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 7CCED45A76 for ; Thu, 13 Apr 2023 12:45:21 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 914CC68BC08; Thu, 13 Apr 2023 15:45:17 +0300 (EEST) Received: from mail-yw1-f177.google.com (mail-yw1-f177.google.com [209.85.128.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6919D688371 for ; Thu, 13 Apr 2023 15:45:11 +0300 (EEST) Received: by mail-yw1-f177.google.com with SMTP id 00721157ae682-54f0feb84adso1125667b3.1 for ; Thu, 13 Apr 2023 05:45:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681389910; x=1683981910; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=2b78XHUtSK6ONsMGbNMoZsejWMhHCSND1+bIGH+pQ8g=; b=NInUGopn3vMf+EN4geFSRixXo8LJEpNkSBfgvIcIzNuuO5jvuTtb9L5WCRbG8WJEt3 RWPEiGMjE7Kyay30wHbDoyp+K3aJzVshzj7wY37G7eXhg5gfb6F8uJ8i53/OOITEnzyn ELg1RFzQuLYQ6HgNCisufiDfBqbjIOUWcZ8T2wgWzTDGtkG9j020Iwk9OoNO+QjMtfJX fTIuhmbEk5gdSrX6tryX6GOYkrhKlsA1I7646au+9HLp1nwcLEwuDp+/rr5wUKJwBBQ/ piii7ICrCJ8j+zVQZtCzjR7XTuDxfJIughSoyxEGrPE15qLQvQusV0JJvB6rQU3XorHW ZPCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681389910; x=1683981910; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=2b78XHUtSK6ONsMGbNMoZsejWMhHCSND1+bIGH+pQ8g=; b=lldvtA6kd7y8DM1srK+Sy24ki3DyEXeQDo7sBr8Ei9M7y5+omwc/wJh4dSkksk3F1g zIL97oVH9WkUQ97iHw9moMeH+zQvYo1C268YbaXMB3LWKKhe4TmWWxrVeXcI6JdLvXil IBOyIDWRdcBS0O6/9+OA40XFEbXhQyuSUFrOZQ/DdALM+jxDIjJ/VAbqwMyD4XFjD7jU 02DAECnFZYj6BEuspNecU875G+pPA3vXv7ITWIy8C7nCdvqqUDmGIzqlONAHDKL+P1nX fFgP652N6gh29s+aVkXR4Xwtsp3cypJuOpyTMpuq8epcmkgBPY+LDzia+4AEekEP1XQh 88cg== X-Gm-Message-State: AAQBX9chWIfEw3QVw/m3YzYEZWWqWXswCQ2A9OmaOirHnB3os53g/5EO cfy6rXTnBOeTjBk+nNoDG8IrPMymVJ0= X-Google-Smtp-Source: AKy350aRz4cI+wVzXCJpNI/I+JdNLboYMWU1gx4dZZ+FYFpaXubmni6PDMIpA9FvARtkdiNu92HGRQ== X-Received: by 2002:a81:1305:0:b0:54c:a77:cc7a with SMTP id 5-20020a811305000000b0054c0a77cc7amr1750336ywt.1.1681389909808; Thu, 13 Apr 2023 05:45:09 -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 18-20020a810e12000000b0054ef368af47sm423530ywo.116.2023.04.13.05.45.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Apr 2023 05:45:09 -0700 (PDT) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Thu, 13 Apr 2023 08:45:06 -0400 Message-Id: <20230413124506.14319-1-leo.izen@gmail.com> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/mjpegdec: fix regression with baseline RGB JPEGs 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: Leo Izen 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: Commit b18a9c29713abc3a1b081de3f320ab53a47120c6 introduced a regression that broke some baseline RGB jpegs. (See Trac issue #4045). This fixes that. Signed-off-by: Leo Izen --- libavcodec/mjpegdec.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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]); -- 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".