Backed out changeset 3f1afabc2aae (bug 1138294)

dom/media/test/bipbop-cenc-audio-key1.xml

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  This XML file describes the encryption applied to |bipbop_<res>-cenc*|. To
-  generate the encrypted files, run bipbop-cenc.sh
--->
-
-<GPACDRM type="CENC AES-CTR">
-
-  <DRMInfo type="pssh" version="1">
-    <!--
-    SystemID specified in
-    https://dvcs.w3.org/hg/html-media/raw-file/tip/encrypted-media/cenc-format.html
-    -->
-    <BS ID128="1077efecc0b24d02ace33c1e52e2fb4b" />
-    <!-- Number of KeyIDs = 1 -->
-    <BS bits="32" value="1" />
-    <!-- KeyID -->
-    <BS ID128="0x7e571d047e571d047e571d047e571d21" />
-  </DRMInfo>
-
-  <CrypTrack trackID="2" isEncrypted="1" IV_size="16" saiSavedBox="senc"
-    first_IV="0x00000000000000000000000000000000">
-    <key KID="0x7e571d047e571d047e571d047e571d21"
-      value="0x7e5744447e5744447e5744447e574421" />
-  </CrypTrack>
-
-</GPACDRM>

dom/media/test/bipbop-cenc-audio-key2.xml

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  This XML file describes the encryption applied to |bipbop_<res>-cenc*|. To
-  generate the encrypted files, run bipbop-cenc.sh
--->
-
-<GPACDRM type="CENC AES-CTR">
-
-  <DRMInfo type="pssh" version="1">
-    <!--
-    SystemID specified in
-    https://dvcs.w3.org/hg/html-media/raw-file/tip/encrypted-media/cenc-format.html
-    -->
-    <BS ID128="1077efecc0b24d02ace33c1e52e2fb4b" />
-    <!-- Number of KeyIDs = 1 -->
-    <BS bits="32" value="1" />
-    <!-- KeyID -->
-    <BS ID128="0x7e571d047e571d047e571d047e571d22" />
-  </DRMInfo>
-
-  <CrypTrack trackID="2" isEncrypted="1" IV_size="16" saiSavedBox="senc"
-    first_IV="0x00000000000000000000000000000000">
-    <key KID="0x7e571d047e571d047e571d047e571d22"
-      value="0x7e5744447e5744447e5744447e574422" />
-  </CrypTrack>
-
-</GPACDRM>

dom/media/test/bipbop-cenc-video-key1.xml

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  This XML file describes the encryption applied to |bipbop_<res>-cenc*|. To
-  generate the encrypted files, run bipbop-cenc.sh
--->
-
-<GPACDRM type="CENC AES-CTR">
-
-  <DRMInfo type="pssh" version="1">
-    <!--
-    SystemID specified in
-    https://dvcs.w3.org/hg/html-media/raw-file/tip/encrypted-media/cenc-format.html
-    -->
-    <BS ID128="1077efecc0b24d02ace33c1e52e2fb4b" />
-    <!-- Number of KeyIDs = 1 -->
-    <BS bits="32" value="1" />
-    <!-- KeyID -->
-    <BS ID128="0x7e571d037e571d037e571d037e571d11" />
-  </DRMInfo>
-
-  <CrypTrack trackID="1" isEncrypted="1" IV_size="16" saiSavedBox="senc"
-    first_IV="0x00000000000000000000000000000000">
-    <key KID="0x7e571d037e571d037e571d037e571d11"
-      value="0x7e5733337e5733337e5733337e573311" />
-  </CrypTrack>
-
-</GPACDRM>

