diff --git a/dom/media/test/bipbop-cenc-audio-key1.xml b/dom/media/test/bipbop-cenc-audio-key1.xml new file mode 100644 index 000000000000..a1672eecef4d --- /dev/null +++ b/dom/media/test/bipbop-cenc-audio-key1.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/dom/media/test/bipbop-cenc-audio-key2.xml b/dom/media/test/bipbop-cenc-audio-key2.xml new file mode 100644 index 000000000000..b706609052c0 --- /dev/null +++ b/dom/media/test/bipbop-cenc-audio-key2.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/dom/media/test/bipbop-cenc-video-key1.xml b/dom/media/test/bipbop-cenc-video-key1.xml new file mode 100644 index 000000000000..f0d9878fa25a --- /dev/null +++ b/dom/media/test/bipbop-cenc-video-key1.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/dom/media/test/bipbop-cenc-video-key2.xml b/dom/media/test/bipbop-cenc-video-key2.xml new file mode 100644 index 000000000000..1f320e63368b --- /dev/null +++ b/dom/media/test/bipbop-cenc-video-key2.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/dom/media/test/bipbop-cenc.sh b/dom/media/test/bipbop-cenc.sh new file mode 100755 index 000000000000..a00c38ae80bd --- /dev/null +++ b/dom/media/test/bipbop-cenc.sh @@ -0,0 +1,29 @@ +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_.mp4 with the keys specified in this file, + # and output to |bipbop_-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_-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_-cenc-{video,audio}-*.m4s + # and |bipbop_-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 diff --git a/dom/media/test/bipbop-cenc1-audio3.m4s b/dom/media/test/bipbop-cenc1-audio3.m4s deleted file mode 100644 index ad0cd72f903f..000000000000 Binary files a/dom/media/test/bipbop-cenc1-audio3.m4s and /dev/null differ diff --git a/dom/media/test/bipbop-cenc1-audioinit.mp4 b/dom/media/test/bipbop-cenc1-audioinit.mp4 deleted file mode 100644 index 1fb0078c1d12..000000000000 Binary files a/dom/media/test/bipbop-cenc1-audioinit.mp4 and /dev/null differ diff --git a/dom/media/test/bipbop-cenc1-video1.m4s b/dom/media/test/bipbop-cenc1-video1.m4s deleted file mode 100644 index 755013c11c8f..000000000000 Binary files a/dom/media/test/bipbop-cenc1-video1.m4s and /dev/null differ diff --git a/dom/media/test/bipbop-cenc1-video2.m4s b/dom/media/test/bipbop-cenc1-video2.m4s deleted file mode 100644 index c884bd95fc44..000000000000 Binary files a/dom/media/test/bipbop-cenc1-video2.m4s and /dev/null differ diff --git a/dom/media/test/bipbop-cenc1-videoinit.mp4 b/dom/media/test/bipbop-cenc1-videoinit.mp4 deleted file mode 100644 index 41160099c82f..000000000000 Binary files a/dom/media/test/bipbop-cenc1-videoinit.mp4 and /dev/null differ diff --git a/dom/media/test/bipbop-frag-cenc-audio.xml b/dom/media/test/bipbop-frag-cenc-audio.xml deleted file mode 100644 index eacd9a4f17bd..000000000000 --- a/dom/media/test/bipbop-frag-cenc-audio.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/dom/media/test/bipbop-frag-cenc-video.xml b/dom/media/test/bipbop-frag-cenc-video.xml deleted file mode 100644 index fb8d5b77948f..000000000000 --- a/dom/media/test/bipbop-frag-cenc-video.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/dom/media/test/bipbop-cenc1-audio1.m4s b/dom/media/test/bipbop_225w_175kbps-cenc-audio-key1-1.m4s similarity index 52% rename from dom/media/test/bipbop-cenc1-audio1.m4s rename to dom/media/test/bipbop_225w_175kbps-cenc-audio-key1-1.m4s index 63cfd66f7efc..e2bd754c7e88 100644 Binary files a/dom/media/test/bipbop-cenc1-audio1.m4s and b/dom/media/test/bipbop_225w_175kbps-cenc-audio-key1-1.m4s differ diff --git a/dom/media/test/bipbop-cenc1-audio2.m4s b/dom/media/test/bipbop_225w_175kbps-cenc-audio-key1-2.m4s similarity index 79% rename from dom/media/test/bipbop-cenc1-audio2.m4s rename to dom/media/test/bipbop_225w_175kbps-cenc-audio-key1-2.m4s index 04a6cb6ff9cf..347835feee37 100644 Binary files a/dom/media/test/bipbop-cenc1-audio2.m4s and b/dom/media/test/bipbop_225w_175kbps-cenc-audio-key1-2.m4s differ diff --git a/dom/media/test/bipbop_225w_175kbps-cenc-audio-key1-3.m4s b/dom/media/test/bipbop_225w_175kbps-cenc-audio-key1-3.m4s new file mode 100644 index 000000000000..64b0da69a0b7 Binary files /dev/null and b/dom/media/test/bipbop_225w_175kbps-cenc-audio-key1-3.m4s differ diff --git a/dom/media/test/bipbop_225w_175kbps-cenc-audio-key1-4.m4s b/dom/media/test/bipbop_225w_175kbps-cenc-audio-key1-4.m4s new file mode 100644 index 000000000000..864f4248af7d Binary files /dev/null and b/dom/media/test/bipbop_225w_175kbps-cenc-audio-key1-4.m4s differ diff --git a/dom/media/test/bipbop_225w_175kbps-cenc-audio-key1-init.mp4 b/dom/media/test/bipbop_225w_175kbps-cenc-audio-key1-init.mp4 new file mode 100644 index 000000000000..40c3a7bb980c Binary files /dev/null and b/dom/media/test/bipbop_225w_175kbps-cenc-audio-key1-init.mp4 differ diff --git a/dom/media/test/bipbop_225w_175kbps-cenc-audio-key2-1.m4s b/dom/media/test/bipbop_225w_175kbps-cenc-audio-key2-1.m4s new file mode 100644 index 000000000000..a8896e069a50 Binary files /dev/null and b/dom/media/test/bipbop_225w_175kbps-cenc-audio-key2-1.m4s differ diff --git a/dom/media/test/bipbop_225w_175kbps-cenc-audio-key2-2.m4s b/dom/media/test/bipbop_225w_175kbps-cenc-audio-key2-2.m4s new file mode 100644 index 000000000000..0f0a35ce797e Binary files /dev/null and b/dom/media/test/bipbop_225w_175kbps-cenc-audio-key2-2.m4s differ diff --git a/dom/media/test/bipbop_225w_175kbps-cenc-audio-key2-3.m4s b/dom/media/test/bipbop_225w_175kbps-cenc-audio-key2-3.m4s new file mode 100644 index 000000000000..fece52ff42b0 Binary files /dev/null and b/dom/media/test/bipbop_225w_175kbps-cenc-audio-key2-3.m4s differ diff --git a/dom/media/test/bipbop_225w_175kbps-cenc-audio-key2-4.m4s b/dom/media/test/bipbop_225w_175kbps-cenc-audio-key2-4.m4s new file mode 100644 index 000000000000..70e61e3d5f5e Binary files /dev/null and b/dom/media/test/bipbop_225w_175kbps-cenc-audio-key2-4.m4s differ diff --git a/dom/media/test/bipbop_225w_175kbps-cenc-audio-key2-init.mp4 b/dom/media/test/bipbop_225w_175kbps-cenc-audio-key2-init.mp4 new file mode 100644 index 000000000000..986e5fb186ea Binary files /dev/null and b/dom/media/test/bipbop_225w_175kbps-cenc-audio-key2-init.mp4 differ diff --git a/dom/media/test/bipbop_225w_175kbps-cenc-video-key1-1.m4s b/dom/media/test/bipbop_225w_175kbps-cenc-video-key1-1.m4s new file mode 100644 index 000000000000..547950e51613 Binary files /dev/null and b/dom/media/test/bipbop_225w_175kbps-cenc-video-key1-1.m4s differ diff --git a/dom/media/test/bipbop_225w_175kbps-cenc-video-key1-init.mp4 b/dom/media/test/bipbop_225w_175kbps-cenc-video-key1-init.mp4 new file mode 100644 index 000000000000..3214f131d4a7 Binary files /dev/null and b/dom/media/test/bipbop_225w_175kbps-cenc-video-key1-init.mp4 differ diff --git a/dom/media/test/bipbop_225w_175kbps-cenc-video-key2-1.m4s b/dom/media/test/bipbop_225w_175kbps-cenc-video-key2-1.m4s new file mode 100644 index 000000000000..08713078d9ff Binary files /dev/null and b/dom/media/test/bipbop_225w_175kbps-cenc-video-key2-1.m4s differ diff --git a/dom/media/test/bipbop_225w_175kbps-cenc-video-key2-init.mp4 b/dom/media/test/bipbop_225w_175kbps-cenc-video-key2-init.mp4 new file mode 100644 index 000000000000..0b13fed5f0f8 Binary files /dev/null and b/dom/media/test/bipbop_225w_175kbps-cenc-video-key2-init.mp4 differ diff --git a/dom/media/test/bipbop_225w_175kbps.mp4 b/dom/media/test/bipbop_225w_175kbps.mp4 new file mode 100644 index 000000000000..abe37b9f9d4e Binary files /dev/null and b/dom/media/test/bipbop_225w_175kbps.mp4 differ diff --git a/dom/media/test/bipbop_300_215kbps-cenc-audio-key1-1.m4s b/dom/media/test/bipbop_300_215kbps-cenc-audio-key1-1.m4s new file mode 100644 index 000000000000..e2bd754c7e88 Binary files /dev/null and b/dom/media/test/bipbop_300_215kbps-cenc-audio-key1-1.m4s differ diff --git a/dom/media/test/bipbop_300_215kbps-cenc-audio-key1-2.m4s b/dom/media/test/bipbop_300_215kbps-cenc-audio-key1-2.m4s new file mode 100644 index 000000000000..347835feee37 Binary files /dev/null and b/dom/media/test/bipbop_300_215kbps-cenc-audio-key1-2.m4s differ diff --git a/dom/media/test/bipbop_300_215kbps-cenc-audio-key1-3.m4s b/dom/media/test/bipbop_300_215kbps-cenc-audio-key1-3.m4s new file mode 100644 index 000000000000..64b0da69a0b7 Binary files /dev/null and b/dom/media/test/bipbop_300_215kbps-cenc-audio-key1-3.m4s differ diff --git a/dom/media/test/bipbop_300_215kbps-cenc-audio-key1-4.m4s b/dom/media/test/bipbop_300_215kbps-cenc-audio-key1-4.m4s new file mode 100644 index 000000000000..864f4248af7d Binary files /dev/null and b/dom/media/test/bipbop_300_215kbps-cenc-audio-key1-4.m4s differ diff --git a/dom/media/test/bipbop_300_215kbps-cenc-audio-key1-init.mp4 b/dom/media/test/bipbop_300_215kbps-cenc-audio-key1-init.mp4 new file mode 100644 index 000000000000..21f3863274e9 Binary files /dev/null and b/dom/media/test/bipbop_300_215kbps-cenc-audio-key1-init.mp4 differ diff --git a/dom/media/test/bipbop_300_215kbps-cenc-audio-key2-1.m4s b/dom/media/test/bipbop_300_215kbps-cenc-audio-key2-1.m4s new file mode 100644 index 000000000000..a8896e069a50 Binary files /dev/null and b/dom/media/test/bipbop_300_215kbps-cenc-audio-key2-1.m4s differ diff --git a/dom/media/test/bipbop_300_215kbps-cenc-audio-key2-2.m4s b/dom/media/test/bipbop_300_215kbps-cenc-audio-key2-2.m4s new file mode 100644 index 000000000000..0f0a35ce797e Binary files /dev/null and b/dom/media/test/bipbop_300_215kbps-cenc-audio-key2-2.m4s differ diff --git a/dom/media/test/bipbop_300_215kbps-cenc-audio-key2-3.m4s b/dom/media/test/bipbop_300_215kbps-cenc-audio-key2-3.m4s new file mode 100644 index 000000000000..fece52ff42b0 Binary files /dev/null and b/dom/media/test/bipbop_300_215kbps-cenc-audio-key2-3.m4s differ diff --git a/dom/media/test/bipbop_300_215kbps-cenc-audio-key2-4.m4s b/dom/media/test/bipbop_300_215kbps-cenc-audio-key2-4.m4s new file mode 100644 index 000000000000..70e61e3d5f5e Binary files /dev/null and b/dom/media/test/bipbop_300_215kbps-cenc-audio-key2-4.m4s differ diff --git a/dom/media/test/bipbop_300_215kbps-cenc-audio-key2-init.mp4 b/dom/media/test/bipbop_300_215kbps-cenc-audio-key2-init.mp4 new file mode 100644 index 000000000000..bc741cdf86d4 Binary files /dev/null and b/dom/media/test/bipbop_300_215kbps-cenc-audio-key2-init.mp4 differ diff --git a/dom/media/test/bipbop_300_215kbps-cenc-video-key1-1.m4s b/dom/media/test/bipbop_300_215kbps-cenc-video-key1-1.m4s new file mode 100644 index 000000000000..9c6818d06f2b Binary files /dev/null and b/dom/media/test/bipbop_300_215kbps-cenc-video-key1-1.m4s differ diff --git a/dom/media/test/bipbop_300_215kbps-cenc-video-key1-2.m4s b/dom/media/test/bipbop_300_215kbps-cenc-video-key1-2.m4s new file mode 100644 index 000000000000..f327aaa5739e Binary files /dev/null and b/dom/media/test/bipbop_300_215kbps-cenc-video-key1-2.m4s differ diff --git a/dom/media/test/bipbop_300_215kbps-cenc-video-key1-init.mp4 b/dom/media/test/bipbop_300_215kbps-cenc-video-key1-init.mp4 new file mode 100644 index 000000000000..543f18c24bbf Binary files /dev/null and b/dom/media/test/bipbop_300_215kbps-cenc-video-key1-init.mp4 differ diff --git a/dom/media/test/bipbop_300_215kbps-cenc-video-key2-1.m4s b/dom/media/test/bipbop_300_215kbps-cenc-video-key2-1.m4s new file mode 100644 index 000000000000..f850ceaf0ade Binary files /dev/null and b/dom/media/test/bipbop_300_215kbps-cenc-video-key2-1.m4s differ diff --git a/dom/media/test/bipbop_300_215kbps-cenc-video-key2-2.m4s b/dom/media/test/bipbop_300_215kbps-cenc-video-key2-2.m4s new file mode 100644 index 000000000000..a28a106dafdd Binary files /dev/null and b/dom/media/test/bipbop_300_215kbps-cenc-video-key2-2.m4s differ diff --git a/dom/media/test/bipbop_300_215kbps-cenc-video-key2-init.mp4 b/dom/media/test/bipbop_300_215kbps-cenc-video-key2-init.mp4 new file mode 100644 index 000000000000..a05a87997009 Binary files /dev/null and b/dom/media/test/bipbop_300_215kbps-cenc-video-key2-init.mp4 differ diff --git a/dom/media/test/bipbop_300_215kbps.mp4 b/dom/media/test/bipbop_300_215kbps.mp4 new file mode 100644 index 000000000000..af01e5fa3783 Binary files /dev/null and b/dom/media/test/bipbop_300_215kbps.mp4 differ diff --git a/dom/media/test/bipbop_300wp_227kbps-cenc-audio-key1-1.m4s b/dom/media/test/bipbop_300wp_227kbps-cenc-audio-key1-1.m4s new file mode 100644 index 000000000000..e2bd754c7e88 Binary files /dev/null and b/dom/media/test/bipbop_300wp_227kbps-cenc-audio-key1-1.m4s differ diff --git a/dom/media/test/bipbop_300wp_227kbps-cenc-audio-key1-2.m4s b/dom/media/test/bipbop_300wp_227kbps-cenc-audio-key1-2.m4s new file mode 100644 index 000000000000..347835feee37 Binary files /dev/null and b/dom/media/test/bipbop_300wp_227kbps-cenc-audio-key1-2.m4s differ diff --git a/dom/media/test/bipbop_300wp_227kbps-cenc-audio-key1-3.m4s b/dom/media/test/bipbop_300wp_227kbps-cenc-audio-key1-3.m4s new file mode 100644 index 000000000000..64b0da69a0b7 Binary files /dev/null and b/dom/media/test/bipbop_300wp_227kbps-cenc-audio-key1-3.m4s differ diff --git a/dom/media/test/bipbop_300wp_227kbps-cenc-audio-key1-4.m4s b/dom/media/test/bipbop_300wp_227kbps-cenc-audio-key1-4.m4s new file mode 100644 index 000000000000..864f4248af7d Binary files /dev/null and b/dom/media/test/bipbop_300wp_227kbps-cenc-audio-key1-4.m4s differ diff --git a/dom/media/test/bipbop_300wp_227kbps-cenc-audio-key1-init.mp4 b/dom/media/test/bipbop_300wp_227kbps-cenc-audio-key1-init.mp4 new file mode 100644 index 000000000000..40c3a7bb980c Binary files /dev/null and b/dom/media/test/bipbop_300wp_227kbps-cenc-audio-key1-init.mp4 differ diff --git a/dom/media/test/bipbop_300wp_227kbps-cenc-audio-key2-1.m4s b/dom/media/test/bipbop_300wp_227kbps-cenc-audio-key2-1.m4s new file mode 100644 index 000000000000..a8896e069a50 Binary files /dev/null and b/dom/media/test/bipbop_300wp_227kbps-cenc-audio-key2-1.m4s differ diff --git a/dom/media/test/bipbop_300wp_227kbps-cenc-audio-key2-2.m4s b/dom/media/test/bipbop_300wp_227kbps-cenc-audio-key2-2.m4s new file mode 100644 index 000000000000..0f0a35ce797e Binary files /dev/null and b/dom/media/test/bipbop_300wp_227kbps-cenc-audio-key2-2.m4s differ diff --git a/dom/media/test/bipbop_300wp_227kbps-cenc-audio-key2-3.m4s b/dom/media/test/bipbop_300wp_227kbps-cenc-audio-key2-3.m4s new file mode 100644 index 000000000000..fece52ff42b0 Binary files /dev/null and b/dom/media/test/bipbop_300wp_227kbps-cenc-audio-key2-3.m4s differ diff --git a/dom/media/test/bipbop_300wp_227kbps-cenc-audio-key2-4.m4s b/dom/media/test/bipbop_300wp_227kbps-cenc-audio-key2-4.m4s new file mode 100644 index 000000000000..70e61e3d5f5e Binary files /dev/null and b/dom/media/test/bipbop_300wp_227kbps-cenc-audio-key2-4.m4s differ diff --git a/dom/media/test/bipbop_300wp_227kbps-cenc-audio-key2-init.mp4 b/dom/media/test/bipbop_300wp_227kbps-cenc-audio-key2-init.mp4 new file mode 100644 index 000000000000..986e5fb186ea Binary files /dev/null and b/dom/media/test/bipbop_300wp_227kbps-cenc-audio-key2-init.mp4 differ diff --git a/dom/media/test/bipbop_300wp_227kbps-cenc-video-key1-1.m4s b/dom/media/test/bipbop_300wp_227kbps-cenc-video-key1-1.m4s new file mode 100644 index 000000000000..9c6818d06f2b Binary files /dev/null and b/dom/media/test/bipbop_300wp_227kbps-cenc-video-key1-1.m4s differ diff --git a/dom/media/test/bipbop_300wp_227kbps-cenc-video-key1-2.m4s b/dom/media/test/bipbop_300wp_227kbps-cenc-video-key1-2.m4s new file mode 100644 index 000000000000..ce2e64eb33e5 Binary files /dev/null and b/dom/media/test/bipbop_300wp_227kbps-cenc-video-key1-2.m4s differ diff --git a/dom/media/test/bipbop_300wp_227kbps-cenc-video-key1-init.mp4 b/dom/media/test/bipbop_300wp_227kbps-cenc-video-key1-init.mp4 new file mode 100644 index 000000000000..8592a5b0a3c0 Binary files /dev/null and b/dom/media/test/bipbop_300wp_227kbps-cenc-video-key1-init.mp4 differ diff --git a/dom/media/test/bipbop_300wp_227kbps-cenc-video-key2-1.m4s b/dom/media/test/bipbop_300wp_227kbps-cenc-video-key2-1.m4s new file mode 100644 index 000000000000..f850ceaf0ade Binary files /dev/null and b/dom/media/test/bipbop_300wp_227kbps-cenc-video-key2-1.m4s differ diff --git a/dom/media/test/bipbop_300wp_227kbps-cenc-video-key2-2.m4s b/dom/media/test/bipbop_300wp_227kbps-cenc-video-key2-2.m4s new file mode 100644 index 000000000000..d07ce9753e71 Binary files /dev/null and b/dom/media/test/bipbop_300wp_227kbps-cenc-video-key2-2.m4s differ diff --git a/dom/media/test/bipbop_300wp_227kbps-cenc-video-key2-init.mp4 b/dom/media/test/bipbop_300wp_227kbps-cenc-video-key2-init.mp4 new file mode 100644 index 000000000000..9d2fa23dd418 Binary files /dev/null and b/dom/media/test/bipbop_300wp_227kbps-cenc-video-key2-init.mp4 differ diff --git a/dom/media/test/bipbop_300wp_227kbps.mp4 b/dom/media/test/bipbop_300wp_227kbps.mp4 new file mode 100644 index 000000000000..14993553131a Binary files /dev/null and b/dom/media/test/bipbop_300wp_227kbps.mp4 differ diff --git a/dom/media/test/bipbop_360w_253kbps-cenc-audio-key1-1.m4s b/dom/media/test/bipbop_360w_253kbps-cenc-audio-key1-1.m4s new file mode 100644 index 000000000000..e2bd754c7e88 Binary files /dev/null and b/dom/media/test/bipbop_360w_253kbps-cenc-audio-key1-1.m4s differ diff --git a/dom/media/test/bipbop_360w_253kbps-cenc-audio-key1-2.m4s b/dom/media/test/bipbop_360w_253kbps-cenc-audio-key1-2.m4s new file mode 100644 index 000000000000..347835feee37 Binary files /dev/null and b/dom/media/test/bipbop_360w_253kbps-cenc-audio-key1-2.m4s differ diff --git a/dom/media/test/bipbop_360w_253kbps-cenc-audio-key1-3.m4s b/dom/media/test/bipbop_360w_253kbps-cenc-audio-key1-3.m4s new file mode 100644 index 000000000000..64b0da69a0b7 Binary files /dev/null and b/dom/media/test/bipbop_360w_253kbps-cenc-audio-key1-3.m4s differ diff --git a/dom/media/test/bipbop_360w_253kbps-cenc-audio-key1-4.m4s b/dom/media/test/bipbop_360w_253kbps-cenc-audio-key1-4.m4s new file mode 100644 index 000000000000..864f4248af7d Binary files /dev/null and b/dom/media/test/bipbop_360w_253kbps-cenc-audio-key1-4.m4s differ diff --git a/dom/media/test/bipbop_360w_253kbps-cenc-audio-key1-init.mp4 b/dom/media/test/bipbop_360w_253kbps-cenc-audio-key1-init.mp4 new file mode 100644 index 000000000000..40c3a7bb980c Binary files /dev/null and b/dom/media/test/bipbop_360w_253kbps-cenc-audio-key1-init.mp4 differ diff --git a/dom/media/test/bipbop_360w_253kbps-cenc-audio-key2-1.m4s b/dom/media/test/bipbop_360w_253kbps-cenc-audio-key2-1.m4s new file mode 100644 index 000000000000..a8896e069a50 Binary files /dev/null and b/dom/media/test/bipbop_360w_253kbps-cenc-audio-key2-1.m4s differ diff --git a/dom/media/test/bipbop_360w_253kbps-cenc-audio-key2-2.m4s b/dom/media/test/bipbop_360w_253kbps-cenc-audio-key2-2.m4s new file mode 100644 index 000000000000..0f0a35ce797e Binary files /dev/null and b/dom/media/test/bipbop_360w_253kbps-cenc-audio-key2-2.m4s differ diff --git a/dom/media/test/bipbop_360w_253kbps-cenc-audio-key2-3.m4s b/dom/media/test/bipbop_360w_253kbps-cenc-audio-key2-3.m4s new file mode 100644 index 000000000000..fece52ff42b0 Binary files /dev/null and b/dom/media/test/bipbop_360w_253kbps-cenc-audio-key2-3.m4s differ diff --git a/dom/media/test/bipbop_360w_253kbps-cenc-audio-key2-4.m4s b/dom/media/test/bipbop_360w_253kbps-cenc-audio-key2-4.m4s new file mode 100644 index 000000000000..70e61e3d5f5e Binary files /dev/null and b/dom/media/test/bipbop_360w_253kbps-cenc-audio-key2-4.m4s differ diff --git a/dom/media/test/bipbop_360w_253kbps-cenc-audio-key2-init.mp4 b/dom/media/test/bipbop_360w_253kbps-cenc-audio-key2-init.mp4 new file mode 100644 index 000000000000..986e5fb186ea Binary files /dev/null and b/dom/media/test/bipbop_360w_253kbps-cenc-audio-key2-init.mp4 differ diff --git a/dom/media/test/bipbop_360w_253kbps-cenc-video-key1-1.m4s b/dom/media/test/bipbop_360w_253kbps-cenc-video-key1-1.m4s new file mode 100644 index 000000000000..a571d47cfbb7 Binary files /dev/null and b/dom/media/test/bipbop_360w_253kbps-cenc-video-key1-1.m4s differ diff --git a/dom/media/test/bipbop_360w_253kbps-cenc-video-key1-init.mp4 b/dom/media/test/bipbop_360w_253kbps-cenc-video-key1-init.mp4 new file mode 100644 index 000000000000..42dbfec1ed3f Binary files /dev/null and b/dom/media/test/bipbop_360w_253kbps-cenc-video-key1-init.mp4 differ diff --git a/dom/media/test/bipbop_360w_253kbps-cenc-video-key2-1.m4s b/dom/media/test/bipbop_360w_253kbps-cenc-video-key2-1.m4s new file mode 100644 index 000000000000..9e4224cac8c6 Binary files /dev/null and b/dom/media/test/bipbop_360w_253kbps-cenc-video-key2-1.m4s differ diff --git a/dom/media/test/bipbop_360w_253kbps-cenc-video-key2-init.mp4 b/dom/media/test/bipbop_360w_253kbps-cenc-video-key2-init.mp4 new file mode 100644 index 000000000000..21763ecbddaa Binary files /dev/null and b/dom/media/test/bipbop_360w_253kbps-cenc-video-key2-init.mp4 differ diff --git a/dom/media/test/bipbop_360w_253kbps.mp4 b/dom/media/test/bipbop_360w_253kbps.mp4 new file mode 100644 index 000000000000..6c796f4e1fe7 Binary files /dev/null and b/dom/media/test/bipbop_360w_253kbps.mp4 differ diff --git a/dom/media/test/bipbop_480_624kbps-cenc-audio-key1-1.m4s b/dom/media/test/bipbop_480_624kbps-cenc-audio-key1-1.m4s new file mode 100644 index 000000000000..e2bd754c7e88 Binary files /dev/null and b/dom/media/test/bipbop_480_624kbps-cenc-audio-key1-1.m4s differ diff --git a/dom/media/test/bipbop_480_624kbps-cenc-audio-key1-2.m4s b/dom/media/test/bipbop_480_624kbps-cenc-audio-key1-2.m4s new file mode 100644 index 000000000000..347835feee37 Binary files /dev/null and b/dom/media/test/bipbop_480_624kbps-cenc-audio-key1-2.m4s differ diff --git a/dom/media/test/bipbop_480_624kbps-cenc-audio-key1-3.m4s b/dom/media/test/bipbop_480_624kbps-cenc-audio-key1-3.m4s new file mode 100644 index 000000000000..64b0da69a0b7 Binary files /dev/null and b/dom/media/test/bipbop_480_624kbps-cenc-audio-key1-3.m4s differ diff --git a/dom/media/test/bipbop_480_624kbps-cenc-audio-key1-4.m4s b/dom/media/test/bipbop_480_624kbps-cenc-audio-key1-4.m4s new file mode 100644 index 000000000000..864f4248af7d Binary files /dev/null and b/dom/media/test/bipbop_480_624kbps-cenc-audio-key1-4.m4s differ diff --git a/dom/media/test/bipbop_480_624kbps-cenc-audio-key1-init.mp4 b/dom/media/test/bipbop_480_624kbps-cenc-audio-key1-init.mp4 new file mode 100644 index 000000000000..e626fa4564ed Binary files /dev/null and b/dom/media/test/bipbop_480_624kbps-cenc-audio-key1-init.mp4 differ diff --git a/dom/media/test/bipbop_480_624kbps-cenc-audio-key2-1.m4s b/dom/media/test/bipbop_480_624kbps-cenc-audio-key2-1.m4s new file mode 100644 index 000000000000..a8896e069a50 Binary files /dev/null and b/dom/media/test/bipbop_480_624kbps-cenc-audio-key2-1.m4s differ diff --git a/dom/media/test/bipbop_480_624kbps-cenc-audio-key2-2.m4s b/dom/media/test/bipbop_480_624kbps-cenc-audio-key2-2.m4s new file mode 100644 index 000000000000..0f0a35ce797e Binary files /dev/null and b/dom/media/test/bipbop_480_624kbps-cenc-audio-key2-2.m4s differ diff --git a/dom/media/test/bipbop_480_624kbps-cenc-audio-key2-3.m4s b/dom/media/test/bipbop_480_624kbps-cenc-audio-key2-3.m4s new file mode 100644 index 000000000000..fece52ff42b0 Binary files /dev/null and b/dom/media/test/bipbop_480_624kbps-cenc-audio-key2-3.m4s differ diff --git a/dom/media/test/bipbop_480_624kbps-cenc-audio-key2-4.m4s b/dom/media/test/bipbop_480_624kbps-cenc-audio-key2-4.m4s new file mode 100644 index 000000000000..70e61e3d5f5e Binary files /dev/null and b/dom/media/test/bipbop_480_624kbps-cenc-audio-key2-4.m4s differ diff --git a/dom/media/test/bipbop_480_624kbps-cenc-audio-key2-init.mp4 b/dom/media/test/bipbop_480_624kbps-cenc-audio-key2-init.mp4 new file mode 100644 index 000000000000..d7cbb2b6b05e Binary files /dev/null and b/dom/media/test/bipbop_480_624kbps-cenc-audio-key2-init.mp4 differ diff --git a/dom/media/test/bipbop_480_624kbps-cenc-video-key1-1.m4s b/dom/media/test/bipbop_480_624kbps-cenc-video-key1-1.m4s new file mode 100644 index 000000000000..805f4bbf3fd3 Binary files /dev/null and b/dom/media/test/bipbop_480_624kbps-cenc-video-key1-1.m4s differ diff --git a/dom/media/test/bipbop_480_624kbps-cenc-video-key1-2.m4s b/dom/media/test/bipbop_480_624kbps-cenc-video-key1-2.m4s new file mode 100644 index 000000000000..5bf99947335c Binary files /dev/null and b/dom/media/test/bipbop_480_624kbps-cenc-video-key1-2.m4s differ diff --git a/dom/media/test/bipbop_480_624kbps-cenc-video-key1-init.mp4 b/dom/media/test/bipbop_480_624kbps-cenc-video-key1-init.mp4 new file mode 100644 index 000000000000..77c7daba5a52 Binary files /dev/null and b/dom/media/test/bipbop_480_624kbps-cenc-video-key1-init.mp4 differ diff --git a/dom/media/test/bipbop_480_624kbps-cenc-video-key2-1.m4s b/dom/media/test/bipbop_480_624kbps-cenc-video-key2-1.m4s new file mode 100644 index 000000000000..c5127beec9ec Binary files /dev/null and b/dom/media/test/bipbop_480_624kbps-cenc-video-key2-1.m4s differ diff --git a/dom/media/test/bipbop_480_624kbps-cenc-video-key2-2.m4s b/dom/media/test/bipbop_480_624kbps-cenc-video-key2-2.m4s new file mode 100644 index 000000000000..b0ff51f74a69 Binary files /dev/null and b/dom/media/test/bipbop_480_624kbps-cenc-video-key2-2.m4s differ diff --git a/dom/media/test/bipbop_480_624kbps-cenc-video-key2-init.mp4 b/dom/media/test/bipbop_480_624kbps-cenc-video-key2-init.mp4 new file mode 100644 index 000000000000..cfa099c04323 Binary files /dev/null and b/dom/media/test/bipbop_480_624kbps-cenc-video-key2-init.mp4 differ diff --git a/dom/media/test/bipbop_480_624kbps.mp4 b/dom/media/test/bipbop_480_624kbps.mp4 new file mode 100644 index 000000000000..27928b85f4f5 Binary files /dev/null and b/dom/media/test/bipbop_480_624kbps.mp4 differ diff --git a/dom/media/test/bipbop_480_959kbps-cenc-audio-key1-1.m4s b/dom/media/test/bipbop_480_959kbps-cenc-audio-key1-1.m4s new file mode 100644 index 000000000000..e2bd754c7e88 Binary files /dev/null and b/dom/media/test/bipbop_480_959kbps-cenc-audio-key1-1.m4s differ diff --git a/dom/media/test/bipbop_480_959kbps-cenc-audio-key1-2.m4s b/dom/media/test/bipbop_480_959kbps-cenc-audio-key1-2.m4s new file mode 100644 index 000000000000..347835feee37 Binary files /dev/null and b/dom/media/test/bipbop_480_959kbps-cenc-audio-key1-2.m4s differ diff --git a/dom/media/test/bipbop_480_959kbps-cenc-audio-key1-3.m4s b/dom/media/test/bipbop_480_959kbps-cenc-audio-key1-3.m4s new file mode 100644 index 000000000000..64b0da69a0b7 Binary files /dev/null and b/dom/media/test/bipbop_480_959kbps-cenc-audio-key1-3.m4s differ diff --git a/dom/media/test/bipbop_480_959kbps-cenc-audio-key1-4.m4s b/dom/media/test/bipbop_480_959kbps-cenc-audio-key1-4.m4s new file mode 100644 index 000000000000..864f4248af7d Binary files /dev/null and b/dom/media/test/bipbop_480_959kbps-cenc-audio-key1-4.m4s differ diff --git a/dom/media/test/bipbop_480_959kbps-cenc-audio-key1-init.mp4 b/dom/media/test/bipbop_480_959kbps-cenc-audio-key1-init.mp4 new file mode 100644 index 000000000000..c9106aad999c Binary files /dev/null and b/dom/media/test/bipbop_480_959kbps-cenc-audio-key1-init.mp4 differ diff --git a/dom/media/test/bipbop_480_959kbps-cenc-audio-key2-1.m4s b/dom/media/test/bipbop_480_959kbps-cenc-audio-key2-1.m4s new file mode 100644 index 000000000000..a8896e069a50 Binary files /dev/null and b/dom/media/test/bipbop_480_959kbps-cenc-audio-key2-1.m4s differ diff --git a/dom/media/test/bipbop_480_959kbps-cenc-audio-key2-2.m4s b/dom/media/test/bipbop_480_959kbps-cenc-audio-key2-2.m4s new file mode 100644 index 000000000000..0f0a35ce797e Binary files /dev/null and b/dom/media/test/bipbop_480_959kbps-cenc-audio-key2-2.m4s differ diff --git a/dom/media/test/bipbop_480_959kbps-cenc-audio-key2-3.m4s b/dom/media/test/bipbop_480_959kbps-cenc-audio-key2-3.m4s new file mode 100644 index 000000000000..fece52ff42b0 Binary files /dev/null and b/dom/media/test/bipbop_480_959kbps-cenc-audio-key2-3.m4s differ diff --git a/dom/media/test/bipbop_480_959kbps-cenc-audio-key2-4.m4s b/dom/media/test/bipbop_480_959kbps-cenc-audio-key2-4.m4s new file mode 100644 index 000000000000..70e61e3d5f5e Binary files /dev/null and b/dom/media/test/bipbop_480_959kbps-cenc-audio-key2-4.m4s differ diff --git a/dom/media/test/bipbop_480_959kbps-cenc-audio-key2-init.mp4 b/dom/media/test/bipbop_480_959kbps-cenc-audio-key2-init.mp4 new file mode 100644 index 000000000000..888b20ab639e Binary files /dev/null and b/dom/media/test/bipbop_480_959kbps-cenc-audio-key2-init.mp4 differ diff --git a/dom/media/test/bipbop_480_959kbps-cenc-video-key1-1.m4s b/dom/media/test/bipbop_480_959kbps-cenc-video-key1-1.m4s new file mode 100644 index 000000000000..796ad1367005 Binary files /dev/null and b/dom/media/test/bipbop_480_959kbps-cenc-video-key1-1.m4s differ diff --git a/dom/media/test/bipbop_480_959kbps-cenc-video-key1-2.m4s b/dom/media/test/bipbop_480_959kbps-cenc-video-key1-2.m4s new file mode 100644 index 000000000000..d02be53198d1 Binary files /dev/null and b/dom/media/test/bipbop_480_959kbps-cenc-video-key1-2.m4s differ diff --git a/dom/media/test/bipbop_480_959kbps-cenc-video-key1-init.mp4 b/dom/media/test/bipbop_480_959kbps-cenc-video-key1-init.mp4 new file mode 100644 index 000000000000..6e0c60f98659 Binary files /dev/null and b/dom/media/test/bipbop_480_959kbps-cenc-video-key1-init.mp4 differ diff --git a/dom/media/test/bipbop_480_959kbps-cenc-video-key2-1.m4s b/dom/media/test/bipbop_480_959kbps-cenc-video-key2-1.m4s new file mode 100644 index 000000000000..06778e6f2bd7 Binary files /dev/null and b/dom/media/test/bipbop_480_959kbps-cenc-video-key2-1.m4s differ diff --git a/dom/media/test/bipbop_480_959kbps-cenc-video-key2-2.m4s b/dom/media/test/bipbop_480_959kbps-cenc-video-key2-2.m4s new file mode 100644 index 000000000000..4c1c603e8db7 Binary files /dev/null and b/dom/media/test/bipbop_480_959kbps-cenc-video-key2-2.m4s differ diff --git a/dom/media/test/bipbop_480_959kbps-cenc-video-key2-init.mp4 b/dom/media/test/bipbop_480_959kbps-cenc-video-key2-init.mp4 new file mode 100644 index 000000000000..f4a98eca97e6 Binary files /dev/null and b/dom/media/test/bipbop_480_959kbps-cenc-video-key2-init.mp4 differ diff --git a/dom/media/test/bipbop_480_959kbps.mp4 b/dom/media/test/bipbop_480_959kbps.mp4 new file mode 100644 index 000000000000..4a9f2ee82388 Binary files /dev/null and b/dom/media/test/bipbop_480_959kbps.mp4 differ diff --git a/dom/media/test/bipbop_480wp_1001kbps-cenc-audio-key1-1.m4s b/dom/media/test/bipbop_480wp_1001kbps-cenc-audio-key1-1.m4s new file mode 100644 index 000000000000..e2bd754c7e88 Binary files /dev/null and b/dom/media/test/bipbop_480wp_1001kbps-cenc-audio-key1-1.m4s differ diff --git a/dom/media/test/bipbop_480wp_1001kbps-cenc-audio-key1-2.m4s b/dom/media/test/bipbop_480wp_1001kbps-cenc-audio-key1-2.m4s new file mode 100644 index 000000000000..347835feee37 Binary files /dev/null and b/dom/media/test/bipbop_480wp_1001kbps-cenc-audio-key1-2.m4s differ diff --git a/dom/media/test/bipbop_480wp_1001kbps-cenc-audio-key1-3.m4s b/dom/media/test/bipbop_480wp_1001kbps-cenc-audio-key1-3.m4s new file mode 100644 index 000000000000..64b0da69a0b7 Binary files /dev/null and b/dom/media/test/bipbop_480wp_1001kbps-cenc-audio-key1-3.m4s differ diff --git a/dom/media/test/bipbop_480wp_1001kbps-cenc-audio-key1-4.m4s b/dom/media/test/bipbop_480wp_1001kbps-cenc-audio-key1-4.m4s new file mode 100644 index 000000000000..864f4248af7d Binary files /dev/null and b/dom/media/test/bipbop_480wp_1001kbps-cenc-audio-key1-4.m4s differ diff --git a/dom/media/test/bipbop_480wp_1001kbps-cenc-audio-key1-init.mp4 b/dom/media/test/bipbop_480wp_1001kbps-cenc-audio-key1-init.mp4 new file mode 100644 index 000000000000..416bc7a7ca17 Binary files /dev/null and b/dom/media/test/bipbop_480wp_1001kbps-cenc-audio-key1-init.mp4 differ diff --git a/dom/media/test/bipbop_480wp_1001kbps-cenc-audio-key2-1.m4s b/dom/media/test/bipbop_480wp_1001kbps-cenc-audio-key2-1.m4s new file mode 100644 index 000000000000..a8896e069a50 Binary files /dev/null and b/dom/media/test/bipbop_480wp_1001kbps-cenc-audio-key2-1.m4s differ diff --git a/dom/media/test/bipbop_480wp_1001kbps-cenc-audio-key2-2.m4s b/dom/media/test/bipbop_480wp_1001kbps-cenc-audio-key2-2.m4s new file mode 100644 index 000000000000..0f0a35ce797e Binary files /dev/null and b/dom/media/test/bipbop_480wp_1001kbps-cenc-audio-key2-2.m4s differ diff --git a/dom/media/test/bipbop_480wp_1001kbps-cenc-audio-key2-3.m4s b/dom/media/test/bipbop_480wp_1001kbps-cenc-audio-key2-3.m4s new file mode 100644 index 000000000000..fece52ff42b0 Binary files /dev/null and b/dom/media/test/bipbop_480wp_1001kbps-cenc-audio-key2-3.m4s differ diff --git a/dom/media/test/bipbop_480wp_1001kbps-cenc-audio-key2-4.m4s b/dom/media/test/bipbop_480wp_1001kbps-cenc-audio-key2-4.m4s new file mode 100644 index 000000000000..70e61e3d5f5e Binary files /dev/null and b/dom/media/test/bipbop_480wp_1001kbps-cenc-audio-key2-4.m4s differ diff --git a/dom/media/test/bipbop_480wp_1001kbps-cenc-audio-key2-init.mp4 b/dom/media/test/bipbop_480wp_1001kbps-cenc-audio-key2-init.mp4 new file mode 100644 index 000000000000..73d542cfe051 Binary files /dev/null and b/dom/media/test/bipbop_480wp_1001kbps-cenc-audio-key2-init.mp4 differ diff --git a/dom/media/test/bipbop_480wp_1001kbps-cenc-video-key1-1.m4s b/dom/media/test/bipbop_480wp_1001kbps-cenc-video-key1-1.m4s new file mode 100644 index 000000000000..796ad1367005 Binary files /dev/null and b/dom/media/test/bipbop_480wp_1001kbps-cenc-video-key1-1.m4s differ diff --git a/dom/media/test/bipbop_480wp_1001kbps-cenc-video-key1-2.m4s b/dom/media/test/bipbop_480wp_1001kbps-cenc-video-key1-2.m4s new file mode 100644 index 000000000000..80824e9ffcc1 Binary files /dev/null and b/dom/media/test/bipbop_480wp_1001kbps-cenc-video-key1-2.m4s differ diff --git a/dom/media/test/bipbop_480wp_1001kbps-cenc-video-key1-init.mp4 b/dom/media/test/bipbop_480wp_1001kbps-cenc-video-key1-init.mp4 new file mode 100644 index 000000000000..5db21d091bc4 Binary files /dev/null and b/dom/media/test/bipbop_480wp_1001kbps-cenc-video-key1-init.mp4 differ diff --git a/dom/media/test/bipbop_480wp_1001kbps-cenc-video-key2-1.m4s b/dom/media/test/bipbop_480wp_1001kbps-cenc-video-key2-1.m4s new file mode 100644 index 000000000000..06778e6f2bd7 Binary files /dev/null and b/dom/media/test/bipbop_480wp_1001kbps-cenc-video-key2-1.m4s differ diff --git a/dom/media/test/bipbop_480wp_1001kbps-cenc-video-key2-2.m4s b/dom/media/test/bipbop_480wp_1001kbps-cenc-video-key2-2.m4s new file mode 100644 index 000000000000..38a081187ac7 Binary files /dev/null and b/dom/media/test/bipbop_480wp_1001kbps-cenc-video-key2-2.m4s differ diff --git a/dom/media/test/bipbop_480wp_1001kbps-cenc-video-key2-init.mp4 b/dom/media/test/bipbop_480wp_1001kbps-cenc-video-key2-init.mp4 new file mode 100644 index 000000000000..bc8bddf505fa Binary files /dev/null and b/dom/media/test/bipbop_480wp_1001kbps-cenc-video-key2-init.mp4 differ diff --git a/dom/media/test/bipbop_480wp_1001kbps.mp4 b/dom/media/test/bipbop_480wp_1001kbps.mp4 new file mode 100644 index 000000000000..600376cf83aa Binary files /dev/null and b/dom/media/test/bipbop_480wp_1001kbps.mp4 differ diff --git a/dom/media/test/bipbop_480wp_663kbps-cenc-audio-key1-1.m4s b/dom/media/test/bipbop_480wp_663kbps-cenc-audio-key1-1.m4s new file mode 100644 index 000000000000..e2bd754c7e88 Binary files /dev/null and b/dom/media/test/bipbop_480wp_663kbps-cenc-audio-key1-1.m4s differ diff --git a/dom/media/test/bipbop_480wp_663kbps-cenc-audio-key1-2.m4s b/dom/media/test/bipbop_480wp_663kbps-cenc-audio-key1-2.m4s new file mode 100644 index 000000000000..347835feee37 Binary files /dev/null and b/dom/media/test/bipbop_480wp_663kbps-cenc-audio-key1-2.m4s differ diff --git a/dom/media/test/bipbop_480wp_663kbps-cenc-audio-key1-3.m4s b/dom/media/test/bipbop_480wp_663kbps-cenc-audio-key1-3.m4s new file mode 100644 index 000000000000..64b0da69a0b7 Binary files /dev/null and b/dom/media/test/bipbop_480wp_663kbps-cenc-audio-key1-3.m4s differ diff --git a/dom/media/test/bipbop_480wp_663kbps-cenc-audio-key1-4.m4s b/dom/media/test/bipbop_480wp_663kbps-cenc-audio-key1-4.m4s new file mode 100644 index 000000000000..864f4248af7d Binary files /dev/null and b/dom/media/test/bipbop_480wp_663kbps-cenc-audio-key1-4.m4s differ diff --git a/dom/media/test/bipbop_480wp_663kbps-cenc-audio-key1-init.mp4 b/dom/media/test/bipbop_480wp_663kbps-cenc-audio-key1-init.mp4 new file mode 100644 index 000000000000..416bc7a7ca17 Binary files /dev/null and b/dom/media/test/bipbop_480wp_663kbps-cenc-audio-key1-init.mp4 differ diff --git a/dom/media/test/bipbop_480wp_663kbps-cenc-audio-key2-1.m4s b/dom/media/test/bipbop_480wp_663kbps-cenc-audio-key2-1.m4s new file mode 100644 index 000000000000..a8896e069a50 Binary files /dev/null and b/dom/media/test/bipbop_480wp_663kbps-cenc-audio-key2-1.m4s differ diff --git a/dom/media/test/bipbop_480wp_663kbps-cenc-audio-key2-2.m4s b/dom/media/test/bipbop_480wp_663kbps-cenc-audio-key2-2.m4s new file mode 100644 index 000000000000..0f0a35ce797e Binary files /dev/null and b/dom/media/test/bipbop_480wp_663kbps-cenc-audio-key2-2.m4s differ diff --git a/dom/media/test/bipbop_480wp_663kbps-cenc-audio-key2-3.m4s b/dom/media/test/bipbop_480wp_663kbps-cenc-audio-key2-3.m4s new file mode 100644 index 000000000000..fece52ff42b0 Binary files /dev/null and b/dom/media/test/bipbop_480wp_663kbps-cenc-audio-key2-3.m4s differ diff --git a/dom/media/test/bipbop_480wp_663kbps-cenc-audio-key2-4.m4s b/dom/media/test/bipbop_480wp_663kbps-cenc-audio-key2-4.m4s new file mode 100644 index 000000000000..70e61e3d5f5e Binary files /dev/null and b/dom/media/test/bipbop_480wp_663kbps-cenc-audio-key2-4.m4s differ diff --git a/dom/media/test/bipbop_480wp_663kbps-cenc-audio-key2-init.mp4 b/dom/media/test/bipbop_480wp_663kbps-cenc-audio-key2-init.mp4 new file mode 100644 index 000000000000..73d542cfe051 Binary files /dev/null and b/dom/media/test/bipbop_480wp_663kbps-cenc-audio-key2-init.mp4 differ diff --git a/dom/media/test/bipbop_480wp_663kbps-cenc-video-key1-1.m4s b/dom/media/test/bipbop_480wp_663kbps-cenc-video-key1-1.m4s new file mode 100644 index 000000000000..805f4bbf3fd3 Binary files /dev/null and b/dom/media/test/bipbop_480wp_663kbps-cenc-video-key1-1.m4s differ diff --git a/dom/media/test/bipbop_480wp_663kbps-cenc-video-key1-2.m4s b/dom/media/test/bipbop_480wp_663kbps-cenc-video-key1-2.m4s new file mode 100644 index 000000000000..0a40d1cb7337 Binary files /dev/null and b/dom/media/test/bipbop_480wp_663kbps-cenc-video-key1-2.m4s differ diff --git a/dom/media/test/bipbop_480wp_663kbps-cenc-video-key1-init.mp4 b/dom/media/test/bipbop_480wp_663kbps-cenc-video-key1-init.mp4 new file mode 100644 index 000000000000..5db21d091bc4 Binary files /dev/null and b/dom/media/test/bipbop_480wp_663kbps-cenc-video-key1-init.mp4 differ diff --git a/dom/media/test/bipbop_480wp_663kbps-cenc-video-key2-1.m4s b/dom/media/test/bipbop_480wp_663kbps-cenc-video-key2-1.m4s new file mode 100644 index 000000000000..c5127beec9ec Binary files /dev/null and b/dom/media/test/bipbop_480wp_663kbps-cenc-video-key2-1.m4s differ diff --git a/dom/media/test/bipbop_480wp_663kbps-cenc-video-key2-2.m4s b/dom/media/test/bipbop_480wp_663kbps-cenc-video-key2-2.m4s new file mode 100644 index 000000000000..3f344022a468 Binary files /dev/null and b/dom/media/test/bipbop_480wp_663kbps-cenc-video-key2-2.m4s differ diff --git a/dom/media/test/bipbop_480wp_663kbps-cenc-video-key2-init.mp4 b/dom/media/test/bipbop_480wp_663kbps-cenc-video-key2-init.mp4 new file mode 100644 index 000000000000..bc8bddf505fa Binary files /dev/null and b/dom/media/test/bipbop_480wp_663kbps-cenc-video-key2-init.mp4 differ diff --git a/dom/media/test/bipbop_480wp_663kbps.mp4 b/dom/media/test/bipbop_480wp_663kbps.mp4 new file mode 100644 index 000000000000..3cc1da69d215 Binary files /dev/null and b/dom/media/test/bipbop_480wp_663kbps.mp4 differ diff --git a/dom/media/test/manifest.js b/dom/media/test/manifest.js index 5a3fac5aca28..d7f20dd6353a 100644 --- a/dom/media/test/manifest.js +++ b/dom/media/test/manifest.js @@ -751,36 +751,514 @@ var gEMETests = [ duration:1.60, }, { - name:"audio&video tracks, each with its key", + name:"400x300 audio&video tracks, each with its key", type:"video/mp4; codecs=\"avc1.64000d,mp4a.40.2\"", tracks: [ { name:"audio", type:"audio/mp4; codecs=\"mp4a.40.2\"", - fragments:[ "bipbop-cenc1-audioinit.mp4", - "bipbop-cenc1-audio1.m4s", - "bipbop-cenc1-audio2.m4s", - "bipbop-cenc1-audio3.m4s", + fragments:[ "bipbop_300_215kbps-cenc-audio-key1-init.mp4", + "bipbop_300_215kbps-cenc-audio-key1-1.m4s", + "bipbop_300_215kbps-cenc-audio-key1-2.m4s", + "bipbop_300_215kbps-cenc-audio-key1-3.m4s", + "bipbop_300_215kbps-cenc-audio-key1-4.m4s", ], }, { name:"video", type:"video/mp4; codecs=\"avc1.64000d\"", - fragments:[ "bipbop-cenc1-videoinit.mp4", - "bipbop-cenc1-video1.m4s", - "bipbop-cenc1-video2.m4s", + fragments:[ "bipbop_300_215kbps-cenc-video-key1-init.mp4", + "bipbop_300_215kbps-cenc-video-key1-1.m4s", + "bipbop_300_215kbps-cenc-video-key1-2.m4s", ], }, ], keys: { // "keyid" : "key" - "7e571d037e571d037e571d037e571d03" : "7e5733337e5733337e5733337e573333", - "7e571d047e571d047e571d047e571d04" : "7e5744447e5744447e5744447e574444", + "7e571d037e571d037e571d037e571d11" : "7e5733337e5733337e5733337e573311", + "7e571d047e571d047e571d047e571d21" : "7e5744447e5744447e5744447e574421", }, sessionType:"temporary", sessionCount:2, duration:1.60, }, + { + name:"640x480@624kbps audio&video tracks, each with its key", + type:"video/mp4; codecs=\"avc1.64000d,mp4a.40.2\"", + tracks: [ + { + name:"audio", + type:"audio/mp4; codecs=\"mp4a.40.2\"", + fragments:[ "bipbop_480_624kbps-cenc-audio-key1-init.mp4", + "bipbop_480_624kbps-cenc-audio-key1-1.m4s", + "bipbop_480_624kbps-cenc-audio-key1-2.m4s", + "bipbop_480_624kbps-cenc-audio-key1-3.m4s", + "bipbop_480_624kbps-cenc-audio-key1-4.m4s", + ], + }, + { + name:"video", + type:"video/mp4; codecs=\"avc1.64000d\"", + fragments:[ "bipbop_480_624kbps-cenc-video-key1-init.mp4", + "bipbop_480_624kbps-cenc-video-key1-1.m4s", + "bipbop_480_624kbps-cenc-video-key1-2.m4s", + ], + }, + ], + keys: { + // "keyid" : "key" + "7e571d037e571d037e571d037e571d11" : "7e5733337e5733337e5733337e573311", + "7e571d047e571d047e571d047e571d21" : "7e5744447e5744447e5744447e574421", + }, + sessionType:"temporary", + sessionCount:2, + duration:1.60, + }, + { + name:"640x480@959kbps audio&video tracks, each with its key", + type:"video/mp4; codecs=\"avc1.64000d,mp4a.40.2\"", + tracks: [ + { + name:"audio", + type:"audio/mp4; codecs=\"mp4a.40.2\"", + fragments:[ "bipbop_480_959kbps-cenc-audio-key1-init.mp4", + "bipbop_480_959kbps-cenc-audio-key1-1.m4s", + "bipbop_480_959kbps-cenc-audio-key1-2.m4s", + "bipbop_480_959kbps-cenc-audio-key1-3.m4s", + "bipbop_480_959kbps-cenc-audio-key1-4.m4s", + ], + }, + { + name:"video", + type:"video/mp4; codecs=\"avc1.64000d\"", + fragments:[ "bipbop_480_959kbps-cenc-video-key1-init.mp4", + "bipbop_480_959kbps-cenc-video-key1-1.m4s", + "bipbop_480_959kbps-cenc-video-key1-2.m4s", + ], + }, + ], + keys: { + // "keyid" : "key" + "7e571d037e571d037e571d037e571d11" : "7e5733337e5733337e5733337e573311", + "7e571d047e571d047e571d047e571d21" : "7e5744447e5744447e5744447e574421", + }, + sessionType:"temporary", + sessionCount:2, + duration:1.60, + }, + { + name:"640x480 then 400x300, same key (1st) per track", + type:"video/mp4; codecs=\"avc1.64000d,mp4a.40.2\"", + tracks: [ + { + name:"audio", + type:"audio/mp4; codecs=\"mp4a.40.2\"", + fragments:[ "bipbop_480_624kbps-cenc-audio-key1-init.mp4", + "bipbop_480_624kbps-cenc-audio-key1-1.m4s", + "bipbop_480_624kbps-cenc-audio-key1-2.m4s", + "bipbop_300_215kbps-cenc-audio-key1-init.mp4", + "bipbop_300_215kbps-cenc-audio-key1-3.m4s", + "bipbop_300_215kbps-cenc-audio-key1-4.m4s", + ], + }, + { + name:"video", + type:"video/mp4; codecs=\"avc1.64000d\"", + fragments:[ "bipbop_480_624kbps-cenc-video-key1-init.mp4", + "bipbop_480_624kbps-cenc-video-key1-1.m4s", + "bipbop_300_215kbps-cenc-video-key1-init.mp4", + "bipbop_300_215kbps-cenc-video-key1-2.m4s", + ], + }, + ], + keys: { + // "keyid" : "key" + "7e571d037e571d037e571d037e571d11" : "7e5733337e5733337e5733337e573311", + "7e571d047e571d047e571d047e571d21" : "7e5744447e5744447e5744447e574421", + }, + sessionType:"temporary", + sessionCount:4, + duration:1.60, + }, + { + name:"640x480 then 400x300, same key (2nd) per track", + type:"video/mp4; codecs=\"avc1.64000d,mp4a.40.2\"", + tracks: [ + { + name:"audio", + type:"audio/mp4; codecs=\"mp4a.40.2\"", + fragments:[ "bipbop_480_624kbps-cenc-audio-key2-init.mp4", + "bipbop_480_624kbps-cenc-audio-key2-1.m4s", + "bipbop_480_624kbps-cenc-audio-key2-2.m4s", + "bipbop_300_215kbps-cenc-audio-key2-init.mp4", + "bipbop_300_215kbps-cenc-audio-key2-3.m4s", + "bipbop_300_215kbps-cenc-audio-key2-4.m4s", + ], + }, + { + name:"video", + type:"video/mp4; codecs=\"avc1.64000d\"", + fragments:[ "bipbop_480_624kbps-cenc-video-key2-init.mp4", + "bipbop_480_624kbps-cenc-video-key2-1.m4s", + "bipbop_300_215kbps-cenc-video-key2-init.mp4", + "bipbop_300_215kbps-cenc-video-key2-2.m4s", + ], + }, + ], + keys: { + // "keyid" : "key" + "7e571d037e571d037e571d037e571d12" : "7e5733337e5733337e5733337e573312", + "7e571d047e571d047e571d047e571d22" : "7e5744447e5744447e5744447e574422", + }, + sessionType:"temporary", + sessionCount:4, + duration:1.60, + }, + { + name:"640x480 with 1st keys then 400x300 with 2nd keys", + type:"video/mp4; codecs=\"avc1.64000d,mp4a.40.2\"", + tracks: [ + { + name:"audio", + type:"audio/mp4; codecs=\"mp4a.40.2\"", + fragments:[ "bipbop_480_624kbps-cenc-audio-key1-init.mp4", + "bipbop_480_624kbps-cenc-audio-key1-1.m4s", + "bipbop_480_624kbps-cenc-audio-key1-2.m4s", + "bipbop_300_215kbps-cenc-audio-key2-init.mp4", + "bipbop_300_215kbps-cenc-audio-key2-3.m4s", + "bipbop_300_215kbps-cenc-audio-key2-4.m4s", + ], + }, + { + name:"video", + type:"video/mp4; codecs=\"avc1.64000d\"", + fragments:[ "bipbop_480_624kbps-cenc-video-key1-init.mp4", + "bipbop_480_624kbps-cenc-video-key1-1.m4s", + "bipbop_300_215kbps-cenc-video-key2-init.mp4", + "bipbop_300_215kbps-cenc-video-key2-2.m4s", + ], + }, + ], + keys: { + // "keyid" : "key" + "7e571d037e571d037e571d037e571d11" : "7e5733337e5733337e5733337e573311", + "7e571d037e571d037e571d037e571d12" : "7e5733337e5733337e5733337e573312", + "7e571d047e571d047e571d047e571d21" : "7e5744447e5744447e5744447e574421", + "7e571d047e571d047e571d047e571d22" : "7e5744447e5744447e5744447e574422", + }, + sessionType:"temporary", + sessionCount:4, + duration:1.60, + }, + { + name:"400x300 with 1st keys then 640x480 with 2nd keys", + type:"video/mp4; codecs=\"avc1.64000d,mp4a.40.2\"", + tracks: [ + { + name:"audio", + type:"audio/mp4; codecs=\"mp4a.40.2\"", + fragments:[ "bipbop_300_215kbps-cenc-audio-key1-init.mp4", + "bipbop_300_215kbps-cenc-audio-key1-1.m4s", + "bipbop_300_215kbps-cenc-audio-key1-2.m4s", + "bipbop_480_624kbps-cenc-audio-key2-init.mp4", + "bipbop_480_624kbps-cenc-audio-key2-3.m4s", + "bipbop_480_624kbps-cenc-audio-key2-4.m4s", + ], + }, + { + name:"video", + type:"video/mp4; codecs=\"avc1.64000d\"", + fragments:[ "bipbop_300_215kbps-cenc-video-key1-init.mp4", + "bipbop_300_215kbps-cenc-video-key1-1.m4s", + "bipbop_480_624kbps-cenc-video-key2-init.mp4", + "bipbop_480_624kbps-cenc-video-key2-2.m4s", + ], + }, + ], + keys: { + // "keyid" : "key" + "7e571d037e571d037e571d037e571d11" : "7e5733337e5733337e5733337e573311", + "7e571d037e571d037e571d037e571d12" : "7e5733337e5733337e5733337e573312", + "7e571d047e571d047e571d047e571d21" : "7e5744447e5744447e5744447e574421", + "7e571d047e571d047e571d047e571d22" : "7e5744447e5744447e5744447e574422", + }, + sessionType:"temporary", + sessionCount:4, + duration:1.60, + }, + { + name:"640x480@959kbps with 1st keys then 640x480@624kbps with 2nd keys", + type:"video/mp4; codecs=\"avc1.64000d,mp4a.40.2\"", + tracks: [ + { + name:"audio", + type:"audio/mp4; codecs=\"mp4a.40.2\"", + fragments:[ "bipbop_480_959kbps-cenc-audio-key1-init.mp4", + "bipbop_480_959kbps-cenc-audio-key1-1.m4s", + "bipbop_480_959kbps-cenc-audio-key1-2.m4s", + "bipbop_480_624kbps-cenc-audio-key2-init.mp4", + "bipbop_480_624kbps-cenc-audio-key2-3.m4s", + "bipbop_480_624kbps-cenc-audio-key2-4.m4s", + ], + }, + { + name:"video", + type:"video/mp4; codecs=\"avc1.64000d\"", + fragments:[ "bipbop_480_959kbps-cenc-video-key1-init.mp4", + "bipbop_480_959kbps-cenc-video-key1-1.m4s", + "bipbop_480_624kbps-cenc-video-key2-init.mp4", + "bipbop_480_624kbps-cenc-video-key2-2.m4s", + ], + }, + ], + keys: { + // "keyid" : "key" + "7e571d037e571d037e571d037e571d11" : "7e5733337e5733337e5733337e573311", + "7e571d037e571d037e571d037e571d12" : "7e5733337e5733337e5733337e573312", + "7e571d047e571d047e571d047e571d21" : "7e5744447e5744447e5744447e574421", + "7e571d047e571d047e571d047e571d22" : "7e5744447e5744447e5744447e574422", + }, + sessionType:"temporary", + sessionCount:4, + duration:1.60, + }, + { + name:"640x480@624kbps with 1st keys then 640x480@959kbps with 2nd keys", + type:"video/mp4; codecs=\"avc1.64000d,mp4a.40.2\"", + tracks: [ + { + name:"audio", + type:"audio/mp4; codecs=\"mp4a.40.2\"", + fragments:[ "bipbop_480_624kbps-cenc-audio-key1-init.mp4", + "bipbop_480_624kbps-cenc-audio-key1-1.m4s", + "bipbop_480_624kbps-cenc-audio-key1-2.m4s", + "bipbop_480_959kbps-cenc-audio-key2-init.mp4", + "bipbop_480_959kbps-cenc-audio-key2-3.m4s", + "bipbop_480_959kbps-cenc-audio-key2-4.m4s", + ], + }, + { + name:"video", + type:"video/mp4; codecs=\"avc1.64000d\"", + fragments:[ "bipbop_480_624kbps-cenc-video-key1-init.mp4", + "bipbop_480_624kbps-cenc-video-key1-1.m4s", + "bipbop_480_959kbps-cenc-video-key2-init.mp4", + "bipbop_480_959kbps-cenc-video-key2-2.m4s", + ], + }, + ], + keys: { + // "keyid" : "key" + "7e571d037e571d037e571d037e571d11" : "7e5733337e5733337e5733337e573311", + "7e571d037e571d037e571d037e571d12" : "7e5733337e5733337e5733337e573312", + "7e571d047e571d047e571d047e571d21" : "7e5744447e5744447e5744447e574421", + "7e571d047e571d047e571d047e571d22" : "7e5744447e5744447e5744447e574422", + }, + sessionType:"temporary", + sessionCount:4, + duration:1.60, + }, + { + name:"400x300 with presentation size 533x300", + type:"video/mp4; codecs=\"avc1.64000d,mp4a.40.2\"", + tracks: [ + { + name:"audio", + type:"audio/mp4; codecs=\"mp4a.40.2\"", + fragments:[ "bipbop_300wp_227kbps-cenc-audio-key1-init.mp4", + "bipbop_300wp_227kbps-cenc-audio-key1-1.m4s", + "bipbop_300wp_227kbps-cenc-audio-key1-2.m4s", + "bipbop_300wp_227kbps-cenc-audio-key1-3.m4s", + "bipbop_300wp_227kbps-cenc-audio-key1-4.m4s", + ], + }, + { + name:"video", + type:"video/mp4; codecs=\"avc1.64000d\"", + fragments:[ "bipbop_300wp_227kbps-cenc-video-key1-init.mp4", + "bipbop_300wp_227kbps-cenc-video-key1-1.m4s", + "bipbop_300wp_227kbps-cenc-video-key1-2.m4s", + ], + }, + ], + keys: { + // "keyid" : "key" + "7e571d037e571d037e571d037e571d11" : "7e5733337e5733337e5733337e573311", + "7e571d047e571d047e571d047e571d21" : "7e5744447e5744447e5744447e574421", + }, + sessionType:"temporary", + sessionCount:2, + duration:1.60, + }, + { + name:"400x300 as-is then 400x300 presented as 533x300", + type:"video/mp4; codecs=\"avc1.64000d,mp4a.40.2\"", + tracks: [ + { + name:"audio", + type:"audio/mp4; codecs=\"mp4a.40.2\"", + fragments:[ + "bipbop_300_215kbps-cenc-audio-key1-init.mp4", + "bipbop_300_215kbps-cenc-audio-key1-1.m4s", + "bipbop_300_215kbps-cenc-audio-key1-2.m4s", + "bipbop_300wp_227kbps-cenc-audio-key1-init.mp4", + "bipbop_300wp_227kbps-cenc-audio-key1-3.m4s", + "bipbop_300wp_227kbps-cenc-audio-key1-4.m4s", + ], + }, + { + name:"video", + type:"video/mp4; codecs=\"avc1.64000d\"", + fragments:[ "bipbop_300_215kbps-cenc-video-key1-init.mp4", + "bipbop_300_215kbps-cenc-video-key1-1.m4s", + "bipbop_300wp_227kbps-cenc-video-key1-init.mp4", + "bipbop_300wp_227kbps-cenc-video-key1-2.m4s", + ], + }, + ], + keys: { + // "keyid" : "key" + "7e571d037e571d037e571d037e571d11" : "7e5733337e5733337e5733337e573311", + "7e571d047e571d047e571d047e571d21" : "7e5744447e5744447e5744447e574421", + }, + sessionType:"temporary", + sessionCount:4, + duration:1.60, + }, + { + name:"400x225", + type:"video/mp4; codecs=\"avc1.64000d,mp4a.40.2\"", + tracks: [ + { + name:"audio", + type:"audio/mp4; codecs=\"mp4a.40.2\"", + fragments:[ "bipbop_225w_175kbps-cenc-audio-key1-init.mp4", + "bipbop_225w_175kbps-cenc-audio-key1-1.m4s", + "bipbop_225w_175kbps-cenc-audio-key1-2.m4s", + "bipbop_225w_175kbps-cenc-audio-key1-3.m4s", + "bipbop_225w_175kbps-cenc-audio-key1-4.m4s", + ], + }, + { + name:"video", + type:"video/mp4; codecs=\"avc1.64000d\"", + fragments:[ "bipbop_225w_175kbps-cenc-video-key1-init.mp4", + "bipbop_225w_175kbps-cenc-video-key1-1.m4s", + ], + }, + ], + keys: { + // "keyid" : "key" + "7e571d037e571d037e571d037e571d11" : "7e5733337e5733337e5733337e573311", + "7e571d047e571d047e571d047e571d21" : "7e5744447e5744447e5744447e574421", + }, + sessionType:"temporary", + sessionCount:2, + duration:1.60, + }, + { + name:"640x360", + type:"video/mp4; codecs=\"avc1.64000d,mp4a.40.2\"", + tracks: [ + { + name:"audio", + type:"audio/mp4; codecs=\"mp4a.40.2\"", + fragments:[ "bipbop_360w_253kbps-cenc-audio-key1-init.mp4", + "bipbop_360w_253kbps-cenc-audio-key1-1.m4s", + "bipbop_360w_253kbps-cenc-audio-key1-2.m4s", + "bipbop_360w_253kbps-cenc-audio-key1-3.m4s", + "bipbop_360w_253kbps-cenc-audio-key1-4.m4s", + ], + }, + { + name:"video", + type:"video/mp4; codecs=\"avc1.64000d\"", + fragments:[ "bipbop_360w_253kbps-cenc-video-key1-init.mp4", + "bipbop_360w_253kbps-cenc-video-key1-1.m4s", + ], + }, + ], + keys: { + // "keyid" : "key" + "7e571d037e571d037e571d037e571d11" : "7e5733337e5733337e5733337e573311", + "7e571d047e571d047e571d047e571d21" : "7e5744447e5744447e5744447e574421", + }, + sessionType:"temporary", + sessionCount:2, + duration:1.60, + }, + { + name:"400x225 then 640x360", + type:"video/mp4; codecs=\"avc1.64000d,mp4a.40.2\"", + tracks: [ + { + name:"audio", + type:"audio/mp4; codecs=\"mp4a.40.2\"", + fragments:[ "bipbop_225w_175kbps-cenc-audio-key1-init.mp4", + "bipbop_225w_175kbps-cenc-audio-key1-1.m4s", + "bipbop_225w_175kbps-cenc-audio-key1-2.m4s", + "bipbop_360w_253kbps-cenc-audio-key2-init.mp4", + "bipbop_360w_253kbps-cenc-audio-key2-3.m4s", + "bipbop_360w_253kbps-cenc-audio-key2-4.m4s", + ], + }, + { + name:"video", + type:"video/mp4; codecs=\"avc1.64000d\"", + fragments:[ "bipbop_225w_175kbps-cenc-video-key1-init.mp4", + "bipbop_225w_175kbps-cenc-video-key1-1.m4s", + "bipbop_360w_253kbps-cenc-video-key2-init.mp4", + "bipbop_360w_253kbps-cenc-video-key2-1.m4s", + ], + }, + ], + keys: { + // "keyid" : "key" + "7e571d037e571d037e571d037e571d11" : "7e5733337e5733337e5733337e573311", + "7e571d047e571d047e571d047e571d21" : "7e5744447e5744447e5744447e574421", + "7e571d037e571d037e571d037e571d12" : "7e5733337e5733337e5733337e573312", + "7e571d047e571d047e571d047e571d22" : "7e5744447e5744447e5744447e574422", + }, + sessionType:"temporary", + sessionCount:4, + duration:1.60, + }, + { + name:"640x360 then 640x480", + type:"video/mp4; codecs=\"avc1.64000d,mp4a.40.2\"", + tracks: [ + { + name:"audio", + type:"audio/mp4; codecs=\"mp4a.40.2\"", + fragments:[ "bipbop_360w_253kbps-cenc-audio-key1-init.mp4", + "bipbop_360w_253kbps-cenc-audio-key1-1.m4s", + "bipbop_360w_253kbps-cenc-audio-key1-2.m4s", + "bipbop_480_624kbps-cenc-audio-key2-init.mp4", + "bipbop_480_624kbps-cenc-audio-key2-3.m4s", + "bipbop_480_624kbps-cenc-audio-key2-4.m4s", + ], + }, + { + name:"video", + type:"video/mp4; codecs=\"avc1.64000d\"", + fragments:[ "bipbop_360w_253kbps-cenc-video-key1-init.mp4", + "bipbop_360w_253kbps-cenc-video-key1-1.m4s", + "bipbop_480_624kbps-cenc-video-key2-init.mp4", + "bipbop_480_624kbps-cenc-video-key2-2.m4s", + ], + }, + ], + keys: { + // "keyid" : "key" + "7e571d037e571d037e571d037e571d11" : "7e5733337e5733337e5733337e573311", + "7e571d047e571d047e571d047e571d21" : "7e5744447e5744447e5744447e574421", + "7e571d037e571d037e571d037e571d12" : "7e5733337e5733337e5733337e573312", + "7e571d047e571d047e571d047e571d22" : "7e5744447e5744447e5744447e574422", + }, + sessionType:"temporary", + sessionCount:4, + duration:1.60, + }, ]; var gEMENonMSEFailTests = [ diff --git a/dom/media/test/mochitest.ini b/dom/media/test/mochitest.ini index 1f5c687f9e89..9f78904f4bf2 100644 --- a/dom/media/test/mochitest.ini +++ b/dom/media/test/mochitest.ini @@ -59,13 +59,130 @@ support-files = bipbop-cenc-video2.m4s^headers^ bipbop-cenc-videoinit.mp4 bipbop-cenc-videoinit.mp4^headers^ - bipbop-cenc1-audio1.m4s - bipbop-cenc1-audio2.m4s - bipbop-cenc1-audio3.m4s - bipbop-cenc1-audioinit.mp4 - bipbop-cenc1-video1.m4s - bipbop-cenc1-video2.m4s - bipbop-cenc1-videoinit.mp4 + bipbop_225w_175kbps-cenc-audio-key1-1.m4s + bipbop_225w_175kbps-cenc-audio-key1-2.m4s + bipbop_225w_175kbps-cenc-audio-key1-3.m4s + bipbop_225w_175kbps-cenc-audio-key1-4.m4s + bipbop_225w_175kbps-cenc-audio-key1-init.mp4 + bipbop_225w_175kbps-cenc-audio-key2-1.m4s + bipbop_225w_175kbps-cenc-audio-key2-2.m4s + bipbop_225w_175kbps-cenc-audio-key2-3.m4s + bipbop_225w_175kbps-cenc-audio-key2-4.m4s + bipbop_225w_175kbps-cenc-audio-key2-init.mp4 + bipbop_225w_175kbps-cenc-video-key1-1.m4s + bipbop_225w_175kbps-cenc-video-key1-init.mp4 + bipbop_225w_175kbps-cenc-video-key2-1.m4s + bipbop_225w_175kbps-cenc-video-key2-init.mp4 + bipbop_300_215kbps-cenc-audio-key1-1.m4s + bipbop_300_215kbps-cenc-audio-key1-2.m4s + bipbop_300_215kbps-cenc-audio-key1-3.m4s + bipbop_300_215kbps-cenc-audio-key1-4.m4s + bipbop_300_215kbps-cenc-audio-key1-init.mp4 + bipbop_300_215kbps-cenc-audio-key2-1.m4s + bipbop_300_215kbps-cenc-audio-key2-2.m4s + bipbop_300_215kbps-cenc-audio-key2-3.m4s + bipbop_300_215kbps-cenc-audio-key2-4.m4s + bipbop_300_215kbps-cenc-audio-key2-init.mp4 + bipbop_300_215kbps-cenc-video-key1-1.m4s + bipbop_300_215kbps-cenc-video-key1-2.m4s + bipbop_300_215kbps-cenc-video-key1-init.mp4 + bipbop_300_215kbps-cenc-video-key2-1.m4s + bipbop_300_215kbps-cenc-video-key2-2.m4s + bipbop_300_215kbps-cenc-video-key2-init.mp4 + bipbop_300wp_227kbps-cenc-audio-key1-1.m4s + bipbop_300wp_227kbps-cenc-audio-key1-2.m4s + bipbop_300wp_227kbps-cenc-audio-key1-3.m4s + bipbop_300wp_227kbps-cenc-audio-key1-4.m4s + bipbop_300wp_227kbps-cenc-audio-key1-init.mp4 + bipbop_300wp_227kbps-cenc-audio-key2-1.m4s + bipbop_300wp_227kbps-cenc-audio-key2-2.m4s + bipbop_300wp_227kbps-cenc-audio-key2-3.m4s + bipbop_300wp_227kbps-cenc-audio-key2-4.m4s + bipbop_300wp_227kbps-cenc-audio-key2-init.mp4 + bipbop_300wp_227kbps-cenc-video-key1-1.m4s + bipbop_300wp_227kbps-cenc-video-key1-2.m4s + bipbop_300wp_227kbps-cenc-video-key1-init.mp4 + bipbop_300wp_227kbps-cenc-video-key2-1.m4s + bipbop_300wp_227kbps-cenc-video-key2-2.m4s + bipbop_300wp_227kbps-cenc-video-key2-init.mp4 + bipbop_360w_253kbps-cenc-audio-key1-1.m4s + bipbop_360w_253kbps-cenc-audio-key1-2.m4s + bipbop_360w_253kbps-cenc-audio-key1-3.m4s + bipbop_360w_253kbps-cenc-audio-key1-4.m4s + bipbop_360w_253kbps-cenc-audio-key1-init.mp4 + bipbop_360w_253kbps-cenc-audio-key2-1.m4s + bipbop_360w_253kbps-cenc-audio-key2-2.m4s + bipbop_360w_253kbps-cenc-audio-key2-3.m4s + bipbop_360w_253kbps-cenc-audio-key2-4.m4s + bipbop_360w_253kbps-cenc-audio-key2-init.mp4 + bipbop_360w_253kbps-cenc-video-key1-1.m4s + bipbop_360w_253kbps-cenc-video-key1-init.mp4 + bipbop_360w_253kbps-cenc-video-key2-1.m4s + bipbop_360w_253kbps-cenc-video-key2-init.mp4 + bipbop_480_624kbps-cenc-audio-key1-1.m4s + bipbop_480_624kbps-cenc-audio-key1-2.m4s + bipbop_480_624kbps-cenc-audio-key1-3.m4s + bipbop_480_624kbps-cenc-audio-key1-4.m4s + bipbop_480_624kbps-cenc-audio-key1-init.mp4 + bipbop_480_624kbps-cenc-audio-key2-1.m4s + bipbop_480_624kbps-cenc-audio-key2-2.m4s + bipbop_480_624kbps-cenc-audio-key2-3.m4s + bipbop_480_624kbps-cenc-audio-key2-4.m4s + bipbop_480_624kbps-cenc-audio-key2-init.mp4 + bipbop_480_624kbps-cenc-video-key1-1.m4s + bipbop_480_624kbps-cenc-video-key1-2.m4s + bipbop_480_624kbps-cenc-video-key1-init.mp4 + bipbop_480_624kbps-cenc-video-key2-1.m4s + bipbop_480_624kbps-cenc-video-key2-2.m4s + bipbop_480_624kbps-cenc-video-key2-init.mp4 + bipbop_480_959kbps-cenc-audio-key1-1.m4s + bipbop_480_959kbps-cenc-audio-key1-2.m4s + bipbop_480_959kbps-cenc-audio-key1-3.m4s + bipbop_480_959kbps-cenc-audio-key1-4.m4s + bipbop_480_959kbps-cenc-audio-key1-init.mp4 + bipbop_480_959kbps-cenc-audio-key2-1.m4s + bipbop_480_959kbps-cenc-audio-key2-2.m4s + bipbop_480_959kbps-cenc-audio-key2-3.m4s + bipbop_480_959kbps-cenc-audio-key2-4.m4s + bipbop_480_959kbps-cenc-audio-key2-init.mp4 + bipbop_480_959kbps-cenc-video-key1-1.m4s + bipbop_480_959kbps-cenc-video-key1-2.m4s + bipbop_480_959kbps-cenc-video-key1-init.mp4 + bipbop_480_959kbps-cenc-video-key2-1.m4s + bipbop_480_959kbps-cenc-video-key2-2.m4s + bipbop_480_959kbps-cenc-video-key2-init.mp4 + bipbop_480wp_663kbps-cenc-audio-key1-1.m4s + bipbop_480wp_663kbps-cenc-audio-key1-2.m4s + bipbop_480wp_663kbps-cenc-audio-key1-3.m4s + bipbop_480wp_663kbps-cenc-audio-key1-4.m4s + bipbop_480wp_663kbps-cenc-audio-key1-init.mp4 + bipbop_480wp_663kbps-cenc-audio-key2-1.m4s + bipbop_480wp_663kbps-cenc-audio-key2-2.m4s + bipbop_480wp_663kbps-cenc-audio-key2-3.m4s + bipbop_480wp_663kbps-cenc-audio-key2-4.m4s + bipbop_480wp_663kbps-cenc-audio-key2-init.mp4 + bipbop_480wp_663kbps-cenc-video-key1-1.m4s + bipbop_480wp_663kbps-cenc-video-key1-2.m4s + bipbop_480wp_663kbps-cenc-video-key1-init.mp4 + bipbop_480wp_663kbps-cenc-video-key2-1.m4s + bipbop_480wp_663kbps-cenc-video-key2-2.m4s + bipbop_480wp_663kbps-cenc-video-key2-init.mp4 + bipbop_480wp_1001kbps-cenc-audio-key1-1.m4s + bipbop_480wp_1001kbps-cenc-audio-key1-2.m4s + bipbop_480wp_1001kbps-cenc-audio-key1-3.m4s + bipbop_480wp_1001kbps-cenc-audio-key1-4.m4s + bipbop_480wp_1001kbps-cenc-audio-key1-init.mp4 + bipbop_480wp_1001kbps-cenc-audio-key2-1.m4s + bipbop_480wp_1001kbps-cenc-audio-key2-2.m4s + bipbop_480wp_1001kbps-cenc-audio-key2-3.m4s + bipbop_480wp_1001kbps-cenc-audio-key2-4.m4s + bipbop_480wp_1001kbps-cenc-audio-key2-init.mp4 + bipbop_480wp_1001kbps-cenc-video-key1-1.m4s + bipbop_480wp_1001kbps-cenc-video-key1-2.m4s + bipbop_480wp_1001kbps-cenc-video-key1-init.mp4 + bipbop_480wp_1001kbps-cenc-video-key2-1.m4s + bipbop_480wp_1001kbps-cenc-video-key2-2.m4s + bipbop_480wp_1001kbps-cenc-video-key2-init.mp4 bogus.duh bogus.ogv bogus.ogv^headers^ diff --git a/dom/media/test/test_eme_playback.html b/dom/media/test/test_eme_playback.html index 29822e282e5f..30e396717998 100644 --- a/dom/media/test/test_eme_playback.html +++ b/dom/media/test/test_eme_playback.html @@ -70,9 +70,11 @@ function startTest(test, token) + ", actual: " + gotEncrypted); ok(Math.abs(test.duration - v.duration) < 0.1, - TimeStamp(token) + " Duration of video should be corrrect"); + TimeStamp(token) + " Duration of video should be " + test.duration + + ", got " + v.duration); ok(Math.abs(test.duration - v.currentTime) < 0.1, - TimeStamp(token) + " Current time should be same as duration"); + TimeStamp(token) + " Current time (" + v.currentTime + + ") should be same as duration (" + test.duration + ")"); // Verify all sessions had all keys went sent to the CDM usable, and thus // that we received keystatuseschange event(s).