ffmpeg | branch: master | Leo Izen <leo.i...@gmail.com> | Sun Feb 11 12:03:19 2024 -0500| [a356815a31921676900a9a51f35f9e0036419047] | committer: Leo Izen
avcodec/libjxlenc: add option to disable xyb encoding Add an AVOption to the libjxl encoder wrapper, which exposes the flag uses_original_profile in libjxl. For highly unusual ICC profiles where the target needs to stay in the original space, this can be useful. Signed-off-by: Leo Izen <leo.i...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a356815a31921676900a9a51f35f9e0036419047 --- libavcodec/libjxlenc.c | 5 ++++- libavcodec/version.h | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libavcodec/libjxlenc.c b/libavcodec/libjxlenc.c index 5f5f9751dc..3f2c74097d 100644 --- a/libavcodec/libjxlenc.c +++ b/libavcodec/libjxlenc.c @@ -52,6 +52,7 @@ typedef struct LibJxlEncodeContext { int effort; float distance; int modular; + int xyb; uint8_t *buffer; size_t buffer_size; } LibJxlEncodeContext; @@ -303,7 +304,7 @@ static int libjxl_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const AVFra av_log(avctx, AV_LOG_WARNING, "Unknown color range, assuming full (pc)\n"); /* bitexact lossless requires there to be no XYB transform */ - info.uses_original_profile = ctx->distance == 0.0; + info.uses_original_profile = ctx->distance == 0.0 || !ctx->xyb; info.orientation = frame->linesize[0] >= 0 ? JXL_ORIENT_IDENTITY : JXL_ORIENT_FLIP_VERTICAL; if (JxlEncoderSetBasicInfo(ctx->encoder, &info) != JXL_ENC_SUCCESS) { @@ -474,6 +475,8 @@ static const AVOption libjxl_encode_options[] = { { "distance", "Maximum Butteraugli distance (quality setting, " "lower = better, zero = lossless, default 1.0)", OFFSET(distance), AV_OPT_TYPE_FLOAT, { .dbl = -1.0 }, -1.0, 15.0, VE }, { "modular", "Force modular mode", OFFSET(modular), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE }, + { "xyb", "Use XYB-encoding for lossy images", OFFSET(xyb), + AV_OPT_TYPE_INT, { .i64 = 1 }, 0, 1, VE }, { NULL }, }; diff --git a/libavcodec/version.h b/libavcodec/version.h index 5957009457..b4616ccc27 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #include "version_major.h" #define LIBAVCODEC_VERSION_MINOR 1 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
