Mirror-Tools
/
shaka-packager
mirror of https://github.com/shaka-project/shaka-packager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make All Output Filenames Similar 

Changed all output file names (not paths) to follow the pattern that
any qualifier (e.g. trick play) will be join the current name using '-'
but will use '_' within itself (e.g. trick_play_1).

Change-Id: Ib0247bf1ca6d94815fedaaf73d3a400d31c20c40
This commit is contained in:
Aaron Vaage 2018-02-27 15:55:47 -08:00
parent 7dd80884c3
commit cd16e95d79
9 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packager/app/test/packager_test.py
View File

@ -142,13 +142,13 @@ class PackagerAppTest(unittest.TestCase):
output_file = '%s_%s' % (self.output_prefix, descriptor) output_file = '%s_%s' % (self.output_prefix, descriptor)
else: else:
str_params = (self.output_prefix, test_file_index, descriptor) str_params = (self.output_prefix, test_file_index, descriptor)
output_file = '%s_%d_%s' % str_params output_file = '%s_%d-%s' % str_params
if trick_play_factor: if trick_play_factor:
output_file += '_trick_play_factor_%d' % trick_play_factor output_file += '-trick_play_factor_%d' % trick_play_factor
if skip_encryption: if skip_encryption:
output_file += '_skip_encryption' output_file += '-skip_encryption'
stream = StreamDescriptor(test_file) stream = StreamDescriptor(test_file)
stream.Append('stream', descriptor) stream.Append('stream', descriptor)

2
packager/app/test/testdata/audio-video-with-trick-play/output.mpd vendored
View File

@ -13,7 +13,7 @@
<AdaptationSet id="1" contentType="video" width="640" height="360" frameRate="30000/30030" subsegmentAlignment="true" par="16:9"> <AdaptationSet id="1" contentType="video" width="640" height="360" frameRate="30000/30030" subsegmentAlignment="true" par="16:9">
<EssentialProperty schemeIdUri="http://dashif.org/guidelines/trickmode" value="0"/> <EssentialProperty schemeIdUri="http://dashif.org/guidelines/trickmode" value="0"/>
<Representation id="1" bandwidth="156160" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1" maxPlayoutRate="30" codingDependency="false"> <Representation id="1" bandwidth="156160" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1" maxPlayoutRate="30" codingDependency="false">
<BaseURL>output_video_trick_play_factor_1.mp4</BaseURL> <BaseURL>output_video-trick_play_factor_1.mp4</BaseURL>
<SegmentBase indexRange="823-890" timescale="30000"> <SegmentBase indexRange="823-890" timescale="30000">
<Initialization range="0-822"/> <Initialization range="0-822"/>
</SegmentBase> </SegmentBase>

0
packager/app/test/testdata/audio-video-with-trick-play/output_video_trick_play_factor_1.mp4 → packager/app/test/testdata/audio-video-with-trick-play/output_video-trick_play_factor_1.mp4 vendored
View File

4
packager/app/test/testdata/audio-video-with-two-trick-play/output.mpd vendored
View File

@ -13,13 +13,13 @@
<AdaptationSet id="1" contentType="video" width="640" height="360" maxFrameRate="30000/30030" par="16:9"> <AdaptationSet id="1" contentType="video" width="640" height="360" maxFrameRate="30000/30030" par="16:9">
<EssentialProperty schemeIdUri="http://dashif.org/guidelines/trickmode" value="0"/> <EssentialProperty schemeIdUri="http://dashif.org/guidelines/trickmode" value="0"/>
<Representation id="1" bandwidth="103866" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1" frameRate="30000/60060" maxPlayoutRate="60" codingDependency="false"> <Representation id="1" bandwidth="103866" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1" frameRate="30000/60060" maxPlayoutRate="60" codingDependency="false">
<BaseURL>output_video_trick_play_factor_2.mp4</BaseURL> <BaseURL>output_video-trick_play_factor_2.mp4</BaseURL>
<SegmentBase indexRange="823-878" timescale="30000"> <SegmentBase indexRange="823-878" timescale="30000">
<Initialization range="0-822"/> <Initialization range="0-822"/>
</SegmentBase> </SegmentBase>
</Representation> </Representation>
<Representation id="2" bandwidth="156160" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1" frameRate="30000/30030" maxPlayoutRate="30" codingDependency="false"> <Representation id="2" bandwidth="156160" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1" frameRate="30000/30030" maxPlayoutRate="30" codingDependency="false">
<BaseURL>output_video_trick_play_factor_1.mp4</BaseURL> <BaseURL>output_video-trick_play_factor_1.mp4</BaseURL>
<SegmentBase indexRange="823-890" timescale="30000"> <SegmentBase indexRange="823-890" timescale="30000">
<Initialization range="0-822"/> <Initialization range="0-822"/>
</SegmentBase> </SegmentBase>

