har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

movenc: Assume streams starting at pts=0 for discontinuous fragments with editlists

Browse Source 
This allows producing fragments discontinously where the video
stream has b-frames (but starts at pts=0), but doesn't work for the
cases with audio with preroll.

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö 2015-01-05 15:13:04 +02:00
parent 59e8ec0aa8
commit 09e431b9e3
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavformat/movenc.c
View File

@ -3506,10 +3506,18 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt)
if (trk->start_dts == AV_NOPTS_VALUE) { if (trk->start_dts == AV_NOPTS_VALUE) {
trk->start_dts = pkt->dts; trk->start_dts = pkt->dts;
if (trk->frag_discont) { if (trk->frag_discont) {
/* Pretend the whole stream started at dts=0, with earlier fragments if (mov->use_editlist) {
* already written, with a duration summing up to pkt->dts. */ /* Pretend the whole stream started at pts=0, with earlier fragments
trk->frag_start = pkt->dts; * already written. If the stream started at pts=0, the duration sum
trk->start_dts = 0; * of earlier fragments would have been pkt->pts. */
trk->frag_start = pkt->pts;
trk->start_dts = pkt->dts - pkt->pts;
} else {
/* Pretend the whole stream started at dts=0, with earlier fragments
* already written, with a duration summing up to pkt->dts. */
trk->frag_start = pkt->dts;
trk->start_dts = 0;
}
trk->frag_discont = 0; trk->frag_discont = 0;
} else if (pkt->dts && mov->moov_written) } else if (pkt->dts && mov->moov_written)
av_log(s, AV_LOG_WARNING, av_log(s, AV_LOG_WARNING,