diff --git a/packager/app/test/packager_test.py b/packager/app/test/packager_test.py index 6b71dc9d20..44f2ca7c85 100755 --- a/packager/app/test/packager_test.py +++ b/packager/app/test/packager_test.py @@ -134,8 +134,7 @@ class PackagerAppTest(unittest.TestCase): trick_play_factor=None, drm_label=None, skip_encryption=None, - test_file=None, - test_file_index=None): + test_file=None): """Get a stream descriptor as a string. @@ -158,15 +157,12 @@ class PackagerAppTest(unittest.TestCase): skip_encryption: If set to true, the stream will not be encrypted. test_file: Specify the input file to use. If the input file is not specify, a default file will be used. - test_file_index: Specify the index of the input out of a group of input - files. Returns: A string that makes up a single stream descriptor for input to the packager. """ - input_file_name = test_file or 'bear-640x360.mp4' input_file_path = os.path.join(self.test_data_dir, input_file_name) @@ -179,10 +175,11 @@ class PackagerAppTest(unittest.TestCase): if language: stream.Append('lang', language) - if test_file_index is None: - output_file_name = 'output_%s' % descriptor - else: - output_file_name = 'output_%d_%s' % (test_file_index, descriptor) + # Use the input file name (no extension) and pair it with the + # descriptor to create the root of the output file_name. + output_file_name = '%s-%s' % ( + os.path.splitext(input_file_name)[0], + descriptor) if hls: stream.Append('playlist_name', descriptor + '.m3u8') @@ -213,7 +210,7 @@ class PackagerAppTest(unittest.TestCase): seg_template = '%s-$Number$.%s' % (output_file_path, segment_ext) stream.Append('segment_template', seg_template) else: - output_file_path = '%s.%s' % (output_file_path, base_ext) + output_file_path += '.' + base_ext stream.Append('output', output_file_path) self.output.append(output_file_path) @@ -230,14 +227,10 @@ class PackagerAppTest(unittest.TestCase): if test_files_count == 0: for stream in streams: out.append(self._GetStream(stream, **kwargs)) - elif test_files_count == 1: - for stream in streams: - out.append(self._GetStream(stream, test_file=test_files[0], **kwargs)) else: - for index, file_name in enumerate(test_files): + for file_name in test_files: for stream in streams: - out.append(self._GetStream( - stream, test_file_index=index, test_file=file_name, **kwargs)) + out.append(self._GetStream(stream, test_file=file_name, **kwargs)) return out diff --git a/packager/app/test/testdata/acc-he/output_audio.mp4 b/packager/app/test/testdata/acc-he/bear-640x360-aac_he-silent_right-audio.mp4 similarity index 100% rename from packager/app/test/testdata/acc-he/output_audio.mp4 rename to packager/app/test/testdata/acc-he/bear-640x360-aac_he-silent_right-audio.mp4 diff --git a/packager/app/test/testdata/acc-he/output.mpd b/packager/app/test/testdata/acc-he/output.mpd index 5994c47f3b..1106893615 100644 --- a/packager/app/test/testdata/acc-he/output.mpd +++ b/packager/app/test/testdata/acc-he/output.mpd @@ -5,7 +5,7 @@ - output_audio.mp4 + bear-640x360-aac_he-silent_right-audio.mp4 diff --git a/packager/app/test/testdata/audio-video-with-language-override-with-subtag/output_audio.mp4 b/packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-audio.mp4 similarity index 100% rename from packager/app/test/testdata/audio-video-with-language-override-with-subtag/output_audio.mp4 rename to packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-audio.mp4 diff --git a/packager/app/test/testdata/audio-video-with-language-override-with-subtag/output_video.mp4 b/packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-video.mp4 similarity index 100% rename from packager/app/test/testdata/audio-video-with-language-override-with-subtag/output_video.mp4 rename to packager/app/test/testdata/audio-video-with-language-override-with-subtag/bear-640x360-video.mp4 diff --git a/packager/app/test/testdata/audio-video-with-language-override-with-subtag/output.mpd b/packager/app/test/testdata/audio-video-with-language-override-with-subtag/output.mpd index 2b5041c5f8..d29c8df8b5 100644 --- a/packager/app/test/testdata/audio-video-with-language-override-with-subtag/output.mpd +++ b/packager/app/test/testdata/audio-video-with-language-override-with-subtag/output.mpd @@ -4,7 +4,7 @@ - output_video.mp4 + bear-640x360-video.mp4 @@ -13,7 +13,7 @@ - output_audio.mp4 + bear-640x360-audio.mp4 diff --git a/packager/app/test/testdata/audio-video-with-language-override/output_audio.mp4 b/packager/app/test/testdata/audio-video-with-language-override/bear-640x360-audio.mp4 similarity index 100% rename from packager/app/test/testdata/audio-video-with-language-override/output_audio.mp4 rename to packager/app/test/testdata/audio-video-with-language-override/bear-640x360-audio.mp4 diff --git a/packager/app/test/testdata/audio-video-with-language-override/output_video.mp4 b/packager/app/test/testdata/audio-video-with-language-override/bear-640x360-video.mp4 similarity index 100% rename from packager/app/test/testdata/audio-video-with-language-override/output_video.mp4 rename to packager/app/test/testdata/audio-video-with-language-override/bear-640x360-video.mp4 diff --git a/packager/app/test/testdata/audio-video-with-language-override/output.mpd b/packager/app/test/testdata/audio-video-with-language-override/output.mpd index 2b5041c5f8..d29c8df8b5 100644 --- a/packager/app/test/testdata/audio-video-with-language-override/output.mpd +++ b/packager/app/test/testdata/audio-video-with-language-override/output.mpd @@ -4,7 +4,7 @@ - output_video.mp4 + bear-640x360-video.mp4 @@ -13,7 +13,7 @@ - output_audio.mp4 + bear-640x360-audio.mp4 diff --git a/packager/app/test/testdata/audio-video-with-trick-play/output_audio.mp4 b/packager/app/test/testdata/audio-video-with-trick-play/bear-640x360-audio.mp4 similarity index 100% rename from packager/app/test/testdata/audio-video-with-trick-play/output_audio.mp4 rename to packager/app/test/testdata/audio-video-with-trick-play/bear-640x360-audio.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/bear-640x360-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/bear-640x360-video-trick_play_factor_1.mp4 diff --git a/packager/app/test/testdata/audio-video-with-trick-play/output_video.mp4 b/packager/app/test/testdata/audio-video-with-trick-play/bear-640x360-video.mp4 similarity index 100% rename from packager/app/test/testdata/audio-video-with-trick-play/output_video.mp4 rename to packager/app/test/testdata/audio-video-with-trick-play/bear-640x360-video.mp4 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 423fb2e3eb..2e5d2b6e3a 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 @@ -4,7 +4,7 @@ - output_video.mp4 + bear-640x360-video.mp4 @@ -13,7 +13,7 @@ - output_video-trick_play_factor_1.mp4 + bear-640x360-video-trick_play_factor_1.mp4 @@ -22,7 +22,7 @@ - output_audio.mp4 + bear-640x360-audio.mp4 diff --git a/packager/app/test/testdata/audio-video-with-two-trick-play/output_audio.mp4 b/packager/app/test/testdata/audio-video-with-two-trick-play/bear-640x360-audio.mp4 similarity index 100% rename from packager/app/test/testdata/audio-video-with-two-trick-play/output_audio.mp4 rename to packager/app/test/testdata/audio-video-with-two-trick-play/bear-640x360-audio.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/bear-640x360-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/bear-640x360-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/bear-640x360-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/bear-640x360-video-trick_play_factor_2.mp4 diff --git a/packager/app/test/testdata/audio-video-with-two-trick-play/output_video.mp4 b/packager/app/test/testdata/audio-video-with-two-trick-play/bear-640x360-video.mp4 similarity index 100% rename from packager/app/test/testdata/audio-video-with-two-trick-play/output_video.mp4 rename to packager/app/test/testdata/audio-video-with-two-trick-play/bear-640x360-video.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 775d130714..3b460c01dd 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 @@ -4,7 +4,7 @@ - output_video.mp4 + bear-640x360-video.mp4 @@ -13,13 +13,13 @@ - output_video-trick_play_factor_2.mp4 + bear-640x360-video-trick_play_factor_2.mp4 - output_video-trick_play_factor_1.mp4 + bear-640x360-video-trick_play_factor_1.mp4 @@ -28,7 +28,7 @@ - output_audio.mp4 + bear-640x360-audio.mp4 diff --git a/packager/app/test/testdata/audio-video/output_audio.mp4 b/packager/app/test/testdata/audio-video/bear-640x360-audio.mp4 similarity index 100% rename from packager/app/test/testdata/audio-video/output_audio.mp4 rename to packager/app/test/testdata/audio-video/bear-640x360-audio.mp4 diff --git a/packager/app/test/testdata/audio-video/output_video.mp4 b/packager/app/test/testdata/audio-video/bear-640x360-video.mp4 similarity index 100% rename from packager/app/test/testdata/audio-video/output_video.mp4 rename to packager/app/test/testdata/audio-video/bear-640x360-video.mp4 diff --git a/packager/app/test/testdata/audio-video/output.mpd b/packager/app/test/testdata/audio-video/output.mpd index 81bbf4f594..439c5f8a56 100644 --- a/packager/app/test/testdata/audio-video/output.mpd +++ b/packager/app/test/testdata/audio-video/output.mpd @@ -4,7 +4,7 @@ - output_video.mp4 + bear-640x360-video.mp4 @@ -13,7 +13,7 @@ - output_audio.mp4 + bear-640x360-audio.mp4 diff --git a/packager/app/test/testdata/avc-aac-ts/audio.m3u8 b/packager/app/test/testdata/avc-aac-ts/audio.m3u8 index d46157a0c8..96870f57f0 100644 --- a/packager/app/test/testdata/avc-aac-ts/audio.m3u8 +++ b/packager/app/test/testdata/avc-aac-ts/audio.m3u8 @@ -4,9 +4,9 @@ #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXTINF:0.952, -output_audio-1.ts +bear-640x360-audio-1.ts #EXTINF:0.998, -output_audio-2.ts +bear-640x360-audio-2.ts #EXTINF:0.813, -output_audio-3.ts +bear-640x360-audio-3.ts #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/avc-aac-ts/output_audio-1.ts b/packager/app/test/testdata/avc-aac-ts/bear-640x360-audio-1.ts similarity index 100% rename from packager/app/test/testdata/avc-aac-ts/output_audio-1.ts rename to packager/app/test/testdata/avc-aac-ts/bear-640x360-audio-1.ts diff --git a/packager/app/test/testdata/avc-aac-ts/output_audio-2.ts b/packager/app/test/testdata/avc-aac-ts/bear-640x360-audio-2.ts similarity index 100% rename from packager/app/test/testdata/avc-aac-ts/output_audio-2.ts rename to packager/app/test/testdata/avc-aac-ts/bear-640x360-audio-2.ts diff --git a/packager/app/test/testdata/avc-aac-ts/output_audio-3.ts b/packager/app/test/testdata/avc-aac-ts/bear-640x360-audio-3.ts similarity index 100% rename from packager/app/test/testdata/avc-aac-ts/output_audio-3.ts rename to packager/app/test/testdata/avc-aac-ts/bear-640x360-audio-3.ts diff --git a/packager/app/test/testdata/avc-aac-ts/output_video-1.ts b/packager/app/test/testdata/avc-aac-ts/bear-640x360-video-1.ts similarity index 100% rename from packager/app/test/testdata/avc-aac-ts/output_video-1.ts rename to packager/app/test/testdata/avc-aac-ts/bear-640x360-video-1.ts diff --git a/packager/app/test/testdata/avc-aac-ts/output_video-2.ts b/packager/app/test/testdata/avc-aac-ts/bear-640x360-video-2.ts similarity index 100% rename from packager/app/test/testdata/avc-aac-ts/output_video-2.ts rename to packager/app/test/testdata/avc-aac-ts/bear-640x360-video-2.ts diff --git a/packager/app/test/testdata/avc-aac-ts/output_video-3.ts b/packager/app/test/testdata/avc-aac-ts/bear-640x360-video-3.ts similarity index 100% rename from packager/app/test/testdata/avc-aac-ts/output_video-3.ts rename to packager/app/test/testdata/avc-aac-ts/bear-640x360-video-3.ts diff --git a/packager/app/test/testdata/avc-aac-ts/video.m3u8 b/packager/app/test/testdata/avc-aac-ts/video.m3u8 index 14e87c0241..51a3eafba0 100644 --- a/packager/app/test/testdata/avc-aac-ts/video.m3u8 +++ b/packager/app/test/testdata/avc-aac-ts/video.m3u8 @@ -4,9 +4,9 @@ #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXTINF:1.001, -output_video-1.ts +bear-640x360-video-1.ts #EXTINF:1.001, -output_video-2.ts +bear-640x360-video-2.ts #EXTINF:0.734, -output_video-3.ts +bear-640x360-video-3.ts #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/avc-ac3-ts-to-mp4/audio.m3u8 b/packager/app/test/testdata/avc-ac3-ts-to-mp4/audio.m3u8 index b8a4080daa..f4242bf511 100644 --- a/packager/app/test/testdata/avc-ac3-ts-to-mp4/audio.m3u8 +++ b/packager/app/test/testdata/avc-ac3-ts-to-mp4/audio.m3u8 @@ -3,14 +3,14 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="output_audio.mp4",BYTERANGE="726@0" +#EXT-X-MAP:URI="bear-640x360-ac3-audio.mp4",BYTERANGE="726@0" #EXTINF:0.975, #EXT-X-BYTERANGE:23728@794 -output_audio.mp4 +bear-640x360-ac3-audio.mp4 #EXTINF:0.975, #EXT-X-BYTERANGE:23730 -output_audio.mp4 +bear-640x360-ac3-audio.mp4 #EXTINF:0.836, #EXT-X-BYTERANGE:20354 -output_audio.mp4 +bear-640x360-ac3-audio.mp4 #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/avc-ac3-ts-to-mp4/output_audio.mp4 b/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-audio.mp4 similarity index 100% rename from packager/app/test/testdata/avc-ac3-ts-to-mp4/output_audio.mp4 rename to packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-audio.mp4 diff --git a/packager/app/test/testdata/avc-ac3-ts-to-mp4/output_video.mp4 b/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-video.mp4 similarity index 100% rename from packager/app/test/testdata/avc-ac3-ts-to-mp4/output_video.mp4 rename to packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-video.mp4 diff --git a/packager/app/test/testdata/avc-ac3-ts-to-mp4/video.m3u8 b/packager/app/test/testdata/avc-ac3-ts-to-mp4/video.m3u8 index bfd8860da6..09e8052f5b 100644 --- a/packager/app/test/testdata/avc-ac3-ts-to-mp4/video.m3u8 +++ b/packager/app/test/testdata/avc-ac3-ts-to-mp4/video.m3u8 @@ -3,14 +3,14 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="output_video.mp4",BYTERANGE="823@0" +#EXT-X-MAP:URI="bear-640x360-ac3-video.mp4",BYTERANGE="823@0" #EXTINF:1.001, #EXT-X-BYTERANGE:99313@891 -output_video.mp4 +bear-640x360-ac3-video.mp4 #EXTINF:1.001, #EXT-X-BYTERANGE:121807 -output_video.mp4 +bear-640x360-ac3-video.mp4 #EXTINF:0.734, #EXT-X-BYTERANGE:79662 -output_video.mp4 +bear-640x360-ac3-video.mp4 #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/avc-ac3-ts-with-encryption/audio.m3u8 b/packager/app/test/testdata/avc-ac3-ts-with-encryption/audio.m3u8 index 95f63083b0..988543c6fd 100644 --- a/packager/app/test/testdata/avc-ac3-ts-with-encryption/audio.m3u8 +++ b/packager/app/test/testdata/avc-ac3-ts-with-encryption/audio.m3u8 @@ -4,11 +4,11 @@ #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXTINF:0.975, -output_audio-1.ts +bear-640x360-ac3-audio-1.ts #EXT-X-DISCONTINUITY #EXT-X-KEY:METHOD=SAMPLE-AES,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",IV=0x3334353637383930,KEYFORMAT="identity" #EXTINF:0.975, -output_audio-2.ts +bear-640x360-ac3-audio-2.ts #EXTINF:0.836, -output_audio-3.ts +bear-640x360-ac3-audio-3.ts #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/avc-ac3-ts-with-encryption/output_audio-1.ts b/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-audio-1.ts similarity index 100% rename from packager/app/test/testdata/avc-ac3-ts-with-encryption/output_audio-1.ts rename to packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-audio-1.ts diff --git a/packager/app/test/testdata/avc-ac3-ts-with-encryption/output_audio-2.ts b/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-audio-2.ts similarity index 100% rename from packager/app/test/testdata/avc-ac3-ts-with-encryption/output_audio-2.ts rename to packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-audio-2.ts diff --git a/packager/app/test/testdata/avc-ac3-ts-with-encryption/output_audio-3.ts b/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-audio-3.ts similarity index 100% rename from packager/app/test/testdata/avc-ac3-ts-with-encryption/output_audio-3.ts rename to packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-audio-3.ts diff --git a/packager/app/test/testdata/avc-ac3-ts-with-encryption/output_video-1.ts b/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-video-1.ts similarity index 100% rename from packager/app/test/testdata/avc-ac3-ts-with-encryption/output_video-1.ts rename to packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-video-1.ts diff --git a/packager/app/test/testdata/avc-ac3-ts-with-encryption/output_video-2.ts b/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-video-2.ts similarity index 100% rename from packager/app/test/testdata/avc-ac3-ts-with-encryption/output_video-2.ts rename to packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-video-2.ts diff --git a/packager/app/test/testdata/avc-ac3-ts-with-encryption/output_video-3.ts b/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-video-3.ts similarity index 100% rename from packager/app/test/testdata/avc-ac3-ts-with-encryption/output_video-3.ts rename to packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-video-3.ts diff --git a/packager/app/test/testdata/avc-ac3-ts-with-encryption/video.m3u8 b/packager/app/test/testdata/avc-ac3-ts-with-encryption/video.m3u8 index c5b1330a30..9c07bb27ba 100644 --- a/packager/app/test/testdata/avc-ac3-ts-with-encryption/video.m3u8 +++ b/packager/app/test/testdata/avc-ac3-ts-with-encryption/video.m3u8 @@ -4,11 +4,11 @@ #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXTINF:1.001, -output_video-1.ts +bear-640x360-ac3-video-1.ts #EXT-X-DISCONTINUITY #EXT-X-KEY:METHOD=SAMPLE-AES,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",IV=0x3334353637383930,KEYFORMAT="identity" #EXTINF:1.001, -output_video-2.ts +bear-640x360-ac3-video-2.ts #EXTINF:0.734, -output_video-3.ts +bear-640x360-ac3-video-3.ts #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/avc-ac3-ts/audio.m3u8 b/packager/app/test/testdata/avc-ac3-ts/audio.m3u8 index f236f95de1..19d086db9a 100644 --- a/packager/app/test/testdata/avc-ac3-ts/audio.m3u8 +++ b/packager/app/test/testdata/avc-ac3-ts/audio.m3u8 @@ -4,9 +4,9 @@ #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXTINF:0.975, -output_audio-1.ts +bear-640x360-ac3-audio-1.ts #EXTINF:0.975, -output_audio-2.ts +bear-640x360-ac3-audio-2.ts #EXTINF:0.836, -output_audio-3.ts +bear-640x360-ac3-audio-3.ts #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/avc-ac3-ts/output_audio-1.ts b/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-audio-1.ts similarity index 100% rename from packager/app/test/testdata/avc-ac3-ts/output_audio-1.ts rename to packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-audio-1.ts diff --git a/packager/app/test/testdata/avc-ac3-ts/output_audio-2.ts b/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-audio-2.ts similarity index 100% rename from packager/app/test/testdata/avc-ac3-ts/output_audio-2.ts rename to packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-audio-2.ts diff --git a/packager/app/test/testdata/avc-ac3-ts/output_audio-3.ts b/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-audio-3.ts similarity index 100% rename from packager/app/test/testdata/avc-ac3-ts/output_audio-3.ts rename to packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-audio-3.ts diff --git a/packager/app/test/testdata/avc-ac3-ts/output_video-1.ts b/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-video-1.ts similarity index 100% rename from packager/app/test/testdata/avc-ac3-ts/output_video-1.ts rename to packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-video-1.ts diff --git a/packager/app/test/testdata/avc-ac3-ts/output_video-2.ts b/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-video-2.ts similarity index 100% rename from packager/app/test/testdata/avc-ac3-ts/output_video-2.ts rename to packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-video-2.ts diff --git a/packager/app/test/testdata/avc-ac3-ts/output_video-3.ts b/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-video-3.ts similarity index 100% rename from packager/app/test/testdata/avc-ac3-ts/output_video-3.ts rename to packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-video-3.ts diff --git a/packager/app/test/testdata/avc-ac3-ts/video.m3u8 b/packager/app/test/testdata/avc-ac3-ts/video.m3u8 index 14e87c0241..452dd22367 100644 --- a/packager/app/test/testdata/avc-ac3-ts/video.m3u8 +++ b/packager/app/test/testdata/avc-ac3-ts/video.m3u8 @@ -4,9 +4,9 @@ #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXTINF:1.001, -output_video-1.ts +bear-640x360-ac3-video-1.ts #EXTINF:1.001, -output_video-2.ts +bear-640x360-ac3-video-2.ts #EXTINF:0.734, -output_video-3.ts +bear-640x360-ac3-video-3.ts #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/avc-ts-event-playlist/audio.m3u8 b/packager/app/test/testdata/avc-ts-event-playlist/audio.m3u8 index ae07db12d1..12fa6a909d 100644 --- a/packager/app/test/testdata/avc-ts-event-playlist/audio.m3u8 +++ b/packager/app/test/testdata/avc-ts-event-playlist/audio.m3u8 @@ -4,8 +4,8 @@ #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:EVENT #EXTINF:0.952, -output_audio-1.ts +bear-640x360-audio-1.ts #EXTINF:0.998, -output_audio-2.ts +bear-640x360-audio-2.ts #EXTINF:0.813, -output_audio-3.ts +bear-640x360-audio-3.ts diff --git a/packager/app/test/testdata/avc-ts-event-playlist/output_audio-1.ts b/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-audio-1.ts similarity index 100% rename from packager/app/test/testdata/avc-ts-event-playlist/output_audio-1.ts rename to packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-audio-1.ts diff --git a/packager/app/test/testdata/avc-ts-event-playlist/output_audio-2.ts b/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-audio-2.ts similarity index 100% rename from packager/app/test/testdata/avc-ts-event-playlist/output_audio-2.ts rename to packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-audio-2.ts diff --git a/packager/app/test/testdata/avc-ts-event-playlist/output_audio-3.ts b/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-audio-3.ts similarity index 100% rename from packager/app/test/testdata/avc-ts-event-playlist/output_audio-3.ts rename to packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-audio-3.ts diff --git a/packager/app/test/testdata/avc-ts-event-playlist/output_video-1.ts b/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-video-1.ts similarity index 100% rename from packager/app/test/testdata/avc-ts-event-playlist/output_video-1.ts rename to packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-video-1.ts diff --git a/packager/app/test/testdata/avc-ts-event-playlist/output_video-2.ts b/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-video-2.ts similarity index 100% rename from packager/app/test/testdata/avc-ts-event-playlist/output_video-2.ts rename to packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-video-2.ts diff --git a/packager/app/test/testdata/avc-ts-event-playlist/output_video-3.ts b/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-video-3.ts similarity index 100% rename from packager/app/test/testdata/avc-ts-event-playlist/output_video-3.ts rename to packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-video-3.ts diff --git a/packager/app/test/testdata/avc-ts-event-playlist/video.m3u8 b/packager/app/test/testdata/avc-ts-event-playlist/video.m3u8 index ee5bc4294c..bab23cb800 100644 --- a/packager/app/test/testdata/avc-ts-event-playlist/video.m3u8 +++ b/packager/app/test/testdata/avc-ts-event-playlist/video.m3u8 @@ -4,8 +4,8 @@ #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:EVENT #EXTINF:1.001, -output_video-1.ts +bear-640x360-video-1.ts #EXTINF:1.001, -output_video-2.ts +bear-640x360-video-2.ts #EXTINF:0.734, -output_video-3.ts +bear-640x360-video-3.ts diff --git a/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/audio.m3u8 b/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/audio.m3u8 index 916ab207fc..f1ed725768 100644 --- a/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/audio.m3u8 +++ b/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/audio.m3u8 @@ -6,7 +6,7 @@ #EXT-X-DISCONTINUITY-SEQUENCE:1 #EXT-X-KEY:METHOD=SAMPLE-AES,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",IV=0x3334353637383930,KEYFORMAT="identity" #EXTINF:0.998, -output_audio-2.ts +bear-640x360-audio-2.ts #EXT-X-KEY:METHOD=SAMPLE-AES,URI="data:text/plain;base64,MjM0NTY3ODkwMTIzNDU2MQ==",IV=0x3334353637383930,KEYFORMAT="identity" #EXTINF:0.813, -output_audio-3.ts +bear-640x360-audio-3.ts diff --git a/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/output_audio-1.ts b/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-audio-1.ts similarity index 100% rename from packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/output_audio-1.ts rename to packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-audio-1.ts diff --git a/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/output_audio-2.ts b/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-audio-2.ts similarity index 100% rename from packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/output_audio-2.ts rename to packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-audio-2.ts diff --git a/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/output_audio-3.ts b/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-audio-3.ts similarity index 100% rename from packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/output_audio-3.ts rename to packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-audio-3.ts diff --git a/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/output_video-1.ts b/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-video-1.ts similarity index 100% rename from packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/output_video-1.ts rename to packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-video-1.ts diff --git a/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/output_video-2.ts b/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-video-2.ts similarity index 100% rename from packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/output_video-2.ts rename to packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-video-2.ts diff --git a/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/output_video-3.ts b/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-video-3.ts similarity index 100% rename from packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/output_video-3.ts rename to packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-video-3.ts diff --git a/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/video.m3u8 b/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/video.m3u8 index 26c493d7f7..9bd3611d1b 100644 --- a/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/video.m3u8 +++ b/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/video.m3u8 @@ -6,7 +6,7 @@ #EXT-X-DISCONTINUITY-SEQUENCE:1 #EXT-X-KEY:METHOD=SAMPLE-AES,URI="data:text/plain;base64,MjM0NTY3ODkwMTIzNDU2MQ==",IV=0x3334353637383930,KEYFORMAT="identity" #EXTINF:1.001, -output_video-2.ts +bear-640x360-video-2.ts #EXT-X-KEY:METHOD=SAMPLE-AES,URI="data:text/plain;base64,MzQ1Njc4OTAxMjM0NTYxMg==",IV=0x3334353637383930,KEYFORMAT="identity" #EXTINF:0.734, -output_video-3.ts +bear-640x360-video-3.ts diff --git a/packager/app/test/testdata/avc-ts-live-playlist/audio.m3u8 b/packager/app/test/testdata/avc-ts-live-playlist/audio.m3u8 index 086a1dad8a..e2c0a22240 100644 --- a/packager/app/test/testdata/avc-ts-live-playlist/audio.m3u8 +++ b/packager/app/test/testdata/avc-ts-live-playlist/audio.m3u8 @@ -4,6 +4,6 @@ #EXT-X-TARGETDURATION:2 #EXT-X-MEDIA-SEQUENCE:1 #EXTINF:0.998, -output_audio-2.ts +bear-640x360-audio-2.ts #EXTINF:0.813, -output_audio-3.ts +bear-640x360-audio-3.ts diff --git a/packager/app/test/testdata/avc-ts-live-playlist/output_audio-1.ts b/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-audio-1.ts similarity index 100% rename from packager/app/test/testdata/avc-ts-live-playlist/output_audio-1.ts rename to packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-audio-1.ts diff --git a/packager/app/test/testdata/avc-ts-live-playlist/output_audio-2.ts b/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-audio-2.ts similarity index 100% rename from packager/app/test/testdata/avc-ts-live-playlist/output_audio-2.ts rename to packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-audio-2.ts diff --git a/packager/app/test/testdata/avc-ts-live-playlist/output_audio-3.ts b/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-audio-3.ts similarity index 100% rename from packager/app/test/testdata/avc-ts-live-playlist/output_audio-3.ts rename to packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-audio-3.ts diff --git a/packager/app/test/testdata/avc-ts-live-playlist/output_video-1.ts b/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-video-1.ts similarity index 100% rename from packager/app/test/testdata/avc-ts-live-playlist/output_video-1.ts rename to packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-video-1.ts diff --git a/packager/app/test/testdata/avc-ts-live-playlist/output_video-2.ts b/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-video-2.ts similarity index 100% rename from packager/app/test/testdata/avc-ts-live-playlist/output_video-2.ts rename to packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-video-2.ts diff --git a/packager/app/test/testdata/avc-ts-live-playlist/output_video-3.ts b/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-video-3.ts similarity index 100% rename from packager/app/test/testdata/avc-ts-live-playlist/output_video-3.ts rename to packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-video-3.ts diff --git a/packager/app/test/testdata/avc-ts-live-playlist/video.m3u8 b/packager/app/test/testdata/avc-ts-live-playlist/video.m3u8 index 70b5992c3f..b705e1c01c 100644 --- a/packager/app/test/testdata/avc-ts-live-playlist/video.m3u8 +++ b/packager/app/test/testdata/avc-ts-live-playlist/video.m3u8 @@ -4,6 +4,6 @@ #EXT-X-TARGETDURATION:2 #EXT-X-MEDIA-SEQUENCE:1 #EXTINF:1.001, -output_video-2.ts +bear-640x360-video-2.ts #EXTINF:0.734, -output_video-3.ts +bear-640x360-video-3.ts diff --git a/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/audio.m3u8 b/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/audio.m3u8 index 166a8f4174..3592ecbb0c 100644 --- a/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/audio.m3u8 +++ b/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/audio.m3u8 @@ -4,11 +4,11 @@ #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXTINF:0.952, -output_audio-1.ts +bear-640x360-audio-1.ts #EXT-X-DISCONTINUITY #EXT-X-KEY:METHOD=SAMPLE-AES,URI="skd://www.license.com/getkey?KeyId=31323334-3536-3738-3930-313233343536",KEYFORMATVERSIONS="1",KEYFORMAT="com.apple.streamingkeydelivery" #EXTINF:0.998, -output_audio-2.ts +bear-640x360-audio-2.ts #EXTINF:0.813, -output_audio-3.ts +bear-640x360-audio-3.ts #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/output_audio-1.ts b/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-audio-1.ts similarity index 100% rename from packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/output_audio-1.ts rename to packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-audio-1.ts diff --git a/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/output_audio-2.ts b/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-audio-2.ts similarity index 100% rename from packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/output_audio-2.ts rename to packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-audio-2.ts diff --git a/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/output_audio-3.ts b/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-audio-3.ts similarity index 100% rename from packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/output_audio-3.ts rename to packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-audio-3.ts diff --git a/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/output_video-1.ts b/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-video-1.ts similarity index 100% rename from packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/output_video-1.ts rename to packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-video-1.ts diff --git a/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/output_video-2.ts b/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-video-2.ts similarity index 100% rename from packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/output_video-2.ts rename to packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-video-2.ts diff --git a/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/output_video-3.ts b/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-video-3.ts similarity index 100% rename from packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/output_video-3.ts rename to packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-video-3.ts diff --git a/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/video.m3u8 b/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/video.m3u8 index 1206c1954a..2918a57460 100644 --- a/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/video.m3u8 +++ b/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/video.m3u8 @@ -4,11 +4,11 @@ #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXTINF:1.001, -output_video-1.ts +bear-640x360-video-1.ts #EXT-X-DISCONTINUITY #EXT-X-KEY:METHOD=SAMPLE-AES,URI="skd://www.license.com/getkey?KeyId=31323334-3536-3738-3930-313233343536",KEYFORMATVERSIONS="1",KEYFORMAT="com.apple.streamingkeydelivery" #EXTINF:1.001, -output_video-2.ts +bear-640x360-video-2.ts #EXTINF:0.734, -output_video-3.ts +bear-640x360-video-3.ts #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/output_video-1.ts b/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-1.ts similarity index 100% rename from packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/output_video-1.ts rename to packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-1.ts diff --git a/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/output_video-2.ts b/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-2.ts similarity index 100% rename from packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/output_video-2.ts rename to packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-2.ts diff --git a/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/output_video-3.ts b/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-3.ts similarity index 100% rename from packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/output_video-3.ts rename to packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-3.ts diff --git a/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/output_video-4.ts b/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-4.ts similarity index 100% rename from packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/output_video-4.ts rename to packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-4.ts diff --git a/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/output_video-5.ts b/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-5.ts similarity index 100% rename from packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/output_video-5.ts rename to packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-5.ts diff --git a/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/output_video-6.ts b/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-6.ts similarity index 100% rename from packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/output_video-6.ts rename to packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-6.ts diff --git a/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/video.m3u8 b/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/video.m3u8 index 607904d24b..005069d849 100644 --- a/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/video.m3u8 +++ b/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/video.m3u8 @@ -4,17 +4,17 @@ #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXTINF:1.000, -output_video-1.ts +sintel-1024x436-video-1.ts #EXT-X-DISCONTINUITY #EXT-X-KEY:METHOD=SAMPLE-AES,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",IV=0x3334353637383930,KEYFORMAT="identity" #EXTINF:1.000, -output_video-2.ts +sintel-1024x436-video-2.ts #EXTINF:1.875, -output_video-3.ts +sintel-1024x436-video-3.ts #EXTINF:0.917, -output_video-4.ts +sintel-1024x436-video-4.ts #EXTINF:1.000, -output_video-5.ts +sintel-1024x436-video-5.ts #EXTINF:0.208, -output_video-6.ts +sintel-1024x436-video-6.ts #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/avc-ts-with-encryption/audio.m3u8 b/packager/app/test/testdata/avc-ts-with-encryption/audio.m3u8 index 9c67fa201d..58b5ef15b7 100644 --- a/packager/app/test/testdata/avc-ts-with-encryption/audio.m3u8 +++ b/packager/app/test/testdata/avc-ts-with-encryption/audio.m3u8 @@ -4,11 +4,11 @@ #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXTINF:0.952, -output_audio-1.ts +bear-640x360-audio-1.ts #EXT-X-DISCONTINUITY #EXT-X-KEY:METHOD=SAMPLE-AES,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",IV=0x3334353637383930,KEYFORMAT="identity" #EXTINF:0.998, -output_audio-2.ts +bear-640x360-audio-2.ts #EXTINF:0.813, -output_audio-3.ts +bear-640x360-audio-3.ts #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/avc-ts-with-encryption/output_audio-1.ts b/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-audio-1.ts similarity index 100% rename from packager/app/test/testdata/avc-ts-with-encryption/output_audio-1.ts rename to packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-audio-1.ts diff --git a/packager/app/test/testdata/avc-ts-with-encryption/output_audio-2.ts b/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-audio-2.ts similarity index 100% rename from packager/app/test/testdata/avc-ts-with-encryption/output_audio-2.ts rename to packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-audio-2.ts diff --git a/packager/app/test/testdata/avc-ts-with-encryption/output_audio-3.ts b/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-audio-3.ts similarity index 100% rename from packager/app/test/testdata/avc-ts-with-encryption/output_audio-3.ts rename to packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-audio-3.ts diff --git a/packager/app/test/testdata/avc-ts-with-encryption/output_video-1.ts b/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-video-1.ts similarity index 100% rename from packager/app/test/testdata/avc-ts-with-encryption/output_video-1.ts rename to packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-video-1.ts diff --git a/packager/app/test/testdata/avc-ts-with-encryption/output_video-2.ts b/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-video-2.ts similarity index 100% rename from packager/app/test/testdata/avc-ts-with-encryption/output_video-2.ts rename to packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-video-2.ts diff --git a/packager/app/test/testdata/avc-ts-with-encryption/output_video-3.ts b/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-video-3.ts similarity index 100% rename from packager/app/test/testdata/avc-ts-with-encryption/output_video-3.ts rename to packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-video-3.ts diff --git a/packager/app/test/testdata/avc-ts-with-encryption/video.m3u8 b/packager/app/test/testdata/avc-ts-with-encryption/video.m3u8 index c5b1330a30..2c0fa89542 100644 --- a/packager/app/test/testdata/avc-ts-with-encryption/video.m3u8 +++ b/packager/app/test/testdata/avc-ts-with-encryption/video.m3u8 @@ -4,11 +4,11 @@ #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXTINF:1.001, -output_video-1.ts +bear-640x360-video-1.ts #EXT-X-DISCONTINUITY #EXT-X-KEY:METHOD=SAMPLE-AES,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",IV=0x3334353637383930,KEYFORMAT="identity" #EXTINF:1.001, -output_video-2.ts +bear-640x360-video-2.ts #EXTINF:0.734, -output_video-3.ts +bear-640x360-video-3.ts #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/bear-320x240-opus-vp9-cenc-golden.mpd b/packager/app/test/testdata/bear-320x240-opus-vp9-cenc-golden.mpd index d488094f94..092631eef1 100644 --- a/packager/app/test/testdata/bear-320x240-opus-vp9-cenc-golden.mpd +++ b/packager/app/test/testdata/bear-320x240-opus-vp9-cenc-golden.mpd @@ -9,7 +9,7 @@ - output_audio.mp4 + bear-320x240-vp9-opus-audio.mp4 @@ -21,7 +21,7 @@ AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== - output_video.mp4 + bear-320x240-vp9-opus-video.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 56fc7c78f4..eaf51a8969 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 @@ -8,7 +8,7 @@ AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== - output_video.mp4 + bear-640x360-video.mp4 @@ -17,7 +17,7 @@ - output_audio-skip_encryption.mp4 + bear-640x360-audio-skip_encryption.mp4 diff --git a/packager/app/test/testdata/bear-640x360-a-live-golden-init.mp4 b/packager/app/test/testdata/bear-640x360-a-live-golden-init.mp4 deleted file mode 100644 index a703e29da8..0000000000 Binary files a/packager/app/test/testdata/bear-640x360-a-live-golden-init.mp4 and /dev/null differ diff --git a/packager/app/test/testdata/bear-640x360-av-cbc1-golden.mpd b/packager/app/test/testdata/bear-640x360-av-cbc1-golden.mpd index ded974833f..c08a024b95 100644 --- a/packager/app/test/testdata/bear-640x360-av-cbc1-golden.mpd +++ b/packager/app/test/testdata/bear-640x360-av-cbc1-golden.mpd @@ -8,7 +8,7 @@ AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== - output_video.mp4 + bear-640x360-video.mp4 @@ -21,7 +21,7 @@ - output_audio.mp4 + bear-640x360-audio.mp4 diff --git a/packager/app/test/testdata/bear-640x360-av-cbcs-golden.mpd b/packager/app/test/testdata/bear-640x360-av-cbcs-golden.mpd index b2a8da16b4..180e0c3fc3 100644 --- a/packager/app/test/testdata/bear-640x360-av-cbcs-golden.mpd +++ b/packager/app/test/testdata/bear-640x360-av-cbcs-golden.mpd @@ -8,7 +8,7 @@ AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== - output_video.mp4 + bear-640x360-video.mp4 @@ -21,7 +21,7 @@ - output_audio.mp4 + bear-640x360-audio.mp4 diff --git a/packager/app/test/testdata/bear-640x360-av-cenc-ad_cues-golden.mpd b/packager/app/test/testdata/bear-640x360-av-cenc-ad_cues-golden.mpd index fd13d80881..2a0ee722f5 100644 --- a/packager/app/test/testdata/bear-640x360-av-cenc-ad_cues-golden.mpd +++ b/packager/app/test/testdata/bear-640x360-av-cenc-ad_cues-golden.mpd @@ -8,7 +8,7 @@ AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== - output_video.mp4 + bear-640x360-video.mp4 @@ -21,7 +21,7 @@ - output_audio.mp4 + bear-640x360-audio.mp4 @@ -35,7 +35,7 @@ AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== - output_video.mp4 + bear-640x360-video.mp4 @@ -48,7 +48,7 @@ - output_audio.mp4 + bear-640x360-audio.mp4 diff --git a/packager/app/test/testdata/bear-640x360-av-cenc-golden.mpd b/packager/app/test/testdata/bear-640x360-av-cenc-golden.mpd index 5f0b7c2d4c..510eb1fa6d 100644 --- a/packager/app/test/testdata/bear-640x360-av-cenc-golden.mpd +++ b/packager/app/test/testdata/bear-640x360-av-cenc-golden.mpd @@ -8,7 +8,7 @@ AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== - output_video.mp4 + bear-640x360-video.mp4 @@ -21,7 +21,7 @@ - output_audio.mp4 + bear-640x360-audio.mp4 diff --git a/packager/app/test/testdata/bear-640x360-av-cenc-no-clear-lead-golden.mpd b/packager/app/test/testdata/bear-640x360-av-cenc-no-clear-lead-golden.mpd index 2c332d628b..a5bb33e666 100644 --- a/packager/app/test/testdata/bear-640x360-av-cenc-no-clear-lead-golden.mpd +++ b/packager/app/test/testdata/bear-640x360-av-cenc-no-clear-lead-golden.mpd @@ -8,7 +8,7 @@ AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== - output_video.mp4 + bear-640x360-video.mp4 @@ -21,7 +21,7 @@ - output_audio.mp4 + bear-640x360-audio.mp4 diff --git a/packager/app/test/testdata/bear-640x360-av-cenc-no-pssh-golden.mpd b/packager/app/test/testdata/bear-640x360-av-cenc-no-pssh-golden.mpd index 8a8f5fe910..6a89b2b54a 100644 --- a/packager/app/test/testdata/bear-640x360-av-cenc-no-pssh-golden.mpd +++ b/packager/app/test/testdata/bear-640x360-av-cenc-no-pssh-golden.mpd @@ -8,7 +8,7 @@ AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== - output_video.mp4 + bear-640x360-video.mp4 @@ -21,7 +21,7 @@ - output_audio.mp4 + bear-640x360-audio.mp4 diff --git a/packager/app/test/testdata/bear-640x360-av-cenc-non-iop-golden.mpd b/packager/app/test/testdata/bear-640x360-av-cenc-non-iop-golden.mpd index ea6273a9a6..fb79b7275d 100644 --- a/packager/app/test/testdata/bear-640x360-av-cenc-non-iop-golden.mpd +++ b/packager/app/test/testdata/bear-640x360-av-cenc-non-iop-golden.mpd @@ -8,7 +8,7 @@ AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== - output_video.mp4 + bear-640x360-video.mp4 @@ -21,7 +21,7 @@ AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== - output_audio.mp4 + bear-640x360-audio.mp4 diff --git a/packager/app/test/testdata/bear-640x360-av-cens-golden.mpd b/packager/app/test/testdata/bear-640x360-av-cens-golden.mpd index fa83b269e1..71fbabb5c7 100644 --- a/packager/app/test/testdata/bear-640x360-av-cens-golden.mpd +++ b/packager/app/test/testdata/bear-640x360-av-cens-golden.mpd @@ -8,7 +8,7 @@ AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== - output_video.mp4 + bear-640x360-video.mp4 @@ -21,7 +21,7 @@ - output_audio.mp4 + bear-640x360-audio.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 441cd7a940..43116630d4 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 @@ -8,7 +8,7 @@ AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== - output_video.mp4 + bear-640x360-video.mp4 @@ -21,7 +21,7 @@ - output_video-trick_play_factor_1.mp4 + bear-640x360-video-trick_play_factor_1.mp4 @@ -34,7 +34,7 @@ - output_audio.mp4 + bear-640x360-audio.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 c33d3268d5..6ba43962ce 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 @@ -8,7 +8,7 @@ AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== - output_video.mp4 + bear-640x360-video.mp4 @@ -21,13 +21,13 @@ - output_video-trick_play_factor_2.mp4 + bear-640x360-video-trick_play_factor_2.mp4 - output_video-trick_play_factor_1.mp4 + bear-640x360-video-trick_play_factor_1.mp4 @@ -40,7 +40,7 @@ - output_audio.mp4 + bear-640x360-audio.mp4 diff --git a/packager/app/test/testdata/bear-640x360-hevc-cenc-golden.mpd b/packager/app/test/testdata/bear-640x360-hevc-cenc-golden.mpd index 09fc89ed78..181871f3f9 100644 --- a/packager/app/test/testdata/bear-640x360-hevc-cenc-golden.mpd +++ b/packager/app/test/testdata/bear-640x360-hevc-cenc-golden.mpd @@ -8,7 +8,7 @@ AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== - output_video.mp4 + bear-640x360-hevc-video.mp4 diff --git a/packager/app/test/testdata/bear-640x360-v-live-golden-init.mp4 b/packager/app/test/testdata/bear-640x360-v-live-golden-init.mp4 deleted file mode 100644 index b183dc5d1c..0000000000 Binary files a/packager/app/test/testdata/bear-640x360-v-live-golden-init.mp4 and /dev/null differ diff --git a/packager/app/test/testdata/bear-640x360-vp8-cenc-golden.mpd b/packager/app/test/testdata/bear-640x360-vp8-cenc-golden.mpd index 108e3c3a47..86accb25de 100644 --- a/packager/app/test/testdata/bear-640x360-vp8-cenc-golden.mpd +++ b/packager/app/test/testdata/bear-640x360-vp8-cenc-golden.mpd @@ -8,7 +8,7 @@ AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== - output_video.mp4 + bear-640x360-video.mp4 diff --git a/packager/app/test/testdata/bear-640x360-vp8-cenc-webm-golden.mpd b/packager/app/test/testdata/bear-640x360-vp8-cenc-webm-golden.mpd index 0354738a2d..9ba687e181 100644 --- a/packager/app/test/testdata/bear-640x360-vp8-cenc-webm-golden.mpd +++ b/packager/app/test/testdata/bear-640x360-vp8-cenc-webm-golden.mpd @@ -7,7 +7,7 @@ AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== - output_video.webm + bear-640x360-video.webm diff --git a/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/audio.m3u8 b/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/audio.m3u8 index 031fab01da..1c66069b9c 100644 --- a/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/audio.m3u8 +++ b/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/audio.m3u8 @@ -3,15 +3,15 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="output_audio.mp4",BYTERANGE="909@0" +#EXT-X-MAP:URI="bear-640x360-ec3-audio.mp4",BYTERANGE="909@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:1.010, #EXT-X-BYTERANGE:24460@977 -output_audio.mp4 +bear-640x360-ec3-audio.mp4 #EXTINF:0.975, #EXT-X-BYTERANGE:23899 -output_audio.mp4 +bear-640x360-ec3-audio.mp4 #EXTINF:0.766, #EXT-X-BYTERANGE:18811 -output_audio.mp4 +bear-640x360-ec3-audio.mp4 #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/output_audio.mp4 b/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-audio.mp4 similarity index 100% rename from packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/output_audio.mp4 rename to packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-audio.mp4 diff --git a/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/output_video.mp4 b/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-video.mp4 similarity index 100% rename from packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/output_video.mp4 rename to packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-video.mp4 diff --git a/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/video.m3u8 b/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/video.m3u8 index cdf5fa0ee4..9841601ae8 100644 --- a/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/video.m3u8 +++ b/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/video.m3u8 @@ -3,15 +3,15 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="output_video.mp4",BYTERANGE="1091@0" +#EXT-X-MAP:URI="bear-640x360-ec3-video.mp4",BYTERANGE="1091@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:1.001, #EXT-X-BYTERANGE:93805@1159 -output_video.mp4 +bear-640x360-ec3-video.mp4 #EXTINF:1.001, #EXT-X-BYTERANGE:122340 -output_video.mp4 +bear-640x360-ec3-video.mp4 #EXTINF:0.734, #EXT-X-BYTERANGE:80067 -output_video.mp4 +bear-640x360-ec3-video.mp4 #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/first-stream/output_0.mp4 b/packager/app/test/testdata/first-stream/bear-640x360-0.mp4 similarity index 100% rename from packager/app/test/testdata/first-stream/output_0.mp4 rename to packager/app/test/testdata/first-stream/bear-640x360-0.mp4 diff --git a/packager/app/test/testdata/first-stream/output.mpd b/packager/app/test/testdata/first-stream/output.mpd index c78e29d393..fb984b99b1 100644 --- a/packager/app/test/testdata/first-stream/output.mpd +++ b/packager/app/test/testdata/first-stream/output.mpd @@ -4,7 +4,7 @@ - output_0.mp4 + bear-640x360-0.mp4 diff --git a/packager/app/test/testdata/bear-640x360-a-live-golden-1.m4s b/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-audio-1.m4s similarity index 100% rename from packager/app/test/testdata/bear-640x360-a-live-golden-1.m4s rename to packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-audio-1.m4s diff --git a/packager/app/test/testdata/bear-640x360-a-live-golden-2.m4s b/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-audio-2.m4s similarity index 100% rename from packager/app/test/testdata/bear-640x360-a-live-golden-2.m4s rename to packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-audio-2.m4s diff --git a/packager/app/test/testdata/bear-640x360-a-live-golden-3.m4s b/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-audio-3.m4s similarity index 100% rename from packager/app/test/testdata/bear-640x360-a-live-golden-3.m4s rename to packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-audio-3.m4s diff --git a/packager/app/test/testdata/hls-segmented-webvtt/output_audio-init.mp4 b/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-audio-init.mp4 similarity index 100% rename from packager/app/test/testdata/hls-segmented-webvtt/output_audio-init.mp4 rename to packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-audio-init.mp4 diff --git a/packager/app/test/testdata/bear-640x360-v-live-golden-1.m4s b/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-video-1.m4s similarity index 100% rename from packager/app/test/testdata/bear-640x360-v-live-golden-1.m4s rename to packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-video-1.m4s diff --git a/packager/app/test/testdata/bear-640x360-v-live-golden-2.m4s b/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-video-2.m4s similarity index 100% rename from packager/app/test/testdata/bear-640x360-v-live-golden-2.m4s rename to packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-video-2.m4s diff --git a/packager/app/test/testdata/bear-640x360-v-live-golden-3.m4s b/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-video-3.m4s similarity index 100% rename from packager/app/test/testdata/bear-640x360-v-live-golden-3.m4s rename to packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-video-3.m4s diff --git a/packager/app/test/testdata/hls-segmented-webvtt/output_video-init.mp4 b/packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-video-init.mp4 similarity index 100% rename from packager/app/test/testdata/hls-segmented-webvtt/output_video-init.mp4 rename to packager/app/test/testdata/hls-segmented-webvtt/bear-640x360-video-init.mp4 diff --git a/packager/app/test/testdata/hls-segmented-webvtt/output_text-1.vtt b/packager/app/test/testdata/hls-segmented-webvtt/bear-subtitle-english-text-1.vtt similarity index 100% rename from packager/app/test/testdata/hls-segmented-webvtt/output_text-1.vtt rename to packager/app/test/testdata/hls-segmented-webvtt/bear-subtitle-english-text-1.vtt diff --git a/packager/app/test/testdata/hls-segmented-webvtt/output_text-2.vtt b/packager/app/test/testdata/hls-segmented-webvtt/bear-subtitle-english-text-2.vtt similarity index 100% rename from packager/app/test/testdata/hls-segmented-webvtt/output_text-2.vtt rename to packager/app/test/testdata/hls-segmented-webvtt/bear-subtitle-english-text-2.vtt diff --git a/packager/app/test/testdata/hls-segmented-webvtt/output_text-3.vtt b/packager/app/test/testdata/hls-segmented-webvtt/bear-subtitle-english-text-3.vtt similarity index 100% rename from packager/app/test/testdata/hls-segmented-webvtt/output_text-3.vtt rename to packager/app/test/testdata/hls-segmented-webvtt/bear-subtitle-english-text-3.vtt diff --git a/packager/app/test/testdata/hls-segmented-webvtt/output_text-4.vtt b/packager/app/test/testdata/hls-segmented-webvtt/bear-subtitle-english-text-4.vtt similarity index 100% rename from packager/app/test/testdata/hls-segmented-webvtt/output_text-4.vtt rename to packager/app/test/testdata/hls-segmented-webvtt/bear-subtitle-english-text-4.vtt diff --git a/packager/app/test/testdata/hls-segmented-webvtt/output_text-5.vtt b/packager/app/test/testdata/hls-segmented-webvtt/bear-subtitle-english-text-5.vtt similarity index 100% rename from packager/app/test/testdata/hls-segmented-webvtt/output_text-5.vtt rename to packager/app/test/testdata/hls-segmented-webvtt/bear-subtitle-english-text-5.vtt diff --git a/packager/app/test/testdata/hls-segmented-webvtt/stream_0.m3u8 b/packager/app/test/testdata/hls-segmented-webvtt/stream_0.m3u8 index f4414940e4..6ddb2b074a 100644 --- a/packager/app/test/testdata/hls-segmented-webvtt/stream_0.m3u8 +++ b/packager/app/test/testdata/hls-segmented-webvtt/stream_0.m3u8 @@ -4,13 +4,13 @@ #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD #EXTINF:1.000, -output_text-1.vtt +bear-subtitle-english-text-1.vtt #EXTINF:1.000, -output_text-2.vtt +bear-subtitle-english-text-2.vtt #EXTINF:1.000, -output_text-3.vtt +bear-subtitle-english-text-3.vtt #EXTINF:1.000, -output_text-4.vtt +bear-subtitle-english-text-4.vtt #EXTINF:1.000, -output_text-5.vtt +bear-subtitle-english-text-5.vtt #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/hls-segmented-webvtt/stream_1.m3u8 b/packager/app/test/testdata/hls-segmented-webvtt/stream_1.m3u8 index 7087e8f2b9..af241f9450 100644 --- a/packager/app/test/testdata/hls-segmented-webvtt/stream_1.m3u8 +++ b/packager/app/test/testdata/hls-segmented-webvtt/stream_1.m3u8 @@ -3,11 +3,11 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="output_audio-init.mp4" +#EXT-X-MAP:URI="bear-640x360-audio-init.mp4" #EXTINF:0.998, -output_audio-1.m4s +bear-640x360-audio-1.m4s #EXTINF:0.998, -output_audio-2.m4s +bear-640x360-audio-2.m4s #EXTINF:0.766, -output_audio-3.m4s +bear-640x360-audio-3.m4s #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/hls-segmented-webvtt/stream_2.m3u8 b/packager/app/test/testdata/hls-segmented-webvtt/stream_2.m3u8 index bd9bfc8a32..19e29dda02 100644 --- a/packager/app/test/testdata/hls-segmented-webvtt/stream_2.m3u8 +++ b/packager/app/test/testdata/hls-segmented-webvtt/stream_2.m3u8 @@ -3,11 +3,11 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="output_video-init.mp4" +#EXT-X-MAP:URI="bear-640x360-video-init.mp4" #EXTINF:1.001, -output_video-1.m4s +bear-640x360-video-1.m4s #EXTINF:1.001, -output_video-2.m4s +bear-640x360-video-2.m4s #EXTINF:0.734, -output_video-3.m4s +bear-640x360-video-3.m4s #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/audio.m3u8 b/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/audio.m3u8 index 7bf3defe68..71920f8ff1 100644 --- a/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/audio.m3u8 +++ b/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/audio.m3u8 @@ -3,16 +3,16 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="output_audio.mp4",BYTERANGE="967@0" +#EXT-X-MAP:URI="bear-640x360-audio.mp4",BYTERANGE="967@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:0.998, #EXT-X-BYTERANGE:16279@1035 -output_audio.mp4 +bear-640x360-audio.mp4 #EXTINF:0.998, #EXT-X-BYTERANGE:16674 -output_audio.mp4 +bear-640x360-audio.mp4 #EXT-X-PLACEMENT-OPPORTUNITY #EXTINF:0.766, #EXT-X-BYTERANGE:10632 -output_audio.mp4 +bear-640x360-audio.mp4 #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/output_audio.mp4 b/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/bear-640x360-audio.mp4 similarity index 100% rename from packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/output_audio.mp4 rename to packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/bear-640x360-audio.mp4 diff --git a/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/output_video.mp4 b/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/bear-640x360-video.mp4 similarity index 100% rename from packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/output_video.mp4 rename to packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/bear-640x360-video.mp4 diff --git a/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/video.m3u8 b/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/video.m3u8 index 99442c7fdd..50b7e9ddea 100644 --- a/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/video.m3u8 +++ b/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/video.m3u8 @@ -3,16 +3,16 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="output_video.mp4",BYTERANGE="1091@0" +#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="1091@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:1.001, #EXT-X-BYTERANGE:99313@1159 -output_video.mp4 +bear-640x360-video.mp4 #EXTINF:1.001, #EXT-X-BYTERANGE:122340 -output_video.mp4 +bear-640x360-video.mp4 #EXT-X-PLACEMENT-OPPORTUNITY #EXTINF:0.734, #EXT-X-BYTERANGE:80067 -output_video.mp4 +bear-640x360-video.mp4 #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/hls-single-segment-mp4-encrypted/audio.m3u8 b/packager/app/test/testdata/hls-single-segment-mp4-encrypted/audio.m3u8 index a1b9dcb25b..2359b185a5 100644 --- a/packager/app/test/testdata/hls-single-segment-mp4-encrypted/audio.m3u8 +++ b/packager/app/test/testdata/hls-single-segment-mp4-encrypted/audio.m3u8 @@ -3,15 +3,15 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="output_audio.mp4",BYTERANGE="967@0" +#EXT-X-MAP:URI="bear-640x360-audio.mp4",BYTERANGE="967@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:0.998, #EXT-X-BYTERANGE:16279@1035 -output_audio.mp4 +bear-640x360-audio.mp4 #EXTINF:0.998, #EXT-X-BYTERANGE:16674 -output_audio.mp4 +bear-640x360-audio.mp4 #EXTINF:0.766, #EXT-X-BYTERANGE:10632 -output_audio.mp4 +bear-640x360-audio.mp4 #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/hls-single-segment-mp4-encrypted/output_audio.mp4 b/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-audio.mp4 similarity index 100% rename from packager/app/test/testdata/hls-single-segment-mp4-encrypted/output_audio.mp4 rename to packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-audio.mp4 diff --git a/packager/app/test/testdata/hls-single-segment-mp4-encrypted/output_video.mp4 b/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-video.mp4 similarity index 100% rename from packager/app/test/testdata/hls-single-segment-mp4-encrypted/output_video.mp4 rename to packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-video.mp4 diff --git a/packager/app/test/testdata/hls-single-segment-mp4-encrypted/video.m3u8 b/packager/app/test/testdata/hls-single-segment-mp4-encrypted/video.m3u8 index 2cfe6ed71d..9e1b78afe7 100644 --- a/packager/app/test/testdata/hls-single-segment-mp4-encrypted/video.m3u8 +++ b/packager/app/test/testdata/hls-single-segment-mp4-encrypted/video.m3u8 @@ -3,15 +3,15 @@ ## Generated with https://github.com/google/shaka-packager version -- #EXT-X-TARGETDURATION:2 #EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="output_video.mp4",BYTERANGE="1091@0" +#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="1091@0" #EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" #EXTINF:1.001, #EXT-X-BYTERANGE:99313@1159 -output_video.mp4 +bear-640x360-video.mp4 #EXTINF:1.001, #EXT-X-BYTERANGE:122340 -output_video.mp4 +bear-640x360-video.mp4 #EXTINF:0.734, #EXT-X-BYTERANGE:80067 -output_video.mp4 +bear-640x360-video.mp4 #EXT-X-ENDLIST diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/output_audio-1.m4s b/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/bear-640x360-audio-1.m4s similarity index 100% rename from packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/output_audio-1.m4s rename to packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/bear-640x360-audio-1.m4s diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/output_audio-2.m4s b/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/bear-640x360-audio-2.m4s similarity index 100% rename from packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/output_audio-2.m4s rename to packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/bear-640x360-audio-2.m4s diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/output_audio-3.m4s b/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/bear-640x360-audio-3.m4s similarity index 100% rename from packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/output_audio-3.m4s rename to packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/bear-640x360-audio-3.m4s diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/output_audio-init.mp4 b/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/bear-640x360-audio-init.mp4 similarity index 100% rename from packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/output_audio-init.mp4 rename to packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/bear-640x360-audio-init.mp4 diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/output_video-1.m4s b/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/bear-640x360-video-1.m4s similarity index 100% rename from packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/output_video-1.m4s rename to packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/bear-640x360-video-1.m4s diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/output_video-2.m4s b/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/bear-640x360-video-2.m4s similarity index 100% rename from packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/output_video-2.m4s rename to packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/bear-640x360-video-2.m4s diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/output_video-3.m4s b/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/bear-640x360-video-3.m4s similarity index 100% rename from packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/output_video-3.m4s rename to packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/bear-640x360-video-3.m4s diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/output_video-init.mp4 b/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/bear-640x360-video-init.mp4 similarity index 100% rename from packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/output_video-init.mp4 rename to packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/bear-640x360-video-init.mp4 diff --git a/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/output.mpd b/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/output.mpd index b7633f2567..59ad90165b 100644 --- a/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/output.mpd +++ b/packager/app/test/testdata/live-profile-and-encryption-and-non-dash-if-iop/output.mpd @@ -8,7 +8,7 @@ AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== - + @@ -23,7 +23,7 @@ AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== - + diff --git a/packager/app/test/testdata/live-profile-and-encryption/output_audio-1.m4s b/packager/app/test/testdata/live-profile-and-encryption/bear-640x360-audio-1.m4s similarity index 100% rename from packager/app/test/testdata/live-profile-and-encryption/output_audio-1.m4s rename to packager/app/test/testdata/live-profile-and-encryption/bear-640x360-audio-1.m4s diff --git a/packager/app/test/testdata/live-profile-and-encryption/output_audio-2.m4s b/packager/app/test/testdata/live-profile-and-encryption/bear-640x360-audio-2.m4s similarity index 100% rename from packager/app/test/testdata/live-profile-and-encryption/output_audio-2.m4s rename to packager/app/test/testdata/live-profile-and-encryption/bear-640x360-audio-2.m4s diff --git a/packager/app/test/testdata/live-profile-and-encryption/output_audio-3.m4s b/packager/app/test/testdata/live-profile-and-encryption/bear-640x360-audio-3.m4s similarity index 100% rename from packager/app/test/testdata/live-profile-and-encryption/output_audio-3.m4s rename to packager/app/test/testdata/live-profile-and-encryption/bear-640x360-audio-3.m4s diff --git a/packager/app/test/testdata/live-profile-and-encryption/output_audio-init.mp4 b/packager/app/test/testdata/live-profile-and-encryption/bear-640x360-audio-init.mp4 similarity index 100% rename from packager/app/test/testdata/live-profile-and-encryption/output_audio-init.mp4 rename to packager/app/test/testdata/live-profile-and-encryption/bear-640x360-audio-init.mp4 diff --git a/packager/app/test/testdata/live-profile-and-encryption/output_video-1.m4s b/packager/app/test/testdata/live-profile-and-encryption/bear-640x360-video-1.m4s similarity index 100% rename from packager/app/test/testdata/live-profile-and-encryption/output_video-1.m4s rename to packager/app/test/testdata/live-profile-and-encryption/bear-640x360-video-1.m4s diff --git a/packager/app/test/testdata/live-profile-and-encryption/output_video-2.m4s b/packager/app/test/testdata/live-profile-and-encryption/bear-640x360-video-2.m4s similarity index 100% rename from packager/app/test/testdata/live-profile-and-encryption/output_video-2.m4s rename to packager/app/test/testdata/live-profile-and-encryption/bear-640x360-video-2.m4s diff --git a/packager/app/test/testdata/live-profile-and-encryption/output_video-3.m4s b/packager/app/test/testdata/live-profile-and-encryption/bear-640x360-video-3.m4s similarity index 100% rename from packager/app/test/testdata/live-profile-and-encryption/output_video-3.m4s rename to packager/app/test/testdata/live-profile-and-encryption/bear-640x360-video-3.m4s diff --git a/packager/app/test/testdata/live-profile-and-encryption/output_video-init.mp4 b/packager/app/test/testdata/live-profile-and-encryption/bear-640x360-video-init.mp4 similarity index 100% rename from packager/app/test/testdata/live-profile-and-encryption/output_video-init.mp4 rename to packager/app/test/testdata/live-profile-and-encryption/bear-640x360-video-init.mp4 diff --git a/packager/app/test/testdata/live-profile-and-encryption/output.mpd b/packager/app/test/testdata/live-profile-and-encryption/output.mpd index f0437b886e..89df6bf845 100644 --- a/packager/app/test/testdata/live-profile-and-encryption/output.mpd +++ b/packager/app/test/testdata/live-profile-and-encryption/output.mpd @@ -8,7 +8,7 @@ AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== - + @@ -23,7 +23,7 @@ - + diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/output_audio-1.m4s b/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/bear-640x360-audio-1.m4s similarity index 100% rename from packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/output_audio-1.m4s rename to packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/bear-640x360-audio-1.m4s diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/output_audio-2.m4s b/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/bear-640x360-audio-2.m4s similarity index 100% rename from packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/output_audio-2.m4s rename to packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/bear-640x360-audio-2.m4s diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/output_audio-3.m4s b/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/bear-640x360-audio-3.m4s similarity index 100% rename from packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/output_audio-3.m4s rename to packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/bear-640x360-audio-3.m4s diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/output_audio-init.mp4 b/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/bear-640x360-audio-init.mp4 similarity index 100% rename from packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/output_audio-init.mp4 rename to packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/bear-640x360-audio-init.mp4 diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/output_video-1.m4s b/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/bear-640x360-video-1.m4s similarity index 100% rename from packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/output_video-1.m4s rename to packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/bear-640x360-video-1.m4s diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/output_video-2.m4s b/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/bear-640x360-video-2.m4s similarity index 100% rename from packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/output_video-2.m4s rename to packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/bear-640x360-video-2.m4s diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/output_video-3.m4s b/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/bear-640x360-video-3.m4s similarity index 100% rename from packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/output_video-3.m4s rename to packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/bear-640x360-video-3.m4s diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/output_video-init.mp4 b/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/bear-640x360-video-init.mp4 similarity index 100% rename from packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/output_video-init.mp4 rename to packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/bear-640x360-video-init.mp4 diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/output.mpd b/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/output.mpd index 3e6c3c72a4..d9cc2265dc 100644 --- a/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/output.mpd +++ b/packager/app/test/testdata/live-profile-and-key-rotation-and-no-pssh-in-stream/output.mpd @@ -6,7 +6,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/output_audio-1.m4s b/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/bear-640x360-audio-1.m4s similarity index 100% rename from packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/output_audio-1.m4s rename to packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/bear-640x360-audio-1.m4s diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/output_audio-2.m4s b/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/bear-640x360-audio-2.m4s similarity index 100% rename from packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/output_audio-2.m4s rename to packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/bear-640x360-audio-2.m4s diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/output_audio-3.m4s b/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/bear-640x360-audio-3.m4s similarity index 100% rename from packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/output_audio-3.m4s rename to packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/bear-640x360-audio-3.m4s diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/output_audio-init.mp4 b/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/bear-640x360-audio-init.mp4 similarity index 100% rename from packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/output_audio-init.mp4 rename to packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/bear-640x360-audio-init.mp4 diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/output_video-1.m4s b/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/bear-640x360-video-1.m4s similarity index 100% rename from packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/output_video-1.m4s rename to packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/bear-640x360-video-1.m4s diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/output_video-2.m4s b/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/bear-640x360-video-2.m4s similarity index 100% rename from packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/output_video-2.m4s rename to packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/bear-640x360-video-2.m4s diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/output_video-3.m4s b/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/bear-640x360-video-3.m4s similarity index 100% rename from packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/output_video-3.m4s rename to packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/bear-640x360-video-3.m4s diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/output_video-init.mp4 b/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/bear-640x360-video-init.mp4 similarity index 100% rename from packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/output_video-init.mp4 rename to packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/bear-640x360-video-init.mp4 diff --git a/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/output.mpd b/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/output.mpd index 7713fefdc2..ce2c748c79 100644 --- a/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/output.mpd +++ b/packager/app/test/testdata/live-profile-and-key-rotation-and-non-dash-if-iop/output.mpd @@ -6,7 +6,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/packager/app/test/testdata/live-profile-and-key-rotation/output_audio-1.m4s b/packager/app/test/testdata/live-profile-and-key-rotation/bear-640x360-audio-1.m4s similarity index 100% rename from packager/app/test/testdata/live-profile-and-key-rotation/output_audio-1.m4s rename to packager/app/test/testdata/live-profile-and-key-rotation/bear-640x360-audio-1.m4s diff --git a/packager/app/test/testdata/live-profile-and-key-rotation/output_audio-2.m4s b/packager/app/test/testdata/live-profile-and-key-rotation/bear-640x360-audio-2.m4s similarity index 100% rename from packager/app/test/testdata/live-profile-and-key-rotation/output_audio-2.m4s rename to packager/app/test/testdata/live-profile-and-key-rotation/bear-640x360-audio-2.m4s diff --git a/packager/app/test/testdata/live-profile-and-key-rotation/output_audio-3.m4s b/packager/app/test/testdata/live-profile-and-key-rotation/bear-640x360-audio-3.m4s similarity index 100% rename from packager/app/test/testdata/live-profile-and-key-rotation/output_audio-3.m4s rename to packager/app/test/testdata/live-profile-and-key-rotation/bear-640x360-audio-3.m4s diff --git a/packager/app/test/testdata/live-profile-and-key-rotation/output_audio-init.mp4 b/packager/app/test/testdata/live-profile-and-key-rotation/bear-640x360-audio-init.mp4 similarity index 100% rename from packager/app/test/testdata/live-profile-and-key-rotation/output_audio-init.mp4 rename to packager/app/test/testdata/live-profile-and-key-rotation/bear-640x360-audio-init.mp4 diff --git a/packager/app/test/testdata/live-profile-and-key-rotation/output_video-1.m4s b/packager/app/test/testdata/live-profile-and-key-rotation/bear-640x360-video-1.m4s similarity index 100% rename from packager/app/test/testdata/live-profile-and-key-rotation/output_video-1.m4s rename to packager/app/test/testdata/live-profile-and-key-rotation/bear-640x360-video-1.m4s diff --git a/packager/app/test/testdata/live-profile-and-key-rotation/output_video-2.m4s b/packager/app/test/testdata/live-profile-and-key-rotation/bear-640x360-video-2.m4s similarity index 100% rename from packager/app/test/testdata/live-profile-and-key-rotation/output_video-2.m4s rename to packager/app/test/testdata/live-profile-and-key-rotation/bear-640x360-video-2.m4s diff --git a/packager/app/test/testdata/live-profile-and-key-rotation/output_video-3.m4s b/packager/app/test/testdata/live-profile-and-key-rotation/bear-640x360-video-3.m4s similarity index 100% rename from packager/app/test/testdata/live-profile-and-key-rotation/output_video-3.m4s rename to packager/app/test/testdata/live-profile-and-key-rotation/bear-640x360-video-3.m4s diff --git a/packager/app/test/testdata/live-profile-and-key-rotation/output_video-init.mp4 b/packager/app/test/testdata/live-profile-and-key-rotation/bear-640x360-video-init.mp4 similarity index 100% rename from packager/app/test/testdata/live-profile-and-key-rotation/output_video-init.mp4 rename to packager/app/test/testdata/live-profile-and-key-rotation/bear-640x360-video-init.mp4 diff --git a/packager/app/test/testdata/live-profile-and-key-rotation/output.mpd b/packager/app/test/testdata/live-profile-and-key-rotation/output.mpd index da04efa872..bbbf958ff0 100644 --- a/packager/app/test/testdata/live-profile-and-key-rotation/output.mpd +++ b/packager/app/test/testdata/live-profile-and-key-rotation/output.mpd @@ -6,7 +6,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/packager/app/test/testdata/hls-segmented-webvtt/output_audio-1.m4s b/packager/app/test/testdata/live-profile/bear-640x360-audio-1.m4s similarity index 100% rename from packager/app/test/testdata/hls-segmented-webvtt/output_audio-1.m4s rename to packager/app/test/testdata/live-profile/bear-640x360-audio-1.m4s diff --git a/packager/app/test/testdata/hls-segmented-webvtt/output_audio-2.m4s b/packager/app/test/testdata/live-profile/bear-640x360-audio-2.m4s similarity index 100% rename from packager/app/test/testdata/hls-segmented-webvtt/output_audio-2.m4s rename to packager/app/test/testdata/live-profile/bear-640x360-audio-2.m4s diff --git a/packager/app/test/testdata/hls-segmented-webvtt/output_audio-3.m4s b/packager/app/test/testdata/live-profile/bear-640x360-audio-3.m4s similarity index 100% rename from packager/app/test/testdata/hls-segmented-webvtt/output_audio-3.m4s rename to packager/app/test/testdata/live-profile/bear-640x360-audio-3.m4s diff --git a/packager/app/test/testdata/live-profile/output_audio-init.mp4 b/packager/app/test/testdata/live-profile/bear-640x360-audio-init.mp4 similarity index 100% rename from packager/app/test/testdata/live-profile/output_audio-init.mp4 rename to packager/app/test/testdata/live-profile/bear-640x360-audio-init.mp4 diff --git a/packager/app/test/testdata/hls-segmented-webvtt/output_video-1.m4s b/packager/app/test/testdata/live-profile/bear-640x360-video-1.m4s similarity index 100% rename from packager/app/test/testdata/hls-segmented-webvtt/output_video-1.m4s rename to packager/app/test/testdata/live-profile/bear-640x360-video-1.m4s diff --git a/packager/app/test/testdata/hls-segmented-webvtt/output_video-2.m4s b/packager/app/test/testdata/live-profile/bear-640x360-video-2.m4s similarity index 100% rename from packager/app/test/testdata/hls-segmented-webvtt/output_video-2.m4s rename to packager/app/test/testdata/live-profile/bear-640x360-video-2.m4s diff --git a/packager/app/test/testdata/hls-segmented-webvtt/output_video-3.m4s b/packager/app/test/testdata/live-profile/bear-640x360-video-3.m4s similarity index 100% rename from packager/app/test/testdata/hls-segmented-webvtt/output_video-3.m4s rename to packager/app/test/testdata/live-profile/bear-640x360-video-3.m4s diff --git a/packager/app/test/testdata/live-profile/output_video-init.mp4 b/packager/app/test/testdata/live-profile/bear-640x360-video-init.mp4 similarity index 100% rename from packager/app/test/testdata/live-profile/output_video-init.mp4 rename to packager/app/test/testdata/live-profile/bear-640x360-video-init.mp4 diff --git a/packager/app/test/testdata/live-profile/output.mpd b/packager/app/test/testdata/live-profile/output.mpd index 91519c4622..8c842e9c8c 100644 --- a/packager/app/test/testdata/live-profile/output.mpd +++ b/packager/app/test/testdata/live-profile/output.mpd @@ -4,7 +4,7 @@ - + @@ -15,7 +15,7 @@ - + diff --git a/packager/app/test/testdata/live-profile/output_audio-1.m4s b/packager/app/test/testdata/live-static-profile-and-ad-cues/bear-640x360-audio-1.m4s similarity index 100% rename from packager/app/test/testdata/live-profile/output_audio-1.m4s rename to packager/app/test/testdata/live-static-profile-and-ad-cues/bear-640x360-audio-1.m4s diff --git a/packager/app/test/testdata/live-profile/output_audio-2.m4s b/packager/app/test/testdata/live-static-profile-and-ad-cues/bear-640x360-audio-2.m4s similarity index 100% rename from packager/app/test/testdata/live-profile/output_audio-2.m4s rename to packager/app/test/testdata/live-static-profile-and-ad-cues/bear-640x360-audio-2.m4s diff --git a/packager/app/test/testdata/live-profile/output_audio-3.m4s b/packager/app/test/testdata/live-static-profile-and-ad-cues/bear-640x360-audio-3.m4s similarity index 100% rename from packager/app/test/testdata/live-profile/output_audio-3.m4s rename to packager/app/test/testdata/live-static-profile-and-ad-cues/bear-640x360-audio-3.m4s diff --git a/packager/app/test/testdata/live-static-profile-and-ad-cues/output_audio-init.mp4 b/packager/app/test/testdata/live-static-profile-and-ad-cues/bear-640x360-audio-init.mp4 similarity index 100% rename from packager/app/test/testdata/live-static-profile-and-ad-cues/output_audio-init.mp4 rename to packager/app/test/testdata/live-static-profile-and-ad-cues/bear-640x360-audio-init.mp4 diff --git a/packager/app/test/testdata/live-profile/output_video-1.m4s b/packager/app/test/testdata/live-static-profile-and-ad-cues/bear-640x360-video-1.m4s similarity index 100% rename from packager/app/test/testdata/live-profile/output_video-1.m4s rename to packager/app/test/testdata/live-static-profile-and-ad-cues/bear-640x360-video-1.m4s diff --git a/packager/app/test/testdata/live-profile/output_video-2.m4s b/packager/app/test/testdata/live-static-profile-and-ad-cues/bear-640x360-video-2.m4s similarity index 100% rename from packager/app/test/testdata/live-profile/output_video-2.m4s rename to packager/app/test/testdata/live-static-profile-and-ad-cues/bear-640x360-video-2.m4s diff --git a/packager/app/test/testdata/live-profile/output_video-3.m4s b/packager/app/test/testdata/live-static-profile-and-ad-cues/bear-640x360-video-3.m4s similarity index 100% rename from packager/app/test/testdata/live-profile/output_video-3.m4s rename to packager/app/test/testdata/live-static-profile-and-ad-cues/bear-640x360-video-3.m4s diff --git a/packager/app/test/testdata/live-static-profile-and-ad-cues/output_video-init.mp4 b/packager/app/test/testdata/live-static-profile-and-ad-cues/bear-640x360-video-init.mp4 similarity index 100% rename from packager/app/test/testdata/live-static-profile-and-ad-cues/output_video-init.mp4 rename to packager/app/test/testdata/live-static-profile-and-ad-cues/bear-640x360-video-init.mp4 diff --git a/packager/app/test/testdata/live-static-profile-and-ad-cues/output.mpd b/packager/app/test/testdata/live-static-profile-and-ad-cues/output.mpd index 9d299d7fa4..6399903550 100644 --- a/packager/app/test/testdata/live-static-profile-and-ad-cues/output.mpd +++ b/packager/app/test/testdata/live-static-profile-and-ad-cues/output.mpd @@ -4,7 +4,7 @@ - + @@ -14,7 +14,7 @@ - + @@ -26,7 +26,7 @@ - + @@ -35,7 +35,7 @@ - + diff --git a/packager/app/test/testdata/live-static-profile-and-ad-cues/output_audio-1.m4s b/packager/app/test/testdata/live-static-profile/bear-640x360-audio-1.m4s similarity index 100% rename from packager/app/test/testdata/live-static-profile-and-ad-cues/output_audio-1.m4s rename to packager/app/test/testdata/live-static-profile/bear-640x360-audio-1.m4s diff --git a/packager/app/test/testdata/live-static-profile-and-ad-cues/output_audio-2.m4s b/packager/app/test/testdata/live-static-profile/bear-640x360-audio-2.m4s similarity index 100% rename from packager/app/test/testdata/live-static-profile-and-ad-cues/output_audio-2.m4s rename to packager/app/test/testdata/live-static-profile/bear-640x360-audio-2.m4s diff --git a/packager/app/test/testdata/live-static-profile-and-ad-cues/output_audio-3.m4s b/packager/app/test/testdata/live-static-profile/bear-640x360-audio-3.m4s similarity index 100% rename from packager/app/test/testdata/live-static-profile-and-ad-cues/output_audio-3.m4s rename to packager/app/test/testdata/live-static-profile/bear-640x360-audio-3.m4s diff --git a/packager/app/test/testdata/live-static-profile/output_audio-init.mp4 b/packager/app/test/testdata/live-static-profile/bear-640x360-audio-init.mp4 similarity index 100% rename from packager/app/test/testdata/live-static-profile/output_audio-init.mp4 rename to packager/app/test/testdata/live-static-profile/bear-640x360-audio-init.mp4 diff --git a/packager/app/test/testdata/live-static-profile-and-ad-cues/output_video-1.m4s b/packager/app/test/testdata/live-static-profile/bear-640x360-video-1.m4s similarity index 100% rename from packager/app/test/testdata/live-static-profile-and-ad-cues/output_video-1.m4s rename to packager/app/test/testdata/live-static-profile/bear-640x360-video-1.m4s diff --git a/packager/app/test/testdata/live-static-profile-and-ad-cues/output_video-2.m4s b/packager/app/test/testdata/live-static-profile/bear-640x360-video-2.m4s similarity index 100% rename from packager/app/test/testdata/live-static-profile-and-ad-cues/output_video-2.m4s rename to packager/app/test/testdata/live-static-profile/bear-640x360-video-2.m4s diff --git a/packager/app/test/testdata/live-static-profile-and-ad-cues/output_video-3.m4s b/packager/app/test/testdata/live-static-profile/bear-640x360-video-3.m4s similarity index 100% rename from packager/app/test/testdata/live-static-profile-and-ad-cues/output_video-3.m4s rename to packager/app/test/testdata/live-static-profile/bear-640x360-video-3.m4s diff --git a/packager/app/test/testdata/live-static-profile/output_video-init.mp4 b/packager/app/test/testdata/live-static-profile/bear-640x360-video-init.mp4 similarity index 100% rename from packager/app/test/testdata/live-static-profile/output_video-init.mp4 rename to packager/app/test/testdata/live-static-profile/bear-640x360-video-init.mp4 diff --git a/packager/app/test/testdata/live-static-profile/output.mpd b/packager/app/test/testdata/live-static-profile/output.mpd index 53e77e5258..5afc2e7a38 100644 --- a/packager/app/test/testdata/live-static-profile/output.mpd +++ b/packager/app/test/testdata/live-static-profile/output.mpd @@ -4,7 +4,7 @@ - + @@ -15,7 +15,7 @@ - + diff --git a/packager/app/test/testdata/live-static-profile/output_audio-1.m4s b/packager/app/test/testdata/live-static-profile/output_audio-1.m4s deleted file mode 100644 index f37ed8a13c..0000000000 Binary files a/packager/app/test/testdata/live-static-profile/output_audio-1.m4s and /dev/null differ diff --git a/packager/app/test/testdata/live-static-profile/output_audio-2.m4s b/packager/app/test/testdata/live-static-profile/output_audio-2.m4s deleted file mode 100644 index bf0257dff3..0000000000 Binary files a/packager/app/test/testdata/live-static-profile/output_audio-2.m4s and /dev/null differ diff --git a/packager/app/test/testdata/live-static-profile/output_audio-3.m4s b/packager/app/test/testdata/live-static-profile/output_audio-3.m4s deleted file mode 100644 index 4efd91c5dd..0000000000 Binary files a/packager/app/test/testdata/live-static-profile/output_audio-3.m4s and /dev/null differ diff --git a/packager/app/test/testdata/live-static-profile/output_video-1.m4s b/packager/app/test/testdata/live-static-profile/output_video-1.m4s deleted file mode 100644 index e8a21a613c..0000000000 Binary files a/packager/app/test/testdata/live-static-profile/output_video-1.m4s and /dev/null differ diff --git a/packager/app/test/testdata/live-static-profile/output_video-2.m4s b/packager/app/test/testdata/live-static-profile/output_video-2.m4s deleted file mode 100644 index 311f93260e..0000000000 Binary files a/packager/app/test/testdata/live-static-profile/output_video-2.m4s and /dev/null differ diff --git a/packager/app/test/testdata/live-static-profile/output_video-3.m4s b/packager/app/test/testdata/live-static-profile/output_video-3.m4s deleted file mode 100644 index 71e371e17a..0000000000 Binary files a/packager/app/test/testdata/live-static-profile/output_video-3.m4s and /dev/null differ diff --git a/packager/app/test/testdata/text/output.mpd b/packager/app/test/testdata/text/output.mpd index 4cf05f3613..4ca04f3252 100644 --- a/packager/app/test/testdata/text/output.mpd +++ b/packager/app/test/testdata/text/output.mpd @@ -4,7 +4,7 @@ - output_text.vtt + subtitle-english-text.vtt diff --git a/packager/app/test/testdata/text/output_text.vtt b/packager/app/test/testdata/text/subtitle-english-text.vtt similarity index 100% rename from packager/app/test/testdata/text/output_text.vtt rename to packager/app/test/testdata/text/subtitle-english-text.vtt diff --git a/packager/app/test/testdata/video-audio-text/output_audio.mp4 b/packager/app/test/testdata/video-audio-text/bear-640x360-audio.mp4 similarity index 100% rename from packager/app/test/testdata/video-audio-text/output_audio.mp4 rename to packager/app/test/testdata/video-audio-text/bear-640x360-audio.mp4 diff --git a/packager/app/test/testdata/video-audio-text/output_video.mp4 b/packager/app/test/testdata/video-audio-text/bear-640x360-video.mp4 similarity index 100% rename from packager/app/test/testdata/video-audio-text/output_video.mp4 rename to packager/app/test/testdata/video-audio-text/bear-640x360-video.mp4 diff --git a/packager/app/test/testdata/video-audio-text/output.mpd b/packager/app/test/testdata/video-audio-text/output.mpd index 0be7c14538..5100875ffd 100644 --- a/packager/app/test/testdata/video-audio-text/output.mpd +++ b/packager/app/test/testdata/video-audio-text/output.mpd @@ -4,12 +4,12 @@ - output_text.vtt + subtitle-english-text.vtt - output_video.mp4 + bear-640x360-video.mp4 @@ -18,7 +18,7 @@ - output_audio.mp4 + bear-640x360-audio.mp4 diff --git a/packager/app/test/testdata/video-audio-text/output_text.vtt b/packager/app/test/testdata/video-audio-text/subtitle-english-text.vtt similarity index 100% rename from packager/app/test/testdata/video-audio-text/output_text.vtt rename to packager/app/test/testdata/video-audio-text/subtitle-english-text.vtt diff --git a/packager/app/test/testdata/vorbis-webm/output_audio.webm b/packager/app/test/testdata/vorbis-webm/bear-320x240-audio-only-audio.webm similarity index 100% rename from packager/app/test/testdata/vorbis-webm/output_audio.webm rename to packager/app/test/testdata/vorbis-webm/bear-320x240-audio-only-audio.webm diff --git a/packager/app/test/testdata/vorbis-webm/output.mpd b/packager/app/test/testdata/vorbis-webm/output.mpd index 8f8784be96..94dbd388f8 100644 --- a/packager/app/test/testdata/vorbis-webm/output.mpd +++ b/packager/app/test/testdata/vorbis-webm/output.mpd @@ -5,7 +5,7 @@ - output_audio.webm + bear-320x240-audio-only-audio.webm diff --git a/packager/app/test/testdata/vp8-webm/output_video.webm b/packager/app/test/testdata/vp8-webm/bear-640x360-video.webm similarity index 100% rename from packager/app/test/testdata/vp8-webm/output_video.webm rename to packager/app/test/testdata/vp8-webm/bear-640x360-video.webm diff --git a/packager/app/test/testdata/vp8-webm/output.mpd b/packager/app/test/testdata/vp8-webm/output.mpd index f177a945ff..720151f188 100644 --- a/packager/app/test/testdata/vp8-webm/output.mpd +++ b/packager/app/test/testdata/vp8-webm/output.mpd @@ -4,7 +4,7 @@ - output_video.webm + bear-640x360-video.webm diff --git a/packager/app/test/testdata/vp9-webm-with-blockgroup/output_video.webm b/packager/app/test/testdata/vp9-webm-with-blockgroup/bear-vp9-blockgroup-video.webm similarity index 100% rename from packager/app/test/testdata/vp9-webm-with-blockgroup/output_video.webm rename to packager/app/test/testdata/vp9-webm-with-blockgroup/bear-vp9-blockgroup-video.webm diff --git a/packager/app/test/testdata/vp9-webm-with-blockgroup/output.mpd b/packager/app/test/testdata/vp9-webm-with-blockgroup/output.mpd index 6ce6b64055..5dffbdf421 100644 --- a/packager/app/test/testdata/vp9-webm-with-blockgroup/output.mpd +++ b/packager/app/test/testdata/vp9-webm-with-blockgroup/output.mpd @@ -4,7 +4,7 @@ - output_video.webm + bear-vp9-blockgroup-video.webm diff --git a/packager/app/test/testdata/vp9-webm/output_audio.webm b/packager/app/test/testdata/vp9-webm/bear-320x240-vp9-opus-audio.webm similarity index 100% rename from packager/app/test/testdata/vp9-webm/output_audio.webm rename to packager/app/test/testdata/vp9-webm/bear-320x240-vp9-opus-audio.webm diff --git a/packager/app/test/testdata/vp9-webm/output_video.webm b/packager/app/test/testdata/vp9-webm/bear-320x240-vp9-opus-video.webm similarity index 100% rename from packager/app/test/testdata/vp9-webm/output_video.webm rename to packager/app/test/testdata/vp9-webm/bear-320x240-vp9-opus-video.webm diff --git a/packager/app/test/testdata/vp9-webm/output.mpd b/packager/app/test/testdata/vp9-webm/output.mpd index 7cf286a043..da04011978 100644 --- a/packager/app/test/testdata/vp9-webm/output.mpd +++ b/packager/app/test/testdata/vp9-webm/output.mpd @@ -5,7 +5,7 @@ - output_audio.webm + bear-320x240-vp9-opus-audio.webm @@ -13,7 +13,7 @@ - output_video.webm + bear-320x240-vp9-opus-video.webm diff --git a/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/output_0.mp4 b/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/bear-multi-configs-0.mp4 similarity index 100% rename from packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/output_0.mp4 rename to packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/bear-multi-configs-0.mp4 diff --git a/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/output_1.mp4 b/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/bear-multi-configs-1.mp4 similarity index 100% rename from packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/output_1.mp4 rename to packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/bear-multi-configs-1.mp4 diff --git a/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/output_2.mp4 b/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/bear-multi-configs-2.mp4 similarity index 100% rename from packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/output_2.mp4 rename to packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/bear-multi-configs-2.mp4 diff --git a/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/output_3.mp4 b/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/bear-multi-configs-3.mp4 similarity index 100% rename from packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/output_3.mp4 rename to packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/bear-multi-configs-3.mp4 diff --git a/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/output.mpd b/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/output.mpd index 34da6e83fc..ab0e67668f 100644 --- a/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/output.mpd +++ b/packager/app/test/testdata/wvm-input-without-stripping-parameters-set-nalus/output.mpd @@ -4,13 +4,13 @@ - output_0.mp4 + bear-multi-configs-0.mp4 - output_2.mp4 + bear-multi-configs-2.mp4 @@ -19,14 +19,14 @@ - output_1.mp4 + bear-multi-configs-1.mp4 - output_3.mp4 + bear-multi-configs-3.mp4 diff --git a/packager/app/test/testdata/wvm-input/output_0.mp4 b/packager/app/test/testdata/wvm-input/bear-multi-configs-0.mp4 similarity index 100% rename from packager/app/test/testdata/wvm-input/output_0.mp4 rename to packager/app/test/testdata/wvm-input/bear-multi-configs-0.mp4 diff --git a/packager/app/test/testdata/wvm-input/output_1.mp4 b/packager/app/test/testdata/wvm-input/bear-multi-configs-1.mp4 similarity index 100% rename from packager/app/test/testdata/wvm-input/output_1.mp4 rename to packager/app/test/testdata/wvm-input/bear-multi-configs-1.mp4 diff --git a/packager/app/test/testdata/wvm-input/output_2.mp4 b/packager/app/test/testdata/wvm-input/bear-multi-configs-2.mp4 similarity index 100% rename from packager/app/test/testdata/wvm-input/output_2.mp4 rename to packager/app/test/testdata/wvm-input/bear-multi-configs-2.mp4 diff --git a/packager/app/test/testdata/wvm-input/output_3.mp4 b/packager/app/test/testdata/wvm-input/bear-multi-configs-3.mp4 similarity index 100% rename from packager/app/test/testdata/wvm-input/output_3.mp4 rename to packager/app/test/testdata/wvm-input/bear-multi-configs-3.mp4 diff --git a/packager/app/test/testdata/wvm-input/output.mpd b/packager/app/test/testdata/wvm-input/output.mpd index e14c797b8e..f7e7772279 100644 --- a/packager/app/test/testdata/wvm-input/output.mpd +++ b/packager/app/test/testdata/wvm-input/output.mpd @@ -4,13 +4,13 @@ - output_0.mp4 + bear-multi-configs-0.mp4 - output_2.mp4 + bear-multi-configs-2.mp4 @@ -19,14 +19,14 @@ - output_1.mp4 + bear-multi-configs-1.mp4 - output_3.mp4 + bear-multi-configs-3.mp4