third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-reset-src-after-setmediakeys.html - Issue 2084053002: EME: Update tests so 'audioCapabilities' always provided

Side by Side Diff: third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-reset-src-after-setmediakeys.html

Issue 2084053002: EME: Update tests so 'audioCapabilities' always provided (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 6 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

« third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-async-creation-with-gc.html ('K') | « third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-playback-two-videos.html ('k') | third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-session-closed-event.html » ('j') | third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-utils.js » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 <!DOCTYPE html>	1 <!DOCTYPE html>

2 <html>	2 <html>

3 <head>	3 <head>

4 <title>Reset src after setMediaKeys()</title>	4 <title>Reset src after setMediaKeys()</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>

(...skipping 17 matching lines...) Expand all Loading...
28 if (encryptedEventIndex == 2) {	28 if (encryptedEventIndex == 2) {

29 // Finished first video; set src to a different video.	29 // Finished first video; set src to a different video.

30 video.src = '../content/test-encrypted-different-av-keys .webm';	30 video.src = '../content/test-encrypted-different-av-keys .webm';

31 } else if (encryptedEventIndex == 4) {	31 } else if (encryptedEventIndex == 4) {

32 // Finished second video.	32 // Finished second video.

33 test.done();	33 test.done();

34 }	34 }

35 };	35 };

36	36

37 // Create a MediaKeys object and assign it to video.	37 // Create a MediaKeys object and assign it to video.

38 navigator.requestMediaKeySystemAccess('org.w3.clearkey', [{}])	38 requestClearKeySystemAccessForInitType('webm')

39 .then(function(access) {	39 .then(function(access) {

40 assert_equals(access.keySystem, 'org.w3.clearkey');	40 assert_equals(access.keySystem, 'org.w3.clearkey');

41 return access.createMediaKeys();	41 return access.createMediaKeys();

42 }).then(function(result) {	42 }).then(function(result) {

43 mediaKeys = result;	43 mediaKeys = result;

44 assert_not_equals(mediaKeys, null);	44 assert_not_equals(mediaKeys, null);

45 return video.setMediaKeys(mediaKeys);	45 return video.setMediaKeys(mediaKeys);

46 }).then(function(result) {	46 }).then(function(result) {

47 assert_not_equals(video.mediaKeys, null, 'not set initially' );	47 assert_not_equals(video.mediaKeys, null, 'not set initially' );

48 assert_true(video.mediaKeys === mediaKeys);	48 assert_true(video.mediaKeys === mediaKeys);

49	49

50 // Set src to a video.	50 // Set src to a video.

51 waitForEventAndRunStep('encrypted', video, onEncrypted, test );	51 waitForEventAndRunStep('encrypted', video, onEncrypted, test );

52 video.src = '../content/test-encrypted.webm';	52 video.src = '../content/test-encrypted.webm';

53 }).catch(function(error) {	53 }).catch(function(error) {

54 forceTestFailureFromPromise(test, error);	54 forceTestFailureFromPromise(test, error);

55 });	55 });

56 }, 'Reset src after setMediaKeys().');	56 }, 'Reset src after setMediaKeys().');

57 </script>	57 </script>

58 </body>	58 </body>

59 </html>	59 </html>

OLD	NEW