April 2025 - ffmpeg-cvslog - lists.ffmpeg.org

avcodec/cbs_apv: don't return an error when reading empty buffers
by James Almer 30 Apr '25

30 Apr '25

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Tue Apr 29 16:57:34 2025 -0300| [e80f32f3bdd56b1b6dd13229bc026439b8efb9be] | committer: James Almer avcodec/cbs_apv: don't return an error when reading empty buffers The output will be a fragment with zero units, which is a lot more user friendly than making them think something went wrong, as it already happens with cbs_av1. Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e80f32f3bdd56b1b6… --- libavcodec/cbs_apv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/cbs_apv.c b/libavcodec/cbs_apv.c index 2c4a1daaf0..e7dd04825c 100644 --- a/libavcodec/cbs_apv.c +++ b/libavcodec/cbs_apv.c @@ -168,8 +168,8 @@ static int cbs_apv_split_fragment(CodedBitstreamContext *ctx, uint32_t signature; int err, trace; - if (header) { - // Ignore extradata fragments. + if (header || !frag->data_size) { + // Ignore empty or extradata fragments. return 0; }

1 0

fate: Add test for APV 422-10 profile
by Mark Thompson 30 Apr '25

30 Apr '25

ffmpeg | branch: master | Mark Thompson <sw(a)jkqxz.net> | Sun Apr 27 18:53:35 2025 +0100| [a8bae9b18d1c334bd027a7551eb1e9f170a40fc5] | committer: Mark Thompson fate: Add test for APV 422-10 profile Bitstream generated using the reference encoder, then edited to fix the colour description and an extra metadata block added. FFmpeg decoder output is identical to the reference decoder output. The content used is the first three frames of "Waterfall" from the SVT Open Content Video Test Suite 2022. This is copyright Sveriges Television AB and is used under the Creative Commons Attribution 4.0 International License. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a8bae9b18d1c334bd… --- tests/Makefile | 1 + tests/fate/apv.mak | 7 +++++++ tests/ref/fate/apv-422-10 | 8 ++++++++ 3 files changed, 16 insertions(+) diff --git a/tests/Makefile b/tests/Makefile index 10871f28f8..c204331020 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -156,6 +156,7 @@ include $(SRC_PATH)/tests/fate/amrnb.mak include $(SRC_PATH)/tests/fate/amrwb.mak include $(SRC_PATH)/tests/fate/api.mak include $(SRC_PATH)/tests/fate/apng.mak +include $(SRC_PATH)/tests/fate/apv.mak include $(SRC_PATH)/tests/fate/atrac.mak include $(SRC_PATH)/tests/fate/audio.mak include $(SRC_PATH)/tests/fate/bmp.mak diff --git a/tests/fate/apv.mak b/tests/fate/apv.mak new file mode 100644 index 0000000000..37e0b9f7be --- /dev/null +++ b/tests/fate/apv.mak @@ -0,0 +1,7 @@ +FATE_APV = fate-apv-422-10 + +FATE_SAMPLES_FFMPEG-$(call FRAMECRC, APV, APV, SCALE_FILTER) += $(FATE_APV) + +fate-apv: $(FATE_APV) + +fate-apv-422-10: CMD = framecrc -i $(TARGET_SAMPLES)/apv/profile_422-10.apv -pix_fmt yuv422p10le -vf scale diff --git a/tests/ref/fate/apv-422-10 b/tests/ref/fate/apv-422-10 new file mode 100644 index 0000000000..d000751207 --- /dev/null +++ b/tests/ref/fate/apv-422-10 @@ -0,0 +1,8 @@ +#tb 0: 1/30 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 320x180 +#sar 0: 1/1 +0, 0, 0, 1, 230400, 0x07f1e56d +0, 1, 1, 1, 230400, 0x0bd1c913 +0, 2, 2, 1, 230400, 0xefd02824

1 0

apv_decode: Replace division with shift
by Mark Thompson 30 Apr '25

30 Apr '25

