[FFmpeg-devel] [PATCH] Adapted to the latest JPEG XL library version 0.9.0

[Peter Kovář]

Signed-off-by: Peter Kovář <peter.kovar at reflexion.tv>
---
  libavcodec/libjxldec.c | 17 +++++++++++++++++
  1 file changed, 17 insertions(+)

diff --git a/libavcodec/libjxldec.c b/libavcodec/libjxldec.c
index 50417bcb02..bfff60769c 100644
--- a/libavcodec/libjxldec.c
+++ b/libavcodec/libjxldec.c
@@ -210,14 +210,23 @@ static int libjxl_get_icc(AVCodecContext *avctx)
      JxlDecoderStatus jret;
      /* an ICC profile is present, and we can meaningfully get it,
       * because the pixel data is not XYB-encoded */
+#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0, 9, 0)
      jret = JxlDecoderGetICCProfileSize(ctx->decoder, &ctx->jxl_pixfmt, 
JXL_COLOR_PROFILE_TARGET_DATA, &icc_len);
+#else
+    jret = JxlDecoderGetICCProfileSize(ctx->decoder, 
JXL_COLOR_PROFILE_TARGET_DATA, &icc_len);
+#endif
      if (jret == JXL_DEC_SUCCESS && icc_len > 0) {
          av_buffer_unref(&ctx->iccp);
          ctx->iccp = av_buffer_alloc(icc_len);
          if (!ctx->iccp)
              return AVERROR(ENOMEM);
+#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0, 9, 0)
          jret = JxlDecoderGetColorAsICCProfile(ctx->decoder, 
&ctx->jxl_pixfmt, JXL_COLOR_PROFILE_TARGET_DATA,
                                                  ctx->iccp->data, icc_len);
+#else
+        jret = JxlDecoderGetColorAsICCProfile(ctx->decoder, 
JXL_COLOR_PROFILE_TARGET_DATA,
+                                                ctx->iccp->data, icc_len);
+#endif
          if (jret != JXL_DEC_SUCCESS) {
              av_log(avctx, AV_LOG_WARNING, "Unable to obtain ICC 
Profile\n");
              av_buffer_unref(&ctx->iccp);
@@ -253,12 +262,20 @@ static int 
libjxl_color_encoding_event(AVCodecContext *avctx, AVFrame *frame)
      /* set this flag if we need to fall back on wide gamut */
      int fallback = 0;
  +#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0, 9, 0)
      jret = JxlDecoderGetColorAsEncodedProfile(ctx->decoder, NULL, 
JXL_COLOR_PROFILE_TARGET_ORIGINAL, &jxl_color);
+#else
+    jret = JxlDecoderGetColorAsEncodedProfile(ctx->decoder, 
JXL_COLOR_PROFILE_TARGET_ORIGINAL, &jxl_color);
+#endif
      if (jret == JXL_DEC_SUCCESS) {
          /* enum values describe the colors of this image */
          jret = JxlDecoderSetPreferredColorProfile(ctx->decoder, 
&jxl_color);
          if (jret == JXL_DEC_SUCCESS)
+#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0, 9, 0)
              jret = JxlDecoderGetColorAsEncodedProfile(ctx->decoder, 
&ctx->jxl_pixfmt, JXL_COLOR_PROFILE_TARGET_DATA, &jxl_color);
+#else
+            jret = JxlDecoderGetColorAsEncodedProfile(ctx->decoder, 
JXL_COLOR_PROFILE_TARGET_DATA, &jxl_color);
+#endif
          /* if we couldn't successfully request the pixel data space, 
we fall back on wide gamut */
          /* this code path is very unlikely to happen in practice */
          if (jret != JXL_DEC_SUCCESS)
-- 
2.41.0

-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_0x60C29844F4628AE1.asc
Type: application/pgp-keys
Size: 644 bytes
Desc: OpenPGP public key
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20230701/ae152820/attachment.key>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_signature
Type: application/pgp-signature
Size: 236 bytes
Desc: OpenPGP digital signature
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20230701/ae152820/attachment.sig>