[FFmpeg-cvslog] avfilter/avf_avectorscope: switch to activate
Paul B Mahol
git at videolan.org
Mon Apr 29 16:22:05 EEST 2019
ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Mon Apr 29 12:52:50 2019 +0200| [21b1f08ea2ec785f47d7d90955b2eaa28ea345ee] | committer: Paul B Mahol
avfilter/avf_avectorscope: switch to activate
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=21b1f08ea2ec785f47d7d90955b2eaa28ea345ee
---
libavfilter/avf_avectorscope.c | 32 ++++++++++++++++++++++++++------
1 file changed, 26 insertions(+), 6 deletions(-)
diff --git a/libavfilter/avf_avectorscope.c b/libavfilter/avf_avectorscope.c
index af9f1da1ec..d9ec151331 100644
--- a/libavfilter/avf_avectorscope.c
+++ b/libavfilter/avf_avectorscope.c
@@ -28,6 +28,7 @@
#include "libavutil/opt.h"
#include "libavutil/parseutils.h"
#include "avfilter.h"
+#include "filters.h"
#include "formats.h"
#include "audio.h"
#include "video.h"
@@ -69,6 +70,7 @@ typedef struct AudioVectorScopeContext {
int mirror;
unsigned prev_x, prev_y;
AVRational frame_rate;
+ int nb_samples;
} AudioVectorScopeContext;
#define OFFSET(x) offsetof(AudioVectorScopeContext, x)
@@ -208,12 +210,8 @@ static int config_input(AVFilterLink *inlink)
{
AVFilterContext *ctx = inlink->dst;
AudioVectorScopeContext *s = ctx->priv;
- int nb_samples;
- nb_samples = FFMAX(1024, ((double)inlink->sample_rate / av_q2d(s->frame_rate)) + 0.5);
- inlink->partial_buf_size =
- inlink->min_samples =
- inlink->max_samples = nb_samples;
+ s->nb_samples = FFMAX(1, ((double)inlink->sample_rate / av_q2d(s->frame_rate)) + 0.5);
return 0;
}
@@ -365,6 +363,28 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples)
return ff_filter_frame(outlink, av_frame_clone(s->outpicref));
}
+static int activate(AVFilterContext *ctx)
+{
+ AVFilterLink *inlink = ctx->inputs[0];
+ AVFilterLink *outlink = ctx->outputs[0];
+ AudioVectorScopeContext *s = ctx->priv;
+ AVFrame *in;
+ int ret;
+
+ FF_FILTER_FORWARD_STATUS_BACK(outlink, inlink);
+
+ ret = ff_inlink_consume_samples(inlink, s->nb_samples, s->nb_samples, &in);
+ if (ret < 0)
+ return ret;
+ if (ret > 0)
+ return filter_frame(inlink, in);
+
+ FF_FILTER_FORWARD_STATUS(inlink, outlink);
+ FF_FILTER_FORWARD_WANTED(outlink, inlink);
+
+ return FFERROR_NOT_READY;
+}
+
static av_cold void uninit(AVFilterContext *ctx)
{
AudioVectorScopeContext *s = ctx->priv;
@@ -377,7 +397,6 @@ static const AVFilterPad audiovectorscope_inputs[] = {
.name = "default",
.type = AVMEDIA_TYPE_AUDIO,
.config_props = config_input,
- .filter_frame = filter_frame,
},
{ NULL }
};
@@ -397,6 +416,7 @@ AVFilter ff_avf_avectorscope = {
.uninit = uninit,
.query_formats = query_formats,
.priv_size = sizeof(AudioVectorScopeContext),
+ .activate = activate,
.inputs = audiovectorscope_inputs,
.outputs = audiovectorscope_outputs,
.priv_class = &avectorscope_class,
More information about the ffmpeg-cvslog
mailing list