RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-30 19:34:43 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit 'dbb472cb2f2f799295a12b4922a6a8be2cccfdee'

Browse Source 
* commit 'dbb472cb2f2f799295a12b4922a6a8be2cccfdee':
  movenc: Write edit lists for fragmented files as well, if necessary

Conflicts:
	libavformat/movenc.c

The default for writing EDTS for fragmented mp4 is left at disabled
this can be overridden via command line with -use_editlist
but EDTS + fragments still does not fully work, which is why it is
left disabled by default

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-10-12 23:26:28 +02:00
commit ca5a77191b
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavformat/movenc.c
View File

@ -112,6 +112,7 @@ static int64_t update_size(AVIOContext *pb, int64_t pos)
static int supports_edts(MOVMuxContext *mov) static int supports_edts(MOVMuxContext *mov)
{ {
// EDTS with fragments is tricky as we don't know the duration when its written // EDTS with fragments is tricky as we don't know the duration when its written
// also we might end up having to write the EDTS before the first packet, which would fail
return (mov->use_editlist<0 && !(mov->flags & FF_MOV_FLAG_FRAGMENT)) || mov->use_editlist>0; return (mov->use_editlist<0 && !(mov->flags & FF_MOV_FLAG_FRAGMENT)) || mov->use_editlist>0;
} }
@ -2186,7 +2187,8 @@ static int mov_write_tapt_tag(AVIOContext *pb, MOVTrack *track)
} }
// This box seems important for the psp playback ... without it the movie seems to hang // This box seems important for the psp playback ... without it the movie seems to hang
static int mov_write_edts_tag(AVIOContext *pb, MOVTrack *track) static int mov_write_edts_tag(AVIOContext *pb, MOVMuxContext *mov,
MOVTrack *track)
{ {
int64_t duration = av_rescale_rnd(track->track_duration, MOV_TIMESCALE, int64_t duration = av_rescale_rnd(track->track_duration, MOV_TIMESCALE,
track->timescale, AV_ROUND_UP); track->timescale, AV_ROUND_UP);
@ -2237,6 +2239,13 @@ static int mov_write_edts_tag(AVIOContext *pb, MOVTrack *track)
duration += delay; duration += delay;
} }
/* For fragmented files, we don't know the full length yet. Setting
* duration to 0 allows us to only specify the offset, including
* the rest of the content (from all future fragments) without specifying
* an explicit duration. */
if (mov->flags & FF_MOV_FLAG_FRAGMENT)
duration = 0;
/* duration */ /* duration */
if (version == 1) { if (version == 1) {
avio_wb64(pb, duration); avio_wb64(pb, duration);
@ -2348,7 +2357,7 @@ static int mov_write_trak_tag(AVIOContext *pb, MOVMuxContext *mov,
ffio_wfourcc(pb, "trak"); ffio_wfourcc(pb, "trak");
mov_write_tkhd_tag(pb, mov, track, st); mov_write_tkhd_tag(pb, mov, track, st);
if (supports_edts(mov)) if (supports_edts(mov))
mov_write_edts_tag(pb, track); // PSP Movies and several other cases require edts box mov_write_edts_tag(pb, mov, track); // PSP Movies and several other cases require edts box
if (track->tref_tag) if (track->tref_tag)
mov_write_tref_tag(pb, track); mov_write_tref_tag(pb, track);
mov_write_mdia_tag(pb, track); mov_write_mdia_tag(pb, track);