EME v0.1: Report defaultURL in KeyMessage.

content/test/data/media/encrypted_media_utils.js

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 var QueryString = function() {
   // Allows access to query parameters on the URL; e.g., given a URL like:
   //    http://<server>/my.html?test=123&bob=123
   // Parameters can then be accessed via QueryString.test or QueryString.bob.
   var params = {};
   // RegEx to split out values by &.
@@ skipping 13 matching lines @@
 if (!mediaType)
   mediaType = 'video/webm; codecs="vorbis, vp8"'
 // Default key used to encrypt many media files used in browser tests.
 var KEY = new Uint8Array([0xeb, 0xdd, 0x62, 0xf1, 0x68, 0x14, 0xd2, 0x7b,
                           0x68, 0xef, 0x12, 0x2a, 0xfc, 0xe4, 0xae, 0x3c]);
 // Stores a failure message that is read by the browser test when it fails.
 var failMessage = '';
 // Heart beat message header.
 var HEART_BEAT_HEADER = 'HEARTBEAT';
 
-function isHeartBeatMessage(msg) {
+var EXTERNAL_CLEAR_KEY_KEY_SYSTEM = "org.chromium.externalclearkey";
+// Note that his URL has been normalized from the one in clear_key_cdm.cc.
+var EXTERNAL_CLEAR_KEY_HEARTBEAT_URL =
+  'http://test.externalclearkey.chromium.org/';

[scherkus (not reviewing), 2012/12/14 21:45:26]

indent 2 more spaces

[ddorwin, 2012/12/14 21:55:16]

Done.

+
+function isHeartbeatMessage(msg) {
   if (msg.length < HEART_BEAT_HEADER.length)
     return false;
 
   for (var i = 0; i < HEART_BEAT_HEADER.length; ++i) {
     if (HEART_BEAT_HEADER[i] != String.fromCharCode(msg[i]))
       return false;
   }
 
   return true;
 }
 
 function failTest(msg) {
+  console.log("failTest('" + msg + "')");
   if (msg instanceof Event)
     failMessage = msg.target + '.' + msg.type;
   else
     failMessage = msg;
   setDocTitle('FAILED');
 }
 
 function setDocTitle(title) {
   document.title = title.toUpperCase();
 }
 
 function installTitleEventHandler(element, event) {
   element.addEventListener(event, function(e) {
     setDocTitle(event.toString());
   }, false);
 }
 
 function loadEncryptedMediaFromURL(video) {
   return loadEncryptedMedia(video, mediaFile, keySystem, KEY);
 }
 
 function loadEncryptedMedia(video, mediaFile, keySystem, key) {
   var keyRequested = false;
   var sourceOpened = false;
-  // Add a property to video to check key was added.
-  video.hasKeyAdded = false;
+  // Add properties to enable verification that events occurred.
+  video.receivedKeyAdded = false;
+  video.receivedHeartbeat = false;
+  video.isHeartbeatExpected = keySystem === EXTERNAL_CLEAR_KEY_KEY_SYSTEM;
 
   if (!(video && mediaFile && keySystem && key))
     failTest('Missing parameters in loadEncryptedMedia().');
 
   function onSourceOpen(e) {
     if (sourceOpened)
       return;
     sourceOpened = true;
     console.log('onSourceOpen', e);
     var srcBuffer =
@@ skipping 14 matching lines @@
     keyRequested = true;
     console.log('onNeedKey', e);
     try {
       video.webkitGenerateKeyRequest(keySystem, e.initData);
     }
     catch(error) {
       setDocTitle("GenerateKeyRequestException");
     }
   }
 
-  function onKeyAdded() {
-    video.hasKeyAdded = true;
+  function onKeyAdded(e) {
+    e.target.receivedKeyAdded = true;
   }
 
   function onKeyMessage(e) {
-    if (isHeartBeatMessage(e.message)) {
-      console.log('onKeyMessage - heart beat', e);
+    // TODO(ddorwin): Enable after fixing http://crbug.com/166204.
+    if (!e.keySystem && false) {
+      failTest('keymessage without a keySystem: ' + e.keySystem);
       return;
     }
 
+    if (!e.sessionId) {
+      failTest('keymessage without a sessionId: ' + e.sessionId);
+      return;
+    }
+
+    if (!e.message) {
+      failTest('keymessage without a sessionId: ' + e.message);
+      return;
+    }
+
+    if (isHeartbeatMessage(e.message)) {
+      console.log('onKeyMessage - heartbeat', e);
+      e.target.receivedHeartbeat = true;
+      verifyHeartbeatMessage(e);
+      return;
+    }
+
+    // keymessage in response to generateKeyRequest. Reply with key.
     console.log('onKeyMessage - key request', e);
     video.webkitAddKey(keySystem, key, e.message);
   }
 
+  function verifyHeartbeatMessage(e) {
+    // Only External Clear Key sends a HEARTBEAT message.
+    if (EXTERNAL_CLEAR_KEY_KEY_SYSTEM != e.keySystem) {

[scherkus (not reviewing), 2012/12/14 21:45:26]

what's up with the yoda condition

[ddorwin, 2012/12/14 21:55:16]

Done.

+      failTest('Unexpected heartbeat from ' + e.keySystem);
+      return;
+    }
+
+    if (e.defaultURL != EXTERNAL_CLEAR_KEY_HEARTBEAT_URL) {
+      failTest('Heartbeat message with unexpected defaultURL: ' + e.defaultURL);
+      return;
+    }
+  }
+
   var mediaSource = new WebKitMediaSource();
 
   mediaSource.addEventListener('webkitsourceopen', onSourceOpen);
   video.addEventListener('webkitneedkey', onNeedKey);
   video.addEventListener('webkitkeymessage', onKeyMessage);
   video.addEventListener('webkitkeyerror', failTest);
   video.addEventListener('webkitkeyadded', onKeyAdded);
   installTitleEventHandler(video, 'error');
 
   video.src = window.URL.createObjectURL(mediaSource);
   return mediaSource;
 }