February 2022 - ffmpeg-cvslog

avfilter/af_afftdn: add support for writable input frames
by Paul B Mahol 27 Feb '22

27 Feb '22

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Sun Feb 27 11:49:34 2022 +0100| [2cb482aa7491f15fe8e62c9f366cb25b6ce7db17] | committer: Paul B Mahol avfilter/af_afftdn: add support for writable input frames > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2cb482aa7491f15fe… --- libavfilter/af_afftdn.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/libavfilter/af_afftdn.c b/libavfilter/af_afftdn.c index 403464baee..d7db625c35 100644 --- a/libavfilter/af_afftdn.c +++ b/libavfilter/af_afftdn.c @@ -1164,9 +1164,8 @@ static int output_frame(AVFilterLink *inlink, AVFrame *in) AudioFFTDeNoiseContext *s = ctx->priv; const int output_mode = ctx->is_disabled ? IN_MODE : s->output_mode; const int offset = s->window_length - s->sample_advance; - AVFrame *out = NULL; + AVFrame *out; ThreadData td; - int ret = 0; for (int ch = 0; ch < s->channels; ch++) { float *src = (float *)s->winframe->extended_data[ch]; @@ -1225,10 +1224,16 @@ static int output_frame(AVFilterLink *inlink, AVFrame *in) ff_filter_execute(ctx, filter_channel, &td, NULL, FFMIN(outlink->channels, ff_filter_get_nb_threads(ctx))); - out = ff_get_audio_buffer(outlink, in->nb_samples); - if (!out) { - ret = AVERROR(ENOMEM); - goto end; + if (av_frame_is_writable(in)) { + out = in; + } else { + out = ff_get_audio_buffer(outlink, in->nb_samples); + if (!out) { + av_frame_free(&in); + return AVERROR(ENOMEM); + } + + out->pts = in->pts; } for (int ch = 0; ch < inlink->channels; ch++) { @@ -1251,23 +1256,18 @@ static int output_frame(AVFilterLink *inlink, AVFrame *in) dst[m] = orig[m] - src[m]; break; default: + if (in != out) + av_frame_free(&in); av_frame_free(&out); - ret = AVERROR_BUG; - goto end; + return AVERROR_BUG; } memmove(src, src + s->sample_advance, (s->window_length - s->sample_advance) * sizeof(*src)); memset(src + (s->window_length - s->sample_advance), 0, s->sample_advance * sizeof(*src)); } - out->pts = in->pts; - - ret = ff_filter_frame(outlink, out); - if (ret < 0) - goto end; -end: - av_frame_free(&in); - - return ret; + if (out != in) + av_frame_free(&in); + return ff_filter_frame(outlink, out); } static int activate(AVFilterContext *ctx)

1 0

configure: stop allowing disabling lzo
by James Almer 26 Feb '22

26 Feb '22

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Sat Feb 26 12:28:44 2022 -0300| [df272928ff8041f87b92f4cf8dbf12a28fe9cdf7] | committer: James Almer configure: stop allowing disabling lzo The module is now always compiled in. Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=df272928ff8041f87… --- configure | 7 ++----- libavformat/matroskadec.c | 4 ---- tests/fate/matroska.mak | 2 +- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/configure b/configure index 4dab8d4715..8c69ab0c86 100755 --- a/configure +++ b/configure @@ -140,7 +140,6 @@ Component options: --disable-dwt disable DWT code --disable-error-resilience disable error resilience code --disable-lsp disable LSP code - --disable-lzo disable LZO decoder code --disable-mdct disable MDCT code --disable-rdft disable RDFT code --disable-fft disable FFT code @@ -1975,7 +1974,6 @@ SUBSYSTEM_LIST=" fast_unaligned fft lsp - lzo mdct pixelutils network @@ -2780,7 +2778,6 @@ clearvideo_decoder_select="idctdsp" cllc_decoder_select="bswapdsp" comfortnoise_encoder_select="lpc" cook_decoder_select="audiodsp mdct sinewin" -cscd_decoder_select="lzo" cscd_decoder_suggest="zlib" dca_decoder_select="mdct" dca_encoder_select="mdct" @@ -2896,7 +2893,7 @@ mxpeg_decoder_select="mjpeg_decoder" nellymoser_decoder_select="mdct sinewin" nellymoser_encoder_select="audio_frame_queue mdct sinewin" notchlc_decoder_select="lzf" -nuv_decoder_select="idctdsp lzo" +nuv_decoder_select="idctdsp" on2avc_decoder_select="mdct" opus_decoder_deps="swresample" opus_decoder_select="mdct15" @@ -3423,7 +3420,7 @@ ivf_muxer_select="av1_metadata_bsf vp9_superframe_bsf" latm_muxer_select="aac_adtstoasc_bsf mpeg4audio" matroska_audio_muxer_select="matroska_muxer" matroska_demuxer_select="riffdec" -matroska_demuxer_suggest="bzlib lzo zlib" +matroska_demuxer_suggest="bzlib zlib" matroska_muxer_select="mpeg4audio riffenc vp9_superframe_bsf aac_adtstoasc_bsf" mlp_demuxer_select="mlp_parser" mmf_muxer_select="riffenc" diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 974bc6f8e3..95e49cbe7f 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1684,7 +1684,6 @@ static int matroska_decode_buffer(uint8_t **buf, int *buf_size, memcpy(pkt_data + header_size, data, isize); break; } -#if CONFIG_LZO case MATROSKA_TRACK_ENCODING_COMP_LZO: do { int insize = isize; @@ -1704,7 +1703,6 @@ static int matroska_decode_buffer(uint8_t **buf, int *buf_size, } pkt_size -= olen; break; -#endif #if CONFIG_ZLIB case MATROSKA_TRACK_ENCODING_COMP_ZLIB: { @@ -2527,9 +2525,7 @@ static int matroska_parse_tracks(AVFormatContext *s) #if CONFIG_BZLIB encodings[0].compression.algo != MATROSKA_TRACK_ENCODING_COMP_BZLIB && #endif -#if CONFIG_LZO encodings[0].compression.algo != MATROSKA_TRACK_ENCODING_COMP_LZO && -#endif encodings[0].compression.algo != MATROSKA_TRACK_ENCODING_COMP_HEADERSTRIP) { encodings[0].scope = 0; av_log(matroska->ctx, AV_LOG_ERROR, diff --git a/tests/fate/matroska.mak b/tests/fate/matroska.mak index 72267d13aa..3073b0a061 100644 --- a/tests/fate/matroska.mak +++ b/tests/fate/matroska.mak @@ -28,7 +28,7 @@ FATE_MATROSKA-$(call ALLYES, MATROSKA_DEMUXER ZLIB) += fate-matroska-zlib-decomp fate-matroska-zlib-decompression: CMD = framecrc -i $(TARGET_SAMPLES)/mkv/subtitle_zlib.mks -c:s copy # This tests that the matroska demuxer can decompress lzo compressed tracks. -FATE_MATROSKA-$(call ALLYES, MATROSKA_DEMUXER LZO) += fate-matroska-lzo-decompression +FATE_MATROSKA-$(CONFIG_MATROSKA_DEMUXER) += fate-matroska-lzo-decompression fate-matroska-lzo-decompression: CMD = framecrc -i $(TARGET_SAMPLES)/mkv/lzo.mka -c copy # This tests that the matroska demuxer correctly propagates

