Skip to content

Commit 8951113

Browse files
author
bok
committed
Added supper for turn with version==1
1 parent 4b1dbe7 commit 8951113

File tree

5 files changed

+5
-4
lines changed

5 files changed

+5
-4
lines changed
-7 KB
Binary file not shown.
-59.1 KB
Binary file not shown.

Source/C++/Apps/Mp4Split/Mp4Split.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ PrintUsageAndExit()
7171
"Options:\n"
7272
" --verbose\n"
7373
" --init-segment <filename> (default: init.mp4)\n"
74-
" --media-segment <filename-pattern> (default: segment-%%d.%%4d.m4f)\n"
74+
" --media-segment <filename-pattern> (default: segment-%%d.%%04d.m4f\n"
75+
" or segment-%%04d.m4f if the --no-track-id option is used)\n"
7576
" --no-track-id\n"
7677
" --audio\n"
7778
" --video\n");

Source/C++/Test/LinearReader/LinearReaderTest.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ main(int argc, char** argv)
8787
AP4_Track* video_track = movie->GetTrack(AP4_Track::TYPE_VIDEO);
8888
CHECK(video_track != NULL);
8989
AP4_Track* audio_track = movie->GetTrack(AP4_Track::TYPE_AUDIO);
90-
CHECK(video_track != NULL);
90+
CHECK(audio_track != NULL);
9191

9292
AP4_LinearReader reader(*movie, input);
9393
AP4_Sample sample;

Source/Python/utils/mp4-dash.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,7 @@ def main():
425425
period = xml.SubElement(mpd, 'Period')
426426

427427
# use the first media file for audio
428-
adaptation_set = xml.SubElement(period, 'AdaptationSet', mimeType=AUDIO_MIMETYPE)
428+
adaptation_set = xml.SubElement(period, 'AdaptationSet', mimeType=AUDIO_MIMETYPE, segmentAlignment='true')
429429
if options.marlin:
430430
AddContentProtection(adaptation_set, [media_files[0]], 'audio')
431431
bandwidth = media_files[0].max_segment_bitrate[media_files[0].audio_track_id]
@@ -437,7 +437,7 @@ def main():
437437

438438

439439
# process all the video
440-
adaptation_set = xml.SubElement(period, 'AdaptationSet', mimeType=VIDEO_MIMETYPE, startWithSAP='1')
440+
adaptation_set = xml.SubElement(period, 'AdaptationSet', mimeType=VIDEO_MIMETYPE, segmentAlignment='true', startWithSAP='1')
441441
if options.marlin:
442442
AddContentProtection(adaptation_set, media_files, 'video')
443443
for media_file in media_files:

0 commit comments

Comments
 (0)