July 2026 - ffmpeg-cvslog - lists.ffmpeg.org

[ffmpeg] Add new mode to mpdecimate video filter (branch master)
by StachowiakDawid 21 Jul '26

21 Jul '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 c182b1c09c Add new mode to mpdecimate video filter c182b1c09c is described below commit c182b1c09c086deb62545393cc7b4a829d541508 Author: StachowiakDawid <dawidos234(a)gmail.com> AuthorDate: Thu Jan 2 14:54:03 2025 +0100 Commit: StachowiakDawid <email(a)dawidstachowiak.pl> CommitDate: Mon Jul 20 17:49:47 2026 +0000 Add new mode to mpdecimate video filter --- doc/filters.texi | 16 +++- libavfilter/vf_mpdecimate.c | 111 +++++++++++++++++++++----- tests/fate/filter-video.mak | 6 ++ tests/ref/fate/filter-mpdecimate-mode-1 | 10 +++ tests/ref/fate/filter-mpdecimate-mode-1-min-3 | 12 +++ 5 files changed, 133 insertions(+), 22 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index 002979ba08..985a1615a9 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -18721,16 +18721,28 @@ fixing movies that were inverse-telecined incorrectly. A description of the accepted options follows. @table @option +@item mode +Set the mode. If the value is 0, the filter drops similar frames. +If the value is 1, the filter keeps only frames that are one representative of sufficiently long duplicate runs. + +Default value is 0. + @item max -Set the maximum number of consecutive frames which can be dropped (if +For mode 0: Set the maximum number of consecutive frames which can be dropped (if positive), or the minimum interval between dropped frames (if negative). If the value is 0, the frame is dropped disregarding the number of previous sequentially dropped frames. Default value is 0. +@item min +For mode 1: Set the minimum number of frame duplicates to mark the frame as non-unique +and keep the first occurrence of it. + +Default value is 1. + @item keep -Set the maximum number of consecutive similar frames to ignore before to start dropping them. +For mode 0: Set the maximum number of consecutive similar frames to ignore before to start dropping them. If the value is 0, the frame is dropped disregarding the number of previous sequentially similar frames. diff --git a/libavfilter/vf_mpdecimate.c b/libavfilter/vf_mpdecimate.c index 00bc6699c3..7523af2e86 100644 --- a/libavfilter/vf_mpdecimate.c +++ b/libavfilter/vf_mpdecimate.c @@ -1,6 +1,7 @@ /* * Copyright (c) 2003 Rich Felker * Copyright (c) 2012 Stefano Sabatini + * Copyright (c) 2026 Dawid Stachowiak * * This file is part of FFmpeg. * @@ -40,19 +41,23 @@ typedef enum { typedef struct DecimateContext { const AVClass *class; + int mode; ///< 0: drop similar frames, 1: drop similar and unique frames int lo, hi; ///< lower and higher threshold number of differences ///< values for 8x8 blocks float frac; ///< threshold of changed pixels over the total fraction - int max_drop_count; ///< if positive: maximum number of sequential frames to drop - ///< if negative: minimum number of frames between two drops + int max_drop_count; ///< for mode 0: if positive: maximum number of sequential frames to drop + ///< for mode 0: if negative: minimum number of frames between two drops int drop_count; ///< if positive: number of frames sequentially dropped ///< if negative: number of sequential frames which were not dropped - int max_keep_count; ///< number of similar frames to ignore before to start dropping them - int keep_count; ///< number of similar frames already ignored + int max_keep_count; ///< for mode 0: number of similar frames to ignore before to start dropping them + int keep_count; ///< for mode 0: number of similar frames already ignored + + int min_dup_count; ///< for mode 1: minimum number of previous frames that need to be duplicated to keep frame + int dup_count; ///< for mode 1: number of duplicated frames int hsub, vsub; ///< chroma subsampling values AVFrame *ref; ///< reference picture @@ -63,13 +68,16 @@ typedef struct DecimateContext { #define FLAGS AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_FILTERING_PARAM static const AVOption mpdecimate_options[] = { - { "max", "set the maximum number of consecutive dropped frames (positive), or the minimum interval between dropped frames (negative)", + { "max", "for mode 0: set the maximum number of consecutive dropped frames (positive), or the minimum interval between dropped frames (negative)", OFFSET(max_drop_count), AV_OPT_TYPE_INT, {.i64=0}, INT_MIN, INT_MAX, FLAGS }, - { "keep", "set the number of similar consecutive frames to be kept before starting to drop similar frames", + { "keep", "for mode 0: set the number of similar consecutive frames to be kept before starting to drop similar frames", OFFSET(max_keep_count), AV_OPT_TYPE_INT, {.i64=0}, 0, INT_MAX, FLAGS }, { "hi", "set high dropping threshold", OFFSET(hi), AV_OPT_TYPE_INT, {.i64=64*12}, INT_MIN, INT_MAX, FLAGS }, { "lo", "set low dropping threshold", OFFSET(lo), AV_OPT_TYPE_INT, {.i64=64*5}, INT_MIN, INT_MAX, FLAGS }, { "frac", "set fraction dropping threshold", OFFSET(frac), AV_OPT_TYPE_FLOAT, {.dbl=0.33}, 0, 1, FLAGS }, + { "mode", "0: drop similar frames, 1: drop similar and unique frames", OFFSET(mode), AV_OPT_TYPE_INT, {.i64=0}, 0, 1, FLAGS }, + { "min", "for mode 1: set minimum number of previous frames that need to be duplicated to keep current frame", + OFFSET(min_dup_count), AV_OPT_TYPE_INT, {.i64=1}, 1, INT_MAX, FLAGS }, { NULL } }; @@ -113,16 +121,13 @@ static int diff_planes(AVFilterContext *ctx, } /** - * Tell if the frame should be decimated, for example if it is no much - * different with respect to the reference frame ref. + * Tell if the frame is different with respect to the reference frame ref. */ -static DecimateResult decimate_frame(AVFilterContext *ctx, AVFrame *cur, AVFrame *ref) +static int is_frame_different(AVFilterContext *ctx, + AVFrame *cur, AVFrame *ref) { DecimateContext *decimate = ctx->priv; int plane; - int is_similar; - - is_similar = 1; for (plane = 0; ref->data[plane] && ref->linesize[plane]; plane++) { /* use 8x8 SAD even on subsampled planes. The blocks won't match up with @@ -135,12 +140,23 @@ static DecimateResult decimate_frame(AVFilterContext *ctx, AVFrame *cur, AVFrame if (diff_planes(ctx, cur->data[plane], cur->linesize[plane], ref->data[plane], ref->linesize[plane], - AV_CEIL_RSHIFT(ref->width, hsub), - AV_CEIL_RSHIFT(ref->height, vsub))) { - is_similar = 0; - break; - } + AV_CEIL_RSHIFT(ref->width, hsub), + AV_CEIL_RSHIFT(ref->height, vsub))) + return 1; } + + return 0; +} + +/** + * Tell if the frame should be decimated, for example if it is no much + * different with respect to the reference frame ref. + */ +static DecimateResult decimate_frame(AVFilterContext *ctx, AVFrame *cur, AVFrame *ref) +{ + DecimateContext *decimate = ctx->priv; + int is_similar = is_frame_different(ctx, cur, ref) == 0; + if (!is_similar) { return DECIMATE_KEEP_UPDATE; } @@ -169,9 +185,14 @@ static av_cold int init(AVFilterContext *ctx) if (!decimate->sad) return AVERROR(EINVAL); - av_log(ctx, AV_LOG_VERBOSE, "max_drop_count:%d hi:%d lo:%d frac:%f\n", + if (decimate->mode == 1) { + av_log(ctx, AV_LOG_VERBOSE, "min_dup_count:%d hi:%d lo:%d frac:%f\n", + decimate->min_dup_count, decimate->hi, decimate->lo, + decimate->frac); + } else { + av_log(ctx, AV_LOG_VERBOSE, "max_drop_count:%d hi:%d lo:%d frac:%f\n", decimate->max_drop_count, decimate->hi, decimate->lo, decimate->frac); - + } return 0; } @@ -208,7 +229,7 @@ static int config_input(AVFilterLink *inlink) return 0; } -static int filter_frame(AVFilterLink *inlink, AVFrame *cur) +static int filter_frame_mode_0(AVFilterLink *inlink, AVFrame *cur) { DecimateContext *decimate = inlink->dst->priv; AVFilterLink *outlink = inlink->dst->outputs[0]; @@ -257,6 +278,56 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *cur) return 0; } +static int filter_frame_mode_1(AVFilterLink *inlink, AVFrame *cur) +{ + DecimateContext *decimate = inlink->dst->priv; + AVFilterLink *outlink = inlink->dst->outputs[0]; + int ret; + AVFrame *out = NULL; + + if (!decimate->ref || is_frame_different(inlink->dst, cur, decimate->ref)) { + AVFrame *ref = av_frame_clone(cur); + if (!ref) { + av_frame_free(&cur); + return AVERROR(ENOMEM); + } + av_frame_free(&decimate->ref); + decimate->ref = ref; + decimate->dup_count = 0; + } else { + decimate->dup_count++; + } + + av_log(inlink->dst, AV_LOG_DEBUG, + "%s pts:%s pts_time:%s dup_count:%d\n", + decimate->dup_count == + decimate->min_dup_count ? "keep" : "drop", av_ts2str(cur->pts), + av_ts2timestr(cur->pts, &inlink->time_base), + decimate->dup_count); + + if (decimate->dup_count == decimate->min_dup_count) { + out = av_frame_clone(decimate->ref); + if (!out) { + av_frame_free(&cur); + return AVERROR(ENOMEM); + } + ret = ff_filter_frame(outlink, out); + if (ret < 0) { + av_frame_free(&cur); + return ret; + } + } + av_frame_free(&cur); + + return 0; +} + +static int filter_frame(AVFilterLink *inlink, AVFrame *cur) +{ + DecimateContext *decimate = inlink->dst->priv; + return decimate->mode == 0 ? filter_frame_mode_0(inlink, cur) : filter_frame_mode_1(inlink, cur); +} + static const AVFilterPad mpdecimate_inputs[] = { { .name = "default", diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak index f5f5096f2b..0eb2e7076c 100644 --- a/tests/fate/filter-video.mak +++ b/tests/fate/filter-video.mak @@ -475,6 +475,12 @@ fate-filter-mpdecimate-maxdrop-pos: CMD = framecrc -lavfi testsrc2=r=1:d=5,fps=1 FATE_FILTER-$(call FILTERFRAMECRC, TESTSRC2 FPS MPDECIMATE) += fate-filter-mpdecimate-maxdrop-neg fate-filter-mpdecimate-maxdrop-neg: CMD = framecrc -lavfi testsrc2=r=1:d=5,fps=10,mpdecimate=max=-3 -pix_fmt yuv420p +FATE_FILTER-$(call FILTERFRAMECRC, TESTSRC2 FPS MPDECIMATE) += fate-filter-mpdecimate-mode-1 +fate-filter-mpdecimate-mode-1: CMD = framecrc -lavfi testsrc2=r=4:d=5,fps=5,mpdecimate=mode=1 -pix_fmt yuv420p + +FATE_FILTER-$(call FILTERFRAMECRC, TESTSRC2 FPS MPDECIMATE) += fate-filter-mpdecimate-mode-1-min-3 +fate-filter-mpdecimate-mode-1-min-3: CMD = framecrc -lavfi testsrc2=r=2:d=7,fps=7,mpdecimate=mode=1:min=3 -pix_fmt yuv420p + FATE_FILTER-$(call FILTERFRAMECRC, FPS TESTSRC2) += $(addprefix fate-filter-fps-, up up-round-down up-round-up down down-round-down down-round-up down-eof-pass start-drop start-fill) fate-filter-fps-up: CMD = framecrc -lavfi testsrc2=r=3:d=2,fps=7 fate-filter-fps-up-round-down: CMD = framecrc -lavfi testsrc2=r=3:d=2,fps=7:round=down diff --git a/tests/ref/fate/filter-mpdecimate-mode-1 b/tests/ref/fate/filter-mpdecimate-mode-1 new file mode 100644 index 0000000000..f55c09e4be --- /dev/null +++ b/tests/ref/fate/filter-mpdecimate-mode-1 @@ -0,0 +1,10 @@ +#tb 0: 1/5 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 320x240 +#sar 0: 1/1 +0, 1, 1, 1, 115200, 0xbd87f5f6 +0, 6, 6, 1, 115200, 0xa0e1f3d6 +0, 11, 11, 1, 115200, 0xc0c5fe56 +0, 16, 16, 1, 115200, 0xba2fccf6 +0, 21, 21, 1, 115200, 0xccefb2df diff --git a/tests/ref/fate/filter-mpdecimate-mode-1-min-3 b/tests/ref/fate/filter-mpdecimate-mode-1-min-3 new file mode 100644 index 0000000000..3897f6834e --- /dev/null +++ b/tests/ref/fate/filter-mpdecimate-mode-1-min-3 @@ -0,0 +1,12 @@ +#tb 0: 1/7 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 320x240 +#sar 0: 1/1 +0, 0, 0, 1, 115200, 0xeba70ff3 +0, 7, 7, 1, 115200, 0x1dadb3a3 +0, 14, 14, 1, 115200, 0xb8cdb7ac +0, 21, 21, 1, 115200, 0xb789c3ba +0, 28, 28, 1, 115200, 0xd1084e35 +0, 35, 35, 1, 115200, 0x7bbb8ede +0, 42, 42, 1, 115200, 0x939ba4bd

1 0

[ffmpeg] branch release/9.0 updated (d124bfeada -> 3abec89a45)
by ffmpeg-git 20 Jul '26

20 Jul '26

This is an automated email from the git hooks/post-receive script. Git pushed a change to branch release/9.0 in repository ffmpeg. from d124bfeada vf_libplacebo: add missing avstring.h include new 60aca6ace7 avcodec/d3d12va_av1: check size of frame bitstream against available buffer size new a90fbb6bc9 avcodec/d3d12va_av1: check slice bitstream size against available buffer size new 3a44bddfb9 avcodec/d3d12va_h264: check size of frame bitstream against available buffer size new b19b023f2a avcodec/d3d12va_hevc: check size of frame bitstream against available buffer size new 865374b1ab avcodec/d3d12va_mpeg2: check size of frame bitstream against available buffer size new ae0feeac8d avcodec/d3d12va_vc1: check size of frame bitstream against available buffer size new 3abec89a45 avcodec/d3d12va_vp9: check size of frame bitstream against available buffer size The 7 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/d3d12va_av1.c | 18 ++++++++++++++++-- libavcodec/d3d12va_h264.c | 10 ++++++++++ libavcodec/d3d12va_hevc.c | 10 ++++++++++ libavcodec/d3d12va_mpeg2.c | 6 ++++++ libavcodec/d3d12va_vc1.c | 10 ++++++++++ libavcodec/d3d12va_vp9.c | 6 ++++++ 6 files changed, 58 insertions(+), 2 deletions(-)

2 7

[ffmpeg] branch release/8.1 updated (94138f6973 -> 703dcc25b9)
by ffmpeg-git 20 Jul '26

20 Jul '26

This is an automated email from the git hooks/post-receive script. Git pushed a change to branch release/8.1 in repository ffmpeg. from 94138f6973 avfilter/vsrc_gfxcapture_winrt: add missing system_error include new f84c03170e avcodec/d3d12va_av1: check size of frame bitstream against available buffer size new c67fa972f7 avcodec/d3d12va_av1: check slice bitstream size against available buffer size new 90b9492b21 avcodec/d3d12va_h264: check size of frame bitstream against available buffer size new 76b400a867 avcodec/d3d12va_hevc: check size of frame bitstream against available buffer size new ad14e248c1 avcodec/d3d12va_mpeg2: check size of frame bitstream against available buffer size new 664fb70302 avcodec/d3d12va_vc1: check size of frame bitstream against available buffer size new 703dcc25b9 avcodec/d3d12va_vp9: check size of frame bitstream against available buffer size The 7 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/d3d12va_av1.c | 18 ++++++++++++++++-- libavcodec/d3d12va_h264.c | 10 ++++++++++ libavcodec/d3d12va_hevc.c | 10 ++++++++++ libavcodec/d3d12va_mpeg2.c | 6 ++++++ libavcodec/d3d12va_vc1.c | 10 ++++++++++ libavcodec/d3d12va_vp9.c | 6 ++++++ 6 files changed, 58 insertions(+), 2 deletions(-)

2 7

[ffmpeg] branch release/8.0 updated (435ae0581d -> e5524a88a7)
by ffmpeg-git 20 Jul '26

20 Jul '26

This is an automated email from the git hooks/post-receive script. Git pushed a change to branch release/8.0 in repository ffmpeg. from 435ae0581d avutil/hwcontext_cuda: fix yuv420p V/U plane overlap in cuda_get_buffer() new 75783603e6 avcodec/d3d12va_av1: check size of frame bitstream against available buffer size new dc077905d9 avcodec/d3d12va_av1: check slice bitstream size against available buffer size new ad10b0d5c6 avcodec/d3d12va_h264: check size of frame bitstream against available buffer size new 246aa085a5 avcodec/d3d12va_hevc: check size of frame bitstream against available buffer size new 1c81d7bc14 avcodec/d3d12va_mpeg2: check size of frame bitstream against available buffer size new e563bc0448 avcodec/d3d12va_vc1: check size of frame bitstream against available buffer size new e5524a88a7 avcodec/d3d12va_vp9: check size of frame bitstream against available buffer size The 7 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/d3d12va_av1.c | 18 ++++++++++++++++-- libavcodec/d3d12va_h264.c | 10 ++++++++++ libavcodec/d3d12va_hevc.c | 10 ++++++++++ libavcodec/d3d12va_mpeg2.c | 6 ++++++ libavcodec/d3d12va_vc1.c | 10 ++++++++++ libavcodec/d3d12va_vp9.c | 6 ++++++ 6 files changed, 58 insertions(+), 2 deletions(-)

2 7

[ffmpeg] branch release/7.1 updated (998de74adf -> b9a218bc1e)
by ffmpeg-git 20 Jul '26

20 Jul '26

This is an automated email from the git hooks/post-receive script. Git pushed a change to branch release/7.1 in repository ffmpeg. from 998de74adf avformat/demux: use io_close2 when closing avfromat new 969c77b554 avcodec/d3d12va_av1: check size of frame bitstream against available buffer size new 2f9d65884f avcodec/d3d12va_av1: check slice bitstream size against available buffer size new f9e4940772 avcodec/d3d12va_h264: check size of frame bitstream against available buffer size new c2661d570f avcodec/d3d12va_hevc: check size of frame bitstream against available buffer size new 6b26c4abd2 avcodec/d3d12va_mpeg2: check size of frame bitstream against available buffer size new 60213cca34 avcodec/d3d12va_vc1: check size of frame bitstream against available buffer size new b9a218bc1e avcodec/d3d12va_vp9: check size of frame bitstream against available buffer size The 7 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/d3d12va_av1.c | 18 ++++++++++++++++-- libavcodec/d3d12va_h264.c | 10 ++++++++++ libavcodec/d3d12va_hevc.c | 10 ++++++++++ libavcodec/d3d12va_mpeg2.c | 6 ++++++ libavcodec/d3d12va_vc1.c | 10 ++++++++++ libavcodec/d3d12va_vp9.c | 6 ++++++ 6 files changed, 58 insertions(+), 2 deletions(-)

2 7

[ffmpeg] branch master updated (1b0c9e3dce -> c23123630e)
by ffmpeg-git 20 Jul '26

20 Jul '26

This is an automated email from the git hooks/post-receive script. Git pushed a change to branch master in repository ffmpeg. from 1b0c9e3dce forgejo/workflows: block concurrent backport runs for the same pull request new 8fe61b7a64 libavcodec/mediacodecdec_common: improve logging for failing to get codec new c23123630e libavcodec/mediacodecdec_common: support AV_HWACCEL_FLAG_ALLOW_PROFILE_MISMATCH 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: libavcodec/mediacodecdec_common.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)

2 2

[ffmpeg] forgejo/workflows: block concurrent backport runs for the same pull request (branch master)
by Timo Rothenpieler 19 Jul '26

19 Jul '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 1b0c9e3dce forgejo/workflows: block concurrent backport runs for the same pull request 1b0c9e3dce is described below commit 1b0c9e3dce64423052e204ca5669a21f9f9a2eac Author: Timo Rothenpieler <timo(a)rothenpieler.org> AuthorDate: Sun Jul 19 22:45:55 2026 +0200 Commit: Timo Rothenpieler <timo(a)rothenpieler.org> CommitDate: Sun Jul 19 22:47:17 2026 +0200 forgejo/workflows: block concurrent backport runs for the same pull request --- .forgejo/workflows/backports.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.forgejo/workflows/backports.yml b/.forgejo/workflows/backports.yml index 30c4e5a4ca..fea0ea7dcf 100644 --- a/.forgejo/workflows/backports.yml +++ b/.forgejo/workflows/backports.yml @@ -8,6 +8,10 @@ on: - closed - labeled +concurrency: + cancel-in-progress: false + group: backport-${{ forgejo.event.pull_request.number }} + jobs: backporting: name: PR

1 0

[ffmpeg] forgejo/workflows: fix backport condition compatibility (branch master)
by Timo Rothenpieler 19 Jul '26

19 Jul '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 162c2784f9 forgejo/workflows: fix backport condition compatibility 162c2784f9 is described below commit 162c2784f90969ae53c1f4aa36d22ef93945a293 Author: Timo Rothenpieler <timo(a)rothenpieler.org> AuthorDate: Sun Jul 19 18:29:57 2026 +0200 Commit: Timo Rothenpieler <timo(a)rothenpieler.org> CommitDate: Sun Jul 19 18:29:57 2026 +0200 forgejo/workflows: fix backport condition compatibility --- .forgejo/workflows/backports.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.forgejo/workflows/backports.yml b/.forgejo/workflows/backports.yml index 9a07164cc2..30c4e5a4ca 100644 --- a/.forgejo/workflows/backports.yml +++ b/.forgejo/workflows/backports.yml @@ -1,6 +1,6 @@ # SPDX-License-Identifier: MIT -name: Pull Request Backporting +name: Backport on: pull_request_target: @@ -10,11 +10,11 @@ on: jobs: backporting: - name: Backporting + name: PR if: > - forgejo.event.pull_request.merged && ( - (forgejo.event.action == 'closed' && contains(forgejo.event.pull_request.labels.*.name, 'backport/')) || - (forgejo.event.action == 'labeled' && contains(forgejo.event.label.name, 'backport/')) + ( vars.BACKPORTS == 'enabled' ) && ( + forgejo.event.pull_request.merged && + contains(toJSON(forgejo.event.pull_request.labels), 'backport/release/') ) runs-on: utilities steps:

1 0

[ffmpeg] forgejo/workflows: add workflow for automatic backport PRs via labels (branch master)
by Timo Rothenpieler 19 Jul '26

19 Jul '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 e2acef488f forgejo/workflows: add workflow for automatic backport PRs via labels e2acef488f is described below commit e2acef488f20098576cfbcd99c0c256313e913e8 Author: Timo Rothenpieler <timo(a)rothenpieler.org> AuthorDate: Wed Jul 15 22:59:11 2026 +0200 Commit: Timo Rothenpieler <timo(a)rothenpieler.org> CommitDate: Sun Jul 19 18:10:07 2026 +0200 forgejo/workflows: add workflow for automatic backport PRs via labels --- .forgejo/workflows/backports.yml | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/.forgejo/workflows/backports.yml b/.forgejo/workflows/backports.yml new file mode 100644 index 0000000000..9a07164cc2 --- /dev/null +++ b/.forgejo/workflows/backports.yml @@ -0,0 +1,33 @@ +# SPDX-License-Identifier: MIT + +name: Pull Request Backporting + +on: + pull_request_target: + types: + - closed + - labeled + +jobs: + backporting: + name: Backporting + if: > + forgejo.event.pull_request.merged && ( + (forgejo.event.action == 'closed' && contains(forgejo.event.pull_request.labels.*.name, 'backport/')) || + (forgejo.event.action == 'labeled' && contains(forgejo.event.label.name, 'backport/')) + ) + runs-on: utilities + steps: + - uses: actions/git-backporting@main + with: + target-branch-pattern: "^backport/(?<target>(.+))$" + strategy: ort + strategy-option: find-renames + cherry-pick-options: -x + bp-repo: ffmpeg-devel/FFmpeg + auth: ${{ secrets.BACKPORT_TOKEN }} + pull-request: ${{ forgejo.event.pull_request.url }} + auto-no-squash: true + enable-err-notification: true + git-user: ffmpeg-devel + git-email: code(a)ffmpeg.org

1 0

[ffmpeg] avcodec/aacpsy: fix the attack lookback (branch master)
by Lynne 19 Jul '26

19 Jul '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 3a8a1a7c6a avcodec/aacpsy: fix the attack lookback 3a8a1a7c6a is described below commit 3a8a1a7c6a20cb2738bc3721624b7d10d1fec19d Author: Lynne <dev(a)lynne.ee> AuthorDate: Sun Jul 19 23:45:01 2026 +0800 Commit: Lynne <dev(a)lynne.ee> CommitDate: Sun Jul 19 23:50:55 2026 +0800 avcodec/aacpsy: fix the attack lookback This fixes a 15+ year old bug. The novelty check read its previous-frame envelope from prev_energy_subshort after the sub-block loop had already overwritten it with current-frame values, so early sub-blocks were compared against the frame's own future instead of the past. That accident suppressed short-period pitch trains well enough, but also suppressed genuine onsets, and could not see pulse periods beyond ~12ms at all: on quiet slow pulse trains (engine-idle buzz and the like) the ratio test leaks sporadic isolated short excursions, each an audible click - reported against this encoder since 2015, at every bitrate, and immune to disabling every coding tool. Keep a rolling two-frame history of HP sub-block peaks instead and require an attack to tower over it: within ~12ms unconditionally (pitch-rate trains), and within ~44ms when coming from steady long-window state (slow trains, where an isolated short excursion can only click). Dense irregular transients tower locally and reset frames_since_short, so their block switching is untouched. --- libavcodec/aacpsy.c | 64 +++++++++++++++++++++++++++++------------------------ tests/fate/aac.mak | 6 ++--- 2 files changed, 38 insertions(+), 32 deletions(-) diff --git a/libavcodec/aacpsy.c b/libavcodec/aacpsy.c index e0faa2a19a..04e0c67ba4 100644 --- a/libavcodec/aacpsy.c +++ b/libavcodec/aacpsy.c @@ -107,6 +107,11 @@ enum { #define PSY_LAME_PE_QUIET 0.4f ///< pre-onset must be below this fraction of the frame peak #define PSY_LAME_PE_RED 0.45f ///< attack-threshold multiplier for a qualifying isolated onset +/* The novelty check must see at least one full period of a pulse train to + * recognize its pulses as repeats; 30 sub-blocks reaches down to ~23Hz. */ +#define PSY_LAME_HIST 32 ///< HP sub-block peak history depth +#define PSY_LAME_NOV_BACK 30 ///< novelty look-back in sub-blocks + /** * @} */ @@ -140,6 +145,7 @@ typedef struct AacPsyChannel{ /* LAME psy model specific members */ float attack_threshold; ///< attack threshold for this channel float prev_energy_subshort[AAC_NUM_BLOCKS_SHORT * PSY_LAME_NUM_SUBBLOCKS]; + float hp_env_hist[PSY_LAME_HIST]; ///< rolling HP sub-block peak envelope int prev_attack; ///< attack value for the last short block in the previous sequence int next_attack0_zero; ///< whether attack[0] of the next frame is zero int frames_since_short; ///< consecutive long frames (pre-echo-aware isolated-onset gate) @@ -293,6 +299,8 @@ static av_cold void lame_window_init(AacPsyContext *ctx, AVCodecContext *avctx) for (j = 0; j < AAC_NUM_BLOCKS_SHORT * PSY_LAME_NUM_SUBBLOCKS; j++) pch->prev_energy_subshort[j] = 10.0f; + for (j = 0; j < PSY_LAME_HIST; j++) + pch->hp_env_hist[j] = 10.0f; } } @@ -1001,15 +1009,14 @@ static int psy_lame_detect(AacPsyContext *pctx, AacPsyChannel *pch, attack_intensity[i + PSY_LAME_NUM_SUBBLOCKS] = p; } - { /* pre-echo-aware threshold relaxation + periodicity/novelty veto (a - * pitch-pulse train repeats its peak; a real onset towers) */ + { /* pre-echo-aware threshold relaxation + periodicity/novelty check + * (a pulse train repeats its peak; a real onset towers) */ float frame_peak = 1.0f; - float eh[8 + (AAC_NUM_BLOCKS_SHORT + 1) * PSY_LAME_NUM_SUBBLOCKS]; + float env[PSY_LAME_HIST + AAC_NUM_BLOCKS_SHORT * PSY_LAME_NUM_SUBBLOCKS]; const float nov_gate = 1.25f; - for (i = 0; i < 8; i++) - eh[i] = pch->prev_energy_subshort[8 + i]; - for (i = 0; i < (AAC_NUM_BLOCKS_SHORT + 1) * PSY_LAME_NUM_SUBBLOCKS; i++) - eh[8 + i] = energy_subshort[i]; + memcpy(env, pch->hp_env_hist, sizeof(pch->hp_env_hist)); + memcpy(env + PSY_LAME_HIST, energy_subshort + PSY_LAME_NUM_SUBBLOCKS, + AAC_NUM_BLOCKS_SHORT * PSY_LAME_NUM_SUBBLOCKS * sizeof(*env)); for (i = PSY_LAME_NUM_SUBBLOCKS; i < (AAC_NUM_BLOCKS_SHORT + 1) * PSY_LAME_NUM_SUBBLOCKS; i++) frame_peak = FFMAX(frame_peak, energy_subshort[i]); for (i = 0; i < (AAC_NUM_BLOCKS_SHORT + 1) * PSY_LAME_NUM_SUBBLOCKS; i++) @@ -1020,11 +1027,21 @@ static int psy_lame_detect(AacPsyContext *pctx, AacPsyChannel *pch, energy_subshort[i - PSY_LAME_NUM_SUBBLOCKS] < PSY_LAME_PE_QUIET * frame_peak) thr *= PSY_LAME_PE_RED; if (attack_intensity[i] > thr) { + /* An attack must tower over the recent HP envelope: + * within ~12ms always (pitch-rate trains), within + * ~44ms only from steady long-window state (slow + * pulse trains, where an isolated short excursion + * is an audible click). */ if (nov_gate > 0.0f && i >= PSY_LAME_NUM_SUBBLOCKS) { - float prevmax = 1.0f; + const int pos = PSY_LAME_HIST + i - PSY_LAME_NUM_SUBBLOCKS; + float nearmax = 1.0f, deepmax = 1.0f; for (int k = 3; k <= 8; k++) - prevmax = FFMAX(prevmax, eh[8 + i - k]); - if (energy_subshort[i] < nov_gate * prevmax) + nearmax = FFMAX(nearmax, env[pos - k]); + for (int k = 3; k <= PSY_LAME_NOV_BACK; k++) + deepmax = FFMAX(deepmax, env[pos - k]); + if (energy_subshort[i] < nov_gate * nearmax || + (energy_subshort[i] < nov_gate * deepmax && + pch->frames_since_short >= PSY_LAME_PE_GAP)) continue; /* periodic, not an onset */ } attacks[i / PSY_LAME_NUM_SUBBLOCKS] = (i % PSY_LAME_NUM_SUBBLOCKS) + 1; @@ -1050,25 +1067,14 @@ static int psy_lame_detect(AacPsyContext *pctx, AacPsyChannel *pch, att_sum += attacks[i]; } - { /* novelty of each attacking sub-block against the trailing HP - * max-envelope (~1-2 pitch periods): a periodic pulse train repeats - * its peak every period (novelty ~1), a genuine onset towers over - * the recent past. Instrumentation only. */ - float eh[8 + (AAC_NUM_BLOCKS_SHORT + 1) * PSY_LAME_NUM_SUBBLOCKS]; - float novmax = 0.0f; - for (i = 0; i < 8; i++) - eh[i] = pch->prev_energy_subshort[8 + i]; - for (i = 0; i < (AAC_NUM_BLOCKS_SHORT + 1) * PSY_LAME_NUM_SUBBLOCKS; i++) - eh[8 + i] = energy_subshort[i]; - for (i = PSY_LAME_NUM_SUBBLOCKS; i < (AAC_NUM_BLOCKS_SHORT + 1) * PSY_LAME_NUM_SUBBLOCKS; i++) { - if (attacks[i / PSY_LAME_NUM_SUBBLOCKS] == (i % PSY_LAME_NUM_SUBBLOCKS) + 1) { - float prevmax = 1.0f; - for (int k = 3; k <= 8; k++) - prevmax = FFMAX(prevmax, eh[8 + i - k]); - novmax = FFMAX(novmax, eh[8 + i] / prevmax); - } - } - } + /* roll the HP sub-block peak history */ + memmove(pch->hp_env_hist, + pch->hp_env_hist + AAC_NUM_BLOCKS_SHORT * PSY_LAME_NUM_SUBBLOCKS, + (PSY_LAME_HIST - AAC_NUM_BLOCKS_SHORT * PSY_LAME_NUM_SUBBLOCKS) * + sizeof(*pch->hp_env_hist)); + memcpy(pch->hp_env_hist + PSY_LAME_HIST - AAC_NUM_BLOCKS_SHORT * PSY_LAME_NUM_SUBBLOCKS, + energy_subshort + PSY_LAME_NUM_SUBBLOCKS, + AAC_NUM_BLOCKS_SHORT * PSY_LAME_NUM_SUBBLOCKS * sizeof(*pch->hp_env_hist)); if (pch->next_attack0_zero) attacks[0] = 0; diff --git a/tests/fate/aac.mak b/tests/fate/aac.mak index 0724539c58..cf0c70c46a 100644 --- a/tests/fate/aac.mak +++ b/tests/fate/aac.mak @@ -224,7 +224,7 @@ FATE_AAC_ENCODE += fate-aac-ln-encode-128k fate-aac-ln-encode-128k: CMD = enc_dec_pcm mp4 wav s16le $(TARGET_SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav -c:a aac -aac_coder fast -aac_is 0 -aac_pns 0 -aac_ms 0 -aac_tns 0 -b:a 128k -cutoff 22050 -fflags +bitexact -flags +bitexact fate-aac-ln-encode-128k: CMP = stddev fate-aac-ln-encode-128k: REF = $(SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav -fate-aac-ln-encode-128k: CMP_TARGET = 638 +fate-aac-ln-encode-128k: CMP_TARGET = 622 fate-aac-ln-encode-128k: FUZZ = 10 FATE_AAC_ENCODE += fate-aac-pns-encode @@ -245,7 +245,7 @@ FATE_AAC_ENCODE += fate-aac-is-encode fate-aac-is-encode: CMD = enc_dec_pcm mp4 wav s16le $(TARGET_SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav -c:a aac -aac_coder fast -aac_pns 0 -aac_is 1 -aac_ms 0 -b:a 128k -aac_tns 0 -cutoff 22050 -fflags +bitexact -flags +bitexact fate-aac-is-encode: CMP = stddev fate-aac-is-encode: REF = $(SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav -fate-aac-is-encode: CMP_TARGET = 517 +fate-aac-is-encode: CMP_TARGET = 500 fate-aac-is-encode: FUZZ = 10 FATE_AAC_ENCODE += fate-aac-ms-encode @@ -260,7 +260,7 @@ FATE_AAC_ENCODE += fate-aac-yoraw-encode fate-aac-yoraw-encode: CMD = enc_dec_pcm mp4 wav s16le $(TARGET_SAMPLES)/audio-reference/yo.raw-short.wav -c:a aac -aac_coder fast -fflags +bitexact -flags +bitexact fate-aac-yoraw-encode: CMP = stddev fate-aac-yoraw-encode: REF = $(SAMPLES)/audio-reference/yo.raw-short.wav -fate-aac-yoraw-encode: CMP_TARGET = 54 +fate-aac-yoraw-encode: CMP_TARGET = 226 fate-aac-yoraw-encode: FUZZ = 17 FATE_AAC_LATM += fate-aac-latm_000000001180bc60

1 0