[FFmpeg-devel] [PATCH v7 0/2] JPEG XL Colorspace Fixes

[FFmpeg-devel] [PATCH v7 0/2] JPEG XL Colorspace Fixes

[Leo Izen]

Changes:
v7:
changes requested by haasn:
- avoid attaching ICCP for now, with followup once lcms2 enters avutil
- make gamma transfer slightly more tolerant
others:
- refactor some conversions into separate functions for cleaner code
v6:
- some cosmetic changes
- check the AVFrame metadata if AVCodecContext's is missing
v5:
- fix attaching ICCP even if an enum can
  accurately describe the colorspace
v4:
- fix a typo. bluh
v3:
- some cosmetic changes
- properly handle P3 spaces
- properly handle PQ transfer
v2:
- avoid misusing AVMasteringDisplayMetadata
- ignore custom primaries in header (very rare without iccp)


Leo Izen (2):
  avcodec/libjxldec: properly tag output colorspace
  avcodec/libjxlenc: properly read input colorspace

 libavcodec/libjxldec.c | 128 +++++++++++++++++++++++++++++++++++------
 libavcodec/libjxlenc.c | 128 ++++++++++++++++++++++++++++++-----------
 2 files changed, 205 insertions(+), 51 deletions(-)

-- 
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".

[FFmpeg-devel] [PATCH v7 1/2] avcodec/libjxldec: properly tag output colorspace

[Leo Izen]

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 | 128 +++++++++++++++++++++++++++++++++++------
 1 file changed, 109 insertions(+), 19 deletions(-)

diff --git a/libavcodec/libjxldec.c b/libavcodec/libjxldec.c
index cd4bca3343..651ac56a36 100644
--- a/libavcodec/libjxldec.c
+++ b/libavcodec/libjxldec.c
@@ -47,7 +47,6 @@ typedef struct LibJxlDecodeContext {
     JxlBasicInfo basic_info;
     JxlPixelFormat jxl_pixfmt;
     JxlDecoderStatus events;
-    AVBufferRef *iccp;
 } LibJxlDecodeContext;
 
 static int libjxl_init_jxl_decoder(AVCodecContext *avctx)
@@ -129,12 +128,84 @@ static enum AVPixelFormat libjxl_get_pix_fmt(AVCodecContext *avctx, JxlBasicInfo
     return AV_PIX_FMT_NONE;
 }
 
+static enum AVColorPrimaries libjxl_get_primaries(void *avctx, JxlColorEncoding *encoding)
+{
+    if (encoding->white_point != JXL_WHITE_POINT_D65 &&
+        (encoding->primaries != JXL_PRIMARIES_P3 || encoding->white_point != JXL_WHITE_POINT_DCI)) {
+        av_log(avctx, AV_LOG_WARNING, "Unsupported JXL white point: %d\n", encoding->white_point);
+        return AVCOL_PRI_UNSPECIFIED;
+    }
+    switch (encoding->primaries) {
+    case JXL_PRIMARIES_SRGB:
+        /* BT709 and sRGB use the same primaries */
+        return AVCOL_PRI_BT709;
+    case JXL_PRIMARIES_2100:
+        /* BT2020 and BT2100 use the same primaries */
+        return AVCOL_PRI_BT2020;
+    case JXL_PRIMARIES_P3:
+        /* DCI P3 uses DCI, Display P3 uses D65 */
+        if (encoding->white_point == JXL_WHITE_POINT_DCI)
+            return AVCOL_PRI_SMPTE431;
+        return AVCOL_PRI_SMPTE432;
+    case JXL_PRIMARIES_CUSTOM:
+        av_log(avctx, AV_LOG_WARNING, "Custom primaries are unsupported\n");
+        return AVCOL_PRI_UNSPECIFIED;
+    }
+
+    av_log(avctx, AV_LOG_WARNING, "Unknown JXL color primaries: %d\n", encoding->primaries);
+
+    return AVCOL_PRI_UNSPECIFIED;
+}
+
+static enum AVColorTransferCharacteristic libjxl_get_trc(void *avctx, JxlColorEncoding *encoding)
+{
+    switch (encoding->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 (encoding->gamma > 2.199 && encoding->gamma < 2.201)
+            return AVCOL_TRC_GAMMA22;
+        if (encoding->gamma > 2.799 && encoding->gamma < 2.801)
+            return AVCOL_TRC_GAMMA28;
+        av_log(avctx, AV_LOG_WARNING, "Unsupported gamma transfer: %f\n", encoding->gamma);
+        return AVCOL_TRC_UNSPECIFIED;
+    }
+
+    av_log(avctx, AV_LOG_WARNING, "Unknown transfer function: %d\n", encoding->transfer_function);
+
+    return AVCOL_TRC_UNSPECIFIED;
+}
+
+static int libjxl_populate_encoding(AVCodecContext *avctx, JxlColorEncoding *encoding)
+{
+    if (avctx->colorspace == AVCOL_SPC_RGB)
+        avctx->color_primaries = libjxl_get_primaries(avctx, encoding);
+    avctx->color_trc = libjxl_get_trc(avctx, encoding);
+
+    if (avctx->color_trc == AVCOL_TRC_UNSPECIFIED ||
+        avctx->colorspace == AVCOL_SPC_RGB && avctx->color_primaries == AVCOL_PRI_UNSPECIFIED)
+        return -1;
+
+    return 0;
+}
+
 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;
