Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1052)

Unified Diff: chrome/test/data/media/eme_player_js/clearkey_player.js

Issue 308553002: Integrate browser tests with new EME player. (Closed) Base URL: http://git.chromium.org/chromium/src.git@eme_player
Patch Set: nits (small change to EME versions UI) Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/test/data/media/eme_player_js/clearkey_player.js
diff --git a/chrome/test/data/media/eme_player_js/clearkey_player.js b/chrome/test/data/media/eme_player_js/clearkey_player.js
index 8ab955bd06e22038107b1b6da7d210b4ba9e6d6e..03ca5356bee4b8e2b821b2139e14a87cd41be639 100644
--- a/chrome/test/data/media/eme_player_js/clearkey_player.js
+++ b/chrome/test/data/media/eme_player_js/clearkey_player.js
@@ -12,17 +12,9 @@ ClearKeyPlayer.prototype.init = function(video) {
};
ClearKeyPlayer.prototype.onMessage = function(message) {
- if (Utils.isHeartBeatMessage(message.message)) {
- Utils.timeLog('MediaKeySession onMessage - heart beat', message);
- return;
- }
Utils.timeLog('MediaKeySession onMessage', message);
- var initData = message.message;
- // If content uses mp4, then message.message is pssh data. Instead of parsing
- // that data we hard code the initData.
- if (TestConfig.mediaType.indexOf('mp4') != -1)
- // Temporary hack for Clear Key in v0.1.
- initData = Utils.convertToUint8Array(KEY_ID);
- var jwkSet = Utils.createJWKData(initData, KEY);
+ var initData = Utils.getInitDataFromMessage(message, TestConfig.mediaType);
+ var key = Utils.getDefaultKey(TestConfig.forceInvalidResponse);
+ var jwkSet = Utils.createJWKData(initData, key);
message.target.update(jwkSet);
};
« no previous file with comments | « chrome/test/data/media/eme_player_js/app_loader.js ('k') | chrome/test/data/media/eme_player_js/file_io_test_player.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698