Also pass correct EOF timestamp.
Unified · Split
| @@ -38,7 +38,9 @@ typedef struct RubberBandContext { · 37 unmodified lines | |||
| 38 | int64_t nb_samples_out; | 38 | int64_t nb_samples_out; |
| 39 | int64_t nb_samples_in; | 39 | int64_t nb_samples_in; |
| 40 | int64_t first_pts; | 40 | int64_t first_pts; |
| 41 | int64_t last_pts; | ||
| 41 | int nb_samples; | 42 | int nb_samples; |
| 43 | int eof; | ||
| 42 | } RubberBandContext; | 44 | } RubberBandContext; |
| 43 | 45 | ||
| 44 | #define OFFSET(x) offsetof(RubberBandContext, x) | 46 | #define OFFSET(x) offsetof(RubberBandContext, x) |
| @@ -100,7 +102,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) · 55 unmodified lines | |||
| 100 | if (s->first_pts == AV_NOPTS_VALUE) | 102 | if (s->first_pts == AV_NOPTS_VALUE) |
| 101 | s->first_pts = in->pts; | 103 | s->first_pts = in->pts; |
| 102 | 104 | ||
| 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); |
| 104 | s->nb_samples_in += in->nb_samples; | 106 | s->nb_samples_in += in->nb_samples; |
| 105 | 107 | ||
| 106 | nb_samples = rubberband_available(s->rbs); | 108 | nb_samples = rubberband_available(s->rbs); |
| @@ -113,6 +115,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) · 6 unmodified lines | |||
| 113 | out->pts = s->first_pts + av_rescale_q(s->nb_samples_out, | 115 | out->pts = s->first_pts + av_rescale_q(s->nb_samples_out, |
| 114 | (AVRational){ 1, outlink->sample_rate }, | 116 | (AVRational){ 1, outlink->sample_rate }, |
| 115 | outlink->time_base); | 117 | outlink->time_base); |
| 118 | s->last_pts = out->pts; | ||
| 116 | nb_samples = rubberband_retrieve(s->rbs, (float *const *)out->extended_data, nb_samples); | 119 | nb_samples = rubberband_retrieve(s->rbs, (float *const *)out->extended_data, nb_samples); |
| 117 | out->nb_samples = nb_samples; | 120 | out->nb_samples = nb_samples; |
| 118 | ret = ff_filter_frame(outlink, out); | 121 | ret = ff_filter_frame(outlink, out); |
| @@ -151,11 +154,16 @@ static int activate(AVFilterContext *ctx) · 32 unmodified lines | |||
| 151 | AVFilterLink *outlink = ctx->outputs[0]; | 154 | AVFilterLink *outlink = ctx->outputs[0]; |
| 152 | RubberBandContext *s = ctx->priv; | 155 | RubberBandContext *s = ctx->priv; |
| 153 | AVFrame *in = NULL; | 156 | AVFrame *in = NULL; |
| 154 | int ret; | 157 | int64_t pts; |
| 158 | int status, ret; | ||
| 155 | 159 | ||
| 156 | FF_FILTER_FORWARD_STATUS_BACK(outlink, inlink); | 160 | FF_FILTER_FORWARD_STATUS_BACK(outlink, inlink); |
| 157 | 161 | ||
| 158 | ret = ff_inlink_consume_samples(inlink, s->nb_samples, s->nb_samples, &in); | 162 | 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 | |||
| 159 | if (ret < 0) | 167 | if (ret < 0) |
| 160 | return ret; | 168 | return ret; |
| 161 | if (ret > 0) { | 169 | if (ret > 0) { |
| @@ -164,7 +172,11 @@ static int activate(AVFilterContext *ctx) · 2 unmodified lines | |||
| 164 | return ret; | 172 | return ret; |
| 165 | } | 173 | } |
| 166 | 174 | ||
| 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 | |||
| 168 | FF_FILTER_FORWARD_WANTED(outlink, inlink); | 180 | FF_FILTER_FORWARD_WANTED(outlink, inlink); |
| 169 | 181 | ||
| 170 | return FFERROR_NOT_READY; | 182 | return FFERROR_NOT_READY; |