ffmpeg | branch: master | Mark Thompson <sw(a)jkqxz.net> | Sun Apr 27 19:43:19 2025 +0100| [585455f7b3270b389b0b8a751562d42b0e4769fb] | committer: Mark Thompson apv_decode: Replace division with shift The compiler can't see that this should be a shift and generates a real division which is slow enough to appear in profiles on its own. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=585455f7b3270b389… --- libavcodec/apv_decode.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavcodec/apv_decode.c b/libavcodec/apv_decode.c index 6fe52ffd84..b1e1db7d64 100644 --- a/libavcodec/apv_decode.c +++ b/libavcodec/apv_decode.c @@ -173,8 +173,8 @@ static int apv_decode_tile_component(AVCodecContext *avctx, void *data, const AVPixFmtDescriptor *pix_fmt_desc = av_pix_fmt_desc_get(avctx->pix_fmt); - int sub_w = comp_index == 0 ? 1 : pix_fmt_desc->log2_chroma_w + 1; - int sub_h = comp_index == 0 ? 1 : pix_fmt_desc->log2_chroma_h + 1; + int sub_w_shift = comp_index == 0 ? 0 : pix_fmt_desc->log2_chroma_w; + int sub_h_shift = comp_index == 0 ? 0 : pix_fmt_desc->log2_chroma_h; APVRawTile *tile = &input->tile[tile_index]; @@ -190,8 +190,8 @@ static int apv_decode_tile_component(AVCodecContext *avctx, void *data, int tile_mb_width = tile_width / APV_MB_WIDTH; int tile_mb_height = tile_height / APV_MB_HEIGHT; - int blk_mb_width = 2 / sub_w; - int blk_mb_height = 2 / sub_h; + int blk_mb_width = 2 >> sub_w_shift; + int blk_mb_height = 2 >> sub_h_shift; int bit_depth; int qp_shift; @@ -234,10 +234,10 @@ static int apv_decode_tile_component(AVCodecContext *avctx, void *data, for (int blk_x = 0; blk_x < blk_mb_width; blk_x++) { int frame_y = (tile_start_y + APV_MB_HEIGHT * mb_y + - APV_TR_SIZE * blk_y) / sub_h; + APV_TR_SIZE * blk_y) >> sub_h_shift; int frame_x = (tile_start_x + APV_MB_WIDTH * mb_x + - APV_TR_SIZE * blk_x) / sub_w; + APV_TR_SIZE * blk_x) >> sub_w_shift; ptrdiff_t frame_pitch = apv->output_frame->linesize[comp_index]; uint8_t *block_start = apv->output_frame->data[comp_index] +

1 0

avcodec/apv_dsp: Fix left-shift of negative value
by Andreas Rheinhardt 30 Apr '25

