From patchwork Thu Apr 20 16:54:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Izen X-Patchwork-Id: 34915 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp660472pzb; Thu, 20 Apr 2023 09:55:15 -0700 (PDT) X-Google-Smtp-Source: AKy350bqlC+7E/HE5cQ2hHZfzSvDHnObzTliDeOYnetw9BDNO30D6WNA9JJi0e3Z8rCqufCmOWHj X-Received: by 2002:a17:906:3755:b0:94f:3338:2431 with SMTP id e21-20020a170906375500b0094f33382431mr2654974ejc.32.1682009715594; Thu, 20 Apr 2023 09:55:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682009715; cv=none; d=google.com; s=arc-20160816; b=UkfNkL3v3VP7e34WKQzraMSvuEWchE4EdZ3hm2VmJ8aLfbVjY10XZMoeTSvRFkcpHx r3AESB7TzIpMbO38q8x5r2KFq48cjBmig0Y+nL4cLJPJi2mKJUP6/GJGhk9FvVfSEWo9 Q2WzEB5Oxwfd14XjVusl5NWhEZKKDN54ew0mEMfp0YJFTZIiUzWqtkVR1fPu/953HXNu WGgJqJ1/TigjT6gEm8pl5hzTYTKkjQUVPMJU3eXS9Z8T0GTRlQoyybtAY0Yv4HDCBpjE 262wGCQbiI+v+p7a2XyF7FePhTaTbpRZerPjmxLU3ywrAm08DdarmQH4JyiSouVGq/hb GhUg== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=SUoJpXurIduJtXoiFqhsBxVikrXaFlAI7vTtqQhJUZ8=; b=wu8dZq2r80LoirJDt5H4SxGkJes35AX/ozOXvqEjQouiQkAadhVS5Z+DzRufGV0JUr Tdi9IgGeTrnZu0NG2xMsGf052A7iVJvqRP88pXYECAWQKkZkLVX4nQasi3BLQBAh+TQZ CDbajsfjyhZdxuT5ub2eDwuPOhoxLmPBiodnLoM8uu0B2UdHX88kfqO15ykFaXAAkehS zKrqIT4oKUql961i8XpUD5RAj32FPtbYZGvQFMhmd/qleZu12Z4mVEuxINsJzqLsmuPP L5EwacCAZga48py2DdbfjhKhfdxklk54c48bfZoL4kRs3qaFkbS/33iRSmWiuYzYtbeU qo+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=jf1CAmAx; 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 uz17-20020a170907119100b0094f4a88b558si2038977ejb.456.2023.04.20.09.55.14; Thu, 20 Apr 2023 09:55:15 -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=jf1CAmAx; 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 43CB968BED3; Thu, 20 Apr 2023 19:55:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yb1-f171.google.com (mail-yb1-f171.google.com [209.85.219.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3E99468BAF5 for ; Thu, 20 Apr 2023 19:55:04 +0300 (EEST) Received: by mail-yb1-f171.google.com with SMTP id 3f1490d57ef6-b922f770841so223701276.0 for ; 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=1682009702; x=1684601702; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=MxHJvNN0sJqaBv4KQXsJIVJh5E94SYwVpl4U339RtOU=; b=jf1CAmAx3N67a9Ksl74cKAnwhflqNYrondhtBQIvsINt15ZjAlXazfscwENO10Mr58 WR21eaDNHDQUVblviEIoDTNnyx5U4henmspmceaIH7mTlFQdmOJo3UyjjxHNGQzmELlI w+amNi1ONeZdOOYcD239hywLLyeqJGEJbi5Vlm43FZlY4CiVtbdPjWi0Qct/7eXHs90P MBCjIskY8eJDXXL8L39CwHYkrpLI83FwnhP33YUXjRrzGdG2H3BnHflI2v2AO5KjNgKF xjTxBRMW9Zf4WuheMiS4ON63dp9rpv/4nvNHaQ5dnbx5puHwR7T97gAaMv6vvcYjSHGu Wwug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682009702; x=1684601702; 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=MxHJvNN0sJqaBv4KQXsJIVJh5E94SYwVpl4U339RtOU=; b=Zk7WUkWyopnbBHpXTN4U2CyEzVMfPzvs2Yt1ByUaIX+z8OrDwl9transrceONXAoP/ khy/MMyPHbf0LUVP/PhiRKxMRa+RhonqUiCXGeHrUdhlSaHzhcj5807O/UW+VJQQ/ycm M1H7h3ZdDpPHWROzwXO8mQPRWV8hgZd9ZjfaX/RiIoVcipBCTKW6BCby8RVnw9pYVH8Q ZMEIFs0k+cayTjuQT2UDc/sJVyCcQSx45PhfKQw2RfC4dpYEDPLs2G8YhgOgUrK632vK zTk84Jed1PxrFXhEE3SLDrQ7EbsOgB/CEuYGJ4NBgAwOsEszIMrTSATOwMG4azP+lizX fQHg== X-Gm-Message-State: AAQBX9d9s0rWy67ysrqeR+AwJqsVw2KNntY5iS5N2JogkjqA18dESRSx W8eBG9vO+maYMB0m9eb6OtqS9q4XDYE= X-Received: by 2002:a81:1ece:0:b0:544:a86e:db72 with SMTP id e197-20020a811ece000000b00544a86edb72mr1324780ywe.4.1682009702589; Thu, 20 Apr 2023 09:55:02 -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.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Apr 2023 09:55:02 -0700 (PDT) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Thu, 20 Apr 2023 12:54:58 -0400 Message-Id: <20230420165500.49516-1-leo.izen@gmail.com> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 0/2] RGB mjpeg fixes 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: G9s7d92j6jEf Changes from v3: - Wrapped two previous commits into one. - Removed case logic with regard to s->progressive and !s->progressive, now all should be treated the same way, at michaelni's recommendation. - All RGB jpegs are now decoded in RGB order and then the buffers are pivoted into GBR-order at the end, so no extensive documentation is needed on which buffers are in which order at what times with what pixel formats. Current version passes samples in the provided fate tests as well as those in #10190, and #4045, #1651, and #850. Leo Izen (2): avcodec/mjpegdec: fix remaining RGB JPEGs fate: add tests for RGB jpegs libavcodec/mjpegdec.c | 9 +++------ tests/fate/image.mak | 9 +++++++++ tests/ref/fate/jpg-rgb-221 | 6 ++++++ tests/ref/fate/jpg-rgb-baseline | 6 ++++++ tests/ref/fate/jpg-rgb-progressive | 6 ++++++ 5 files changed, 30 insertions(+), 6 deletions(-) create mode 100644 tests/ref/fate/jpg-rgb-221 create mode 100644 tests/ref/fate/jpg-rgb-baseline create mode 100644 tests/ref/fate/jpg-rgb-progressive