From cd16e95d79a5d7263f8ad9b34b752ce465d63c30 Mon Sep 17 00:00:00 2001 From: Aaron Vaage Date: Tue, 27 Feb 2018 15:55:47 -0800 Subject: [PATCH] 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 --- packager/app/test/packager_test.py | 6 +++--- .../testdata/audio-video-with-trick-play/output.mpd | 2 +- ...r_1.mp4 => output_video-trick_play_factor_1.mp4} | Bin .../audio-video-with-two-trick-play/output.mpd | 4 ++-- ...r_1.mp4 => output_video-trick_play_factor_1.mp4} | Bin ...r_2.mp4 => output_video-trick_play_factor_2.mp4} | Bin .../testdata/bear-640x360-a-clear-v-cenc-golden.mpd | 2 +- .../bear-640x360-av-trick-1-cenc-golden.mpd | 2 +- .../bear-640x360-av-trick-1-trick-2-cenc-golden.mpd | 4 ++-- 9 files changed, 10 insertions(+), 10 deletions(-) rename packager/app/test/testdata/audio-video-with-trick-play/{output_video_trick_play_factor_1.mp4 => output_video-trick_play_factor_1.mp4} (100%) rename packager/app/test/testdata/audio-video-with-two-trick-play/{output_video_trick_play_factor_1.mp4 => output_video-trick_play_factor_1.mp4} (100%) rename packager/app/test/testdata/audio-video-with-two-trick-play/{output_video_trick_play_factor_2.mp4 => output_video-trick_play_factor_2.mp4} (100%) diff --git a/packager/app/test/packager_test.py b/packager/app/test/packager_test.py index 99b681b221..64eb545a0f 100755 --- a/packager/app/test/packager_test.py +++ b/packager/app/test/packager_test.py @@ -142,13 +142,13 @@ class PackagerAppTest(unittest.TestCase): output_file = '%s_%s' % (self.output_prefix, descriptor) else: 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: - output_file += '_trick_play_factor_%d' % trick_play_factor + output_file += '-trick_play_factor_%d' % trick_play_factor if skip_encryption: - output_file += '_skip_encryption' + output_file += '-skip_encryption' stream = StreamDescriptor(test_file) stream.Append('stream', descriptor) diff --git a/packager/app/test/testdata/audio-video-with-trick-play/output.mpd b/packager/app/test/testdata/audio-video-with-trick-play/output.mpd index 47002fcf88..423fb2e3eb 100644 --- a/packager/app/test/testdata/audio-video-with-trick-play/output.mpd +++ b/packager/app/test/testdata/audio-video-with-trick-play/output.mpd @@ -13,7 +13,7 @@ - output_video_trick_play_factor_1.mp4 + output_video-trick_play_factor_1.mp4 diff --git a/packager/app/test/testdata/audio-video-with-trick-play/output_video_trick_play_factor_1.mp4 b/packager/app/test/testdata/audio-video-with-trick-play/output_video-trick_play_factor_1.mp4 similarity index 100% rename from packager/app/test/testdata/audio-video-with-trick-play/output_video_trick_play_factor_1.mp4 rename to packager/app/test/testdata/audio-video-with-trick-play/output_video-trick_play_factor_1.mp4 diff --git a/packager/app/test/testdata/audio-video-with-two-trick-play/output.mpd b/packager/app/test/testdata/audio-video-with-two-trick-play/output.mpd index 6a5bbe8238..775d130714 100644 --- a/packager/app/test/testdata/audio-video-with-two-trick-play/output.mpd +++ b/packager/app/test/testdata/audio-video-with-two-trick-play/output.mpd @@ -13,13 +13,13 @@ - output_video_trick_play_factor_2.mp4 + output_video-trick_play_factor_2.mp4 - output_video_trick_play_factor_1.mp4 + output_video-trick_play_factor_1.mp4 diff --git a/packager/app/test/testdata/audio-video-with-two-trick-play/output_video_trick_play_factor_1.mp4 b/packager/app/test/testdata/audio-video-with-two-trick-play/output_video-trick_play_factor_1.mp4 similarity index 100% rename from packager/app/test/testdata/audio-video-with-two-trick-play/output_video_trick_play_factor_1.mp4 rename to packager/app/test/testdata/audio-video-with-two-trick-play/output_video-trick_play_factor_1.mp4 diff --git a/packager/app/test/testdata/audio-video-with-two-trick-play/output_video_trick_play_factor_2.mp4 b/packager/app/test/testdata/audio-video-with-two-trick-play/output_video-trick_play_factor_2.mp4 similarity index 100% rename from packager/app/test/testdata/audio-video-with-two-trick-play/output_video_trick_play_factor_2.mp4 rename to packager/app/test/testdata/audio-video-with-two-trick-play/output_video-trick_play_factor_2.mp4 diff --git a/packager/app/test/testdata/bear-640x360-a-clear-v-cenc-golden.mpd b/packager/app/test/testdata/bear-640x360-a-clear-v-cenc-golden.mpd index 1dd7459081..56fc7c78f4 100644 --- a/packager/app/test/testdata/bear-640x360-a-clear-v-cenc-golden.mpd +++ b/packager/app/test/testdata/bear-640x360-a-clear-v-cenc-golden.mpd @@ -17,7 +17,7 @@ - output_audio_skip_encryption.mp4 + output_audio-skip_encryption.mp4 diff --git a/packager/app/test/testdata/bear-640x360-av-trick-1-cenc-golden.mpd b/packager/app/test/testdata/bear-640x360-av-trick-1-cenc-golden.mpd index 9c7d256e7b..441cd7a940 100644 --- a/packager/app/test/testdata/bear-640x360-av-trick-1-cenc-golden.mpd +++ b/packager/app/test/testdata/bear-640x360-av-trick-1-cenc-golden.mpd @@ -21,7 +21,7 @@ - output_video_trick_play_factor_1.mp4 + output_video-trick_play_factor_1.mp4 diff --git a/packager/app/test/testdata/bear-640x360-av-trick-1-trick-2-cenc-golden.mpd b/packager/app/test/testdata/bear-640x360-av-trick-1-trick-2-cenc-golden.mpd index 711c66824b..c33d3268d5 100644 --- a/packager/app/test/testdata/bear-640x360-av-trick-1-trick-2-cenc-golden.mpd +++ b/packager/app/test/testdata/bear-640x360-av-trick-1-trick-2-cenc-golden.mpd @@ -21,13 +21,13 @@ - output_video_trick_play_factor_2.mp4 + output_video-trick_play_factor_2.mp4 - output_video_trick_play_factor_1.mp4 + output_video-trick_play_factor_1.mp4