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 78F2F4562F for ; Wed, 12 Apr 2023 16:13:52 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1818C68B343; Wed, 12 Apr 2023 19:13:49 +0300 (EEST) Received: from mail-yw1-f174.google.com (mail-yw1-f174.google.com [209.85.128.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5554468ABE5 for ; Wed, 12 Apr 2023 19:13:42 +0300 (EEST) Received: by mail-yw1-f174.google.com with SMTP id 00721157ae682-54f8b687a06so329827b3.0 for ; Wed, 12 Apr 2023 09:13:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681316021; x=1683908021; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=cKxDdQ3F3JvTT/DlVyKyoUuJ2w0jNO25khEQXNJOlbQ=; b=d2Pmcofb5X/WG+iG4clxwSDrRRJu7d4Lvytyf7PGRaLlDiWRJy6674lMu9bqHh9ZvN BNiOEYiPUjtBDObREY8br6/HujtAvMrpPIndCE5fh8SYAj7Z51HquY132bVREC87fE6G FKZrHmvyfGlV4JIA4B1tN6Az3P24BatYSKqixXmN8hirn7QQWGWxqgaMmyy6UbsrSgof PxrvyuX0KuXvr+YCF4wJqMD137TFxsbCdn5nVswQAis2LJhdb4skI0JV499fik3IkIg7 TzdMXtsdJlrHoFdUibx3xvVdv8DSDRZqVyghU2BLLyZY716UY59lzn+0liEXn0aV2jvk Pb/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681316021; x=1683908021; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=cKxDdQ3F3JvTT/DlVyKyoUuJ2w0jNO25khEQXNJOlbQ=; b=30iKuF5csChV0Jct4yD6FXy41RPAJcSr9ViLKIsi/7zCcxXEf18B3G4M9SCqTSHr4P KHaCjrXtDBJa23RCuPWIvzA9nrz350q0FBiXXFgmCvBc9dxxoUOpd5r8dQhprbA4tzd6 nGVPbKVtohU1alKILJBG1K59hgVhgyz7zC44rJHnAI2VO51fs1pbNInS9hcPPUnLSfCL YKc+wcxAWWvmTp0Qpq/Uk8N1BtrnUWcFLYrmkCxejnOk6DZdTHM6ZJA5pRW/h5kgSMs+ z/38xhd22rIs6biexEiJqOM508+qlaxv3qZgSWa9h2WvxB1V9aWIHcBcF7WH5O97lMU5 Ylcg== X-Gm-Message-State: AAQBX9dwX1AKk5gXNWiO24199sAixDYxxt9VoyDKj84vYgl4Y/x89evy OHQPQCeGdI3AQvRfqpAxxgr9VPjsUfY= X-Google-Smtp-Source: AKy350Y0n0ns5sVzs9W5Ve3id0YHjbGbaxkKhyAFi0WpH2eMuifgDG6a8EWegel/oBK1iFcr2uIrtw== X-Received: by 2002:a81:7041:0:b0:54f:87d0:cb3d with SMTP id l62-20020a817041000000b0054f87d0cb3dmr2302911ywc.4.1681316020748; Wed, 12 Apr 2023 09:13:40 -0700 (PDT) Received: from [192.168.1.35] (c-98-224-219-15.hsd1.mi.comcast.net. [98.224.219.15]) by smtp.gmail.com with ESMTPSA id 189-20020a810bc6000000b0054f856bdc4dsm816691ywl.38.2023.04.12.09.13.40 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 12 Apr 2023 09:13:40 -0700 (PDT) Message-ID: Date: Wed, 12 Apr 2023 12:13:39 -0400 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.9.1 Content-Language: en-US-large To: ffmpeg-devel@ffmpeg.org References: <20230410085620.577A841038A@natalya.videolan.org> <20230412153539.GA275136@pb2> From: Leo Izen In-Reply-To: <20230412153539.GA275136@pb2> Subject: Re: [FFmpeg-devel] [FFmpeg-cvslog] avcodec/mjpegdec: support weird RGB subsampling with progressive 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-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 4/12/23 11:35, Michael Niedermayer wrote: > Hi > > On Mon, Apr 10, 2023 at 08:56:19AM +0000, Leo Izen wrote: >> ffmpeg | branch: master | Leo Izen | Thu Mar 16 15:32:14 2023 -0400| [b18a9c29713abc3a1b081de3f320ab53a47120c6] | committer: Leo Izen >> >> avcodec/mjpegdec: support weird RGB subsampling with progressive >> >> This allows weird subsampling with progressive JPEGs to be decoded, >> such as full-RG and only B subsampled. > > This breaks multiple jpeg files > > tickets/4045/1x2.jpg > tickets/4045/2x1.jpg > > [...] > I believe this should fix it. Should these two jpegs be added as FATE tests to prevent an issue like this in the future? diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 3fc18aac73..01537d4774 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -1698,6 +1698,9 @@ int ff_mjpeg_decode_sos(MJpegDecodeContext *s, const uint8_t *mb_bitmask, s->h_scount[i] = s->h_count[index]; s->v_scount[i] = s->v_count[index]; + if(nb_components == 3 && s->nb_components == 3 && s->avctx->pix_fmt == AV_PIX_FMT_GBRP) + index = (index+2)%3; + s->comp_index[i] = index; s->dc_index[i] = get_bits(&s->gb, 4); @@ -2721,7 +2724,7 @@ the_end: } } - if (s->avctx->pix_fmt == AV_PIX_FMT_GBRP) { + if (s->avctx->pix_fmt == AV_PIX_FMT_GBRP && s->progressive) { av_assert0(s->nb_components == 3); FFSWAP(uint8_t *, frame->data[0], frame->data[2]); FFSWAP(uint8_t *, frame->data[0], frame->data[1]); _______________________________________________ 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".