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 25AA74456B for ; Wed, 18 Jan 2023 14:24:17 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9A38168B37A; Wed, 18 Jan 2023 16:24:15 +0200 (EET) 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-Google-Smtp-Source: AMrXdXtE3rpA4bg+wSro/AWs1oZyF44ltf3JVf6V2xSFxV/gAAPeRDjX3/JUDpXjiLa6BZU7/1CQtw== 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 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: 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); -- 2.39.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".