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

Side by Side Diff: content/browser/media/media_canplaytype_browsertest.cc

Issue 2550473002: To M56: Fix mimetype mappings for FLAC support. (Closed)
Patch Set: Created 4 years 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 | « content/browser/media/media_browsertest.cc ('k') | media/base/demuxer_perftest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <string> 5 #include <string>
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "build/build_config.h" 9 #include "build/build_config.h"
10 #include "content/browser/media/media_browsertest.h" 10 #include "content/browser/media/media_browsertest.h"
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 mime != "application/vnd.apple.mpegurl" && mime != "video/mp2t") { 203 mime != "application/vnd.apple.mpegurl" && mime != "video/mp2t") {
204 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"mp3\"'")); 204 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"mp3\"'"));
205 } 205 }
206 206
207 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"vorbis\"'")); 207 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"vorbis\"'"));
208 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"avc1, vorbis\"'")); 208 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"avc1, vorbis\"'"));
209 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"avc3, vorbis\"'")); 209 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"avc3, vorbis\"'"));
210 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"avc1.4D401E, vorbis\"'")); 210 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"avc1.4D401E, vorbis\"'"));
211 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"avc3.64001F, vorbis\"'")); 211 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"avc3.64001F, vorbis\"'"));
212 212
213 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"flac\"'"));
214 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"avc1, flac\"'"));
215 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"avc3, flac\"'"));
216 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"avc1.4D401E, flac\"'"));
217 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"avc3.64001F, flac\"'"));
218
213 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"opus\"'")); 219 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"opus\"'"));
214 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"avc1, opus\"'")); 220 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"avc1, opus\"'"));
215 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"avc3, opus\"'")); 221 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"avc3, opus\"'"));
216 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"avc1.4D401E, opus\"'")); 222 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"avc1.4D401E, opus\"'"));
217 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"avc3.64001F, opus\"'")); 223 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"avc3.64001F, opus\"'"));
218 224
219 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"vp8\"'")); 225 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"vp8\"'"));
220 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"vp9\"'")); 226 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"vp9\"'"));
221 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"vp8.0\"'")); 227 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"vp8.0\"'"));
222 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"vp9.0\"'")); 228 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"vp9.0\"'"));
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
355 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"avc1, vorbis\"'")); 361 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"avc1, vorbis\"'"));
356 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"avc3, vorbis\"'")); 362 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"avc3, vorbis\"'"));
357 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"avc1, opus\"'")); 363 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"avc1, opus\"'"));
358 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"avc3, opus\"'")); 364 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"avc3, opus\"'"));
359 365
360 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"hev1.1.6.L93.B0\"'")); 366 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"hev1.1.6.L93.B0\"'"));
361 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"hvc1.1.6.L93.B0\"'")); 367 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"hvc1.1.6.L93.B0\"'"));
362 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"hev1.1.6.L93.B0,opus\"'")); 368 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"hev1.1.6.L93.B0,opus\"'"));
363 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"hvc1.1.6.L93.B0,opus\"'")); 369 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"hvc1.1.6.L93.B0,opus\"'"));
364 370
371 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"flac\"'"));
365 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"mp3\"'")); 372 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"mp3\"'"));
366 373
367 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"mp4a.66\"'")); 374 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"mp4a.66\"'"));
368 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"mp4a.67\"'")); 375 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"mp4a.67\"'"));
369 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"mp4a.68\"'")); 376 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"mp4a.68\"'"));
370 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"mp4a.69\"'")); 377 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"mp4a.69\"'"));
371 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"mp4a.6B\"'")); 378 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"mp4a.6B\"'"));
372 379
373 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"mp4a.40\"'")); 380 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"mp4a.40\"'"));
374 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"mp4a.40.2\"'")); 381 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"mp4a.40.2\"'"));
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
420 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"avc1, vorbis\"'")); 427 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"avc1, vorbis\"'"));
421 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"avc3, vorbis\"'")); 428 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"avc3, vorbis\"'"));
422 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"avc1, opus\"'")); 429 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"avc1, opus\"'"));
423 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"avc3, opus\"'")); 430 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"avc3, opus\"'"));
424 431
425 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"hev1.1.6.L93.B0\"'")); 432 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"hev1.1.6.L93.B0\"'"));
426 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"hvc1.1.6.L93.B0\"'")); 433 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"hvc1.1.6.L93.B0\"'"));
427 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"hev1.1.6.L93.B0,opus\"'")); 434 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"hev1.1.6.L93.B0,opus\"'"));
428 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"hvc1.1.6.L93.B0,opus\"'")); 435 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"hvc1.1.6.L93.B0,opus\"'"));
429 436
437 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"flac\"'"));
430 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"mp3\"'")); 438 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"mp3\"'"));
431 439
432 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"mp4a.66\"'")); 440 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"mp4a.66\"'"));
433 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"mp4a.67\"'")); 441 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"mp4a.67\"'"));
434 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"mp4a.68\"'")); 442 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"mp4a.68\"'"));
435 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"mp4a.69\"'")); 443 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"mp4a.69\"'"));
436 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"mp4a.6B\"'")); 444 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"mp4a.6B\"'"));
437 445
438 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"mp4a.40\"'")); 446 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"mp4a.40\"'"));
439 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"mp4a.40.2\"'")); 447 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"mp4a.40.2\"'"));
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
484 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"avc3.64001F\"'")); 492 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"avc3.64001F\"'"));
485 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"avc1.66.30\"'")); 493 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"avc1.66.30\"'"));
486 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"avc1, 1\"'")); 494 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"avc1, 1\"'"));
487 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"avc3, 1\"'")); 495 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"avc3, 1\"'"));
488 496
489 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"hev1.1.6.L93.B0\"'")); 497 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"hev1.1.6.L93.B0\"'"));
490 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"hvc1.1.6.L93.B0\"'")); 498 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"hvc1.1.6.L93.B0\"'"));
491 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"hev1.1.6.L93.B0,opus\"'")); 499 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"hev1.1.6.L93.B0,opus\"'"));
492 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"hvc1.1.6.L93.B0,opus\"'")); 500 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"hvc1.1.6.L93.B0,opus\"'"));
493 501
502 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"flac\"'"));
494 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"mp3\"'")); 503 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"mp3\"'"));
495 504
496 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"mp4a.66\"'")); 505 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"mp4a.66\"'"));
497 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"mp4a.67\"'")); 506 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"mp4a.67\"'"));
498 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"mp4a.68\"'")); 507 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"mp4a.68\"'"));
499 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"mp4a.69\"'")); 508 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"mp4a.69\"'"));
500 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"mp4a.6B\"'")); 509 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"mp4a.6B\"'"));
501 510
502 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"mp4a.40\"'")); 511 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"mp4a.40\"'"));
503 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"mp4a.40.2\"'")); 512 EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"mp4a.40.2\"'"));
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
604 EXPECT_EQ(kProbably, CanPlay("'application/ogg; codecs=\"opus\"'")); 613 EXPECT_EQ(kProbably, CanPlay("'application/ogg; codecs=\"opus\"'"));
605 EXPECT_EQ(kTheoraProbably, 614 EXPECT_EQ(kTheoraProbably,
606 CanPlay("'application/ogg; codecs=\"theora, vorbis\"'")); 615 CanPlay("'application/ogg; codecs=\"theora, vorbis\"'"));
607 EXPECT_EQ(kTheoraProbably, 616 EXPECT_EQ(kTheoraProbably,
608 CanPlay("'application/ogg; codecs=\"theora, opus\"'")); 617 CanPlay("'application/ogg; codecs=\"theora, opus\"'"));
609 EXPECT_EQ(kProbably, CanPlay("'application/ogg; codecs=\"opus, vorbis\"'")); 618 EXPECT_EQ(kProbably, CanPlay("'application/ogg; codecs=\"opus, vorbis\"'"));
610 619
611 TestOGGUnacceptableCombinations("application/ogg"); 620 TestOGGUnacceptableCombinations("application/ogg");
612 } 621 }
613 622
623 IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_flac) {
624 EXPECT_EQ(kProbably, CanPlay("'audio/flac'"));
625
626 // Only audio/flac is supported.
627 EXPECT_EQ(kNot, CanPlay("'video/flac'"));
628 EXPECT_EQ(kNot, CanPlay("'video/x-flac'"));
629 EXPECT_EQ(kNot, CanPlay("'audio/x-flac'"));
630 EXPECT_EQ(kNot, CanPlay("'application/x-flac'"));
631 EXPECT_EQ(kNot, CanPlay("'audio/flac; codecs=\"flac\"'"));
632
633 // Currently only flac in a flac container is supported.
634 EXPECT_EQ(kNot, CanPlay("'video/mp4; codecs=\"flac\"'"));
635 EXPECT_EQ(kNot, CanPlay("'video/webm; codecs=\"flac\"'"));
636 EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"flac\"'"));
637 EXPECT_EQ(kNot, CanPlay("'audio/webm; codecs=\"flac\"'"));
638 EXPECT_EQ(kNot, CanPlay("'audio/flac; codecs=\"avc1\"'"));
639 EXPECT_EQ(kNot, CanPlay("'audio/flac; codecs=\"avc3\"'"));
640
641 EXPECT_EQ(kNot, CanPlay("'audio/flac; codecs=\"avc1.4D401E\"'"));
642 EXPECT_EQ(kNot, CanPlay("'audio/flac; codecs=\"avc3.64001F\"'"));
643
644 EXPECT_EQ(kNot, CanPlay("'audio/flac; codecs=\"mp4a.66\"'"));
645 EXPECT_EQ(kNot, CanPlay("'audio/flac; codecs=\"mp4a.67\"'"));
646 EXPECT_EQ(kNot, CanPlay("'audio/flac; codecs=\"mp4a.68\"'"));
647 EXPECT_EQ(kNot, CanPlay("'audio/flac; codecs=\"mp4a.40.2\"'"));
648 EXPECT_EQ(kNot, CanPlay("'audio/flac; codecs=\"mp4a.40.02\"'"));
649 }
650
614 IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_mp3) { 651 IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_mp3) {
615 EXPECT_EQ(kNot, CanPlay("'video/mp3'")); 652 EXPECT_EQ(kNot, CanPlay("'video/mp3'"));
616 EXPECT_EQ(kNot, CanPlay("'video/mpeg'")); 653 EXPECT_EQ(kNot, CanPlay("'video/mpeg'"));
617 EXPECT_EQ(kNot, CanPlay("'video/x-mp3'")); 654 EXPECT_EQ(kNot, CanPlay("'video/x-mp3'"));
618 655
619 // audio/mpeg without a codecs parameter (RFC 3003 compliant) 656 // audio/mpeg without a codecs parameter (RFC 3003 compliant)
620 EXPECT_EQ(kPropProbably, CanPlay("'audio/mpeg'")); 657 EXPECT_EQ(kPropProbably, CanPlay("'audio/mpeg'"));
621 658
622 // audio/mpeg with mp3 in codecs parameter. (Not RFC compliant, but 659 // audio/mpeg with mp3 in codecs parameter. (Not RFC compliant, but
623 // very common in the wild so it is a defacto standard). 660 // very common in the wild so it is a defacto standard).
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
758 EXPECT_EQ(kHevcSupported, 795 EXPECT_EQ(kHevcSupported,
759 CanPlay("'video/mp4; codecs=\"hev1.1.6.L93.B0, mp4a.40.5\"'")); 796 CanPlay("'video/mp4; codecs=\"hev1.1.6.L93.B0, mp4a.40.5\"'"));
760 EXPECT_EQ(kHevcSupported, 797 EXPECT_EQ(kHevcSupported,
761 CanPlay("'video/mp4; codecs=\"hvc1.1.6.L93.B0, mp4a.40.5\"'")); 798 CanPlay("'video/mp4; codecs=\"hvc1.1.6.L93.B0, mp4a.40.5\"'"));
762 799
763 // Note: set to kPropProbably when switches::kEnableVp9InMp4 is enabled by 800 // Note: set to kPropProbably when switches::kEnableVp9InMp4 is enabled by
764 // default. 801 // default.
765 EXPECT_EQ(kNot, CanPlay("'video/mp4; codecs=\"vp09.00.01.08.02.01.01.00\"'")); 802 EXPECT_EQ(kNot, CanPlay("'video/mp4; codecs=\"vp09.00.01.08.02.01.01.00\"'"));
766 803
767 TestMPEGUnacceptableCombinations("video/mp4"); 804 TestMPEGUnacceptableCombinations("video/mp4");
805 EXPECT_EQ(kNot, CanPlay("'video/mp4; codecs=\"flac\"'"));
768 // This result is incorrect. See https://crbug.com/592889. 806 // This result is incorrect. See https://crbug.com/592889.
769 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"mp3\"'")); 807 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"mp3\"'"));
770 808
771 EXPECT_EQ(kPropMaybe, CanPlay("'video/x-m4v'")); 809 EXPECT_EQ(kPropMaybe, CanPlay("'video/x-m4v'"));
772 810
773 EXPECT_EQ(kPropMaybe, CanPlay("'video/x-m4v; codecs=\"avc1\"'")); 811 EXPECT_EQ(kPropMaybe, CanPlay("'video/x-m4v; codecs=\"avc1\"'"));
774 EXPECT_EQ(kPropMaybe, CanPlay("'video/x-m4v; codecs=\"avc3\"'")); 812 EXPECT_EQ(kPropMaybe, CanPlay("'video/x-m4v; codecs=\"avc3\"'"));
775 EXPECT_EQ(kPropMaybe, CanPlay("'video/x-m4v; codecs=\"mp4a.40\"'")); 813 EXPECT_EQ(kPropMaybe, CanPlay("'video/x-m4v; codecs=\"mp4a.40\"'"));
776 EXPECT_EQ(kPropMaybe, CanPlay("'video/x-m4v; codecs=\"avc1, mp4a.40\"'")); 814 EXPECT_EQ(kPropMaybe, CanPlay("'video/x-m4v; codecs=\"avc1, mp4a.40\"'"));
777 EXPECT_EQ(kPropMaybe, CanPlay("'video/x-m4v; codecs=\"avc3, mp4a.40\"'")); 815 EXPECT_EQ(kPropMaybe, CanPlay("'video/x-m4v; codecs=\"avc3, mp4a.40\"'"));
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
869 EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"vp09.00.01.08.02.01.01.00\"'")); 907 EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"vp09.00.01.08.02.01.01.00\"'"));
870 908
871 EXPECT_EQ(kAc3Eac3Probably, CanPlay("'audio/mp4; codecs=\"ac-3\"'")); 909 EXPECT_EQ(kAc3Eac3Probably, CanPlay("'audio/mp4; codecs=\"ac-3\"'"));
872 EXPECT_EQ(kAc3Eac3Probably, CanPlay("'audio/mp4; codecs=\"mp4a.a5\"'")); 910 EXPECT_EQ(kAc3Eac3Probably, CanPlay("'audio/mp4; codecs=\"mp4a.a5\"'"));
873 EXPECT_EQ(kAc3Eac3Probably, CanPlay("'audio/mp4; codecs=\"mp4a.A5\"'")); 911 EXPECT_EQ(kAc3Eac3Probably, CanPlay("'audio/mp4; codecs=\"mp4a.A5\"'"));
874 EXPECT_EQ(kAc3Eac3Probably, CanPlay("'audio/mp4; codecs=\"ec-3\"'")); 912 EXPECT_EQ(kAc3Eac3Probably, CanPlay("'audio/mp4; codecs=\"ec-3\"'"));
875 EXPECT_EQ(kAc3Eac3Probably, CanPlay("'audio/mp4; codecs=\"mp4a.a6\"'")); 913 EXPECT_EQ(kAc3Eac3Probably, CanPlay("'audio/mp4; codecs=\"mp4a.a6\"'"));
876 EXPECT_EQ(kAc3Eac3Probably, CanPlay("'audio/mp4; codecs=\"mp4a.A6\"'")); 914 EXPECT_EQ(kAc3Eac3Probably, CanPlay("'audio/mp4; codecs=\"mp4a.A6\"'"));
877 915
878 TestMPEGUnacceptableCombinations("audio/mp4"); 916 TestMPEGUnacceptableCombinations("audio/mp4");
917 EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"flac\"'"));
879 // This result is incorrect. See https://crbug.com/592889. 918 // This result is incorrect. See https://crbug.com/592889.
880 EXPECT_EQ(kPropProbably, CanPlay("'audio/mp4; codecs=\"mp3\"'")); 919 EXPECT_EQ(kPropProbably, CanPlay("'audio/mp4; codecs=\"mp3\"'"));
881 920
882 EXPECT_EQ(kPropMaybe, CanPlay("'audio/x-m4a'")); 921 EXPECT_EQ(kPropMaybe, CanPlay("'audio/x-m4a'"));
883 922
884 EXPECT_EQ(kPropProbably, CanPlay("'audio/x-m4a; codecs=\"mp4a.66\"'")); 923 EXPECT_EQ(kPropProbably, CanPlay("'audio/x-m4a; codecs=\"mp4a.66\"'"));
885 EXPECT_EQ(kPropProbably, CanPlay("'audio/x-m4a; codecs=\"mp4a.67\"'")); 924 EXPECT_EQ(kPropProbably, CanPlay("'audio/x-m4a; codecs=\"mp4a.67\"'"));
886 EXPECT_EQ(kPropProbably, CanPlay("'audio/x-m4a; codecs=\"mp4a.68\"'")); 925 EXPECT_EQ(kPropProbably, CanPlay("'audio/x-m4a; codecs=\"mp4a.68\"'"));
887 EXPECT_EQ(kNot, CanPlay("'audio/x-m4a; codecs=\"mp4a.69\"'")); 926 EXPECT_EQ(kNot, CanPlay("'audio/x-m4a; codecs=\"mp4a.69\"'"));
888 EXPECT_EQ(kNot, CanPlay("'audio/x-m4a; codecs=\"mp4a.6B\"'")); 927 EXPECT_EQ(kNot, CanPlay("'audio/x-m4a; codecs=\"mp4a.6B\"'"));
(...skipping 759 matching lines...) Expand 10 before | Expand all | Expand 10 after
1648 CanPlay("'video/mp4; codecs=\"vp09.02.01.08.02.01.01.00\"'")); 1687 CanPlay("'video/mp4; codecs=\"vp09.02.01.08.02.01.01.00\"'"));
1649 EXPECT_EQ(mp4_vp9_maybe, 1688 EXPECT_EQ(mp4_vp9_maybe,
1650 CanPlay("'video/mp4; codecs=\"vp09.03.01.08.02.01.01.00\"'")); 1689 CanPlay("'video/mp4; codecs=\"vp09.03.01.08.02.01.01.00\"'"));
1651 } 1690 }
1652 1691
1653 INSTANTIATE_TEST_CASE_P(EnableDisableMp4Vp9Demuxing, 1692 INSTANTIATE_TEST_CASE_P(EnableDisableMp4Vp9Demuxing,
1654 MediaCanPlayTypeTestMp4Vp9Demuxing, 1693 MediaCanPlayTypeTestMp4Vp9Demuxing,
1655 ::testing::Bool()); 1694 ::testing::Bool());
1656 1695
1657 } // namespace content 1696 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/media/media_browsertest.cc ('k') | media/base/demuxer_perftest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698