March 2026 - ffmpeg-cvslog - lists.ffmpeg.org

[ffmpeg] avcodec/aac/aacdec_usac: Implement missing bits of otts_bands_phase and residual_bands computation (branch master)
by Michael Niedermayer 31 Mar '26

31 Mar '26

This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg. The following commit(s) were added to refs/heads/master by this push: new ddcb9dd3b5 avcodec/aac/aacdec_usac: Implement missing bits of otts_bands_phase and residual_bands computation ddcb9dd3b5 is described below commit ddcb9dd3b5d21d055774abd61ae609ecb728cb1c Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Tue Mar 31 15:51:52 2026 +0200 Commit: michaelni <michael(a)niedermayer.cc> CommitDate: Tue Mar 31 22:29:18 2026 +0000 avcodec/aac/aacdec_usac: Implement missing bits of otts_bands_phase and residual_bands computation Fixes: out of array access Fixes: matejsmycka/poc.mp4 Introducing commit: `baad75cafa6bac298b72c177f657a2eb8e31cff1` — "aacdec_usac: add support for parsing Mpsp212 (MPEG surround)", 2025-11-17. Found-by: Matěj Smyčka <matejsmycka(a)gmail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> --- libavcodec/aac/aacdec_usac.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/libavcodec/aac/aacdec_usac.c b/libavcodec/aac/aacdec_usac.c index 687a5b6a3c..4d57fbfff7 100644 --- a/libavcodec/aac/aacdec_usac.c +++ b/libavcodec/aac/aacdec_usac.c @@ -218,6 +218,8 @@ static int decode_usac_element_pair(AACDecContext *ac, if (!e->mps.freq_res) return AVERROR_INVALIDDATA; /* value 0 is reserved */ + int numBands = ((int[]){0,28,20,14,10,7,5,4})[e->mps.freq_res]; // ISO/IEC 23003-1:2007, 5.2, Table 39 + e->mps.fixed_gain = get_bits(gb, 3); /* bsFixedGainDMX */ e->mps.temp_shape_config = get_bits(gb, 2); /* bsTempShapeConfig */ e->mps.decorr_config = get_bits(gb, 2); /* bsDecorrConfig */ @@ -225,12 +227,21 @@ static int decode_usac_element_pair(AACDecContext *ac, e->mps.phase_coding = get_bits1(gb); /* bsPhaseCoding */ e->mps.otts_bands_phase_present = get_bits1(gb); - if (e->mps.otts_bands_phase_present) /* bsOttBandsPhasePresent */ - e->mps.otts_bands_phase = get_bits(gb, 5); /* bsOttBandsPhase */ + int otts_bands_phase = ((int[]){0,10,10,7,5,3,2,2})[e->mps.freq_res]; // Table 109 — Default value of bsOttBandsPhase + if (e->mps.otts_bands_phase_present) { /* bsOttBandsPhasePresent */ + otts_bands_phase = get_bits(gb, 5); /* bsOttBandsPhase */ + if (otts_bands_phase > numBands) + return AVERROR_INVALIDDATA; + } + e->mps.otts_bands_phase = otts_bands_phase; e->mps.residual_coding = e->stereo_config_index >= 2; /* bsResidualCoding */ if (e->mps.residual_coding) { - e->mps.residual_bands = get_bits(gb, 5); /* bsResidualBands */ + int residual_bands = get_bits(gb, 5); /* bsResidualBands */ + if (residual_bands > numBands) + return AVERROR_INVALIDDATA; + e->mps.residual_bands = residual_bands; + e->mps.otts_bands_phase = FFMAX(e->mps.otts_bands_phase, e->mps.residual_bands); e->mps.pseudo_lr = get_bits1(gb); /* bsPseudoLr */

1 0

[ffmpeg] branch master updated (77ff3bcb90 -> 9c04a40136)
by ffmpeg-git 31 Mar '26

31 Mar '26

This is an automated email from the git hooks/post-receive script. Git pushed a change to branch master in repository ffmpeg. from 77ff3bcb90 aarch64: Add AARCH64_VALID_JUMP_CALL_TARGET new 35c6cdb191 hwcontext_vulkan: add support for GBRPF16/GBRAPF16 new 29b8614e62 vulkan/ffv1: fix bitstream initialization for Golomb new f5054f726d ffv1enc_vulkan: implement floating-point encoding new 9c04a40136 vulkan/ffv1: implement floating-point decoding The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: libavcodec/ffv1enc_vulkan.c | 195 +++++++++++++++++++-- libavcodec/vulkan/Makefile | 8 +- libavcodec/vulkan/ffv1_common.glsl | 35 +++- libavcodec/vulkan/ffv1_dec.comp.glsl | 69 +++++--- ..._rgb.comp.glsl => ffv1_dec_rgb_float.comp.glsl} | 3 +- ...mp.glsl => ffv1_dec_rgb_float_golomb.comp.glsl} | 4 +- libavcodec/vulkan/ffv1_dec_setup.comp.glsl | 70 ++++++-- libavcodec/vulkan/ffv1_enc.comp.glsl | 57 ++++-- libavcodec/vulkan/ffv1_enc_remap.comp.glsl | 69 ++++++++ ..._rgb.comp.glsl => ffv1_enc_rgb_float.comp.glsl} | 1 + libavcodec/vulkan/ffv1_enc_setup.comp.glsl | 72 ++++++-- libavcodec/vulkan/rangecoder.glsl | 8 +- libavcodec/vulkan_ffv1.c | 70 +++++++- libavutil/hwcontext_vulkan.c | 2 + libavutil/vulkan.c | 11 ++ 15 files changed, 594 insertions(+), 80 deletions(-) copy libavcodec/vulkan/{ffv1_dec_rgb.comp.glsl => ffv1_dec_rgb_float.comp.glsl} (92%) copy libavcodec/vulkan/{ffv1_dec_rgb.comp.glsl => ffv1_dec_rgb_float_golomb.comp.glsl} (91%) create mode 100644 libavcodec/vulkan/ffv1_enc_remap.comp.glsl copy libavcodec/vulkan/{ffv1_enc_rgb.comp.glsl => ffv1_enc_rgb_float.comp.glsl} (98%)