dom/media/test/bipbop-cenc-video-key2.xml

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  This XML file describes the encryption applied to |bipbop_<res>-cenc*|. To
-  generate the encrypted files, run bipbop-cenc.sh
--->
-
-<GPACDRM type="CENC AES-CTR">
-
-  <DRMInfo type="pssh" version="1">
-    <!--
-    SystemID specified in
-    https://dvcs.w3.org/hg/html-media/raw-file/tip/encrypted-media/cenc-format.html
-    -->
-    <BS ID128="1077efecc0b24d02ace33c1e52e2fb4b" />
-    <!-- Number of KeyIDs = 1 -->
-    <BS bits="32" value="1" />
-    <!-- KeyID -->
-    <BS ID128="0x7e571d037e571d037e571d037e571d12" />
-  </DRMInfo>
-
-  <CrypTrack trackID="1" isEncrypted="1" IV_size="16" saiSavedBox="senc"
-    first_IV="0x00000000000000000000000000000000">
-    <key KID="0x7e571d037e571d037e571d037e571d12"
-      value="0x7e5733337e5733337e5733337e573312" />
-  </CrypTrack>
-
-</GPACDRM>

dom/media/test/bipbop-cenc.sh

@@ -1,29 +0,0 @@
-mkdir work.tmp
-
-for r in 225w_175kbps 300_215kbps 300wp_227kbps 360w_253kbps 480_624kbps 480wp_663kbps 480_959kbps 480wp_1001kbps
-do
-  for k in 1 2
-  do
-    # Encrypt bipbop_<res>.mp4 with the keys specified in this file,
-    # and output to |bipbop_<res>-cenc-{video,audio}.mp4|
-    MP4Box -crypt bipbop-cenc-audio-key${k}.xml -rem 1 -out work.tmp/bipbop_${r}-cenc-audio-key${k}.mp4 bipbop_${r}.mp4
-    MP4Box -crypt bipbop-cenc-video-key${k}.xml -rem 2 -out work.tmp/bipbop_${r}-cenc-video-key${k}.mp4 bipbop_${r}.mp4
-
-    # Fragment |bipbop_<res>-cenc-*.mp4| into 500ms segments:
-    MP4Box -dash 500 -rap -segment-name work.tmp/bipbop_${r}-cenc-audio-key${k}- -subsegs-per-sidx 5 work.tmp/bipbop_${r}-cenc-audio-key${k}.mp4
-    MP4Box -dash 500 -rap -segment-name work.tmp/bipbop_${r}-cenc-video-key${k}- -subsegs-per-sidx 5 work.tmp/bipbop_${r}-cenc-video-key${k}.mp4
-
-    # The above command will generate a set of fragments |bipbop_<res>-cenc-{video,audio}-*.m4s
-    # and |bipbop_<res>-cenc-{video,audio}-init.mp4| containing just the init segment.
-
-    # Remove unneeded mpd files.
-    rm bipbop_${r}-cenc-{audio,video}-key${k}_dash.mpd
-  done
-done
-
-# Only keep the first 4 audio & 2 video segments:
-cp work.tmp/*-init[.]mp4 ./
-cp work.tmp/*audio*-[1234][.]m4s ./
-cp work.tmp/*video*-[12][.]m4s ./
-
-rm -Rf work.tmp

dom/media/test/bipbop-frag-cenc-audio.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This XML file describes the encryption applied to |bipbop-cenc*|. To
+  generate the bipbop-cenc1 files, run the following commands:
+
+  # Encrypt bipbop-no-edts.mp4 with the keys specified in this file,
+  # and output to |bipbop-cenc1-{video,audio}.mp4|
+  MP4Box -crypt bipbop-frag-cenc-video.xml -rem 2 -out bipbop-cenc1-video.mp4 bipbop-no-edts.mp4
+  MP4Box -crypt bipbop-frag-cenc-audio.xml -rem 1 -out bipbop-cenc1-audio.mp4 bipbop-no-edts.mp4
+
+  # Fragment |bipbop-cenc1-*.mp4| into 500ms segments:
+  MP4Box -dash 500 -rap -segment-name bipbop-cenc1-video -subsegs-per-sidx 5 bipbop-cenc1-video.mp4
+  MP4Box -dash 500 -rap -segment-name bipbop-cenc1-audio -subsegs-per-sidx 5 bipbop-cenc1-audio.mp4
+
+  # The above command will generate a set of fragments in |bipbop-cenc1-{video,audio}*.m4s
+  # and |bipbop-cenc1-{video,audio}init.mp4| containing just the init segment.
+
+  # To cut down the duration, we throw out all but the first 3 audio & 2 video segments:
+  rm bipbop-cenc1-audio{[^123],[123][^.]}.m4s
+  rm bipbop-cenc1-video{[^12],[12][^.]}.m4s
+
+  # MP4Box will also have generated some *.mpd files we don't need:
+  rm bipbop-cenc1-*.mpd
+
+  # Delete intermediate encrypted files:
+  rm bipbop-cenc1-{audio,video}.mp4
+-->
+
+<GPACDRM type="CENC AES-CTR">
+
+  <DRMInfo type="pssh" version="1">
+    <!--
+    SystemID specified in
+    https://dvcs.w3.org/hg/html-media/raw-file/tip/encrypted-media/cenc-format.html
+    -->
+    <BS ID128="1077efecc0b24d02ace33c1e52e2fb4b" />
+    <!-- Number of KeyIDs = 1 -->
+    <BS bits="32" value="1" />
+    <!-- KeyID -->
+    <BS ID128="0x7e571d047e571d047e571d047e571d04" />
+  </DRMInfo>
+
+  <CrypTrack trackID="2" isEncrypted="1" IV_size="16" saiSavedBox="senc"
+    first_IV="0x00000000000000000000000000000000">
+    <key KID="0x7e571d047e571d047e571d047e571d04"
+      value="0x7e5744447e5744447e5744447e574444" />
+  </CrypTrack>
+
+</GPACDRM>

dom/media/test/bipbop-frag-cenc-video.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This XML file describes the encryption applied to |bipbop-cenc*|. To
+  generate the bipbop-cenc1 files, run the following commands:
+
+  # Encrypt bipbop-no-edts.mp4 with the keys specified in this file,
+  # and output to |bipbop-cenc1-{video,audio}.mp4|
+  MP4Box -crypt bipbop-frag-cenc-video.xml -rem 2 -out bipbop-cenc1-video.mp4 bipbop-no-edts.mp4
+  MP4Box -crypt bipbop-frag-cenc-audio.xml -rem 1 -out bipbop-cenc1-audio.mp4 bipbop-no-edts.mp4
+
+  # Fragment |bipbop-cenc1-*.mp4| into 500ms segments:
+  MP4Box -dash 500 -rap -segment-name bipbop-cenc1-video -subsegs-per-sidx 5 bipbop-cenc1-video.mp4
+  MP4Box -dash 500 -rap -segment-name bipbop-cenc1-audio -subsegs-per-sidx 5 bipbop-cenc1-audio.mp4
+
+  # The above command will generate a set of fragments in |bipbop-cenc1-{video,audio}*.m4s
+  # and |bipbop-cenc1-{video,audio}init.mp4| containing just the init segment.
+
+  # To cut down the duration, we throw out all but the first 3 audio & 2 video segments:
+  rm bipbop-cenc1-audio{[^123],[123][^.]}.m4s
+  rm bipbop-cenc1-video{[^12],[12][^.]}.m4s
+
+  # MP4Box will also have generated some *.mpd files we don't need:
+  rm bipbop-cenc1-*.mpd
+
+  # Delete intermediate encrypted files:
+  rm bipbop-cenc1-{audio,video}.mp4
+-->
+
+<GPACDRM type="CENC AES-CTR">
+
+  <DRMInfo type="pssh" version="1">
+    <!--
+    SystemID specified in
+    https://dvcs.w3.org/hg/html-media/raw-file/tip/encrypted-media/cenc-format.html
+    -->
+    <BS ID128="1077efecc0b24d02ace33c1e52e2fb4b" />
+    <!-- Number of KeyIDs = 1 -->
+    <BS bits="32" value="1" />
+    <!-- KeyID -->
+    <BS ID128="0x7e571d037e571d037e571d037e571d03" />
+  </DRMInfo>
+
+  <CrypTrack trackID="1" isEncrypted="1" IV_size="16" saiSavedBox="senc"
+    first_IV="0x00000000000000000000000000000000">
+    <key KID="0x7e571d037e571d037e571d037e571d03"
+      value="0x7e5733337e5733337e5733337e573333" />
+  </CrypTrack>
+
+</GPACDRM>