media/test/data/mse_config_change.html - Issue 357413002: Have media content and chrome browser tests load data from media/test/data

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/mse_config_change.html

Issue 357413002: Have media content and chrome browser tests load data from media/test/data (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix xhwang's comments Created 6 years, 5 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 | Annotate | Revision Log

OLD	NEW
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='eme_player_js/app_loader.js' type='text/javascript'></script>	7 <script src='eme_player_js/app_loader.js' type='text/javascript'></script>

8 <script type="text/javascript">	8 <script type="text/javascript">

9 var testConfig = new TestConfig();	9 var testConfig = new TestConfig();

10 testConfig.loadQueryParams();	10 testConfig.loadQueryParams();

11 testConfig.useMSE = '1';

12 var runEncrypted = testConfig.runEncrypted == 1;	11 var runEncrypted = testConfig.runEncrypted == 1;

13	12

14 var video = document.querySelector('video');	13 var video = document.querySelector('video');

15 var mediaType = 'video/webm; codecs="vorbis, vp8"';	14 var mediaType = 'video/webm; codecs="vorbis, vp8"';

16	15

17 var MEDIA_1 = 'bear-320x240.webm';	16 var MEDIA_1 = 'bear-320x240.webm';

18 var MEDIA_2 = 'bear-640x360.webm';	17 var MEDIA_2 = 'bear-640x360.webm';

19 if (runEncrypted) {	18 if (runEncrypted) {

20 MEDIA_1 = 'bear-320x240-av-enc_av.webm';	19 MEDIA_1 = 'bear-320x240-av_enc-av.webm';

21 MEDIA_2 = 'bear-640x360-av-enc_av.webm';	20 MEDIA_2 = 'bear-640x360-av_enc-av.webm';

22 }	21 }

23	22

24 var MEDIA_1_WIDTH = 320;	23 var MEDIA_1_WIDTH = 320;

25 var MEDIA_1_HEIGHT = 240;	24 var MEDIA_1_HEIGHT = 240;

26	25

27 var MEDIA_2_WIDTH = 640;	26 var MEDIA_2_WIDTH = 640;

28 var MEDIA_2_HEIGHT = 360;	27 var MEDIA_2_HEIGHT = 360;

29 var MEDIA_2_LENGTH = 2.75;	28 var MEDIA_2_LENGTH = 2.75;

30	29

31 // The time in secs to append the second media source.	30 // The time in secs to append the second media source.

(...skipping 94 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
126 var emePlayer = PlayerUtils.createPlayer(video, testConfig);	125 var emePlayer = PlayerUtils.createPlayer(video, testConfig);

127 emePlayer.registerEventListeners();	126 emePlayer.registerEventListeners();

128 }	127 }

129 var mediaSource = MediaSourceUtils.loadMediaSource(	128 var mediaSource = MediaSourceUtils.loadMediaSource(

130 MEDIA_1, mediaType, appendNextSource);	129 MEDIA_1, mediaType, appendNextSource);

131 video.src = window.URL.createObjectURL(mediaSource);	130 video.src = window.URL.createObjectURL(mediaSource);

132 }	131 }

133 </script>	132 </script>

134 </body>	133 </body>

135 </html>	134 </html>

OLD	NEW

« media/base/test_data_util.cc ('K') | « media/test/data/media_source_player.html ('k') | media/test/data/player.html » ('j') | no next file with comments »