2 4

[ffmpeg] branch master updated (878eabdfef -> 77ff3bcb90)
by ffmpeg-git 31 Mar '26

31 Mar '26

This is an automated email from the git hooks/post-receive script. Git pushed a change to branch master in repository ffmpeg. from 878eabdfef tests/fate/libavutil: add FATE test for video_enc_params new 8ed8e221bd aarch64: Fix a URL typo new 77ff3bcb90 aarch64: Add AARCH64_VALID_JUMP_CALL_TARGET The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: libavutil/aarch64/asm.S | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)

2 2

[ffmpeg] branch master updated (c1aed85491 -> 878eabdfef)
by ffmpeg-git 31 Mar '26

31 Mar '26

This is an automated email from the git hooks/post-receive script. Git pushed a change to branch master in repository ffmpeg. from c1aed85491 avcodec/x86/h264_idct: Avoid spilling register unnecessarily new be2fa77344 tests/fate/libavutil: add FATE test for spherical new c8ec660d78 tests/fate/libavutil: add FATE test for detection_bbox new 878eabdfef tests/fate/libavutil: add FATE test for video_enc_params The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: libavutil/Makefile | 3 + libavutil/tests/detection_bbox.c | 132 +++++++++++++++++++++++++++++++++++++ libavutil/tests/spherical.c | 107 ++++++++++++++++++++++++++++++ libavutil/tests/video_enc_params.c | 130 ++++++++++++++++++++++++++++++++++++ tests/fate/libavutil.mak | 12 ++++ tests/ref/fate/detection_bbox | 22 +++++++ tests/ref/fate/spherical | 38 +++++++++++ tests/ref/fate/video_enc_params | 19 ++++++ 8 files changed, 463 insertions(+) create mode 100644 libavutil/tests/detection_bbox.c create mode 100644 libavutil/tests/spherical.c create mode 100644 libavutil/tests/video_enc_params.c create mode 100644 tests/ref/fate/detection_bbox create mode 100644 tests/ref/fate/spherical create mode 100644 tests/ref/fate/video_enc_params

2 3

[ffmpeg] avcodec/x86/h264_idct: Avoid spilling register unnecessarily (branch master)
by Andreas Rheinhardt 31 Mar '26

31 Mar '26

