April 2022 - ffmpeg-cvslog - lists.ffmpeg.org

lavc/flacdec: Increase residual limit from INT_MAX to UINT_MAX
by Martijn van Beurden 30 Apr '22

30 Apr '22

ffmpeg | branch: master | Martijn van Beurden <mvanb1(a)gmail.com> | Tue Apr 5 15:37:47 2022 +0200| [296d3bbe167f06168ac54724626006b43002833f] | committer: Michael Niedermayer lavc/flacdec: Increase residual limit from INT_MAX to UINT_MAX Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=296d3bbe167f06168… --- libavcodec/flacdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c index a23d7e2cf1..87f20c7425 100644 --- a/libavcodec/flacdec.c +++ b/libavcodec/flacdec.c @@ -260,7 +260,7 @@ static int decode_residuals(FLACContext *s, int32_t *decoded, int pred_order) for (; i < samples; i++) *decoded++ = get_sbits_long(&gb, tmp); } else { - int real_limit = tmp ? (INT_MAX >> tmp) + 2 : INT_MAX; + int real_limit = (tmp > 1) ? (INT_MAX >> (tmp - 1)) + 2 : INT_MAX; for (; i < samples; i++) { int v = get_sr_golomb_flac(&gb, tmp, real_limit, 1); if (v == 0x80000000){

1 0

avfilter/avf_showvolume: request new frames only when needed
by Paul B Mahol 30 Apr '22

30 Apr '22

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Sat Apr 30 16:16:37 2022 +0200| [eef652ca9c893a84c6430fcdd53eed186c299d82] | committer: Paul B Mahol avfilter/avf_showvolume: request new frames only when needed > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eef652ca9c893a84c… --- libavfilter/avf_showvolume.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavfilter/avf_showvolume.c b/libavfilter/avf_showvolume.c index a930a1ee2a..854d10be7a 100644 --- a/libavfilter/avf_showvolume.c +++ b/libavfilter/avf_showvolume.c @@ -468,6 +468,11 @@ static int activate(AVFilterContext *ctx) if (ret > 0) return filter_frame(inlink, in); + if (ff_inlink_queued_samples(inlink) >= s->nb_samples) { + ff_filter_set_ready(ctx, 10); + return 0; + } + FF_FILTER_FORWARD_STATUS(inlink, outlink); FF_FILTER_FORWARD_WANTED(outlink, inlink);

1 0

avfilter/avf_avectorscope: request new frames only when needed
by Paul B Mahol 30 Apr '22

30 Apr '22

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Sat Apr 30 16:15:43 2022 +0200| [3ce4e0808924c55cbb387a6249bcb1e82ea44f63] | committer: Paul B Mahol avfilter/avf_avectorscope: request new frames only when needed > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3ce4e0808924c55cb… --- libavfilter/avf_avectorscope.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavfilter/avf_avectorscope.c b/libavfilter/avf_avectorscope.c index 200b2e452c..fe381a631d 100644 --- a/libavfilter/avf_avectorscope.c +++ b/libavfilter/avf_avectorscope.c @@ -414,6 +414,11 @@ static int activate(AVFilterContext *ctx) if (ret > 0) return filter_frame(inlink, in); + if (ff_inlink_queued_samples(inlink) >= s->nb_samples) { + ff_filter_set_ready(ctx, 10); + return 0; + } + FF_FILTER_FORWARD_STATUS(inlink, outlink); FF_FILTER_FORWARD_WANTED(outlink, inlink);

1 0

avfilter/af_aspectralstats: request new frames only when needed
by Paul B Mahol 30 Apr '22

30 Apr '22

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Sat Apr 30 15:38:38 2022 +0200| [9aa20d28cdda0dcaa4daa2848670a6530c6ba26a] | committer: Paul B Mahol avfilter/af_aspectralstats: request new frames only when needed > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9aa20d28cdda0dcaa… --- libavfilter/af_aspectralstats.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavfilter/af_aspectralstats.c b/libavfilter/af_aspectralstats.c index bc578bdcc1..cac5d01bca 100644 --- a/libavfilter/af_aspectralstats.c +++ b/libavfilter/af_aspectralstats.c @@ -502,6 +502,11 @@ static int activate(AVFilterContext *ctx) if (ret < 0) return ret; + if (ff_inlink_queued_samples(inlink) >= s->hop_size) { + ff_filter_set_ready(ctx, 10); + return 0; + } + FF_FILTER_FORWARD_STATUS(inlink, outlink); FF_FILTER_FORWARD_WANTED(outlink, inlink);

1 0

avfilter/af_surround: request new frames only when needed
by Paul B Mahol 30 Apr '22

30 Apr '22

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Sat Apr 30 15:36:39 2022 +0200| [a9e9020ff6eb92fb36b35a53c27719aeedfc6a8a] | committer: Paul B Mahol avfilter/af_surround: request new frames only when needed > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a9e9020ff6eb92fb3… --- libavfilter/af_surround.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavfilter/af_surround.c b/libavfilter/af_surround.c index 4599dd1601..858fed609a 100644 --- a/libavfilter/af_surround.c +++ b/libavfilter/af_surround.c @@ -1633,6 +1633,11 @@ static int activate(AVFilterContext *ctx) if (ret < 0) return ret; + if (ff_inlink_queued_samples(inlink) >= s->hop_size) { + ff_filter_set_ready(ctx, 10); + return 0; + } + if (ff_inlink_acknowledge_status(inlink, &status, &pts)) { ff_outlink_set_status(outlink, status, pts); return 0;

1 0

avfilter/avf_showfreqs: add rate option
by Paul B Mahol 30 Apr '22

30 Apr '22

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Sat Apr 30 15:33:13 2022 +0200| [d8e8aa944aa633dbb1990c4d33654234aaf0d312] | committer: Paul B Mahol avfilter/avf_showfreqs: add rate option Fix possible buffer overflow. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d8e8aa944aa633dbb… --- doc/filters.texi | 3 +++ libavfilter/avf_showfreqs.c | 58 +++++++++++++++++++++++++-------------------- 2 files changed, 35 insertions(+), 26 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index 72628af9b2..478a75bd3a 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -28476,6 +28476,9 @@ Specify size of video. For the syntax of this option, check the @ref{video size syntax,,"Video size" section in the ffmpeg-utils manual,ffmpeg-utils}. Default is @code{1024x512}. +@item rate, r +Set video rate. Default is @code{25}. + @item mode Set display mode. This set how each frequency bin will be represented. diff --git a/libavfilter/avf_showfreqs.c b/libavfilter/avf_showfreqs.c index 5d13f71a2b..6dcff686b6 100644 --- a/libavfilter/avf_showfreqs.c +++ b/libavfilter/avf_showfreqs.c @@ -70,6 +70,9 @@ typedef struct ShowFreqsContext { int win_size; float scale; char *colors; + int64_t pts; + int64_t old_pts; + AVRational frame_rate; } ShowFreqsContext; #define OFFSET(x) offsetof(ShowFreqsContext, x) @@ -78,6 +81,8 @@ typedef struct ShowFreqsContext { static const AVOption showfreqs_options[] = { { "size", "set video size", OFFSET(w), AV_OPT_TYPE_IMAGE_SIZE, {.str = "1024x512"}, 0, 0, FLAGS }, { "s", "set video size", OFFSET(w), AV_OPT_TYPE_IMAGE_SIZE, {.str = "1024x512"}, 0, 0, FLAGS }, + { "rate", "set video rate", OFFSET(frame_rate), AV_OPT_TYPE_VIDEO_RATE, {.str = "25"}, 0, INT_MAX, FLAGS }, + { "r", "set video rate", OFFSET(frame_rate), AV_OPT_TYPE_VIDEO_RATE, {.str = "25"}, 0, INT_MAX, FLAGS }, { "mode", "set display mode", OFFSET(mode), AV_OPT_TYPE_INT, {.i64=BAR}, 0, NB_MODES-1, FLAGS, "mode" }, { "line", "show lines", 0, AV_OPT_TYPE_CONST, {.i64=LINE}, 0, 0, FLAGS, "mode" }, { "bar", "show bars", 0, AV_OPT_TYPE_CONST, {.i64=BAR}, 0, 0, FLAGS, "mode" }, @@ -149,6 +154,7 @@ static int config_output(AVFilterLink *outlink) float overlap, scale; int i, ret; + s->old_pts = AV_NOPTS_VALUE; s->nb_freq = s->fft_size / 2; s->win_size = s->fft_size; av_tx_uninit(&s->fft); @@ -215,7 +221,7 @@ static int config_output(AVFilterLink *outlink) if (!s->window) return AVERROR(ENOMEM); - outlink->frame_rate = av_make_q(inlink->sample_rate, s->hop_size); + outlink->frame_rate = s->frame_rate; outlink->time_base = av_inv_q(outlink->frame_rate); outlink->sample_aspect_ratio = (AVRational){1,1}; outlink->w = s->w; @@ -328,13 +334,13 @@ static inline void plot_freq(ShowFreqsContext *s, int ch, switch (s->avg) { case 0: - y = s->avg_data[ch][f] = !outlink->frame_count_in ? y : FFMIN(avg, y); + y = s->avg_data[ch][f] = !outlink->frame_count_in ? y : FFMIN(0, y); break; case 1: break; default: - s->avg_data[ch][f] = avg + y * (y - avg) / (FFMIN(outlink->frame_count_in + 1, s->avg) * y); - y = s->avg_data[ch][f]; + s->avg_data[ch][f] = avg + y * (y - avg) / (FFMIN(outlink->frame_count_in + 1, s->avg) * (float)y); + y = av_clip(s->avg_data[ch][f], 0, outlink->h - 1); break; } @@ -379,13 +385,6 @@ static int plot_freqs(AVFilterLink *inlink, int64_t pts) AVFrame *out; int ch, n; - out = ff_get_video_buffer(outlink, outlink->w, outlink->h); - if (!out) - return AVERROR(ENOMEM); - - for (n = 0; n < outlink->h; n++) - memset(out->data[0] + out->linesize[0] * n, 0, outlink->w * 4); - /* fill FFT input with the number of samples available */ for (ch = 0; ch < s->nb_channels; ch++) { const float *p = (float *)in->extended_data[ch]; @@ -407,16 +406,26 @@ static int plot_freqs(AVFilterLink *inlink, int64_t pts) s->tx_fn(s->fft, s->fft_data[ch], s->fft_input[ch], sizeof(float)); } + s->pts = av_rescale_q(pts, inlink->time_base, outlink->time_base); + if (s->old_pts >= s->pts) + return 0; + s->old_pts = s->pts; + #define RE(x, ch) s->fft_data[ch][x].re #define IM(x, ch) s->fft_data[ch][x].im #define M(a, b) (sqrt((a) * (a) + (b) * (b))) #define P(a, b) (atan2((b), (a))) colors = av_strdup(s->colors); - if (!colors) { - av_frame_free(&out); + if (!colors) return AVERROR(ENOMEM); - } + + out = ff_get_video_buffer(outlink, outlink->w, outlink->h); + if (!out) + return AVERROR(ENOMEM); + + for (n = 0; n < outlink->h; n++) + memset(out->data[0] + out->linesize[0] * n, 0, outlink->w * 4); for (ch = 0; ch < s->nb_channels; ch++) { uint8_t fg[4] = { 0xff, 0xff, 0xff, 0xff }; @@ -432,29 +441,21 @@ static int plot_freqs(AVFilterLink *inlink, int64_t pts) switch (s->data_mode) { case MAGNITUDE: - a = av_clipd(M(RE(0, ch), 0) / s->scale, 0, 1); - plot_freq(s, ch, a, 0, fg, &prev_y, out, outlink); - - for (f = 1; f < s->nb_freq; f++) { + for (f = 0; f < s->nb_freq; f++) { a = av_clipd(M(RE(f, ch), IM(f, ch)) / s->scale, 0, 1); plot_freq(s, ch, a, f, fg, &prev_y, out, outlink); } break; case PHASE: - a = av_clipd((M_PI + P(RE(0, ch), 0)) / (2. * M_PI), 0, 1); - plot_freq(s, ch, a, 0, fg, &prev_y, out, outlink); - - for (f = 1; f < s->nb_freq; f++) { + for (f = 0; f < s->nb_freq; f++) { a = av_clipd((M_PI + P(RE(f, ch), IM(f, ch))) / (2. * M_PI), 0, 1); plot_freq(s, ch, a, f, fg, &prev_y, out, outlink); } break; case DELAY: - plot_freq(s, ch, 0, 0, fg, &prev_y, out, outlink); - - for (f = 1; f < s->nb_freq; f++) { + for (f = 0; f < s->nb_freq; f++) { a = av_clipd((M_PI - P(IM(f, ch) * RE(f-1, ch) - IM(f-1, ch) * RE(f, ch), RE(f, ch) * RE(f-1, ch) + IM(f, ch) * IM(f-1, ch))) / (2. * M_PI), 0, 1); @@ -465,7 +466,7 @@ static int plot_freqs(AVFilterLink *inlink, int64_t pts) } av_free(colors); - out->pts = av_rescale_q(pts, inlink->time_base, outlink->time_base); + out->pts = s->pts; out->sample_aspect_ratio = (AVRational){1,1}; return ff_filter_frame(outlink, out); } @@ -509,6 +510,11 @@ static int activate(AVFilterContext *ctx) if (ret < 0) return ret; + if (ff_inlink_queued_samples(inlink) >= s->hop_size) { + ff_filter_set_ready(ctx, 10); + return 0; + } + FF_FILTER_FORWARD_STATUS(inlink, outlink); FF_FILTER_FORWARD_WANTED(outlink, inlink);

1 0

avfilter/vf_estdif: set frame_rate only when needed
by Paul B Mahol 30 Apr '22

30 Apr '22

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Sat Apr 30 10:08:21 2022 +0200| [fe06e70c301f62a20f4662259abbe658e5a84468] | committer: Paul B Mahol avfilter/vf_estdif: set frame_rate only when needed > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fe06e70c301f62a20… --- libavfilter/vf_estdif.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavfilter/vf_estdif.c b/libavfilter/vf_estdif.c index 0e5c9b4224..3506eab9c5 100644 --- a/libavfilter/vf_estdif.c +++ b/libavfilter/vf_estdif.c @@ -137,9 +137,11 @@ static int config_output(AVFilterLink *outlink) { AVFilterContext *ctx = outlink->src; AVFilterLink *inlink = ctx->inputs[0]; + ESTDIFContext *s = ctx->priv; outlink->time_base = av_mul_q(inlink->time_base, (AVRational){1, 2}); - outlink->frame_rate = av_mul_q(inlink->frame_rate, (AVRational){2, 1}); + if (s->mode) + outlink->frame_rate = av_mul_q(inlink->frame_rate, (AVRational){2, 1}); return 0; }

1 0

avfilter/vf_w3fdif: set frame_rate only when needed
by Paul B Mahol 30 Apr '22

30 Apr '22

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Sat Apr 30 10:07:51 2022 +0200| [f09712d68631d6d17237d36519f41039d151b7fe] | committer: Paul B Mahol avfilter/vf_w3fdif: set frame_rate only when needed > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f09712d68631d6d17… --- libavfilter/vf_w3fdif.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavfilter/vf_w3fdif.c b/libavfilter/vf_w3fdif.c index 41a45ea06c..53631fd15b 100644 --- a/libavfilter/vf_w3fdif.c +++ b/libavfilter/vf_w3fdif.c @@ -325,10 +325,13 @@ static int config_input(AVFilterLink *inlink) static int config_output(AVFilterLink *outlink) { - AVFilterLink *inlink = outlink->src->inputs[0]; + AVFilterContext *ctx = outlink->src; + AVFilterLink *inlink = ctx->inputs[0]; + W3FDIFContext *s = ctx->priv; outlink->time_base = av_mul_q(inlink->time_base, (AVRational){1, 2}); - outlink->frame_rate = av_mul_q(inlink->frame_rate, (AVRational){2, 1}); + if (s->mode) + outlink->frame_rate = av_mul_q(inlink->frame_rate, (AVRational){2, 1}); return 0; }

1 0

avfilter/vf_nnedi: set frame_rate only when needed
by Paul B Mahol 30 Apr '22

30 Apr '22

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Sat Apr 30 10:01:23 2022 +0200| [6018fa899f5fd06e3d565adaf229dbd5155d0f56] | committer: Paul B Mahol avfilter/vf_nnedi: set frame_rate only when needed > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6018fa899f5fd06e3… --- libavfilter/vf_nnedi.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavfilter/vf_nnedi.c b/libavfilter/vf_nnedi.c index cbe2110577..370f643678 100644 --- a/libavfilter/vf_nnedi.c +++ b/libavfilter/vf_nnedi.c @@ -166,13 +166,15 @@ AVFILTER_DEFINE_CLASS(nnedi); static int config_output(AVFilterLink *outlink) { AVFilterContext *ctx = outlink->src; + const NNEDIContext *const s = ctx->priv; outlink->time_base = av_mul_q(ctx->inputs[0]->time_base, (AVRational){1, 2}); outlink->w = ctx->inputs[0]->w; outlink->h = ctx->inputs[0]->h; - outlink->frame_rate = av_mul_q(ctx->inputs[0]->frame_rate, - (AVRational){2, 1}); + if (s->field == -2 || s->field > 1) + outlink->frame_rate = av_mul_q(ctx->inputs[0]->frame_rate, + (AVRational){2, 1}); return 0; }

1 0

avfilter/vf_mix: output same number of frames from input for tmix
by Paul B Mahol 29 Apr '22

29 Apr '22

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Fri Apr 29 21:56:02 2022 +0200| [55e0b041b370b09593e5d9f02ff56409d4ce3ad7] | committer: Paul B Mahol avfilter/vf_mix: output same number of frames from input for tmix > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=55e0b041b370b0959… --- libavfilter/vf_mix.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/libavfilter/vf_mix.c b/libavfilter/vf_mix.c index 79c96e5aec..64d07bbbbb 100644 --- a/libavfilter/vf_mix.c +++ b/libavfilter/vf_mix.c @@ -415,8 +415,12 @@ static int tmix_filter_frame(AVFilterLink *inlink, AVFrame *in) if (s->nb_frames < s->nb_inputs) { s->frames[s->nb_frames] = in; s->nb_frames++; - if (s->nb_frames < s->nb_inputs) - return 0; + while (s->nb_frames < s->nb_inputs) { + s->frames[s->nb_frames] = av_frame_clone(s->frames[s->nb_frames - 1]); + if (!s->frames[s->nb_frames]) + return AVERROR(ENOMEM); + s->nb_frames++; + } } else { av_frame_free(&s->frames[0]); memmove(&s->frames[0], &s->frames[1], sizeof(*s->frames) * (s->nb_inputs - 1)); @@ -433,7 +437,7 @@ static int tmix_filter_frame(AVFilterLink *inlink, AVFrame *in) out = ff_get_video_buffer(outlink, outlink->w, outlink->h); if (!out) return AVERROR(ENOMEM); - out->pts = s->frames[0]->pts; + out->pts = s->frames[s->nb_frames - 1]->pts; td.out = out; td.in = s->frames;

1 0