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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: media/test/data/eme_player.html

Issue 1712903002: Remove prefixed EME. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix isRenewalMessage() in browser tests. Created 4 years, 10 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 unified diff | Download patch
« no previous file with comments | « media/mojo/interfaces/content_decryption_module.mojom ('k') | media/test/data/eme_player_js/app_loader.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <!DOCTYPE html> 1 <!DOCTYPE html>
2 <html lang='en-US'> 2 <html lang='en-US'>
3 <head> 3 <head>
4 <title>EME playback test application</title> 4 <title>EME playback test application</title>
5 </head> 5 </head>
6 <body style='font-family:"Lucida Console", Monaco, monospace; font-size:14px' onload="start()"> 6 <body style='font-family:"Lucida Console", Monaco, monospace; font-size:14px' onload="start()">
7 <i>Clearkey works only with content encrypted using bear key.</i><br><br> 7 <i>Clearkey works only with content encrypted using bear key.</i><br><br>
8 <table> 8 <table>
9 <tr title='URL param mediaFile=...'> 9 <tr title='URL param mediaFile=...'>
10 <td><label for='mediaFile'>Encrypted video URL:</label></td> 10 <td><label for='mediaFile'>Encrypted video URL:</label></td>
11 <td><input id='mediaFile' type='text' size='64'></td> 11 <td><input id='mediaFile' type='text' size='64'></td>
12 </tr> 12 </tr>
13 <tr title='URL param licenseServerURL=...'> 13 <tr title='URL param licenseServerURL=...'>
14 <td><label for='licenseServer'>License sever URL:</label></td> 14 <td><label for='licenseServer'>License sever URL:</label></td>
15 <td><input id='licenseServer' type='text' size='64'></td> 15 <td><input id='licenseServer' type='text' size='64'></td>
16 </tr> 16 </tr>
17 <tr title='URL param keySystem=...'> 17 <tr title='URL param keySystem=...'>
18 <td><label for='keySystemList'>Key system:</label></td> 18 <td><label for='keySystemList'>Key system:</label></td>
19 <td><select id='keySystemList'></select></td> 19 <td><select id='keySystemList'></select></td>
20 </tr> 20 </tr>
21 <tr title='URL param mediaType=...'> 21 <tr title='URL param mediaType=...'>
22 <td><label for='mediaTypeList'>Media type:</label></td> 22 <td><label for='mediaTypeList'>Media type:</label></td>
23 <td><select id='mediaTypeList'></select></td> 23 <td><select id='mediaTypeList'></select></td>
24 </tr> 24 </tr>
25 <tr title='URL param usePrefixedEME=1|0'>
26 <td><label for='usePrefixedEME'>EME API version:</label></td>
27 <td><select id='usePrefixedEME'></select></td>
28 </tr>
29 <tr title='URL param useMSE=1|0'> 25 <tr title='URL param useMSE=1|0'>
30 <td><label for='useMSE'>Load media by:</label></td> 26 <td><label for='useMSE'>Load media by:</label></td>
31 <td> 27 <td>
32 <select id='useMSE'> 28 <select id='useMSE'>
33 <option value='true' selected='selected'>MSE</option> 29 <option value='true' selected='selected'>MSE</option>
34 <option value='false'>src</option> 30 <option value='false'>src</option>
35 </select> 31 </select>
36 </td> 32 </td>
37 </tr> 33 </tr>
38 </table> 34 </table>
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 var video = e.target; 73 var video = e.target;
78 Utils.timeLog('timeupdate @ ' + video.currentTime); 74 Utils.timeLog('timeupdate @ ' + video.currentTime);
79 if (video.currentTime < 1) 75 if (video.currentTime < 1)
80 return; 76 return;
81 // For loadSession() tests, addKey() will not be called after 77 // For loadSession() tests, addKey() will not be called after
82 // loadSession() (the key is loaded internally). Do not check keyadded 78 // loadSession() (the key is loaded internally). Do not check keyadded
83 // and renewal message for these tests. 79 // and renewal message for these tests.
84 if (!testConfig.sessionToLoad) { 80 if (!testConfig.sessionToLoad) {
85 // keyadded may be fired around the start of playback; check for it 81 // keyadded may be fired around the start of playback; check for it
86 // after a delay to avoid timing issues. 82 // after a delay to avoid timing issues.
87 if (testConfig.usePrefixedEME && !video.receivedKeyAdded)
88 Utils.failTest('Key added event not received.');
89 if (testConfig.keySystem == EXTERNAL_CLEARKEY && 83 if (testConfig.keySystem == EXTERNAL_CLEARKEY &&
90 !video.receivedRenewalMessage) 84 !video.receivedRenewalMessage)
91 Utils.failTest('license-renewal message not received.'); 85 Utils.failTest('license-renewal message not received.');
92 } 86 }
93 Utils.timeLog('waiting for video to end.'); 87 Utils.timeLog('waiting for video to end.');
94 video.removeEventListener('ended', Utils.failTest); 88 video.removeEventListener('ended', Utils.failTest);
95 Utils.installTitleEventHandler(video, 'ended'); 89 Utils.installTitleEventHandler(video, 'ended');
96 video.removeEventListener('timeupdate', onTimeUpdate); 90 video.removeEventListener('timeupdate', onTimeUpdate);
97 } 91 }
98 92
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 .then(function(p) { 151 .then(function(p) {
158 player = p; 152 player = p;
159 play(player.video, testConfig.playTwice); 153 play(player.video, testConfig.playTwice);
160 }).catch(function(error) { 154 }).catch(function(error) {
161 Utils.timeLog(error); 155 Utils.timeLog(error);
162 Utils.failTest('Unable to play video.'); 156 Utils.failTest('Unable to play video.');
163 }); 157 });
164 } 158 }
165 </script> 159 </script>
166 </html> 160 </html>
OLDNEW
« no previous file with comments | « media/mojo/interfaces/content_decryption_module.mojom ('k') | media/test/data/eme_player_js/app_loader.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698