Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 // The PlayerUtils provides utility functions to binding common media events | 5 // The PlayerUtils provides utility functions to binding common media events |
| 6 // to specific player functions. It also provides functions to load media source | 6 // to specific player functions. It also provides functions to load media source |
| 7 // base on test configurations. | 7 // base on test configurations. |
| 8 var PlayerUtils = new function() { | 8 var PlayerUtils = new function() { |
| 9 } | 9 } |
| 10 | 10 |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 60 }); | 60 }); |
| 61 } | 61 } |
| 62 | 62 |
| 63 try { | 63 try { |
| 64 if (player.testConfig.sessionToLoad) { | 64 if (player.testConfig.sessionToLoad) { |
| 65 Utils.timeLog('Loading session: ' + player.testConfig.sessionToLoad); | 65 Utils.timeLog('Loading session: ' + player.testConfig.sessionToLoad); |
| 66 var session = | 66 var session = |
| 67 message.target.mediaKeys.createSession('persistent-license'); | 67 message.target.mediaKeys.createSession('persistent-license'); |
| 68 addMediaKeySessionListeners(session); | 68 addMediaKeySessionListeners(session); |
| 69 session.load(player.testConfig.sessionToLoad) | 69 session.load(player.testConfig.sessionToLoad) |
| 70 .catch(function(error) { Utils.failTest(error, EME_LOAD_FAILED); }); | 70 .then( |
| 71 function(result) { | |
| 72 if (!result) { | |
| 73 Utils.reportResult('Session not found.', | |
|
ddorwin
2015/07/09 00:29:35
Thanks. However, I don't think we should make this
jrummell
2015/07/10 00:16:50
Reverted.
| |
| 74 EME_SESSION_NOT_FOUND); | |
| 75 } | |
| 76 }, | |
| 77 function(error) { Utils.failTest(error, EME_LOAD_FAILED); }); | |
| 71 } else { | 78 } else { |
| 72 Utils.timeLog('Creating new media key session for initDataType: ' + | 79 Utils.timeLog('Creating new media key session for initDataType: ' + |
| 73 message.initDataType + ', initData: ' + | 80 message.initDataType + ', initData: ' + |
| 74 Utils.getHexString(new Uint8Array(message.initData))); | 81 Utils.getHexString(new Uint8Array(message.initData))); |
| 75 var session = message.target.mediaKeys.createSession(); | 82 var session = message.target.mediaKeys.createSession(); |
| 76 addMediaKeySessionListeners(session); | 83 addMediaKeySessionListeners(session); |
| 77 session.generateRequest(message.initDataType, message.initData) | 84 session.generateRequest(message.initDataType, message.initData) |
| 78 .catch(function(error) { | 85 .catch(function(error) { |
| 79 // Ignore the error if a crash is expected. This ensures that | 86 // Ignore the error if a crash is expected. This ensures that |
| 80 // the decoder actually detects and reports the error. | 87 // the decoder actually detects and reports the error. |
| (...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 209 default: | 216 default: |
| 210 Utils.timeLog(keySystem + ' is not a known key system'); | 217 Utils.timeLog(keySystem + ' is not a known key system'); |
| 211 if (usePrefixedEME) | 218 if (usePrefixedEME) |
| 212 return PrefixedClearKeyPlayer; | 219 return PrefixedClearKeyPlayer; |
| 213 return ClearKeyPlayer; | 220 return ClearKeyPlayer; |
| 214 } | 221 } |
| 215 } | 222 } |
| 216 var Player = getPlayerType(testConfig.keySystem); | 223 var Player = getPlayerType(testConfig.keySystem); |
| 217 return new Player(video, testConfig); | 224 return new Player(video, testConfig); |
| 218 }; | 225 }; |
| OLD | NEW |