LayoutTests/media/encrypted-media/encrypted-media-needkey.html - Issue 134663005: Add new needkey event for EME.

Side by Side Diff: LayoutTests/media/encrypted-media/encrypted-media-needkey.html

Issue 134663005: Add new needkey event for EME. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Add test Created 6 years, 11 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/content/test-encrypted.webm ('k') | LayoutTests/media/encrypted-media/encrypted-media-needkey-expected.txt » ('j') | Source/core/html/HTMLMediaElement.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
(Empty)
	1 <!DOCTYPE html>
	ddorwin 2014/01/13 19:08:38 We should start writing tests in a W3C test-compat We should start writing tests in a W3C test-compatible way. This is fine, but let's not write more like this. We should look at how to convert this and others.
	2 <html>

	3 <head>

	4 <title>NeedKey</title>

	5 <script src=../video-test.js></script>

	6 <script>

	7 function stringToUint8Array(str)

	8 {

	9 var arr=[];
	acolwell GONE FROM CHROMIUM 2014/01/13 18:19:04 nit: Add spaces around '=' here and elsewhere nit: Add spaces around '=' here and elsewhere jrummell 2014/01/13 19:01:32 Done. This function (and most of the code) was cop Show quoted text On 2014/01/13 18:19:04, acolwell wrote: > nit: Add spaces around '=' here and elsewhere Done. This function (and most of the code) was copied from encrypted-media-v2-events.html. ddorwin 2014/01/13 19:08:38 add spaces to all of this add spaces to all of this jrummell 2014/01/13 22:43:44 Done. Show quoted text On 2014/01/13 19:08:38, ddorwin wrote: > add spaces to all of this Done.
	10 for(var i=0,j=str.length;i<j;++i)
	acolwell GONE FROM CHROMIUM 2014/01/13 18:19:04 nit: add spaces around '<' nit: add spaces around '<' jrummell 2014/01/13 19:01:32 Done. Show quoted text On 2014/01/13 18:19:04, acolwell wrote: > nit: add spaces around '<' Done.
	11 arr[i]=str.charCodeAt(i);

	12 return new Uint8Array(arr);

	13 }

	14

	15 var mediaKeys;

	16 var mediaKeySession;

	17 var initData = stringToUint8Array('mock');
	ddorwin 2014/01/13 19:08:38 Why "mock"? Why "mock"? jrummell 2014/01/13 22:43:44 Clone from encrypted-media-v2-events.html. Now tha Show quoted text On 2014/01/13 19:08:38, ddorwin wrote: > Why "mock"? Clone from encrypted-media-v2-events.html. Now that we're not calling createSession(), it's not needed anymore.
	18 var expectedInitData = stringToUint8Array('0123456789012345');

	19 var validKey = stringToUint8Array(

	20 '{"keys":[{"kty":"oct","kid":"691i8WgU0nto7xIq/OSuPA","k":"MDEyM zQ1Njc4OTAxMjM0"}]}');

	21 var expectedEvents = 2;

	22

	23 function runTest()

	24 {

	25 video = document.getElementsByTagName('video')[0];

	26 run('mediaKeys = new MediaKeys("org.w3.clearkey")');
	acolwell GONE FROM CHROMIUM 2014/01/13 18:19:04 nit: Why is this and the line below in a run()? Se nit: Why is this and the line below in a run()? Seems unnecessary. jrummell 2014/01/13 19:01:32 run() logs the statement and catches exceptions. I Show quoted text On 2014/01/13 18:19:04, acolwell wrote: > nit: Why is this and the line below in a run()? Seems unnecessary. run() logs the statement and catches exceptions. It looks like most of the tests in this directory wrap all calls using run(), so I've updated the remaining line below that doesn't. acolwell GONE FROM CHROMIUM 2014/01/13 19:19:39 Ok. I'm not a fan of this style, but since it appe Show quoted text On 2014/01/13 19:01:32, jrummell wrote: > On 2014/01/13 18:19:04, acolwell wrote: > > nit: Why is this and the line below in a run()? Seems unnecessary. > > run() logs the statement and catches exceptions. It looks like most of the tests > in this directory wrap all calls using run(), so I've updated the remaining line > below that doesn't. Ok. I'm not a fan of this style, but since it appears to be the local convention in this directory this is fine.
	27 run('mediaKeySession = mediaKeys.createSession("video/webm", ini tData)');

	28 video.setMediaKeys(mediaKeys);
	xhwang 2014/01/13 18:42:40 Based on the spec, we don't need a MediaKeys objec Based on the spec, we don't need a MediaKeys object for the needkey event. Can we remove the above three lines? jrummell 2014/01/13 19:01:32 Done. Show quoted text On 2014/01/13 18:42:40, xhwang wrote: > Based on the spec, we don't need a MediaKeys object for the needkey event. Can > we remove the above three lines? Done.
	29 video.src="../content/test-encrypted.webm";
	ddorwin 2014/01/13 19:08:38 spaces spaces jrummell 2014/01/13 22:43:44 Done. Show quoted text On 2014/01/13 19:08:38, ddorwin wrote: > spaces Done.
	30

	31 // Will get 2 identical events, one for audio, one for video.
	ddorwin 2014/01/13 19:08:38 Would this comment be better above line 21? Would this comment be better above line 21? jrummell 2014/01/13 22:43:44 Sure. Show quoted text On 2014/01/13 19:08:38, ddorwin wrote: > Would this comment be better above line 21? Sure.
	32 waitForEvent('needkey', needKey, false, false, video, false);

	33 }

	34

	35 function needKey(event)

	36 {

	37 testExpected("event.target", video);

	38 testExpected("event instanceof window.MediaKeyNeededEvent", true );

	39 testExpected("event.type", "needkey");

	40

	41 // Following line commented out as contentType not currently set .
	ddorwin 2014/01/13 19:08:38 FIXME: Enable the following line when... FIXME: Enable the following line when... jrummell 2014/01/13 22:43:44 Done. Show quoted text On 2014/01/13 19:08:38, ddorwin wrote: > FIXME: Enable the following line when... Done.
	42 // testExpected("event.contentType", "video/webm");

	43 testArraysEqual("event.initData", expectedInitData);

	44

	45 if (--expectedEvents == 0)

	46 endTest();

	47 }

	48 </script>

	49 </head>

	50 <body onload="runTest()">

	51 <p>This tests that the 'needkey' event is generated.</p>

	52 <video></video>

	53 </body>

	54 </html>

OLD	NEW