From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
by master.gitmailbox.com (Postfix) with ESMTP id A9A3B4087E
for <ffmpegdev@gitmailbox.com>; Thu, 2 Jun 2022 02:14:34 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4B7D668B7DA;
Thu, 2 Jun 2022 05:14:23 +0300 (EEST)
Received: from mail-qk1-f177.google.com (mail-qk1-f177.google.com
[209.85.222.177])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 99CA368B64C
for <ffmpeg-devel@ffmpeg.org>; Thu, 2 Jun 2022 05:14:16 +0300 (EEST)
Received: by mail-qk1-f177.google.com with SMTP id o68so2740508qkf.13
for <ffmpeg-devel@ffmpeg.org>; Wed, 01 Jun 2022 19:14:16 -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:in-reply-to:references
:mime-version:content-transfer-encoding;
bh=buvwL8o3Q3elqV+k+FL8VLUeQeVejrthw4VEIAYPlGA=;
b=pmLlN/xZX/ZwG9lX/BjWjrCU3/Z0EhLj1I1dSczrnbQihyA3mBPJp37U31yvQyIeq0
R+SnlA7/PyIguJ+tX7QpemiTrn9nSakQ8gEzcqtnDBDjpBgE7ks2iJjY9uWwY+O0SbAH
HbLNXXMeyP6UaLyAtjFCjG14DVfZI1JfPfzLr4VjPECGloyRBM5Vh7EtWgd6sRfA+p6R
s4OTJur3/bL7upQBNBTXNGs0wg2OFy2sIQlvcT9WJ7cI1ZT22AKzoS+T5JtZqMWWiZCS
xPrwA+aEt7p+mDz+Q6B6V7Kq3ocJsCGlVc3KhLAA5rjDnT9ikpmAID3pWb97JRv9KNC1
tw6g==
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:in-reply-to
:references:mime-version:content-transfer-encoding;
bh=buvwL8o3Q3elqV+k+FL8VLUeQeVejrthw4VEIAYPlGA=;
b=XibW+Zsfwt0bEirno5g5fMzOxiuC7Ws26KTP939HNJDpZSzCYu0z3UU07HSG4ZDzEi
RweZ+DnUQ5XiMOaxABwUZjMTHt6nii8eGEDS5ds8UEI30wgX1ORm8r3NzMiL9sBtT6Ho
Xqp+VIFgkwbpO/lJZVHS6q3NF/4RSkSHDT5d116aB/ZX08gq/o+KivBLEPbFBzXK6DJF
ka1tG/przDtpRJ8iRiTxf+CKK27m6OT2NEhrIXuaj3076WAOXvhJ5W7p2W5Lg879FyUH
/KTB4Z6+I0YlriHnpTHrLpLrO53vMpmh7/DVfpb7J4cznxMklzUkal7nsYg9sJChHQnY
it7g==
X-Gm-Message-State: AOAM530NGlT8UnQDHhUXCUGc7ULY69RhuDK2gC+o/lIIvppsTA+z4Tw0
qhEqH0FtqDMnAB1MvrcKqCyUe8js3aBDLg==
X-Google-Smtp-Source: ABdhPJwa3fMpWX3uHk1YVLXiSRPqV9X9r/KShe1ZtYlTs48cdj39NlswfETQBcyjT5VPWjfm1lSl3Q==
X-Received: by 2002:a05:620a:4402:b0:6a6:7220:8a0d with SMTP id
v2-20020a05620a440200b006a672208a0dmr1758144qkp.265.1654136054645;
Wed, 01 Jun 2022 19:14:14 -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
ey19-20020a05622a4c1300b002f39b99f69esm2093738qtb.56.2022.06.01.19.14.14
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Wed, 01 Jun 2022 19:14:14 -0700 (PDT)
From: Leo Izen <leo.izen@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Date: Wed, 1 Jun 2022 22:14:11 -0400
Message-Id: <20220602021412.58306-2-leo.izen@gmail.com>
X-Mailer: git-send-email 2.36.1
In-Reply-To: <20220602021412.58306-1-leo.izen@gmail.com>
References: <20220602021412.58306-1-leo.izen@gmail.com>
MIME-Version: 1.0
Subject: [FFmpeg-devel] [PATCH v8 1/2] avcodec/libjxldec: properly tag
output colorspace
X-BeenThere: ffmpeg-devel@ffmpeg.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Cc: Leo Izen <leo.izen@gmail.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/20220602021412.58306-2-leo.izen@gmail.com/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
Whether an ICC profile is present or not, the decoder
should now properly tag the colorspace of pixel data
received by the decoder.
---
libavcodec/libjxldec.c | 142 ++++++++++++++++++++++++++++++++++++++---
1 file changed, 133 insertions(+), 9 deletions(-)
diff --git a/libavcodec/libjxldec.c b/libavcodec/libjxldec.c
index cd4bca3343..d2e0616124 100644
--- a/libavcodec/libjxldec.c
+++ b/libavcodec/libjxldec.c
@@ -27,6 +27,7 @@
#include "libavutil/avassert.h"
#include "libavutil/buffer.h"
#include "libavutil/common.h"
+#include "libavutil/csp.h"
#include "libavutil/error.h"
#include "libavutil/mem.h"
#include "libavutil/pixdesc.h"
@@ -92,7 +93,7 @@ static av_cold int libjxl_decode_init(AVCodecContext *avctx)
return libjxl_init_jxl_decoder(avctx);
}
-static enum AVPixelFormat libjxl_get_pix_fmt(AVCodecContext *avctx, JxlBasicInfo *basic_info, JxlPixelFormat *format)
+static enum AVPixelFormat libjxl_get_pix_fmt(void *avctx, const JxlBasicInfo *basic_info, JxlPixelFormat *format)
{
format->endianness = JXL_NATIVE_ENDIAN;
format->num_channels = basic_info->num_color_channels + (basic_info->alpha_bits > 0);
@@ -129,12 +130,71 @@ static enum AVPixelFormat libjxl_get_pix_fmt(AVCodecContext *avctx, JxlBasicInfo
return AV_PIX_FMT_NONE;
}
+static enum AVColorPrimaries libjxl_get_primaries(void *avctx, const JxlColorEncoding *jxl_color)
+{
+ AVColorPrimariesDesc desc;
+ enum AVColorPrimaries prim;
+
+ /* libjxl populates these double values even if it uses an enum space */
+ desc.prim.r.x = av_d2q(jxl_color->primaries_red_xy[0], 300000);
+ desc.prim.r.y = av_d2q(jxl_color->primaries_red_xy[1], 300000);
+ desc.prim.g.x = av_d2q(jxl_color->primaries_green_xy[0], 300000);
+ desc.prim.g.y = av_d2q(jxl_color->primaries_green_xy[1], 300000);
+ desc.prim.b.x = av_d2q(jxl_color->primaries_blue_xy[0], 300000);
+ desc.prim.b.y = av_d2q(jxl_color->primaries_blue_xy[1], 300000);
+ desc.wp.x = av_d2q(jxl_color->white_point_xy[0], 300000);
+ desc.wp.y = av_d2q(jxl_color->white_point_xy[1], 300000);
+
+ prim = av_csp_primaries_id_from_desc(&desc);
+ if (prim == AVCOL_PRI_UNSPECIFIED) {
+ /* try D65 with the same primaries */
+ /* BT.709 uses D65 white point */
+ const AVWhitepointCoefficients *d65 = &av_csp_primaries_desc_from_id(AVCOL_PRI_BT709)->wp;
+ desc.wp = *d65;
+ av_log(avctx, AV_LOG_WARNING, "Changing unknown white point to D65\n");
+ prim = av_csp_primaries_id_from_desc(&desc);
+ }
+
+ return prim;
+}
+
+static enum AVColorTransferCharacteristic libjxl_get_trc(void *avctx, const JxlColorEncoding *jxl_color)
+{
+ switch (jxl_color->transfer_function) {
+ case JXL_TRANSFER_FUNCTION_709:
+ return AVCOL_TRC_BT709;
+ case JXL_TRANSFER_FUNCTION_LINEAR:
+ return AVCOL_TRC_LINEAR;
+ case JXL_TRANSFER_FUNCTION_SRGB:
+ return AVCOL_TRC_IEC61966_2_1;
+ case JXL_TRANSFER_FUNCTION_PQ:
+ return AVCOL_TRC_SMPTE2084;
+ 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)
+ return AVCOL_TRC_GAMMA22;
+ else if (jxl_color->gamma > 2.799 && jxl_color->gamma < 2.801)
+ return AVCOL_TRC_GAMMA28;
+ else
+ av_log(avctx, AV_LOG_WARNING, "Unsupported gamma transfer: %f\n", jxl_color->gamma);
+ break;
+ default:
+ av_log(avctx, AV_LOG_WARNING, "Unknown transfer function: %d\n", jxl_color->transfer_function);
+ }
+
+ return AVCOL_TRC_UNSPECIFIED;
+}
+
static int libjxl_decode_frame(AVCodecContext *avctx, AVFrame *frame, int *got_frame, AVPacket *avpkt)
{
LibJxlDecodeContext *ctx = avctx->priv_data;
uint8_t *buf = avpkt->data;
size_t remaining = avpkt->size, iccp_len;
JxlDecoderStatus jret;
+ JxlColorEncoding jxl_color;
int ret;
*got_frame = 0;
@@ -189,16 +249,80 @@ static int libjxl_decode_frame(AVCodecContext *avctx, AVFrame *frame, int *got_f
continue;
case JXL_DEC_COLOR_ENCODING:
av_log(avctx, AV_LOG_DEBUG, "COLOR_ENCODING event emitted\n");
- jret = JxlDecoderGetICCProfileSize(ctx->decoder, &ctx->jxl_pixfmt, JXL_COLOR_PROFILE_TARGET_ORIGINAL, &iccp_len);
- if (jret == JXL_DEC_SUCCESS && iccp_len > 0) {
- av_buffer_unref(&ctx->iccp);
- ctx->iccp = av_buffer_alloc(iccp_len);
- if (!ctx->iccp)
- return AVERROR(ENOMEM);
- jret = JxlDecoderGetColorAsICCProfile(ctx->decoder, &ctx->jxl_pixfmt, JXL_COLOR_PROFILE_TARGET_ORIGINAL, ctx->iccp->data, iccp_len);
+ jret = JxlDecoderGetColorAsEncodedProfile(ctx->decoder, NULL, JXL_COLOR_PROFILE_TARGET_ORIGINAL, &jxl_color);
+ if (jret == JXL_DEC_SUCCESS) {
+ /* enum values describe the colors of this image */
+ jret = JxlDecoderSetPreferredColorProfile(ctx->decoder, &jxl_color);
+ if (jret == JXL_DEC_SUCCESS)
+ jret = JxlDecoderGetColorAsEncodedProfile(ctx->decoder, &ctx->jxl_pixfmt, JXL_COLOR_PROFILE_TARGET_DATA, &jxl_color);
+ } else {
+ /* an ICC Profile is present in the stream */
+ if (ctx->basic_info.uses_original_profile) {
+ av_log(avctx, AV_LOG_VERBOSE, "Using embedded ICC Profile\n");
+ /* an ICC profile is present, and we can meaningfully get it,
+ * because the pixel data is not XYB-encoded */
+ jret = JxlDecoderGetICCProfileSize(ctx->decoder, &ctx->jxl_pixfmt, JXL_COLOR_PROFILE_TARGET_DATA, &iccp_len);
+ if (jret == JXL_DEC_SUCCESS && iccp_len > 0) {
+ av_buffer_unref(&ctx->iccp);
+ ctx->iccp = av_buffer_alloc(iccp_len);
+ if (!ctx->iccp)
+ return AVERROR(ENOMEM);
+ jret = JxlDecoderGetColorAsICCProfile(ctx->decoder, &ctx->jxl_pixfmt, JXL_COLOR_PROFILE_TARGET_DATA, ctx->iccp->data, iccp_len);
+ if (jret != JXL_DEC_SUCCESS) {
+ av_log(avctx, AV_LOG_WARNING, "Unable to obtain ICCP from header\n");
+ av_buffer_unref(&ctx->iccp);
+ }
+ }
+ }
+ /* when libjxl adds JxlDecoderSetICCProfile() properly handle the XYB case as well */
+ }
+
+ avctx->color_range = frame->color_range = AVCOL_RANGE_JPEG;
+ if (ctx->jxl_pixfmt.num_channels >= 3)
+ avctx->colorspace = AVCOL_SPC_RGB;
+ avctx->color_primaries = AVCOL_PRI_UNSPECIFIED;
+ avctx->color_trc = AVCOL_TRC_UNSPECIFIED;
+
+ if (!ctx->iccp) {
+ /* checking enum values */
+ if (jret == JXL_DEC_SUCCESS) {
+ if (avctx->colorspace == AVCOL_SPC_RGB)
+ avctx->color_primaries = libjxl_get_primaries(avctx, &jxl_color);
+ avctx->color_trc = libjxl_get_trc(avctx, &jxl_color);
+ }
+ /* fall back on wide gamut if enum values fail */
+ if (avctx->color_primaries == AVCOL_PRI_UNSPECIFIED) {
+ if (avctx->colorspace == AVCOL_SPC_RGB) {
+ av_log(avctx, AV_LOG_WARNING, "Falling back on wide gamut output\n");
+ jxl_color.primaries = JXL_PRIMARIES_2100;
+ avctx->color_primaries = AVCOL_PRI_BT2020;
+ }
+ /* libjxl requires this set even for grayscale */
+ jxl_color.white_point = JXL_WHITE_POINT_D65;
+ }
+ if (avctx->color_trc == AVCOL_TRC_UNSPECIFIED) {
+ if (ctx->jxl_pixfmt.data_type == JXL_TYPE_FLOAT
+ || ctx->jxl_pixfmt.data_type == JXL_TYPE_FLOAT16) {
+ av_log(avctx, AV_LOG_WARNING, "Falling back on Linear Light transfer\n");
+ jxl_color.transfer_function = JXL_TRANSFER_FUNCTION_LINEAR;
+ avctx->color_trc = AVCOL_TRC_LINEAR;
+ } else {
+ av_log(avctx, AV_LOG_WARNING, "Falling back on iec61966-2-1/sRGB transfer\n");
+ jxl_color.transfer_function = JXL_TRANSFER_FUNCTION_SRGB;
+ avctx->color_trc = AVCOL_TRC_IEC61966_2_1;
+ }
+ }
+ /* all colors will be in-gamut so we want accurate colors */
+ jxl_color.rendering_intent = JXL_RENDERING_INTENT_RELATIVE;
+ jxl_color.color_space = avctx->colorspace == AVCOL_SPC_RGB ? JXL_COLOR_SPACE_RGB : JXL_COLOR_SPACE_GRAY;
+ jret = JxlDecoderSetPreferredColorProfile(ctx->decoder, &jxl_color);
if (jret != JXL_DEC_SUCCESS)
- av_buffer_unref(&ctx->iccp);
+ av_log(avctx, AV_LOG_WARNING, "Unable to set fallback color encoding\n");
}
+
+ frame->color_trc = avctx->color_trc;
+ frame->color_primaries = avctx->color_primaries;
+ frame->colorspace = avctx->colorspace;
continue;
case JXL_DEC_NEED_IMAGE_OUT_BUFFER:
av_log(avctx, AV_LOG_DEBUG, "NEED_IMAGE_OUT_BUFFER event emitted\n");
--
2.36.1
_______________________________________________
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".