[FFmpeg-devel] [PATCH] avcodec/libjxlenc: avoid hard failure with unspecified primaries

[FFmpeg-devel] [PATCH] avcodec/libjxlenc: avoid hard failure with unspecified primaries

[Leo Izen]

This patch prevents the libjxl encoder wrapper from failing to
encode images when the input video has untagged primaries. It will
instead assume BT.709/sRGB primaries and print a warning.

Signed-off-by: Leo Izen <leo.izen@gmail.com>
---
 libavcodec/libjxlenc.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/libavcodec/libjxlenc.c b/libavcodec/libjxlenc.c
index 6a948cc3ae..d6d25fe970 100644
--- a/libavcodec/libjxlenc.c
+++ b/libavcodec/libjxlenc.c
@@ -343,8 +343,11 @@ static int libjxl_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const AVFra
     ret = libjxl_populate_primaries(&jxl_color,
             frame->color_primaries && frame->color_primaries != AVCOL_PRI_UNSPECIFIED
             ? frame->color_primaries : avctx->color_primaries);
-    if (ret < 0)
-        return ret;
+    if (ret < 0) {
+        av_log(avctx, AV_LOG_WARNING, "Unknown primaries, assuming BT.709/sRGB. Colors may be wrong.\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)
-- 
2.37.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".

Re: [FFmpeg-devel] [PATCH] avcodec/libjxlenc: avoid hard failure with unspecified primaries

[Leo Izen]

On 7/7/22 14:32, Leo Izen wrote:
> This patch prevents the libjxl encoder wrapper from failing to
> encode images when the input video has untagged primaries. It will
> instead assume BT.709/sRGB primaries and print a warning.
> 
> Signed-off-by: Leo Izen <leo.izen@gmail.com>
> ---
>   libavcodec/libjxlenc.c | 7 +++++--
>   1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/libavcodec/libjxlenc.c b/libavcodec/libjxlenc.c
> index 6a948cc3ae..d6d25fe970 100644
> --- a/libavcodec/libjxlenc.c
> +++ b/libavcodec/libjxlenc.c
> @@ -343,8 +343,11 @@ static int libjxl_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const AVFra
>       ret = libjxl_populate_primaries(&jxl_color,
>               frame->color_primaries && frame->color_primaries != AVCOL_PRI_UNSPECIFIED
>               ? frame->color_primaries : avctx->color_primaries);
> -    if (ret < 0)
> -        return ret;
> +    if (ret < 0) {
> +        av_log(avctx, AV_LOG_WARNING, "Unknown primaries, assuming BT.709/sRGB. Colors may be wrong.\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)

Bumping for review.

- Leo Izen (thebombzen)
_______________________________________________
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".