Showing the changes to libavfilter (1 of 1 file). Show all
Unified · Split
| @@ -24,6 +24,7 @@ · 23 unmodified lines | |||
| 24 | #include "libavutil/opt.h" | 24 | #include "libavutil/opt.h" |
| 25 | #include "libavutil/parseutils.h" | 25 | #include "libavutil/parseutils.h" |
| 26 | #include "avfilter.h" | 26 | #include "avfilter.h" |
| 27 | #include "filters.h" | ||
| 27 | #include "formats.h" | 28 | #include "formats.h" |
| 28 | #include "audio.h" | 29 | #include "audio.h" |
| 29 | #include "video.h" | 30 | #include "video.h" |
| @@ -36,6 +37,7 @@ typedef struct AudioBitScopeContext { · 6 unmodified lines | |||
| 36 | char *colors; | 37 | char *colors; |
| 37 | 38 | ||
| 38 | int nb_channels; | 39 | int nb_channels; |
| 40 | int nb_samples; | ||
| 39 | int depth; | 41 | int depth; |
| 40 | uint8_t *fg; | 42 | uint8_t *fg; |
| 41 | 43 | ||
| @@ -91,13 +93,10 @@ static int config_input(AVFilterLink *inlink) · 49 unmodified lines | |||
| 91 | { | 93 | { |
| 92 | AVFilterContext *ctx = inlink->dst; | 94 | AVFilterContext *ctx = inlink->dst; |
| 93 | AudioBitScopeContext *s = ctx->priv; | 95 | AudioBitScopeContext *s = ctx->priv; |
| 94 | int ch, nb_samples; | 96 | int ch; |
| 95 | char *colors, *saveptr = NULL; | 97 | char *colors, *saveptr = NULL; |
| 96 | 98 | ||
| 97 | nb_samples = FFMAX(1024, ((double)inlink->sample_rate / av_q2d(s->frame_rate)) + 0.5); | 99 | s->nb_samples = FFMAX(1, ((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; | ||
| 101 | s->nb_channels = inlink->channels; | 100 | s->nb_channels = inlink->channels; |
| 102 | s->depth = inlink->format == AV_SAMPLE_FMT_S16P ? 16 : 32; | 101 | s->depth = inlink->format == AV_SAMPLE_FMT_S16P ? 16 : 32; |
| 103 | 102 | ||
| @@ -222,12 +221,33 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples) · 118 unmodified lines | |||
| 222 | return ff_filter_frame(outlink, outpicref); | 221 | return ff_filter_frame(outlink, outpicref); |
| 223 | } | 222 | } |
| 224 | 223 | ||
| 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 | |||
| 225 | static const AVFilterPad inputs[] = { | 246 | static const AVFilterPad inputs[] = { |
| 226 | { | 247 | { |
| 227 | .name = "default", | 248 | .name = "default", |
| 228 | .type = AVMEDIA_TYPE_AUDIO, | 249 | .type = AVMEDIA_TYPE_AUDIO, |
| 229 | .config_props = config_input, | 250 | .config_props = config_input, |
| 230 | .filter_frame = filter_frame, | ||
| 231 | }, | 251 | }, |
| 232 | { NULL } | 252 | { NULL } |
| 233 | }; | 253 | }; |
| @@ -248,5 +268,6 @@ AVFilter ff_avf_abitscope = { · 14 unmodified lines | |||
| 248 | .priv_size = sizeof(AudioBitScopeContext), | 268 | .priv_size = sizeof(AudioBitScopeContext), |
| 249 | .inputs = inputs, | 269 | .inputs = inputs, |
| 250 | .outputs = outputs, | 270 | .outputs = outputs, |
| 271 | .activate = activate, | ||
| 251 | .priv_class = &abitscope_class, | 272 | .priv_class = &abitscope_class, |
| 252 | }; | 273 | }; |