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 1B6F0452A7 for ; Tue, 18 Apr 2023 14:52:44 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 16CE968BE53; Tue, 18 Apr 2023 17:52:32 +0300 (EEST) Received: from mail-yw1-f175.google.com (mail-yw1-f175.google.com [209.85.128.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3717668BE2B for ; Tue, 18 Apr 2023 17:52:25 +0300 (EEST) Received: by mail-yw1-f175.google.com with SMTP id 00721157ae682-54f8b687a06so3714997b3.0 for ; Tue, 18 Apr 2023 07:52:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681829544; x=1684421544; 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=ZTUeuBnteDtpeD0LjLOfAyxV+u9uQCiqmGDOdXejzu0=; b=fso3hR9VP8zoUf7kZ4rGxn0fGVEcqZ78YEG2gqd0fFNWE2alB+BKapFWedLRUZz3KK 0oR6CtlXsJrJdjmAAlJ/8eGE1+dX2GFMmZbdBXcLvMF0iKrNcbzVOeZChH3nFtQJerDG I7hPT3X5/epvy+Cpp7YVWyiBbQzumux8SPxV4zDMcH+HIyHKt2rlyj4moqZjJAo32+Ri OeHAWHwXCzv02bYKqpqrwirwd5BgJ31LcHwVC5HFL0bBY8WAd0CJ3bwrjjGxSSoF7H/o 39mzW13WCErweOav1vPblv/pj3e5Vo30qiU7pBJjgAYpfFzOtVURZL1nIwUpeplRTF1H xu0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681829544; x=1684421544; 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=ZTUeuBnteDtpeD0LjLOfAyxV+u9uQCiqmGDOdXejzu0=; b=KRCPBB4S1TlefHNNLc8goI75kXXX0SHtHIqaoDmDR+sRKwdLEu01enpm4zE3BRebWA ihbwWGjdbKe9q/bfzfpWmGCRXlmXKKp57DcTyAVIAgrVlnf71o/j9ZWx9fTcN4yMuBMQ F+jeK8NlR0dy6U39Lx/ckRMaf+Kg4mTb9/iEVmqAONWO0xe3uYQ/fTL02Yzfhzl1drQG N/95ZXQ+HuznjkCgkVEl1WO2JsD8gCRei1Bq2ukmfOVH2iIpgX/AMKjJihwjGd7pDABT vi0j8PJq7Dg3IR4YBZ7XvDp4/ogFBF3QkmPj6gw9qEZ0UlB62YhMR/5i5RJzP5cbq7XK sqmA== X-Gm-Message-State: AAQBX9clI6fbT0g3PZv7gWjZBLTPZ4U0ifOwzhj/pGPqZip2IMwSm1z5 NE45OPQNdAVS8ceRIkQv7t6Y6oJ8X0M= X-Google-Smtp-Source: AKy350Y0TTQzaNNVCa2cpmx/wOOXw6XM5A/RpWdw/FWDmcxKOWIaQb6RQ/8EAgdtnJUVGcSNssEswA== X-Received: by 2002:a81:1b10:0:b0:53c:6fca:a1c4 with SMTP id b16-20020a811b10000000b0053c6fcaa1c4mr13843738ywb.2.1681829543923; Tue, 18 Apr 2023 07:52:23 -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 da15-20020a05690c0d8f00b00555abba6ff7sm570420ywb.113.2023.04.18.07.52.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Apr 2023 07:52:23 -0700 (PDT) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Apr 2023 10:52:19 -0400 Message-Id: <20230418145220.33379-2-leo.izen@gmail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230418145220.33379-1-leo.izen@gmail.com> References: <20230418145220.33379-1-leo.izen@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 1/2] avcodec/mjpegdec: fix non-subsampled 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: The change introduced in b18a9c29713abc3a1b081de3f320ab53a47120c6 created a regression for non-subsampled progressive RGB jpegs. This should fix that. --- libavcodec/mjpegdec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 01537d4774..1e3ddb72fb 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -1698,7 +1698,8 @@ 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) + if((nb_components == 3 || nb_components == 1) && s->nb_components == 3 + && s->avctx->pix_fmt == AV_PIX_FMT_GBRP && !s->progressive) index = (index+2)%3; s->comp_index[i] = index; -- 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".