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

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

Issue 1997783002: Revert "Flip unified media pipeline to default-on w/ disabled holdback." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2704
Patch Set: Created 4 years, 7 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
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/macros.h" 7 #include "base/macros.h"
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 #include "content/browser/media/media_browsertest.h" 9 #include "content/browser/media/media_browsertest.h"
10 #include "content/public/test/browser_test_utils.h" 10 #include "content/public/test/browser_test_utils.h"
(...skipping 14 matching lines...) Expand all
25 const char* kPropMaybe = kMaybe; 25 const char* kPropMaybe = kMaybe;
26 #else 26 #else
27 const char* kPropProbably = kNot; 27 const char* kPropProbably = kNot;
28 const char* kPropMaybe = kNot; 28 const char* kPropMaybe = kNot;
29 #endif // USE_PROPRIETARY_CODECS 29 #endif // USE_PROPRIETARY_CODECS
30 30
31 #if !defined(OS_ANDROID) 31 #if !defined(OS_ANDROID)
32 const char* kOggVideoProbably = kProbably; 32 const char* kOggVideoProbably = kProbably;
33 const char* kOggVideoMaybe = kMaybe; 33 const char* kOggVideoMaybe = kMaybe;
34 const char* kTheoraProbably = kProbably; 34 const char* kTheoraProbably = kProbably;
35 const char* kOggOpusProbably = kProbably;
36 const char* kMpeg2AacProbably = kPropProbably;
35 const char* kHlsProbably = kNot; 37 const char* kHlsProbably = kNot;
36 const char* kHlsMaybe = kNot; 38 const char* kHlsMaybe = kNot;
37 #else 39 #else
38 const char* kOggVideoProbably = kNot; 40 const char* kOggVideoProbably = kNot;
39 const char* kOggVideoMaybe = kNot; 41 const char* kOggVideoMaybe = kNot;
40 const char* kTheoraProbably = kNot; 42 const char* kTheoraProbably = kNot;
43 const char* kOggOpusProbably = kNot;
44 const char* kMpeg2AacProbably = kNot; // https://crbug.com/544268.
41 const char* kHlsProbably = kPropProbably; 45 const char* kHlsProbably = kPropProbably;
42 const char* kHlsMaybe = kPropMaybe; 46 const char* kHlsMaybe = kPropMaybe;
43 #endif // !OS_ANDROID 47 #endif // !OS_ANDROID
44 48
45 #if BUILDFLAG(ENABLE_HEVC_DEMUXING) 49 #if BUILDFLAG(ENABLE_HEVC_DEMUXING)
46 const char* kHevcSupported = kPropProbably; 50 const char* kHevcSupported = kPropProbably;
47 #else 51 #else
48 const char* kHevcSupported = kNot; 52 const char* kHevcSupported = kNot;
49 #endif 53 #endif
50 54
(...skipping 453 matching lines...) Expand 10 before | Expand all | Expand 10 after
504 508
505 TestWAVUnacceptableCombinations("audio/wav"); 509 TestWAVUnacceptableCombinations("audio/wav");
506 510
507 EXPECT_EQ(kMaybe, CanPlay("'audio/x-wav'")); 511 EXPECT_EQ(kMaybe, CanPlay("'audio/x-wav'"));
508 EXPECT_EQ(kProbably, CanPlay("'audio/x-wav; codecs=\"1\"'")); 512 EXPECT_EQ(kProbably, CanPlay("'audio/x-wav; codecs=\"1\"'"));
509 513
510 TestWAVUnacceptableCombinations("audio/x-wav"); 514 TestWAVUnacceptableCombinations("audio/x-wav");
511 } 515 }
512 516
513 IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_webm) { 517 IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_webm) {
518 // On Android, VP9 is supported only on KitKat and above (API level 19) and
519 // Opus is supported only on Lollipop and above (API level 21).
520 std::string VP9Probably = "probably";
521 std::string VP9AndOpusProbably = "probably";
522 std::string OpusProbably = "probably";
523 #if defined(OS_ANDROID)
524 if (base::android::BuildInfo::GetInstance()->sdk_int() < 19)
525 VP9Probably = "";
526 if (base::android::BuildInfo::GetInstance()->sdk_int() < 21) {
527 OpusProbably = "";
528 VP9AndOpusProbably = "";
529 }
530 #endif
514 EXPECT_EQ(kMaybe, CanPlay("'video/webm'")); 531 EXPECT_EQ(kMaybe, CanPlay("'video/webm'"));
515 532
516 EXPECT_EQ(kProbably, CanPlay("'video/webm; codecs=\"vp8\"'")); 533 EXPECT_EQ(kProbably, CanPlay("'video/webm; codecs=\"vp8\"'"));
517 EXPECT_EQ(kProbably, CanPlay("'video/webm; codecs=\"vp8.0\"'")); 534 EXPECT_EQ(kProbably, CanPlay("'video/webm; codecs=\"vp8.0\"'"));
518 EXPECT_EQ(kProbably, CanPlay("'video/webm; codecs=\"vp8, vorbis\"'")); 535 EXPECT_EQ(kProbably, CanPlay("'video/webm; codecs=\"vp8, vorbis\"'"));
519 EXPECT_EQ(kProbably, CanPlay("'video/webm; codecs=\"vp8.0, vorbis\"'")); 536 EXPECT_EQ(kProbably, CanPlay("'video/webm; codecs=\"vp8.0, vorbis\"'"));
520 EXPECT_EQ(kProbably, CanPlay("'video/webm; codecs=\"vp8, opus\"'")); 537 EXPECT_EQ(OpusProbably, CanPlay("'video/webm; codecs=\"vp8, opus\"'"));
521 EXPECT_EQ(kProbably, CanPlay("'video/webm; codecs=\"vp8.0, opus\"'")); 538 EXPECT_EQ(OpusProbably, CanPlay("'video/webm; codecs=\"vp8.0, opus\"'"));
522 539
523 EXPECT_EQ(kProbably, CanPlay("'video/webm; codecs=\"vp9\"'")); 540 EXPECT_EQ(VP9Probably, CanPlay("'video/webm; codecs=\"vp9\"'"));
524 EXPECT_EQ(kProbably, CanPlay("'video/webm; codecs=\"vp9.0\"'")); 541 EXPECT_EQ(VP9Probably, CanPlay("'video/webm; codecs=\"vp9.0\"'"));
525 EXPECT_EQ(kProbably, CanPlay("'video/webm; codecs=\"vp9, vorbis\"'")); 542 EXPECT_EQ(VP9Probably, CanPlay("'video/webm; codecs=\"vp9, vorbis\"'"));
526 EXPECT_EQ(kProbably, CanPlay("'video/webm; codecs=\"vp9.0, vorbis\"'")); 543 EXPECT_EQ(VP9Probably, CanPlay("'video/webm; codecs=\"vp9.0, vorbis\"'"));
527 EXPECT_EQ(kProbably, CanPlay("'video/webm; codecs=\"vp9, opus\"'")); 544 EXPECT_EQ(VP9AndOpusProbably, CanPlay("'video/webm; codecs=\"vp9, opus\"'"));
528 EXPECT_EQ(kProbably, CanPlay("'video/webm; codecs=\"vp9.0, opus\"'")); 545 EXPECT_EQ(VP9AndOpusProbably,
546 CanPlay("'video/webm; codecs=\"vp9.0, opus\"'"));
529 547
530 EXPECT_EQ(kProbably, CanPlay("'video/webm; codecs=\"vp8, vp9\"'")); 548 EXPECT_EQ(VP9Probably, CanPlay("'video/webm; codecs=\"vp8, vp9\"'"));
531 EXPECT_EQ(kProbably, CanPlay("'video/webm; codecs=\"vp8.0, vp9.0\"'")); 549 EXPECT_EQ(VP9Probably, CanPlay("'video/webm; codecs=\"vp8.0, vp9.0\"'"));
532 550
533 TestWEBMUnacceptableCombinations("video/webm"); 551 TestWEBMUnacceptableCombinations("video/webm");
534 552
535 EXPECT_EQ(kMaybe, CanPlay("'audio/webm'")); 553 EXPECT_EQ(kMaybe, CanPlay("'audio/webm'"));
536 EXPECT_EQ(kProbably, CanPlay("'audio/webm; codecs=\"vorbis\"'")); 554 EXPECT_EQ(kProbably, CanPlay("'audio/webm; codecs=\"vorbis\"'"));
537 EXPECT_EQ(kProbably, CanPlay("'audio/webm; codecs=\"opus\"'")); 555 EXPECT_EQ(OpusProbably, CanPlay("'audio/webm; codecs=\"opus\"'"));
538 EXPECT_EQ(kProbably, CanPlay("'audio/webm; codecs=\"opus, vorbis\"'")); 556 EXPECT_EQ(OpusProbably, CanPlay("'audio/webm; codecs=\"opus, vorbis\"'"));
539 557
540 EXPECT_EQ(kNot, CanPlay("'audio/webm; codecs=\"vp8\"'")); 558 EXPECT_EQ(kNot, CanPlay("'audio/webm; codecs=\"vp8\"'"));
541 EXPECT_EQ(kNot, CanPlay("'audio/webm; codecs=\"vp8.0\"'")); 559 EXPECT_EQ(kNot, CanPlay("'audio/webm; codecs=\"vp8.0\"'"));
542 EXPECT_EQ(kNot, CanPlay("'audio/webm; codecs=\"vp8, vorbis\"'")); 560 EXPECT_EQ(kNot, CanPlay("'audio/webm; codecs=\"vp8, vorbis\"'"));
543 EXPECT_EQ(kNot, CanPlay("'audio/webm; codecs=\"vp8.0, vorbis\"'")); 561 EXPECT_EQ(kNot, CanPlay("'audio/webm; codecs=\"vp8.0, vorbis\"'"));
544 EXPECT_EQ(kNot, CanPlay("'audio/webm; codecs=\"vp8, opus\"'")); 562 EXPECT_EQ(kNot, CanPlay("'audio/webm; codecs=\"vp8, opus\"'"));
545 EXPECT_EQ(kNot, CanPlay("'audio/webm; codecs=\"vp8.0, opus\"'")); 563 EXPECT_EQ(kNot, CanPlay("'audio/webm; codecs=\"vp8.0, opus\"'"));
546 564
547 EXPECT_EQ(kNot, CanPlay("'audio/webm; codecs=\"vp9\"'")); 565 EXPECT_EQ(kNot, CanPlay("'audio/webm; codecs=\"vp9\"'"));
548 EXPECT_EQ(kNot, CanPlay("'audio/webm; codecs=\"vp9.0\"'")); 566 EXPECT_EQ(kNot, CanPlay("'audio/webm; codecs=\"vp9.0\"'"));
(...skipping 12 matching lines...) Expand all
561 CanPlay("'video/ogg; codecs=\"theora, vorbis\"'")); 579 CanPlay("'video/ogg; codecs=\"theora, vorbis\"'"));
562 EXPECT_EQ(kOggVideoProbably, 580 EXPECT_EQ(kOggVideoProbably,
563 CanPlay("'video/ogg; codecs=\"theora, opus\"'")); 581 CanPlay("'video/ogg; codecs=\"theora, opus\"'"));
564 EXPECT_EQ(kOggVideoProbably, 582 EXPECT_EQ(kOggVideoProbably,
565 CanPlay("'video/ogg; codecs=\"opus, vorbis\"'")); 583 CanPlay("'video/ogg; codecs=\"opus, vorbis\"'"));
566 584
567 TestOGGUnacceptableCombinations("video/ogg"); 585 TestOGGUnacceptableCombinations("video/ogg");
568 586
569 EXPECT_EQ(kMaybe, CanPlay("'audio/ogg'")); 587 EXPECT_EQ(kMaybe, CanPlay("'audio/ogg'"));
570 EXPECT_EQ(kProbably, CanPlay("'audio/ogg; codecs=\"vorbis\"'")); 588 EXPECT_EQ(kProbably, CanPlay("'audio/ogg; codecs=\"vorbis\"'"));
571 EXPECT_EQ(kProbably, CanPlay("'audio/ogg; codecs=\"opus\"'")); 589 EXPECT_EQ(kOggOpusProbably, CanPlay("'audio/ogg; codecs=\"opus\"'"));
572 EXPECT_EQ(kProbably, CanPlay("'audio/ogg; codecs=\"vorbis, opus\"'")); 590 EXPECT_EQ(kOggOpusProbably, CanPlay("'audio/ogg; codecs=\"vorbis, opus\"'"));
573 591
574 EXPECT_EQ(kNot, CanPlay("'audio/ogg; codecs=\"theora\"'")); 592 EXPECT_EQ(kNot, CanPlay("'audio/ogg; codecs=\"theora\"'"));
575 EXPECT_EQ(kNot, CanPlay("'audio/ogg; codecs=\"theora, opus\"'")); 593 EXPECT_EQ(kNot, CanPlay("'audio/ogg; codecs=\"theora, opus\"'"));
576 EXPECT_EQ(kNot, CanPlay("'audio/ogg; codecs=\"theora, vorbis\"'")); 594 EXPECT_EQ(kNot, CanPlay("'audio/ogg; codecs=\"theora, vorbis\"'"));
577 595
578 TestOGGUnacceptableCombinations("audio/ogg"); 596 TestOGGUnacceptableCombinations("audio/ogg");
579 597
580 EXPECT_EQ(kMaybe, CanPlay("'application/ogg'")); 598 EXPECT_EQ(kMaybe, CanPlay("'application/ogg'"));
581 EXPECT_EQ(kProbably, CanPlay("'application/ogg; codecs=\"vorbis\"'")); 599 EXPECT_EQ(kProbably, CanPlay("'application/ogg; codecs=\"vorbis\"'"));
582 EXPECT_EQ(kTheoraProbably, CanPlay("'application/ogg; codecs=\"theora\"'")); 600 EXPECT_EQ(kTheoraProbably, CanPlay("'application/ogg; codecs=\"theora\"'"));
583 EXPECT_EQ(kProbably, CanPlay("'application/ogg; codecs=\"opus\"'")); 601 EXPECT_EQ(kOggOpusProbably, CanPlay("'application/ogg; codecs=\"opus\"'"));
584 EXPECT_EQ(kTheoraProbably, 602 EXPECT_EQ(kTheoraProbably,
585 CanPlay("'application/ogg; codecs=\"theora, vorbis\"'")); 603 CanPlay("'application/ogg; codecs=\"theora, vorbis\"'"));
586 EXPECT_EQ(kTheoraProbably, 604 EXPECT_EQ(kTheoraProbably,
587 CanPlay("'application/ogg; codecs=\"theora, opus\"'")); 605 CanPlay("'application/ogg; codecs=\"theora, opus\"'"));
588 EXPECT_EQ(kProbably, CanPlay("'application/ogg; codecs=\"opus, vorbis\"'")); 606 EXPECT_EQ(kOggOpusProbably,
607 CanPlay("'application/ogg; codecs=\"opus, vorbis\"'"));
589 608
590 TestOGGUnacceptableCombinations("application/ogg"); 609 TestOGGUnacceptableCombinations("application/ogg");
591 } 610 }
592 611
593 IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_mp3) { 612 IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_mp3) {
594 EXPECT_EQ(kNot, CanPlay("'video/mp3'")); 613 EXPECT_EQ(kNot, CanPlay("'video/mp3'"));
595 EXPECT_EQ(kNot, CanPlay("'video/mpeg'")); 614 EXPECT_EQ(kNot, CanPlay("'video/mpeg'"));
596 EXPECT_EQ(kNot, CanPlay("'video/x-mp3'")); 615 EXPECT_EQ(kNot, CanPlay("'video/x-mp3'"));
597 616
598 // audio/mpeg without a codecs parameter (RFC 3003 compliant) 617 // audio/mpeg without a codecs parameter (RFC 3003 compliant)
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
672 691
673 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc1.42E01E\"'")); 692 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc1.42E01E\"'"));
674 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc1.42101E\"'")); 693 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc1.42101E\"'"));
675 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc1.42701E\"'")); 694 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc1.42701E\"'"));
676 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc1.42F01E\"'")); 695 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc1.42F01E\"'"));
677 696
678 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc3.42E01E\"'")); 697 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc3.42E01E\"'"));
679 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc3.42801E\"'")); 698 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc3.42801E\"'"));
680 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc3.42C01E\"'")); 699 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc3.42C01E\"'"));
681 700
682 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"mp4a.66\"'")); 701 EXPECT_EQ(kMpeg2AacProbably, CanPlay("'video/mp4; codecs=\"mp4a.66\"'"));
683 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"mp4a.67\"'")); 702 EXPECT_EQ(kMpeg2AacProbably, CanPlay("'video/mp4; codecs=\"mp4a.67\"'"));
684 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"mp4a.68\"'")); 703 EXPECT_EQ(kMpeg2AacProbably, CanPlay("'video/mp4; codecs=\"mp4a.68\"'"));
685 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"mp4a.69\"'")); 704 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"mp4a.69\"'"));
686 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"mp4a.6B\"'")); 705 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"mp4a.6B\"'"));
687 706
688 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"mp4a.40.2\"'")); 707 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"mp4a.40.2\"'"));
689 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"mp4a.40.02\"'")); 708 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"mp4a.40.02\"'"));
690 EXPECT_EQ(kPropProbably, 709 EXPECT_EQ(kPropProbably,
691 CanPlay("'video/mp4; codecs=\"avc1.42E01E, mp4a.40.2\"'")); 710 CanPlay("'video/mp4; codecs=\"avc1.42E01E, mp4a.40.2\"'"));
692 EXPECT_EQ(kPropProbably, 711 EXPECT_EQ(kPropProbably,
693 CanPlay("'video/mp4; codecs=\"avc1.42E01E, mp4a.40.02\"'")); 712 CanPlay("'video/mp4; codecs=\"avc1.42E01E, mp4a.40.02\"'"));
694 EXPECT_EQ(kPropProbably, 713 EXPECT_EQ(kPropProbably,
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
756 775
757 EXPECT_EQ(kPropProbably, CanPlay("'video/x-m4v; codecs=\"avc1.42E01E\"'")); 776 EXPECT_EQ(kPropProbably, CanPlay("'video/x-m4v; codecs=\"avc1.42E01E\"'"));
758 EXPECT_EQ(kPropProbably, CanPlay("'video/x-m4v; codecs=\"avc1.42101E\"'")); 777 EXPECT_EQ(kPropProbably, CanPlay("'video/x-m4v; codecs=\"avc1.42101E\"'"));
759 EXPECT_EQ(kPropProbably, CanPlay("'video/x-m4v; codecs=\"avc1.42701E\"'")); 778 EXPECT_EQ(kPropProbably, CanPlay("'video/x-m4v; codecs=\"avc1.42701E\"'"));
760 EXPECT_EQ(kPropProbably, CanPlay("'video/x-m4v; codecs=\"avc1.42F01E\"'")); 779 EXPECT_EQ(kPropProbably, CanPlay("'video/x-m4v; codecs=\"avc1.42F01E\"'"));
761 780
762 EXPECT_EQ(kPropProbably, CanPlay("'video/x-m4v; codecs=\"avc3.42E01E\"'")); 781 EXPECT_EQ(kPropProbably, CanPlay("'video/x-m4v; codecs=\"avc3.42E01E\"'"));
763 EXPECT_EQ(kPropProbably, CanPlay("'video/x-m4v; codecs=\"avc3.42801E\"'")); 782 EXPECT_EQ(kPropProbably, CanPlay("'video/x-m4v; codecs=\"avc3.42801E\"'"));
764 EXPECT_EQ(kPropProbably, CanPlay("'video/x-m4v; codecs=\"avc3.42C01E\"'")); 783 EXPECT_EQ(kPropProbably, CanPlay("'video/x-m4v; codecs=\"avc3.42C01E\"'"));
765 784
766 EXPECT_EQ(kPropProbably, CanPlay("'video/x-m4v; codecs=\"mp4a.66\"'")); 785 EXPECT_EQ(kMpeg2AacProbably, CanPlay("'video/x-m4v; codecs=\"mp4a.66\"'"));
767 EXPECT_EQ(kPropProbably, CanPlay("'video/x-m4v; codecs=\"mp4a.67\"'")); 786 EXPECT_EQ(kMpeg2AacProbably, CanPlay("'video/x-m4v; codecs=\"mp4a.67\"'"));
768 EXPECT_EQ(kPropProbably, CanPlay("'video/x-m4v; codecs=\"mp4a.68\"'")); 787 EXPECT_EQ(kMpeg2AacProbably, CanPlay("'video/x-m4v; codecs=\"mp4a.68\"'"));
769 EXPECT_EQ(kNot, CanPlay("'video/x-m4v; codecs=\"mp4a.69\"'")); 788 EXPECT_EQ(kNot, CanPlay("'video/x-m4v; codecs=\"mp4a.69\"'"));
770 EXPECT_EQ(kNot, CanPlay("'video/x-m4v; codecs=\"mp4a.6B\"'")); 789 EXPECT_EQ(kNot, CanPlay("'video/x-m4v; codecs=\"mp4a.6B\"'"));
771 790
772 EXPECT_EQ(kPropProbably, CanPlay("'video/x-m4v; codecs=\"mp4a.40.2\"'")); 791 EXPECT_EQ(kPropProbably, CanPlay("'video/x-m4v; codecs=\"mp4a.40.2\"'"));
773 EXPECT_EQ(kPropProbably, CanPlay("'video/x-m4v; codecs=\"mp4a.40.02\"'")); 792 EXPECT_EQ(kPropProbably, CanPlay("'video/x-m4v; codecs=\"mp4a.40.02\"'"));
774 EXPECT_EQ(kPropProbably, 793 EXPECT_EQ(kPropProbably,
775 CanPlay("'video/x-m4v; codecs=\"avc1.42E01E, mp4a.40.2\"'")); 794 CanPlay("'video/x-m4v; codecs=\"avc1.42E01E, mp4a.40.2\"'"));
776 EXPECT_EQ(kPropProbably, 795 EXPECT_EQ(kPropProbably,
777 CanPlay("'video/x-m4v; codecs=\"avc1.42E01E, mp4a.40.02\"'")); 796 CanPlay("'video/x-m4v; codecs=\"avc1.42E01E, mp4a.40.02\"'"));
778 EXPECT_EQ(kPropProbably, 797 EXPECT_EQ(kPropProbably,
(...skipping 28 matching lines...) Expand all
807 EXPECT_EQ(kNot, CanPlay("'video/x-m4v; codecs=\"avc1.640028,ac-3\"'")); 826 EXPECT_EQ(kNot, CanPlay("'video/x-m4v; codecs=\"avc1.640028,ac-3\"'"));
808 EXPECT_EQ(kNot, CanPlay("'video/x-m4v; codecs=\"avc1.640028,mp4a.a5\"'")); 827 EXPECT_EQ(kNot, CanPlay("'video/x-m4v; codecs=\"avc1.640028,mp4a.a5\"'"));
809 EXPECT_EQ(kNot, CanPlay("'video/x-m4v; codecs=\"avc1.640028,mp4a.A5\"'")); 828 EXPECT_EQ(kNot, CanPlay("'video/x-m4v; codecs=\"avc1.640028,mp4a.A5\"'"));
810 EXPECT_EQ(kNot, CanPlay("'video/x-m4v; codecs=\"avc1.640028,ec-3\"'")); 829 EXPECT_EQ(kNot, CanPlay("'video/x-m4v; codecs=\"avc1.640028,ec-3\"'"));
811 EXPECT_EQ(kNot, CanPlay("'video/x-m4v; codecs=\"avc1.640028,mp4a.a6\"'")); 830 EXPECT_EQ(kNot, CanPlay("'video/x-m4v; codecs=\"avc1.640028,mp4a.a6\"'"));
812 EXPECT_EQ(kNot, CanPlay("'video/x-m4v; codecs=\"avc1.640028,mp4a.A6\"'")); 831 EXPECT_EQ(kNot, CanPlay("'video/x-m4v; codecs=\"avc1.640028,mp4a.A6\"'"));
813 832
814 TestMPEGUnacceptableCombinations("video/x-m4v"); 833 TestMPEGUnacceptableCombinations("video/x-m4v");
815 834
816 EXPECT_EQ(kPropMaybe, CanPlay("'audio/mp4'")); 835 EXPECT_EQ(kPropMaybe, CanPlay("'audio/mp4'"));
817 EXPECT_EQ(kPropProbably, CanPlay("'audio/mp4; codecs=\"mp4a.66\"'")); 836 EXPECT_EQ(kMpeg2AacProbably, CanPlay("'audio/mp4; codecs=\"mp4a.66\"'"));
818 EXPECT_EQ(kPropProbably, CanPlay("'audio/mp4; codecs=\"mp4a.67\"'")); 837 EXPECT_EQ(kMpeg2AacProbably, CanPlay("'audio/mp4; codecs=\"mp4a.67\"'"));
819 EXPECT_EQ(kPropProbably, CanPlay("'audio/mp4; codecs=\"mp4a.68\"'")); 838 EXPECT_EQ(kMpeg2AacProbably, CanPlay("'audio/mp4; codecs=\"mp4a.68\"'"));
820 EXPECT_EQ(kPropProbably, CanPlay("'audio/mp4; codecs=\"mp4a.69\"'")); 839 EXPECT_EQ(kPropProbably, CanPlay("'audio/mp4; codecs=\"mp4a.69\"'"));
821 EXPECT_EQ(kPropProbably, CanPlay("'audio/mp4; codecs=\"mp4a.6B\"'")); 840 EXPECT_EQ(kPropProbably, CanPlay("'audio/mp4; codecs=\"mp4a.6B\"'"));
822 841
823 EXPECT_EQ(kPropMaybe, CanPlay("'audio/mp4; codecs=\"mp4a.40\"'")); 842 EXPECT_EQ(kPropMaybe, CanPlay("'audio/mp4; codecs=\"mp4a.40\"'"));
824 EXPECT_EQ(kPropProbably, CanPlay("'audio/mp4; codecs=\"mp4a.40.2\"'")); 843 EXPECT_EQ(kPropProbably, CanPlay("'audio/mp4; codecs=\"mp4a.40.2\"'"));
825 EXPECT_EQ(kPropProbably, CanPlay("'audio/mp4; codecs=\"mp4a.40.02\"'")); 844 EXPECT_EQ(kPropProbably, CanPlay("'audio/mp4; codecs=\"mp4a.40.02\"'"));
826 EXPECT_EQ(kPropProbably, CanPlay("'audio/mp4; codecs=\"mp4a.40.5\"'")); 845 EXPECT_EQ(kPropProbably, CanPlay("'audio/mp4; codecs=\"mp4a.40.5\"'"));
827 EXPECT_EQ(kPropProbably, CanPlay("'audio/mp4; codecs=\"mp4a.40.05\"'")); 846 EXPECT_EQ(kPropProbably, CanPlay("'audio/mp4; codecs=\"mp4a.40.05\"'"));
828 EXPECT_EQ(kPropProbably, CanPlay("'audio/mp4; codecs=\"mp4a.40.29\"'")); 847 EXPECT_EQ(kPropProbably, CanPlay("'audio/mp4; codecs=\"mp4a.40.29\"'"));
829 848
(...skipping 16 matching lines...) Expand all
846 EXPECT_EQ(kAc3Eac3Probably, CanPlay("'audio/mp4; codecs=\"ec-3\"'")); 865 EXPECT_EQ(kAc3Eac3Probably, CanPlay("'audio/mp4; codecs=\"ec-3\"'"));
847 EXPECT_EQ(kAc3Eac3Probably, CanPlay("'audio/mp4; codecs=\"mp4a.a6\"'")); 866 EXPECT_EQ(kAc3Eac3Probably, CanPlay("'audio/mp4; codecs=\"mp4a.a6\"'"));
848 EXPECT_EQ(kAc3Eac3Probably, CanPlay("'audio/mp4; codecs=\"mp4a.A6\"'")); 867 EXPECT_EQ(kAc3Eac3Probably, CanPlay("'audio/mp4; codecs=\"mp4a.A6\"'"));
849 868
850 TestMPEGUnacceptableCombinations("audio/mp4"); 869 TestMPEGUnacceptableCombinations("audio/mp4");
851 // This result is incorrect. See https://crbug.com/592889. 870 // This result is incorrect. See https://crbug.com/592889.
852 EXPECT_EQ(kPropProbably, CanPlay("'audio/mp4; codecs=\"mp3\"'")); 871 EXPECT_EQ(kPropProbably, CanPlay("'audio/mp4; codecs=\"mp3\"'"));
853 872
854 EXPECT_EQ(kPropMaybe, CanPlay("'audio/x-m4a'")); 873 EXPECT_EQ(kPropMaybe, CanPlay("'audio/x-m4a'"));
855 874
856 EXPECT_EQ(kPropProbably, CanPlay("'audio/x-m4a; codecs=\"mp4a.66\"'")); 875 EXPECT_EQ(kMpeg2AacProbably, CanPlay("'audio/x-m4a; codecs=\"mp4a.66\"'"));
857 EXPECT_EQ(kPropProbably, CanPlay("'audio/x-m4a; codecs=\"mp4a.67\"'")); 876 EXPECT_EQ(kMpeg2AacProbably, CanPlay("'audio/x-m4a; codecs=\"mp4a.67\"'"));
858 EXPECT_EQ(kPropProbably, CanPlay("'audio/x-m4a; codecs=\"mp4a.68\"'")); 877 EXPECT_EQ(kMpeg2AacProbably, CanPlay("'audio/x-m4a; codecs=\"mp4a.68\"'"));
859 EXPECT_EQ(kNot, CanPlay("'audio/x-m4a; codecs=\"mp4a.69\"'")); 878 EXPECT_EQ(kNot, CanPlay("'audio/x-m4a; codecs=\"mp4a.69\"'"));
860 EXPECT_EQ(kNot, CanPlay("'audio/x-m4a; codecs=\"mp4a.6B\"'")); 879 EXPECT_EQ(kNot, CanPlay("'audio/x-m4a; codecs=\"mp4a.6B\"'"));
861 880
862 EXPECT_EQ(kPropMaybe, CanPlay("'audio/x-m4a; codecs=\"mp4a.40\"'")); 881 EXPECT_EQ(kPropMaybe, CanPlay("'audio/x-m4a; codecs=\"mp4a.40\"'"));
863 EXPECT_EQ(kPropProbably, CanPlay("'audio/x-m4a; codecs=\"mp4a.40.2\"'")); 882 EXPECT_EQ(kPropProbably, CanPlay("'audio/x-m4a; codecs=\"mp4a.40.2\"'"));
864 EXPECT_EQ(kPropProbably, CanPlay("'audio/x-m4a; codecs=\"mp4a.40.02\"'")); 883 EXPECT_EQ(kPropProbably, CanPlay("'audio/x-m4a; codecs=\"mp4a.40.02\"'"));
865 EXPECT_EQ(kPropProbably, CanPlay("'audio/x-m4a; codecs=\"mp4a.40.5\"'")); 884 EXPECT_EQ(kPropProbably, CanPlay("'audio/x-m4a; codecs=\"mp4a.40.5\"'"));
866 EXPECT_EQ(kPropProbably, CanPlay("'audio/x-m4a; codecs=\"mp4a.40.05\"'")); 885 EXPECT_EQ(kPropProbably, CanPlay("'audio/x-m4a; codecs=\"mp4a.40.05\"'"));
867 EXPECT_EQ(kPropProbably, CanPlay("'audio/x-m4a; codecs=\"mp4a.40.29\"'")); 886 EXPECT_EQ(kPropProbably, CanPlay("'audio/x-m4a; codecs=\"mp4a.40.29\"'"));
868 887
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after
1190 EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"mp4a\"'")); 1209 EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"mp4a\"'"));
1191 EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"mp4a.\"'")); 1210 EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"mp4a.\"'"));
1192 1211
1193 EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"mp4a.6\"'")); 1212 EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"mp4a.6\"'"));
1194 EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"mp4a.60\"'")); 1213 EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"mp4a.60\"'"));
1195 EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"mp4a.61\"'")); 1214 EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"mp4a.61\"'"));
1196 EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"mp4a.62\"'")); 1215 EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"mp4a.62\"'"));
1197 EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"mp4a.63\"'")); 1216 EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"mp4a.63\"'"));
1198 EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"mp4a.65\"'")); 1217 EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"mp4a.65\"'"));
1199 EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"mp4a.65\"'")); 1218 EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"mp4a.65\"'"));
1200 // MPEG2 AAC Main, LC, and SSR are supported. 1219 // MPEG2 AAC Main, LC, and SSR are supported except on Android.
1201 EXPECT_EQ(kPropProbably, CanPlay("'audio/mp4; codecs=\"mp4a.66\"'")); 1220 EXPECT_EQ(kMpeg2AacProbably, CanPlay("'audio/mp4; codecs=\"mp4a.66\"'"));
1202 EXPECT_EQ(kPropProbably, CanPlay("'audio/mp4; codecs=\"mp4a.67\"'")); 1221 EXPECT_EQ(kMpeg2AacProbably, CanPlay("'audio/mp4; codecs=\"mp4a.67\"'"));
1203 EXPECT_EQ(kPropProbably, CanPlay("'audio/mp4; codecs=\"mp4a.68\"'")); 1222 EXPECT_EQ(kMpeg2AacProbably, CanPlay("'audio/mp4; codecs=\"mp4a.68\"'"));
1204 // MP3. 1223 // MP3.
1205 EXPECT_EQ(kPropProbably, CanPlay("'audio/mp4; codecs=\"mp4a.69\"'")); 1224 EXPECT_EQ(kPropProbably, CanPlay("'audio/mp4; codecs=\"mp4a.69\"'"));
1206 EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"mp4a.6A\"'")); 1225 EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"mp4a.6A\"'"));
1207 // MP3. 1226 // MP3.
1208 EXPECT_EQ(kPropProbably, CanPlay("'audio/mp4; codecs=\"mp4a.6B\"'")); 1227 EXPECT_EQ(kPropProbably, CanPlay("'audio/mp4; codecs=\"mp4a.6B\"'"));
1209 EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"mp4a.6b\"'")); 1228 EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"mp4a.6b\"'"));
1210 EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"mp4a.6C\"'")); 1229 EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"mp4a.6C\"'"));
1211 EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"mp4a.6D\"'")); 1230 EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"mp4a.6D\"'"));
1212 EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"mp4a.6E\"'")); 1231 EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"mp4a.6E\"'"));
1213 EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"mp4a.6F\"'")); 1232 EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"mp4a.6F\"'"));
(...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after
1561 EXPECT_EQ(kMp2tsProbably, 1580 EXPECT_EQ(kMp2tsProbably,
1562 CanPlay("'video/mp2t; codecs=\"avc1.100.40,mp4a.40.2\"'")); 1581 CanPlay("'video/mp2t; codecs=\"avc1.100.40,mp4a.40.2\"'"));
1563 } 1582 }
1564 1583
1565 IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_Mpeg2TsAudio) { 1584 IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_Mpeg2TsAudio) {
1566 // audio/mp2t is currently not supported (see also crbug.com/556837). 1585 // audio/mp2t is currently not supported (see also crbug.com/556837).
1567 EXPECT_EQ(kNot, CanPlay("'audio/mp2t; codecs=\"mp4a.40.2\"'")); 1586 EXPECT_EQ(kNot, CanPlay("'audio/mp2t; codecs=\"mp4a.40.2\"'"));
1568 } 1587 }
1569 1588
1570 } // namespace content 1589 } // namespace content
OLDNEW
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | content/browser/media/session/media_session_visibility_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698