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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified 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, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | net/base/mime_util.cc » ('j') | net/base/mime_util.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/media/media_canplaytype_browsertest.cc
diff --git a/content/browser/media/media_canplaytype_browsertest.cc b/content/browser/media/media_canplaytype_browsertest.cc
index 59ce221bb624e25a295bbd503a0d34fa95ec13e0..fb1e1892ed0304687bd5d2a378245832dcddd409 100644
--- a/content/browser/media/media_canplaytype_browsertest.cc
+++ b/content/browser/media/media_canplaytype_browsertest.cc
@@ -500,14 +500,27 @@ IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_mp4) {
EXPECT_EQ(kPropMaybe, CanPlay("'video/mp4; codecs=\"avc3, mp4a.40\"'"));
EXPECT_EQ(kPropMaybe, CanPlay("'video/mp4; codecs=\"avc1, avc3\"'"));
- EXPECT_EQ(kPropMaybe, CanPlay("'video/mp4; codecs=\"avc1.4D401E\"'"));
- EXPECT_EQ(kPropMaybe, CanPlay("'video/mp4; codecs=\"avc3.64001F\"'"));
- EXPECT_EQ(kPropMaybe, CanPlay("'video/mp4; codecs=\"mp4a.40.2\"'"));
- EXPECT_EQ(kPropMaybe,
+ EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc1.4D401E\"'"));
+ EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc3.64001F\"'"));
+ EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"mp4a.40.2\"'"));
+ EXPECT_EQ(kPropProbably,
CanPlay("'video/mp4; codecs=\"avc1.4D401E, mp4a.40.2\"'"));
- EXPECT_EQ(kPropMaybe,
+ EXPECT_EQ(kPropProbably,
CanPlay("'video/mp4; codecs=\"avc3.64001F, mp4a.40.5\"'"));
+ EXPECT_EQ(kPropMaybe, CanPlay("video/mp4; codecs=\"avc1, mp4a.40.2\"'"));
+ EXPECT_EQ(kPropMaybe, CanPlay("video/mp4; codecs=\"avc3, mp4a.40.2\"'"));
+ EXPECT_EQ(kPropMaybe, CanPlay("video/mp4; codecs=\"avc1.4D401E, mp4a.40\"'"));
+ EXPECT_EQ(kPropMaybe, CanPlay("video/mp4; codecs=\"avc3.64001F, mp4a.40\"'"));
+
+ EXPECT_EQ(kPropMaybe, CanPlay("video/mp4; codecs=\"avc1.ABCDEF\"'"));
+ EXPECT_EQ(kPropMaybe, CanPlay("video/mp4; codecs=\"mp4a.6A\"'"));
+ EXPECT_EQ(kPropMaybe, CanPlay("video/mp4; codecs=\"avc1.ABCDEF, mp4a.6A\"'"));
+ EXPECT_EQ(kPropMaybe, CanPlay("video/mp4; codecs=\"avc3.ABCDEF, mp4a.6A\"'"));
+ // TODO(amogh.bihani): This should give "maybe" but profile parameters for
+ // avc3 are not yet added to kProprietaryCodecsExpression list.
+ EXPECT_EQ(kPropProbably, CanPlay("video/mp4; codecs=\"avc3.ABCDEF\"'"));
+
EXPECT_EQ(kNot, CanPlay("'video/mp4; codecs=\"avc1.unknown\"'"));
EXPECT_EQ(kNot, CanPlay("'video/mp4; codecs=\"avc3.unknown\"'"));
EXPECT_EQ(kNot, CanPlay("'video/mp4; codecs=\"mp4a.unknown\"'"));
@@ -569,14 +582,31 @@ IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_mp4) {
EXPECT_EQ(kPropMaybe, CanPlay("'video/x-m4v; codecs=\"avc3, mp4a.40\"'"));
EXPECT_EQ(kPropMaybe, CanPlay("'video/x-m4v; codecs=\"avc1, avc3\"'"));
- EXPECT_EQ(kPropMaybe, CanPlay("'video/x-m4v; codecs=\"avc1.4D401E\"'"));
- EXPECT_EQ(kPropMaybe, CanPlay("'video/x-m4v; codecs=\"avc3.64001F\"'"));
- EXPECT_EQ(kPropMaybe, CanPlay("'video/x-m4v; codecs=\"mp4a.40.2\"'"));
- EXPECT_EQ(kPropMaybe,
+ EXPECT_EQ(kPropProbably, CanPlay("'video/x-m4v; codecs=\"avc1.4D401E\"'"));
+ EXPECT_EQ(kPropProbably, CanPlay("'video/x-m4v; codecs=\"avc3.64001F\"'"));
+ EXPECT_EQ(kPropProbably, CanPlay("'video/x-m4v; codecs=\"mp4a.40.2\"'"));
+ EXPECT_EQ(kPropProbably,
CanPlay("'video/x-m4v; codecs=\"avc1.4D401E, mp4a.40.2\"'"));
- EXPECT_EQ(kPropMaybe,
+ EXPECT_EQ(kPropProbably,
CanPlay("'video/x-m4v; codecs=\"avc3.64001F, mp4a.40.5\"'"));
+ EXPECT_EQ(kPropMaybe, CanPlay("video/x-m4v; codecs=\"avc1, mp4a.40.2\"'"));
+ EXPECT_EQ(kPropMaybe, CanPlay("video/x-m4v; codecs=\"avc3, mp4a.40.2\"'"));
+ EXPECT_EQ(kPropMaybe,
+ CanPlay("video/x-m4v; codecs=\"avc1.4D401E, mp4a.40\"'"));
+ EXPECT_EQ(kPropMaybe,
+ CanPlay("video/x-m4v; codecs=\"avc3.64001F, mp4a.40\"'"));
+
+ EXPECT_EQ(kPropMaybe, CanPlay("video/x-m4v; codecs=\"avc1.ABCDEF\"'"));
+ EXPECT_EQ(kPropMaybe, CanPlay("video/x-m4v; codecs=\"mp4a.6A\"'"));
+ EXPECT_EQ(kPropMaybe,
+ CanPlay("video/x-m4v; codecs=\"avc1.ABCDEF, mp4a.6A\"'"));
+ EXPECT_EQ(kPropMaybe,
+ CanPlay("video/x-m4v; codecs=\"avc3.ABCDEF, mp4a.6A\"'"));
+ // TODO(amogh.bihani): This should give "maybe" but profile parameters for
+ // avc3 are yet not added to kProprietaryCodecsExpression list.
+ EXPECT_EQ(kPropProbably, CanPlay("video/x-m4v; codecs=\"avc3.ABCDEF\"'"));
+
EXPECT_EQ(kNot, CanPlay("'video/x-m4v; codecs=\"avc1.unknown\"'"));
EXPECT_EQ(kNot, CanPlay("'video/x-m4v; codecs=\"avc3.unknown\"'"));
EXPECT_EQ(kNot, CanPlay("'video/x-m4v; codecs=\"mp4a.unknown\"'"));
@@ -631,7 +661,7 @@ IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_mp4) {
EXPECT_EQ(kPropMaybe, CanPlay("'audio/mp4'"));
EXPECT_EQ(kPropMaybe, CanPlay("'audio/mp4; codecs=\"mp4a.40\"'"));
- EXPECT_EQ(kPropMaybe, CanPlay("'audio/mp4; codecs=\"mp4a.40.2\"'"));
+ EXPECT_EQ(kPropProbably, CanPlay("'audio/mp4; codecs=\"mp4a.40.2\"'"));
EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"avc1\"'"));
EXPECT_EQ(kNot, CanPlay("'audio/mp4; codecs=\"avc3\"'"));
@@ -696,7 +726,7 @@ IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_mp4) {
EXPECT_EQ(kPropMaybe, CanPlay("'audio/x-m4a'"));
EXPECT_EQ(kPropMaybe, CanPlay("'audio/x-m4a; codecs=\"mp4a.40\"'"));
- EXPECT_EQ(kPropMaybe, CanPlay("'audio/x-m4a; codecs=\"mp4a.40.2\"'"));
+ EXPECT_EQ(kPropProbably, CanPlay("'audio/x-m4a; codecs=\"mp4a.40.2\"'"));
EXPECT_EQ(kNot, CanPlay("'audio/x-m4a; codecs=\"avc1\"'"));
EXPECT_EQ(kNot, CanPlay("'audio/x-m4a; codecs=\"avc3\"'"));
@@ -762,32 +792,60 @@ IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_mp4) {
IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_HLS) {
// HLS are supported only on Android IceCreamSandwich and above (API level 14)
- std::string canPlayHLS = kNot;
+ std::string probablyCanPlayHLS = kNot;
+ std::string maybeCanPlayHLS = kNot;
#if defined(OS_ANDROID)
- if (base::android::BuildInfo::GetInstance()->sdk_int() > 13)
- canPlayHLS = kMaybe;
+ if (base::android::BuildInfo::GetInstance()->sdk_int() > 13) {
+ probablyCanPlayHLS = kProbably;
+ maybeCanPlayHLS = kMaybe;
+ }
#endif
- EXPECT_EQ(canPlayHLS, CanPlay("'application/x-mpegurl'"));
-
- EXPECT_EQ(canPlayHLS, CanPlay("'application/x-mpegurl; codecs=\"avc1\"'"));
- EXPECT_EQ(canPlayHLS, CanPlay("'application/x-mpegurl; codecs=\"avc3\"'"));
- EXPECT_EQ(canPlayHLS, CanPlay("'application/x-mpegurl; codecs=\"mp4a.40\"'"));
- EXPECT_EQ(canPlayHLS,
+ EXPECT_EQ(maybeCanPlayHLS, CanPlay("'application/x-mpegurl'"));
+
+ EXPECT_EQ(maybeCanPlayHLS,
+ CanPlay("'application/x-mpegurl; codecs=\"avc1\"'"));
+ EXPECT_EQ(maybeCanPlayHLS,
+ CanPlay("'application/x-mpegurl; codecs=\"avc3\"'"));
+ EXPECT_EQ(maybeCanPlayHLS,
+ CanPlay("'application/x-mpegurl; codecs=\"mp4a.40\"'"));
+ EXPECT_EQ(maybeCanPlayHLS,
CanPlay("'application/x-mpegurl; codecs=\"avc1, mp4a.40\"'"));
- EXPECT_EQ(canPlayHLS,
+ EXPECT_EQ(maybeCanPlayHLS,
CanPlay("'application/x-mpegurl; codecs=\"avc3, mp4a.40\"'"));
- EXPECT_EQ(canPlayHLS,
+ EXPECT_EQ(probablyCanPlayHLS,
CanPlay("'application/x-mpegurl; codecs=\"avc1.4D401E\"'"));
- EXPECT_EQ(canPlayHLS,
+ EXPECT_EQ(probablyCanPlayHLS,
CanPlay("'application/x-mpegurl; codecs=\"avc3.64001F\"'"));
- EXPECT_EQ(canPlayHLS,
+ EXPECT_EQ(probablyCanPlayHLS,
CanPlay("'application/x-mpegurl; codecs=\"mp4a.40.2\"'"));
- EXPECT_EQ(canPlayHLS,
+ EXPECT_EQ(probablyCanPlayHLS,
CanPlay("'application/x-mpegurl; codecs=\"avc1.4D401E, mp4a.40.2\"'"));
- EXPECT_EQ(canPlayHLS,
+ EXPECT_EQ(probablyCanPlayHLS,
CanPlay("'application/x-mpegurl; codecs=\"avc3.64001F, mp4a.40.5\"'"));
+ EXPECT_EQ(maybeCanPlayHLS,
+ CanPlay("'application/x-mpegurl; codecs=\"avc1, mp4a.40.2\"'"));
+ EXPECT_EQ(maybeCanPlayHLS,
+ CanPlay("'application/x-mpegurl; codecs=\"avc3, mp4a.40.2\"'"));
+ EXPECT_EQ(maybeCanPlayHLS,
+ CanPlay("'application/x-mpegurl; codecs=\"avc1.4D401E, mp4a.40\"'"));
+ EXPECT_EQ(maybeCanPlayHLS,
+ CanPlay("'application/x-mpegurl; codecs=\"avc3.64001F, mp4a.40\"'"));
+
+ EXPECT_EQ(maybeCanPlayHLS,
+ CanPlay("'application/x-mpegurl; codecs=\"avc1.ABCDEF\"'"));
+ EXPECT_EQ(maybeCanPlayHLS,
+ CanPlay("'application/x-mpegurl; codecs=\"mp4a.6A\"'"));
+ EXPECT_EQ(maybeCanPlayHLS,
+ CanPlay("'application/x-mpegurl; codecs=\"avc1.ABCDEF, mp4a.6A\"'"));
+ EXPECT_EQ(maybeCanPlayHLS,
+ CanPlay("'application/x-mpegurl; codecs=\"avc3.ABCDEF, mp4a.6A\"'"));
+ // TODO(amogh.bihani): This should give "maybe" but profile parameters for
+ // avc3 are not yet added to kProprietaryCodecsExpression list.
+ EXPECT_EQ(probablyCanPlayHLS,
+ CanPlay("'application/x-mpegurl; codecs=\"avc1.ABCDEF\"'"));
+
EXPECT_EQ(kNot, CanPlay("'application/x-mpegurl; codecs=\"avc1.unknown\"'"));
EXPECT_EQ(kNot, CanPlay("'application/x-mpegurl; codecs=\"avc3.unknown\"'"));
EXPECT_EQ(kNot, CanPlay("'application/x-mpegurl; codecs=\"mp4a.unknown\"'"));
@@ -842,26 +900,52 @@ IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_HLS) {
EXPECT_EQ(kNot, CanPlay("'application/x-mpegurl; codecs=\"unknown\"'"));
- EXPECT_EQ(canPlayHLS, CanPlay("'application/vnd.apple.mpegurl'"));
+ 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
- EXPECT_EQ(canPlayHLS,
+ EXPECT_EQ(maybeCanPlayHLS,
CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc1\"'"));
- EXPECT_EQ(canPlayHLS,
+ EXPECT_EQ(maybeCanPlayHLS,
CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc3\"'"));
- EXPECT_EQ(canPlayHLS,
+ EXPECT_EQ(maybeCanPlayHLS,
CanPlay("'application/vnd.apple.mpegurl; codecs=\"mp4a.40\"'"));
- EXPECT_EQ(canPlayHLS,
+ EXPECT_EQ(maybeCanPlayHLS,
CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc1, mp4a.40\"'"));
- EXPECT_EQ(canPlayHLS,
+ EXPECT_EQ(maybeCanPlayHLS,
CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc3, mp4a.40\"'"));
- EXPECT_EQ(canPlayHLS,
+ EXPECT_EQ(probablyCanPlayHLS,
CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc1.4D401E\"'"));
- EXPECT_EQ(canPlayHLS,
+ EXPECT_EQ(probablyCanPlayHLS,
CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc3.64001F\"'"));
- EXPECT_EQ(canPlayHLS,
+ EXPECT_EQ(probablyCanPlayHLS,
CanPlay("'application/vnd.apple.mpegurl; codecs=\"mp4a.40.2\"'"));
+ EXPECT_EQ(maybeCanPlayHLS,
+ CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc1, mp4a.40.2\"'"));
+ EXPECT_EQ(maybeCanPlayHLS,
+ CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc3, mp4a.40.2\"'"));
+ EXPECT_EQ(maybeCanPlayHLS,
+ CanPlay("'application/vnd.apple.mpegurl; "
+ "codecs=\"avc1.4D401E, mp4a.40\"'"));
+ EXPECT_EQ(maybeCanPlayHLS,
+ CanPlay("'application/vnd.apple.mpegurl; "
+ "codecs=\"avc3.64001F, mp4a.40\"'"));
+
+ EXPECT_EQ(maybeCanPlayHLS,
+ CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc1.ABCDEF\"'"));
+ EXPECT_EQ(maybeCanPlayHLS,
+ CanPlay("'application/vnd.apple.mpegurl; codecs=\"mp4a.6A\"'"));
+ EXPECT_EQ(maybeCanPlayHLS,
+ CanPlay("'application/vnd.apple.mpegurl; "
+ "codecs=\"avc1.ABCDEF, mp4a.6A\"'"));
+ EXPECT_EQ(maybeCanPlayHLS,
+ CanPlay("'application/vnd.apple.mpegurl; "
+ "codecs=\"avc3.ABCDEF, mp4a.6A\"'"));
+ // TODO(amogh.bihani): This should give "maybe" but profile parameters for
+ // avc3 are not yet added to kProprietaryCodecsExpression list.
+ EXPECT_EQ(probablyCanPlayHLS,
+ CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc1.ABCDEF\"'"));
+
EXPECT_EQ(kNot,
CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc1.unknown\"'"));
EXPECT_EQ(kNot,
« 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