Commit 782ea8b2 authored by Paul B Mahol's avatar Paul B Mahol

avfilter/af_asetnsamples: add timeline support

parent 03800bca
...@@ -61,12 +61,15 @@ static int activate(AVFilterContext *ctx) ...@@ -61,12 +61,15 @@ static int activate(AVFilterContext *ctx)
FF_FILTER_FORWARD_STATUS_BACK(outlink, inlink); FF_FILTER_FORWARD_STATUS_BACK(outlink, inlink);
if (ctx->is_disabled)
ret = ff_inlink_consume_frame(inlink, &frame);
else
ret = ff_inlink_consume_samples(inlink, s->nb_out_samples, s->nb_out_samples, &frame); ret = ff_inlink_consume_samples(inlink, s->nb_out_samples, s->nb_out_samples, &frame);
if (ret < 0) if (ret < 0)
return ret; return ret;
if (ret > 0) { if (ret > 0) {
if (!s->pad || frame->nb_samples == s->nb_out_samples) if (!s->pad || ctx->is_disabled || frame->nb_samples == s->nb_out_samples)
return ff_filter_frame(outlink, frame); return ff_filter_frame(outlink, frame);
pad_frame = ff_get_audio_buffer(outlink, s->nb_out_samples); pad_frame = ff_get_audio_buffer(outlink, s->nb_out_samples);
...@@ -123,5 +126,6 @@ const AVFilter ff_af_asetnsamples = { ...@@ -123,5 +126,6 @@ const AVFilter ff_af_asetnsamples = {
FILTER_INPUTS(asetnsamples_inputs), FILTER_INPUTS(asetnsamples_inputs),
FILTER_OUTPUTS(asetnsamples_outputs), FILTER_OUTPUTS(asetnsamples_outputs),
.activate = activate, .activate = activate,
.flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL,
.process_command = ff_filter_process_command, .process_command = ff_filter_process_command,
}; };
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment