virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

fftools/ffmpeg_mux: distinguish between sync queue and muxer EOF

Browse Source 
Individual streams should be terminated in the former case, the whole
muxing process in the latter.

Reported-by: Gyan Doshi
This commit is contained in:
Anton Khirnov 2023-02-09 16:51:30 +01:00
parent 8ed1d6b5e4
commit b40856c905
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fftools/ffmpeg_mux.c
View File

@ -159,14 +159,18 @@ fail:
return ret; return ret;
} }
static int sync_queue_process(Muxer *mux, OutputStream *ost, AVPacket *pkt) static int sync_queue_process(Muxer *mux, OutputStream *ost, AVPacket *pkt, int *stream_eof)
{ {
OutputFile *of = &mux->of; OutputFile *of = &mux->of;
if (ost->sq_idx_mux >= 0) { if (ost->sq_idx_mux >= 0) {
int ret = sq_send(mux->sq_mux, ost->sq_idx_mux, SQPKT(pkt)); int ret = sq_send(mux->sq_mux, ost->sq_idx_mux, SQPKT(pkt));
if (ret < 0) if (ret < 0) {
if (ret == AVERROR_EOF)
*stream_eof = 1;
return ret; return ret;
}
while (1) { while (1) {
ret = sq_receive(mux->sq_mux, -1, SQPKT(mux->sq_pkt)); ret = sq_receive(mux->sq_mux, -1, SQPKT(mux->sq_pkt));
@ -208,7 +212,7 @@ static void *muxer_thread(void *arg)
while (1) { while (1) {
OutputStream *ost; OutputStream *ost;
int stream_idx; int stream_idx, stream_eof = 0;
ret = tq_receive(mux->tq, &stream_idx, pkt); ret = tq_receive(mux->tq, &stream_idx, pkt);
if (stream_idx < 0) { if (stream_idx < 0) {
@ -218,9 +222,9 @@ static void *muxer_thread(void *arg)
} }
ost = of->streams[stream_idx]; ost = of->streams[stream_idx];
ret = sync_queue_process(mux, ost, ret < 0 ? NULL : pkt); ret = sync_queue_process(mux, ost, ret < 0 ? NULL : pkt, &stream_eof);
av_packet_unref(pkt); av_packet_unref(pkt);
if (ret == AVERROR_EOF) if (ret == AVERROR_EOF && stream_eof)
tq_receive_finish(mux->tq, stream_idx); tq_receive_finish(mux->tq, stream_idx);
else if (ret < 0) { else if (ret < 0) {
av_log(mux, AV_LOG_ERROR, "Error muxing a packet\n"); av_log(mux, AV_LOG_ERROR, "Error muxing a packet\n");