[FFmpeg-cvslog] fftools/ffmpeg_mux: forward EOF from the sync queue

[Anton Khirnov]

ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Mon Jul 10 10:48:38 2023 +0200| [9a2335444b83b9bfa6553c43c9cbdd352f0f11ef] | committer: Anton Khirnov

fftools/ffmpeg_mux: forward EOF from the sync queue

EOF from sq_receive() means no packets will ever be output by the sync
queue. Since the muxing sync queue is always used by all interleaved
(i.e. non-attachment) streams, this means no further packets can make
it to the muxer and we can terminate muxing now.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9a2335444b83b9bfa6553c43c9cbdd352f0f11ef
---

 fftools/ffmpeg_mux.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/fftools/ffmpeg_mux.c b/fftools/ffmpeg_mux.c
index 026796f7e6..ca32967cd8 100644
--- a/fftools/ffmpeg_mux.c
+++ b/fftools/ffmpeg_mux.c
@@ -166,8 +166,14 @@ static int sync_queue_process(Muxer *mux, OutputStream *ost, AVPacket *pkt, int
 
         while (1) {
             ret = sq_receive(mux->sq_mux, -1, SQPKT(mux->sq_pkt));
-            if (ret < 0)
-                return (ret == AVERROR_EOF || ret == AVERROR(EAGAIN)) ? 0 : ret;
+            if (ret < 0) {
+                /* n.b.: We forward EOF from the sync queue, terminating muxing.
+                 * This assumes that if a muxing sync queue is present, then all
+                 * the streams use it. That is true currently, but may change in
+                 * the future, then this code needs to be revisited.
+                 */
+                return ret == AVERROR(EAGAIN) ? 0 : ret;
+            }
 
             ret = write_packet(mux, of->streams[ret],
                                mux->sq_pkt);