+    size_t remaining = avpkt->size;
     JxlDecoderStatus jret;
+    JxlColorEncoding jxl_encoding;
     int ret;
     *got_frame = 0;
 
@@ -189,16 +260,43 @@ 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);
-                if (jret != JXL_DEC_SUCCESS)
-                    av_buffer_unref(&ctx->iccp);
+            avctx->color_range = frame->color_range = AVCOL_RANGE_JPEG;
+            if (ctx->jxl_pixfmt.num_channels >= 3)
+                avctx->colorspace = AVCOL_SPC_RGB;
+            else
+                avctx->colorspace = AVCOL_SPC_UNSPECIFIED;
+            jret = JxlDecoderGetColorAsEncodedProfile(ctx->decoder, NULL, JXL_COLOR_PROFILE_TARGET_ORIGINAL, &jxl_encoding);
+            if (jret == JXL_DEC_SUCCESS)
+                jret = JxlDecoderSetPreferredColorProfile(ctx->decoder, &jxl_encoding);
+            if (jret == JXL_DEC_SUCCESS)
+                jret = JxlDecoderGetColorAsEncodedProfile(ctx->decoder, &ctx->jxl_pixfmt, JXL_COLOR_PROFILE_TARGET_DATA, &jxl_encoding);
+            if (jret == JXL_DEC_SUCCESS)
+                ret = libjxl_populate_encoding(avctx, &jxl_encoding);
+            else
+                ret = -1;
+
+            /* fall back on HDR gamut if enum values fail */
+            if (ret < 0) {
+                av_log(avctx, AV_LOG_WARNING, "Falling back on HDR gamut\n");
+                jxl_encoding.rendering_intent = JXL_RENDERING_INTENT_RELATIVE;
+                jxl_encoding.white_point = JXL_WHITE_POINT_D65;
+                if  (avctx->colorspace == AVCOL_SPC_RGB)
+                    jxl_encoding.primaries = JXL_PRIMARIES_2100;
+                if (ctx->jxl_pixfmt.data_type == JXL_TYPE_FLOAT || ctx->jxl_pixfmt.data_type == JXL_TYPE_FLOAT16)
+                    jxl_encoding.transfer_function = JXL_TRANSFER_FUNCTION_LINEAR;
+                else
+                    jxl_encoding.transfer_function = JXL_TRANSFER_FUNCTION_SRGB;
+                /* this shouldn't fail, barring libjxl decoder bug */
+                jret = JxlDecoderSetPreferredColorProfile(ctx->decoder, &jxl_encoding);
+                if (jret == JXL_DEC_SUCCESS)
+                    ret = libjxl_populate_encoding(avctx, &jxl_encoding);
             }
