From patchwork Sun May 1 19:39:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Izen X-Patchwork-Id: 35533 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp1473774pzb; Sun, 1 May 2022 12:39:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzKYtJe3ac7FSzJmMv6JtJH6xCZG8YmZHBxVWg12i3W9lnrNp4bh2uJdHwYuKnmQm1p9zFu X-Received: by 2002:a17:906:2991:b0:6cc:fc18:f10c with SMTP id x17-20020a170906299100b006ccfc18f10cmr8370975eje.744.1651433965017; Sun, 01 May 2022 12:39:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651433965; cv=none; d=google.com; s=arc-20160816; b=e25QpyuStD6STIMyuDClMVyvqj/eryys2PeGYWaYsJesLQ8JzfH+YsEe2p73/UPjm1 a6pHxalxQ/azk6RJfVPq5kVRsAX3I+vIz7qPfe9NVrrQpOSlQyLg1FeoCbPWd62B0nw3 b+e0l41lR2+0OPlYmS0+qUB2231zsBlDE/zA4NDd82iJK+Bazp9lX+jPgwrgSFm8cIAF PAU5jhUt8mxCDkdw27R/UMXDIEmsCqHXSVPDL8lM+n9wtO4r6BXvmzbIi4zObCrIXfNR SIQ6Nx8XXnrcYaUR+MSiLwgzgGq7ypM71Atjr1cFP+DNSe2vGzIAAB98aCb4hxRA9uIY m/uw== 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=+pB6KqqjPpqhfwmQ79UBK0FXCrfnQ7x93EMaTqKLG0I=; b=p2OeoCfS1QnKyI/773bQJ7nV0n2prR8y9m4GzvUYdCz2A1PdLf/SrUjQizeJLVkvNd eFPy04qCJ+Se7K/zzrhTLBZQTSgrd44GE9BLn8XUx6y59QaWi60nIIWMjkpqVwbZaVaO ld0/qKkJfN0Xirdz0F0CHRR2NBeJkkIGajoAjPJdNO5Y6o0v91/eP1ElAOyo9KplV/dL bKsZnibQ7Fkw0uLRuG9i8MPsniHatiLt59+mGl8q1ZHaPhKTpDaX8BBUKMW6CNRN9G7e 2rNxih80tgfhyunO56aXC7ALaUlz4e8KByRPczO+/fDbGc1Ld89MEKhlHHj9qbpA9pZO vJzg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=iNE9Z8l8; 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 dp22-20020a170906c15600b006f35fd3ab4fsi12313986ejc.324.2022.05.01.12.39.22; Sun, 01 May 2022 12:39:25 -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=20210112 header.b=iNE9Z8l8; 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 11B0C68B2CD; Sun, 1 May 2022 22:39:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f179.google.com (mail-qk1-f179.google.com [209.85.222.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 98D3A68B240 for ; Sun, 1 May 2022 22:39:12 +0300 (EEST) Received: by mail-qk1-f179.google.com with SMTP id j6so10170824qkp.9 for ; Sun, 01 May 2022 12:39:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=/HI4WwFabpr2gEJ9Cogjt89UpJjWUTi42bkKYs1+omo=; b=iNE9Z8l8LylCkyMk8H0tBHj8hjEePEyw3Cf1jC3V2aonRQFpt4Nsw2sv6wwi9GX2jm GJ6rpnF/MOx8YpwQbRaq8wtm+LFLZCzMshc9D9JMU5X8uucQv2ZiugQlueYNICTMNdfM hrhnI+7A0w6KUPwmCZ9iqxIyWxmjhOQiva9lU9/pFepfhj3hwWO7wz8AG6kv9Sukd8bV 9kHUfFDiwW6n7/JFXO3JYJ3MbY7r7dd8pZtPyRizHKRxh9kMrAA52yHgprKgatm0KJAZ B12TsaD4aNiM9fWOzRjv/ofTzsyUjDXOXkmk5lsBcq3R3o7d75xTFJCsDYEVYV27rIve qO8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=/HI4WwFabpr2gEJ9Cogjt89UpJjWUTi42bkKYs1+omo=; b=PaVfXWopswgT9eqa41VE9/3iTUBEbL+fNAXLvW2K9VejIyo1ST9Tz7saojyK6pzzpY 7Jm0eg4h+5evFL16EipRLqJ+vFTsW9+7RomTaGDmj6285ArAv7WrvyjVPBjZY7T7PjRR na+77XsC6DWsvtSTOcd6yXJoGoZr/+671+0cQsbseSpzMkGUC+ImdFxOSUrk73XIvrWU k6DoyswqlRoM4RBwg7lx7Jfere8stoeRWhpwdUedsbXk0jhMkjw/YhRmENGBMGKZIlZ9 JNMGtVi05nTw+bFwnsXZVAL69JftrCpS9OvQEcGrlk9UmIV5HC2HiNvkRXDcxiukwA2b ZUXA== X-Gm-Message-State: AOAM532LXaDoZ5VNThhujfLtUfXPRyFucF6twKz1Fo5ZIAMKD2Np8ARO Tj1slFP0ts2lirftPQJ1OObClVXfPhg= X-Received: by 2002:a05:620a:2946:b0:69e:7d2d:1947 with SMTP id n6-20020a05620a294600b0069e7d2d1947mr6400455qkp.533.1651433950995; Sun, 01 May 2022 12:39:10 -0700 (PDT) Received: from gauss.local (c-68-41-54-207.hsd1.mi.comcast.net. [68.41.54.207]) by smtp.gmail.com with ESMTPSA id y21-20020ac87095000000b002f39b99f699sm2982612qto.51.2022.05.01.12.39.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 May 2022 12:39:10 -0700 (PDT) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Sun, 1 May 2022 15:39:07 -0400 Message-Id: <20220501193907.32430-1-leo.izen@gmail.com> X-Mailer: git-send-email 2.36.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/jpegxl_probe: fix incorrect cw_mask probing 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: pp03kWyX0ttz Fix incorrectly skipping over the upX_weights if the cw_mask is present and it is not a multiple of 4. --- libavformat/jpegxl_probe.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/libavformat/jpegxl_probe.c b/libavformat/jpegxl_probe.c index 9cd00da194..c03dc3bd1d 100644 --- a/libavformat/jpegxl_probe.c +++ b/libavformat/jpegxl_probe.c @@ -368,15 +368,19 @@ int ff_jpegxl_verify_codestream_header(const uint8_t *buf, int buflen) /* default transform */ if (!jxl_bits(1)) { + uint32_t cw_mask; + /* opsin inverse matrix */ if (xyb_encoded && !jxl_bits(1)) jxl_bits_skip(16 * 16); + /* cw_mask and default weights */ - if (jxl_bits(1)) + cw_mask = jxl_bits(3); + if (cw_mask & 1) jxl_bits_skip(16 * 15); - if (jxl_bits(1)) + if (cw_mask & 2) jxl_bits_skip(16 * 55); - if (jxl_bits(1)) + if (cw_mask & 4) jxl_bits_skip(16 * 210); }