History

avfilter/avf_showvolume: switch to activate

Paul B Mahol committed 7 years ago

Commit 5ddaedc1 parent f78172b1 file · +26 −6Browse files

Unified · Split

libavfilter/avf_showvolume.c+26−6
@@ -26,6 +26,7 @@ · 25 unmodified lines
2626 #include "libavutil/parseutils.h"
2727 #include "libavutil/xga_font_data.h"
2828 #include "avfilter.h"
29+#include "filters.h"
2930 #include "formats.h"
3031 #include "audio.h"
3132 #include "video.h"
@@ -47,6 +48,7 @@ typedef struct ShowVolumeContext { · 15 unmodified lines
4748 float bgopacity;
4849 int mode;
4950
51+ int nb_samples;
5052 AVFrame *out;
5153 AVExpr *c_expr;
5254 int draw_text;
@@ -162,12 +164,8 @@ static int config_input(AVFilterLink *inlink) · 109 unmodified lines
162164 {
163165 AVFilterContext *ctx = inlink->dst;
164166 ShowVolumeContext *s = ctx->priv;
165− int nb_samples;
166167
167− nb_samples = FFMAX(1024, ((double)inlink->sample_rate / av_q2d(s->frame_rate)) + 0.5);
168− inlink->partial_buf_size =
169− inlink->min_samples =
170− inlink->max_samples = nb_samples;
168+ s->nb_samples = FFMAX(1024, ((double)inlink->sample_rate / av_q2d(s->frame_rate)) + 0.5);
171169 s->values = av_calloc(inlink->channels * VAR_VARS_NB, sizeof(double));
172170 if (!s->values)
173171 return AVERROR(ENOMEM);
@@ -449,6 +447,28 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples) · 275 unmodified lines
449447 return ff_filter_frame(outlink, out);
450448 }
451449
450+static int activate(AVFilterContext *ctx)
451+{
452+ AVFilterLink *inlink = ctx->inputs[0];
453+ AVFilterLink *outlink = ctx->outputs[0];
454+ ShowVolumeContext *s = ctx->priv;
455+ AVFrame *in = NULL;
456+ int ret;
457+
458+ FF_FILTER_FORWARD_STATUS_BACK(outlink, inlink);
459+
460+ ret = ff_inlink_consume_samples(inlink, s->nb_samples, s->nb_samples, &in);
461+ if (ret < 0)
462+ return ret;
463+ if (ret > 0)
464+ return filter_frame(inlink, in);
465+
466+ FF_FILTER_FORWARD_STATUS(inlink, outlink);
467+ FF_FILTER_FORWARD_WANTED(outlink, inlink);
468+
469+ return FFERROR_NOT_READY;
470+}
471+
452472 static av_cold void uninit(AVFilterContext *ctx)
453473 {
454474 ShowVolumeContext *s = ctx->priv;
@@ -465,7 +485,6 @@ static const AVFilterPad showvolume_inputs[] = { · 10 unmodified lines
465485 .name = "default",
466486 .type = AVMEDIA_TYPE_AUDIO,
467487 .config_props = config_input,
468− .filter_frame = filter_frame,
469488 },
470489 { NULL }
471490 };
@@ -483,6 +502,7 @@ AVFilter ff_avf_showvolume = { · 11 unmodified lines
483502 .name = "showvolume",
484503 .description = NULL_IF_CONFIG_SMALL("Convert input audio volume to video output."),
485504 .init = init,
505+ .activate = activate,
486506 .uninit = uninit,
487507 .query_formats = query_formats,
488508 .priv_size = sizeof(ShowVolumeContext),

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t