June 2022 - ffmpeg-cvslog - lists.ffmpeg.org

libavcodec/qsvenc_hevc: Use default value from MSDK to set bf.
by Wenbin Chen 27 Jun '22

27 Jun '22

ffmpeg | branch: master | Wenbin Chen <wenbin.chen-at-intel.com(a)ffmpeg.org> | Mon Jun 20 17:06:31 2022 +0800| [afa20e6db82245807bd0bb181dd22e1b714972cc] | committer: Haihao Xiang libavcodec/qsvenc_hevc: Use default value from MSDK to set bf. Change the default value of "bf" for hevc_qsv to -1. 8 isn't the best choice so let MSDK to decide the number of b frames. Signed-off-by: Wenbin Chen <wenbin.chen(a)intel.com> Signed-off-by: Haihao Xiang <haihao.xiang(a)intel.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=afa20e6db82245807… --- libavcodec/qsvenc_hevc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/qsvenc_hevc.c b/libavcodec/qsvenc_hevc.c index da2bf457af..f6027f600b 100644 --- a/libavcodec/qsvenc_hevc.c +++ b/libavcodec/qsvenc_hevc.c @@ -287,7 +287,7 @@ static const FFCodecDefault qsv_enc_defaults[] = { { "refs", "0" }, // same as the x264 default { "g", "248" }, - { "bf", "8" }, + { "bf", "-1" }, { "qmin", "-1" }, { "qmax", "-1" }, { "trellis", "-1" },

1 0

avcodec/cuviddec: fix null pointer dereference
by Zhao Zhili 26 Jun '22

26 Jun '22

ffmpeg | branch: release/5.0 | Zhao Zhili <zhilizhao(a)tencent.com> | Fri Jun 24 22:42:01 2022 +0800| [7389a49fd348719d1fab393c2087183cde4dbd9c] | committer: Timo Rothenpieler avcodec/cuviddec: fix null pointer dereference It can happened on error path of cuvid_decode_init(). Signed-off-by: Timo Rothenpieler <timo(a)rothenpieler.org> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7389a49fd348719d1… --- libavcodec/cuviddec.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/libavcodec/cuviddec.c b/libavcodec/cuviddec.c index 1a1906e1f2..88f1d12a00 100644 --- a/libavcodec/cuviddec.c +++ b/libavcodec/cuviddec.c @@ -653,21 +653,23 @@ error: static av_cold int cuvid_decode_end(AVCodecContext *avctx) { CuvidContext *ctx = avctx->priv_data; - AVHWDeviceContext *device_ctx = (AVHWDeviceContext *)ctx->hwdevice->data; - AVCUDADeviceContext *device_hwctx = device_ctx->hwctx; - CUcontext dummy, cuda_ctx = device_hwctx->cuda_ctx; + AVHWDeviceContext *device_ctx = ctx->hwdevice ? (AVHWDeviceContext *)ctx->hwdevice->data : NULL; + AVCUDADeviceContext *device_hwctx = device_ctx ? device_ctx->hwctx : NULL; + CUcontext dummy, cuda_ctx = device_hwctx ? device_hwctx->cuda_ctx : NULL; av_fifo_freep(&ctx->frame_queue); - ctx->cudl->cuCtxPushCurrent(cuda_ctx); + if (cuda_ctx) { + ctx->cudl->cuCtxPushCurrent(cuda_ctx); - if (ctx->cuparser) - ctx->cvdl->cuvidDestroyVideoParser(ctx->cuparser); + if (ctx->cuparser) + ctx->cvdl->cuvidDestroyVideoParser(ctx->cuparser); - if (ctx->cudecoder) - ctx->cvdl->cuvidDestroyDecoder(ctx->cudecoder); + if (ctx->cudecoder) + ctx->cvdl->cuvidDestroyDecoder(ctx->cudecoder); - ctx->cudl->cuCtxPopCurrent(&dummy); + ctx->cudl->cuCtxPopCurrent(&dummy); + } ctx->cudl = NULL;

1 0

avcodec/cuviddec: fix AV1 decoding error
by Zhao Zhili 26 Jun '22

26 Jun '22

ffmpeg | branch: release/5.0 | Zhao Zhili <zhilizhao(a)tencent.com> | Fri Jun 24 12:04:04 2022 +0800| [3607d7bbea4fc3e601774e02ef734097f2d369af] | committer: Timo Rothenpieler avcodec/cuviddec: fix AV1 decoding error cuvidParseVideoData only supports pure OBUs, it reports an unknown error with AV1CodecConfigurationRecord. Check whether extradata is AV1CodecConfigurationRecord and skip the first 4 bytes to fix the issue. The bug is revealed in ffmpeg cmd since 45e3b6a68 and ffd1316e. Signed-off-by: Timo Rothenpieler <timo(a)rothenpieler.org> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3607d7bbea4fc3e60… --- libavcodec/cuviddec.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libavcodec/cuviddec.c b/libavcodec/cuviddec.c index f03bbd8c4b..1a1906e1f2 100644 --- a/libavcodec/cuviddec.c +++ b/libavcodec/cuviddec.c @@ -951,6 +951,16 @@ static av_cold int cuvid_decode_init(AVCodecContext *avctx) extradata_size = avctx->extradata_size; } + // Check first bit to determine whether it's AV1CodecConfigurationRecord. + // Skip first 4 bytes of AV1CodecConfigurationRecord to keep configOBUs + // only, otherwise cuvidParseVideoData report unknown error. + if (avctx->codec->id == AV_CODEC_ID_AV1 && + extradata_size > 4 && + extradata[0] & 0x80) { + extradata += 4; + extradata_size -= 4; + } + ctx->cuparse_ext = av_mallocz(sizeof(*ctx->cuparse_ext) + FFMAX(extradata_size - (int)sizeof(ctx->cuparse_ext->raw_seqhdr_data), 0)); if (!ctx->cuparse_ext) {

