diff --git a/packager/app/test/packager_test.py b/packager/app/test/packager_test.py index 6dc4e7f3bc..36aff4a633 100755 --- a/packager/app/test/packager_test.py +++ b/packager/app/test/packager_test.py @@ -1212,14 +1212,14 @@ class PackagerFunctionalTest(PackagerAppTest): self.assertPackageSuccess(streams, flags) self._CheckTestResults('hdr10-with-encryption') - def testDolbyVisionWithEncryption(self): + def testDolbyVisionProfile5WithEncryption(self): streams = [ - self._GetStream('video', test_file='426x240-dvh1.mp4') + self._GetStream('video', test_file='sparks_dovi_5.mp4') ] flags = self._GetFlags(encryption=True, output_dash=True, output_hls=True) self.assertPackageSuccess(streams, flags) - self._CheckTestResults('dvh1-with-encryption') + self._CheckTestResults('dolby-vision-profile-5-with-encryption') def testVp8Mp4WithEncryption(self): streams = [ diff --git a/packager/app/test/testdata/dolby-vision-profile-5-with-encryption/output.m3u8 b/packager/app/test/testdata/dolby-vision-profile-5-with-encryption/output.m3u8 new file mode 100644 index 0000000000..36fd01d95c --- /dev/null +++ b/packager/app/test/testdata/dolby-vision-profile-5-with-encryption/output.m3u8 @@ -0,0 +1,5 @@ +#EXTM3U +## Generated with https://github.com/google/shaka-packager version -- + +#EXT-X-STREAM-INF:BANDWIDTH=820260,AVERAGE-BANDWIDTH=785273,CODECS="dvh1.05.01",RESOLUTION=640x360,FRAME-RATE=59.940,VIDEO-RANGE=PQ +stream_0.m3u8 diff --git a/packager/app/test/testdata/dvh1-with-encryption/output.mpd b/packager/app/test/testdata/dolby-vision-profile-5-with-encryption/output.mpd similarity index 67% rename from packager/app/test/testdata/dvh1-with-encryption/output.mpd rename to packager/app/test/testdata/dolby-vision-profile-5-with-encryption/output.mpd index e18101a2a9..f779b275d4 100644 --- a/packager/app/test/testdata/dvh1-with-encryption/output.mpd +++ b/packager/app/test/testdata/dolby-vision-profile-5-with-encryption/output.mpd @@ -1,16 +1,16 @@ - + - + AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA== - - 426x240-dvh1-video.mp4 - - + + sparks_dovi_5-video.mp4 + + diff --git a/packager/app/test/testdata/dolby-vision-profile-5-with-encryption/sparks_dovi_5-video.mp4 b/packager/app/test/testdata/dolby-vision-profile-5-with-encryption/sparks_dovi_5-video.mp4 new file mode 100644 index 0000000000..3a036fedd9 Binary files /dev/null and b/packager/app/test/testdata/dolby-vision-profile-5-with-encryption/sparks_dovi_5-video.mp4 differ diff --git a/packager/app/test/testdata/dolby-vision-profile-5-with-encryption/stream_0.m3u8 b/packager/app/test/testdata/dolby-vision-profile-5-with-encryption/stream_0.m3u8 new file mode 100644 index 0000000000..413a58dafa --- /dev/null +++ b/packager/app/test/testdata/dolby-vision-profile-5-with-encryption/stream_0.m3u8 @@ -0,0 +1,20 @@ +#EXTM3U +#EXT-X-VERSION:6 +## Generated with https://github.com/google/shaka-packager version -- +#EXT-X-TARGETDURATION:3 +#EXT-X-PLAYLIST-TYPE:VOD +#EXT-X-MAP:URI="sparks_dovi_5-video.mp4",BYTERANGE="1355@0" +#EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" +#EXTINF:2.002, +#EXT-X-BYTERANGE:185521@1435 +sparks_dovi_5-video.mp4 +#EXTINF:2.002, +#EXT-X-BYTERANGE:197565 +sparks_dovi_5-video.mp4 +#EXTINF:2.002, +#EXT-X-BYTERANGE:205270 +sparks_dovi_5-video.mp4 +#EXTINF:0.017, +#EXT-X-BYTERANGE:2825 +sparks_dovi_5-video.mp4 +#EXT-X-ENDLIST diff --git a/packager/app/test/testdata/dvh1-with-encryption/426x240-dvh1-video.mp4 b/packager/app/test/testdata/dvh1-with-encryption/426x240-dvh1-video.mp4 deleted file mode 100644 index c41c6c4ee4..0000000000 Binary files a/packager/app/test/testdata/dvh1-with-encryption/426x240-dvh1-video.mp4 and /dev/null differ diff --git a/packager/app/test/testdata/dvh1-with-encryption/output.m3u8 b/packager/app/test/testdata/dvh1-with-encryption/output.m3u8 deleted file mode 100644 index c7db8f443c..0000000000 --- a/packager/app/test/testdata/dvh1-with-encryption/output.m3u8 +++ /dev/null @@ -1,5 +0,0 @@ -#EXTM3U -## Generated with https://github.com/google/shaka-packager version -- - -#EXT-X-STREAM-INF:BANDWIDTH=375371,AVERAGE-BANDWIDTH=368196,CODECS="dvh1.05.01",RESOLUTION=426x240,FRAME-RATE=23.810,VIDEO-RANGE=PQ -stream_0.m3u8 diff --git a/packager/app/test/testdata/dvh1-with-encryption/stream_0.m3u8 b/packager/app/test/testdata/dvh1-with-encryption/stream_0.m3u8 deleted file mode 100644 index 013f75d541..0000000000 --- a/packager/app/test/testdata/dvh1-with-encryption/stream_0.m3u8 +++ /dev/null @@ -1,17 +0,0 @@ -#EXTM3U -#EXT-X-VERSION:6 -## Generated with https://github.com/google/shaka-packager version -- -#EXT-X-TARGETDURATION:6 -#EXT-X-PLAYLIST-TYPE:VOD -#EXT-X-MAP:URI="426x240-dvh1-video.mp4",BYTERANGE="1353@0" -#EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity" -#EXTINF:5.005, -#EXT-X-BYTERANGE:234841@1421 -426x240-dvh1-video.mp4 -#EXTINF:5.005, -#EXT-X-BYTERANGE:218284 -426x240-dvh1-video.mp4 -#EXTINF:0.042, -#EXT-X-BYTERANGE:9513 -426x240-dvh1-video.mp4 -#EXT-X-ENDLIST diff --git a/packager/media/test/data/426x240-dvh1.mp4 b/packager/media/test/data/426x240-dvh1.mp4 deleted file mode 100644 index 64bc837222..0000000000 Binary files a/packager/media/test/data/426x240-dvh1.mp4 and /dev/null differ diff --git a/packager/media/test/data/README b/packager/media/test/data/README index b348011794..bb29e4f4f5 100644 --- a/packager/media/test/data/README +++ b/packager/media/test/data/README @@ -107,3 +107,7 @@ hevc-byte-stream-frame.h265 - Several video frames with SPS/PPS/VPS manually ext hevc-byte-stream-frame.h265 - hevc-byte-stream-frame.h265 converted to unit stream format. sintel-1024x436.mp4 - First 6 seconds of Sintel stream. + +// First 6 seconds of Sparks, generated from Netflix open content: +// http://download.opencontent.netflix.com/?prefix=TechblogAssets/Sparks/Sparks_DolbyVision_P3D65_PQ_5994fps_4096x2160_LtRt_IMF_20170214/ +sparks_dovi_5.mp4 - Dolby Vision profile 5 diff --git a/packager/media/test/data/sparks_dovi_5.mp4 b/packager/media/test/data/sparks_dovi_5.mp4 new file mode 100644 index 0000000000..ea010ef77f Binary files /dev/null and b/packager/media/test/data/sparks_dovi_5.mp4 differ