LayoutTests/media/encrypted-media/encrypted-media-lifetime-reload.html - Issue 429033003: Allow JSON messages to be returned for ClearKey.

Side by Side Diff: LayoutTests/media/encrypted-media/encrypted-media-lifetime-reload.html

Issue 429033003: Allow JSON messages to be returned for ClearKey. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 6 years, 4 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 | « no previous file | LayoutTests/media/encrypted-media/encrypted-media-playback-multiple-sessions.html » ('j') | 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>Reloading during encrypted media playback</title>	4 <title>Reloading during encrypted media playback</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 29 matching lines...) Expand all Loading...
40 forceTestFailureFromPromise(test, error);	40 forceTestFailureFromPromise(test, error);

41 });	41 });

42 }	42 }

43	43

44 function onMessage(event)	44 function onMessage(event)

45 {	45 {

46 assert_true(event instanceof window.MediaKeyMessageEvent);	46 assert_true(event instanceof window.MediaKeyMessageEvent);

47 assert_equals(event.target, mediaKeySession);	47 assert_equals(event.target, mediaKeySession);

48 assert_equals(event.type, 'message');	48 assert_equals(event.type, 'message');

49	49

50 var keyId = new Uint8Array(event.message);	50 var keyId = extractFirstLicenseKey(event.message);
	ddorwin 2014/08/08 20:41:14 extractSingleKeyIdFromMessage()? If there is more extractSingleKeyIdFromMessage()? If there is more than one, we probably shouldn't be calling this function. Maybe someday we'll have extractKeyIdsFromMessage() and pass the entire list to createJWKSet. jrummell 2014/08/08 23:51:28 Done. Show quoted text On 2014/08/08 20:41:14, ddorwin wrote: > extractSingleKeyIdFromMessage()? > If there is more than one, we probably shouldn't be calling this function. > > Maybe someday we'll have extractKeyIdsFromMessage() and pass the entire list to > createJWKSet. Done.
51 var jwkSet = stringToUint8Array(createJWKSet(createJWK(keyId , rawKey)));	51 var jwkSet = stringToUint8Array(createJWKSet(createJWK(keyId , rawKey)));

52 mediaKeySession.update(jwkSet).then(function(result) {	52 mediaKeySession.update(jwkSet).then(function(result) {

53 sessionReadyReceived = true;	53 sessionReadyReceived = true;

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

55 forceTestFailureFromPromise(test, error);	55 forceTestFailureFromPromise(test, error);

56 });	56 });

57 }	57 }

58	58

59 function onPlaying(event)	59 function onPlaying(event)

60 {	60 {

(...skipping 25 matching lines...) Expand all Loading...
86 video.setMediaKeys(mediaKeys);	86 video.setMediaKeys(mediaKeys);

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

88 video.play();	88 video.play();

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

90 forceTestFailureFromPromise(test, error);	90 forceTestFailureFromPromise(test, error);

91 });	91 });

92 }, 'Reloading during encrypted media playback.');	92 }, 'Reloading during encrypted media playback.');

93 </script>	93 </script>

94 </body>	94 </body>

95 </html>	95 </html>

OLD	NEW