Skip to content

Commit

Permalink
fftools/ffmpeg_mux: forward EOF from the sync queue
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
elenril committed Jul 13, 2023
1 parent 7430ee2 commit 9a23354
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions fftools/ffmpeg_mux.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 9a23354

Please sign in to comment.