From patchwork Wed Jan 18 14:24:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Izen X-Patchwork-Id: 40074 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3ca3:b0:b9:1511:ac2c with SMTP id b35csp134564pzj; Wed, 18 Jan 2023 06:24:20 -0800 (PST) X-Google-Smtp-Source: AMrXdXsw+gVwMdJtfkvDrtwuQXYo/XtNXMj3ZnLc/IT0gIB+d4XO4sli/BQ+iR+SWZT0AtQS2+C9 X-Received: by 2002:a17:906:60d:b0:83d:61f8:3c with SMTP id s13-20020a170906060d00b0083d61f8003cmr4043793ejb.3.1674051860393; Wed, 18 Jan 2023 06:24:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674051860; cv=none; d=google.com; s=arc-20160816; b=O98LzPdc5q1i8dkacBqyKFdKnM9UP73UUuA4gvMtuw5MnyrKj2o4RALAO4IZVNztnq hix6wxFrsLjqr+2/kNozegKyNwPhrU2jrM7+MMqA45NsunB/aEeNOfJcLihwi014oyW4 K1Cqo4f8l8ENh0H2tlR8+5WCDQpfU9tp23jN+QTHE4h83yMijmwtvHwai1dnN5cwLe+E AJpLwgYmG4HBh6tIG7SccNoy8UJj9+iA+W/KfoSLlwLqiX1sBZI+1JGxGPMZUa9aNV6S fO7Dr2UeaatXjsXA2Qmqgid2s3DSlsfGZXvr63efGp3qVcKAkN/UHg16yRK4LK+Ashe6 81TQ== 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=WYYJLfJ9fhI8yWfEGlggpOYfhrzAxHu+11Ztu8zwI/k=; b=K6Q7mVG5N+c46zHqESt8pecr1lmiGnZIUR39/nM/aC/1b6kDQyooMxNertdEbvIB0l BACBDcD7pwK88T0/n2frOAKVIE/7LegxR3hjPOeXHyzykXtIrlcPety5xL3bItnZJgLF Ri098/JhRNTMpX8Nc2+RRpbijNxtOuAp8665jradrWQCP3uGP/SsQNvQXraWZfyuZcgG bwj8Mpivj1yJSyFwSMQeyne6UgHoWSnRgmmVzo5dU6RXcnT6oziQV81z1ev14Wmj6Q0y G0XQ3tyP/6+/0xwfXWpaWdBDjqXIZ4GC4wMBKdTJuYcjAGLxopqPhGYXCKPoA5VaKw/9 8bxA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=CyIzsCKY; 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 sh35-20020a1709076ea300b00871ca43905bsi8408159ejc.938.2023.01.18.06.24.18; Wed, 18 Jan 2023 06:24:20 -0800 (PST) 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=CyIzsCKY; 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 CA20968B3A1; Wed, 18 Jan 2023 16:24:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f46.google.com (mail-io1-f46.google.com [209.85.166.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9897B680118 for ; Wed, 18 Jan 2023 16:24:09 +0200 (EET) Received: by mail-io1-f46.google.com with SMTP id y69so1959826iof.3 for ; Wed, 18 Jan 2023 06:24:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=iytbTrLiUHajRUlcEN4NhSRUBgj/jKcpimV+HjPU/f0=; b=CyIzsCKYvfcqVGVgxv2cOULW9R3h6Lq5hMjKXLf0ThUvRz8wven2I+fysk2uepcYgN YfpDtwEeH2M3AL883SpIEQRtryT2qUYcxqtPmJTNadGJtARLpWhb3lCC5+oK4y+03iV7 kzswks42tBXaCjxL7V73bgA+C9BrJr7G1LtbdZhWGgocf4HVV7VkbOW3QINGQ6/ceilx PVrB++/A4acWbh9gtlL5FyE+5jBMUqyaYFtjArpBDP2G+P5p7NXfYrlSDC5dQfrEyCVa uG5lKbuPifcVBtxNK4qo9WNjExUWviclpZw9mr0noL5GZFYrxkfWMcNSuBxiakWvFb5/ QWrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=iytbTrLiUHajRUlcEN4NhSRUBgj/jKcpimV+HjPU/f0=; b=he02jbO4LL3RwjIY+Tdz6STMufRGOHDmohSzH2u6LmcU3Ll24J+E+vXXUQ6DBlDLWH 9DvYPAEjvqhZNOjoxzHzlWi3u4ye9WIKl79MLme2GI4LuvHemr4vUD4yjpyiw5B49Pij DfwHd+F8FnctB1lOI51FlIgWfpfXAZv48gdNsFpmVRBk8mZat6HEXKZmTzVmKcTtOmi8 3wFZknZYsPmKDX18JtIMkY0Kl8BSp4UlnSz7D77gawdRfd2D4/NGOWL7woGumHoxEKjx dcET/nFabLC/vIqZFAgsm95y67rPH4qtkoxb1668SreYqPwUP4smboFc4S/dQdOKfLYv 0DXQ== X-Gm-Message-State: AFqh2kp1a4SMk9y7fsySUPfnz1ovfgHz5qbGq5pdUgscVzW0rymckPRR hYfefHo+i4HLANkg7HU96dAWNtjI9us= X-Received: by 2002:a5d:9045:0:b0:704:cf7f:27f6 with SMTP id v5-20020a5d9045000000b00704cf7f27f6mr4526195ioq.17.1674051848003; Wed, 18 Jan 2023 06:24:08 -0800 (PST) Received: from gauss.local (c-68-41-54-207.hsd1.mi.comcast.net. [68.41.54.207]) by smtp.gmail.com with ESMTPSA id w1-20020a02cf81000000b003a4aa2dd3e6sm2961361jar.87.2023.01.18.06.24.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Jan 2023 06:24:07 -0800 (PST) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Wed, 18 Jan 2023 09:24:05 -0500 Message-Id: <20230118142405.23568-1-leo.izen@gmail.com> X-Mailer: git-send-email 2.39.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/libjxldec: fix gamma22 and gamma28 recognization 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: avoB0lr2IeZf Gamma 2.2 and Gamma 2.8 are tagged in the file as 0.45455 and 0.35714, respectively (i.e. 1/2.2 and 1/2.8). Trying to identify them as 2.2 and 2.8 instead of these values will cause the transfer function to not properly be recognized. This patch fixes this. --- libavcodec/libjxldec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/libjxldec.c b/libavcodec/libjxldec.c index 55c7366f61..0009af9615 100644 --- a/libavcodec/libjxldec.c +++ b/libavcodec/libjxldec.c @@ -167,9 +167,9 @@ static enum AVColorTransferCharacteristic libjxl_get_trc(void *avctx, const JxlC case JXL_TRANSFER_FUNCTION_DCI: return AVCOL_TRC_SMPTE428; case JXL_TRANSFER_FUNCTION_HLG: return AVCOL_TRC_ARIB_STD_B67; case JXL_TRANSFER_FUNCTION_GAMMA: - if (jxl_color->gamma > 2.199 && jxl_color->gamma < 2.201) + if (jxl_color->gamma > 0.45355 && jxl_color->gamma < 0.45555) return AVCOL_TRC_GAMMA22; - else if (jxl_color->gamma > 2.799 && jxl_color->gamma < 2.801) + else if (jxl_color->gamma > 0.35614 && jxl_color->gamma < 0.35814) return AVCOL_TRC_GAMMA28; else av_log(avctx, AV_LOG_WARNING, "Unsupported gamma transfer: %f\n", jxl_color->gamma);