Replace Dolby Vision test content

Issue #341

Change-Id: I530b0768341e352f6ee0a1326540cd5712f01638

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 = [

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 <tag>-<hash>-<test>
+
+#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

packager/app/test/testdata/dolby-vision-profile-5-with-encryption/output.mpd

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--Generated with https://github.com/google/shaka-packager version <tag>-<hash>-<test>-->
-<MPD xmlns="urn:mpeg:dash:schema:mpd:2011" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:mpeg:dash:schema:mpd:2011 DASH-MPD.xsd" xmlns:cenc="urn:mpeg:cenc:2013" profiles="urn:mpeg:dash:profile:isoff-on-demand:2011" minBufferTime="PT2S" type="static" mediaPresentationDuration="PT10.052000045776367S">
+<MPD xmlns="urn:mpeg:dash:schema:mpd:2011" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:mpeg:dash:schema:mpd:2011 DASH-MPD.xsd" xmlns:cenc="urn:mpeg:cenc:2013" profiles="urn:mpeg:dash:profile:isoff-on-demand:2011" minBufferTime="PT2S" type="static" mediaPresentationDuration="PT6.022683143615723S">
   <Period id="0">
-    <AdaptationSet id="0" contentType="video" width="426" height="240" frameRate="1000/42" subsegmentAlignment="true" par="16:9">
+    <AdaptationSet id="0" contentType="video" width="640" height="360" frameRate="60000/1001" subsegmentAlignment="true" par="16:9">
       <ContentProtection value="cenc" schemeIdUri="urn:mpeg:dash:mp4protection:2011" cenc:default_KID="31323334-3536-3738-3930-313233343536"/>
       <ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b">
         <cenc:pssh>AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAExMjM0NTY3ODkwMTIzNDU2AAAAAA==</cenc:pssh>
       </ContentProtection>
-      <Representation id="0" bandwidth="375371" codecs="dvh1.05.01" mimeType="video/mp4" sar="1:1">
+      <Representation id="0" bandwidth="820260" codecs="dvh1.05.01" mimeType="video/mp4" sar="1:1">
-        <BaseURL>426x240-dvh1-video.mp4</BaseURL>
+        <BaseURL>sparks_dovi_5-video.mp4</BaseURL>
-        <SegmentBase indexRange="1353-1420" timescale="1000">
+        <SegmentBase indexRange="1355-1434" timescale="60000">
-          <Initialization range="0-1352"/>
+          <Initialization range="0-1354"/>
         </SegmentBase>
       </Representation>
     </AdaptationSet>

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 <tag>-<hash>-<test>
+#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

packager/app/test/testdata/dvh1-with-encryption/output.m3u8

@@ -1,5 +0,0 @@
-#EXTM3U
-## Generated with https://github.com/google/shaka-packager version <tag>-<hash>-<test>
-
-#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

packager/app/test/testdata/dvh1-with-encryption/stream_0.m3u8

@@ -1,17 +0,0 @@
-#EXTM3U
-#EXT-X-VERSION:6
-## Generated with https://github.com/google/shaka-packager version <tag>-<hash>-<test>
-#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

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