* [FFmpeg-devel] [PATCH] fftools/ffmpeg_mux: forward EOF from the sync queue
@ 2023-07-10 11:37 Anton Khirnov
0 siblings, 0 replies; only message in thread
From: Anton Khirnov @ 2023-07-10 11:37 UTC (permalink / raw)
To: ffmpeg-devel
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.
---
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..2fb2c7ccaa 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);
--
2.40.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-07-10 11:37 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-07-10 11:37 [FFmpeg-devel] [PATCH] fftools/ffmpeg_mux: forward EOF from the sync queue Anton Khirnov
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git