LayoutTests/media/encrypted-media/encrypted-media-playback-setmediakeys-before-src.html - Issue 655603003: Reland: Remove "needkey" event and add its replacement, "encrypted".

Side by Side Diff: LayoutTests/media/encrypted-media/encrypted-media-playback-setmediakeys-before-src.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-playback-setmediakeys-after-src-expected.txt ('k') | LayoutTests/media/encrypted-media/encrypted-media-playback-setmediakeys-before-src-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>Clear Key Playback</title>	4 <title>Clear Key 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>

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

12 <p>Test playback of encrypted media using Clear Key key system.</p>	12 <p>Test playback of encrypted media using Clear Key key system.</p>

13 <script>	13 <script>

14 async_test(function(test)	14 async_test(function(test)

15 {	15 {

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

17 var isSessionCreated = false;	17 var isSessionCreated = false;

18 var isUpdatePromiseResolved = false;	18 var isUpdatePromiseResolved = false;

19	19

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

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

22	22

23 function onNeedKey(event)	23 function onEncrypted(event)

24 {	24 {

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

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

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

28	28

29 // The same decryption key is shared by all streams so only create a shared session once.	29 // The same decryption key is shared by all streams so only create a shared session once.

30 if (isSessionCreated)	30 if (isSessionCreated)

31 return;	31 return;

32 isSessionCreated = true;	32 isSessionCreated = true;

33	33

34 var mediaKeySession = video.mediaKeys.createSession();	34 var mediaKeySession = video.mediaKeys.createSession();

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

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

37 forceTestFailureFromPromise(test, error);	37 forceTestFailureFromPromise(test, error);

38 });	38 });

39 }	39 }

40	40

41 function onMessage(event)	41 function onMessage(event)

42 {	42 {

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

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

45	45

46 var keyId = extractSingleKeyIdFromMessage(event.message);	46 var keyId = extractSingleKeyIdFromMessage(event.message);

(...skipping 15 matching lines...) Expand all Loading...
62 function onTimeUpdate(event)	62 function onTimeUpdate(event)

63 {	63 {

64 if (event.target.currentTime < 0.2 \|\| !isUpdatePromiseResolv ed)	64 if (event.target.currentTime < 0.2 \|\| !isUpdatePromiseResolv ed)

65 return;	65 return;

66	66

67 test.done();	67 test.done();

68 }	68 }

69	69

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

71	71

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

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

74	74

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

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

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

78 video.play();	78 video.play();

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

80 forceTestFailureFromPromise(test, error);	80 forceTestFailureFromPromise(test, error);

81 });	81 });

82 }, 'Playback using Clear Key key system, calling setMediaKeys() befo re setting src attribute.');	82 }, 'Playback using Clear Key key system, calling setMediaKeys() befo re setting src attribute.');

83 </script>	83 </script>

84 </body>	84 </body>

85 </html>	85 </html>

OLD	NEW