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

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

Issue 336213011: Fix: Changing canPlayType behaviour for MP4 containers (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Correcting type in mime_util Created 6 years, 5 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 | net/base/mime_util.cc » ('j') | net/base/mime_util.cc » ('J')
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 "content/browser/media/media_browsertest.h" 7 #include "content/browser/media/media_browsertest.h"
8 #include "content/public/test/browser_test_utils.h" 8 #include "content/public/test/browser_test_utils.h"
9 #include "content/public/test/content_browser_test_utils.h" 9 #include "content/public/test/content_browser_test_utils.h"
10 #include "content/shell/browser/shell.h" 10 #include "content/shell/browser/shell.h"
(...skipping 482 matching lines...) Expand 10 before | Expand all | Expand 10 after
493 IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_mp4) { 493 IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_mp4) {
494 EXPECT_EQ(kPropMaybe, CanPlay("'video/mp4'")); 494 EXPECT_EQ(kPropMaybe, CanPlay("'video/mp4'"));
495 495
496 EXPECT_EQ(kPropMaybe, CanPlay("'video/mp4; codecs=\"avc1\"'")); 496 EXPECT_EQ(kPropMaybe, CanPlay("'video/mp4; codecs=\"avc1\"'"));
497 EXPECT_EQ(kPropMaybe, CanPlay("'video/mp4; codecs=\"avc3\"'")); 497 EXPECT_EQ(kPropMaybe, CanPlay("'video/mp4; codecs=\"avc3\"'"));
498 EXPECT_EQ(kPropMaybe, CanPlay("'video/mp4; codecs=\"mp4a.40\"'")); 498 EXPECT_EQ(kPropMaybe, CanPlay("'video/mp4; codecs=\"mp4a.40\"'"));
499 EXPECT_EQ(kPropMaybe, CanPlay("'video/mp4; codecs=\"avc1, mp4a.40\"'")); 499 EXPECT_EQ(kPropMaybe, CanPlay("'video/mp4; codecs=\"avc1, mp4a.40\"'"));
500 EXPECT_EQ(kPropMaybe, CanPlay("'video/mp4; codecs=\"avc3, mp4a.40\"'")); 500 EXPECT_EQ(kPropMaybe, CanPlay("'video/mp4; codecs=\"avc3, mp4a.40\"'"));
501 EXPECT_EQ(kPropMaybe, CanPlay("'video/mp4; codecs=\"avc1, avc3\"'")); 501 EXPECT_EQ(kPropMaybe, CanPlay("'video/mp4; codecs=\"avc1, avc3\"'"));
502 502
503 EXPECT_EQ(kPropMaybe, CanPlay("'video/mp4; codecs=\"avc1.4D401E\"'")); 503 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc1.4D401E\"'"));
504 EXPECT_EQ(kPropMaybe, CanPlay("'video/mp4; codecs=\"avc3.64001F\"'")); 504 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc3.64001F\"'"));
505 EXPECT_EQ(kPropMaybe, CanPlay("'video/mp4; codecs=\"mp4a.40.2\"'")); 505 EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"mp4a.40.2\"'"));
506 EXPECT_EQ(kPropMaybe, 506 EXPECT_EQ(kPropProbably,
507 CanPlay("'video/mp4; codecs=\"avc1.4D401E, mp4a.40.2\"'")); 507 CanPlay("'video/mp4; codecs=\"avc1.4D401E, mp4a.40.2\"'"));
508 EXPECT_EQ(kPropMaybe, 508 EXPECT_EQ(kPropProbably,
509 CanPlay("'video/mp4; codecs=\"avc3.64001F, mp4a.40.5\"'")); 509 CanPlay("'video/mp4; codecs=\"avc3.64001F, mp4a.40.5\"'"));
510 510
511 EXPECT_EQ(kPropMaybe, CanPlay("video/mp4; codecs=\"avc1, mp4a.40.2\"'"));
512 EXPECT_EQ(kPropMaybe, CanPlay("video/mp4; codecs=\"avc3, mp4a.40.2\"'"));
513 EXPECT_EQ(kPropMaybe, CanPlay("video/mp4; codecs=\"avc1.4D401E, mp4a.40\"'"));
514 EXPECT_EQ(kPropMaybe, CanPlay("video/mp4; codecs=\"avc3.64001F, mp4a.40\"'"));
515
516 EXPECT_EQ(kPropMaybe, CanPlay("video/mp4; codecs=\"avc1.ABCDEF\"'"));
517 EXPECT_EQ(kPropMaybe, CanPlay("video/mp4; codecs=\"mp4a.6A\"'"));
518 EXPECT_EQ(kPropMaybe, CanPlay("video/mp4; codecs=\"avc1.ABCDEF, mp4a.6A\"'"));
519 EXPECT_EQ(kPropMaybe, CanPlay("video/mp4; codecs=\"avc3.ABCDEF, mp4a.6A\"'"));
520 // TODO(amogh.bihani): This should give "maybe" but profile parameters for
521 // avc3 are not yet added to kProprietaryCodecsExpression list.
522 EXPECT_EQ(kPropProbably, CanPlay("video/mp4; codecs=\"avc3.ABCDEF\"'"));
523
511 EXPECT_EQ(kNot, CanPlay("'video/mp4; codecs=\"avc1.unknown\"'")); 524 EXPECT_EQ(kNot, CanPlay("'video/mp4; codecs=\"avc1.unknown\"'"));
512 EXPECT_EQ(kNot, CanPlay("'video/mp4; codecs=\"avc3.unknown\"'")); 525 EXPECT_EQ(kNot, CanPlay("'video/mp4; codecs=\"avc3.unknown\"'"));
513 EXPECT_EQ(kNot, CanPlay("'video/mp4; codecs=\"mp4a.unknown\"'")); 526 EXPECT_EQ(kNot, CanPlay("'video/mp4; codecs=\"mp4a.unknown\"'"));
514 527
515 EXPECT_EQ(kNot, CanPlay("'video/mp4; codecs=\"avc1.\"'")); 528 EXPECT_EQ(kNot, CanPlay("'video/mp4; codecs=\"avc1.\"'"));
516 EXPECT_EQ(kNot, CanPlay("'video/mp4; codecs=\"avc3.\"'")); 529 EXPECT_EQ(kNot, CanPlay("'video/mp4; codecs=\"avc3.\"'"));
517 EXPECT_EQ(kNot, CanPlay("'video/mp4; codecs=\"mp4a\"'")); 530 EXPECT_EQ(kNot, CanPlay("'video/mp4; codecs=\"mp4a\"'"));
518 EXPECT_EQ(kNot, CanPlay("'video/mp4; codecs=\"mp4a.\"'")); 531 EXPECT_EQ(kNot, CanPlay("'video/mp4; codecs=\"mp4a.\"'"));
519 EXPECT_EQ(kNot, CanPlay("'video/mp4; codecs=\"mp4a.40.\"'")); 532 EXPECT_EQ(kNot, CanPlay("'video/mp4; codecs=\"mp4a.40.\"'"));
520 533
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
562 575
563 EXPECT_EQ(kPropMaybe, CanPlay("'video/x-m4v'")); 576 EXPECT_EQ(kPropMaybe, CanPlay("'video/x-m4v'"));
564 577
565 EXPECT_EQ(kPropMaybe, CanPlay("'video/x-m4v; codecs=\"avc1\"'")); 578 EXPECT_EQ(kPropMaybe, CanPlay("'video/x-m4v; codecs=\"avc1\"'"));
566 EXPECT_EQ(kPropMaybe, CanPlay("'video/x-m4v; codecs=\"avc3\"'")); 579 EXPECT_EQ(kPropMaybe, CanPlay("'video/x-m4v; codecs=\"avc3\"'"));
567 EXPECT_EQ(kPropMaybe, CanPlay("'video/x-m4v; codecs=\"mp4a.40\"'")); 580 EXPECT_EQ(kPropMaybe, CanPlay("'video/x-m4v; codecs=\"mp4a.40\"'"));
568 EXPECT_EQ(kPropMaybe, CanPlay("'video/x-m4v; codecs=\"avc1, mp4a.40\"'")); 581 EXPECT_EQ(kPropMaybe, CanPlay("'video/x-m4v; codecs=\"avc1, mp4a.40\"'"));
569 EXPECT_EQ(kPropMaybe, CanPlay("'video/x-m4v; codecs=\"avc3, mp4a.40\"'")); 582 EXPECT_EQ(kPropMaybe, CanPlay("'video/x-m4v; codecs=\"avc3, mp4a.40\"'"));
570 EXPECT_EQ(kPropMaybe, CanPlay("'video/x-m4v; codecs=\"avc1, avc3\"'")); 583 EXPECT_EQ(kPropMaybe, CanPlay("'video/x-m4v; codecs=\"avc1, avc3\"'"));
571 584
572 EXPECT_EQ(kPropMaybe, CanPlay("'video/x-m4v; codecs=\"avc1.4D401E\"'")); 585 EXPECT_EQ(kPropProbably, CanPlay("'video/x-m4v; codecs=\"avc1.4D401E\"'"));
573 EXPECT_EQ(kPropMaybe, CanPlay("'video/x-m4v; codecs=\"avc3.64001F\"'")); 586 EXPECT_EQ(kPropProbably, CanPlay("'video/x-m4v; codecs=\"avc3.64001F\"'"));
574 EXPECT_EQ(kPropMaybe, CanPlay("'video/x-m4v; codecs=\"mp4a.40.2\"'")); 587 EXPECT_EQ(kPropProbably, CanPlay("'video/x-m4v; codecs=\"mp4a.40.2\"'"));
588 EXPECT_EQ(kPropProbably,
589 CanPlay("'video/x-m4v; codecs=\"avc1.4D401E, mp4a.40.2\"'"));
590 EXPECT_EQ(kPropProbably,
591 CanPlay("'video/x-m4v; codecs=\"avc3.64001F, mp4a.40.5\"'"));
592
593 EXPECT_EQ(kPropMaybe, CanPlay("video/x-m4v; codecs=\"avc1, mp4a.40.2\"'"));
594 EXPECT_EQ(kPropMaybe, CanPlay("video/x-m4v; codecs=\"avc3, mp4a.40.2\"'"));
575 EXPECT_EQ(kPropMaybe, 595 EXPECT_EQ(kPropMaybe,
576 CanPlay("'video/x-m4v; codecs=\"avc1.4D401E, mp4a.40.2\"'")); 596 CanPlay("video/x-m4v; codecs=\"avc1.4D401E, mp4a.40\"'"));
577 EXPECT_EQ(kPropMaybe, 597 EXPECT_EQ(kPropMaybe,
578 CanPlay("'video/x-m4v; codecs=\"avc3.64001F, mp4a.40.5\"'")); 598 CanPlay("video/x-m4v; codecs=\"avc3.64001F, mp4a.40\"'"));
599
600 EXPECT_EQ(kPropMaybe, CanPlay("video/x-m4v; codecs=\"avc1.ABCDEF\"'"));
601 EXPECT_EQ(kPropMaybe, CanPlay("video/x-m4v; codecs=\"mp4a.6A\"'"));
602 EXPECT_EQ(kPropMaybe,
603 CanPlay("video/x-m4v; codecs=\"avc1.ABCDEF, mp4a.6A\"'"));
604 EXPECT_EQ(kPropMaybe,
605 CanPlay("video/x-m4v; codecs=\"avc3.ABCDEF, mp4a.6A\"'"));
606 // TODO(amogh.bihani): This should give "maybe" but profile parameters for
607 // avc3 are yet not added to kProprietaryCodecsExpression list.
608 EXPECT_EQ(kPropProbably, CanPlay("video/x-m4v; codecs=\"avc3.ABCDEF\"'"));
579 609
580 EXPECT_EQ(kNot, CanPlay("'video/x-m4v; codecs=\"avc1.unknown\"'")); 610 EXPECT_EQ(kNot, CanPlay("'video/x-m4v; codecs=\"avc1.unknown\"'"));
581 EXPECT_EQ(kNot, CanPlay("'video/x-m4v; codecs=\"avc3.unknown\"'")); 611 EXPECT_EQ(kNot, CanPlay("'video/x-m4v; codecs=\"avc3.unknown\"'"));
582 EXPECT_EQ(kNot, CanPlay("'video/x-m4v; codecs=\"mp4a.unknown\"'")); 612 EXPECT_EQ(kNot, CanPlay("'video/x-m4v; codecs=\"mp4a.unknown\"'"));
583 613
584 EXPECT_EQ(kNot, CanPlay("'video/x-m4v; codecs=\"avc1.\"'")); 614 EXPECT_EQ(kNot, CanPlay("'video/x-m4v; codecs=\"avc1.\"'"));
585 EXPECT_EQ(kNot, CanPlay("'video/x-m4v; codecs=\"avc3.\"'")); 615 EXPECT_EQ(kNot, CanPlay("'video/x-m4v; codecs=\"avc3.\"'"));
586 EXPECT_EQ(kNot, CanPlay("'video/x-m4v; codecs=\"mp4a\"'")); 616 EXPECT_EQ(kNot, CanPlay("'video/x-m4v; codecs=\"mp4a\"'"));
587 EXPECT_EQ(kNot, CanPlay("'video/x-m4v; codecs=\"mp4a.\"'")); 617 EXPECT_EQ(kNot, CanPlay("'video/x-m4v; codecs=\"mp4a.\"'"));
588 EXPECT_EQ(kNot, CanPlay("'video/x-m4v; codecs=\"mp4a.40.\"'")); 618 EXPECT_EQ(kNot, CanPlay("'video/x-m4v; codecs=\"mp4a.40.\"'"));
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
624 EXPECT_EQ(kNot, CanPlay("'video/x-m4v; codecs=\"avc4\"'")); 654 EXPECT_EQ(kNot, CanPlay("'video/x-m4v; codecs=\"avc4\"'"));
625 655
626 EXPECT_EQ(kNot, CanPlay("'video/x-m4v; codecs=\"avc1x\"'")); 656 EXPECT_EQ(kNot, CanPlay("'video/x-m4v; codecs=\"avc1x\"'"));
627 EXPECT_EQ(kNot, CanPlay("'video/x-m4v; codecs=\"avc3x\"'")); 657 EXPECT_EQ(kNot, CanPlay("'video/x-m4v; codecs=\"avc3x\"'"));
628 EXPECT_EQ(kNot, CanPlay("'video/x-m4v; codecs=\"mp4ax\"'")); 658 EXPECT_EQ(kNot, CanPlay("'video/x-m4v; codecs=\"mp4ax\"'"));
629 659
630 EXPECT_EQ(kNot, CanPlay("'video/x-m4v; codecs=\"unknown\"'")); 660 EXPECT_EQ(kNot, CanPlay("'video/x-m4v; codecs=\"unknown\"'"));
631 661
632 EXPECT_EQ(kPropMaybe, CanPlay("'audio/mp4'")); 662 EXPECT_EQ(kPropMaybe, CanPlay("'audio/mp4'"));
633 EXPECT_EQ(kPropMaybe, CanPlay("'audio/mp4; codecs=\"mp4a.40\"'")); 663 EXPECT_EQ(kPropMaybe, CanPlay("'audio/mp4; codecs=\"mp4a.40\"'"));
634 EXPECT_EQ(kPropMaybe, CanPlay("'audio/mp4; codecs=\"mp4a.40.2\"'")); 664 EXPECT_EQ(kPropProbably, CanPlay("'audio/mp4; codecs=\"mp4a.40.2\"'"));
635 665
636 EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"avc1\"'")); 666 EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"avc1\"'"));
637 EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"avc3\"'")); 667 EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"avc3\"'"));
638 EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"avc1, mp4a.40\"'")); 668 EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"avc1, mp4a.40\"'"));
639 EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"avc3, mp4a.40\"'")); 669 EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"avc3, mp4a.40\"'"));
640 670
641 EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"avc1.4D401E\"'")); 671 EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"avc1.4D401E\"'"));
642 EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"avc3.64001F\"'")); 672 EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"avc3.64001F\"'"));
643 673
644 EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"avc1.unknown\"'")); 674 EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"avc1.unknown\"'"));
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
689 EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"avc4\"'")); 719 EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"avc4\"'"));
690 720
691 EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"avc1x\"'")); 721 EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"avc1x\"'"));
692 EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"avc3x\"'")); 722 EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"avc3x\"'"));
693 EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"mp4ax\"'")); 723 EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"mp4ax\"'"));
694 724
695 EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"unknown\"'")); 725 EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"unknown\"'"));
696 726
697 EXPECT_EQ(kPropMaybe, CanPlay("'audio/x-m4a'")); 727 EXPECT_EQ(kPropMaybe, CanPlay("'audio/x-m4a'"));
698 EXPECT_EQ(kPropMaybe, CanPlay("'audio/x-m4a; codecs=\"mp4a.40\"'")); 728 EXPECT_EQ(kPropMaybe, CanPlay("'audio/x-m4a; codecs=\"mp4a.40\"'"));
699 EXPECT_EQ(kPropMaybe, CanPlay("'audio/x-m4a; codecs=\"mp4a.40.2\"'")); 729 EXPECT_EQ(kPropProbably, CanPlay("'audio/x-m4a; codecs=\"mp4a.40.2\"'"));
700 730
701 EXPECT_EQ(kNot, CanPlay("'audio/x-m4a; codecs=\"avc1\"'")); 731 EXPECT_EQ(kNot, CanPlay("'audio/x-m4a; codecs=\"avc1\"'"));
702 EXPECT_EQ(kNot, CanPlay("'audio/x-m4a; codecs=\"avc3\"'")); 732 EXPECT_EQ(kNot, CanPlay("'audio/x-m4a; codecs=\"avc3\"'"));
703 EXPECT_EQ(kNot, CanPlay("'audio/x-m4a; codecs=\"avc1, mp4a\"'")); 733 EXPECT_EQ(kNot, CanPlay("'audio/x-m4a; codecs=\"avc1, mp4a\"'"));
704 EXPECT_EQ(kNot, CanPlay("'audio/x-m4a; codecs=\"avc3, mp4a\"'")); 734 EXPECT_EQ(kNot, CanPlay("'audio/x-m4a; codecs=\"avc3, mp4a\"'"));
705 735
706 EXPECT_EQ(kNot, CanPlay("'audio/x-m4a; codecs=\"avc1.4D401E\"'")); 736 EXPECT_EQ(kNot, CanPlay("'audio/x-m4a; codecs=\"avc1.4D401E\"'"));
707 EXPECT_EQ(kNot, CanPlay("'audio/x-m4a; codecs=\"avc3.64001F\"'")); 737 EXPECT_EQ(kNot, CanPlay("'audio/x-m4a; codecs=\"avc3.64001F\"'"));
708 738
709 EXPECT_EQ(kNot, CanPlay("'audio/x-m4a; codecs=\"avc1.unknown\"'")); 739 EXPECT_EQ(kNot, CanPlay("'audio/x-m4a; codecs=\"avc1.unknown\"'"));
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
755 785
756 EXPECT_EQ(kNot, CanPlay("'audio/x-m4a; codecs=\"avc1x\"'")); 786 EXPECT_EQ(kNot, CanPlay("'audio/x-m4a; codecs=\"avc1x\"'"));
757 EXPECT_EQ(kNot, CanPlay("'audio/x-m4a; codecs=\"avc3x\"'")); 787 EXPECT_EQ(kNot, CanPlay("'audio/x-m4a; codecs=\"avc3x\"'"));
758 EXPECT_EQ(kNot, CanPlay("'audio/x-m4a; codecs=\"mp4ax\"'")); 788 EXPECT_EQ(kNot, CanPlay("'audio/x-m4a; codecs=\"mp4ax\"'"));
759 789
760 EXPECT_EQ(kNot, CanPlay("'audio/x-m4a; codecs=\"unknown\"'")); 790 EXPECT_EQ(kNot, CanPlay("'audio/x-m4a; codecs=\"unknown\"'"));
761 } 791 }
762 792
763 IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_HLS) { 793 IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_HLS) {
764 // HLS are supported only on Android IceCreamSandwich and above (API level 14) 794 // HLS are supported only on Android IceCreamSandwich and above (API level 14)
765 std::string canPlayHLS = kNot; 795 std::string probablyCanPlayHLS = kNot;
796 std::string maybeCanPlayHLS = kNot;
766 #if defined(OS_ANDROID) 797 #if defined(OS_ANDROID)
767 if (base::android::BuildInfo::GetInstance()->sdk_int() > 13) 798 if (base::android::BuildInfo::GetInstance()->sdk_int() > 13) {
768 canPlayHLS = kMaybe; 799 probablyCanPlayHLS = kProbably;
800 maybeCanPlayHLS = kMaybe;
801 }
769 #endif 802 #endif
770 EXPECT_EQ(canPlayHLS, CanPlay("'application/x-mpegurl'")); 803 EXPECT_EQ(maybeCanPlayHLS, CanPlay("'application/x-mpegurl'"));
771 804
772 EXPECT_EQ(canPlayHLS, CanPlay("'application/x-mpegurl; codecs=\"avc1\"'")); 805 EXPECT_EQ(maybeCanPlayHLS,
773 EXPECT_EQ(canPlayHLS, CanPlay("'application/x-mpegurl; codecs=\"avc3\"'")); 806 CanPlay("'application/x-mpegurl; codecs=\"avc1\"'"));
774 EXPECT_EQ(canPlayHLS, CanPlay("'application/x-mpegurl; codecs=\"mp4a.40\"'")); 807 EXPECT_EQ(maybeCanPlayHLS,
775 EXPECT_EQ(canPlayHLS, 808 CanPlay("'application/x-mpegurl; codecs=\"avc3\"'"));
809 EXPECT_EQ(maybeCanPlayHLS,
810 CanPlay("'application/x-mpegurl; codecs=\"mp4a.40\"'"));
811 EXPECT_EQ(maybeCanPlayHLS,
776 CanPlay("'application/x-mpegurl; codecs=\"avc1, mp4a.40\"'")); 812 CanPlay("'application/x-mpegurl; codecs=\"avc1, mp4a.40\"'"));
777 EXPECT_EQ(canPlayHLS, 813 EXPECT_EQ(maybeCanPlayHLS,
778 CanPlay("'application/x-mpegurl; codecs=\"avc3, mp4a.40\"'")); 814 CanPlay("'application/x-mpegurl; codecs=\"avc3, mp4a.40\"'"));
779 815
780 EXPECT_EQ(canPlayHLS, 816 EXPECT_EQ(probablyCanPlayHLS,
781 CanPlay("'application/x-mpegurl; codecs=\"avc1.4D401E\"'")); 817 CanPlay("'application/x-mpegurl; codecs=\"avc1.4D401E\"'"));
782 EXPECT_EQ(canPlayHLS, 818 EXPECT_EQ(probablyCanPlayHLS,
783 CanPlay("'application/x-mpegurl; codecs=\"avc3.64001F\"'")); 819 CanPlay("'application/x-mpegurl; codecs=\"avc3.64001F\"'"));
784 EXPECT_EQ(canPlayHLS, 820 EXPECT_EQ(probablyCanPlayHLS,
785 CanPlay("'application/x-mpegurl; codecs=\"mp4a.40.2\"'")); 821 CanPlay("'application/x-mpegurl; codecs=\"mp4a.40.2\"'"));
786 EXPECT_EQ(canPlayHLS, 822 EXPECT_EQ(probablyCanPlayHLS,
787 CanPlay("'application/x-mpegurl; codecs=\"avc1.4D401E, mp4a.40.2\"'")); 823 CanPlay("'application/x-mpegurl; codecs=\"avc1.4D401E, mp4a.40.2\"'"));
788 EXPECT_EQ(canPlayHLS, 824 EXPECT_EQ(probablyCanPlayHLS,
789 CanPlay("'application/x-mpegurl; codecs=\"avc3.64001F, mp4a.40.5\"'")); 825 CanPlay("'application/x-mpegurl; codecs=\"avc3.64001F, mp4a.40.5\"'"));
790 826
827 EXPECT_EQ(maybeCanPlayHLS,
828 CanPlay("'application/x-mpegurl; codecs=\"avc1, mp4a.40.2\"'"));
829 EXPECT_EQ(maybeCanPlayHLS,
830 CanPlay("'application/x-mpegurl; codecs=\"avc3, mp4a.40.2\"'"));
831 EXPECT_EQ(maybeCanPlayHLS,
832 CanPlay("'application/x-mpegurl; codecs=\"avc1.4D401E, mp4a.40\"'"));
833 EXPECT_EQ(maybeCanPlayHLS,
834 CanPlay("'application/x-mpegurl; codecs=\"avc3.64001F, mp4a.40\"'"));
835
836 EXPECT_EQ(maybeCanPlayHLS,
837 CanPlay("'application/x-mpegurl; codecs=\"avc1.ABCDEF\"'"));
838 EXPECT_EQ(maybeCanPlayHLS,
839 CanPlay("'application/x-mpegurl; codecs=\"mp4a.6A\"'"));
840 EXPECT_EQ(maybeCanPlayHLS,
841 CanPlay("'application/x-mpegurl; codecs=\"avc1.ABCDEF, mp4a.6A\"'"));
842 EXPECT_EQ(maybeCanPlayHLS,
843 CanPlay("'application/x-mpegurl; codecs=\"avc3.ABCDEF, mp4a.6A\"'"));
844 // TODO(amogh.bihani): This should give "maybe" but profile parameters for
845 // avc3 are not yet added to kProprietaryCodecsExpression list.
846 EXPECT_EQ(probablyCanPlayHLS,
847 CanPlay("'application/x-mpegurl; codecs=\"avc1.ABCDEF\"'"));
848
791 EXPECT_EQ(kNot, CanPlay("'application/x-mpegurl; codecs=\"avc1.unknown\"'")); 849 EXPECT_EQ(kNot, CanPlay("'application/x-mpegurl; codecs=\"avc1.unknown\"'"));
792 EXPECT_EQ(kNot, CanPlay("'application/x-mpegurl; codecs=\"avc3.unknown\"'")); 850 EXPECT_EQ(kNot, CanPlay("'application/x-mpegurl; codecs=\"avc3.unknown\"'"));
793 EXPECT_EQ(kNot, CanPlay("'application/x-mpegurl; codecs=\"mp4a.unknown\"'")); 851 EXPECT_EQ(kNot, CanPlay("'application/x-mpegurl; codecs=\"mp4a.unknown\"'"));
794 852
795 EXPECT_EQ(kNot, CanPlay("'application/x-mpegurl; codecs=\"avc1.\"'")); 853 EXPECT_EQ(kNot, CanPlay("'application/x-mpegurl; codecs=\"avc1.\"'"));
796 EXPECT_EQ(kNot, CanPlay("'application/x-mpegurl; codecs=\"avc3.\"'")); 854 EXPECT_EQ(kNot, CanPlay("'application/x-mpegurl; codecs=\"avc3.\"'"));
797 EXPECT_EQ(kNot, CanPlay("'application/x-mpegurl; codecs=\"mp4a\"'")); 855 EXPECT_EQ(kNot, CanPlay("'application/x-mpegurl; codecs=\"mp4a\"'"));
798 EXPECT_EQ(kNot, CanPlay("'application/x-mpegurl; codecs=\"mp4a.\"'")); 856 EXPECT_EQ(kNot, CanPlay("'application/x-mpegurl; codecs=\"mp4a.\"'"));
799 EXPECT_EQ(kNot, CanPlay("'application/x-mpegurl; codecs=\"mp4a.40.\"'")); 857 EXPECT_EQ(kNot, CanPlay("'application/x-mpegurl; codecs=\"mp4a.40.\"'"));
800 858
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
835 893
836 EXPECT_EQ(kNot, CanPlay("'application/x-mpegurl; codecs=\"avc2\"'")); 894 EXPECT_EQ(kNot, CanPlay("'application/x-mpegurl; codecs=\"avc2\"'"));
837 EXPECT_EQ(kNot, CanPlay("'application/x-mpegurl; codecs=\"avc4\"'")); 895 EXPECT_EQ(kNot, CanPlay("'application/x-mpegurl; codecs=\"avc4\"'"));
838 896
839 EXPECT_EQ(kNot, CanPlay("'application/x-mpegurl; codecs=\"avc1x\"'")); 897 EXPECT_EQ(kNot, CanPlay("'application/x-mpegurl; codecs=\"avc1x\"'"));
840 EXPECT_EQ(kNot, CanPlay("'application/x-mpegurl; codecs=\"avc3x\"'")); 898 EXPECT_EQ(kNot, CanPlay("'application/x-mpegurl; codecs=\"avc3x\"'"));
841 EXPECT_EQ(kNot, CanPlay("'application/x-mpegurl; codecs=\"mp4ax\"'")); 899 EXPECT_EQ(kNot, CanPlay("'application/x-mpegurl; codecs=\"mp4ax\"'"));
842 900
843 EXPECT_EQ(kNot, CanPlay("'application/x-mpegurl; codecs=\"unknown\"'")); 901 EXPECT_EQ(kNot, CanPlay("'application/x-mpegurl; codecs=\"unknown\"'"));
844 902
845 EXPECT_EQ(canPlayHLS, CanPlay("'application/vnd.apple.mpegurl'")); 903 EXPECT_EQ(maybeCanPlayHLS, CanPlay("'application/vnd.apple.mpegurl'"));
acolwell GONE FROM CHROMIUM 2014/06/30 20:00:06 There appears to be a fair amount of duplication i
846 904
847 EXPECT_EQ(canPlayHLS, 905 EXPECT_EQ(maybeCanPlayHLS,
848 CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc1\"'")); 906 CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc1\"'"));
849 EXPECT_EQ(canPlayHLS, 907 EXPECT_EQ(maybeCanPlayHLS,
850 CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc3\"'")); 908 CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc3\"'"));
851 EXPECT_EQ(canPlayHLS, 909 EXPECT_EQ(maybeCanPlayHLS,
852 CanPlay("'application/vnd.apple.mpegurl; codecs=\"mp4a.40\"'")); 910 CanPlay("'application/vnd.apple.mpegurl; codecs=\"mp4a.40\"'"));
853 EXPECT_EQ(canPlayHLS, 911 EXPECT_EQ(maybeCanPlayHLS,
854 CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc1, mp4a.40\"'")); 912 CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc1, mp4a.40\"'"));
855 EXPECT_EQ(canPlayHLS, 913 EXPECT_EQ(maybeCanPlayHLS,
856 CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc3, mp4a.40\"'")); 914 CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc3, mp4a.40\"'"));
857 915
858 EXPECT_EQ(canPlayHLS, 916 EXPECT_EQ(probablyCanPlayHLS,
859 CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc1.4D401E\"'")); 917 CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc1.4D401E\"'"));
860 EXPECT_EQ(canPlayHLS, 918 EXPECT_EQ(probablyCanPlayHLS,
861 CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc3.64001F\"'")); 919 CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc3.64001F\"'"));
862 EXPECT_EQ(canPlayHLS, 920 EXPECT_EQ(probablyCanPlayHLS,
863 CanPlay("'application/vnd.apple.mpegurl; codecs=\"mp4a.40.2\"'")); 921 CanPlay("'application/vnd.apple.mpegurl; codecs=\"mp4a.40.2\"'"));
864 922
923 EXPECT_EQ(maybeCanPlayHLS,
924 CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc1, mp4a.40.2\"'"));
925 EXPECT_EQ(maybeCanPlayHLS,
926 CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc3, mp4a.40.2\"'"));
927 EXPECT_EQ(maybeCanPlayHLS,
928 CanPlay("'application/vnd.apple.mpegurl; "
929 "codecs=\"avc1.4D401E, mp4a.40\"'"));
930 EXPECT_EQ(maybeCanPlayHLS,
931 CanPlay("'application/vnd.apple.mpegurl; "
932 "codecs=\"avc3.64001F, mp4a.40\"'"));
933
934 EXPECT_EQ(maybeCanPlayHLS,
935 CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc1.ABCDEF\"'"));
936 EXPECT_EQ(maybeCanPlayHLS,
937 CanPlay("'application/vnd.apple.mpegurl; codecs=\"mp4a.6A\"'"));
938 EXPECT_EQ(maybeCanPlayHLS,
939 CanPlay("'application/vnd.apple.mpegurl; "
940 "codecs=\"avc1.ABCDEF, mp4a.6A\"'"));
941 EXPECT_EQ(maybeCanPlayHLS,
942 CanPlay("'application/vnd.apple.mpegurl; "
943 "codecs=\"avc3.ABCDEF, mp4a.6A\"'"));
944 // TODO(amogh.bihani): This should give "maybe" but profile parameters for
945 // avc3 are not yet added to kProprietaryCodecsExpression list.
946 EXPECT_EQ(probablyCanPlayHLS,
947 CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc1.ABCDEF\"'"));
948
865 EXPECT_EQ(kNot, 949 EXPECT_EQ(kNot,
866 CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc1.unknown\"'")); 950 CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc1.unknown\"'"));
867 EXPECT_EQ(kNot, 951 EXPECT_EQ(kNot,
868 CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc3.unknown\"'")); 952 CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc3.unknown\"'"));
869 EXPECT_EQ(kNot, 953 EXPECT_EQ(kNot,
870 CanPlay("'application/vnd.apple.mpegurl; codecs=\"mp4a.unknown\"'")); 954 CanPlay("'application/vnd.apple.mpegurl; codecs=\"mp4a.unknown\"'"));
871 955
872 EXPECT_EQ(kNot, CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc1.\"'")); 956 EXPECT_EQ(kNot, CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc1.\"'"));
873 EXPECT_EQ(kNot, CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc3.\"'")); 957 EXPECT_EQ(kNot, CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc3.\"'"));
874 EXPECT_EQ(kNot, CanPlay("'application/vnd.apple.mpegurl; codecs=\"mp4a\"'")); 958 EXPECT_EQ(kNot, CanPlay("'application/vnd.apple.mpegurl; codecs=\"mp4a\"'"));
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
934 1018
935 EXPECT_EQ(kNot, CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc1x\"'")); 1019 EXPECT_EQ(kNot, CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc1x\"'"));
936 EXPECT_EQ(kNot, CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc3x\"'")); 1020 EXPECT_EQ(kNot, CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc3x\"'"));
937 EXPECT_EQ(kNot, CanPlay("'application/vnd.apple.mpegurl; codecs=\"mp4ax\"'")); 1021 EXPECT_EQ(kNot, CanPlay("'application/vnd.apple.mpegurl; codecs=\"mp4ax\"'"));
938 1022
939 EXPECT_EQ(kNot, 1023 EXPECT_EQ(kNot,
940 CanPlay("'application/vnd.apple.mpegurl; codecs=\"unknown\"'")); 1024 CanPlay("'application/vnd.apple.mpegurl; codecs=\"unknown\"'"));
941 } 1025 }
942 1026
943 } // namespace content 1027 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | net/base/mime_util.cc » ('j') | net/base/mime_util.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698