+            if (ret < 0)
+                av_log(avctx, AV_LOG_WARNING, "Unable to set default colorspace values\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");
@@ -216,13 +314,6 @@ static int libjxl_decode_frame(AVCodecContext *avctx, AVFrame *frame, int *got_f
             av_log(avctx, AV_LOG_DEBUG, "FULL_IMAGE event emitted\n");
             frame->pict_type = AV_PICTURE_TYPE_I;
             frame->key_frame = 1;
-            if (ctx->iccp) {
-                AVFrameSideData *sd = av_frame_new_side_data_from_buf(frame, AV_FRAME_DATA_ICC_PROFILE, ctx->iccp);
-                if (!sd)
-                    return AVERROR(ENOMEM);
-                /* ownership is transfered, and it is not ref-ed */
-                ctx->iccp = NULL;
-            }
             *got_frame = 1;
             return avpkt->size - remaining;
         case JXL_DEC_SUCCESS:
@@ -260,7 +351,6 @@ static av_cold int libjxl_decode_close(AVCodecContext *avctx)
     if (ctx->decoder)
         JxlDecoderDestroy(ctx->decoder);
     ctx->decoder = NULL;
-    av_buffer_unref(&ctx->iccp);
 
     return 0;
 }
-- 
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".

[FFmpeg-devel] [PATCH v7 2/2] avcodec/libjxlenc: properly read input colorspace

[Leo Izen]

Whether an ICC profile is present or not, the libjxl
encoder wrapper should now properly read colorspace tags
and forward them to libjxl appropriately, rather than just
assume sRGB as before. It will also print warnings when
colorimetric assumptions are made about the input data.
---
 libavcodec/libjxlenc.c | 128 ++++++++++++++++++++++++++++++-----------
 1 file changed, 96 insertions(+), 32 deletions(-)

diff --git a/libavcodec/libjxlenc.c b/libavcodec/libjxlenc.c
index 8bebec6aeb..43bb7299c6 100644
--- a/libavcodec/libjxlenc.c
+++ b/libavcodec/libjxlenc.c
@@ -117,7 +117,7 @@ static int libjxl_init_jxl_encoder(AVCodecContext *avctx)
         return AVERROR_EXTERNAL;
     }
 
