LayoutTests/media/encrypted-media/encrypted-media-waiting-for-a-key.html - Issue 655603003: Reland: Remove "needkey" event and add its replacement, "encrypted".

Side by Side Diff: LayoutTests/media/encrypted-media/encrypted-media-waiting-for-a-key.html

Issue 655603003: Reland: Remove "needkey" event and add its replacement, "encrypted". (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 6 years, 2 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 | « LayoutTests/media/encrypted-media/encrypted-media-v2-syntax.html ('k') | LayoutTests/media/encrypted-media/encrypted-media-waiting-for-a-key-expected.txt » ('j') | no next file with comments »
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>Waiting for a key.</title>	4 <title>Waiting for a key.</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>

11 <div id="log"></div>	11 <div id="log"></div>

12 <script>	12 <script>

13 async_test(function(test)	13 async_test(function(test)

14 {	14 {

15 var video = document.getElementById('testVideo');	15 var video = document.getElementById('testVideo');

16 var mediaKeySession = null;	16 var mediaKeySession = null;

17 var sessionCreated = false;	17 var sessionCreated = false;

18 var sessionReadyReceived = false;	18 var sessionReadyReceived = false;

19	19

20 var keyId = null;	20 var keyId = null;

21 var rawKey = new Uint8Array([0xeb, 0xdd, 0x62, 0xf1, 0x68, 0x14, 0xd2, 0x7b,	21 var rawKey = new Uint8Array([0xeb, 0xdd, 0x62, 0xf1, 0x68, 0x14, 0xd2, 0x7b,

22 0x68, 0xef, 0x12, 0x2a, 0xfc, 0xe4, 0xae, 0x3c]);	22 0x68, 0xef, 0x12, 0x2a, 0xfc, 0xe4, 0xae, 0x3c]);

23	23

24 function onNeedKey(event)	24 function onEncrypted(event)

25 {	25 {

26 assert_equals(event.target, video);	26 assert_equals(event.target, video);

27 assert_true(event instanceof window.MediaKeyNeededEvent);	27 assert_true(event instanceof window.MediaEncryptedEvent);

28 assert_equals(event.type, 'needkey');	28 assert_equals(event.type, 'encrypted');

29	29

30 // The same decryption key is shared by all streams so only	30 // The same decryption key is shared by all streams so only

31 // create a shared session once.	31 // create a shared session once.

32 if (sessionCreated)	32 if (sessionCreated)

33 return;	33 return;

34 sessionCreated = true;	34 sessionCreated = true;

35	35

36 mediaKeySession = video.mediaKeys.createSession();	36 mediaKeySession = video.mediaKeys.createSession();

37 waitForEventAndRunStep('message', mediaKeySession, onMessage , test);	37 waitForEventAndRunStep('message', mediaKeySession, onMessage , test);

38 mediaKeySession.generateRequest(event.contentType, event.ini tData).catch(function(error) {	38 mediaKeySession.generateRequest(event.initDataType, event.in itData).catch(function(error) {

39 forceTestFailureFromPromise(test, error);	39 forceTestFailureFromPromise(test, error);

40 });	40 });

41 }	41 }

42	42

43 function onMessage(event)	43 function onMessage(event)

44 {	44 {

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

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

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

48	48

(...skipping 33 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
82	82

83 function onTimeUpdate(event)	83 function onTimeUpdate(event)

84 {	84 {

85 if (event.target.currentTime < 0.5 \|\| !sessionReadyReceived)	85 if (event.target.currentTime < 0.5 \|\| !sessionReadyReceived)

86 return;	86 return;

87	87

88 test.done();	88 test.done();

89 }	89 }

90	90

91 MediaKeys.create('org.w3.clearkey').then(function(mediaKeys) {	91 MediaKeys.create('org.w3.clearkey').then(function(mediaKeys) {

92 waitForEventAndRunStep('needkey', video, onNeedKey, test);	92 waitForEventAndRunStep('encrypted', video, onEncrypted, test );

93 waitForEventAndRunStep('playing', video, onPlaying, test);	93 waitForEventAndRunStep('playing', video, onPlaying, test);

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

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

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

97 video.play();	97 video.play();

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

99 forceTestFailureFromPromise(test, error);	99 forceTestFailureFromPromise(test, error);

100 });	100 });

101 }, 'Waiting for a key.');	101 }, 'Waiting for a key.');

102 </script>	102 </script>

103 </body>	103 </body>

104 </html>	104 </html>

OLD	NEW