1 0

avutil: make lzo always compile
by James Almer 26 Feb '22

26 Feb '22

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Sat Feb 26 11:47:06 2022 -0300| [ff145498b25e20f0563c75bbb84d1513df634d4c] | committer: James Almer avutil: make lzo always compile Having optionally installed headers is a bad idea as there's no way to know if they are present or not (unless a define is added to avconfig.h, but that's just ugly). Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ff145498b25e20f05… --- libavutil/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavutil/Makefile b/libavutil/Makefile index d17876df1a..b867d3b362 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -52,6 +52,7 @@ HEADERS = adler32.h \ intreadwrite.h \ lfg.h \ log.h \ + lzo.h \ macros.h \ mathematics.h \ mastering_display_metadata.h \ @@ -87,8 +88,6 @@ HEADERS = adler32.h \ tx.h \ film_grain_params.h \ -HEADERS-$(CONFIG_LZO) += lzo.h - ARCH_HEADERS = bswap.h \ intmath.h \ intreadwrite.h \ @@ -139,6 +138,7 @@ OBJS = adler32.o \ lls.o \ log.o \ log2_tab.o \ + lzo.o \ mathematics.o \ mastering_display_metadata.o \ md5.o \ @@ -180,7 +180,6 @@ OBJS-$(CONFIG_CUDA) += hwcontext_cuda.o OBJS-$(CONFIG_D3D11VA) += hwcontext_d3d11va.o OBJS-$(CONFIG_DXVA2) += hwcontext_dxva2.o OBJS-$(CONFIG_LIBDRM) += hwcontext_drm.o -OBJS-$(CONFIG_LZO) += lzo.o OBJS-$(CONFIG_MACOS_KPERF) += macos_kperf.o OBJS-$(CONFIG_MEDIACODEC) += hwcontext_mediacodec.o OBJS-$(CONFIG_OPENCL) += hwcontext_opencl.o

1 0

avfilter/af_aspectralstats: stop using fifo and rewritting pts
by Paul B Mahol 26 Feb '22

