avfilter/af_aresample: split flushing code out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

libavfilter/af_aresample.c

@@ -223,31 +223,24 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamplesref)
     return ret;
 }
 
-static int request_frame(AVFilterLink *outlink)
+static int flush_frame(AVFilterLink *outlink, int final, AVFrame **outsamplesref_ret)
 {
     AVFilterContext *ctx = outlink->src;
     AResampleContext *aresample = ctx->priv;
     AVFilterLink *const inlink = outlink->src->inputs[0];
-    int ret;
-
-    aresample->req_fullfilled = 0;
-    do{
-        ret = ff_request_frame(ctx->inputs[0]);
-    }while(!aresample->req_fullfilled && ret>=0);
-
-    if (ret == AVERROR_EOF) {
     AVFrame *outsamplesref;
     int n_out = 4096;
     int64_t pts;
 
     outsamplesref = ff_get_audio_buffer(outlink, n_out);
+    *outsamplesref_ret = outsamplesref;
     if (!outsamplesref)
         return AVERROR(ENOMEM);
 
     pts = swr_next_pts(aresample->swr, INT64_MIN);
     pts = ROUNDED_DIV(pts, inlink->sample_rate);
 
-        n_out = swr_convert(aresample->swr, outsamplesref->extended_data, n_out, 0, 0);
+    n_out = swr_convert(aresample->swr, outsamplesref->extended_data, n_out, final ? NULL : (void*)outsamplesref->extended_data, 0);
     if (n_out <= 0) {
         av_frame_free(&outsamplesref);
         return (n_out == 0) ? AVERROR_EOF : n_out;
@@ -258,6 +251,27 @@ static int request_frame(AVFilterLink *outlink)
 
     outsamplesref->pts = pts;
 
+    return 0;
+}
+
+static int request_frame(AVFilterLink *outlink)
+{
+    AVFilterContext *ctx = outlink->src;
+    AResampleContext *aresample = ctx->priv;
+    AVFilterLink *const inlink = outlink->src->inputs[0];
+    int ret;
+
+    aresample->req_fullfilled = 0;
+    do{
+        ret = ff_request_frame(ctx->inputs[0]);
+    }while(!aresample->req_fullfilled && ret>=0);
+
+    if (ret == AVERROR_EOF) {
+        AVFrame *outsamplesref;
+
+        if ((ret = flush_frame(outlink, 1, &outsamplesref)) < 0)
+            return ret;
+
         return ff_filter_frame(outlink, outsamplesref);
     }
     return ret;