Added supper for turn with version==1

This commit is contained in:
bok
2012-01-28 10:11:45 +00:00
parent 4b1dbe7439
commit 8951113c2e
5 changed files with 5 additions and 4 deletions

View File

@@ -71,7 +71,8 @@ PrintUsageAndExit()
"Options:\n"
" --verbose\n"
" --init-segment <filename> (default: init.mp4)\n"
" --media-segment <filename-pattern> (default: segment-%%d.%%4d.m4f)\n"
" --media-segment <filename-pattern> (default: segment-%%d.%%04d.m4f\n"
" or segment-%%04d.m4f if the --no-track-id option is used)\n"
" --no-track-id\n"
" --audio\n"
" --video\n");

View File

@@ -87,7 +87,7 @@ main(int argc, char** argv)
AP4_Track* video_track = movie->GetTrack(AP4_Track::TYPE_VIDEO);
CHECK(video_track != NULL);
AP4_Track* audio_track = movie->GetTrack(AP4_Track::TYPE_AUDIO);
CHECK(video_track != NULL);
CHECK(audio_track != NULL);
AP4_LinearReader reader(*movie, input);
AP4_Sample sample;

View File

@@ -425,7 +425,7 @@ def main():
period = xml.SubElement(mpd, 'Period')
# use the first media file for audio
adaptation_set = xml.SubElement(period, 'AdaptationSet', mimeType=AUDIO_MIMETYPE)
adaptation_set = xml.SubElement(period, 'AdaptationSet', mimeType=AUDIO_MIMETYPE, segmentAlignment='true')
if options.marlin:
AddContentProtection(adaptation_set, [media_files[0]], 'audio')
bandwidth = media_files[0].max_segment_bitrate[media_files[0].audio_track_id]
@@ -437,7 +437,7 @@ def main():
# process all the video
adaptation_set = xml.SubElement(period, 'AdaptationSet', mimeType=VIDEO_MIMETYPE, startWithSAP='1')
adaptation_set = xml.SubElement(period, 'AdaptationSet', mimeType=VIDEO_MIMETYPE, segmentAlignment='true', startWithSAP='1')
if options.marlin:
AddContentProtection(adaptation_set, media_files, 'video')
for media_file in media_files: