media/test/data/eme_player.html - Issue 2543623003: media: Allow config change between clear and encrypted streams

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2543623003: media: Allow config change between clear and encrypted streams (Closed)

Patch Set: comments addressed Created 3 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

OLD	NEW
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>

(...skipping 127 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
138 if (!element)	138 if (!element)

139 return;	139 return;

140 if (element.style['display'] != 'none')	140 if (element.style['display'] != 'none')

141 element.style['display'] = 'none';	141 element.style['display'] = 'none';

142 else	142 else

143 element.style['display'] = '';	143 element.style['display'] = '';

144 }	144 }

145	145

146 function start() {	146 function start() {

147 initApp();	147 initApp();

	148 // TODO(jrummell): Support setMediaKeys() after play().

	149 // See http://crbug.com/675011

148 emeApp.createPlayer()	150 emeApp.createPlayer()

149 .then(function(p) {	151 .then(function(p) {

150 player = p;	152 player = p;

151 play(player.video, testConfig.playTwice);	153 play(player.video, testConfig.playTwice);

152 }).catch(function(error) {	154 }).catch(function(error) {

153 Utils.timeLog(error);	155 Utils.timeLog(error);

154 Utils.failTest('Unable to play video.');	156 Utils.failTest('Unable to play video.');

155 });	157 });

156 }	158 }

157 </script>	159 </script>

158 </html>	160 </html>

OLD	NEW

« no previous file with comments | « media/filters/source_buffer_stream.cc ('k') | media/test/data/eme_player_js/globals.js » ('j') | no next file with comments »