Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(537)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-requestmediakeysystemaccess.html

Issue 2731743003: [eme] Ignore capabilities with unrecognized parameters (Closed)
Patch Set: Created 3 years, 9 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 | third_party/WebKit/Source/modules/encryptedmedia/NavigatorRequestMediaKeySystemAccess.cpp » ('j') | third_party/WebKit/Source/modules/encryptedmedia/NavigatorRequestMediaKeySystemAccess.cpp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <!DOCTYPE html> 1 <!DOCTYPE html>
2 <html> 2 <html>
3 <head> 3 <head>
4 <title>Test navigator.requestMediaKeySystemAccess()</title> 4 <title>Test navigator.requestMediaKeySystemAccess()</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 <script> 10 <script>
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 }], { 244 }], {
245 videoCapabilities: [{contentType: 'video/webm ; codecs="vp8"'}], 245 videoCapabilities: [{contentType: 'video/webm ; codecs="vp8"'}],
246 }, 'Space before ; in contentType'); 246 }, 'Space before ; in contentType');
247 247
248 expect_config('org.w3.clearkey', [{ 248 expect_config('org.w3.clearkey', [{
249 videoCapabilities: [{contentType: 'video/webm; codecs="vp8"'}], 249 videoCapabilities: [{contentType: 'video/webm; codecs="vp8"'}],
250 }], { 250 }], {
251 videoCapabilities: [{contentType: 'video/webm; codecs="vp8"'}], 251 videoCapabilities: [{contentType: 'video/webm; codecs="vp8"'}],
252 }, 'Extra spaces after ; in contentType'); 252 }, 'Extra spaces after ; in contentType');
253 253
254 // TODO(jrummell): contentType should allow white space at the 254 expect_config('org.w3.clearkey', [{
255 // end of the string. http://crbug.com/487392 255 videoCapabilities: [{contentType: 'video/webm; codecs="vp8" '}],
256 // expect_config('org.w3.clearkey', [{ 256 }], {
257 // videoCapabilities: [{contentType: 'video/webm; codecs="vp8" '}], 257 videoCapabilities: [{contentType: 'video/webm; codecs="vp8" '}],
258 // }], { 258 }, 'Trailing space in contentType');
259 // videoCapabilities: [{contentType: 'video/webm; codecs="vp8" '}],
260 // }, 'Trailing space in contentType');
261 259
262 expect_config('org.w3.clearkey', [{ 260 expect_config('org.w3.clearkey', [{
263 videoCapabilities: [{contentType: 'video/webm; codecs=" vp8"'}], 261 videoCapabilities: [{contentType: 'video/webm; codecs=" vp8"'}],
264 }], { 262 }], {
265 videoCapabilities: [{contentType: 'video/webm; codecs=" vp8"'}], 263 videoCapabilities: [{contentType: 'video/webm; codecs=" vp8"'}],
266 }, 'Space at start of codecs parameter'); 264 }, 'Space at start of codecs parameter');
267 265
268 expect_config('org.w3.clearkey', [{ 266 expect_config('org.w3.clearkey', [{
269 videoCapabilities: [{contentType: 'video/webm; codecs="vp8 "'}], 267 videoCapabilities: [{contentType: 'video/webm; codecs="vp8 "'}],
270 }], { 268 }], {
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
302 300
303 expect_error('org.w3.clearkey', [{ 301 expect_error('org.w3.clearkey', [{
304 videoCapabilities: [{contentType: 'video/webm; CODECS="foo"'}], 302 videoCapabilities: [{contentType: 'video/webm; CODECS="foo"'}],
305 }], 'NotSupportedError', 'Unsupported codec'); 303 }], 'NotSupportedError', 'Unsupported codec');
306 304
307 expect_error('org.w3.clearkey', [{ 305 expect_error('org.w3.clearkey', [{
308 videoCapabilities: [{contentType: 'video/webm; codecs="VP8"'}], 306 videoCapabilities: [{contentType: 'video/webm; codecs="VP8"'}],
309 }], 'NotSupportedError', 'Codec is case-sensitive'); 307 }], 'NotSupportedError', 'Codec is case-sensitive');
310 308
311 // Unrecognized attributes are not allowed. 309 // Unrecognized attributes are not allowed.
312 // TODO(jrummell): Unrecognized attributes are ignored currently. 310 expect_error('org.w3.clearkey', [{
313 // http://crbug.com/690131 311 videoCapabilities: [{contentType: 'video/webm; foo="bar"'}],
314 // expect_error('org.w3.clearkey', [{ 312 }], 'NotSupportedError', 'Unrecognized foo');
315 // videoCapabilities: [{contentType: 'video/webm; foo="bar"'}], 313 expect_error('org.w3.clearkey', [{
316 // }], 'NotSupportedError', 'Unrecognized foo'); 314 videoCapabilities: [{contentType: 'video/webm; foo="bar"; codecs ="vp8"'}],
317 // expect_error('org.w3.clearkey', [{ 315 }], 'NotSupportedError', 'Unrecognized foo with codecs');
318 // videoCapabilities: [{contentType: 'video/webm; foo="bar"; codecs ="vp8"'}],
319 // }], 'NotSupportedError', 'Unrecognized foo with codecs');
320 316
321 // Invalid contentTypes. 317 // Invalid contentTypes.
322 expect_error('org.w3.clearkey', [{ 318 expect_error('org.w3.clearkey', [{
323 videoCapabilities: [{contentType: 'fake'}], 319 videoCapabilities: [{contentType: 'fake'}],
324 }], 'NotSupportedError', 'contentType fake'); 320 }], 'NotSupportedError', 'contentType fake');
325 321
326 expect_error('org.w3.clearkey', [{ 322 expect_error('org.w3.clearkey', [{
327 audioCapabilities: [{contentType: 'audio/fake'}], 323 audioCapabilities: [{contentType: 'audio/fake'}],
328 }], 'NotSupportedError', 'contentType audio/fake'); 324 }], 'NotSupportedError', 'contentType audio/fake');
329 325
330 expect_error('org.w3.clearkey', [{ 326 expect_error('org.w3.clearkey', [{
331 videoCapabilities: [{contentType: 'video/fake'}], 327 videoCapabilities: [{contentType: 'video/fake'}],
332 }], 'NotSupportedError', 'contentType video/fake'); 328 }], 'NotSupportedError', 'contentType video/fake');
xhwang 2017/03/03 23:20:57 Also add a test with additional paramters in conte
jrummell 2017/03/04 00:48:25 I think this is tested in the tests above.
333 329
334 // The actual codec names are case sensitive. 330 // The actual codec names are case sensitive.
335 expect_error('org.w3.clearkey', [{ 331 expect_error('org.w3.clearkey', [{
336 videoCapabilities: [{contentType: 'video/webm; codecs="Vp8"'}], 332 videoCapabilities: [{contentType: 'video/webm; codecs="Vp8"'}],
337 }], 'NotSupportedError', 'codecs Vp8'); 333 }], 'NotSupportedError', 'codecs Vp8');
338 334
339 expect_error('org.w3.clearkey', [{ 335 expect_error('org.w3.clearkey', [{
340 videoCapabilities: [{contentType: 'video/webm; codecs="VP8"'}], 336 videoCapabilities: [{contentType: 'video/webm; codecs="VP8"'}],
341 }], 'NotSupportedError', 'codecs VP8'); 337 }], 'NotSupportedError', 'codecs VP8');
342 338
(...skipping 26 matching lines...) Expand all
369 }], 'NotSupportedError', 'persistent-license sessionType'); 365 }], 'NotSupportedError', 'persistent-license sessionType');
370 366
371 // Verify invalid sessionTypes. 367 // Verify invalid sessionTypes.
372 expect_error('org.w3.clearkey', [{ 368 expect_error('org.w3.clearkey', [{
373 sessionTypes: [ 'foo' ], 369 sessionTypes: [ 'foo' ],
374 audioCapabilities: [{contentType: 'audio/webm; codecs=vorbis'}] 370 audioCapabilities: [{contentType: 'audio/webm; codecs=vorbis'}]
375 }], 'NotSupportedError', 'invalid sessionType'); 371 }], 'NotSupportedError', 'invalid sessionType');
376 </script> 372 </script>
377 </body> 373 </body>
378 </html> 374 </html>
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/modules/encryptedmedia/NavigatorRequestMediaKeySystemAccess.cpp » ('j') | third_party/WebKit/Source/modules/encryptedmedia/NavigatorRequestMediaKeySystemAccess.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698