1 0

avcodec/cuviddec: fix null pointer dereference
by Zhao Zhili 26 Jun '22

26 Jun '22

ffmpeg | branch: master | Zhao Zhili <zhilizhao(a)tencent.com> | Fri Jun 24 22:42:01 2022 +0800| [07bcedc232feeb9e30336624f4e9977d47ac43bc] | committer: Timo Rothenpieler avcodec/cuviddec: fix null pointer dereference It can happened on error path of cuvid_decode_init(). Signed-off-by: Timo Rothenpieler <timo(a)rothenpieler.org> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=07bcedc232feeb9e3… --- libavcodec/cuviddec.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/libavcodec/cuviddec.c b/libavcodec/cuviddec.c index 5f265b1c70..b544b3361d 100644 --- a/libavcodec/cuviddec.c +++ b/libavcodec/cuviddec.c @@ -655,21 +655,23 @@ error: static av_cold int cuvid_decode_end(AVCodecContext *avctx) { CuvidContext *ctx = avctx->priv_data; - AVHWDeviceContext *device_ctx = (AVHWDeviceContext *)ctx->hwdevice->data; - AVCUDADeviceContext *device_hwctx = device_ctx->hwctx; - CUcontext dummy, cuda_ctx = device_hwctx->cuda_ctx; + AVHWDeviceContext *device_ctx = ctx->hwdevice ? (AVHWDeviceContext *)ctx->hwdevice->data : NULL; + AVCUDADeviceContext *device_hwctx = device_ctx ? device_ctx->hwctx : NULL; + CUcontext dummy, cuda_ctx = device_hwctx ? device_hwctx->cuda_ctx : NULL; av_fifo_freep2(&ctx->frame_queue); - ctx->cudl->cuCtxPushCurrent(cuda_ctx); + if (cuda_ctx) { + ctx->cudl->cuCtxPushCurrent(cuda_ctx); - if (ctx->cuparser) - ctx->cvdl->cuvidDestroyVideoParser(ctx->cuparser); + if (ctx->cuparser) + ctx->cvdl->cuvidDestroyVideoParser(ctx->cuparser); - if (ctx->cudecoder) - ctx->cvdl->cuvidDestroyDecoder(ctx->cudecoder); + if (ctx->cudecoder) + ctx->cvdl->cuvidDestroyDecoder(ctx->cudecoder); - ctx->cudl->cuCtxPopCurrent(&dummy); + ctx->cudl->cuCtxPopCurrent(&dummy); + } ctx->cudl = NULL;

1 0

avcodec/cuviddec: fix AV1 decoding error
by Zhao Zhili 26 Jun '22

26 Jun '22

ffmpeg | branch: master | Zhao Zhili <zhilizhao(a)tencent.com> | Fri Jun 24 12:04:04 2022 +0800| [ffc91940a4262f605cb650c93e52a657090ae148] | committer: Timo Rothenpieler avcodec/cuviddec: fix AV1 decoding error cuvidParseVideoData only supports pure OBUs, it reports an unknown error with AV1CodecConfigurationRecord. Check whether extradata is AV1CodecConfigurationRecord and skip the first 4 bytes to fix the issue. The bug is revealed in ffmpeg cmd since 45e3b6a68 and ffd1316e. Signed-off-by: Timo Rothenpieler <timo(a)rothenpieler.org> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ffc91940a4262f605… --- libavcodec/cuviddec.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libavcodec/cuviddec.c b/libavcodec/cuviddec.c index cb3cda7e24..5f265b1c70 100644 --- a/libavcodec/cuviddec.c +++ b/libavcodec/cuviddec.c @@ -953,6 +953,16 @@ static av_cold int cuvid_decode_init(AVCodecContext *avctx) extradata_size = avctx->extradata_size; } + // Check first bit to determine whether it's AV1CodecConfigurationRecord. + // Skip first 4 bytes of AV1CodecConfigurationRecord to keep configOBUs + // only, otherwise cuvidParseVideoData report unknown error. + if (avctx->codec->id == AV_CODEC_ID_AV1 && + extradata_size > 4 && + extradata[0] & 0x80) { + extradata += 4; + extradata_size -= 4; + } + ctx->cuparse_ext = av_mallocz(sizeof(*ctx->cuparse_ext) + FFMAX(extradata_size - (int)sizeof(ctx->cuparse_ext->raw_seqhdr_data), 0)); if (!ctx->cuparse_ext) {

