Showing the changes to libavfilter (1 of 1 file). Show all
Unified · Split
| @@ -28,6 +28,7 @@ · 27 unmodified lines | |||
| 28 | #include "libavutil/opt.h" | 28 | #include "libavutil/opt.h" |
| 29 | #include "libavutil/parseutils.h" | 29 | #include "libavutil/parseutils.h" |
| 30 | #include "avfilter.h" | 30 | #include "avfilter.h" |
| 31 | #include "filters.h" | ||
| 31 | #include "formats.h" | 32 | #include "formats.h" |
| 32 | #include "audio.h" | 33 | #include "audio.h" |
| 33 | #include "video.h" | 34 | #include "video.h" |
| @@ -69,6 +70,7 @@ typedef struct AudioVectorScopeContext { · 35 unmodified lines | |||
| 69 | int mirror; | 70 | int mirror; |
| 70 | unsigned prev_x, prev_y; | 71 | unsigned prev_x, prev_y; |
| 71 | AVRational frame_rate; | 72 | AVRational frame_rate; |
| 73 | int nb_samples; | ||
| 72 | } AudioVectorScopeContext; | 74 | } AudioVectorScopeContext; |
| 73 | 75 | ||
| 74 | #define OFFSET(x) offsetof(AudioVectorScopeContext, x) | 76 | #define OFFSET(x) offsetof(AudioVectorScopeContext, x) |
| @@ -208,12 +210,8 @@ static int config_input(AVFilterLink *inlink) · 133 unmodified lines | |||
| 208 | { | 210 | { |
| 209 | AVFilterContext *ctx = inlink->dst; | 211 | AVFilterContext *ctx = inlink->dst; |
| 210 | AudioVectorScopeContext *s = ctx->priv; | 212 | AudioVectorScopeContext *s = ctx->priv; |
| 211 | int nb_samples; | ||
| 212 | 213 | ||
| 213 | nb_samples = FFMAX(1024, ((double)inlink->sample_rate / av_q2d(s->frame_rate)) + 0.5); | 214 | s->nb_samples = FFMAX(1, ((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; | ||
| 217 | 215 | ||
| 218 | return 0; | 216 | return 0; |
| 219 | } | 217 | } |
| @@ -365,6 +363,28 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples) · 145 unmodified lines | |||
| 365 | return ff_filter_frame(outlink, av_frame_clone(s->outpicref)); | 363 | return ff_filter_frame(outlink, av_frame_clone(s->outpicref)); |
| 366 | } | 364 | } |
| 367 | 365 | ||
| 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 | |||
| 368 | static av_cold void uninit(AVFilterContext *ctx) | 388 | static av_cold void uninit(AVFilterContext *ctx) |
| 369 | { | 389 | { |
| 370 | AudioVectorScopeContext *s = ctx->priv; | 390 | AudioVectorScopeContext *s = ctx->priv; |
| @@ -377,7 +397,6 @@ static const AVFilterPad audiovectorscope_inputs[] = { · 6 unmodified lines | |||
| 377 | .name = "default", | 397 | .name = "default", |
| 378 | .type = AVMEDIA_TYPE_AUDIO, | 398 | .type = AVMEDIA_TYPE_AUDIO, |
| 379 | .config_props = config_input, | 399 | .config_props = config_input, |
| 380 | .filter_frame = filter_frame, | ||
| 381 | }, | 400 | }, |
| 382 | { NULL } | 401 | { NULL } |
| 383 | }; | 402 | }; |
| @@ -397,6 +416,7 @@ AVFilter ff_avf_avectorscope = { · 13 unmodified lines | |||
| 397 | .uninit = uninit, | 416 | .uninit = uninit, |
| 398 | .query_formats = query_formats, | 417 | .query_formats = query_formats, |
| 399 | .priv_size = sizeof(AudioVectorScopeContext), | 418 | .priv_size = sizeof(AudioVectorScopeContext), |
| 419 | .activate = activate, | ||
| 400 | .inputs = audiovectorscope_inputs, | 420 | .inputs = audiovectorscope_inputs, |
| 401 | .outputs = audiovectorscope_outputs, | 421 | .outputs = audiovectorscope_outputs, |
| 402 | .priv_class = &avectorscope_class, | 422 | .priv_class = &avectorscope_class, |