History

avfilter/avf_abitscope: switch to activate

Paul B Mahol committed 7 years ago

Commit a7fa89f1 parent 255feec1 file · +27 −6Browse files

Showing the changes to libavfilter (1 of 1 file). Show all

Unified · Split

libavfilter/avf_abitscope.c+27−6
@@ -24,6 +24,7 @@ · 23 unmodified lines
2424 #include "libavutil/opt.h"
2525 #include "libavutil/parseutils.h"
2626 #include "avfilter.h"
27+#include "filters.h"
2728 #include "formats.h"
2829 #include "audio.h"
2930 #include "video.h"
@@ -36,6 +37,7 @@ typedef struct AudioBitScopeContext { · 6 unmodified lines
3637 char *colors;
3738
3839 int nb_channels;
40+ int nb_samples;
3941 int depth;
4042 uint8_t *fg;
4143
@@ -91,13 +93,10 @@ static int config_input(AVFilterLink *inlink) · 49 unmodified lines
9193 {
9294 AVFilterContext *ctx = inlink->dst;
9395 AudioBitScopeContext *s = ctx->priv;
94− int ch, nb_samples;
96+ int ch;
9597 char *colors, *saveptr = NULL;
9698
97− nb_samples = FFMAX(1024, ((double)inlink->sample_rate / av_q2d(s->frame_rate)) + 0.5);
98− inlink->partial_buf_size =
99− inlink->min_samples =
100− inlink->max_samples = nb_samples;
99+ s->nb_samples = FFMAX(1, ((double)inlink->sample_rate / av_q2d(s->frame_rate)) + 0.5);
101100 s->nb_channels = inlink->channels;
102101 s->depth = inlink->format == AV_SAMPLE_FMT_S16P ? 16 : 32;
103102
@@ -222,12 +221,33 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples) · 118 unmodified lines
222221 return ff_filter_frame(outlink, outpicref);
223222 }
224223
224+static int activate(AVFilterContext *ctx)
225+{
226+ AVFilterLink *inlink = ctx->inputs[0];
227+ AVFilterLink *outlink = ctx->outputs[0];
228+ AudioBitScopeContext *s = ctx->priv;
229+ AVFrame *in;
230+ int ret;
231+
232+ FF_FILTER_FORWARD_STATUS_BACK(outlink, inlink);
233+
234+ ret = ff_inlink_consume_samples(inlink, s->nb_samples, s->nb_samples, &in);
235+ if (ret < 0)
236+ return ret;
237+ if (ret > 0)
238+ return filter_frame(inlink, in);
239+
240+ FF_FILTER_FORWARD_STATUS(inlink, outlink);
241+ FF_FILTER_FORWARD_WANTED(outlink, inlink);
242+
243+ return FFERROR_NOT_READY;
244+}
245+
225246 static const AVFilterPad inputs[] = {
226247 {
227248 .name = "default",
228249 .type = AVMEDIA_TYPE_AUDIO,
229250 .config_props = config_input,
230− .filter_frame = filter_frame,
231251 },
232252 { NULL }
233253 };
@@ -248,5 +268,6 @@ AVFilter ff_avf_abitscope = { · 14 unmodified lines
248268 .priv_size = sizeof(AudioBitScopeContext),
249269 .inputs = inputs,
250270 .outputs = outputs,
271+ .activate = activate,
251272 .priv_class = &abitscope_class,
252273 };

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