mirror of https://git.ffmpeg.org/ffmpeg.git
fftools/ffmpeg_sched: be smarter about flushing the pre-muxing queues
These per-stream FIFOs hold the packets before every stream is initialized and the header can be written. Once that happens, current code will flush each stream's queue one after the other. However, in case we buffered a lot of data for multiple streams, this may cause the muxer to overflow max_interleave_delta, resulting in worse interleaving than necessary. Change the code to interleave packets from all the queues by DTS.
This commit is contained in:
parent
6d6bd86f2b
commit
242ee7b0a2
|
@ -1111,22 +1111,52 @@ static int mux_task_start(SchMux *mux)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
/* flush the pre-muxing queues */
|
/* flush the pre-muxing queues */
|
||||||
for (unsigned i = 0; i < mux->nb_streams; i++) {
|
while (1) {
|
||||||
SchMuxStream *ms = &mux->streams[i];
|
int min_stream = -1;
|
||||||
|
Timestamp min_ts = { .ts = AV_NOPTS_VALUE };
|
||||||
|
|
||||||
AVPacket *pkt;
|
AVPacket *pkt;
|
||||||
|
|
||||||
while (av_fifo_read(ms->pre_mux_queue.fifo, &pkt, 1) >= 0) {
|
// find the stream with the earliest dts or EOF in pre-muxing queue
|
||||||
|
for (unsigned i = 0; i < mux->nb_streams; i++) {
|
||||||
|
SchMuxStream *ms = &mux->streams[i];
|
||||||
|
|
||||||
|
if (av_fifo_peek(ms->pre_mux_queue.fifo, &pkt, 1, 0) < 0)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
if (!pkt || pkt->dts == AV_NOPTS_VALUE) {
|
||||||
|
min_stream = i;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (min_ts.ts == AV_NOPTS_VALUE ||
|
||||||
|
av_compare_ts(min_ts.ts, min_ts.tb, pkt->dts, pkt->time_base) > 0) {
|
||||||
|
min_stream = i;
|
||||||
|
min_ts = (Timestamp){ .ts = pkt->dts, .tb = pkt->time_base };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (min_stream >= 0) {
|
||||||
|
SchMuxStream *ms = &mux->streams[min_stream];
|
||||||
|
|
||||||
|
ret = av_fifo_read(ms->pre_mux_queue.fifo, &pkt, 1);
|
||||||
|
av_assert0(ret >= 0);
|
||||||
|
|
||||||
if (pkt) {
|
if (pkt) {
|
||||||
if (!ms->init_eof)
|
if (!ms->init_eof)
|
||||||
ret = tq_send(mux->queue, i, pkt);
|
ret = tq_send(mux->queue, min_stream, pkt);
|
||||||
av_packet_free(&pkt);
|
av_packet_free(&pkt);
|
||||||
if (ret == AVERROR_EOF)
|
if (ret == AVERROR_EOF)
|
||||||
ms->init_eof = 1;
|
ms->init_eof = 1;
|
||||||
else if (ret < 0)
|
else if (ret < 0)
|
||||||
return ret;
|
return ret;
|
||||||
} else
|
} else
|
||||||
tq_send_finish(mux->queue, i);
|
tq_send_finish(mux->queue, min_stream);
|
||||||
|
|
||||||
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
atomic_store(&mux->mux_started, 1);
|
atomic_store(&mux->mux_started, 1);
|
||||||
|
|
Loading…
Reference in New Issue