1 0

avcodec: fix time reporting for DFPWM streams
by Jack Bruienne 26 Jun '22

26 Jun '22

ffmpeg | branch: master | Jack Bruienne <jackbruienne(a)gmail.com> | Sun Jun 26 17:04:42 2022 +0200| [75638fe9402f70645bdde4d95672fa640a327300] | committer: Paul B Mahol avcodec: fix time reporting for DFPWM streams This adds the exact bits per sample for DFPWM to av_get_exact_bits_per_sample. Previously, the DTS and PTS were set to 0 because the codec never reported them, but adding this allows libavformat to automatically set DTS and PTS from the byte position of the stream. Signed-off-by: Jack Bruienne <jackbruienne(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=75638fe9402f70645… --- libavcodec/utils.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index eb7e505a62..940f25fe7a 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -495,6 +495,8 @@ const char *avcodec_profile_name(enum AVCodecID codec_id, int profile) int av_get_exact_bits_per_sample(enum AVCodecID codec_id) { switch (codec_id) { + case AV_CODEC_ID_DFPWM: + return 1; case AV_CODEC_ID_8SVX_EXP: case AV_CODEC_ID_8SVX_FIB: case AV_CODEC_ID_ADPCM_ARGO:

1 0

avcodec/x86/h264_qpel: Remove unused functions
by Andreas Rheinhardt 26 Jun '22

26 Jun '22

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Fri Jun 24 19:29:37 2022 +0200| [9dfec90253787e718b2771fd93528381d5407721] | committer: Andreas Rheinhardt avcodec/x86/h264_qpel: Remove unused functions Forgotten in 4011a76494a5ff6844312813bc753aae8e54c2f0. The reason for this is that these functtions are marked as av_always_inline and GCC does not emit warnings if such functions are unused, so this went unnoticed. Yet Clang does, so this commit removes them. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9dfec90253787e718… --- libavcodec/x86/h264_qpel.c | 40 ---------------------------------------- 1 file changed, 40 deletions(-) diff --git a/libavcodec/x86/h264_qpel.c b/libavcodec/x86/h264_qpel.c index 5aa12ff81f..b9b1edcd9e 100644 --- a/libavcodec/x86/h264_qpel.c +++ b/libavcodec/x86/h264_qpel.c @@ -57,11 +57,9 @@ void ff_ ## OPNAME ## _h264_qpel4_h_lowpass_l2_mmxext(uint8_t *dst, const uint8_ void ff_ ## OPNAME ## _h264_qpel8_h_lowpass_l2_mmxext(uint8_t *dst, const uint8_t *src, const uint8_t *src2, int dstStride, int src2Stride);\ void ff_ ## OPNAME ## _h264_qpel8_h_lowpass_l2_ssse3(uint8_t *dst, const uint8_t *src, const uint8_t *src2, int dstStride, int src2Stride);\ void ff_ ## OPNAME ## _h264_qpel4_v_lowpass_mmxext(uint8_t *dst, const uint8_t *src, int dstStride, int srcStride);\ -void ff_ ## OPNAME ## _h264_qpel8or16_v_lowpass_op_mmxext(uint8_t *dst, const uint8_t *src, int dstStride, int srcStride, int h);\ void ff_ ## OPNAME ## _h264_qpel8or16_v_lowpass_sse2(uint8_t *dst, const uint8_t *src, int dstStride, int srcStride, int h);\ void ff_ ## OPNAME ## _h264_qpel4_hv_lowpass_v_mmxext(const uint8_t *src, int16_t *tmp, int srcStride);\ void ff_ ## OPNAME ## _h264_qpel4_hv_lowpass_h_mmxext(int16_t *tmp, uint8_t *dst, int dstStride);\ -void ff_ ## OPNAME ## _h264_qpel8or16_hv1_lowpass_op_mmxext(const uint8_t *src, int16_t *tmp, int srcStride, int size);\ void ff_ ## OPNAME ## _h264_qpel8or16_hv1_lowpass_op_sse2(const uint8_t *src, int16_t *tmp, int srcStride, int size);\ void ff_ ## OPNAME ## _h264_qpel8or16_hv2_lowpass_op_mmxext(uint8_t *dst, int16_t *tmp, int dstStride, int unused, int h);\ void ff_ ## OPNAME ## _h264_qpel8or16_hv2_lowpass_ssse3(uint8_t *dst, int16_t *tmp, int dstStride, int tmpStride, int size);\ @@ -71,17 +69,6 @@ void ff_ ## OPNAME ## _pixels8_l2_shift5_mmxext(uint8_t *dst, const int16_t *src DEF_QPEL(avg) DEF_QPEL(put) -static av_always_inline void ff_put_h264_qpel8or16_hv1_lowpass_mmxext(int16_t *tmp, const uint8_t *src, int tmpStride, int srcStride, int size) -{ - int w = (size + 8) >> 2; - src -= 2 * srcStride + 2; - while (w--) { - ff_put_h264_qpel8or16_hv1_lowpass_op_mmxext(src, tmp, srcStride, size); - tmp += 4; - src += 4; - } -} - #define QPEL_H264(OPNAME, OP, MMX)\ static av_always_inline void ff_ ## OPNAME ## h264_qpel4_hv_lowpass_ ## MMX(uint8_t *dst, int16_t *tmp, const uint8_t *src, int dstStride, int tmpStride, int srcStride){\ int w=3;\ @@ -95,13 +82,6 @@ static av_always_inline void ff_ ## OPNAME ## h264_qpel4_hv_lowpass_ ## MMX(uint ff_ ## OPNAME ## h264_qpel4_hv_lowpass_h_mmxext(tmp, dst, dstStride);\ }\ \ -static av_always_inline void ff_ ## OPNAME ## h264_qpel8or16_v_lowpass_ ## MMX(uint8_t *dst, const uint8_t *src, int dstStride, int srcStride, int h){\ - src -= 2*srcStride;\ - ff_ ## OPNAME ## h264_qpel8or16_v_lowpass_op_mmxext(dst, src, dstStride, srcStride, h);\ - src += 4;\ - dst += 4;\ - ff_ ## OPNAME ## h264_qpel8or16_v_lowpass_op_mmxext(dst, src, dstStride, srcStride, h);\ -}\ static av_always_inline void ff_ ## OPNAME ## h264_qpel8or16_hv2_lowpass_ ## MMX(uint8_t *dst, int16_t *tmp, int dstStride, int tmpStride, int size){\ int w = size>>4;\ do{\ @@ -111,14 +91,6 @@ static av_always_inline void ff_ ## OPNAME ## h264_qpel8or16_hv2_lowpass_ ## MMX }while(w--);\ }\ \ -static av_always_inline void ff_ ## OPNAME ## h264_qpel8_v_lowpass_ ## MMX(uint8_t *dst, const uint8_t *src, int dstStride, int srcStride){\ - ff_ ## OPNAME ## h264_qpel8or16_v_lowpass_ ## MMX(dst , src , dstStride, srcStride, 8);\ -}\ -static av_always_inline void ff_ ## OPNAME ## h264_qpel16_v_lowpass_ ## MMX(uint8_t *dst, const uint8_t *src, int dstStride, int srcStride){\ - ff_ ## OPNAME ## h264_qpel8or16_v_lowpass_ ## MMX(dst , src , dstStride, srcStride, 16);\ - ff_ ## OPNAME ## h264_qpel8or16_v_lowpass_ ## MMX(dst+8, src+8, dstStride, srcStride, 16);\ -}\ -\ static av_always_inline void ff_ ## OPNAME ## h264_qpel16_h_lowpass_ ## MMX(uint8_t *dst, const uint8_t *src, int dstStride, int srcStride){\ ff_ ## OPNAME ## h264_qpel8_h_lowpass_ ## MMX(dst , src , dstStride, srcStride);\ ff_ ## OPNAME ## h264_qpel8_h_lowpass_ ## MMX(dst+8, src+8, dstStride, srcStride);\ @@ -138,18 +110,6 @@ static av_always_inline void ff_ ## OPNAME ## h264_qpel16_h_lowpass_l2_ ## MMX(u ff_ ## OPNAME ## h264_qpel8_h_lowpass_l2_ ## MMX(dst+8, src+8, src2+8, dstStride, src2Stride);\ }\ \ -static av_always_inline void ff_ ## OPNAME ## h264_qpel8or16_hv_lowpass_ ## MMX(uint8_t *dst, int16_t *tmp, const uint8_t *src, int dstStride, int tmpStride, int srcStride, int size){\ - ff_put_h264_qpel8or16_hv1_lowpass_ ## MMX(tmp, src, tmpStride, srcStride, size);\ - ff_ ## OPNAME ## h264_qpel8or16_hv2_lowpass_ ## MMX(dst, tmp, dstStride, tmpStride, size);\ -}\ -static av_always_inline void ff_ ## OPNAME ## h264_qpel8_hv_lowpass_ ## MMX(uint8_t *dst, int16_t *tmp, const uint8_t *src, int dstStride, int tmpStride, int srcStride){\ - ff_ ## OPNAME ## h264_qpel8or16_hv_lowpass_ ## MMX(dst , tmp , src , dstStride, tmpStride, srcStride, 8);\ -}\ -\ -static av_always_inline void ff_ ## OPNAME ## h264_qpel16_hv_lowpass_ ## MMX(uint8_t *dst, int16_t *tmp, const uint8_t *src, int dstStride, int tmpStride, int srcStride){\ - ff_ ## OPNAME ## h264_qpel8or16_hv_lowpass_ ## MMX(dst , tmp , src , dstStride, tmpStride, srcStride, 16);\ -}\ -\ static av_always_inline void ff_ ## OPNAME ## pixels16_l2_shift5_ ## MMX(uint8_t *dst, const int16_t *src16, const uint8_t *src8, int dstStride, int src8Stride, int h)\ {\ ff_ ## OPNAME ## pixels8_l2_shift5_ ## MMX(dst , src16 , src8 , dstStride, src8Stride, h);\

1 0

avformat/matroskaenc: Fix use of uninitialized value
by Andreas Rheinhardt 26 Jun '22

26 Jun '22

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Sun Jun 26 06:12:32 2022 +0200| [2cce1d852862c91a14a9921bf15a7e0e027c7164] | committer: Andreas Rheinhardt avformat/matroskaenc: Fix use of uninitialized value Regression since 67eea6cf026a70940ea402d54685d67c660b49cd. Affects only WebVTT when muxing WebM. (This is covered by the webm-webvtt-remux FATE test which fails for several FATE boxes on fate-ffmpeg.org.) Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2cce1d852862c91a1… --- libavformat/matroskaenc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 4f5afc1be4..1256bdfe36 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1914,6 +1914,7 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, } end_ebml_master(pb, track_master); + ret = 0; fail: ffio_reset_dyn_buf(mkv->tmp_bc);

1 0

avformat/matroskadec: avoid integer overflows in SAR computation
by Michael Niedermayer 25 Jun '22

25 Jun '22

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Fri Apr 1 12:46:08 2022 +0200| [e6cad01122c6dea0435d042d68a56045a214492d] | committer: Michael Niedermayer avformat/matroskadec: avoid integer overflows in SAR computation This ignores >64bit Alternatively we could support that if it occurs in reality Fixes: negation of -9223372036854775808 Fixes: integer overflows Fixes: 46072/clusterfuzz-testcase-minimized-ffmpeg_dem_MATROSKA_fuzzer-5029840966778880 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e6cad01122c6dea04… --- libavformat/matroskadec.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index cd30b5f7a4..73ded761fd 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -2886,11 +2886,14 @@ static int matroska_parse_tracks(AVFormatContext *s) mkv_stereo_mode_display_mul(track->video.stereo_mode, &display_width_mul, &display_height_mul); if (track->video.display_unit < MATROSKA_VIDEO_DISPLAYUNIT_UNKNOWN) { - av_reduce(&st->sample_aspect_ratio.num, - &st->sample_aspect_ratio.den, - st->codecpar->height * track->video.display_width * display_width_mul, - st->codecpar->width * track->video.display_height * display_height_mul, - INT_MAX); + if (track->video.display_width && track->video.display_height && + st->codecpar->height < INT64_MAX / track->video.display_width / display_width_mul && + st->codecpar->width < INT64_MAX / track->video.display_height / display_height_mul) + av_reduce(&st->sample_aspect_ratio.num, + &st->sample_aspect_ratio.den, + st->codecpar->height * track->video.display_width * display_width_mul, + st->codecpar->width * track->video.display_height * display_height_mul, + INT_MAX); } if (st->codecpar->codec_id != AV_CODEC_ID_HEVC) sti->need_parsing = AVSTREAM_PARSE_HEADERS;

1 0

avcodec/libjxlenc: properly read input colorspace
by Leo Izen 25 Jun '22

25 Jun '22

ffmpeg | branch: master | Leo Izen <leo.izen(a)gmail.com> | Tue May 3 11:38:43 2022 -0400| [59a58d1a85611c65c9f6910c75ee5bfa7ba43364] | committer: Niklas Haas avcodec/libjxlenc: properly read input colorspace 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. Reviewed-by: Niklas Haas <git(a)haasn.dev> Signed-off-by: Leo Izen <leo.izen(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=59a58d1a85611c65c… --- libavcodec/libjxlenc.c | 153 +++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 123 insertions(+), 30 deletions(-) diff --git a/libavcodec/libjxlenc.c b/libavcodec/libjxlenc.c index 8bebec6aeb..6a948cc3ae 100644 --- a/libavcodec/libjxlenc.c +++ b/libavcodec/libjxlenc.c @@ -27,6 +27,7 @@ #include <string.h> #include "libavutil/avutil.h" +#include "libavutil/csp.h" #include "libavutil/error.h" #include "libavutil/frame.h" #include "libavutil/libm.h" @@ -117,7 +118,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 +134,7 @@ 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; } @@ -185,6 +186,52 @@ static av_cold int libjxl_encode_init(AVCodecContext *avctx) return 0; } +/** + * Populate a JxlColorEncoding with the given enum AVColorPrimaries. + * @return < 0 upon failure, >= 0 upon success + */ +static int libjxl_populate_primaries(JxlColorEncoding *jxl_color, enum AVColorPrimaries prm) +{ + const AVColorPrimariesDesc *desc; + + switch (prm) { + case AVCOL_PRI_BT709: + jxl_color->primaries = JXL_PRIMARIES_SRGB; + jxl_color->white_point = JXL_WHITE_POINT_D65; + return 0; + case AVCOL_PRI_BT2020: + jxl_color->primaries = JXL_PRIMARIES_2100; + jxl_color->white_point = JXL_WHITE_POINT_D65; + return 0; + case AVCOL_PRI_SMPTE431: + jxl_color->primaries = JXL_PRIMARIES_P3; + jxl_color->white_point = JXL_WHITE_POINT_DCI; + return 0; + case AVCOL_PRI_SMPTE432: + jxl_color->primaries = JXL_PRIMARIES_P3; + jxl_color->white_point = JXL_WHITE_POINT_D65; + return 0; + } + + desc = av_csp_primaries_desc_from_id(prm); + if (!desc) + return AVERROR(EINVAL); + + jxl_color->primaries = JXL_PRIMARIES_CUSTOM; + jxl_color->white_point = JXL_WHITE_POINT_CUSTOM; + + jxl_color->primaries_red_xy[0] = av_q2d(desc->prim.r.x); + jxl_color->primaries_red_xy[1] = av_q2d(desc->prim.r.y); + jxl_color->primaries_green_xy[0] = av_q2d(desc->prim.g.x); + jxl_color->primaries_green_xy[1] = av_q2d(desc->prim.g.y); + jxl_color->primaries_blue_xy[0] = av_q2d(desc->prim.b.x); + jxl_color->primaries_blue_xy[1] = av_q2d(desc->prim.b.y); + jxl_color->white_point_xy[0] = av_q2d(desc->wp.x); + jxl_color->white_point_xy[1] = av_q2d(desc->wp.y); + + return 0; +} + /** * Encode an entire frame. Currently animation, is not supported by * this encoder, so this will always reinitialize a new still image @@ -223,49 +270,95 @@ static int libjxl_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const AVFra 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 limited range */ + if (avctx->color_range == AVCOL_RANGE_MPEG || + avctx->color_range == AVCOL_RANGE_UNSPECIFIED && frame->color_range == AVCOL_RANGE_MPEG) + av_log(avctx, AV_LOG_WARNING, "This encoder does not support limited (tv) range, colors will be wrong!\n"); + else if (avctx->color_range != AVCOL_RANGE_JPEG && frame->color_range != AVCOL_RANGE_JPEG) + 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; - 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 (frame->color_trc && frame->color_trc != AVCOL_TRC_UNSPECIFIED + ? frame->color_trc : 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. Colors may be wrong.\n"); + jxl_color.transfer_function = JXL_TRANSFER_FUNCTION_LINEAR; + } else { + av_log(avctx, AV_LOG_WARNING, "Unknown transfer function, assuming IEC61966-2-1/sRGB. Colors may be wrong.\n"); + jxl_color.transfer_function = JXL_TRANSFER_FUNCTION_SRGB; + } + } + + /* This should be implied to be honest + * but a libjxl bug 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; + + 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; + + 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];

1 0