From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id C7D8448A94 for ; Wed, 26 Jun 2024 22:09:29 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F1D8368D69B; Thu, 27 Jun 2024 01:09:27 +0300 (EEST) Received: from mx.sdf.org (mx.sdf.org [205.166.94.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B7B2B68D653 for ; Thu, 27 Jun 2024 01:09:20 +0300 (EEST) Received: from 9e5d27e4b9fe9ef6ae1fbb02e4373de4 ([1.145.155.179]) (authenticated (0 bits)) by mx.sdf.org (8.16.1/8.14.3) with ESMTPSA id 45QM9Eft014416 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits) verified NO) for ; Wed, 26 Jun 2024 22:09:18 GMT Date: Thu, 27 Jun 2024 08:09:09 +1000 From: Peter Ross To: ffmpeg-devel@ffmpeg.org Message-ID: <059dfb2beeba1079915ec95f8d8deb9f49251e7d.1719439673.git.pross@xvid.org> References: <5062735ea3804e138da9ebd1d753c6bf4ec334b2.1719439673.git.pross@xvid.org> MIME-Version: 1.0 In-Reply-To: <5062735ea3804e138da9ebd1d753c6bf4ec334b2.1719439673.git.pross@xvid.org> Subject: [FFmpeg-devel] [PATCHv2 4/4] avcodec/mm: decode raw chunk type and skip unknown audio chunk type X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Type: multipart/mixed; boundary="===============4865835519790356633==" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --===============4865835519790356633== Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="DQhD5zJhEmULp3to" Content-Disposition: inline --DQhD5zJhEmULp3to Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable --- libavcodec/mmvideo.c | 11 +++++++++++ libavformat/mm.c | 9 +++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/libavcodec/mmvideo.c b/libavcodec/mmvideo.c index d339967702..7313507deb 100644 --- a/libavcodec/mmvideo.c +++ b/libavcodec/mmvideo.c @@ -39,6 +39,7 @@ =20 #define MM_PREAMBLE_SIZE 6 =20 +#define MM_TYPE_RAW 0x2 #define MM_TYPE_INTER 0x5 #define MM_TYPE_INTRA 0x8 #define MM_TYPE_INTRA_HH 0xc @@ -76,6 +77,15 @@ static av_cold int mm_decode_init(AVCodecContext *avctx) return 0; } =20 +static int mm_decode_raw(MmContext * s) +{ + if (bytestream2_get_bytes_left(&s->gb) < s->avctx->width * s->avctx->h= eight) + return AVERROR_INVALIDDATA; + for (int y =3D 0; y < s->avctx->height; y++) + bytestream2_get_buffer(&s->gb, s->frame->data[0] + y*s->frame->lin= esize[0], s->avctx->width); + return 0; +} + static void mm_decode_pal(MmContext *s) { int start =3D bytestream2_get_le16(&s->gb); @@ -202,6 +212,7 @@ static int mm_decode_frame(AVCodecContext *avctx, AVFra= me *rframe, return res; =20 switch(type) { + case MM_TYPE_RAW : res =3D mm_decode_raw(s); break; case MM_TYPE_PALETTE : mm_decode_pal(s); return avpkt->size; case MM_TYPE_INTRA : res =3D mm_decode_intra(s, 0, 0); break; case MM_TYPE_INTRA_HH : res =3D mm_decode_intra(s, 1, 0); break; diff --git a/libavformat/mm.c b/libavformat/mm.c index a40b5c44bb..8d79311a07 100644 --- a/libavformat/mm.c +++ b/libavformat/mm.c @@ -40,17 +40,20 @@ #define MM_PREAMBLE_SIZE 6 =20 #define MM_TYPE_HEADER 0x0 +#define MM_TYPE_RAW 0x2 #define MM_TYPE_INTER 0x5 #define MM_TYPE_INTRA 0x8 #define MM_TYPE_INTRA_HH 0xc #define MM_TYPE_INTER_HH 0xd #define MM_TYPE_INTRA_HHV 0xe #define MM_TYPE_INTER_HHV 0xf +#define MM_TYPE_AUDIO2 0x14 #define MM_TYPE_AUDIO 0x15 #define MM_TYPE_PALETTE 0x31 =20 #define MM_HEADER_LEN_V 0x16 /* video only */ #define MM_HEADER_LEN_AV 0x18 /* video + audio */ +#define MM_HEADER_LEN_AV2 0x1a =20 #define MM_PALETTE_COUNT 128 #define MM_PALETTE_SIZE (MM_PALETTE_COUNT*3) @@ -68,7 +71,7 @@ static int probe(const AVProbeData *p) if (AV_RL16(&p->buf[0]) !=3D MM_TYPE_HEADER) return 0; len =3D AV_RL32(&p->buf[2]); - if (len !=3D MM_HEADER_LEN_V && len !=3D MM_HEADER_LEN_AV) + if (len !=3D MM_HEADER_LEN_V && len !=3D MM_HEADER_LEN_AV && len !=3D = MM_HEADER_LEN_AV2) return 0; fps =3D AV_RL16(&p->buf[8]); w =3D AV_RL16(&p->buf[12]); @@ -118,7 +121,7 @@ static int read_header(AVFormatContext *s) avpriv_set_pts_info(st, 64, 1, frame_rate); =20 /* audio stream */ - if (length =3D=3D MM_HEADER_LEN_AV) { + if (length >=3D MM_HEADER_LEN_AV) { st =3D avformat_new_stream(s, NULL); if (!st) return AVERROR(ENOMEM); @@ -154,6 +157,7 @@ static int read_packet(AVFormatContext *s, length =3D AV_RL16(&preamble[2]); =20 switch(type) { + case MM_TYPE_RAW : case MM_TYPE_PALETTE : case MM_TYPE_INTER : case MM_TYPE_INTRA : @@ -186,6 +190,7 @@ static int read_packet(AVFormatContext *s, =20 default : av_log(s, AV_LOG_INFO, "unknown chunk type 0x%x\n", type); + case MM_TYPE_AUDIO2 : avio_skip(pb, length); } } --=20 2.43.0 -- Peter (A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B) --DQhD5zJhEmULp3to Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iF0EABECAB0WIQSpB+AvpuUM0jTNINJnYHnFrEDdawUCZnyRhQAKCRBnYHnFrEDd axFOAJ9Bv27CN39pWMYPE6eujsv2iF63XgCgvzXCbplPdNbs4wZ271nUBl++C0M= =S888 -----END PGP SIGNATURE----- --DQhD5zJhEmULp3to-- --===============4865835519790356633== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". --===============4865835519790356633==--