26 Feb '22

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Sat Feb 26 13:28:01 2022 +0100| [6562d28b9b64d97df31adc0870a12429b11a0ebd] | committer: Paul B Mahol avfilter/af_aspectralstats: stop using fifo and rewritting pts > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6562d28b9b64d97df… --- libavfilter/af_aspectralstats.c | 132 ++++++++++++++-------------------------- 1 file changed, 46 insertions(+), 86 deletions(-) diff --git a/libavfilter/af_aspectralstats.c b/libavfilter/af_aspectralstats.c index da418d22bf..c3d998fd7e 100644 --- a/libavfilter/af_aspectralstats.c +++ b/libavfilter/af_aspectralstats.c @@ -21,7 +21,6 @@ #include <float.h> #include <math.h> -#include "libavutil/audio_fifo.h" #include "libavutil/opt.h" #include "libavutil/tx.h" #include "audio.h" @@ -54,16 +53,14 @@ typedef struct AudioSpectralStatsContext { int nb_channels; int hop_size; ChannelSpectralStats *stats; - AVAudioFifo *fifo; float *window_func_lut; - int64_t pts; - int eof; av_tx_fn tx_fn; AVTXContext **fft; AVComplexFloat **fft_in; AVComplexFloat **fft_out; float **prev_magnitude; float **magnitude; + AVFrame *window; } AudioSpectralStatsContext; #define OFFSET(x) offsetof(AudioSpectralStatsContext, x) @@ -85,10 +82,6 @@ static int config_output(AVFilterLink *outlink) int ret; s->nb_channels = outlink->channels; - s->fifo = av_audio_fifo_alloc(outlink->format, s->nb_channels, s->win_size); - if (!s->fifo) - return AVERROR(ENOMEM); - s->window_func_lut = av_realloc_f(s->window_func_lut, s->win_size, sizeof(*s->window_func_lut)); if (!s->window_func_lut) @@ -147,6 +140,10 @@ static int config_output(AVFilterLink *outlink) return AVERROR(ENOMEM); } + s->window = ff_get_audio_buffer(outlink, s->win_size); + if (!s->window) + return AVERROR(ENOMEM); + return 0; } @@ -392,14 +389,15 @@ static float spectral_rolloff(const float *const spectral, int size, int max_fre static int filter_channel(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) { AudioSpectralStatsContext *s = ctx->priv; + const float *window_func_lut = s->window_func_lut; AVFrame *in = arg; const int channels = s->nb_channels; - const int samples = in->nb_samples; const int start = (channels * jobnr) / nb_jobs; const int end = (channels * (jobnr+1)) / nb_jobs; + const int offset = s->win_size - s->hop_size; for (int ch = start; ch < end; ch++) { - const float *const src = (const float *const)in->extended_data[ch]; + float *window = (float *)s->window->extended_data[ch]; ChannelSpectralStats *stats = &s->stats[ch]; AVComplexFloat *fft_out = s->fft_out[ch]; AVComplexFloat *fft_in = s->fft_in[ch]; @@ -407,13 +405,12 @@ static int filter_channel(AVFilterContext *ctx, void *arg, int jobnr, int nb_job float *prev_magnitude = s->prev_magnitude[ch]; const float scale = 1.f / s->win_size; - for (int n = 0; n < samples; n++) { - fft_in[n].re = src[n] * s->window_func_lut[n]; - fft_in[n].im = 0; - } + memmove(window, &window[s->hop_size], offset * sizeof(float)); + memcpy(&window[offset], in->extended_data[ch], in->nb_samples * sizeof(float)); + memset(&window[offset + in->nb_samples], 0, (s->hop_size - in->nb_samples) * sizeof(float)); - for (int n = in->nb_samples; n < s->win_size; n++) { - fft_in[n].re = 0; + for (int n = 0; n < s->win_size; n++) { + fft_in[n].re = window[n] * window_func_lut[n]; fft_in[n].im = 0; } @@ -447,102 +444,66 @@ static int filter_channel(AVFilterContext *ctx, void *arg, int jobnr, int nb_job return 0; } -static int filter_frame(AVFilterLink *inlink) +static int filter_frame(AVFilterLink *inlink, AVFrame *in) { AVFilterContext *ctx = inlink->dst; AVFilterLink *outlink = ctx->outputs[0]; AudioSpectralStatsContext *s = ctx->priv; AVDictionary **metadata; - AVFrame *out, *in = NULL; - int ret = 0; - - out = ff_get_audio_buffer(outlink, s->hop_size); - if (!out) { - ret = AVERROR(ENOMEM); - goto fail; - } + AVFrame *out; + int ret; - if (!in) { - in = ff_get_audio_buffer(outlink, s->win_size); - if (!in) + if (av_frame_is_writable(in)) { + out = in; + } else { + out = ff_get_audio_buffer(outlink, in->nb_samples); + if (!out) { + av_frame_free(&in); return AVERROR(ENOMEM); + } + ret = av_frame_copy_props(out, in); + if (ret < 0) + goto fail; + ret = av_frame_copy(out, in); + if (ret < 0) + goto fail; } - ret = av_audio_fifo_peek(s->fifo, (void **)in->extended_data, s->win_size); - if (ret < 0) - goto fail; - metadata = &out->metadata; ff_filter_execute(ctx, filter_channel, in, NULL, FFMIN(inlink->channels, ff_filter_get_nb_threads(ctx))); set_metadata(s, metadata); - out->pts = s->pts; - s->pts += av_rescale_q(s->hop_size, (AVRational){1, outlink->sample_rate}, outlink->time_base); - - av_audio_fifo_read(s->fifo, (void **)out->extended_data, s->hop_size); - - av_frame_free(&in); + if (out != in) + av_frame_free(&in); return ff_filter_frame(outlink, out); fail: av_frame_free(&in); - return ret < 0 ? ret : 0; + av_frame_free(&out); + return ret; } static int activate(AVFilterContext *ctx) { - AVFilterLink *inlink = ctx->inputs[0]; - AVFilterLink *outlink = ctx->outputs[0]; AudioSpectralStatsContext *s = ctx->priv; - AVFrame *in = NULL; - int ret = 0, status; - int64_t pts; + AVFilterLink *outlink = ctx->outputs[0]; + AVFilterLink *inlink = ctx->inputs[0]; + AVFrame *in; + int ret; FF_FILTER_FORWARD_STATUS_BACK(outlink, inlink); - if (!s->eof && av_audio_fifo_size(s->fifo) < s->win_size) { - ret = ff_inlink_consume_frame(inlink, &in); - if (ret < 0) - return ret; - - if (ret > 0) { - ret = av_audio_fifo_write(s->fifo, (void **)in->extended_data, - in->nb_samples); - if (ret >= 0 && s->pts == AV_NOPTS_VALUE) - s->pts = in->pts; - - av_frame_free(&in); - if (ret < 0) - return ret; - } - } - - if ((av_audio_fifo_size(s->fifo) >= s->win_size) || - (av_audio_fifo_size(s->fifo) > 0 && s->eof)) { - ret = filter_frame(inlink); - if (av_audio_fifo_size(s->fifo) >= s->win_size) - ff_filter_set_ready(ctx, 100); + ret = ff_inlink_consume_samples(inlink, s->hop_size, s->hop_size, &in); + if (ret < 0) + return ret; + if (ret > 0) + ret = filter_frame(inlink, in); + if (ret < 0) return ret; - } - - if (!s->eof && ff_inlink_acknowledge_status(inlink, &status, &pts)) { - if (status == AVERROR_EOF) { - s->eof = 1; - if (av_audio_fifo_size(s->fifo) >= 0) { - ff_filter_set_ready(ctx, 100); - return 0; - } - } - } - - if (s->eof && av_audio_fifo_size(s->fifo) <= 0) { - ff_outlink_set_status(outlink, AVERROR_EOF, s->pts); - return 0; - } - if (!s->eof) - FF_FILTER_FORWARD_WANTED(outlink, inlink); + FF_FILTER_FORWARD_STATUS(inlink, outlink); + FF_FILTER_FORWARD_WANTED(outlink, inlink); return FFERROR_NOT_READY; } @@ -572,8 +533,7 @@ static av_cold void uninit(AVFilterContext *ctx) av_freep(&s->stats); av_freep(&s->window_func_lut); - av_audio_fifo_free(s->fifo); - s->fifo = NULL; + av_frame_free(&s->window); } static const AVFilterPad aspectralstats_inputs[] = {

