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

Side by Side Diff: chrome/test/data/media/mse_config_change.html

Issue 182113005: Update EME browser tests to include EME WD (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changes + shadi's fix Created 6 years, 9 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
OLDNEW
1 <html> 1 <html>
2 <head> 2 <head>
3 <title>Test media source config changes.</title> 3 <title>Test media source config changes.</title>
4 </head> 4 </head>
5 <body onload="runTest();"> 5 <body onload="runTest();">
6 <video controls></video> 6 <video controls></video>
7 <script src="media_utils.js" type="text/javascript"></script> 7 <script src="media_utils.js" type="text/javascript"></script>
8 <script src="media_source_utils.js" type="text/javascript"></script> 8 <script src="media_source_utils.js" type="text/javascript"></script>
9 <script src="encrypted_media_utils.js" type="text/javascript"></script> 9 <script src="encrypted_media_utils.js" type="text/javascript"></script>
10 <script type="text/javascript"> 10 <script type="text/javascript">
11 var runEncrypted = QueryString.runEncrypted == 1; 11 var runEncrypted = QueryString.runEncrypted == 1;
12 var usePrefixedEME = QueryString.usePrefixedEME == 1;
shadi1 2014/03/06 01:16:21 You don't need this, usePrefixedEME is global vari
jrummell 2014/03/06 01:55:07 Done.
12 var video = document.querySelector('video'); 13 var video = document.querySelector('video');
13 var mediaType = 'video/webm; codecs="vorbis, vp8"'; 14 var mediaType = 'video/webm; codecs="vorbis, vp8"';
14 15
15 var MEDIA_1 = 'bear-320x240.webm'; 16 var MEDIA_1 = 'bear-320x240.webm';
16 var MEDIA_2 = 'bear-640x360.webm'; 17 var MEDIA_2 = 'bear-640x360.webm';
17 if (runEncrypted) { 18 if (runEncrypted) {
18 MEDIA_1 = 'bear-320x240-av-enc_av.webm'; 19 MEDIA_1 = 'bear-320x240-av-enc_av.webm';
19 MEDIA_2 = 'bear-640x360-av-enc_av.webm'; 20 MEDIA_2 = 'bear-640x360-av-enc_av.webm';
20 } 21 }
21 22
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 console.log('video.currentTime = ' + video.currentTime + 114 console.log('video.currentTime = ' + video.currentTime +
114 ', video dimensions = ' + video.videoWidth + 'x' + 115 ', video dimensions = ' + video.videoWidth + 'x' +
115 video.videoHeight + '.'); 116 video.videoHeight + '.');
116 } 117 }
117 118
118 function runTest() { 119 function runTest() {
119 video.addEventListener('timeupdate', onTimeUpdate); 120 video.addEventListener('timeupdate', onTimeUpdate);
120 video.addEventListener('ended', failTest); 121 video.addEventListener('ended', failTest);
121 if (runEncrypted) { 122 if (runEncrypted) {
122 loadEncryptedMedia(video, MEDIA_1, keySystem, KEY, true, 123 loadEncryptedMedia(video, MEDIA_1, keySystem, KEY, true,
123 appendNextSource); 124 usePrefixedEME, appendNextSource);
124 } else { 125 } else {
125 var mediaSource = loadMediaSource(MEDIA_1, mediaType, 126 var mediaSource = loadMediaSource(MEDIA_1, mediaType,
126 appendNextSource); 127 appendNextSource);
127 video.src = window.URL.createObjectURL(mediaSource); 128 video.src = window.URL.createObjectURL(mediaSource);
128 } 129 }
129 } 130 }
130 </script> 131 </script>
131 </body> 132 </body>
132 </html> 133 </html>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698