This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg. The following commit(s) were added to refs/heads/master by this push: new c1aed85491 avcodec/x86/h264_idct: Avoid spilling register unnecessarily c1aed85491 is described below commit c1aed854915bc5d1125e5616da3f798013aff6e5 Author: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> AuthorDate: Fri Mar 27 22:10:03 2026 +0100 Commit: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> CommitDate: Tue Mar 31 17:31:58 2026 +0200 avcodec/x86/h264_idct: Avoid spilling register unnecessarily It is only needed in the unlikely codepath. The ordinary one only uses six xmm registers. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> --- libavcodec/x86/h264_idct.asm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/x86/h264_idct.asm b/libavcodec/x86/h264_idct.asm index 6ae8202748..0ced412a3e 100644 --- a/libavcodec/x86/h264_idct.asm +++ b/libavcodec/x86/h264_idct.asm @@ -647,7 +647,7 @@ RET %endmacro INIT_XMM sse2 -cglobal h264_luma_dc_dequant_idct, 3, 4, 7 +cglobal h264_luma_dc_dequant_idct, 3, 4, 6 movq m3, [r1+24] movq m2, [r1+16] movq m1, [r1+ 8] @@ -683,6 +683,7 @@ cglobal h264_luma_dc_dequant_idct, 3, 4, 7 RET .big_qmul: bsr t0d, t3d + WIN64_PUSH_XMM 7 add t3d, 128 << 16 mov t1d, 7 cmp t0d, t1d

1 0

[ffmpeg] avfilter/x86/vf_atadenoise: Avoid load (branch master)
by Andreas Rheinhardt 31 Mar '26

31 Mar '26

This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg. The following commit(s) were added to refs/heads/master by this push: new 9fdd7e23e3 avfilter/x86/vf_atadenoise: Avoid load 9fdd7e23e3 is described below commit 9fdd7e23e3ae7be4453e296fea27ddf6da69d805 Author: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> AuthorDate: Fri Mar 27 20:59:42 2026 +0100 Commit: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> CommitDate: Tue Mar 31 16:49:51 2026 +0200 avfilter/x86/vf_atadenoise: Avoid load Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> --- libavfilter/x86/vf_atadenoise.asm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/libavfilter/x86/vf_atadenoise.asm b/libavfilter/x86/vf_atadenoise.asm index f1a21cbe75..2ef65a0202 100644 --- a/libavfilter/x86/vf_atadenoise.asm +++ b/libavfilter/x86/vf_atadenoise.asm @@ -26,7 +26,6 @@ SECTION_RODATA pw_one: times 8 dw 1 -pw_ones: times 8 dw 65535 SECTION .text @@ -52,7 +51,7 @@ cglobal atadenoise_filter_row8, 8,10,13, src, dst, srcf, w, mid, size, i, j, src movd m5, r7m SPLATW m5, m5 pxor m2, m2 - mova m10, [pw_ones] + pcmpeqw m10, m10 .loop: mov iq, midq @@ -60,10 +59,10 @@ cglobal atadenoise_filter_row8, 8,10,13, src, dst, srcf, w, mid, size, i, j, src pxor m3, m3 pxor m11, m11 movu m0, [srcq + xq] + mova m12, m10 punpcklbw m0, m2 mova m7, m0 mova m8, [pw_one] - mova m12, [pw_ones] .loop0: inc iq @@ -166,7 +165,7 @@ cglobal atadenoise_filter_row8_serial, 8,10,13, src, dst, srcf, w, mid, size, i, movd m5, r7m SPLATW m5, m5 pxor m2, m2 - mova m10, [pw_ones] + pcmpeqw m10, m10 .loop: mov iq, midq @@ -177,7 +176,7 @@ cglobal atadenoise_filter_row8_serial, 8,10,13, src, dst, srcf, w, mid, size, i, punpcklbw m0, m2 mova m7, m0 mova m8, [pw_one] - mova m12, [pw_ones] + mova m12, m10 .loop0: dec jq @@ -210,7 +209,7 @@ cglobal atadenoise_filter_row8_serial, 8,10,13, src, dst, srcf, w, mid, size, i, jg .loop0 .end_loop0: - mova m12, [pw_ones] + mova m12, m10 .loop1: inc iq

1 0

[ffmpeg] avcodec/amfdec: set context dimensions from decoder size (branch master)
by Araz Iusubov 31 Mar '26

31 Mar '26

