History

avfilter/af_rubberband: rewrite EOF handling

Also pass correct EOF timestamp.

Paul B Mahol committed 3 years ago

Commit bfd50901 parent 1d7a6ea1 file · +15 −3Browse files

Unified · Split

libavfilter/af_rubberband.c+15−3
@@ -38,7 +38,9 @@ typedef struct RubberBandContext { · 37 unmodified lines
3838 int64_t nb_samples_out;
3939 int64_t nb_samples_in;
4040 int64_t first_pts;
41+ int64_t last_pts;
4142 int nb_samples;
43+ int eof;
4244 } RubberBandContext;
4345
4446 #define OFFSET(x) offsetof(RubberBandContext, x)
@@ -100,7 +102,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) · 55 unmodified lines
100102 if (s->first_pts == AV_NOPTS_VALUE)
101103 s->first_pts = in->pts;
102104
103− rubberband_process(s->rbs, (const float *const *)in->extended_data, in->nb_samples, ff_outlink_get_status(inlink));
105+ rubberband_process(s->rbs, (const float *const *)in->extended_data, in->nb_samples, s->eof);
104106 s->nb_samples_in += in->nb_samples;
105107
106108 nb_samples = rubberband_available(s->rbs);
@@ -113,6 +115,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) · 6 unmodified lines
113115 out->pts = s->first_pts + av_rescale_q(s->nb_samples_out,
114116 (AVRational){ 1, outlink->sample_rate },
115117 outlink->time_base);
118+ s->last_pts = out->pts;
116119 nb_samples = rubberband_retrieve(s->rbs, (float *const *)out->extended_data, nb_samples);
117120 out->nb_samples = nb_samples;
118121 ret = ff_filter_frame(outlink, out);
@@ -151,11 +154,16 @@ static int activate(AVFilterContext *ctx) · 32 unmodified lines
151154 AVFilterLink *outlink = ctx->outputs[0];
152155 RubberBandContext *s = ctx->priv;
153156 AVFrame *in = NULL;
154− int ret;
157+ int64_t pts;
158+ int status, ret;
155159
156160 FF_FILTER_FORWARD_STATUS_BACK(outlink, inlink);
157161
158162 ret = ff_inlink_consume_samples(inlink, s->nb_samples, s->nb_samples, &in);
163+
164+ if (ff_inlink_acknowledge_status(inlink, &status, &pts))
165+ s->eof |= status == AVERROR_EOF;
166+
159167 if (ret < 0)
160168 return ret;
161169 if (ret > 0) {
@@ -164,7 +172,11 @@ static int activate(AVFilterContext *ctx) · 2 unmodified lines
164172 return ret;
165173 }
166174
167− FF_FILTER_FORWARD_STATUS(inlink, outlink);
175+ if (s->eof) {
176+ ff_outlink_set_status(outlink, AVERROR_EOF, s->last_pts);
177+ return 0;
178+ }
179+
168180 FF_FILTER_FORWARD_WANTED(outlink, inlink);
169181
170182 return FFERROR_NOT_READY;

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