From patchwork Tue Apr 18 14:52:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Izen X-Patchwork-Id: 41242 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp3219037pzb; Tue, 18 Apr 2023 07:52:47 -0700 (PDT) X-Google-Smtp-Source: AKy350bQe3ALMK7SaH6FEI9O+dh8awdO7s3JTSyviFZB52n5QQ7Emv4kXu6DZn6jp2BK2CGgUjNr X-Received: by 2002:a17:906:fa03:b0:94e:b3a1:3ed9 with SMTP id lo3-20020a170906fa0300b0094eb3a13ed9mr8732442ejb.49.1681829566811; Tue, 18 Apr 2023 07:52:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681829566; cv=none; d=google.com; s=arc-20160816; b=DvncBX6ro01P1l2cFrdCmtHdEU7t0OrmX1sSq7jLjOJvum26a2/QPPxmyTkmsC4B3+ XoEWlNyTj9chGyHKXfeaTCiy4lGQdMGRycjsv6b3MG69gPW7QVVRl7CXA19i3rTDylWD 2LmUiqjUyGUbzPEK8tZUzNtTo53L/z7Y4tyJeL9P/hod7l1UDL3y20vzBlhRd8nD+Tv0 gohjLBIx6I77h4Gw7rj2pU7okZj2O7LsHDEIWz9xI1qzD9cCAhxKh2eiY67avDgIYx9I Jzw5N9zE+wG40+FuXRg0c68fpfRtZgzBZJVWoXHRohf8UP1nC1W0gXeZNFFvmUyqGFqi XtKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=Q/kIgPSesz8Qi7rwGt2RufA3Ucpr/rVZvilsq4H63AU=; b=UBJ/IaETbFnqtKWBA6Vd6SLwt6RpF/SJNSkNwRPDolPrV/DF4IvfSPF/EgAbqxANDF j+mRLAyGTQJhcvm9g4rZApS4L9eAeAAh0Vd9Lr+Z0y5LLLyGvyttAckoNXVMuyQcMaRv DU2SWvxPjN4WAldiBAGohBs5/NArEVRTfzTFL0qUU2OvsqahKFMd74W/cQ6HTHq85VBM hXvQekZGiGq14bfmISQgLsEyLfRUxIwV85IOwOtKE595HFP/a/PXpy1PMCArPkHwNInd deBECda6zyYGquYNR0Ff3c9+guSitgpMHAJV4Rki+p16oifUIXuO1Lg/dXYP+ungZyjJ ueIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=fso3hR9V; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id kb8-20020a170907924800b0094f5ff35071si4854613ejb.479.2023.04.18.07.52.46; Tue, 18 Apr 2023 07:52:46 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=fso3hR9V; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6313B68BE7B; Tue, 18 Apr 2023 17:52:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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-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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 5Nx8XfUDKUPB 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;