1 0

avfilter/af_afftdn: stop using fifo and rewritting pts
by Paul B Mahol 26 Feb '22

26 Feb '22

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Sat Feb 26 12:08:25 2022 +0100| [644b6ed3ff1f4b2ec7b08a6e71f08f2c8e383216] | committer: Paul B Mahol avfilter/af_afftdn: stop using fifo and rewritting pts > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=644b6ed3ff1f4b2ec… --- libavfilter/af_afftdn.c | 78 ++++++++++++++++++------------------------------- 1 file changed, 29 insertions(+), 49 deletions(-) diff --git a/libavfilter/af_afftdn.c b/libavfilter/af_afftdn.c index d1dbbc667b..403464baee 100644 --- a/libavfilter/af_afftdn.c +++ b/libavfilter/af_afftdn.c @@ -20,7 +20,6 @@ #include <float.h> -#include "libavutil/audio_fifo.h" #include "libavutil/avstring.h" #include "libavutil/channel_layout.h" #include "libavutil/opt.h" @@ -101,7 +100,6 @@ typedef struct AudioFFTDeNoiseContext { float last_noise_balance; int64_t block_count; - int64_t pts; int channels; int sample_noise; int sample_noise_start; @@ -124,6 +122,8 @@ typedef struct AudioFFTDeNoiseContext { DeNoiseChannel *dnch; + AVFrame *winframe; + double max_gain; double max_var; double gain_scale; @@ -138,8 +138,6 @@ typedef struct AudioFFTDeNoiseContext { double vector_b[5]; double matrix_b[75]; double matrix_c[75]; - - AVAudioFifo *fifo; } AudioFFTDeNoiseContext; #define OFFSET(x) offsetof(AudioFFTDeNoiseContext, x) @@ -620,7 +618,6 @@ static int config_input(AVFilterLink *inlink) if (!s->dnch) return AVERROR(ENOMEM); - s->pts = AV_NOPTS_VALUE; s->channels = inlink->channels; s->sample_rate = inlink->sample_rate; s->sample_advance = s->sample_rate / 80; @@ -831,6 +828,10 @@ static int config_input(AVFilterLink *inlink) } } + s->winframe = ff_get_audio_buffer(inlink, s->window_length); + if (!s->winframe) + return AVERROR(ENOMEM); + wscale = sqrt(16.0 / (9.0 * s->fft_length)); sum = 0.0; for (int i = 0; i < s->window_length; i++) { @@ -857,10 +858,6 @@ static int config_input(AVFilterLink *inlink) } s->noise_band_count = s->noise_band_edge[16]; - s->fifo = av_audio_fifo_alloc(inlink->format, inlink->channels, s->fft_length); - if (!s->fifo) - return AVERROR(ENOMEM); - return 0; } @@ -1160,23 +1157,24 @@ static void get_auto_noise_levels(AudioFFTDeNoiseContext *s, } } -static int output_frame(AVFilterLink *inlink) +static int output_frame(AVFilterLink *inlink, AVFrame *in) { AVFilterContext *ctx = inlink->dst; AVFilterLink *outlink = ctx->outputs[0]; AudioFFTDeNoiseContext *s = ctx->priv; const int output_mode = ctx->is_disabled ? IN_MODE : s->output_mode; - AVFrame *out = NULL, *in = NULL; + const int offset = s->window_length - s->sample_advance; + AVFrame *out = NULL; ThreadData td; int ret = 0; - in = ff_get_audio_buffer(outlink, s->window_length); - if (!in) - return AVERROR(ENOMEM); + for (int ch = 0; ch < s->channels; ch++) { + float *src = (float *)s->winframe->extended_data[ch]; - ret = av_audio_fifo_peek(s->fifo, (void **)in->extended_data, s->window_length); - if (ret < 0) - goto end; + memmove(src, &src[s->sample_advance], offset * sizeof(float)); + memcpy(&src[offset], in->extended_data[ch], in->nb_samples * sizeof(float)); + memset(&src[offset + in->nb_samples], 0, (s->sample_advance - in->nb_samples) * sizeof(float)); + } if (s->track_noise) { for (int ch = 0; ch < inlink->channels; ch++) { @@ -1205,7 +1203,7 @@ static int output_frame(AVFilterLink *inlink) for (int ch = 0; ch < inlink->channels; ch++) { DeNoiseChannel *dnch = &s->dnch[ch]; - sample_noise_block(s, dnch, in, ch); + sample_noise_block(s, dnch, s->winframe, ch); } } @@ -1223,11 +1221,11 @@ static int output_frame(AVFilterLink *inlink) } s->block_count++; - td.in = in; + td.in = s->winframe; ff_filter_execute(ctx, filter_channel, &td, NULL, FFMIN(outlink->channels, ff_filter_get_nb_threads(ctx))); - out = ff_get_audio_buffer(outlink, s->sample_advance); + out = ff_get_audio_buffer(outlink, in->nb_samples); if (!out) { ret = AVERROR(ENOMEM); goto end; @@ -1236,20 +1234,20 @@ static int output_frame(AVFilterLink *inlink) for (int ch = 0; ch < inlink->channels; ch++) { DeNoiseChannel *dnch = &s->dnch[ch]; double *src = dnch->out_samples; - float *orig = (float *)in->extended_data[ch]; + const float *orig = (const float *)s->winframe->extended_data[ch]; float *dst = (float *)out->extended_data[ch]; switch (output_mode) { case IN_MODE: - for (int m = 0; m < s->sample_advance; m++) + for (int m = 0; m < out->nb_samples; m++) dst[m] = orig[m]; break; case OUT_MODE: - for (int m = 0; m < s->sample_advance; m++) + for (int m = 0; m < out->nb_samples; m++) dst[m] = src[m]; break; case NOISE_MODE: - for (int m = 0; m < s->sample_advance; m++) + for (int m = 0; m < out->nb_samples; m++) dst[m] = orig[m] - src[m]; break; default: @@ -1261,13 +1259,11 @@ static int output_frame(AVFilterLink *inlink) memset(src + (s->window_length - s->sample_advance), 0, s->sample_advance * sizeof(*src)); } - av_audio_fifo_drain(s->fifo, s->sample_advance); + out->pts = in->pts; - out->pts = s->pts; ret = ff_filter_frame(outlink, out); if (ret < 0) goto end; - s->pts += av_rescale_q(s->sample_advance, (AVRational){1, outlink->sample_rate}, outlink->time_base); end: av_frame_free(&in); @@ -1279,34 +1275,19 @@ static int activate(AVFilterContext *ctx) AVFilterLink *inlink = ctx->inputs[0]; AVFilterLink *outlink = ctx->outputs[0]; AudioFFTDeNoiseContext *s = ctx->priv; - AVFrame *frame = NULL; + AVFrame *in = NULL; int ret; FF_FILTER_FORWARD_STATUS_BACK(outlink, inlink); - ret = ff_inlink_consume_frame(inlink, &frame); + ret = ff_inlink_consume_samples(inlink, s->sample_advance, s->sample_advance, &in); if (ret < 0) return ret; - - if (ret > 0) { - if (s->pts == AV_NOPTS_VALUE) - s->pts = frame->pts; - - ret = av_audio_fifo_write(s->fifo, (void **)frame->extended_data, frame->nb_samples); - av_frame_free(&frame); - if (ret < 0) - return ret; - } - - if (av_audio_fifo_size(s->fifo) >= s->window_length) - return output_frame(inlink); + if (ret > 0) + return output_frame(inlink, in); FF_FILTER_FORWARD_STATUS(inlink, outlink); - if (ff_outlink_frame_wanted(outlink) && - av_audio_fifo_size(s->fifo) < s->window_length) { - ff_inlink_request_frame(inlink); - return 0; - } + FF_FILTER_FORWARD_WANTED(outlink, inlink); return FFERROR_NOT_READY; } @@ -1319,6 +1300,7 @@ static av_cold void uninit(AVFilterContext *ctx) av_freep(&s->bin2band); av_freep(&s->band_alpha); av_freep(&s->band_beta); + av_frame_free(&s->winframe); if (s->dnch) { for (int ch = 0; ch < s->channels; ch++) { @@ -1343,8 +1325,6 @@ static av_cold void uninit(AVFilterContext *ctx) } av_freep(&s->dnch); } - - av_audio_fifo_free(s->fifo); } static int process_command(AVFilterContext *ctx, const char *cmd, const char *args,

