From patchwork Wed Jun 26 22:09:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Ross X-Patchwork-Id: 50175 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:bc92:0:b0:482:c625:d099 with SMTP id p18csp108503vqy; Wed, 26 Jun 2024 15:09:35 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVIg3yqc23OOw4bsYcdwS2MR2HIcMZWnEvUiBMdwRifKMcihpVuW5M630Xi29nZJbSMSRhJiDVFXXK+dUUSMWj43jpSwD2BNac+Rg== X-Google-Smtp-Source: AGHT+IFSFWsptPaWufH5xvylxOZBEF7Ah5DayGHNsyad0kRvx702DU6VI5Evngc+mMPHtqFyriDZ X-Received: by 2002:a19:384b:0:b0:52b:c1cc:51f1 with SMTP id 2adb3069b0e04-52cdf7f10ddmr8462718e87.23.1719439775183; Wed, 26 Jun 2024 15:09:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719439775; cv=none; d=google.com; s=arc-20160816; b=jCWOPuRA7u6CM+AXwJP4RPyDi5sDq/Ur4wM+ItwkOBHwh1kc6R37gVyHYdp5ijzTN7 zZat+oP3GkC8Rj+r4XLe5/c4wPNy7bMpFe8M861f0SyK1tfBSUK9Wfnc01a+N9f9t11R kQKIUaczl4IUAKdvInZ8caK+x/8PtpmVe3JB/wH9y63zTTjDL8c74u4ZFIC5apgZbovO z9lDbwR3manZRMkaLutZfGqbPaPqOQAt0IkjrGWjxp+uKE+ETqrKGQIQxNOdU9nVO5n+ XznKuGFAGYowxeYhCxo++sffH8H0mJFOAsyTK5kYIrx+Xl26vPpRUka802lC+8ggWa0s BZoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :in-reply-to:mime-version:references:message-id:to:from:date :delivered-to; bh=N4qMZKdkZ0suXi0507wnik8hOo3QyX62WHgGCecNRV8=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=ZofWjIeXHvhX5UxtPr0njgO2pQOmLmYU/t0X7iOOOR1YkqgW3+nh/ogCNxvyw7WHmg gKn93yCvBBeP7ZKIbDCCXq8E2bFeNDV+jh8ba+7djyPjkOUS22+dIv+ruUk7corrcFB2 griocYmaNLUIhqaZ5IifPALAw4eI3GNi6+AvHWe9/3NGFO3EiBF+E65I+nRiSqGjDuFU G92SkBwgf2P4/g8nHvQbBoGlhLq4XH/FK2VXrxVcb9pdZcDG+HE3IVZY2QjR+HMLHcgq d1/oRw6OgVfVQS5BLcEnYuwDhTcMntgGzyIog7fvBFEuQ2shEqWrrECFIOGWJuMfy1q3 1xeQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 2adb3069b0e04-52ce9703063si1966435e87.357.2024.06.26.15.09.34; Wed, 26 Jun 2024 15:09:35 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7C31668D653; Thu, 27 Jun 2024 01:09:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 1gSzzzUT9FKi --- 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 @@ #define MM_PREAMBLE_SIZE 6 +#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; } +static int mm_decode_raw(MmContext * s) +{ + if (bytestream2_get_bytes_left(&s->gb) < s->avctx->width * s->avctx->height) + return AVERROR_INVALIDDATA; + for (int y = 0; y < s->avctx->height; y++) + bytestream2_get_buffer(&s->gb, s->frame->data[0] + y*s->frame->linesize[0], s->avctx->width); + return 0; +} + static void mm_decode_pal(MmContext *s) { int start = bytestream2_get_le16(&s->gb); @@ -202,6 +212,7 @@ static int mm_decode_frame(AVCodecContext *avctx, AVFrame *rframe, return res; switch(type) { + case MM_TYPE_RAW : res = mm_decode_raw(s); break; case MM_TYPE_PALETTE : mm_decode_pal(s); return avpkt->size; case MM_TYPE_INTRA : res = mm_decode_intra(s, 0, 0); break; case MM_TYPE_INTRA_HH : res = 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 #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 #define MM_HEADER_LEN_V 0x16 /* video only */ #define MM_HEADER_LEN_AV 0x18 /* video + audio */ +#define MM_HEADER_LEN_AV2 0x1a #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]) != MM_TYPE_HEADER) return 0; len = AV_RL32(&p->buf[2]); - if (len != MM_HEADER_LEN_V && len != MM_HEADER_LEN_AV) + if (len != MM_HEADER_LEN_V && len != MM_HEADER_LEN_AV && len != MM_HEADER_LEN_AV2) return 0; fps = AV_RL16(&p->buf[8]); w = AV_RL16(&p->buf[12]); @@ -118,7 +121,7 @@ static int read_header(AVFormatContext *s) avpriv_set_pts_info(st, 64, 1, frame_rate); /* audio stream */ - if (length == MM_HEADER_LEN_AV) { + if (length >= MM_HEADER_LEN_AV) { st = avformat_new_stream(s, NULL); if (!st) return AVERROR(ENOMEM); @@ -154,6 +157,7 @@ static int read_packet(AVFormatContext *s, length = AV_RL16(&preamble[2]); 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, default : av_log(s, AV_LOG_INFO, "unknown chunk type 0x%x\n", type); + case MM_TYPE_AUDIO2 : avio_skip(pb, length); } }