diff mbox

[FFmpeg-devel,2/2] ffmpeg: factor out sending frame to filters

Message ID 20161024210507.15858-2-u@pkh.me
State Superseded
Headers show

Commit Message

Clément Bœsch Oct. 24, 2016, 9:05 p.m. UTC 
Video doesn't exit ffmpeg on error anymore, and audio now prints an
error.
---
 ffmpeg.c | 64 ++++++++++++++++++++++++++++++----------------------------------
 1 file changed, 30 insertions(+), 34 deletions(-)

Comments

Clément Bœsch Nov. 1, 2016, 9:55 a.m. UTC | #1 
On Mon, Oct 24, 2016 at 11:05:07PM +0200, Clément Bœsch wrote:
> Video doesn't exit ffmpeg on error anymore, and audio now prints an
> error.
> ---
>  ffmpeg.c | 64 ++++++++++++++++++++++++++++++----------------------------------
>  1 file changed, 30 insertions(+), 34 deletions(-)
> 

ping

(now depends on "[FFmpeg-devel] [PATCH] ffmpeg: remove dead code out of
the video filter loop")
Michael Niedermayer Nov. 1, 2016, 1:52 p.m. UTC | #2 
On Tue, Nov 01, 2016 at 10:55:31AM +0100, Clément Bœsch wrote:
> On Mon, Oct 24, 2016 at 11:05:07PM +0200, Clément Bœsch wrote:
> > Video doesn't exit ffmpeg on error anymore, and audio now prints an
> > error.
> > ---
> >  ffmpeg.c | 64 ++++++++++++++++++++++++++++++----------------------------------
> >  1 file changed, 30 insertions(+), 34 deletions(-)
> > 
> 
> ping
> 
> (now depends on "[FFmpeg-devel] [PATCH] ffmpeg: remove dead code out of
> the video filter loop")

the patch you reply to does not seem to apply cleany after the quoted
patch

[...]
Clément Bœsch Nov. 18, 2016, 7:43 p.m. UTC | #3 
On Mon, Oct 24, 2016 at 11:05:07PM +0200, Clément Bœsch wrote:
> Video doesn't exit ffmpeg on error anymore, and audio now prints an
> error.
> ---
>  ffmpeg.c | 64 ++++++++++++++++++++++++++++++----------------------------------
>  1 file changed, 30 insertions(+), 34 deletions(-)
> 

applied
diff mbox

Patch

diff --git a/ffmpeg.c b/ffmpeg.c
index e8088c0..b7b0dc6 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2055,9 +2055,35 @@  static int decode(AVCodecContext *avctx, AVFrame *frame, int *got_frame, AVPacke
     return 0;
 }
 
+static int send_frame_to_filters(InputStream *ist, AVFrame *decoded_frame)
+{
+    int i, ret;
+    AVFrame *f;
+
+    for (i = 0; i < ist->nb_filters; i++) {
+        if (i < ist->nb_filters - 1) {
+            f = ist->filter_frame;
+            ret = av_frame_ref(f, decoded_frame);
+            if (ret < 0)
+                break;
+        } else
+            f = decoded_frame;
+        ret = av_buffersrc_add_frame_flags(ist->filters[i]->filter, f,
+                                           AV_BUFFERSRC_FLAG_PUSH);
+        if (ret == AVERROR_EOF)
+            ret = 0; /* ignore */
+        if (ret < 0) {
+            av_log(NULL, AV_LOG_ERROR,
+                   "Failed to inject frame into filter network: %s\n", av_err2str(ret));
+            break;
+        }
+    }
+    return ret;
+}
+
 static int decode_audio(InputStream *ist, AVPacket *pkt, int *got_output)
 {
-    AVFrame *decoded_frame, *f;
+    AVFrame *decoded_frame;
     AVCodecContext *avctx = ist->dec_ctx;
     int i, ret, err = 0, resample_changed;
     AVRational decoded_frame_tb;
@@ -2152,21 +2178,7 @@  static int decode_audio(InputStream *ist, AVPacket *pkt, int *got_output)
                                               (AVRational){1, avctx->sample_rate}, decoded_frame->nb_samples, &ist->filter_in_rescale_delta_last,
                                               (AVRational){1, avctx->sample_rate});
     ist->nb_samples = decoded_frame->nb_samples;
-    for (i = 0; i < ist->nb_filters; i++) {
-        if (i < ist->nb_filters - 1) {
-            f = ist->filter_frame;
-            err = av_frame_ref(f, decoded_frame);
-            if (err < 0)
-                break;
-        } else
-            f = decoded_frame;
-        err = av_buffersrc_add_frame_flags(ist->filters[i]->filter, f,
-                                     AV_BUFFERSRC_FLAG_PUSH);
-        if (err == AVERROR_EOF)
-            err = 0; /* ignore */
-        if (err < 0)
-            break;
-    }
+    err = send_frame_to_filters(ist, decoded_frame);
     decoded_frame->pts = AV_NOPTS_VALUE;
 
     av_frame_unref(ist->filter_frame);
@@ -2176,7 +2188,7 @@  static int decode_audio(InputStream *ist, AVPacket *pkt, int *got_output)
 
 static int decode_video(InputStream *ist, AVPacket *pkt, int *got_output, int eof)
 {
-    AVFrame *decoded_frame, *f;
+    AVFrame *decoded_frame;
     int i, ret = 0, err = 0, resample_changed;
     int64_t best_effort_timestamp;
     int64_t dts = AV_NOPTS_VALUE;
@@ -2319,23 +2331,7 @@  static int decode_video(InputStream *ist, AVPacket *pkt, int *got_output, int eo
     frame_sample_aspect= av_opt_ptr(avcodec_get_frame_class(), decoded_frame, "sample_aspect_ratio");
     if (!frame_sample_aspect->num)
         *frame_sample_aspect = ist->st->sample_aspect_ratio;
-    for (i = 0; i < ist->nb_filters; i++) {
-        if (i < ist->nb_filters - 1) {
-            f = ist->filter_frame;
-            err = av_frame_ref(f, decoded_frame);
-            if (err < 0)
-                break;
-        } else
-            f = decoded_frame;
-        err = av_buffersrc_add_frame_flags(ist->filters[i]->filter, f, AV_BUFFERSRC_FLAG_PUSH);
-        if (err == AVERROR_EOF) {
-            err = 0; /* ignore */
-        } else if (err < 0) {
-            av_log(NULL, AV_LOG_FATAL,
-                   "Failed to inject frame into filter network: %s\n", av_err2str(err));
-            exit_program(1);
-        }
-    }
+    err = send_frame_to_filters(ist, decoded_frame);
 
 fail:
     av_frame_unref(ist->filter_frame);