Chromium Code Reviews Chromium Code Reviews
Issue 634243005:
Improve reliability of EME tests (Closed)
Base URL: https://chromium.googlesource.com/chromium/blink.git@master| OLD | NEW |
|---|---|
| 1 <!DOCTYPE html> | 1 <!DOCTYPE html> |
| 2 <html> | 2 <html> |
| 3 <head> | 3 <head> |
| 4 <title>Reloading during encrypted media playback</title> | 4 <title>Reloading during encrypted media playback</title> |
| 5 <script src="encrypted-media-utils.js"></script> | 5 <script src="encrypted-media-utils.js"></script> |
| 6 <script src="../../resources/testharness.js"></script> | 6 <script src="../../resources/testharness.js"></script> |
| 7 <script src="../../resources/testharnessreport.js"></script> | 7 <script src="../../resources/testharnessreport.js"></script> |
| 8 </head> | 8 </head> |
| 9 <body> | 9 <body> |
| 10 <video id="testVideo"></video> | 10 <video id="testVideo"></video> |
| 11 <div id="log"></div> | 11 <div id="log"></div> |
| 12 <p>Test reloading during encrypted media playback.</p> | 12 <p>Test reloading during encrypted media playback.</p> |
| 13 <script> | 13 <script> |
| 14 async_test(function(test) | 14 async_test(function(test) |
| 15 { | 15 { |
| 16 var video = document.getElementById('testVideo'); | 16 var video = document.getElementById('testVideo'); |
| 17 var mediaKeySession = null; | 17 var mediaKeySession = null; |
| 18 var isSessionCreated = false; | |
| 19 var sessionReadyReceived = false; | 18 var sessionReadyReceived = false; |
| 19 var encryptedEventCount = 0; | |
| 20 | 20 |
| 21 var rawKey = new Uint8Array([0xeb, 0xdd, 0x62, 0xf1, 0x68, 0x14, 0xd2, 0x7b, | 21 var rawKey = new Uint8Array([0xeb, 0xdd, 0x62, 0xf1, 0x68, 0x14, 0xd2, 0x7b, |
| 22 0x68, 0xef, 0x12, 0x2a, 0xfc, 0xe4, 0xae, 0x3c]); | 22 0x68, 0xef, 0x12, 0x2a, 0xfc, 0xe4, 0xae, 0x3c]); |
| 23 | 23 |
| 24 function onEncrypted(event) | 24 function onEncrypted(event) |
| 25 { | 25 { |
| 26 assert_equals(event.target, video); | 26 assert_equals(event.target, video); |
| 27 assert_true(event instanceof window.MediaEncryptedEvent); | 27 assert_true(event instanceof window.MediaEncryptedEvent); |
| 28 assert_equals(event.type, 'encrypted'); | 28 assert_equals(event.type, 'encrypted'); |
| 29 | 29 |
| 30 // The same decryption key is shared by all streams so only | 30 // The same decryption key is shared by all streams so only |
| 31 // create a shared session once. | 31 // create a shared session once. To avoid timing issues with |
|
ddorwin
2014/10/15 23:36:20
Any idea what "shared" means?
jrummell
2014/10/16 00:43:45
Changed.
| |
| 32 if (isSessionCreated) | 32 // the "message" event being received before the second |
|
ddorwin
2014/10/15 23:36:20
We should be specific about this being related to
jrummell
2014/10/16 00:43:45
Done.
| |
| 33 // "encrypted" event, only create the session on the second | |
| 34 // event. | |
|
ddorwin
2014/10/15 23:36:20
...This also ensures we see both events.
Maybe we
jrummell
2014/10/16 00:43:45
Comment added. expected.txt file ensures it fails
| |
| 35 if (++encryptedEventCount != 2) | |
| 33 return; | 36 return; |
| 34 isSessionCreated = true; | |
| 35 | 37 |
| 36 mediaKeySession = video.mediaKeys.createSession(); | 38 mediaKeySession = video.mediaKeys.createSession(); |
| 37 waitForEventAndRunStep('message', mediaKeySession, onMessage , test); | 39 waitForEventAndRunStep('message', mediaKeySession, onMessage , test); |
| 38 mediaKeySession.generateRequest(event.initDataType, event.in itData).catch(function(error) { | 40 mediaKeySession.generateRequest(event.initDataType, event.in itData).catch(function(error) { |
| 39 forceTestFailureFromPromise(test, error); | 41 forceTestFailureFromPromise(test, error); |
| 40 }); | 42 }); |
| 41 } | 43 } |
| 42 | 44 |
| 43 function onMessage(event) | 45 function onMessage(event) |
| 44 { | 46 { |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 84 return video.setMediaKeys(mediaKeys); | 86 return video.setMediaKeys(mediaKeys); |
| 85 }).then(function(result) { | 87 }).then(function(result) { |
| 86 video.play(); | 88 video.play(); |
| 87 }).catch(function(error) { | 89 }).catch(function(error) { |
| 88 forceTestFailureFromPromise(test, error); | 90 forceTestFailureFromPromise(test, error); |
| 89 }); | 91 }); |
| 90 }, 'Reloading during encrypted media playback.'); | 92 }, 'Reloading during encrypted media playback.'); |
| 91 </script> | 93 </script> |
| 92 </body> | 94 </body> |
| 93 </html> | 95 </html> |
| OLD | NEW |
