Unified · Split
| @@ -223,6 +223,37 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamplesref) · 222 unmodified lines | ||
| 223 | 223 | return ret; |
| 224 | 224 | } |
| 225 | 225 | |
| 226 | +static int flush_frame(AVFilterLink *outlink, int final, AVFrame **outsamplesref_ret) | |
| 227 | +{ | |
| 228 | + AVFilterContext *ctx = outlink->src; | |
| 229 | + AResampleContext *aresample = ctx->priv; | |
| 230 | + AVFilterLink *const inlink = outlink->src->inputs[0]; | |
| 231 | + AVFrame *outsamplesref; | |
| 232 | + int n_out = 4096; | |
| 233 | + int64_t pts; | |
| 234 | + | |
| 235 | + outsamplesref = ff_get_audio_buffer(outlink, n_out); | |
| 236 | + *outsamplesref_ret = outsamplesref; | |
| 237 | + if (!outsamplesref) | |
| 238 | + return AVERROR(ENOMEM); | |
| 239 | + | |
| 240 | + pts = swr_next_pts(aresample->swr, INT64_MIN); | |
| 241 | + pts = ROUNDED_DIV(pts, inlink->sample_rate); | |
| 242 | + | |
| 243 | + n_out = swr_convert(aresample->swr, outsamplesref->extended_data, n_out, final ? NULL : (void*)outsamplesref->extended_data, 0); | |
| 244 | + if (n_out <= 0) { | |
| 245 | + av_frame_free(&outsamplesref); | |
| 246 | + return (n_out == 0) ? AVERROR_EOF : n_out; | |
| 247 | + } | |
| 248 | + | |
| 249 | + outsamplesref->sample_rate = outlink->sample_rate; | |
| 250 | + outsamplesref->nb_samples = n_out; | |
| 251 | + | |
| 252 | + outsamplesref->pts = pts; | |
| 253 | + | |
| 254 | + return 0; | |
| 255 | +} | |
| 256 | + | |
| 226 | 257 | static int request_frame(AVFilterLink *outlink) |
| 227 | 258 | { |
| 228 | 259 | AVFilterContext *ctx = outlink->src; |
| @@ -237,26 +268,9 @@ static int request_frame(AVFilterLink *outlink) · 8 unmodified lines | ||
| 237 | 268 | |
| 238 | 269 | if (ret == AVERROR_EOF) { |
| 239 | 270 | AVFrame *outsamplesref; |
| 240 | − int n_out = 4096; | |
| 241 | − int64_t pts; | |
| 242 | − | |
| 243 | − outsamplesref = ff_get_audio_buffer(outlink, n_out); | |
| 244 | − if (!outsamplesref) | |
| 245 | − return AVERROR(ENOMEM); | |
| 246 | − | |
| 247 | − pts = swr_next_pts(aresample->swr, INT64_MIN); | |
| 248 | − pts = ROUNDED_DIV(pts, inlink->sample_rate); | |
| 249 | − | |
| 250 | − n_out = swr_convert(aresample->swr, outsamplesref->extended_data, n_out, 0, 0); | |
| 251 | − if (n_out <= 0) { | |
| 252 | − av_frame_free(&outsamplesref); | |
| 253 | − return (n_out == 0) ? AVERROR_EOF : n_out; | |
| 254 | − } | |
| 255 | − | |
| 256 | − outsamplesref->sample_rate = outlink->sample_rate; | |
| 257 | − outsamplesref->nb_samples = n_out; | |
| 258 | 271 | |
| 259 | − outsamplesref->pts = pts; | |
| 272 | + if ((ret = flush_frame(outlink, 1, &outsamplesref)) < 0) | |
| 273 | + return ret; | |
| 260 | 274 | |
| 261 | 275 | return ff_filter_frame(outlink, outsamplesref); |
| 262 | 276 | } |