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 A826D44F3A for ; Sat, 10 Dec 2022 11:02:45 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1664D68BD84; Sat, 10 Dec 2022 13:02:43 +0200 (EET) Received: from mail-vs1-f50.google.com (mail-vs1-f50.google.com [209.85.217.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D397968BBAD for ; Sat, 10 Dec 2022 13:02:36 +0200 (EET) Received: by mail-vs1-f50.google.com with SMTP id f189so6842206vsc.11 for ; Sat, 10 Dec 2022 03:02:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=kHcYu12Qr9sNcNRco6+Q/Y+/Nv+vO0ah3oUGOSmkFvc=; b=L7q0qDGC2t6Qelo/c8mLjJAdS1i989Tc24AexkAYzhc/W42nO7OtHIty14QYKuVOZr nkKEdHJB1n0bWqxKWnPlEKLBvmRnPl8AIvkO/RsXpASiUao/9jDjgyLkFxoxXBTWoxG/ mycmJNNnTdu1mdtuK9wMIy9zx1HbqGFtURC0HwYlzfmHa//t1FQXSeo828g4syuW0HVD 4mPe/faKWcDEZSWs37wcazGslHB6LqaHXp88ziNThoAoLaDp3k+ShHTqKqQ46ir11gwH znmoXT883JT1d7cIY3XIag6JDlsw4RbwN9n4G8q9AgvO+3G9Kkef2ph2r8oeECfxS3R2 l+aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=kHcYu12Qr9sNcNRco6+Q/Y+/Nv+vO0ah3oUGOSmkFvc=; b=AZnJe0Ophj6nKhfxTzTzjKPUC5kh69SD684qMcAtxzEWwzbuuDnLfAIX8iQL0uauUi xCE4Z36B4ghOSNUBdzuRgX1j7EWwFEOU35oW5dCJMXwFZ2JNh4pT9aydu0ERQYBbrTMv nDNrdUKPrAvOVGz6y5Ha97w13ZILUf/cpZZ6kKeszoCwz2WlK3foLelPrLDaRuDTgEDR nPfygB1femlFsYZQbhyyf9hep/z2/GV0ITu5Gi0TlNwl+LWLShyNv4sycosm/vqPZwS7 MAvhYTdfdR6JEuUv+3XoXVoS57cE2owQcXlfqSEZ1SsatCJHYk6IDkwOEuBb3S3TaQFG CQnQ== X-Gm-Message-State: ANoB5pkzBasscqDt+EVhzMuroJ/1aJwZX+rP5XhOnAfNBInZbLBYTy2w hs2tM7g6PxXRVub03NSwOCFqwiMQRNKgBzgZyJSCJ4YV X-Google-Smtp-Source: AA0mqf4q5kVJXCHNEIXMqDcJzqMT7Tx/HC593Zx3Ku7XiQxfRmGg78TTNCBlEQsHD0MJh5g1Qqu99Xs4p9qARVpo14o= X-Received: by 2002:a67:c906:0:b0:3aa:f64:fbfd with SMTP id w6-20020a67c906000000b003aa0f64fbfdmr45408292vsk.15.1670670155262; Sat, 10 Dec 2022 03:02:35 -0800 (PST) MIME-Version: 1.0 Received: by 2002:a05:612c:2428:b0:32a:5eaa:92e4 with HTTP; Sat, 10 Dec 2022 03:02:34 -0800 (PST) In-Reply-To: References: From: Paul B Mahol Date: Sat, 10 Dec 2022 12:02:34 +0100 Message-ID: To: FFmpeg development discussions and patches Subject: Re: [FFmpeg-devel] [PATCH 1/5] avcodec/mjpegdec: Restrict AVID MJPEG to non-SMVJPEG 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 Cc: Andreas Rheinhardt Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 12/7/22, Andreas Rheinhardt wrote: > AVID content is not supposed to be SMVJPEG; given that > both these codecs involve manipulating image dimensions > and cropping dimensions, it makes sense to restrict > the AVID codepaths to non-SMVJPEG codecs in order not > to have to think about what if SMVJPEG happens to > have a codec tag indicating AVID. > > Signed-off-by: Andreas Rheinhardt > --- > libavcodec/mjpegdec.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c > index 9b7465abe7..28e2839072 100644 > --- a/libavcodec/mjpegdec.c > +++ b/libavcodec/mjpegdec.c > @@ -452,7 +452,8 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) > if (ret < 0) > return ret; > > - if ((s->avctx->codec_tag == MKTAG('A', 'V', 'R', 'n') || > + if (s->avctx->codec_id != AV_CODEC_ID_SMVJPEG && > + (s->avctx->codec_tag == MKTAG('A', 'V', 'R', 'n') || > s->avctx->codec_tag == MKTAG('A', 'V', 'D', 'J')) && > s->orig_height < height) > s->avctx->height = AV_CEIL_RSHIFT(s->orig_height, > s->avctx->lowres); > @@ -2927,7 +2928,8 @@ the_end: > return ret; > } > } > - if ((avctx->codec_tag == MKTAG('A', 'V', 'R', 'n') || > + if (avctx->codec_id != AV_CODEC_ID_SMVJPEG && > + (avctx->codec_tag == MKTAG('A', 'V', 'R', 'n') || > avctx->codec_tag == MKTAG('A', 'V', 'D', 'J')) && > avctx->coded_height > s->orig_height) { > frame->height = AV_CEIL_RSHIFT(avctx->coded_height, > avctx->lowres); > -- > 2.34.1 > LGTM > _______________________________________________ > 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". > _______________________________________________ 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".