History

avfilter/avf_avectorscope: switch to activate

Paul B Mahol committed 7 years ago

Commit 21b1f081 parent 77aacdb1 file · +26 −6Browse files

Unified · Split

libavfilter/avf_avectorscope.c+26−6
@@ -28,6 +28,7 @@ · 27 unmodified lines
2828 #include "libavutil/opt.h"
2929 #include "libavutil/parseutils.h"
3030 #include "avfilter.h"
31+#include "filters.h"
3132 #include "formats.h"
3233 #include "audio.h"
3334 #include "video.h"
@@ -69,6 +70,7 @@ typedef struct AudioVectorScopeContext { · 35 unmodified lines
6970 int mirror;
7071 unsigned prev_x, prev_y;
7172 AVRational frame_rate;
73+ int nb_samples;
7274 } AudioVectorScopeContext;
7375
7476 #define OFFSET(x) offsetof(AudioVectorScopeContext, x)
@@ -208,12 +210,8 @@ static int config_input(AVFilterLink *inlink) · 133 unmodified lines
208210 {
209211 AVFilterContext *ctx = inlink->dst;
210212 AudioVectorScopeContext *s = ctx->priv;
211− int nb_samples;
212213
213− nb_samples = FFMAX(1024, ((double)inlink->sample_rate / av_q2d(s->frame_rate)) + 0.5);
214− inlink->partial_buf_size =
215− inlink->min_samples =
216− inlink->max_samples = nb_samples;
214+ s->nb_samples = FFMAX(1, ((double)inlink->sample_rate / av_q2d(s->frame_rate)) + 0.5);
217215
218216 return 0;
219217 }
@@ -365,6 +363,28 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples) · 145 unmodified lines
365363 return ff_filter_frame(outlink, av_frame_clone(s->outpicref));
366364 }
367365
366+static int activate(AVFilterContext *ctx)
367+{
368+ AVFilterLink *inlink = ctx->inputs[0];
369+ AVFilterLink *outlink = ctx->outputs[0];
370+ AudioVectorScopeContext *s = ctx->priv;
371+ AVFrame *in;
372+ int ret;
373+
374+ FF_FILTER_FORWARD_STATUS_BACK(outlink, inlink);
375+
376+ ret = ff_inlink_consume_samples(inlink, s->nb_samples, s->nb_samples, &in);
377+ if (ret < 0)
378+ return ret;
379+ if (ret > 0)
380+ return filter_frame(inlink, in);
381+
382+ FF_FILTER_FORWARD_STATUS(inlink, outlink);
383+ FF_FILTER_FORWARD_WANTED(outlink, inlink);
384+
385+ return FFERROR_NOT_READY;
386+}
387+
368388 static av_cold void uninit(AVFilterContext *ctx)
369389 {
370390 AudioVectorScopeContext *s = ctx->priv;
@@ -377,7 +397,6 @@ static const AVFilterPad audiovectorscope_inputs[] = { · 6 unmodified lines
377397 .name = "default",
378398 .type = AVMEDIA_TYPE_AUDIO,
379399 .config_props = config_input,
380− .filter_frame = filter_frame,
381400 },
382401 { NULL }
383402 };
@@ -397,6 +416,7 @@ AVFilter ff_avf_avectorscope = { · 13 unmodified lines
397416 .uninit = uninit,
398417 .query_formats = query_formats,
399418 .priv_size = sizeof(AudioVectorScopeContext),
419+ .activate = activate,
400420 .inputs = audiovectorscope_inputs,
401421 .outputs = audiovectorscope_outputs,
402422 .priv_class = &avectorscope_class,

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