From patchwork Wed Jun 26 22:08:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Ross X-Patchwork-Id: 50176 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:bc92:0:b0:482:c625:d099 with SMTP id p18csp111786vqy; Wed, 26 Jun 2024 15:18:18 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWdmKmS/mqobLDAj+Bb8KNjJVQEmvGmljq6lmmdEgwKr9JYv6LpVn6Xttu+cAy1H75kpKfvC5SyyptAnmp/HacXfpYkqvrnyyRDsA== X-Google-Smtp-Source: AGHT+IFbyKLw2Fnx9tSGE1oOlO6qhnUVqnztmdKMVYq9T00aS23S4ZUovGJRh13GbLR4dK567BV4 X-Received: by 2002:a17:906:35d4:b0:a6f:acf8:2f88 with SMTP id a640c23a62f3a-a7245b8eff0mr703249966b.21.1719440295066; Wed, 26 Jun 2024 15:18:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719440295; cv=none; d=google.com; s=arc-20160816; b=M5win/99dH8sh5/9q37Lr9OcfNMHyewpdssEBi14pR84JRenhQKqqQMpcofrJggOkT NB22FZd8sBGrWtL1MQekfErJ6KK9aKw7GRrom1RUJy52bqqc59XfVS+Z4TBjmyApoqeC MLHGnqtlcnEH+yCpF9IqJmgp77UbmmaOd3nxb037C89BLDrCSQhdPbDOmyqwWbrW3vb8 bElzS03woqJmpiT5hoTJoUAEGGxNcFNKotHlIh/wTIwCJqc+QWz8bDixOVLSt7qwlDOs x23zsfXInbXebtaeS/BTmk1rdg7CvZkAMhPRDY+84d8kMrnQ2xTfMUvL+ip85vWEyx0I WcWA== 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 :mime-version:message-id:to:from:date:delivered-to; bh=QP5e0usTu/4oKMGbdwYVgl+0dldRaNcskcM1y2a2YsE=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=uI2p+18DipoZsZlV1ow1QYY3UVQ5B0kPxYaYpiLwSEwWZlLpk0fnYIiUGIxzZZbvch KO6/3+mKUV/w26BdPiaNuLHy1XJu4llzg7TnBjekF/sEgSuEooDRBTcqOVb1C4OumtpS mm+C3TjTDeYs9nvrO/Oaa2EIynBnHwoi9yIwfgi6plXRYXHGJE7v/jeDCp+P2QNpwgBw ur57akochpp2mOeZjWz70KtO7uxB/6AM0W07TCQ+1hBaG6L7hiVa1n0kMk2qoir39Rca kfEnrb72iFPXosKB536N1yfy/QqkvReHpyFoyyqyXHLv0jkoC7pjN4s75s0YMbSAPsJB aLIQ==; 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 a640c23a62f3a-a7260c648a3si298634166b.568.2024.06.26.15.17.51; Wed, 26 Jun 2024 15:18:15 -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 14CE068CB9F; Thu, 27 Jun 2024 01:08:37 +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 BD21068CB9F for ; Thu, 27 Jun 2024 01:08:28 +0300 (EEST) Received: from ab032b462362d66d13fa5ccf63a6104c ([1.145.155.179]) (authenticated (0 bits)) by mx.sdf.org (8.16.1/8.14.3) with ESMTPSA id 45QM8KtA009533 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits) verified NO) for ; Wed, 26 Jun 2024 22:08:24 GMT Date: Thu, 27 Jun 2024 08:08:14 +1000 From: Peter Ross To: ffmpeg-devel@ffmpeg.org Message-ID: <5062735ea3804e138da9ebd1d753c6bf4ec334b2.1719439673.git.pross@xvid.org> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCHv2 1/4] avcodec/mm: set audio pts proportionally to audio offset 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: jtCH5O1V/NZz --- libavformat/mm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/mm.c b/libavformat/mm.c index 23c025d852..a40b5c44bb 100644 --- a/libavformat/mm.c +++ b/libavformat/mm.c @@ -180,7 +180,8 @@ static int read_packet(AVFormatContext *s, if ((ret = av_get_packet(s->pb, pkt, length)) < 0) return ret; pkt->stream_index = 1; - pkt->pts = mm->audio_pts++; + pkt->pts = mm->audio_pts; + mm->audio_pts += length; return 0; default : From patchwork Wed Jun 26 22:08:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Ross X-Patchwork-Id: 50173 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:bc92:0:b0:482:c625:d099 with SMTP id p18csp108267vqy; Wed, 26 Jun 2024 15:08:59 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXdXhL+b5gnhSWs6dF9b41EJiyKo+qOjxk9tpUO5ZjJA6+hGZuw8j4nOuCMJPd41eaB2nkr87WFzA2F42uQZM4XKFalRR8ak2/bNg== X-Google-Smtp-Source: AGHT+IGiFih0DxY51rZq38hT4F+ov3BWxjod74DVVPU4sPXhl5kg3Is0PKJlIpfm1pEgzSlMoDqC X-Received: by 2002:a17:906:99cd:b0:a72:5e95:ad46 with SMTP id a640c23a62f3a-a725e95ae70mr686903966b.31.1719439738608; Wed, 26 Jun 2024 15:08:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719439738; cv=none; d=google.com; s=arc-20160816; b=majh3XqID+tuEmpQzIHbr5ZLAWKK0kWmiSbnwe0yVLVbiYYyV8zGFhEgj0TF9JR1JY fmF9TuBJDOuZXUu5HjNKW4K8/qXMv7qC8C/fJy6snpsfAB9mmmd0qwbD02Yw+yqdIE5y 0Omu7R9++Xq9b4dv9DVNCbcAr2dleZfp9CJHiQ9wDrAs+3O2M75HsFThDIq1pL4J0s9O Xg/lp9HAJDqzhYMwKVml9tHPqqRHW74g3QDMeTcnX9AxSaExYcyRj5EZSAjyq15RqjB2 wNxue1UAtMiU08PCFD+rqM7y+SfWkBLAF3Xpo0kIra5hFXDcU946d4AJsA8bsXjQTZfD RNYA== 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=+dqZfhNkIrPUVHtNZYx06GcsOqMRjWj3++7Ym/l76UU=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=XfPTjBx4y7+wihZQSvxKhiln/MpceqH2JooxB8YaLkA65XRNzHqpc4bNyTpghdudpr K04oNAdpZ1VtHkfaIC/wca3kaXce6D+Dhs82kplFoqbBcNRBJgQhuvWXsF1ltcoxIJFG 9c/xiaLjDwq8EaBk7NbDL4akGvScbSesDvUDeSoqqfy56LlrCxNcb86EZap86rTt4YnX C5eQMCzmouWhc2WWT3+ST3isQ/69Ab/CDMzM46JLWEmNror+w1j3GTPNMsKYNMQbNyyp HKViLV/V6a7+6bS4nY4ghmBqd8kC7hUhLvWQwVY1YmDP3tMH55+u5QjnWmDtu8uGKR8I ppsQ==; 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 a640c23a62f3a-a72426cd19dsi458759866b.410.2024.06.26.15.08.54; Wed, 26 Jun 2024 15:08:58 -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 D58D668D321; Thu, 27 Jun 2024 01:08:51 +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 B1D6768D3C6 for ; Thu, 27 Jun 2024 01:08:44 +0300 (EEST) Received: from 6f518394d9b192562d438bebf7fb61c0 ([1.145.155.179]) (authenticated (0 bits)) by mx.sdf.org (8.16.1/8.14.3) with ESMTPSA id 45QM8djC005918 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits) verified NO) for ; Wed, 26 Jun 2024 22:08:42 GMT Date: Thu, 27 Jun 2024 08:08:33 +1000 From: Peter Ross To: ffmpeg-devel@ffmpeg.org Message-ID: <089793aaa66d4fc39083cfe4332e4b294a144db9.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 2/4] avcodec/mm: decode partial palette 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: Pw4Uz85Sghbn Reviewed-by: Andreas Rheinhardt --- libavcodec/mmvideo.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/libavcodec/mmvideo.c b/libavcodec/mmvideo.c index 3038d9ea92..933d895f96 100644 --- a/libavcodec/mmvideo.c +++ b/libavcodec/mmvideo.c @@ -78,13 +78,10 @@ static av_cold int mm_decode_init(AVCodecContext *avctx) static void mm_decode_pal(MmContext *s) { - int i; - - bytestream2_skip(&s->gb, 4); - for (i = 0; i < 128; i++) { - s->palette[i] = 0xFFU << 24 | bytestream2_get_be24(&s->gb); - s->palette[i+128] = s->palette[i]<<2; - } + int start = bytestream2_get_le16(&s->gb); + int count = bytestream2_get_le16(&s->gb); + for (int i = 0; i < count; i++) + s->palette[start+i] = 0xFFU << 24 | (bytestream2_get_be24(&s->gb) << 2); } /** From patchwork Wed Jun 26 22:08:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Ross X-Patchwork-Id: 50174 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:bc92:0:b0:482:c625:d099 with SMTP id p18csp108353vqy; Wed, 26 Jun 2024 15:09:12 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWRb2UGn7CiFUcZK1MxIxsotIqO8MYMX8tOEhYrG7tt8E6zR1SV45IhfPdVTyj4ZUMG6BG9eZ+qgNnhgzKcP8E+ivj0bWlVGPTkXA== X-Google-Smtp-Source: AGHT+IHtW7uU67bArTju7V6y6fuKX9Ld/PByYwtE8clGWaQeFw7J5gf4wRkQDVHZq94dIp35fY9A X-Received: by 2002:a2e:7211:0:b0:2ea:e74c:40a2 with SMTP id 38308e7fff4ca-2ec5b2d5b95mr83061791fa.20.1719439751672; Wed, 26 Jun 2024 15:09:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719439751; cv=none; d=google.com; s=arc-20160816; b=KhuXLIq5duqhs5deQ94P4clTxD1DJhWw5ccw50z1I7HhUB7K+FWiSU1yKGi7wKbhHb W2X5w5V+Y2W9srdjsQCIDzSyNVh7d5bqtPxMantBOUcLKwD0gQsSd35mm4q95KKWhMMP i9hZPBDSyrHIKCHl+4lI0PvjVf3YFVrDucYHfBosnet+n1goW2IPfYub1m1itd27dSFh iYr+hcqko4Bx0MExnbg13si9FzI4hbFG0lj0bs3TTRXHZ85g5ZnrRkYuL/rIR2GIPLNZ zZSnLRllfn8MDR//8Ma1J+muhQTibp+r8XVhm/qsp3YSKO+VkYaiIwZ6sPzp+u6hiB/E w9vg== 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=s53nBdTLridFcXfks42NZi9Oe6IUyPknoMDgXqZ5XDs=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=Q7UBC8R5xhaa5gsRBu5a3YEwN/HuyLaJrm1/U4aTsvRPwmWx+lQVEVn7ozZ1czqVcY 23vOU7IfaRI0XJ98uPcC+oxw9U7QL6RvUVML3WZ7Zs3ILIpNnAIvykgX5xIylLDum7jz rjL6Dx1Rw8kglUiLHTamm/3gFq1pOvSBv1AQYaw+4rPuZp2xfkYGN05Jz1/NXQJWy9ca ancXZSFwZxC2JNjdLAp+l6MzX/EELl4aaY6MpcbH31/994KokbmXwhNQQqXoya38MuBk a8qixBkxPpcX3QLwvBy5Sre4xl+yCqi4/3iqYUp9/v3/A+C0hP3Qx5D5Il9nQB4RJ5Vg Kh9g==; 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 4fb4d7f45d1cf-584d2e442e5si29889a12.411.2024.06.26.15.09.10; Wed, 26 Jun 2024 15:09:11 -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 47D3868D685; Thu, 27 Jun 2024 01:09:08 +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 DD7E068D3A6 for ; Thu, 27 Jun 2024 01:09:01 +0300 (EEST) Received: from 83484378655e085d94eafc45b94ceacf ([1.145.155.179]) (authenticated (0 bits)) by mx.sdf.org (8.16.1/8.14.3) with ESMTPSA id 45QM8uWf000514 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits) verified NO) for ; Wed, 26 Jun 2024 22:08:59 GMT Date: Thu, 27 Jun 2024 08:08:50 +1000 From: Peter Ross To: ffmpeg-devel@ffmpeg.org Message-ID: <74b7c329c03e5931966b9f41a759e184fcdcb88c.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 3/4] avcodec/mm: don't fail if x offset exceeds frame width 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: bFDSq4s2H85o --- libavcodec/mmvideo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/mmvideo.c b/libavcodec/mmvideo.c index 933d895f96..d339967702 100644 --- a/libavcodec/mmvideo.c +++ b/libavcodec/mmvideo.c @@ -161,7 +161,7 @@ static int mm_decode_inter(MmContext * s, int half_horiz, int half_vert) for(j=0; j<8; j++) { int replace = (replace_array >> (7-j)) & 1; if (x + half_horiz >= s->avctx->width) - return AVERROR_INVALIDDATA; + break; if (replace) { int color = bytestream2_get_byte(&data_ptr); s->frame->data[0][y*s->frame->linesize[0] + x] = color; 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); } }