diff --git a/include/packager/hls_params.h b/include/packager/hls_params.h index 268b37eac5b..c91695f9ece 100644 --- a/include/packager/hls_params.h +++ b/include/packager/hls_params.h @@ -75,6 +75,8 @@ struct HlsParams { /// Add EXT-X-PROGRAM-DATE-TIME tag to the playlist. The date time is derived /// from the current wall clock. bool add_program_date_time = false; + /// Don't map codecs to preferred codec value. + bool strict_codecs_signaling = false; }; } // namespace shaka diff --git a/packager/app/hls_flags.cc b/packager/app/hls_flags.cc index 41ca8422712..f0e68da1246 100644 --- a/packager/app/hls_flags.cc +++ b/packager/app/hls_flags.cc @@ -55,4 +55,11 @@ ABSL_FLAG(bool, add_program_date_time, false, "Add EXT-X-PROGRAM-DATE-TIME tag to the playlist. The date time is " - "derived from the current wall clock time."); \ No newline at end of file + "derived from the current wall clock time."); +ABSL_FLAG(bool, + strict_codecs_signaling, + false, + "Don't map codecs to a preferred codec value, but strictly " + "preserve the fourcc in the media. This may cause playback " + "issues on some Apple devices, but strictly complies with the " + "HLS specification."); diff --git a/packager/app/hls_flags.h b/packager/app/hls_flags.h index ee263ee9b3c..efb7f5f522d 100644 --- a/packager/app/hls_flags.h +++ b/packager/app/hls_flags.h @@ -18,5 +18,6 @@ ABSL_DECLARE_FLAG(int32_t, hls_media_sequence_number); ABSL_DECLARE_FLAG(std::optional, hls_start_time_offset); ABSL_DECLARE_FLAG(bool, create_session_keys); ABSL_DECLARE_FLAG(bool, add_program_date_time); +ABSL_DECLARE_FLAG(bool, strict_codecs_signaling); #endif // PACKAGER_APP_HLS_FLAGS_H_ diff --git a/packager/app/packager_main.cc b/packager/app/packager_main.cc index 7fe7b77c24a..5fdd38fa083 100644 --- a/packager/app/packager_main.cc +++ b/packager/app/packager_main.cc @@ -545,6 +545,8 @@ std::optional GetPackagingParams() { hls_params.start_time_offset = absl::GetFlag(FLAGS_hls_start_time_offset); hls_params.create_session_keys = absl::GetFlag(FLAGS_create_session_keys); hls_params.add_program_date_time = absl::GetFlag(FLAGS_add_program_date_time); + hls_params.strict_codecs_signaling = + absl::GetFlag(FLAGS_strict_codecs_signaling); TestParams& test_params = packaging_params.test_params; test_params.dump_stream_info = absl::GetFlag(FLAGS_dump_stream_info); diff --git a/packager/app/test/packager_test.py b/packager/app/test/packager_test.py index f5014cf74ca..09ea6f127fb 100755 --- a/packager/app/test/packager_test.py +++ b/packager/app/test/packager_test.py @@ -489,7 +489,8 @@ def _GetFlags(self, dash_force_segment_list=False, force_cl_index=None, start_segment_number=None, - use_dovi_supplemental_codecs=None): + use_dovi_supplemental_codecs=None, + strict_codecs_signaling=None): flags = ['--single_threaded'] if not strip_parameter_set_nalus: @@ -550,6 +551,9 @@ def _GetFlags(self, if use_dovi_supplemental_codecs: flags.append('--use_dovi_supplemental_codecs') + if strict_codecs_signaling: + flags.append('--strict_codecs_signaling') + if output_media_info: flags.append('--output_media_info') if output_dash: @@ -1536,6 +1540,176 @@ def testDolbyVisionProfile10UsingSupplementalCodecs(self): self.assertPackageSuccess(streams, flags) self._CheckTestResults('dolby-vision-profile-10-supplemental-codecs') + def testDolbyVisionDvh1P81(self): + streams = [ + self._GetStream('video', + test_file='color_pattern_24_dvh1_081_1920x1080.mp4') + ] + flags = self._GetFlags(output_dash=True, output_hls=True) + + self.assertPackageSuccess(streams, flags) + self._CheckTestResults('dolby-vision-dvh1-p81') + + def testDolbyVisionDvh1P84(self): + streams = [ + self._GetStream('video', + test_file='color_pattern_24_dvh1_084_1920x1080.mp4') + ] + flags = self._GetFlags(output_dash=True, output_hls=True) + + self.assertPackageSuccess(streams, flags) + self._CheckTestResults('dolby-vision-dvh1-p84') + + def testDolbyVisionDvheP81(self): + streams = [ + self._GetStream('video', + test_file='color_pattern_24_dvhe_081_1920x1080.mp4') + ] + flags = self._GetFlags(output_dash=True, output_hls=True) + + self.assertPackageSuccess(streams, flags) + self._CheckTestResults('dolby-vision-dvhe-p81') + + def testDolbyVisionDvheP84(self): + streams = [ + self._GetStream('video', + test_file='color_pattern_24_dvhe_084_1920x1080.mp4') + ] + flags = self._GetFlags(output_dash=True, output_hls=True) + + self.assertPackageSuccess(streams, flags) + self._CheckTestResults('dolby-vision-dvhe-p84') + + def testDolbyVisionDvh1P81UsingSupplementalCodecs(self): + streams = [ + self._GetStream('video', + test_file='color_pattern_24_dvh1_081_1920x1080.mp4') + ] + flags = self._GetFlags(output_dash=True, + output_hls=True, + use_dovi_supplemental_codecs=True) + + self.assertPackageSuccess(streams, flags) + self._CheckTestResults('dolby-vision-dvh1-p81-with-supplemental-codecs') + + def testDolbyVisionDvh1P84UsingSupplementalCodecs(self): + streams = [ + self._GetStream('video', + test_file='color_pattern_24_dvh1_084_1920x1080.mp4') + ] + flags = self._GetFlags(output_dash=True, + output_hls=True, + use_dovi_supplemental_codecs=True) + + self.assertPackageSuccess(streams, flags) + self._CheckTestResults('dolby-vision-dvh1-p84-with-supplemental-codecs') + + def testDolbyVisionDvheP81UsingSupplementalCodecs(self): + streams = [ + self._GetStream('video', + test_file='color_pattern_24_dvhe_081_1920x1080.mp4') + ] + flags = self._GetFlags(output_dash=True, + output_hls=True, + use_dovi_supplemental_codecs=True) + + self.assertPackageSuccess(streams, flags) + self._CheckTestResults('dolby-vision-dvhe-p81-with-supplemental-codecs') + + def testDolbyVisionDvheP84UsingSupplementalCodecs(self): + streams = [ + self._GetStream('video', + test_file='color_pattern_24_dvhe_084_1920x1080.mp4') + ] + flags = self._GetFlags(output_dash=True, + output_hls=True, + use_dovi_supplemental_codecs=True) + + self.assertPackageSuccess(streams, flags) + self._CheckTestResults('dolby-vision-dvhe-p84-with-supplemental-codecs') + + + def testDolbyVisionDvh1P81WithEncryption(self): + streams = [ + self._GetStream('video', + test_file='color_pattern_24_dvh1_081_1920x1080.mp4') + ] + flags = self._GetFlags(encryption=True, output_dash=True, output_hls=True) + + self.assertPackageSuccess(streams, flags) + self._CheckTestResults('dolby-vision-dvh1-p81-with-encryption') + + def testDolbyVisionDvh1P84WithEncryption(self): + streams = [ + self._GetStream('video', + test_file='color_pattern_24_dvh1_084_1920x1080.mp4') + ] + flags = self._GetFlags(encryption=True, output_dash=True, output_hls=True) + + self.assertPackageSuccess(streams, flags) + self._CheckTestResults('dolby-vision-dvh1-p84-with-encryption') + + def testDolbyVisionDvheP81WithEncryption(self): + streams = [ + self._GetStream('video', + test_file='color_pattern_24_dvhe_081_1920x1080.mp4') + ] + + flags = self._GetFlags(encryption=True, output_dash=True, output_hls=True) + + self.assertPackageSuccess(streams, flags) + self._CheckTestResults('dolby-vision-dvhe-p81-with-encryption') + + def testDolbyVisionDvheP84WithEncryption(self): + streams = [ + self._GetStream('video', + test_file='color_pattern_24_dvhe_084_1920x1080.mp4') + ] + flags = self._GetFlags(encryption=True, output_dash=True, output_hls=True) + + self.assertPackageSuccess(streams, flags) + self._CheckTestResults('dolby-vision-dvhe-p84-with-encryption') + + def testDolbyVisionDvh1P81WithStrictCodecsSignaling(self): + streams = [ + self._GetStream('video', + test_file='color_pattern_24_dvh1_081_1920x1080.mp4') + ] + flags = self._GetFlags(output_hls=True, strict_codecs_signaling=True) + + self.assertPackageSuccess(streams, flags) + self._CheckTestResults('dolby-vision-dvh1-p81-with-strict-codecs-signaling') + + def testDolbyVisionDvh1P84WithStrictCodecsSignaling(self): + streams = [ + self._GetStream('video', + test_file='color_pattern_24_dvh1_084_1920x1080.mp4') + ] + flags = self._GetFlags(output_hls=True, strict_codecs_signaling=True) + + self.assertPackageSuccess(streams, flags) + self._CheckTestResults('dolby-vision-dvh1-p84-with-strict-codecs-signaling') + + def testDolbyVisionDvheP81WithStrictCodecsSignaling(self): + streams = [ + self._GetStream('video', + test_file='color_pattern_24_dvhe_081_1920x1080.mp4') + ] + flags = self._GetFlags(output_hls=True, strict_codecs_signaling=True) + + self.assertPackageSuccess(streams, flags) + self._CheckTestResults('dolby-vision-dvhe-p81-with-strict-codecs-signaling') + + def testDolbyVisionDvheP84WithStrictCodecsSignaling(self): + streams = [ + self._GetStream('video', + test_file='color_pattern_24_dvhe_084_1920x1080.mp4') + ] + flags = self._GetFlags(output_hls=True, strict_codecs_signaling=True) + + self.assertPackageSuccess(streams, flags) + self._CheckTestResults('dolby-vision-dvhe-p84-with-strict-codecs-signaling') + def testVp8Mp4WithEncryption(self): streams = [ self._GetStream('video', diff --git a/packager/app/test/testdata/dolby-vision-dvh1-p81-with-encryption/color_pattern_24_dvh1_081_1920x1080-video.mp4 b/packager/app/test/testdata/dolby-vision-dvh1-p81-with-encryption/color_pattern_24_dvh1_081_1920x1080-video.mp4 new file mode 100644 index 00000000000..7ff25c47450 Binary files /dev/null and b/packager/app/test/testdata/dolby-vision-dvh1-p81-with-encryption/color_pattern_24_dvh1_081_1920x1080-video.mp4 differ diff --git a/packager/app/test/testdata/dolby-vision-dvh1-p81-with-encryption/output.m3u8 b/packager/app/test/testdata/dolby-vision-dvh1-p81-with-encryption/output.m3u8 new file mode 100644 index 00000000000..5604713dbca --- /dev/null +++ b/packager/app/test/testdata/dolby-vision-dvh1-p81-with-encryption/output.m3u8 @@ -0,0 +1,9 @@ +#EXTM3U +## Generated with https://github.com/shaka-project/shaka-packager version -- + +#EXT-X-INDEPENDENT-SEGMENTS + +#EXT-X-STREAM-INF:BANDWIDTH=163596,AVERAGE-BANDWIDTH=162709,CODECS="hvc1.2.4.L120.b0",RESOLUTION=1920x1080,FRAME-RATE=24.000,VIDEO-RANGE=PQ,CLOSED-CAPTIONS=NONE +stream_0.m3u8 +#EXT-X-STREAM-INF:BANDWIDTH=163596,AVERAGE-BANDWIDTH=162709,CODECS="dvh1.08.03",RESOLUTION=1920x1080,FRAME-RATE=24.000,VIDEO-RANGE=PQ,CLOSED-CAPTIONS=NONE +stream_0.m3u8 diff --git a/packager/app/test/testdata/dolby-vision-dvh1-p81-with-encryption/output.mpd b/packager/app/test/testdata/dolby-vision-dvh1-p81-with-encryption/output.mpd new file mode 100644 index 00000000000..af99fc75cd3 --- /dev/null +++ b/packager/app/test/testdata/dolby-vision-dvh1-p81-with-encryption/output.mpd @@ -0,0 +1,36 @@ + + + + + + + + + + + AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== + + + color_pattern_24_dvh1_081_1920x1080-video.mp4 + + + + + + + + + + + + AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== + + + color_pattern_24_dvh1_081_1920x1080-video.mp4 + + + + + + + diff --git a/packager/app/test/testdata/dolby-vision-dvh1-p81-with-encryption/stream_0.m3u8 b/packager/app/test/testdata/dolby-vision-dvh1-p81-with-encryption/stream_0.m3u8 new file mode 100644 index 00000000000..6e24109bee4 --- /dev/null +++ b/packager/app/test/testdata/dolby-vision-dvh1-p81-with-encryption/stream_0.m3u8 @@ -0,0 +1,22 @@ +#EXTM3U +#EXT-X-VERSION:6 +## Generated with https://github.com/shaka-project/shaka-packager version -- +#EXT-X-TARGETDURATION:2 +#EXT-X-PLAYLIST-TYPE:VOD +#EXT-X-MAP:URI="color_pattern_24_dvh1_081_1920x1080-video.mp4",BYTERANGE="1356@0" +#EXTINF:2.000, +#EXT-X-BYTERANGE:39790@1448 +color_pattern_24_dvh1_081_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:40899 +color_pattern_24_dvh1_081_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:40899 +color_pattern_24_dvh1_081_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:40899 +color_pattern_24_dvh1_081_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:40899 +color_pattern_24_dvh1_081_1920x1080-video.mp4 +#EXT-X-ENDLIST diff --git a/packager/app/test/testdata/dolby-vision-dvh1-p81-with-strict-codecs-signaling/color_pattern_24_dvh1_081_1920x1080-video.mp4 b/packager/app/test/testdata/dolby-vision-dvh1-p81-with-strict-codecs-signaling/color_pattern_24_dvh1_081_1920x1080-video.mp4 new file mode 100644 index 00000000000..58ccd7bbbdc Binary files /dev/null and b/packager/app/test/testdata/dolby-vision-dvh1-p81-with-strict-codecs-signaling/color_pattern_24_dvh1_081_1920x1080-video.mp4 differ diff --git a/packager/app/test/testdata/dolby-vision-dvh1-p81-with-strict-codecs-signaling/output.m3u8 b/packager/app/test/testdata/dolby-vision-dvh1-p81-with-strict-codecs-signaling/output.m3u8 new file mode 100644 index 00000000000..966c42d787d --- /dev/null +++ b/packager/app/test/testdata/dolby-vision-dvh1-p81-with-strict-codecs-signaling/output.m3u8 @@ -0,0 +1,9 @@ +#EXTM3U +## Generated with https://github.com/shaka-project/shaka-packager version -- + +#EXT-X-INDEPENDENT-SEGMENTS + +#EXT-X-STREAM-INF:BANDWIDTH=159160,AVERAGE-BANDWIDTH=159160,CODECS="hvc1.2.4.L120.b0",RESOLUTION=1920x1080,FRAME-RATE=24.000,VIDEO-RANGE=PQ,CLOSED-CAPTIONS=NONE +stream_0.m3u8 +#EXT-X-STREAM-INF:BANDWIDTH=159160,AVERAGE-BANDWIDTH=159160,CODECS="dvh1.08.03",RESOLUTION=1920x1080,FRAME-RATE=24.000,VIDEO-RANGE=PQ,CLOSED-CAPTIONS=NONE +stream_0.m3u8 diff --git a/packager/app/test/testdata/dolby-vision-dvh1-p81-with-strict-codecs-signaling/stream_0.m3u8 b/packager/app/test/testdata/dolby-vision-dvh1-p81-with-strict-codecs-signaling/stream_0.m3u8 new file mode 100644 index 00000000000..90212ddca88 --- /dev/null +++ b/packager/app/test/testdata/dolby-vision-dvh1-p81-with-strict-codecs-signaling/stream_0.m3u8 @@ -0,0 +1,22 @@ +#EXTM3U +#EXT-X-VERSION:6 +## Generated with https://github.com/shaka-project/shaka-packager version -- +#EXT-X-TARGETDURATION:2 +#EXT-X-PLAYLIST-TYPE:VOD +#EXT-X-MAP:URI="color_pattern_24_dvh1_081_1920x1080-video.mp4",BYTERANGE="963@0" +#EXTINF:2.000, +#EXT-X-BYTERANGE:39790@1055 +color_pattern_24_dvh1_081_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:39790 +color_pattern_24_dvh1_081_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:39790 +color_pattern_24_dvh1_081_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:39790 +color_pattern_24_dvh1_081_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:39790 +color_pattern_24_dvh1_081_1920x1080-video.mp4 +#EXT-X-ENDLIST diff --git a/packager/app/test/testdata/dolby-vision-dvh1-p81-with-supplemental-codecs/color_pattern_24_dvh1_081_1920x1080-video.mp4 b/packager/app/test/testdata/dolby-vision-dvh1-p81-with-supplemental-codecs/color_pattern_24_dvh1_081_1920x1080-video.mp4 new file mode 100644 index 00000000000..7af316104bb Binary files /dev/null and b/packager/app/test/testdata/dolby-vision-dvh1-p81-with-supplemental-codecs/color_pattern_24_dvh1_081_1920x1080-video.mp4 differ diff --git a/packager/app/test/testdata/dolby-vision-dvh1-p81-with-supplemental-codecs/output.m3u8 b/packager/app/test/testdata/dolby-vision-dvh1-p81-with-supplemental-codecs/output.m3u8 new file mode 100644 index 00000000000..b54bdda9318 --- /dev/null +++ b/packager/app/test/testdata/dolby-vision-dvh1-p81-with-supplemental-codecs/output.m3u8 @@ -0,0 +1,7 @@ +#EXTM3U +## Generated with https://github.com/shaka-project/shaka-packager version -- + +#EXT-X-INDEPENDENT-SEGMENTS + +#EXT-X-STREAM-INF:BANDWIDTH=159160,AVERAGE-BANDWIDTH=159160,CODECS="hvc1.2.4.L120.b0",SUPPLEMENTAL-CODECS="dvh1.08.03/db1p",RESOLUTION=1920x1080,FRAME-RATE=24.000,VIDEO-RANGE=PQ,CLOSED-CAPTIONS=NONE +stream_0.m3u8 diff --git a/packager/app/test/testdata/dolby-vision-dvh1-p81-with-supplemental-codecs/output.mpd b/packager/app/test/testdata/dolby-vision-dvh1-p81-with-supplemental-codecs/output.mpd new file mode 100644 index 00000000000..b56facfc087 --- /dev/null +++ b/packager/app/test/testdata/dolby-vision-dvh1-p81-with-supplemental-codecs/output.mpd @@ -0,0 +1,17 @@ + + + + + + + + + + color_pattern_24_dvh1_081_1920x1080-video.mp4 + + + + + + + diff --git a/packager/app/test/testdata/dolby-vision-dvh1-p81-with-supplemental-codecs/stream_0.m3u8 b/packager/app/test/testdata/dolby-vision-dvh1-p81-with-supplemental-codecs/stream_0.m3u8 new file mode 100644 index 00000000000..9efc702e1a0 --- /dev/null +++ b/packager/app/test/testdata/dolby-vision-dvh1-p81-with-supplemental-codecs/stream_0.m3u8 @@ -0,0 +1,22 @@ +#EXTM3U +#EXT-X-VERSION:6 +## Generated with https://github.com/shaka-project/shaka-packager version -- +#EXT-X-TARGETDURATION:2 +#EXT-X-PLAYLIST-TYPE:VOD +#EXT-X-MAP:URI="color_pattern_24_dvh1_081_1920x1080-video.mp4",BYTERANGE="967@0" +#EXTINF:2.000, +#EXT-X-BYTERANGE:39790@1059 +color_pattern_24_dvh1_081_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:39790 +color_pattern_24_dvh1_081_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:39790 +color_pattern_24_dvh1_081_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:39790 +color_pattern_24_dvh1_081_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:39790 +color_pattern_24_dvh1_081_1920x1080-video.mp4 +#EXT-X-ENDLIST diff --git a/packager/app/test/testdata/dolby-vision-dvh1-p81/color_pattern_24_dvh1_081_1920x1080-video.mp4 b/packager/app/test/testdata/dolby-vision-dvh1-p81/color_pattern_24_dvh1_081_1920x1080-video.mp4 new file mode 100644 index 00000000000..58ccd7bbbdc Binary files /dev/null and b/packager/app/test/testdata/dolby-vision-dvh1-p81/color_pattern_24_dvh1_081_1920x1080-video.mp4 differ diff --git a/packager/app/test/testdata/dolby-vision-dvh1-p81/output.m3u8 b/packager/app/test/testdata/dolby-vision-dvh1-p81/output.m3u8 new file mode 100644 index 00000000000..966c42d787d --- /dev/null +++ b/packager/app/test/testdata/dolby-vision-dvh1-p81/output.m3u8 @@ -0,0 +1,9 @@ +#EXTM3U +## Generated with https://github.com/shaka-project/shaka-packager version -- + +#EXT-X-INDEPENDENT-SEGMENTS + +#EXT-X-STREAM-INF:BANDWIDTH=159160,AVERAGE-BANDWIDTH=159160,CODECS="hvc1.2.4.L120.b0",RESOLUTION=1920x1080,FRAME-RATE=24.000,VIDEO-RANGE=PQ,CLOSED-CAPTIONS=NONE +stream_0.m3u8 +#EXT-X-STREAM-INF:BANDWIDTH=159160,AVERAGE-BANDWIDTH=159160,CODECS="dvh1.08.03",RESOLUTION=1920x1080,FRAME-RATE=24.000,VIDEO-RANGE=PQ,CLOSED-CAPTIONS=NONE +stream_0.m3u8 diff --git a/packager/app/test/testdata/dolby-vision-dvh1-p81/output.mpd b/packager/app/test/testdata/dolby-vision-dvh1-p81/output.mpd new file mode 100644 index 00000000000..7d513b1372e --- /dev/null +++ b/packager/app/test/testdata/dolby-vision-dvh1-p81/output.mpd @@ -0,0 +1,28 @@ + + + + + + + + + + color_pattern_24_dvh1_081_1920x1080-video.mp4 + + + + + + + + + + + color_pattern_24_dvh1_081_1920x1080-video.mp4 + + + + + + + diff --git a/packager/app/test/testdata/dolby-vision-dvh1-p81/stream_0.m3u8 b/packager/app/test/testdata/dolby-vision-dvh1-p81/stream_0.m3u8 new file mode 100644 index 00000000000..90212ddca88 --- /dev/null +++ b/packager/app/test/testdata/dolby-vision-dvh1-p81/stream_0.m3u8 @@ -0,0 +1,22 @@ +#EXTM3U +#EXT-X-VERSION:6 +## Generated with https://github.com/shaka-project/shaka-packager version -- +#EXT-X-TARGETDURATION:2 +#EXT-X-PLAYLIST-TYPE:VOD +#EXT-X-MAP:URI="color_pattern_24_dvh1_081_1920x1080-video.mp4",BYTERANGE="963@0" +#EXTINF:2.000, +#EXT-X-BYTERANGE:39790@1055 +color_pattern_24_dvh1_081_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:39790 +color_pattern_24_dvh1_081_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:39790 +color_pattern_24_dvh1_081_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:39790 +color_pattern_24_dvh1_081_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:39790 +color_pattern_24_dvh1_081_1920x1080-video.mp4 +#EXT-X-ENDLIST diff --git a/packager/app/test/testdata/dolby-vision-dvh1-p84-with-encryption/color_pattern_24_dvh1_084_1920x1080-video.mp4 b/packager/app/test/testdata/dolby-vision-dvh1-p84-with-encryption/color_pattern_24_dvh1_084_1920x1080-video.mp4 new file mode 100644 index 00000000000..b0f7b908b8b Binary files /dev/null and b/packager/app/test/testdata/dolby-vision-dvh1-p84-with-encryption/color_pattern_24_dvh1_084_1920x1080-video.mp4 differ diff --git a/packager/app/test/testdata/dolby-vision-dvh1-p84-with-encryption/output.m3u8 b/packager/app/test/testdata/dolby-vision-dvh1-p84-with-encryption/output.m3u8 new file mode 100644 index 00000000000..795cdc7f7a7 --- /dev/null +++ b/packager/app/test/testdata/dolby-vision-dvh1-p84-with-encryption/output.m3u8 @@ -0,0 +1,9 @@ +#EXTM3U +## Generated with https://github.com/shaka-project/shaka-packager version -- + +#EXT-X-INDEPENDENT-SEGMENTS + +#EXT-X-STREAM-INF:BANDWIDTH=174452,AVERAGE-BANDWIDTH=173657,CODECS="hvc1.2.4.L123.b0",RESOLUTION=1920x1080,FRAME-RATE=24.000,VIDEO-RANGE=HLG,CLOSED-CAPTIONS=NONE +stream_0.m3u8 +#EXT-X-STREAM-INF:BANDWIDTH=174452,AVERAGE-BANDWIDTH=173657,CODECS="dvh1.08.03",RESOLUTION=1920x1080,FRAME-RATE=24.000,VIDEO-RANGE=PQ,CLOSED-CAPTIONS=NONE +stream_0.m3u8 diff --git a/packager/app/test/testdata/dolby-vision-dvh1-p84-with-encryption/output.mpd b/packager/app/test/testdata/dolby-vision-dvh1-p84-with-encryption/output.mpd new file mode 100644 index 00000000000..252dee9a703 --- /dev/null +++ b/packager/app/test/testdata/dolby-vision-dvh1-p84-with-encryption/output.mpd @@ -0,0 +1,36 @@ + + + + + + + + + + + AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== + + + color_pattern_24_dvh1_084_1920x1080-video.mp4 + + + + + + + + + + + + AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== + + + color_pattern_24_dvh1_084_1920x1080-video.mp4 + + + + + + + diff --git a/packager/app/test/testdata/dolby-vision-dvh1-p84-with-encryption/stream_0.m3u8 b/packager/app/test/testdata/dolby-vision-dvh1-p84-with-encryption/stream_0.m3u8 new file mode 100644 index 00000000000..ab0f1d811f0 --- /dev/null +++ b/packager/app/test/testdata/dolby-vision-dvh1-p84-with-encryption/stream_0.m3u8 @@ -0,0 +1,25 @@ +#EXTM3U +#EXT-X-VERSION:6 +## Generated with https://github.com/shaka-project/shaka-packager version -- +#EXT-X-TARGETDURATION:2 +#EXT-X-PLAYLIST-TYPE:VOD +#EXT-X-MAP:URI="color_pattern_24_dvh1_084_1920x1080-video.mp4",BYTERANGE="1358@0" +#EXTINF:2.000, +#EXT-X-BYTERANGE:42476@1462 +color_pattern_24_dvh1_084_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:43613 +color_pattern_24_dvh1_084_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:43585 +color_pattern_24_dvh1_084_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:43613 +color_pattern_24_dvh1_084_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:43585 +color_pattern_24_dvh1_084_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:43613 +color_pattern_24_dvh1_084_1920x1080-video.mp4 +#EXT-X-ENDLIST diff --git a/packager/app/test/testdata/dolby-vision-dvh1-p84-with-strict-codecs-signaling/color_pattern_24_dvh1_084_1920x1080-video.mp4 b/packager/app/test/testdata/dolby-vision-dvh1-p84-with-strict-codecs-signaling/color_pattern_24_dvh1_084_1920x1080-video.mp4 new file mode 100644 index 00000000000..6a4732fc0b9 Binary files /dev/null and b/packager/app/test/testdata/dolby-vision-dvh1-p84-with-strict-codecs-signaling/color_pattern_24_dvh1_084_1920x1080-video.mp4 differ diff --git a/packager/app/test/testdata/dolby-vision-dvh1-p84-with-strict-codecs-signaling/output.m3u8 b/packager/app/test/testdata/dolby-vision-dvh1-p84-with-strict-codecs-signaling/output.m3u8 new file mode 100644 index 00000000000..4bb4851659b --- /dev/null +++ b/packager/app/test/testdata/dolby-vision-dvh1-p84-with-strict-codecs-signaling/output.m3u8 @@ -0,0 +1,9 @@ +#EXTM3U +## Generated with https://github.com/shaka-project/shaka-packager version -- + +#EXT-X-INDEPENDENT-SEGMENTS + +#EXT-X-STREAM-INF:BANDWIDTH=170016,AVERAGE-BANDWIDTH=169960,CODECS="hvc1.2.4.L123.b0",RESOLUTION=1920x1080,FRAME-RATE=24.000,VIDEO-RANGE=HLG,CLOSED-CAPTIONS=NONE +stream_0.m3u8 +#EXT-X-STREAM-INF:BANDWIDTH=170016,AVERAGE-BANDWIDTH=169960,CODECS="dvh1.08.03",RESOLUTION=1920x1080,FRAME-RATE=24.000,VIDEO-RANGE=PQ,CLOSED-CAPTIONS=NONE +stream_0.m3u8 diff --git a/packager/app/test/testdata/dolby-vision-dvh1-p84-with-strict-codecs-signaling/stream_0.m3u8 b/packager/app/test/testdata/dolby-vision-dvh1-p84-with-strict-codecs-signaling/stream_0.m3u8 new file mode 100644 index 00000000000..8aa92a22e54 --- /dev/null +++ b/packager/app/test/testdata/dolby-vision-dvh1-p84-with-strict-codecs-signaling/stream_0.m3u8 @@ -0,0 +1,25 @@ +#EXTM3U +#EXT-X-VERSION:6 +## Generated with https://github.com/shaka-project/shaka-packager version -- +#EXT-X-TARGETDURATION:2 +#EXT-X-PLAYLIST-TYPE:VOD +#EXT-X-MAP:URI="color_pattern_24_dvh1_084_1920x1080-video.mp4",BYTERANGE="964@0" +#EXTINF:2.000, +#EXT-X-BYTERANGE:42476@1068 +color_pattern_24_dvh1_084_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:42504 +color_pattern_24_dvh1_084_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:42476 +color_pattern_24_dvh1_084_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:42504 +color_pattern_24_dvh1_084_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:42476 +color_pattern_24_dvh1_084_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:42504 +color_pattern_24_dvh1_084_1920x1080-video.mp4 +#EXT-X-ENDLIST diff --git a/packager/app/test/testdata/dolby-vision-dvh1-p84-with-supplemental-codecs/color_pattern_24_dvh1_084_1920x1080-video.mp4 b/packager/app/test/testdata/dolby-vision-dvh1-p84-with-supplemental-codecs/color_pattern_24_dvh1_084_1920x1080-video.mp4 new file mode 100644 index 00000000000..380be0d04e0 Binary files /dev/null and b/packager/app/test/testdata/dolby-vision-dvh1-p84-with-supplemental-codecs/color_pattern_24_dvh1_084_1920x1080-video.mp4 differ diff --git a/packager/app/test/testdata/dolby-vision-dvh1-p84-with-supplemental-codecs/output.m3u8 b/packager/app/test/testdata/dolby-vision-dvh1-p84-with-supplemental-codecs/output.m3u8 new file mode 100644 index 00000000000..949cdb7cd1c --- /dev/null +++ b/packager/app/test/testdata/dolby-vision-dvh1-p84-with-supplemental-codecs/output.m3u8 @@ -0,0 +1,7 @@ +#EXTM3U +## Generated with https://github.com/shaka-project/shaka-packager version -- + +#EXT-X-INDEPENDENT-SEGMENTS + +#EXT-X-STREAM-INF:BANDWIDTH=170016,AVERAGE-BANDWIDTH=169960,CODECS="hvc1.2.4.L123.b0",SUPPLEMENTAL-CODECS="dvh1.08.03/db4h",RESOLUTION=1920x1080,FRAME-RATE=24.000,VIDEO-RANGE=HLG,CLOSED-CAPTIONS=NONE +stream_0.m3u8 diff --git a/packager/app/test/testdata/dolby-vision-dvh1-p84-with-supplemental-codecs/output.mpd b/packager/app/test/testdata/dolby-vision-dvh1-p84-with-supplemental-codecs/output.mpd new file mode 100644 index 00000000000..0743c50a6f6 --- /dev/null +++ b/packager/app/test/testdata/dolby-vision-dvh1-p84-with-supplemental-codecs/output.mpd @@ -0,0 +1,17 @@ + + + + + + + + + + color_pattern_24_dvh1_084_1920x1080-video.mp4 + + + + + + + diff --git a/packager/app/test/testdata/dolby-vision-dvh1-p84-with-supplemental-codecs/stream_0.m3u8 b/packager/app/test/testdata/dolby-vision-dvh1-p84-with-supplemental-codecs/stream_0.m3u8 new file mode 100644 index 00000000000..7ffb15334c4 --- /dev/null +++ b/packager/app/test/testdata/dolby-vision-dvh1-p84-with-supplemental-codecs/stream_0.m3u8 @@ -0,0 +1,25 @@ +#EXTM3U +#EXT-X-VERSION:6 +## Generated with https://github.com/shaka-project/shaka-packager version -- +#EXT-X-TARGETDURATION:2 +#EXT-X-PLAYLIST-TYPE:VOD +#EXT-X-MAP:URI="color_pattern_24_dvh1_084_1920x1080-video.mp4",BYTERANGE="968@0" +#EXTINF:2.000, +#EXT-X-BYTERANGE:42476@1072 +color_pattern_24_dvh1_084_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:42504 +color_pattern_24_dvh1_084_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:42476 +color_pattern_24_dvh1_084_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:42504 +color_pattern_24_dvh1_084_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:42476 +color_pattern_24_dvh1_084_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:42504 +color_pattern_24_dvh1_084_1920x1080-video.mp4 +#EXT-X-ENDLIST diff --git a/packager/app/test/testdata/dolby-vision-dvh1-p84/color_pattern_24_dvh1_084_1920x1080-video.mp4 b/packager/app/test/testdata/dolby-vision-dvh1-p84/color_pattern_24_dvh1_084_1920x1080-video.mp4 new file mode 100644 index 00000000000..6a4732fc0b9 Binary files /dev/null and b/packager/app/test/testdata/dolby-vision-dvh1-p84/color_pattern_24_dvh1_084_1920x1080-video.mp4 differ diff --git a/packager/app/test/testdata/dolby-vision-dvh1-p84/output.m3u8 b/packager/app/test/testdata/dolby-vision-dvh1-p84/output.m3u8 new file mode 100644 index 00000000000..4bb4851659b --- /dev/null +++ b/packager/app/test/testdata/dolby-vision-dvh1-p84/output.m3u8 @@ -0,0 +1,9 @@ +#EXTM3U +## Generated with https://github.com/shaka-project/shaka-packager version -- + +#EXT-X-INDEPENDENT-SEGMENTS + +#EXT-X-STREAM-INF:BANDWIDTH=170016,AVERAGE-BANDWIDTH=169960,CODECS="hvc1.2.4.L123.b0",RESOLUTION=1920x1080,FRAME-RATE=24.000,VIDEO-RANGE=HLG,CLOSED-CAPTIONS=NONE +stream_0.m3u8 +#EXT-X-STREAM-INF:BANDWIDTH=170016,AVERAGE-BANDWIDTH=169960,CODECS="dvh1.08.03",RESOLUTION=1920x1080,FRAME-RATE=24.000,VIDEO-RANGE=PQ,CLOSED-CAPTIONS=NONE +stream_0.m3u8 diff --git a/packager/app/test/testdata/dolby-vision-dvh1-p84/output.mpd b/packager/app/test/testdata/dolby-vision-dvh1-p84/output.mpd new file mode 100644 index 00000000000..5101a611ad0 --- /dev/null +++ b/packager/app/test/testdata/dolby-vision-dvh1-p84/output.mpd @@ -0,0 +1,28 @@ + + + + + + + + + + color_pattern_24_dvh1_084_1920x1080-video.mp4 + + + + + + + + + + + color_pattern_24_dvh1_084_1920x1080-video.mp4 + + + + + + + diff --git a/packager/app/test/testdata/dolby-vision-dvh1-p84/stream_0.m3u8 b/packager/app/test/testdata/dolby-vision-dvh1-p84/stream_0.m3u8 new file mode 100644 index 00000000000..8aa92a22e54 --- /dev/null +++ b/packager/app/test/testdata/dolby-vision-dvh1-p84/stream_0.m3u8 @@ -0,0 +1,25 @@ +#EXTM3U +#EXT-X-VERSION:6 +## Generated with https://github.com/shaka-project/shaka-packager version -- +#EXT-X-TARGETDURATION:2 +#EXT-X-PLAYLIST-TYPE:VOD +#EXT-X-MAP:URI="color_pattern_24_dvh1_084_1920x1080-video.mp4",BYTERANGE="964@0" +#EXTINF:2.000, +#EXT-X-BYTERANGE:42476@1068 +color_pattern_24_dvh1_084_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:42504 +color_pattern_24_dvh1_084_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:42476 +color_pattern_24_dvh1_084_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:42504 +color_pattern_24_dvh1_084_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:42476 +color_pattern_24_dvh1_084_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:42504 +color_pattern_24_dvh1_084_1920x1080-video.mp4 +#EXT-X-ENDLIST diff --git a/packager/app/test/testdata/dolby-vision-dvhe-p81-with-encryption/color_pattern_24_dvhe_081_1920x1080-video.mp4 b/packager/app/test/testdata/dolby-vision-dvhe-p81-with-encryption/color_pattern_24_dvhe_081_1920x1080-video.mp4 new file mode 100644 index 00000000000..0bd5f51ef99 Binary files /dev/null and b/packager/app/test/testdata/dolby-vision-dvhe-p81-with-encryption/color_pattern_24_dvhe_081_1920x1080-video.mp4 differ diff --git a/packager/app/test/testdata/dolby-vision-dvhe-p81-with-encryption/output.m3u8 b/packager/app/test/testdata/dolby-vision-dvhe-p81-with-encryption/output.m3u8 new file mode 100644 index 00000000000..0fb38530703 --- /dev/null +++ b/packager/app/test/testdata/dolby-vision-dvhe-p81-with-encryption/output.m3u8 @@ -0,0 +1,9 @@ +#EXTM3U +## Generated with https://github.com/shaka-project/shaka-packager version -- + +#EXT-X-INDEPENDENT-SEGMENTS + +#EXT-X-STREAM-INF:BANDWIDTH=164032,AVERAGE-BANDWIDTH=163145,CODECS="hvc1.2.4.L120.b0",RESOLUTION=1920x1080,FRAME-RATE=24.000,CLOSED-CAPTIONS=NONE +stream_0.m3u8 +#EXT-X-STREAM-INF:BANDWIDTH=164032,AVERAGE-BANDWIDTH=163145,CODECS="dvh1.08.03",RESOLUTION=1920x1080,FRAME-RATE=24.000,VIDEO-RANGE=PQ,CLOSED-CAPTIONS=NONE +stream_0.m3u8 diff --git a/packager/app/test/testdata/dolby-vision-dvhe-p81-with-encryption/output.mpd b/packager/app/test/testdata/dolby-vision-dvhe-p81-with-encryption/output.mpd new file mode 100644 index 00000000000..b9c6e283289 --- /dev/null +++ b/packager/app/test/testdata/dolby-vision-dvhe-p81-with-encryption/output.mpd @@ -0,0 +1,31 @@ + + + + + + + + AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== + + + color_pattern_24_dvhe_081_1920x1080-video.mp4 + + + + + + + + + + AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== + + + color_pattern_24_dvhe_081_1920x1080-video.mp4 + + + + + + + diff --git a/packager/app/test/testdata/dolby-vision-dvhe-p81-with-encryption/stream_0.m3u8 b/packager/app/test/testdata/dolby-vision-dvhe-p81-with-encryption/stream_0.m3u8 new file mode 100644 index 00000000000..d72c44152f2 --- /dev/null +++ b/packager/app/test/testdata/dolby-vision-dvhe-p81-with-encryption/stream_0.m3u8 @@ -0,0 +1,22 @@ +#EXTM3U +#EXT-X-VERSION:6 +## Generated with https://github.com/shaka-project/shaka-packager version -- +#EXT-X-TARGETDURATION:2 +#EXT-X-PLAYLIST-TYPE:VOD +#EXT-X-MAP:URI="color_pattern_24_dvhe_081_1920x1080-video.mp4",BYTERANGE="1128@0" +#EXTINF:2.000, +#EXT-X-BYTERANGE:39899@1220 +color_pattern_24_dvhe_081_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:41008 +color_pattern_24_dvhe_081_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:41008 +color_pattern_24_dvhe_081_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:41008 +color_pattern_24_dvhe_081_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:41008 +color_pattern_24_dvhe_081_1920x1080-video.mp4 +#EXT-X-ENDLIST diff --git a/packager/app/test/testdata/dolby-vision-dvhe-p81-with-strict-codecs-signaling/color_pattern_24_dvhe_081_1920x1080-video.mp4 b/packager/app/test/testdata/dolby-vision-dvhe-p81-with-strict-codecs-signaling/color_pattern_24_dvhe_081_1920x1080-video.mp4 new file mode 100644 index 00000000000..5a2dcd9917b Binary files /dev/null and b/packager/app/test/testdata/dolby-vision-dvhe-p81-with-strict-codecs-signaling/color_pattern_24_dvhe_081_1920x1080-video.mp4 differ diff --git a/packager/app/test/testdata/dolby-vision-dvhe-p81-with-strict-codecs-signaling/output.m3u8 b/packager/app/test/testdata/dolby-vision-dvhe-p81-with-strict-codecs-signaling/output.m3u8 new file mode 100644 index 00000000000..986d91201ac --- /dev/null +++ b/packager/app/test/testdata/dolby-vision-dvhe-p81-with-strict-codecs-signaling/output.m3u8 @@ -0,0 +1,9 @@ +#EXTM3U +## Generated with https://github.com/shaka-project/shaka-packager version -- + +#EXT-X-INDEPENDENT-SEGMENTS + +#EXT-X-STREAM-INF:BANDWIDTH=159596,AVERAGE-BANDWIDTH=159596,CODECS="hev1.2.4.L120.b0",RESOLUTION=1920x1080,FRAME-RATE=24.000,CLOSED-CAPTIONS=NONE +stream_0.m3u8 +#EXT-X-STREAM-INF:BANDWIDTH=159596,AVERAGE-BANDWIDTH=159596,CODECS="dvhe.08.03",RESOLUTION=1920x1080,FRAME-RATE=24.000,VIDEO-RANGE=PQ,CLOSED-CAPTIONS=NONE +stream_0.m3u8 diff --git a/packager/app/test/testdata/dolby-vision-dvhe-p81-with-strict-codecs-signaling/stream_0.m3u8 b/packager/app/test/testdata/dolby-vision-dvhe-p81-with-strict-codecs-signaling/stream_0.m3u8 new file mode 100644 index 00000000000..d9597ed7ca2 --- /dev/null +++ b/packager/app/test/testdata/dolby-vision-dvhe-p81-with-strict-codecs-signaling/stream_0.m3u8 @@ -0,0 +1,22 @@ +#EXTM3U +#EXT-X-VERSION:6 +## Generated with https://github.com/shaka-project/shaka-packager version -- +#EXT-X-TARGETDURATION:2 +#EXT-X-PLAYLIST-TYPE:VOD +#EXT-X-MAP:URI="color_pattern_24_dvhe_081_1920x1080-video.mp4",BYTERANGE="847@0" +#EXTINF:2.000, +#EXT-X-BYTERANGE:39899@939 +color_pattern_24_dvhe_081_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:39899 +color_pattern_24_dvhe_081_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:39899 +color_pattern_24_dvhe_081_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:39899 +color_pattern_24_dvhe_081_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:39899 +color_pattern_24_dvhe_081_1920x1080-video.mp4 +#EXT-X-ENDLIST diff --git a/packager/app/test/testdata/dolby-vision-dvhe-p81-with-supplemental-codecs/color_pattern_24_dvhe_081_1920x1080-video.mp4 b/packager/app/test/testdata/dolby-vision-dvhe-p81-with-supplemental-codecs/color_pattern_24_dvhe_081_1920x1080-video.mp4 new file mode 100644 index 00000000000..fd2d39640ae Binary files /dev/null and b/packager/app/test/testdata/dolby-vision-dvhe-p81-with-supplemental-codecs/color_pattern_24_dvhe_081_1920x1080-video.mp4 differ diff --git a/packager/app/test/testdata/dolby-vision-dvhe-p81-with-supplemental-codecs/output.m3u8 b/packager/app/test/testdata/dolby-vision-dvhe-p81-with-supplemental-codecs/output.m3u8 new file mode 100644 index 00000000000..d8436fd897a --- /dev/null +++ b/packager/app/test/testdata/dolby-vision-dvhe-p81-with-supplemental-codecs/output.m3u8 @@ -0,0 +1,7 @@ +#EXTM3U +## Generated with https://github.com/shaka-project/shaka-packager version -- + +#EXT-X-INDEPENDENT-SEGMENTS + +#EXT-X-STREAM-INF:BANDWIDTH=159596,AVERAGE-BANDWIDTH=159596,CODECS="hvc1.2.4.L120.b0",SUPPLEMENTAL-CODECS="dvh1.08.03/db1p",RESOLUTION=1920x1080,FRAME-RATE=24.000,CLOSED-CAPTIONS=NONE +stream_0.m3u8 diff --git a/packager/app/test/testdata/dolby-vision-dvhe-p81-with-supplemental-codecs/output.mpd b/packager/app/test/testdata/dolby-vision-dvhe-p81-with-supplemental-codecs/output.mpd new file mode 100644 index 00000000000..31e77303c68 --- /dev/null +++ b/packager/app/test/testdata/dolby-vision-dvhe-p81-with-supplemental-codecs/output.mpd @@ -0,0 +1,14 @@ + + + + + + + color_pattern_24_dvhe_081_1920x1080-video.mp4 + + + + + + + diff --git a/packager/app/test/testdata/dolby-vision-dvhe-p81-with-supplemental-codecs/stream_0.m3u8 b/packager/app/test/testdata/dolby-vision-dvhe-p81-with-supplemental-codecs/stream_0.m3u8 new file mode 100644 index 00000000000..ea7dfaaabab --- /dev/null +++ b/packager/app/test/testdata/dolby-vision-dvhe-p81-with-supplemental-codecs/stream_0.m3u8 @@ -0,0 +1,22 @@ +#EXTM3U +#EXT-X-VERSION:6 +## Generated with https://github.com/shaka-project/shaka-packager version -- +#EXT-X-TARGETDURATION:2 +#EXT-X-PLAYLIST-TYPE:VOD +#EXT-X-MAP:URI="color_pattern_24_dvhe_081_1920x1080-video.mp4",BYTERANGE="851@0" +#EXTINF:2.000, +#EXT-X-BYTERANGE:39899@943 +color_pattern_24_dvhe_081_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:39899 +color_pattern_24_dvhe_081_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:39899 +color_pattern_24_dvhe_081_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:39899 +color_pattern_24_dvhe_081_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:39899 +color_pattern_24_dvhe_081_1920x1080-video.mp4 +#EXT-X-ENDLIST diff --git a/packager/app/test/testdata/dolby-vision-dvhe-p81/color_pattern_24_dvhe_081_1920x1080-video.mp4 b/packager/app/test/testdata/dolby-vision-dvhe-p81/color_pattern_24_dvhe_081_1920x1080-video.mp4 new file mode 100644 index 00000000000..5a2dcd9917b Binary files /dev/null and b/packager/app/test/testdata/dolby-vision-dvhe-p81/color_pattern_24_dvhe_081_1920x1080-video.mp4 differ diff --git a/packager/app/test/testdata/dolby-vision-dvhe-p81/output.m3u8 b/packager/app/test/testdata/dolby-vision-dvhe-p81/output.m3u8 new file mode 100644 index 00000000000..7864f1555eb --- /dev/null +++ b/packager/app/test/testdata/dolby-vision-dvhe-p81/output.m3u8 @@ -0,0 +1,9 @@ +#EXTM3U +## Generated with https://github.com/shaka-project/shaka-packager version -- + +#EXT-X-INDEPENDENT-SEGMENTS + +#EXT-X-STREAM-INF:BANDWIDTH=159596,AVERAGE-BANDWIDTH=159596,CODECS="hvc1.2.4.L120.b0",RESOLUTION=1920x1080,FRAME-RATE=24.000,CLOSED-CAPTIONS=NONE +stream_0.m3u8 +#EXT-X-STREAM-INF:BANDWIDTH=159596,AVERAGE-BANDWIDTH=159596,CODECS="dvh1.08.03",RESOLUTION=1920x1080,FRAME-RATE=24.000,VIDEO-RANGE=PQ,CLOSED-CAPTIONS=NONE +stream_0.m3u8 diff --git a/packager/app/test/testdata/dolby-vision-dvhe-p81/output.mpd b/packager/app/test/testdata/dolby-vision-dvhe-p81/output.mpd new file mode 100644 index 00000000000..545d939ad32 --- /dev/null +++ b/packager/app/test/testdata/dolby-vision-dvhe-p81/output.mpd @@ -0,0 +1,23 @@ + + + + + + + color_pattern_24_dvhe_081_1920x1080-video.mp4 + + + + + + + + + color_pattern_24_dvhe_081_1920x1080-video.mp4 + + + + + + + diff --git a/packager/app/test/testdata/dolby-vision-dvhe-p81/stream_0.m3u8 b/packager/app/test/testdata/dolby-vision-dvhe-p81/stream_0.m3u8 new file mode 100644 index 00000000000..d9597ed7ca2 --- /dev/null +++ b/packager/app/test/testdata/dolby-vision-dvhe-p81/stream_0.m3u8 @@ -0,0 +1,22 @@ +#EXTM3U +#EXT-X-VERSION:6 +## Generated with https://github.com/shaka-project/shaka-packager version -- +#EXT-X-TARGETDURATION:2 +#EXT-X-PLAYLIST-TYPE:VOD +#EXT-X-MAP:URI="color_pattern_24_dvhe_081_1920x1080-video.mp4",BYTERANGE="847@0" +#EXTINF:2.000, +#EXT-X-BYTERANGE:39899@939 +color_pattern_24_dvhe_081_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:39899 +color_pattern_24_dvhe_081_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:39899 +color_pattern_24_dvhe_081_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:39899 +color_pattern_24_dvhe_081_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:39899 +color_pattern_24_dvhe_081_1920x1080-video.mp4 +#EXT-X-ENDLIST diff --git a/packager/app/test/testdata/dolby-vision-dvhe-p84-with-encryption/color_pattern_24_dvhe_084_1920x1080-video.mp4 b/packager/app/test/testdata/dolby-vision-dvhe-p84-with-encryption/color_pattern_24_dvhe_084_1920x1080-video.mp4 new file mode 100644 index 00000000000..302abc74d2c Binary files /dev/null and b/packager/app/test/testdata/dolby-vision-dvhe-p84-with-encryption/color_pattern_24_dvhe_084_1920x1080-video.mp4 differ diff --git a/packager/app/test/testdata/dolby-vision-dvhe-p84-with-encryption/output.m3u8 b/packager/app/test/testdata/dolby-vision-dvhe-p84-with-encryption/output.m3u8 new file mode 100644 index 00000000000..ea7df8b3310 --- /dev/null +++ b/packager/app/test/testdata/dolby-vision-dvhe-p84-with-encryption/output.m3u8 @@ -0,0 +1,9 @@ +#EXTM3U +## Generated with https://github.com/shaka-project/shaka-packager version -- + +#EXT-X-INDEPENDENT-SEGMENTS + +#EXT-X-STREAM-INF:BANDWIDTH=174892,AVERAGE-BANDWIDTH=174097,CODECS="hvc1.2.4.L123.b0",RESOLUTION=1920x1080,FRAME-RATE=24.000,CLOSED-CAPTIONS=NONE +stream_0.m3u8 +#EXT-X-STREAM-INF:BANDWIDTH=174892,AVERAGE-BANDWIDTH=174097,CODECS="dvh1.08.03",RESOLUTION=1920x1080,FRAME-RATE=24.000,VIDEO-RANGE=PQ,CLOSED-CAPTIONS=NONE +stream_0.m3u8 diff --git a/packager/app/test/testdata/dolby-vision-dvhe-p84-with-encryption/output.mpd b/packager/app/test/testdata/dolby-vision-dvhe-p84-with-encryption/output.mpd new file mode 100644 index 00000000000..6b7e9f1481b --- /dev/null +++ b/packager/app/test/testdata/dolby-vision-dvhe-p84-with-encryption/output.mpd @@ -0,0 +1,31 @@ + + + + + + + + AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== + + + color_pattern_24_dvhe_084_1920x1080-video.mp4 + + + + + + + + + + AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== + + + color_pattern_24_dvhe_084_1920x1080-video.mp4 + + + + + + + diff --git a/packager/app/test/testdata/dolby-vision-dvhe-p84-with-encryption/stream_0.m3u8 b/packager/app/test/testdata/dolby-vision-dvhe-p84-with-encryption/stream_0.m3u8 new file mode 100644 index 00000000000..8f2da15073c --- /dev/null +++ b/packager/app/test/testdata/dolby-vision-dvhe-p84-with-encryption/stream_0.m3u8 @@ -0,0 +1,25 @@ +#EXTM3U +#EXT-X-VERSION:6 +## Generated with https://github.com/shaka-project/shaka-packager version -- +#EXT-X-TARGETDURATION:2 +#EXT-X-PLAYLIST-TYPE:VOD +#EXT-X-MAP:URI="color_pattern_24_dvhe_084_1920x1080-video.mp4",BYTERANGE="1128@0" +#EXTINF:2.000, +#EXT-X-BYTERANGE:42586@1232 +color_pattern_24_dvhe_084_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:43723 +color_pattern_24_dvhe_084_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:43695 +color_pattern_24_dvhe_084_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:43723 +color_pattern_24_dvhe_084_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:43695 +color_pattern_24_dvhe_084_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:43723 +color_pattern_24_dvhe_084_1920x1080-video.mp4 +#EXT-X-ENDLIST diff --git a/packager/app/test/testdata/dolby-vision-dvhe-p84-with-strict-codecs-signaling/color_pattern_24_dvhe_084_1920x1080-video.mp4 b/packager/app/test/testdata/dolby-vision-dvhe-p84-with-strict-codecs-signaling/color_pattern_24_dvhe_084_1920x1080-video.mp4 new file mode 100644 index 00000000000..0622e986ca6 Binary files /dev/null and b/packager/app/test/testdata/dolby-vision-dvhe-p84-with-strict-codecs-signaling/color_pattern_24_dvhe_084_1920x1080-video.mp4 differ diff --git a/packager/app/test/testdata/dolby-vision-dvhe-p84-with-strict-codecs-signaling/output.m3u8 b/packager/app/test/testdata/dolby-vision-dvhe-p84-with-strict-codecs-signaling/output.m3u8 new file mode 100644 index 00000000000..c544ff5d897 --- /dev/null +++ b/packager/app/test/testdata/dolby-vision-dvhe-p84-with-strict-codecs-signaling/output.m3u8 @@ -0,0 +1,9 @@ +#EXTM3U +## Generated with https://github.com/shaka-project/shaka-packager version -- + +#EXT-X-INDEPENDENT-SEGMENTS + +#EXT-X-STREAM-INF:BANDWIDTH=170456,AVERAGE-BANDWIDTH=170400,CODECS="hev1.2.4.L123.b0",RESOLUTION=1920x1080,FRAME-RATE=24.000,CLOSED-CAPTIONS=NONE +stream_0.m3u8 +#EXT-X-STREAM-INF:BANDWIDTH=170456,AVERAGE-BANDWIDTH=170400,CODECS="dvhe.08.03",RESOLUTION=1920x1080,FRAME-RATE=24.000,VIDEO-RANGE=PQ,CLOSED-CAPTIONS=NONE +stream_0.m3u8 diff --git a/packager/app/test/testdata/dolby-vision-dvhe-p84-with-strict-codecs-signaling/stream_0.m3u8 b/packager/app/test/testdata/dolby-vision-dvhe-p84-with-strict-codecs-signaling/stream_0.m3u8 new file mode 100644 index 00000000000..27f55da439f --- /dev/null +++ b/packager/app/test/testdata/dolby-vision-dvhe-p84-with-strict-codecs-signaling/stream_0.m3u8 @@ -0,0 +1,25 @@ +#EXTM3U +#EXT-X-VERSION:6 +## Generated with https://github.com/shaka-project/shaka-packager version -- +#EXT-X-TARGETDURATION:2 +#EXT-X-PLAYLIST-TYPE:VOD +#EXT-X-MAP:URI="color_pattern_24_dvhe_084_1920x1080-video.mp4",BYTERANGE="847@0" +#EXTINF:2.000, +#EXT-X-BYTERANGE:42586@951 +color_pattern_24_dvhe_084_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:42614 +color_pattern_24_dvhe_084_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:42586 +color_pattern_24_dvhe_084_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:42614 +color_pattern_24_dvhe_084_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:42586 +color_pattern_24_dvhe_084_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:42614 +color_pattern_24_dvhe_084_1920x1080-video.mp4 +#EXT-X-ENDLIST diff --git a/packager/app/test/testdata/dolby-vision-dvhe-p84-with-supplemental-codecs/color_pattern_24_dvhe_084_1920x1080-video.mp4 b/packager/app/test/testdata/dolby-vision-dvhe-p84-with-supplemental-codecs/color_pattern_24_dvhe_084_1920x1080-video.mp4 new file mode 100644 index 00000000000..5b1f28663c2 Binary files /dev/null and b/packager/app/test/testdata/dolby-vision-dvhe-p84-with-supplemental-codecs/color_pattern_24_dvhe_084_1920x1080-video.mp4 differ diff --git a/packager/app/test/testdata/dolby-vision-dvhe-p84-with-supplemental-codecs/output.m3u8 b/packager/app/test/testdata/dolby-vision-dvhe-p84-with-supplemental-codecs/output.m3u8 new file mode 100644 index 00000000000..d7812833966 --- /dev/null +++ b/packager/app/test/testdata/dolby-vision-dvhe-p84-with-supplemental-codecs/output.m3u8 @@ -0,0 +1,7 @@ +#EXTM3U +## Generated with https://github.com/shaka-project/shaka-packager version -- + +#EXT-X-INDEPENDENT-SEGMENTS + +#EXT-X-STREAM-INF:BANDWIDTH=170456,AVERAGE-BANDWIDTH=170400,CODECS="hvc1.2.4.L123.b0",SUPPLEMENTAL-CODECS="dvh1.08.03/db4h",RESOLUTION=1920x1080,FRAME-RATE=24.000,CLOSED-CAPTIONS=NONE +stream_0.m3u8 diff --git a/packager/app/test/testdata/dolby-vision-dvhe-p84-with-supplemental-codecs/output.mpd b/packager/app/test/testdata/dolby-vision-dvhe-p84-with-supplemental-codecs/output.mpd new file mode 100644 index 00000000000..b4106b84ba9 --- /dev/null +++ b/packager/app/test/testdata/dolby-vision-dvhe-p84-with-supplemental-codecs/output.mpd @@ -0,0 +1,14 @@ + + + + + + + color_pattern_24_dvhe_084_1920x1080-video.mp4 + + + + + + + diff --git a/packager/app/test/testdata/dolby-vision-dvhe-p84-with-supplemental-codecs/stream_0.m3u8 b/packager/app/test/testdata/dolby-vision-dvhe-p84-with-supplemental-codecs/stream_0.m3u8 new file mode 100644 index 00000000000..54d40350c6f --- /dev/null +++ b/packager/app/test/testdata/dolby-vision-dvhe-p84-with-supplemental-codecs/stream_0.m3u8 @@ -0,0 +1,25 @@ +#EXTM3U +#EXT-X-VERSION:6 +## Generated with https://github.com/shaka-project/shaka-packager version -- +#EXT-X-TARGETDURATION:2 +#EXT-X-PLAYLIST-TYPE:VOD +#EXT-X-MAP:URI="color_pattern_24_dvhe_084_1920x1080-video.mp4",BYTERANGE="851@0" +#EXTINF:2.000, +#EXT-X-BYTERANGE:42586@955 +color_pattern_24_dvhe_084_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:42614 +color_pattern_24_dvhe_084_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:42586 +color_pattern_24_dvhe_084_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:42614 +color_pattern_24_dvhe_084_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:42586 +color_pattern_24_dvhe_084_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:42614 +color_pattern_24_dvhe_084_1920x1080-video.mp4 +#EXT-X-ENDLIST diff --git a/packager/app/test/testdata/dolby-vision-dvhe-p84/color_pattern_24_dvhe_084_1920x1080-video.mp4 b/packager/app/test/testdata/dolby-vision-dvhe-p84/color_pattern_24_dvhe_084_1920x1080-video.mp4 new file mode 100644 index 00000000000..0622e986ca6 Binary files /dev/null and b/packager/app/test/testdata/dolby-vision-dvhe-p84/color_pattern_24_dvhe_084_1920x1080-video.mp4 differ diff --git a/packager/app/test/testdata/dolby-vision-dvhe-p84/output.m3u8 b/packager/app/test/testdata/dolby-vision-dvhe-p84/output.m3u8 new file mode 100644 index 00000000000..9b440736da1 --- /dev/null +++ b/packager/app/test/testdata/dolby-vision-dvhe-p84/output.m3u8 @@ -0,0 +1,9 @@ +#EXTM3U +## Generated with https://github.com/shaka-project/shaka-packager version -- + +#EXT-X-INDEPENDENT-SEGMENTS + +#EXT-X-STREAM-INF:BANDWIDTH=170456,AVERAGE-BANDWIDTH=170400,CODECS="hvc1.2.4.L123.b0",RESOLUTION=1920x1080,FRAME-RATE=24.000,CLOSED-CAPTIONS=NONE +stream_0.m3u8 +#EXT-X-STREAM-INF:BANDWIDTH=170456,AVERAGE-BANDWIDTH=170400,CODECS="dvh1.08.03",RESOLUTION=1920x1080,FRAME-RATE=24.000,VIDEO-RANGE=PQ,CLOSED-CAPTIONS=NONE +stream_0.m3u8 diff --git a/packager/app/test/testdata/dolby-vision-dvhe-p84/output.mpd b/packager/app/test/testdata/dolby-vision-dvhe-p84/output.mpd new file mode 100644 index 00000000000..8ccb7a8a669 --- /dev/null +++ b/packager/app/test/testdata/dolby-vision-dvhe-p84/output.mpd @@ -0,0 +1,23 @@ + + + + + + + color_pattern_24_dvhe_084_1920x1080-video.mp4 + + + + + + + + + color_pattern_24_dvhe_084_1920x1080-video.mp4 + + + + + + + diff --git a/packager/app/test/testdata/dolby-vision-dvhe-p84/stream_0.m3u8 b/packager/app/test/testdata/dolby-vision-dvhe-p84/stream_0.m3u8 new file mode 100644 index 00000000000..27f55da439f --- /dev/null +++ b/packager/app/test/testdata/dolby-vision-dvhe-p84/stream_0.m3u8 @@ -0,0 +1,25 @@ +#EXTM3U +#EXT-X-VERSION:6 +## Generated with https://github.com/shaka-project/shaka-packager version -- +#EXT-X-TARGETDURATION:2 +#EXT-X-PLAYLIST-TYPE:VOD +#EXT-X-MAP:URI="color_pattern_24_dvhe_084_1920x1080-video.mp4",BYTERANGE="847@0" +#EXTINF:2.000, +#EXT-X-BYTERANGE:42586@951 +color_pattern_24_dvhe_084_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:42614 +color_pattern_24_dvhe_084_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:42586 +color_pattern_24_dvhe_084_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:42614 +color_pattern_24_dvhe_084_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:42586 +color_pattern_24_dvhe_084_1920x1080-video.mp4 +#EXTINF:2.000, +#EXT-X-BYTERANGE:42614 +color_pattern_24_dvhe_084_1920x1080-video.mp4 +#EXT-X-ENDLIST diff --git a/packager/hls/base/media_playlist.cc b/packager/hls/base/media_playlist.cc index 345b833ce77..cccd7652988 100644 --- a/packager/hls/base/media_playlist.cc +++ b/packager/hls/base/media_playlist.cc @@ -407,11 +407,14 @@ bool MediaPlaylist::SetMediaInfo(const MediaInfo& media_info) { if (media_info.has_video_info()) { stream_type_ = MediaPlaylistStreamType::kVideo; - codec_ = AdjustVideoCodec(media_info.video_info().codec()); + codec_ = hls_params_.strict_codecs_signaling + ? media_info.video_info().codec() + : AdjustVideoCodec(media_info.video_info().codec()); if (media_info.video_info().has_supplemental_codec() && media_info.video_info().has_compatible_brand()) { - supplemental_codec_ = - AdjustVideoCodec(media_info.video_info().supplemental_codec()); + supplemental_codec_ = hls_params_.strict_codecs_signaling + ? media_info.video_info().supplemental_codec() + : AdjustVideoCodec(media_info.video_info().supplemental_codec()); compatible_brand_ = static_cast( media_info.video_info().compatible_brand()); } diff --git a/packager/media/test/data/color_pattern_24_dvh1_081_1920x1080.mp4 b/packager/media/test/data/color_pattern_24_dvh1_081_1920x1080.mp4 new file mode 100644 index 00000000000..5e095eae6ab Binary files /dev/null and b/packager/media/test/data/color_pattern_24_dvh1_081_1920x1080.mp4 differ diff --git a/packager/media/test/data/color_pattern_24_dvh1_084_1920x1080.mp4 b/packager/media/test/data/color_pattern_24_dvh1_084_1920x1080.mp4 new file mode 100644 index 00000000000..6a7f19953a7 Binary files /dev/null and b/packager/media/test/data/color_pattern_24_dvh1_084_1920x1080.mp4 differ diff --git a/packager/media/test/data/color_pattern_24_dvhe_081_1920x1080.mp4 b/packager/media/test/data/color_pattern_24_dvhe_081_1920x1080.mp4 new file mode 100644 index 00000000000..366ac67996b Binary files /dev/null and b/packager/media/test/data/color_pattern_24_dvhe_081_1920x1080.mp4 differ diff --git a/packager/media/test/data/color_pattern_24_dvhe_084_1920x1080.mp4 b/packager/media/test/data/color_pattern_24_dvhe_084_1920x1080.mp4 new file mode 100644 index 00000000000..b265ef6b6c2 Binary files /dev/null and b/packager/media/test/data/color_pattern_24_dvhe_084_1920x1080.mp4 differ