From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
	by master.gitmailbox.com (Postfix) with ESMTP id F3D7745B52
	for <ffmpegdev@gitmailbox.com>; Thu, 20 Apr 2023 16:55:21 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
	by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2D4D468BED4;
	Thu, 20 Apr 2023 19:55:12 +0300 (EEST)
Received: from mail-yw1-f181.google.com (mail-yw1-f181.google.com
 [209.85.128.181])
 by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8F2EA68BAF5
 for <ffmpeg-devel@ffmpeg.org>; Thu, 20 Apr 2023 19:55:04 +0300 (EEST)
Received: by mail-yw1-f181.google.com with SMTP id
 00721157ae682-54f8b687a06so2544317b3.0
 for <ffmpeg-devel@ffmpeg.org>; Thu, 20 Apr 2023 09:55:04 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=gmail.com; s=20221208; t=1682009703; x=1684601703;
 h=content-transfer-encoding:mime-version:references:in-reply-to
 :message-id:date:subject:cc:to:from:from:to:cc:subject:date
 :message-id:reply-to;
 bh=edwP5WKkYAwvfP/dgHyqbUdWWkvOTW8YBouS9m8jfxQ=;
 b=fMgxcH0hpcJ/usl+rSJMuON5jh/syEYWXyeKOsXIN+UJW4wNtF4jGost9OkMDxJXCJ
 Z+GlxO3M/D83jS3fR/45+RsWHYnEMHWMlC5TfX34GkOgKcwRp5ajG8pI6GB9AL5qu1TH
 jMh62TTW+m1hfdNYzyrisfLjyClAw6srmcJKvDZsqfykhMWEGi1Bx0ewyYpEtEFTIu3e
 97fhJA9Kp2m2m3U/+NTeo3UrPl7V+whYaVwdTNTKB2WNSTqbuXcEj1urk1wf4hkvDWBw
 zn1UoDqMGTVXYKqgGEOoc+bpayC5sdXro6pVx7rCH8tKCmzY5xNUfn1hW4iAveRYkVA2
 ur6w==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20221208; t=1682009703; x=1684601703;
 h=content-transfer-encoding:mime-version:references:in-reply-to
 :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
 :subject:date:message-id:reply-to;
 bh=edwP5WKkYAwvfP/dgHyqbUdWWkvOTW8YBouS9m8jfxQ=;
 b=E/hQTbTJac7VQKIdOiCLLMoXCb+ni+5RriJukFIfYeJ/4aplCxx9oN13yOCc75xhWe
 VqbQyM7asfLTNXhKNsIv6UOxDsKiqbHAiGBze+TPnmxN9lNg1npGB4oZNU6SJjbn/lb4
 PmILtFU/HxQDrF06OL/VCwDWLnVT7Kv0wCXpR5cfHjpCFm5rvik09NxoxctCHzUXGO22
 CDNE/HNSePArV5jNRdIqP3Upm/pXtwXo7epZA2rwMpzar/bTeH3l6tdQGgGGngRZ8pBr
 FqAR0RgGPY2X2sBnRVEJTpj2LBVlnHeDUOduJMOf17I1zfC45v2ev1y1uuWLyiLXR5/G
 JsYg==
X-Gm-Message-State: AAQBX9e1IiGDUo7rZBipj9HRkeqJtUhTfnjyL0zvOM69p2DT9RhkbXZC
 4CZzf0ZV58x5aVnH1Gnj5lZhPVkBVLs=
X-Google-Smtp-Source: AKy350aDXKqp/juj+ZHm5vvbVLhYcwi8FiT+as3u8Krbglg9jEz2whqBOPMn2ALo0evdbO8zfFviqQ==
X-Received: by 2002:a81:1a4f:0:b0:534:a28b:6d9 with SMTP id
 a76-20020a811a4f000000b00534a28b06d9mr1319316ywa.0.1682009703160; 
 Thu, 20 Apr 2023 09:55:03 -0700 (PDT)
Received: from gauss.local (c-98-224-219-15.hsd1.mi.comcast.net.
 [98.224.219.15]) by smtp.gmail.com with ESMTPSA id
 b129-20020a816787000000b0054fb2ab8782sm436198ywc.50.2023.04.20.09.55.02
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Thu, 20 Apr 2023 09:55:02 -0700 (PDT)
From: Leo Izen <leo.izen@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Date: Thu, 20 Apr 2023 12:54:59 -0400
Message-Id: <20230420165500.49516-2-leo.izen@gmail.com>
X-Mailer: git-send-email 2.40.0
In-Reply-To: <20230420165500.49516-1-leo.izen@gmail.com>
References: <20230420165500.49516-1-leo.izen@gmail.com>
MIME-Version: 1.0
Subject: [FFmpeg-devel] [PATCH v4 1/2] avcodec/mjpegdec: fix remaining RGB
 JPEGs
X-BeenThere: ffmpeg-devel@ffmpeg.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
 <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
 <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Cc: Leo Izen <leo.izen@gmail.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/20230420165500.49516-2-leo.izen@gmail.com/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>

The change introduced in b18a9c29713abc3a1b081de3f320ab53a47120c6
created a regression for non-subsampled progressive RGB jpegs. This
should fix that.

Additionally, this should fix other RGB JPEGs broken before the recent
patches, such as those in Trac issue #10190.
---
 libavcodec/mjpegdec.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index c41d4bce5e..9b55002c4b 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -604,7 +604,7 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
                 if (s->bits <= 8) s->avctx->pix_fmt = AV_PIX_FMT_GBRP;
                 else
                     goto unk_pixfmt;
-                s->upscale_v[0] = s->upscale_v[1] = 1;
+                s->upscale_v[1] = s->upscale_v[2] = 1;
             } else {
                 if (pix_fmt_id == 0x14111100)
                     s->upscale_v[1] = s->upscale_v[2] = 1;
@@ -619,7 +619,7 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
                 if (s->bits <= 8) s->avctx->pix_fmt = AV_PIX_FMT_GBRP;
                 else
                     goto unk_pixfmt;
-                s->upscale_h[0] = s->upscale_h[1] = 1;
+                s->upscale_h[1] = s->upscale_h[2] = 1;
             } else {
                 if (s->bits <= 8) s->avctx->pix_fmt = s->cs_itu601 ? AV_PIX_FMT_YUV422P : AV_PIX_FMT_YUVJ422P;
                 else              s->avctx->pix_fmt = AV_PIX_FMT_YUV422P16;
@@ -1698,9 +1698,6 @@ 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);
@@ -2724,7 +2721,7 @@ the_end:
         }
     }
 
-    if (s->avctx->pix_fmt == AV_PIX_FMT_GBRP && s->progressive) {
+    if (s->avctx->pix_fmt == AV_PIX_FMT_GBRP) {
         av_assert0(s->nb_components == 3);
         FFSWAP(uint8_t *, frame->data[0], frame->data[2]);
         FFSWAP(uint8_t *, frame->data[0], frame->data[1]);
-- 
2.40.0

_______________________________________________
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".