[FFmpeg-cvslog] avfilter/af_anlmdn: add support for using writable frames
Paul B Mahol
git at videolan.org
Thu Mar 10 13:07:57 EET 2022
ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Thu Mar 10 10:33:26 2022 +0100| [34715fe4a2df70a9b6010df10e97330bb347fc57] | committer: Paul B Mahol
avfilter/af_anlmdn: add support for using writable frames
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=34715fe4a2df70a9b6010df10e97330bb347fc57
---
libavfilter/af_anlmdn.c | 36 +++++++++++++++++++++++-------------
1 file changed, 23 insertions(+), 13 deletions(-)
diff --git a/libavfilter/af_anlmdn.c b/libavfilter/af_anlmdn.c
index 9df388b727..54cbd8d387 100644
--- a/libavfilter/af_anlmdn.c
+++ b/libavfilter/af_anlmdn.c
@@ -50,6 +50,7 @@ typedef struct AudioNLMeansContext {
int N;
int H;
+ AVFrame *in;
AVFrame *cache;
AVFrame *window;
@@ -201,6 +202,8 @@ static int filter_channel(AVFilterContext *ctx, void *arg, int ch, int nb_jobs)
AVFrame *out = arg;
const int S = s->S;
const int K = s->K;
+ const int N = s->N;
+ const int H = s->H;
const int om = s->om;
const float *f = (const float *)(s->window->extended_data[ch]) + K;
float *cache = (float *)s->cache->extended_data[ch];
@@ -209,8 +212,15 @@ static int filter_channel(AVFilterContext *ctx, void *arg, int ch, int nb_jobs)
const float *const weight_lut = s->weight_lut;
const float pdiff_lut_scale = s->pdiff_lut_scale;
const float smooth = fminf(s->m, WEIGHT_LUT_SIZE / pdiff_lut_scale);
+ const int offset = N - H;
+ float *src = (float *)s->window->extended_data[ch];
+ const AVFrame *const in = s->in;
- for (int i = S; i < s->H + S; i++) {
+ memmove(src, &src[H], offset * sizeof(float));
+ memcpy(&src[offset], in->extended_data[ch], in->nb_samples * sizeof(float));
+ memset(&src[offset + in->nb_samples], 0, (H - in->nb_samples) * sizeof(float));
+
+ for (int i = S; i < H + S; i++) {
float P = 0.f, Q = 0.f;
int v = 0;
@@ -260,25 +270,25 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
AVFilterContext *ctx = inlink->dst;
AVFilterLink *outlink = ctx->outputs[0];
AudioNLMeansContext *s = ctx->priv;
- const int offset = s->N - s->H;
AVFrame *out;
- out = ff_get_audio_buffer(outlink, in->nb_samples);
- if (!out)
- return AVERROR(ENOMEM);
-
- for (int ch = 0; ch < in->channels; ch++) {
- float *src = (float *)s->window->extended_data[ch];
+ 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);
+ }
- memmove(src, &src[s->H], offset * sizeof(float));
- memcpy(&src[offset], in->extended_data[ch], in->nb_samples * sizeof(float));
- memset(&src[offset + in->nb_samples], 0, (s->H - in->nb_samples) * sizeof(float));
+ out->pts = in->pts;
}
+ s->in = in;
ff_filter_execute(ctx, filter_channel, out, NULL, inlink->channels);
- out->pts = in->pts;
- av_frame_free(&in);
+ if (out != in)
+ av_frame_free(&in);
return ff_filter_frame(outlink, out);
}
More information about the ffmpeg-cvslog
mailing list