| Index: media/test/data/eme_player_js/globals.js
|
| diff --git a/media/test/data/eme_player_js/globals.js b/media/test/data/eme_player_js/globals.js
|
| index 5317d276d82b33fa026dc6787f140a79a1e49ea6..e13539c06bd91f7d9bc04c0bb0810ac7b2518088 100644
|
| --- a/media/test/data/eme_player_js/globals.js
|
| +++ b/media/test/data/eme_player_js/globals.js
|
| @@ -6,7 +6,7 @@
|
|
|
| // Renewal message header. External Clear Key implementation returns this as
|
| // part of renewal messages.
|
| -var PREFIXED_EME_RENEWAL_MESSAGE_HEADER = 'RENEWAL';
|
| +var EME_RENEWAL_MESSAGE_HEADER = 'RENEWAL';
|
|
|
| // Default key used to encrypt many media files used in browser tests.
|
| var KEY = new Uint8Array([0xeb, 0xdd, 0x62, 0xf1, 0x68, 0x14, 0xd2, 0x7b,
|
| @@ -28,21 +28,16 @@ var EME_LOAD_FAILED = 'EME_LOAD_FAILED';
|
| var EME_UPDATE_FAILED = 'EME_UPDATE_FAILED';
|
| var EME_ERROR_EVENT = 'EME_ERROR_EVENT';
|
| var EME_MESSAGE_UNEXPECTED_TYPE = 'EME_MESSAGE_UNEXPECTED_TYPE';
|
| -var PREFIXED_EME_RENEWAL_MISSING_HEADER = 'PREFIXED_EME_RENEWAL_MISSING_HEADER';
|
| -var PREFIXED_EME_ERROR_EVENT = 'PREFIXED_EME_ERROR_EVENT';
|
| +var EME_RENEWAL_MISSING_HEADER = 'EME_RENEWAL_MISSING_HEADER';
|
|
|
| // Headers used when testing file I/O.
|
| var FILE_IO_TEST_RESULT_HEADER = 'FILEIOTESTRESULT';
|
| -var PREFIXED_EME_API_LOAD_SESSION_HEADER = 'LOAD_SESSION|';
|
|
|
| // Available EME key systems to use.
|
| -var PREFIXED_CLEARKEY = 'webkit-org.w3.clearkey';
|
| var CLEARKEY = 'org.w3.clearkey';
|
| var EXTERNAL_CLEARKEY = 'org.chromium.externalclearkey';
|
| var WIDEVINE_KEYSYSTEM = 'com.widevine.alpha';
|
| var FILE_IO_TEST_KEYSYSTEM = 'org.chromium.externalclearkey.fileiotest';
|
| -var EME_PREFIXED_VERSION = 'Prefixed EME (v 0.1b)';
|
| -var EME_UNPREFIXED_VERSION = 'Unprefixed EME (Working draft)';
|
|
|
| // Key system name:value map to show on the document page.
|
| var KEY_SYSTEMS = {
|
| @@ -60,17 +55,6 @@ var MEDIA_TYPES = {
|
| 'MP4 - Audio Only': 'audio/mp4; codecs="mp4a.40.2"'
|
| };
|
|
|
| -// Update the EME versions list by checking runtime support by the browser.
|
| -var EME_VERSIONS_OPTIONS = {};
|
| -EME_VERSIONS_OPTIONS[EME_UNPREFIXED_VERSION] = EME_UNPREFIXED_VERSION;
|
| -EME_VERSIONS_OPTIONS[EME_PREFIXED_VERSION] = EME_PREFIXED_VERSION;
|
| -
|
| -var EME_DISABLED_OPTIONS = [];
|
| -if (!document.createElement('video').webkitAddKey)
|
| - EME_DISABLED_OPTIONS.push(EME_PREFIXED_VERSION);
|
| -if (!document.createElement('video').setMediaKeys)
|
| - EME_DISABLED_OPTIONS.push(EME_UNPREFIXED_VERSION);
|
| -
|
| // Global document elements ID's.
|
| var VIDEO_ELEMENT_ID = 'video';
|
| var MEDIA_FILE_ELEMENT_ID = 'mediaFile';
|
| @@ -78,7 +62,6 @@ var LICENSE_SERVER_ELEMENT_ID = 'licenseServer';
|
| var KEYSYSTEM_ELEMENT_ID = 'keySystemList';
|
| var MEDIA_TYPE_ELEMENT_ID = 'mediaTypeList';
|
| var USE_MSE_ELEMENT_ID = 'useMSE';
|
| -var USE_PREFIXED_EME_ID = 'usePrefixedEME';
|
| var USE_PLAY_TWICE_ELEMENT_ID = 'playTwice';
|
|
|
| // These variables get updated every second, so better to have global pointers.
|
|
|