This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg. The following commit(s) were added to refs/heads/master by this push: new 3b55818764 avcodec/amfdec: set context dimensions from decoder size 3b55818764 is described below commit 3b5581876405d8617a7325f2c42b0d502b4d9a06 Author: Araz Iusubov <Primeadvice(a)gmail.com> AuthorDate: Mon Mar 23 15:55:58 2026 +0100 Commit: ArazIusubov <Primeadvice(a)gmail.com> CommitDate: Tue Mar 31 14:07:31 2026 +0000 avcodec/amfdec: set context dimensions from decoder size --- libavcodec/amfdec.c | 55 +++++++++++++++++++++++++++++++++++++++++------------ libavcodec/amfdec.h | 1 + 2 files changed, 44 insertions(+), 12 deletions(-) diff --git a/libavcodec/amfdec.c b/libavcodec/amfdec.c index 76b22ad750..38fae3f4e7 100644 --- a/libavcodec/amfdec.c +++ b/libavcodec/amfdec.c @@ -243,12 +243,13 @@ static int amf_init_frames_context(AVCodecContext *avctx, int sw_format, int new static int amf_decode_init(AVCodecContext *avctx) { AMFDecoderContext *ctx = avctx->priv_data; + ctx->dimensions_initialized = 0; int ret; ctx->in_pkt = av_packet_alloc(); if (!ctx->in_pkt) return AVERROR(ENOMEM); - if (avctx->hw_device_ctx) { + if (avctx->hw_device_ctx) { AVHWDeviceContext *hwdev_ctx; hwdev_ctx = (AVHWDeviceContext*)avctx->hw_device_ctx->data; if (hwdev_ctx->type == AV_HWDEVICE_TYPE_AMF) @@ -271,7 +272,7 @@ static int amf_decode_init(AVCodecContext *avctx) AVAMFDeviceContext *amf_device_ctx = (AVAMFDeviceContext*)hw_device_ctx->hwctx; enum AVPixelFormat surf_pix_fmt = AV_PIX_FMT_NONE; - if(amf_legacy_driver_no_bitness_detect(amf_device_ctx)){ + if (amf_legacy_driver_no_bitness_detect(amf_device_ctx)) { // if bitness detection is not supported in legacy driver use format from container switch (avctx->pix_fmt) { case AV_PIX_FMT_YUV420P: @@ -280,7 +281,7 @@ static int amf_decode_init(AVCodecContext *avctx) case AV_PIX_FMT_YUV420P10: surf_pix_fmt = AV_PIX_FMT_P010; break; } - }else{ + } else { AMFVariantStruct format_var = {0}; ret = ctx->decoder->pVtbl->GetProperty(ctx->decoder, AMF_VIDEO_DECODER_OUTPUT_FORMAT, &format_var); @@ -288,17 +289,26 @@ static int amf_decode_init(AVCodecContext *avctx) surf_pix_fmt = av_amf_to_av_format(format_var.int64Value); } - if(avctx->hw_frames_ctx) + if (avctx->hw_frames_ctx) { // this values should be set for avcodec_open2 // will be updated after header decoded if not true. - if(surf_pix_fmt == AV_PIX_FMT_NONE) + if (surf_pix_fmt == AV_PIX_FMT_NONE) surf_pix_fmt = AV_PIX_FMT_NV12; // for older drivers - if (!avctx->coded_width) - avctx->coded_width = 1280; - if (!avctx->coded_height) - avctx->coded_height = 720; - ret = amf_init_frames_context(avctx, surf_pix_fmt, avctx->coded_width, avctx->coded_height); + int frames_w = 0; + int frames_h = 0; + + if (avctx->coded_width > 0 && avctx->coded_height > 0) { + frames_w = avctx->coded_width; + frames_h = avctx->coded_height; + } else if (avctx->width > 0 && avctx->height > 0) { + frames_w = avctx->width; + frames_h = avctx->height; + } else { + frames_w = 1280; + frames_h = 720; + } + ret = amf_init_frames_context(avctx, surf_pix_fmt, frames_w, frames_h); AMF_GOTO_FAIL_IF_FALSE(avctx, ret == 0, ret, "Failed to init frames context (AMF) : %s\n", av_err2str(ret)); } else @@ -495,6 +505,25 @@ static AMF_RESULT amf_buffer_from_packet(AVCodecContext *avctx, const AVPacket* return amf_update_buffer_properties(avctx, buf, pkt); } +static void amf_init_dimensions(AVCodecContext *avctx) +{ + AMFDecoderContext *ctx = avctx->priv_data; + AMFVariantStruct size_var = {0}; + AMF_RESULT res = AMF_OK; + + res = ctx->decoder->pVtbl->GetProperty(ctx->decoder, AMF_VIDEO_DECODER_CURRENT_SIZE, &size_var); + if (res == AMF_OK && size_var.sizeValue.width > 0 && size_var.sizeValue.height > 0) { + avctx->width = size_var.sizeValue.width; + avctx->height = size_var.sizeValue.height; + avctx->coded_width = size_var.sizeValue.width; + avctx->coded_height = size_var.sizeValue.height; + + ctx->dimensions_initialized = 1; + + av_log(avctx, AV_LOG_DEBUG, "AMF: detected initial decoder size %dx%d\n", avctx->width, avctx->height); + } +} + static int amf_decode_frame(AVCodecContext *avctx, struct AVFrame *frame) { AMFDecoderContext *ctx = avctx->priv_data; @@ -556,9 +585,11 @@ static int amf_decode_frame(AVCodecContext *avctx, struct AVFrame *frame) } res = amf_receive_frame(avctx, frame); - if (res == AMF_OK) + if (res == AMF_OK) { got_frame = 1; - else if (res == AMF_REPEAT) + if (!ctx->dimensions_initialized) + amf_init_dimensions(avctx); + } else if (res == AMF_REPEAT) // decoder has no output yet res = AMF_OK; else if (res == AMF_EOF) { diff --git a/libavcodec/amfdec.h b/libavcodec/amfdec.h index 205d7a84a5..fd5e00f9db 100644 --- a/libavcodec/amfdec.h +++ b/libavcodec/amfdec.h @@ -55,6 +55,7 @@ typedef struct AMFDecoderContext { int drain; int resolution_changed; int copy_output; + int dimensions_initialized; AVPacket* in_pkt; enum AMF_SURFACE_FORMAT output_format;

1 0

[ffmpeg] branch master updated (8b93c94f47 -> 53537f6cf5)
by ffmpeg-git 31 Mar '26

31 Mar '26

This is an automated email from the git hooks/post-receive script. Git pushed a change to branch master in repository ffmpeg. from 8b93c94f47 avutil/hwcontext_amf: Add AMF_IFACE_CALL macro new af443abe99 aarch64: Add support for indirect branch targets in the function macro new 53537f6cf5 swscale/aarch64: mark CPS kernel functions as indirect branch targets The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: libavutil/aarch64/asm.S | 6 +++++- libswscale/aarch64/ops_asmgen.c | 6 +++--- libswscale/aarch64/rasm.c | 13 ++++++++----- libswscale/aarch64/rasm.h | 7 +++++-- libswscale/aarch64/rasm_print.c | 3 ++- 5 files changed, 23 insertions(+), 12 deletions(-)

2 2

[ffmpeg] avutil/hwcontext_amf: Add AMF_IFACE_CALL macro (branch master)
by Dmitrii Gershenkop 31 Mar '26

31 Mar '26

This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg. The following commit(s) were added to refs/heads/master by this push: new 8b93c94f47 avutil/hwcontext_amf: Add AMF_IFACE_CALL macro 8b93c94f47 is described below commit 8b93c94f474664bb7a0ef801ef33acf4cc802217 Author: Dmitrii Gershenkop <bortengineer(a)protonmail.com> AuthorDate: Thu Mar 26 16:35:12 2026 +0100 Commit: ArazIusubov <Primeadvice(a)gmail.com> CommitDate: Tue Mar 31 11:33:00 2026 +0000 avutil/hwcontext_amf: Add AMF_IFACE_CALL macro Using AMF interfaces in C can be cumbersome and visually difficult to process in some cases: i.e.: object->function(object, args). To improve code readability, a new macro is added. This commit is instrumental for future AMF integration refactoring. --- libavutil/hwcontext_amf_internal.h | 1 + 1 file changed, 1 insertion(+) diff --git a/libavutil/hwcontext_amf_internal.h b/libavutil/hwcontext_amf_internal.h index 79e7556bf5..06d67246c0 100644 --- a/libavutil/hwcontext_amf_internal.h +++ b/libavutil/hwcontext_amf_internal.h @@ -40,5 +40,6 @@ #define AMF_TIME_BASE_Q (AVRational){1, AMF_SECOND} +#define AMF_IFACE_CALL(this, function, ...) ((this)->pVtbl->function((this), ##__VA_ARGS__)) #endif /* AVUTIL_HWCONTEXT_AMF_INTERNAL_H */

1 0

[ffmpeg] avfilter/vf_vpp_amf: Minor clean up. (branch master)
by Dmitrii Gershenkop 31 Mar '26

31 Mar '26

This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg. The following commit(s) were added to refs/heads/master by this push: new 6f75e879b6 avfilter/vf_vpp_amf: Minor clean up. 6f75e879b6 is described below commit 6f75e879b69ebb6594a66f3ded42e1cc32c06beb Author: Dmitrii Gershenkop <dmitriy.gershenkop2(a)dxc.com> AuthorDate: Wed Mar 18 15:43:25 2026 +0100 Commit: ArazIusubov <Primeadvice(a)gmail.com> CommitDate: Tue Mar 31 11:17:51 2026 +0000 avfilter/vf_vpp_amf: Minor clean up. -vf_vpp_amf.c: Remove unused variables. -vf_amf_common.c: Fix hdrmeta_buffer memory leak. -hwcontext_amf.c: Fix av_amf_extract_hdr_metadata not picking up light metadata if display mastering metadata is not set. -doc/filters.texi: Remove irrelevant example with HDR metadata for vpp_amf. --- doc/filters.texi | 16 ++++------------ libavfilter/vf_amf_common.c | 9 ++++++--- libavfilter/vf_vpp_amf.c | 3 --- libavutil/hwcontext_amf.c | 25 ++++++++++++++++--------- 4 files changed, 26 insertions(+), 27 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index e2fcab68fe..88d67cc70f 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -25804,18 +25804,10 @@ vpp_amf=4096:2160:color_profile=bt2020 @end example @item -Override display mastering, max CLL and max FALL metadata for filter input to represent those parameters: -Primary G: x=0.2650 y=0.6900 -Primary B: x=0.1500 y=0.0600 -Primary R: x=0.6800 y=0.3200 -White point: x=0.3127 y=0.3290 -Max. luminance: 1100.0000 cd/m² -Min. luminance: 0.0040 cd/m² -MaxCLL: 1100 cd/m² -MaxFALL: 400 cd/m² - -@example -vpp_amf=color_profile=bt2020:in_trc=smpte2084:in_primaries=bt2020:master_display='G(13250,23460)B(7500,3000)R(34000,16000)WP(15635,16450)L(11000000,40)':max_cll='1100,400' +Override input primaries and input transfer characteristics, change both to bt709. + +@example +vpp_amf=color_profile=bt2020:in_trc=smpte2084:in_primaries=bt2020:out_trc=bt709:out_primaries=bt709 @end example @end itemize diff --git a/libavfilter/vf_amf_common.c b/libavfilter/vf_amf_common.c index 86b9d846cb..087f4dbcdd 100644 --- a/libavfilter/vf_amf_common.c +++ b/libavfilter/vf_amf_common.c @@ -452,6 +452,7 @@ int amf_avframe_to_amfsurface(AVFilterContext *avctx, const AVFrame *frame, AMFS { AMFVariantStruct var = { 0 }; AMFFilterContext *ctx = avctx->priv; + AMFBuffer *hdrmeta_buffer = NULL; AMFSurface *surface; AMF_RESULT res; int hw_surface = 0; @@ -541,7 +542,6 @@ int amf_avframe_to_amfsurface(AVFilterContext *avctx, const AVFrame *frame, AMFS } if (ctx->in_trc == AMF_COLOR_TRANSFER_CHARACTERISTIC_SMPTE2084 && (ctx->master_display || ctx->light_meta)) { - AMFBuffer *hdrmeta_buffer = NULL; res = ctx->amf_device_ctx->context->pVtbl->AllocBuffer(ctx->amf_device_ctx->context, AMF_MEMORY_HOST, sizeof(AMFHDRMetadata), &hdrmeta_buffer); if (res == AMF_OK) { AMFHDRMetadata *hdrmeta = (AMFHDRMetadata*)hdrmeta_buffer->pVtbl->GetNative(hdrmeta_buffer); @@ -553,18 +553,21 @@ int amf_avframe_to_amfsurface(AVFilterContext *avctx, const AVFrame *frame, AMFS } else if (frame->color_trc == AVCOL_TRC_SMPTE2084) { res = surface->pVtbl->GetProperty(surface, AMF_VIDEO_DECODER_HDR_METADATA, &var); if (res == AMF_NOT_FOUND) { - AMFBuffer *hdrmeta_buffer = NULL; res = ctx->amf_device_ctx->context->pVtbl->AllocBuffer(ctx->amf_device_ctx->context, AMF_MEMORY_HOST, sizeof(AMFHDRMetadata), &hdrmeta_buffer); if (res == AMF_OK) { AMFHDRMetadata *hdrmeta = (AMFHDRMetadata*)hdrmeta_buffer->pVtbl->GetNative(hdrmeta_buffer); if (av_amf_extract_hdr_metadata(frame, hdrmeta) == 0) AMF_ASSIGN_PROPERTY_INTERFACE(res, surface, AMF_VIDEO_DECODER_HDR_METADATA, hdrmeta_buffer); - hdrmeta_buffer->pVtbl->Release(hdrmeta_buffer); } } } + if (hdrmeta_buffer) { + hdrmeta_buffer->pVtbl->Release(hdrmeta_buffer); + hdrmeta_buffer = NULL; + } + if (frame->crop_left || frame->crop_right || frame->crop_top || frame->crop_bottom) { size_t crop_x = frame->crop_left; size_t crop_y = frame->crop_top; diff --git a/libavfilter/vf_vpp_amf.c b/libavfilter/vf_vpp_amf.c index 5d5955f4b2..e836cec68a 100644 --- a/libavfilter/vf_vpp_amf.c +++ b/libavfilter/vf_vpp_amf.c @@ -85,14 +85,11 @@ static int amf_filter_config_output(AVFilterLink *outlink) AMFBuffer *hdrmeta_buffer = NULL; AMFHDRMetadata *hdrmeta = NULL; AMFSize out_size; - size_t size = 0; int ret; AMF_RESULT res; const AVFrameSideData *sd; enum AMF_VIDEO_CONVERTER_COLOR_PROFILE_ENUM amf_color_profile; enum AVPixelFormat in_format; - const int chroma_den = 50000; - const int luma_den = 10000; ret = amf_init_filter_config(outlink, &in_format); if (ret < 0) diff --git a/libavutil/hwcontext_amf.c b/libavutil/hwcontext_amf.c index 822f726c0f..754b1c60a2 100644 --- a/libavutil/hwcontext_amf.c +++ b/libavutil/hwcontext_amf.c @@ -232,24 +232,31 @@ int av_amf_light_metadata_to_hdrmeta(const AVContentLightMetadata *light_meta, A int av_amf_extract_hdr_metadata(const AVFrame *frame, AMFHDRMetadata *hdrmeta) { - AVFrameSideData *sidedata; + AVFrameSideData *sidedata; + AVContentLightMetadata *content_light = NULL; + AVMasteringDisplayMetadata *mastering_display = NULL; if (!frame || !hdrmeta) return AVERROR(EINVAL); sidedata = av_frame_get_side_data(frame, AV_FRAME_DATA_MASTERING_DISPLAY_METADATA); - if (!sidedata) - return AVERROR(ENODATA); - - if (av_amf_display_mastering_meta_to_hdrmeta((AVMasteringDisplayMetadata *)sidedata->data, hdrmeta) != 0) - return AVERROR(ENODATA); + if (sidedata) { + mastering_display = (AVMasteringDisplayMetadata *)sidedata->data; + if (av_amf_display_mastering_meta_to_hdrmeta(mastering_display, hdrmeta) != 0) + mastering_display = NULL; + } sidedata = av_frame_get_side_data(frame, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL); - if (sidedata) - av_amf_light_metadata_to_hdrmeta((AVContentLightMetadata *)sidedata->data, hdrmeta); + if (sidedata) { + content_light = (AVContentLightMetadata *)sidedata->data; + if (av_amf_light_metadata_to_hdrmeta(content_light, hdrmeta) != 0) + content_light = NULL; + } - return 0; + if (!mastering_display && !content_light) + return AVERROR(ENODATA); + return 0; } int av_amf_attach_hdr_metadata(AVFrame *frame, const AMFHDRMetadata *hdrmeta) {

1 0