diff mbox series

[FFmpeg-devel,11/12] fftools/ffmpeg_filter: fail on filtering errors

Message ID 20231003153526.19228-11-anton@khirnov.net
State New
Headers show
Series [FFmpeg-devel,01/12] fftools/ffmpeg_enc: move handling video frame duration to video_sync_process() | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished

Commit Message

Anton Khirnov Oct. 3, 2023, 3:35 p.m. UTC 
These should be considered serious errors - don't just print a log
message and continue as if nothing happened.
---
 fftools/ffmpeg_filter.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)
diff mbox series

Patch

diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c
index 0df284c334..129487cf88 100644
--- a/fftools/ffmpeg_filter.c
+++ b/fftools/ffmpeg_filter.c
@@ -2152,17 +2152,17 @@  static int fg_output_step(OutputFilterPriv *ofp, int flush)
 
     ret = av_buffersink_get_frame_flags(filter, frame,
                                         AV_BUFFERSINK_FLAG_NO_REQUEST);
-    if (ret < 0) {
-        if (ret != AVERROR(EAGAIN) && ret != AVERROR_EOF) {
-            av_log(fgp, AV_LOG_WARNING,
-                   "Error in av_buffersink_get_frame_flags(): %s\n", av_err2str(ret));
-        } else if (flush && ret == AVERROR_EOF && ofp->got_frame &&
-                   av_buffersink_get_type(filter) == AVMEDIA_TYPE_VIDEO) {
-            ret = fg_output_frame(ofp, NULL);
-            return (ret < 0) ? ret : 1;
-        }
-
+    if (flush && ret == AVERROR_EOF && ofp->got_frame &&
+        ost->type == AVMEDIA_TYPE_VIDEO) {
+        ret = fg_output_frame(ofp, NULL);
+        return (ret < 0) ? ret : 1;
+    } else if (ret == AVERROR(EAGAIN) || ret == AVERROR_EOF) {
         return 1;
+    } else if (ret < 0) {
+        av_log(fgp, AV_LOG_WARNING,
+               "Error in retrieving a frame from the filtergraph: %s\n",
+               av_err2str(ret));
+        return ret;
     }
     if (ost->finished) {
         av_frame_unref(frame);