0
packager/app/test/testdata/audio-video-with-two-trick-play/output_video_trick_play_factor_1.mp4 → packager/app/test/testdata/audio-video-with-two-trick-play/output_video-trick_play_factor_1.mp4 vendored
View File

0
packager/app/test/testdata/audio-video-with-two-trick-play/output_video_trick_play_factor_2.mp4 → packager/app/test/testdata/audio-video-with-two-trick-play/output_video-trick_play_factor_2.mp4 vendored
View File

2
packager/app/test/testdata/bear-640x360-a-clear-v-cenc-golden.mpd vendored
View File

@ -17,7 +17,7 @@
<AdaptationSet id="1" contentType="audio" subsegmentAlignment="true"> <AdaptationSet id="1" contentType="audio" subsegmentAlignment="true">
<Representation id="1" bandwidth="126510" codecs="mp4a.40.2" mimeType="audio/mp4" audioSamplingRate="44100"> <Representation id="1" bandwidth="126510" codecs="mp4a.40.2" mimeType="audio/mp4" audioSamplingRate="44100">
<AudioChannelConfiguration schemeIdUri="urn:mpeg:dash:23003:3:audio_channel_configuration:2011" value="2"/> <AudioChannelConfiguration schemeIdUri="urn:mpeg:dash:23003:3:audio_channel_configuration:2011" value="2"/>
<BaseURL>output_audio_skip_encryption.mp4</BaseURL> <BaseURL>output_audio-skip_encryption.mp4</BaseURL>
<SegmentBase indexRange="757-824" timescale="44100"> <SegmentBase indexRange="757-824" timescale="44100">
<Initialization range="0-756"/> <Initialization range="0-756"/>
</SegmentBase> </SegmentBase>

2
packager/app/test/testdata/bear-640x360-av-trick-1-cenc-golden.mpd vendored
View File

@ -21,7 +21,7 @@
</ContentProtection> </ContentProtection>
<EssentialProperty schemeIdUri="http://dashif.org/guidelines/trickmode" value="0"/> <EssentialProperty schemeIdUri="http://dashif.org/guidelines/trickmode" value="0"/>
<Representation id="1" bandwidth="157348" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1" maxPlayoutRate="30" codingDependency="false"> <Representation id="1" bandwidth="157348" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1" maxPlayoutRate="30" codingDependency="false">
<BaseURL>output_video_trick_play_factor_1.mp4</BaseURL> <BaseURL>output_video-trick_play_factor_1.mp4</BaseURL>
<SegmentBase indexRange="1091-1158" timescale="30000"> <SegmentBase indexRange="1091-1158" timescale="30000">
<Initialization range="0-1090"/> <Initialization range="0-1090"/>
</SegmentBase> </SegmentBase>

4
packager/app/test/testdata/bear-640x360-av-trick-1-trick-2-cenc-golden.mpd vendored
View File

@ -21,13 +21,13 @@
</ContentProtection> </ContentProtection>
<EssentialProperty schemeIdUri="http://dashif.org/guidelines/trickmode" value="0"/> <EssentialProperty schemeIdUri="http://dashif.org/guidelines/trickmode" value="0"/>
<Representation id="1" bandwidth="104852" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1" frameRate="30000/60060" maxPlayoutRate="60" codingDependency="false"> <Representation id="1" bandwidth="104852" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1" frameRate="30000/60060" maxPlayoutRate="60" codingDependency="false">
<BaseURL>output_video_trick_play_factor_2.mp4</BaseURL> <BaseURL>output_video-trick_play_factor_2.mp4</BaseURL>
<SegmentBase indexRange="1091-1146" timescale="30000"> <SegmentBase indexRange="1091-1146" timescale="30000">
<Initialization range="0-1090"/> <Initialization range="0-1090"/>
</SegmentBase> </SegmentBase>
</Representation> </Representation>
<Representation id="2" bandwidth="157348" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1" frameRate="30000/30030" maxPlayoutRate="30" codingDependency="false"> <Representation id="2" bandwidth="157348" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1" frameRate="30000/30030" maxPlayoutRate="30" codingDependency="false">
<BaseURL>output_video_trick_play_factor_1.mp4</BaseURL> <BaseURL>output_video-trick_play_factor_1.mp4</BaseURL>
<SegmentBase indexRange="1091-1158" timescale="30000"> <SegmentBase indexRange="1091-1158" timescale="30000">
<Initialization range="0-1090"/> <Initialization range="0-1090"/>
</SegmentBase> </SegmentBase>