1 0

avcodec/libopenjpegenc: Don't clone AVFrame unnecessarily
by Andreas Rheinhardt 25 Feb '22

25 Feb '22

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Tue Feb 22 23:26:31 2022 +0100| [c1735bb139622f239a9aa4c9a544d74bbd6f005e] | committer: Andreas Rheinhardt avcodec/libopenjpegenc: Don't clone AVFrame unnecessarily Reviewed-by: Michael Bradshaw <mjbshaw(a)gmail.com> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c1735bb139622f239… --- libavcodec/libopenjpegenc.c | 83 +++++++++++++++++++++++---------------------- 1 file changed, 42 insertions(+), 41 deletions(-) diff --git a/libavcodec/libopenjpegenc.c b/libavcodec/libopenjpegenc.c index 3e52bcd4e9..08b7b6a152 100644 --- a/libavcodec/libopenjpegenc.c +++ b/libavcodec/libopenjpegenc.c @@ -345,7 +345,8 @@ static av_cold int libopenjpeg_encode_init(AVCodecContext *avctx) return 0; } -static int libopenjpeg_copy_packed8(AVCodecContext *avctx, const AVFrame *frame, opj_image_t *image) +static int libopenjpeg_copy_packed8(AVCodecContext *avctx, const uint8_t *src[4], + const int linesize[4], opj_image_t *image) { int compno; int x; @@ -355,7 +356,7 @@ static int libopenjpeg_copy_packed8(AVCodecContext *avctx, const AVFrame *frame, const int numcomps = image->numcomps; for (compno = 0; compno < numcomps; ++compno) { - if (image->comps[compno].w > frame->linesize[0] / numcomps) { + if (image->comps[compno].w > linesize[0] / numcomps) { av_log(avctx, AV_LOG_ERROR, "Error: frame's linesize is too small for the image\n"); return 0; } @@ -364,9 +365,9 @@ static int libopenjpeg_copy_packed8(AVCodecContext *avctx, const AVFrame *frame, for (compno = 0; compno < numcomps; ++compno) { for (y = 0; y < avctx->height; ++y) { image_line = image->comps[compno].data + y * image->comps[compno].w; - frame_index = y * frame->linesize[0] + compno; + frame_index = y * linesize[0] + compno; for (x = 0; x < avctx->width; ++x) { - image_line[x] = frame->data[0][frame_index]; + image_line[x] = src[0][frame_index]; frame_index += numcomps; } for (; x < image->comps[compno].w; ++x) { @@ -385,17 +386,18 @@ static int libopenjpeg_copy_packed8(AVCodecContext *avctx, const AVFrame *frame, } // for XYZ 12 bit -static int libopenjpeg_copy_packed12(AVCodecContext *avctx, const AVFrame *frame, opj_image_t *image) +static int libopenjpeg_copy_packed12(AVCodecContext *avctx, const uint8_t *src[4], + const int linesize[4], opj_image_t *image) { int compno; int x, y; int *image_line; int frame_index; const int numcomps = image->numcomps; - uint16_t *frame_ptr = (uint16_t *)frame->data[0]; + const uint16_t *frame_ptr = (const uint16_t *)src[0]; for (compno = 0; compno < numcomps; ++compno) { - if (image->comps[compno].w > frame->linesize[0] / numcomps) { + if (image->comps[compno].w > linesize[0] / numcomps) { av_log(avctx, AV_LOG_ERROR, "Error: frame's linesize is too small for the image\n"); return 0; } @@ -404,7 +406,7 @@ static int libopenjpeg_copy_packed12(AVCodecContext *avctx, const AVFrame *frame for (compno = 0; compno < numcomps; ++compno) { for (y = 0; y < avctx->height; ++y) { image_line = image->comps[compno].data + y * image->comps[compno].w; - frame_index = y * (frame->linesize[0] / 2) + compno; + frame_index = y * (linesize[0] / 2) + compno; for (x = 0; x < avctx->width; ++x) { image_line[x] = frame_ptr[frame_index] >> 4; frame_index += numcomps; @@ -424,7 +426,8 @@ static int libopenjpeg_copy_packed12(AVCodecContext *avctx, const AVFrame *frame return 1; } -static int libopenjpeg_copy_packed16(AVCodecContext *avctx, const AVFrame *frame, opj_image_t *image) +static int libopenjpeg_copy_packed16(AVCodecContext *avctx, const uint8_t *src[4], + const int linesize[4], opj_image_t *image) { int compno; int x; @@ -432,10 +435,10 @@ static int libopenjpeg_copy_packed16(AVCodecContext *avctx, const AVFrame *frame int *image_line; int frame_index; const int numcomps = image->numcomps; - uint16_t *frame_ptr = (uint16_t*)frame->data[0]; + const uint16_t *frame_ptr = (const uint16_t*)src[0]; for (compno = 0; compno < numcomps; ++compno) { - if (image->comps[compno].w > frame->linesize[0] / numcomps) { + if (image->comps[compno].w > linesize[0] / numcomps) { av_log(avctx, AV_LOG_ERROR, "Error: frame's linesize is too small for the image\n"); return 0; } @@ -444,7 +447,7 @@ static int libopenjpeg_copy_packed16(AVCodecContext *avctx, const AVFrame *frame for (compno = 0; compno < numcomps; ++compno) { for (y = 0; y < avctx->height; ++y) { image_line = image->comps[compno].data + y * image->comps[compno].w; - frame_index = y * (frame->linesize[0] / 2) + compno; + frame_index = y * (linesize[0] / 2) + compno; for (x = 0; x < avctx->width; ++x) { image_line[x] = frame_ptr[frame_index]; frame_index += numcomps; @@ -464,7 +467,8 @@ static int libopenjpeg_copy_packed16(AVCodecContext *avctx, const AVFrame *frame return 1; } -static int libopenjpeg_copy_unpacked8(AVCodecContext *avctx, const AVFrame *frame, opj_image_t *image) +static int libopenjpeg_copy_unpacked8(AVCodecContext *avctx, const uint8_t *src[4], + const int linesize[4], opj_image_t *image) { int compno; int x; @@ -476,7 +480,7 @@ static int libopenjpeg_copy_unpacked8(AVCodecContext *avctx, const AVFrame *fram const int numcomps = image->numcomps; for (compno = 0; compno < numcomps; ++compno) { - if (image->comps[compno].w > frame->linesize[compno]) { + if (image->comps[compno].w > linesize[compno]) { av_log(avctx, AV_LOG_ERROR, "Error: frame's linesize is too small for the image\n"); return 0; } @@ -487,9 +491,9 @@ static int libopenjpeg_copy_unpacked8(AVCodecContext *avctx, const AVFrame *fram height = (avctx->height + image->comps[compno].dy - 1) / image->comps[compno].dy; for (y = 0; y < height; ++y) { image_line = image->comps[compno].data + y * image->comps[compno].w; - frame_index = y * frame->linesize[compno]; + frame_index = y * linesize[compno]; for (x = 0; x < width; ++x) - image_line[x] = frame->data[compno][frame_index++]; + image_line[x] = src[compno][frame_index++]; for (; x < image->comps[compno].w; ++x) { image_line[x] = image_line[x - 1]; } @@ -505,7 +509,8 @@ static int libopenjpeg_copy_unpacked8(AVCodecContext *avctx, const AVFrame *fram return 1; } -static int libopenjpeg_copy_unpacked16(AVCodecContext *avctx, const AVFrame *frame, opj_image_t *image) +static int libopenjpeg_copy_unpacked16(AVCodecContext *avctx, const uint8_t *src[4], + const int linesize[4], opj_image_t *image) { int compno; int x; @@ -515,22 +520,21 @@ static int libopenjpeg_copy_unpacked16(AVCodecContext *avctx, const AVFrame *fra int *image_line; int frame_index; const int numcomps = image->numcomps; - uint16_t *frame_ptr; for (compno = 0; compno < numcomps; ++compno) { - if (image->comps[compno].w > frame->linesize[compno]) { + if (image->comps[compno].w > linesize[compno]) { av_log(avctx, AV_LOG_ERROR, "Error: frame's linesize is too small for the image\n"); return 0; } } for (compno = 0; compno < numcomps; ++compno) { + const uint16_t *frame_ptr = (const uint16_t *)src[compno]; width = (avctx->width + image->comps[compno].dx - 1) / image->comps[compno].dx; height = (avctx->height + image->comps[compno].dy - 1) / image->comps[compno].dy; - frame_ptr = (uint16_t *)frame->data[compno]; for (y = 0; y < height; ++y) { image_line = image->comps[compno].data + y * image->comps[compno].w; - frame_index = y * (frame->linesize[compno] / 2); + frame_index = y * (linesize[compno] / 2); for (x = 0; x < width; ++x) image_line[x] = frame_ptr[frame_index++]; for (; x < image->comps[compno].w; ++x) { @@ -553,12 +557,15 @@ static int libopenjpeg_encode_frame(AVCodecContext *avctx, AVPacket *pkt, { LibOpenJPEGContext *ctx = avctx->priv_data; int ret; - AVFrame *gbrframe; int cpyresult = 0; PacketWriter writer = { 0 }; opj_codec_t *compress = NULL; opj_stream_t *stream = NULL; opj_image_t *image = mj2_create_image(avctx, &ctx->enc_params); + const uint8_t *data[4] = { frame->data[0], frame->data[1], + frame->data[2], frame->data[3] }; + int linesize[4] = { frame->linesize[0], frame->linesize[1], + frame->linesize[2], frame->linesize[3] }; if (!image) { av_log(avctx, AV_LOG_ERROR, "Error creating the mj2 image\n"); ret = AVERROR(EINVAL); @@ -569,15 +576,15 @@ static int libopenjpeg_encode_frame(AVCodecContext *avctx, AVPacket *pkt, case AV_PIX_FMT_RGB24: case AV_PIX_FMT_RGBA: case AV_PIX_FMT_YA8: - cpyresult = libopenjpeg_copy_packed8(avctx, frame, image); + cpyresult = libopenjpeg_copy_packed8(avctx, data, linesize, image); break; case AV_PIX_FMT_XYZ12: - cpyresult = libopenjpeg_copy_packed12(avctx, frame, image); + cpyresult = libopenjpeg_copy_packed12(avctx, data, linesize, image); break; case AV_PIX_FMT_RGB48: case AV_PIX_FMT_RGBA64: case AV_PIX_FMT_YA16: - cpyresult = libopenjpeg_copy_packed16(avctx, frame, image); + cpyresult = libopenjpeg_copy_packed16(avctx, data, linesize, image); break; case AV_PIX_FMT_GBR24P: case AV_PIX_FMT_GBRP9: @@ -585,23 +592,17 @@ static int libopenjpeg_encode_frame(AVCodecContext *avctx, AVPacket *pkt, case AV_PIX_FMT_GBRP12: case AV_PIX_FMT_GBRP14: case AV_PIX_FMT_GBRP16: - gbrframe = av_frame_clone(frame); - if (!gbrframe) { - ret = AVERROR(ENOMEM); - goto done; - } - gbrframe->data[0] = frame->data[2]; // swap to be rgb - gbrframe->data[1] = frame->data[0]; - gbrframe->data[2] = frame->data[1]; - gbrframe->linesize[0] = frame->linesize[2]; - gbrframe->linesize[1] = frame->linesize[0]; - gbrframe->linesize[2] = frame->linesize[1]; + data[0] = frame->data[2]; // swap to be rgb + data[1] = frame->data[0]; + data[2] = frame->data[1]; + linesize[0] = frame->linesize[2]; + linesize[1] = frame->linesize[0]; + linesize[2] = frame->linesize[1]; if (avctx->pix_fmt == AV_PIX_FMT_GBR24P) { - cpyresult = libopenjpeg_copy_unpacked8(avctx, gbrframe, image); + cpyresult = libopenjpeg_copy_unpacked8(avctx, data, linesize, image); } else { - cpyresult = libopenjpeg_copy_unpacked16(avctx, gbrframe, image); + cpyresult = libopenjpeg_copy_unpacked16(avctx, data, linesize, image); } - av_frame_free(&gbrframe); break; case AV_PIX_FMT_GRAY8: case AV_PIX_FMT_YUV410P: @@ -613,7 +614,7 @@ static int libopenjpeg_encode_frame(AVCodecContext *avctx, AVPacket *pkt, case AV_PIX_FMT_YUVA420P: case AV_PIX_FMT_YUVA422P: case AV_PIX_FMT_YUVA444P: - cpyresult = libopenjpeg_copy_unpacked8(avctx, frame, image); + cpyresult = libopenjpeg_copy_unpacked8(avctx, data, linesize, image); break; case AV_PIX_FMT_GRAY10: case AV_PIX_FMT_GRAY12: @@ -643,7 +644,7 @@ static int libopenjpeg_encode_frame(AVCodecContext *avctx, AVPacket *pkt, case AV_PIX_FMT_YUVA444P16: case AV_PIX_FMT_YUVA422P16: case AV_PIX_FMT_YUVA420P16: - cpyresult = libopenjpeg_copy_unpacked16(avctx, frame, image); + cpyresult = libopenjpeg_copy_unpacked16(avctx, data, linesize, image); break; default: av_log(avctx, AV_LOG_ERROR,