-    /* check for negative zero, our default */
+    /* check for negative, our default */
     if (ctx->distance < 0.0) {
         /* use ffmpeg.c -q option if passed */
         if (avctx->flags & AV_CODEC_FLAG_QSCALE)
@@ -133,7 +133,8 @@ static int libjxl_init_jxl_encoder(AVCodecContext *avctx)
      */
     if (ctx->distance > 0.0 && ctx->distance < 0.01)
         ctx->distance = 0.01;
-    if (JxlEncoderOptionsSetDistance(ctx->options, ctx->distance) != JXL_ENC_SUCCESS) {
+
+    if (JxlEncoderSetFrameDistance(ctx->options, ctx->distance) != JXL_ENC_SUCCESS) {
         av_log(avctx, AV_LOG_ERROR, "Failed to set distance: %f\n", ctx->distance);
         return AVERROR_EXTERNAL;
     }
@@ -219,57 +220,120 @@ static int libjxl_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const AVFra
     info.num_color_channels = jxl_fmt.num_channels - info.num_extra_channels;
     info.bits_per_sample = av_get_bits_per_pixel(pix_desc) / jxl_fmt.num_channels;
     info.alpha_bits = (info.num_extra_channels > 0) * info.bits_per_sample;
+
     if (pix_desc->flags & AV_PIX_FMT_FLAG_FLOAT) {
         info.exponent_bits_per_sample = info.bits_per_sample > 16 ? 8 : 5;
         info.alpha_exponent_bits = info.alpha_bits ? info.exponent_bits_per_sample : 0;
         jxl_fmt.data_type = info.bits_per_sample > 16 ? JXL_TYPE_FLOAT : JXL_TYPE_FLOAT16;
-        JxlColorEncodingSetToLinearSRGB(&jxl_color, info.num_color_channels == 1);
     } else {
         info.exponent_bits_per_sample = 0;
         info.alpha_exponent_bits = 0;
         jxl_fmt.data_type = info.bits_per_sample <= 8 ? JXL_TYPE_UINT8 : JXL_TYPE_UINT16;
-        JxlColorEncodingSetToSRGB(&jxl_color, info.num_color_channels == 1);
     }
 
-    if (info.bits_per_sample > 16
-        || info.xsize > (1 << 18) || info.ysize > (1 << 18)
-        || (info.xsize << 4) * (info.ysize << 4) > (1 << 20)) {
-        /*
-         * must upgrade codestream to level 10, from level 5
-         * the encoder will not do this automatically
-         */
-        if (JxlEncoderSetCodestreamLevel(ctx->encoder, 10) != JXL_ENC_SUCCESS) {
-            av_log(avctx, AV_LOG_ERROR, "Could not upgrade JXL Codestream level.\n");
-            return AVERROR_EXTERNAL;
-        }
-    }
+    /* JPEG XL format itself does not support partial range */
+    if (avctx->color_range == AVCOL_RANGE_MPEG)
+        av_log(avctx, AV_LOG_ERROR, "This encoder does not support partial(tv) range, colors will be wrong!\n");
+    else if (avctx->color_range != AVCOL_RANGE_JPEG)
+        av_log(avctx, AV_LOG_WARNING, "Unknown color range, assuming full\n");
 
-    /* bitexact lossless requires there to be no XYB transform */
+     /* bitexact lossless requires there to be no XYB transform */
     info.uses_original_profile = ctx->distance == 0.0;
 
-    sd = av_frame_get_side_data(frame, AV_FRAME_DATA_ICC_PROFILE);
-    if (sd && sd->size && JxlEncoderSetICCProfile(ctx->encoder, sd->data, sd->size) != JXL_ENC_SUCCESS) {
-        av_log(avctx, AV_LOG_WARNING, "Could not set ICC Profile\n");
-    } else if (info.uses_original_profile) {
-        /*
-        * the color encoding is not used if uses_original_profile is false
-        * this just works around a bug in libjxl 0.7.0 and lower
-        */
-        if (JxlEncoderSetColorEncoding(ctx->encoder, &jxl_color) != JXL_ENC_SUCCESS) {
-            av_log(avctx, AV_LOG_ERROR, "Failed to set JxlColorEncoding\n");
-            return AVERROR_EXTERNAL;
-        }
-    }
-
     if (JxlEncoderSetBasicInfo(ctx->encoder, &info) != JXL_ENC_SUCCESS) {
         av_log(avctx, AV_LOG_ERROR, "Failed to set JxlBasicInfo\n");
         return AVERROR_EXTERNAL;
     }
 
+    /* rendering intent doesn't matter here
+     * but libjxl will whine if we don't set it */
+    jxl_color.rendering_intent = JXL_RENDERING_INTENT_RELATIVE;
+
+    switch (avctx->color_trc) {
+    case AVCOL_TRC_BT709:
+        jxl_color.transfer_function = JXL_TRANSFER_FUNCTION_709;
+        break;
+    case AVCOL_TRC_LINEAR:
+        jxl_color.transfer_function = JXL_TRANSFER_FUNCTION_LINEAR;
+        break;
+    case AVCOL_TRC_IEC61966_2_1:
+        jxl_color.transfer_function = JXL_TRANSFER_FUNCTION_SRGB;
+        break;
+    case AVCOL_TRC_SMPTE428:
+        jxl_color.transfer_function = JXL_TRANSFER_FUNCTION_DCI;
+        break;
+    case AVCOL_TRC_SMPTE2084:
+        jxl_color.transfer_function = JXL_TRANSFER_FUNCTION_PQ;
+        break;
+    case AVCOL_TRC_ARIB_STD_B67:
+        jxl_color.transfer_function = JXL_TRANSFER_FUNCTION_HLG;
+        break;
+    case AVCOL_TRC_GAMMA22:
+        jxl_color.transfer_function = JXL_TRANSFER_FUNCTION_GAMMA;
+        jxl_color.gamma = 2.2;
+        break;
+    case AVCOL_TRC_GAMMA28:
+        jxl_color.transfer_function = JXL_TRANSFER_FUNCTION_GAMMA;
+        jxl_color.gamma = 2.8;
+        break;
+    default:
+        if (pix_desc->flags & AV_PIX_FMT_FLAG_FLOAT) {
+            av_log(avctx, AV_LOG_WARNING, "Unknown transfer function, assuming Linear Light\n");
+            jxl_color.transfer_function = JXL_TRANSFER_FUNCTION_LINEAR;
+        } else {
+            av_log(avctx, AV_LOG_WARNING, "Unknown transfer function, assuming IEC61966-2-1/sRGB\n");
+            jxl_color.transfer_function = JXL_TRANSFER_FUNCTION_SRGB;
+        }
+    }
+
+    /* This should be implied to be honest
+    * but a libjxl but makes it fail otherwise */
+    if (info.num_color_channels == 1)
+        jxl_color.color_space = JXL_COLOR_SPACE_GRAY;
+    else
+        jxl_color.color_space = JXL_COLOR_SPACE_RGB;
+
+    switch (avctx->color_primaries) {
+    case AVCOL_PRI_BT709:
+        jxl_color.primaries = JXL_PRIMARIES_SRGB;
+        jxl_color.white_point = JXL_WHITE_POINT_D65;
+        break;
+    case AVCOL_PRI_BT2020:
+        jxl_color.primaries = JXL_PRIMARIES_2100;
+        jxl_color.white_point = JXL_WHITE_POINT_D65;
+        break;
+    case AVCOL_PRI_SMPTE431:
+        jxl_color.primaries = JXL_PRIMARIES_P3;
+        jxl_color.primaries = JXL_WHITE_POINT_DCI;
+        break;
+    case AVCOL_PRI_SMPTE432:
+        jxl_color.primaries = JXL_PRIMARIES_P3;
+        jxl_color.primaries = JXL_WHITE_POINT_D65;
+        break;
+    default:
+        av_log(avctx, AV_LOG_WARNING, "Unknown color primaries, assuming BT.709/sRGB+D65\n");
+        jxl_color.primaries = JXL_PRIMARIES_SRGB;
+        jxl_color.white_point = JXL_WHITE_POINT_D65;
+    }
+
+    sd = av_frame_get_side_data(frame, AV_FRAME_DATA_ICC_PROFILE);
+    if (sd && sd->size && JxlEncoderSetICCProfile(ctx->encoder, sd->data, sd->size) != JXL_ENC_SUCCESS)
+        av_log(avctx, AV_LOG_WARNING, "Could not set ICC Profile\n");
+    if (JxlEncoderSetColorEncoding(ctx->encoder, &jxl_color) != JXL_ENC_SUCCESS)
+        av_log(avctx, AV_LOG_WARNING, "Failed to set JxlColorEncoding\n");
+
+    /* depending on basic info, level 10 might
+     * be required instead of level 5 */
+    if (JxlEncoderGetRequiredCodestreamLevel(ctx->encoder) > 5) {
+        if (JxlEncoderSetCodestreamLevel(ctx->encoder, 10) != JXL_ENC_SUCCESS)
+            av_log(avctx, AV_LOG_WARNING, "Could not increase codestream level\n");
+    }
+
     jxl_fmt.endianness = JXL_NATIVE_ENDIAN;
     jxl_fmt.align = frame->linesize[0];
 
-    if (JxlEncoderAddImageFrame(ctx->options, &jxl_fmt, frame->data[0], jxl_fmt.align * info.ysize) != JXL_ENC_SUCCESS) {
+    if (JxlEncoderAddImageFrame(ctx->options, &jxl_fmt, frame->data[0],
+            jxl_fmt.align * info.ysize) != JXL_ENC_SUCCESS) {
         av_log(avctx, AV_LOG_ERROR, "Failed to add Image Frame\n");
         return AVERROR_EXTERNAL;
     }
-- 
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".