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

["Peter Kovář" <peter.kovar@reflexion.tv>]

[-- Attachment #1.1.1.1: Type: text/plain, Size: 2973 bytes --]

Signed-off-by: Peter Kovář <peter.kovar@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


[-- Attachment #1.1.1.2: OpenPGP public key --]
[-- Type: application/pgp-keys, Size: 657 bytes --]

[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 236 bytes --]

[-- Attachment #2: Type: text/plain, Size: 251 bytes --]

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