30 Apr '25

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Wed Apr 30 20:07:35 2025 +0200| [0b588bfb51ecb262f714994696e77b6a1c7b1cef] | committer: Andreas Rheinhardt avcodec/apv_dsp: Fix left-shift of negative value Reviewed-by: Mark Thompson <sw(a)jkqxz.net> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0b588bfb51ecb262f… --- libavcodec/apv_dsp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/apv_dsp.c b/libavcodec/apv_dsp.c index fd814ef900..07bb34ec0b 100644 --- a/libavcodec/apv_dsp.c +++ b/libavcodec/apv_dsp.c @@ -58,7 +58,7 @@ static void apv_decode_transquant_c(void *output, for (int y = 0; y < 8; y++) { for (int x = 0; x < 8; x++) { - int coeff = (((input[y][x] * qmatrix[y][x]) << qp_shift) + + int coeff = (input[y][x] * qmatrix[y][x] * (1 << qp_shift) + (1 << (bd_shift - 1))) >> bd_shift; scaled_coeff[y][x] =

1 0

avformat/apvdec: Remove inappropriate INIT_CLEANUP flag
by Andreas Rheinhardt 30 Apr '25

30 Apr '25

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Sun Apr 27 20:20:02 2025 +0200| [c681d8e8a8180c74e0f0edd8c50f996862c30708] | committer: Andreas Rheinhardt avformat/apvdec: Remove inappropriate INIT_CLEANUP flag The init-cleanup flag makes no sense for a demuxer without a read_close() function. Reviewed-by: Mark Thompson <sw(a)jkqxz.net> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c681d8e8a8180c74e… --- libavformat/apvdec.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavformat/apvdec.c b/libavformat/apvdec.c index d2c2a50629..f87fb477a9 100644 --- a/libavformat/apvdec.c +++ b/libavformat/apvdec.c @@ -244,7 +244,6 @@ const FFInputFormat ff_apv_demuxer = { .p.long_name = NULL_IF_CONFIG_SMALL("APV raw bitstream"), .p.extensions = "apv", .p.flags = AVFMT_GENERIC_INDEX | AVFMT_NOTIMESTAMPS, - .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP, .read_probe = apv_probe, .read_header = apv_read_header, .read_packet = apv_read_packet,

1 0

avformat/apvdec: Fix seeking
by Andreas Rheinhardt 30 Apr '25

30 Apr '25

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Mon Apr 28 11:31:49 2025 +0200| [f98c63e417d13dc5a30a1d2c2de550d8958f7b10] | committer: Andreas Rheinhardt avformat/apvdec: Fix seeking pkt->pos pointed to the actual packet data, not to the start of the access unit. Reviewed-by: Mark Thompson <sw(a)jkqxz.net> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f98c63e417d13dc5a… --- libavformat/apvdec.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/apvdec.c b/libavformat/apvdec.c index 300ee77316..d2c2a50629 100644 --- a/libavformat/apvdec.c +++ b/libavformat/apvdec.c @@ -227,6 +227,7 @@ static int apv_read_packet(AVFormatContext *s, AVPacket *pkt) ret = av_get_packet(s->pb, pkt, au_size); if (ret < 0) return ret; + pkt->pos -= 4; pkt->flags = AV_PKT_FLAG_KEY; signature = AV_RB32(pkt->data);

1 0

avformat/apvdec: Check before access
by Andreas Rheinhardt 30 Apr '25

30 Apr '25

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Mon Apr 28 11:25:26 2025 +0200| [8279d02cf1998ec324b7624dc41ed15dc2b01cae] | committer: Andreas Rheinhardt avformat/apvdec: Check before access The signature check would segfault in case the packet could not be allocated or if nothing could be read. Furthermore, read_packet callbacks are supposed to return zero on success, yet the current code returned the size of the packet. Reviewed-by: Mark Thompson <sw(a)jkqxz.net> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8279d02cf1998ec32… --- libavformat/apvdec.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavformat/apvdec.c b/libavformat/apvdec.c index 9f94a901ec..300ee77316 100644 --- a/libavformat/apvdec.c +++ b/libavformat/apvdec.c @@ -225,7 +225,9 @@ static int apv_read_packet(AVFormatContext *s, AVPacket *pkt) } ret = av_get_packet(s->pb, pkt, au_size); - pkt->flags = AV_PKT_FLAG_KEY; + if (ret < 0) + return ret; + pkt->flags = AV_PKT_FLAG_KEY; signature = AV_RB32(pkt->data); if (signature != APV_SIGNATURE) { @@ -233,7 +235,7 @@ static int apv_read_packet(AVFormatContext *s, AVPacket *pkt) return AVERROR_INVALIDDATA; } - return ret; + return 0; } const FFInputFormat ff_apv_demuxer = {

1 0

avformat/apvdec: Use ffio_read_size()
by Andreas Rheinhardt 30 Apr '25

30 Apr '25

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Sun Apr 27 20:14:35 2025 +0200| [0a12b84d3b4025d55c443e5356d6eba546bcc1bb] | committer: Andreas Rheinhardt avformat/apvdec: Use ffio_read_size() Fixes potential use of uninitialized data. Reviewed-by: Mark Thompson <sw(a)jkqxz.net> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0a12b84d3b4025d55… --- libavformat/apvdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/apvdec.c b/libavformat/apvdec.c index e1ac34b003..9f94a901ec 100644 --- a/libavformat/apvdec.c +++ b/libavformat/apvdec.c @@ -164,7 +164,7 @@ static int apv_read_header(AVFormatContext *s) err = ffio_ensure_seekback(s->pb, sizeof(buffer)); if (err < 0) return err; - size = avio_read(s->pb, buffer, sizeof(buffer)); + size = ffio_read_size(s->pb, buffer, sizeof(buffer)); if (size < 0) return size;

1 0

doc/resampler.texi: add missing swr channel layout options
by James Almer 30 Apr '25

30 Apr '25

ffmpeg | branch: release/5.1 | James Almer <jamrial(a)gmail.com> | Fri Feb 17 15:22:38 2023 -0300| [cb46a097507f5fee04ee42c9efb3badffe3c98f3] | committer: Marton Balint doc/resampler.texi: add missing swr channel layout options Signed-off-by: James Almer <jamrial(a)gmail.com> (cherry picked from commit 1d14959f12ffd720377684af830a51d0cdb2aa8c) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cb46a097507f5fee0… --- doc/resampler.texi | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/doc/resampler.texi b/doc/resampler.texi index 5ed3f4377a..d55654e7bc 100644 --- a/doc/resampler.texi +++ b/doc/resampler.texi @@ -11,16 +11,6 @@ programmatic use. @table @option -@item ich, in_channel_count -Set the number of input channels. Default value is 0. Setting this -value is not mandatory if the corresponding channel layout -@option{in_channel_layout} is set. - -@item och, out_channel_count -Set the number of output channels. Default value is 0. Setting this -value is not mandatory if the corresponding channel layout -@option{out_channel_layout} is set. - @item uch, used_channel_count Set the number of used input channels. Default value is 0. This option is only used for special remapping. @@ -41,8 +31,8 @@ Specify the output sample format. It is set by default to @code{none}. Set the internal sample format. Default value is @code{none}. This will automatically be chosen when it is not explicitly set. -@item icl, in_channel_layout -@item ocl, out_channel_layout +@item ichl, in_chlayout +@item ochl, out_chlayout Set the input/output channel layout. See @ref{channel layout syntax,,the Channel Layout section in the ffmpeg-utils(1) manual,ffmpeg-utils}

1 0

swresample/swresample_frame: fix regression in detecting changes
by Paul B Mahol 30 Apr '25

30 Apr '25

ffmpeg | branch: release/5.1 | Paul B Mahol <onemda(a)gmail.com> | Wed Jan 4 17:53:01 2023 +0100| [f868ded795ed40ec53730ddbdb33cd2c61a644d7] | committer: Marton Balint swresample/swresample_frame: fix regression in detecting changes Do not overwrite return variable values, instead use different one for checking results. (cherry picked from commit 99bd2dbc9101549b4c6afb3e8d50c6a9e9e80215) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f868ded795ed40ec5… --- libswresample/swresample_frame.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libswresample/swresample_frame.c b/libswresample/swresample_frame.c index 53ac487136..8726ee58e9 100644 --- a/libswresample/swresample_frame.c +++ b/libswresample/swresample_frame.c @@ -84,7 +84,7 @@ static int config_changed(SwrContext *s, const AVFrame *out, const AVFrame *in) { AVChannelLayout ch_layout = { 0 }; - int ret = 0; + int ret = 0, err; if (in) { #if FF_API_OLD_CHANNEL_LAYOUT @@ -96,8 +96,8 @@ FF_DISABLE_DEPRECATION_WARNINGS FF_ENABLE_DEPRECATION_WARNINGS } else #endif - if ((ret = av_channel_layout_copy(&ch_layout, &in->ch_layout)) < 0) - return ret; + if ((err = av_channel_layout_copy(&ch_layout, &in->ch_layout)) < 0) + return err; if (av_channel_layout_compare(&s->in_ch_layout, &ch_layout) || s->in_sample_rate != in->sample_rate || s->in_sample_fmt != in->format) { @@ -116,8 +116,8 @@ FF_DISABLE_DEPRECATION_WARNINGS FF_ENABLE_DEPRECATION_WARNINGS } else #endif - if ((ret = av_channel_layout_copy(&ch_layout, &out->ch_layout)) < 0) - return ret; + if ((err = av_channel_layout_copy(&ch_layout, &out->ch_layout)) < 0) + return err; if (av_channel_layout_compare(&s->out_ch_layout, &ch_layout) || s->out_sample_rate != out->sample_rate || s->out_sample_fmt != out->format) {

1 0