Bug 1257716 - Add WebM Clearkey media to eme test list. r=cpearce

MozReview-Commit-ID: LYBmDUvboMk

--HG--
extra : rebase_source : e7715c57a1f6181c99b9e815c5fbf37f1f1410c6

dom/media/test/bipbop_360w_253kbps-clearkey-audio.webm^headers^

@@ -0,0 +1 @@
+Cache-Control: no-store

dom/media/test/bipbop_360w_253kbps-clearkey-video-vp8.webm^headers^

@@ -0,0 +1 @@
+Cache-Control: no-store

dom/media/test/bipbop_360w_253kbps-clearkey-video-vp9.webm^headers^

@@ -0,0 +1 @@
+Cache-Control: no-store

dom/media/test/eme.js

@@ -419,6 +419,7 @@ function SetupEMEPref(callback) {
   var prefs = [
     [ "media.mediasource.enabled", true ],
     [ "media.eme.apiVisible", true ],
+    [ "media.mediasource.webm.enabled", true ],
   ];
 
   if (SpecialPowers.Services.appinfo.name == "B2G" ||

dom/media/test/manifest.js

@@ -1349,6 +1349,56 @@ var gEMETests = [
     sessionCount:3,
     duration:1.60,
   },
+  {
+    name: "WebM vorbis audio & vp8 video clearkey",
+    tracks: [
+      {
+        name:"audio",
+        type:"audio/webm; codecs=\"vorbis\"",
+        fragments:[ "bipbop_360w_253kbps-clearkey-audio.webm",
+                  ],
+      },
+      {
+        name:"video",
+        type:"video/webm; codecs=\"vp8\"",
+        fragments:[ "bipbop_360w_253kbps-clearkey-video-vp8.webm",
+                  ],
+      },
+    ],
+    keys: {
+      // "keyid" : "key"
+      "f1f3ee1790527e9de47217d43835f76a" : "97b9ddc459c8d5ff23c1f2754c95abe8",
+      "8b5df745ad84145b5617c33116e35a67" : "bddfd35dd9be033ee73bc18bc1885056",
+    },
+    sessionType:"temporary",
+    sessionCount:2,
+    duration:1.60,
+  },
+  {
+    name: "WebM vorbis audio & vp9 video clearkey",
+    tracks: [
+      {
+        name:"audio",
+        type:"audio/webm; codecs=\"vorbis\"",
+        fragments:[ "bipbop_360w_253kbps-clearkey-audio.webm",
+                  ],
+      },
+      {
+        name:"video",
+        type:"video/webm; codecs=\"vp9\"",
+        fragments:[ "bipbop_360w_253kbps-clearkey-video-vp9.webm",
+                  ],
+      },
+    ],
+    keys: {
+      // "keyid" : "key"
+      "f1f3ee1790527e9de47217d43835f76a" : "97b9ddc459c8d5ff23c1f2754c95abe8",
+      "eedf63a94fa7c398ee094f123a4ee709" : "973b679a746c82f3acdb856b30e9378e",
+    },
+    sessionType:"temporary",
+    sessionCount:2,
+    duration:1.60,
+  },
 ];
 
 var gEMENonMSEFailTests = [

dom/media/test/mochitest.ini

@@ -182,6 +182,12 @@ support-files =
   bipbop_360w_253kbps-cenc-video-key2-1.m4s^headers^
   bipbop_360w_253kbps-cenc-video-key2-init.mp4
   bipbop_360w_253kbps-cenc-video-key2-init.mp4^headers^
+  bipbop_360w_253kbps-clearkey-audio.webm
+  bipbop_360w_253kbps-clearkey-audio.webm^headers^
+  bipbop_360w_253kbps-clearkey-video-vp8.webm
+  bipbop_360w_253kbps-clearkey-video-vp8.webm^headers^
+  bipbop_360w_253kbps-clearkey-video-vp9.webm
+  bipbop_360w_253kbps-clearkey-video-vp9.webm^headers^
   bipbop_480_624kbps-cenc-audio-key1-1.m4s
   bipbop_480_624kbps-cenc-audio-key1-1.m4s^headers^
   bipbop_480_624kbps-cenc-audio-key1-2.m4s

dom/media/test/test_eme_requestKeySystemAccess.html

@@ -390,12 +390,84 @@ var tests = [
     shouldPass: true,
   },
   {
-    name: 'WebM CLEARKEY_ID not supported',
+    name: 'Basic WebM video',
+    keySystem: CLEARKEY_ID,
+    options: [
+      {
+        label: SUPPORTED_LABEL,
+        initDataTypes: ['webm'],
+        videoCapabilities: [{contentType: 'video/webm'}],
+      }
+    ],
+    expectedConfig: {
+      label: SUPPORTED_LABEL,
+      initDataTypes: ['webm'],
+      videoCapabilities: [{contentType: 'video/webm'}],
+    },
+    shouldPass: true,
+  },
+  {
+    name: 'Basic WebM audio',
+    keySystem: CLEARKEY_ID,
+    options: [
+      {
+        label: SUPPORTED_LABEL,
+        initDataTypes: ['webm'],
+        audioCapabilities: [{contentType: 'audio/webm'}],
+      }
+    ],
+    expectedConfig: {
+      label: SUPPORTED_LABEL,
+      initDataTypes: ['webm'],
+      audioCapabilities: [{contentType: 'audio/webm'}],
+    },
+    shouldPass: true,
+  },
+  {
+    name: 'Webm with Vorbis audio and VP8 video.',
+    keySystem: CLEARKEY_ID,
+    options: [
+      {
+        label: SUPPORTED_LABEL,
+        initDataTypes: ['webm'],
+        videoCapabilities: [{contentType: 'video/webm;codecs="vp8"'}],
+        audioCapabilities: [{contentType: 'audio/webm;codecs="vorbis"'}],
+      }
+    ],
+    expectedConfig: {
+      label: SUPPORTED_LABEL,
+      initDataTypes: ['webm'],
+      videoCapabilities: [{contentType: 'video/webm;codecs="vp8"'}],
+      audioCapabilities: [{contentType: 'audio/webm;codecs="vorbis"'}],
+    },
+    shouldPass: true,
+  },
+  {
+    name: 'Webm with Vorbis audio and VP9 video.',
+    keySystem: CLEARKEY_ID,
+    options: [
+      {
+        label: SUPPORTED_LABEL,
+        initDataTypes: ['webm'],
+        videoCapabilities: [{contentType: 'video/webm;codecs="vp9"'}],
+        audioCapabilities: [{contentType: 'audio/webm;codecs="vorbis"'}],
+      }
+    ],
+    expectedConfig: {
+      label: SUPPORTED_LABEL,
+      initDataTypes: ['webm'],
+      videoCapabilities: [{contentType: 'video/webm;codecs="vp9"'}],
+      audioCapabilities: [{contentType: 'audio/webm;codecs="vorbis"'}],
+    },
+    shouldPass: true,
+  },
+  {
+    name: 'Webm with bogus video.',
     keySystem: CLEARKEY_ID,
     options: [
       {
         initDataTypes: ['webm'],
-        videoCapabilities: [{contentType: 'video/webm'}],
+        videoCapabilities: [{contentType: 'video/webm;codecs="bogus"'}],
       }
     ],
     shouldPass: false,