1 0

avcodec/h263dec: Avoid copying data when flipping image
by Andreas Rheinhardt 25 Feb '22

25 Feb '22

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Tue Feb 22 19:09:16 2022 +0100| [3ca347900e336dd750f00a7f1e988d4fc2c4321e] | committer: Andreas Rheinhardt avcodec/h263dec: Avoid copying data when flipping image Also remove an unchecked av_frame_make_writable(). Reviewed-by: Michael Niedermayer <michael(a)niedermayer.cc> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3ca347900e336dd75… --- libavcodec/h263dec.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index e940b7f7c7..423036e97b 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -703,17 +703,11 @@ frame_end: if (s->last_picture_ptr || s->low_delay) { if ( pict->format == AV_PIX_FMT_YUV420P && (s->codec_tag == AV_RL32("GEOV") || s->codec_tag == AV_RL32("GEOX"))) { - int x, y, p; - av_frame_make_writable(pict); - for (p=0; p<3; p++) { - int w = AV_CEIL_RSHIFT(pict-> width, !!p); + for (int p = 0; p < 3; p++) { int h = AV_CEIL_RSHIFT(pict->height, !!p); - int linesize = pict->linesize[p]; - for (y=0; y<(h>>1); y++) - for (x=0; x<w; x++) - FFSWAP(int, - pict->data[p][x + y*linesize], - pict->data[p][x + (h-1-y)*linesize]); + + pict->data[p] += (h - 1) * pict->linesize[p]; + pict->linesize[p] *= -1; } } *got_frame = 1;

1 0

avformat/argo_cvg:: Fix order of operations in error check in argo_cvg_write_trailer()
by Michael Niedermayer 25 Feb '22

25 Feb '22

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Mon Feb 14 20:24:07 2022 +0100| [70a1024290b7a6a6d544a16dc80daea9bfce0b13] | committer: Michael Niedermayer avformat/argo_cvg:: Fix order of operations in error check in argo_cvg_write_trailer() Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=70a1024290b7a6a6d… --- libavformat/argo_cvg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/argo_cvg.c b/libavformat/argo_cvg.c index f59e93496f..dfdf126c17 100644 --- a/libavformat/argo_cvg.c +++ b/libavformat/argo_cvg.c @@ -345,7 +345,7 @@ static int argo_cvg_write_trailer(AVFormatContext *s) avio_wl32(s->pb, ctx->checksum); - if ((ret = avio_seek(s->pb, 0, SEEK_SET) < 0)) + if ((ret = avio_seek(s->pb, 0, SEEK_SET)) < 0) return ret; avio_wl32(s->pb, (uint32_t)ctx->size);

1 0

avformat/argo_asf: Fix order of operations in error check in argo_asf_write_trailer()
by Michael Niedermayer 25 Feb '22

25 Feb '22

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Mon Feb 14 20:24:07 2022 +0100| [c8c12fb5d69107f94c5a0be14d0f3646861c60d1] | committer: Michael Niedermayer avformat/argo_asf: Fix order of operations in error check in argo_asf_write_trailer() Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c8c12fb5d69107f94… --- libavformat/argo_asf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/argo_asf.c b/libavformat/argo_asf.c index 2b3569ebc3..d26844d1e2 100644 --- a/libavformat/argo_asf.c +++ b/libavformat/argo_asf.c @@ -423,7 +423,7 @@ static int argo_asf_write_trailer(AVFormatContext *s) ArgoASFMuxContext *ctx = s->priv_data; int64_t ret; - if ((ret = avio_seek(s->pb, ASF_FILE_HEADER_SIZE, SEEK_SET) < 0)) + if ((ret = avio_seek(s->pb, ASF_FILE_HEADER_SIZE, SEEK_SET)) < 0) return ret; avio_wl32(s->pb, (uint32_t)ctx->nb_blocks);

1 0

avcodec/movtextdec: add () to CMP() macro to avoid unexpected behavior
by Michael Niedermayer 25 Feb '22

25 Feb '22

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Mon Feb 14 20:20:47 2022 +0100| [c182c706589de2b513331c61a8597fa863d4e97f] | committer: Michael Niedermayer avcodec/movtextdec: add () to CMP() macro to avoid unexpected behavior Reviewed-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c182c706589de2b51… --- libavcodec/movtextdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/movtextdec.c b/libavcodec/movtextdec.c index 825632ca9b..dc30fdc698 100644 --- a/libavcodec/movtextdec.c +++ b/libavcodec/movtextdec.c @@ -263,7 +263,7 @@ static int decode_hclr(const uint8_t *tsmb, MovTextContext *m, uint64_t size) static int styles_equivalent(const StyleBox *a, const StyleBox *b) { -#define CMP(field) a->field == b->field +#define CMP(field) ((a)->field == (b)->field) return CMP(bold) && CMP(italic) && CMP(underline) && CMP(color) && CMP(alpha) && CMP(fontsize) && CMP(font_id); #undef CMP

1 0