Chromium Code Reviews| Index: media/test/data/eme_player_js/utils.js |
| diff --git a/media/test/data/eme_player_js/utils.js b/media/test/data/eme_player_js/utils.js |
| index e664593e8e56c6536a090817d4fc6dccc41ccb01..2fae0712ce8700dafd7fd958ebbabfd8d6adb048 100644 |
| --- a/media/test/data/eme_player_js/utils.js |
| +++ b/media/test/data/eme_player_js/utils.js |
| @@ -30,11 +30,16 @@ Utils.convertToArray = function(input) { |
| }; |
| Utils.convertToUint8Array = function(msg) { |
| - var ans = new Uint8Array(msg.length); |
| - for (var i = 0; i < msg.length; i++) { |
| - ans[i] = msg.charCodeAt(i); |
| + if (typeof msg == 'string') { |
| + var ans = new Uint8Array(msg.length); |
| + for (var i = 0; i < msg.length; i++) { |
| + ans[i] = msg.charCodeAt(i); |
| + } |
| + return ans; |
| } |
| - return ans; |
| + // Assume it is ArrayBuffer or ArrayBufferView. If it already a Uint8Array, |
|
shadi
2014/07/24 17:46:51
s/a/is a
jrummell
2014/07/25 19:34:05
Done.
|
| + // this will just make a copy of the view. |
| + return new Uint8Array(msg); |
| }; |
| Utils.createJWKData = function(keyId, key) { |
| @@ -150,7 +155,7 @@ Utils.getHexString = function(uintArray) { |
| }; |
| Utils.getInitDataFromMessage = function(message, mediaType) { |
| - var initData = message.message; |
| + var initData = Utils.convertToUint8Array(message.message); |
| if (mediaType.indexOf('mp4') != -1) { |
| // Temporary hack for Clear Key in v0.1. |
| // If content uses mp4, then message.message is PSSH data. Instead of |
| @@ -172,7 +177,7 @@ Utils.installTitleEventHandler = function(element, event) { |
| }; |
| Utils.isHeartBeatMessage = function(msg) { |
| - return Utils.hasPrefix(msg, HEART_BEAT_HEADER); |
| + return Utils.hasPrefix(Utils.convertToUint8Array(msg), HEART_BEAT_HEADER); |
| }; |
| Utils.resetTitleChange = function() { |