virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-02 20:35:37 +02:00
Code Issues Releases Activity

movenc: Only adjust the cts offset at the start of fragments if necessary

Browse Source 
Adjusting it is only necessary when a sidx/tfrf/tfxd atom already has
been written for the previous fragment (since the sidx/tfrf/tfxd atoms
include the duration between the first pts of the previous fragment, to
the first pts of the new fragment).

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö 2015-03-15 23:40:06 +02:00
parent 5cf892d694
commit eee13d6539
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/movenc.c
View File

@ -3454,9 +3454,11 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt)
* of this packet to be what the previous packets duration implies. */ * of this packet to be what the previous packets duration implies. */
trk->cluster[trk->entry].dts = trk->start_dts + trk->track_duration; trk->cluster[trk->entry].dts = trk->start_dts + trk->track_duration;
/* We also may have written the pts and the corresponding duration /* We also may have written the pts and the corresponding duration
* in sidx tags; make sure the sidx pts and duration match up with * in sidx/tfrf/tfxd tags; make sure the sidx pts and duration match up with
* the next fragment. This means the cts of the first sample must * the next fragment. This means the cts of the first sample must
* be the same in all fragments. */ * be the same in all fragments. */
if ((mov->flags & FF_MOV_FLAG_DASH && !(mov->flags & FF_MOV_FLAG_FASTSTART)) ||
mov->mode == MODE_ISM)
pkt->pts = pkt->dts + trk->start_cts; pkt->pts = pkt->dts + trk->start_cts;
} else { } else {
/* New fragment, but discontinuous from previous fragments. /* New fragment, but discontinuous from previous fragments.