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

movenc: Provide output bytestream markers for fragmented content

Browse Source 
Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö 2016-05-04 22:18:18 +03:00
parent 371df9ba71
commit dbbaad32e3
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavformat/movenc.c
View File

@ -3183,6 +3183,7 @@ static int mov_flush_fragment(AVFormatContext *s, int force)
MOVMuxContext *mov = s->priv_data; MOVMuxContext *mov = s->priv_data;
int i, first_track = -1; int i, first_track = -1;
int64_t mdat_size = 0; int64_t mdat_size = 0;
int has_video = 0, starts_with_key = 0, first_video_track = 1;
if (!(mov->flags & FF_MOV_FLAG_FRAGMENT)) if (!(mov->flags & FF_MOV_FLAG_FRAGMENT))
return 0; return 0;
@ -3235,6 +3236,7 @@ static int mov_flush_fragment(AVFormatContext *s, int force)
for (i = 0; i < mov->nb_streams; i++) for (i = 0; i < mov->nb_streams; i++)
mov->tracks[i].data_offset = pos + buf_size + 8; mov->tracks[i].data_offset = pos + buf_size + 8;
avio_write_marker(s->pb, AV_NOPTS_VALUE, AVIO_DATA_MARKER_HEADER);
if (mov->flags & FF_MOV_FLAG_DELAY_MOOV) if (mov->flags & FF_MOV_FLAG_DELAY_MOOV)
mov_write_identification(s->pb, s); mov_write_identification(s->pb, s);
mov_write_moov_tag(s->pb, mov, s); mov_write_moov_tag(s->pb, mov, s);
@ -3289,6 +3291,14 @@ static int mov_flush_fragment(AVFormatContext *s, int force)
track->data_offset = 0; track->data_offset = 0;
else else
track->data_offset = mdat_size; track->data_offset = mdat_size;
if (track->par->codec_type == AVMEDIA_TYPE_VIDEO) {
has_video = 1;
if (first_video_track) {
if (track->entry)
starts_with_key = track->cluster[0].flags & MOV_SYNC_SAMPLE;
first_video_track = 0;
}
}
if (!track->entry) if (!track->entry)
continue; continue;
if (track->mdat_buf) if (track->mdat_buf)
@ -3300,6 +3310,10 @@ static int mov_flush_fragment(AVFormatContext *s, int force)
if (!mdat_size) if (!mdat_size)
return 0; return 0;
avio_write_marker(s->pb,
av_rescale(mov->tracks[first_track].cluster[0].dts, AV_TIME_BASE, mov->tracks[first_track].timescale),
(has_video ? starts_with_key : mov->tracks[first_track].cluster[0].flags & MOV_SYNC_SAMPLE) ? AVIO_DATA_MARKER_SYNC_POINT : AVIO_DATA_MARKER_BOUNDARY_POINT);
for (i = 0; i < mov->nb_streams; i++) { for (i = 0; i < mov->nb_streams; i++) {
MOVTrack *track = &mov->tracks[i]; MOVTrack *track = &mov->tracks[i];
int buf_size, write_moof = 1, moof_tracks = -1; int buf_size, write_moof = 1, moof_tracks = -1;
@ -4284,9 +4298,11 @@ static int mov_write_trailer(AVFormatContext *s)
avio_seek(pb, mov->reserved_header_pos, SEEK_SET); avio_seek(pb, mov->reserved_header_pos, SEEK_SET);
mov_write_sidx_tags(pb, mov, -1, 0); mov_write_sidx_tags(pb, mov, -1, 0);
avio_seek(pb, end, SEEK_SET); avio_seek(pb, end, SEEK_SET);
avio_write_marker(s->pb, AV_NOPTS_VALUE, AVIO_DATA_MARKER_TRAILER);
mov_write_mfra_tag(pb, mov); mov_write_mfra_tag(pb, mov);
} }
} else { } else {
avio_write_marker(s->pb, AV_NOPTS_VALUE, AVIO_DATA_MARKER_TRAILER);
mov_write_mfra_tag(pb, mov); mov_write_mfra_tag(pb, mov);
} }
} }