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

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: Changing method names 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | net/base/mime_util.cc » ('j') | no next file with comments »
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 7897d78618b9b0aa22e72b9a0970de323aa62055..ec14d1006dfe79c34639622393dec8dd5545b534 100644
--- a/content/browser/media/media_canplaytype_browsertest.cc
+++ b/content/browser/media/media_canplaytype_browsertest.cc
@@ -398,13 +398,20 @@ 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(kPropProbably, CanPlay("'video/mp4; codecs=\"avc1.42E01E\"'"));
+ EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc3.42E01E\"'"));
+ EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"mp4a.40.2\"'"));
+ EXPECT_EQ(kPropProbably,
+ CanPlay("'video/mp4; codecs=\"avc1.42E01E, mp4a.40.2\"'"));
+ EXPECT_EQ(kPropProbably,
+ CanPlay("'video/mp4; codecs=\"avc3.42E01E, 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.2\"'"));
+ CanPlay("'video/mp4; codecs=\"avc1.42E01E, mp4a.40\"'"));
EXPECT_EQ(kPropMaybe,
- CanPlay("'video/mp4; codecs=\"avc3.64001F, mp4a.40.5\"'"));
+ CanPlay("'video/mp4; codecs=\"avc3.42E01E, mp4a.40\"'"));
TestMPEGUnacceptableCombinations("video/mp4");
@@ -417,19 +424,26 @@ 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(kPropProbably, CanPlay("'video/x-m4v; codecs=\"avc1.42E01E\"'"));
+ EXPECT_EQ(kPropProbably, CanPlay("'video/x-m4v; codecs=\"avc3.42E01E\"'"));
+ EXPECT_EQ(kPropProbably, CanPlay("'video/x-m4v; codecs=\"mp4a.40.2\"'"));
+ EXPECT_EQ(kPropProbably,
+ CanPlay("'video/x-m4v; codecs=\"avc1.42E01E, mp4a.40.2\"'"));
+ EXPECT_EQ(kPropProbably,
+ CanPlay("'video/x-m4v; codecs=\"avc3.42E01E, 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.2\"'"));
+ CanPlay("'video/x-m4v; codecs=\"avc1.42E01E, mp4a.40\"'"));
EXPECT_EQ(kPropMaybe,
- CanPlay("'video/x-m4v; codecs=\"avc3.64001F, mp4a.40.5\"'"));
+ CanPlay("'video/x-m4v; codecs=\"avc3.42E01E, mp4a.40\"'"));
TestMPEGUnacceptableCombinations("video/x-m4v");
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\"'"));
@@ -443,7 +457,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\"'"));
@@ -458,54 +472,80 @@ 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,
- CanPlay("'application/x-mpegurl; codecs=\"avc1.4D401E\"'"));
- EXPECT_EQ(canPlayHLS,
- CanPlay("'application/x-mpegurl; codecs=\"avc3.64001F\"'"));
- EXPECT_EQ(canPlayHLS,
+ EXPECT_EQ(probablyCanPlayHLS,
+ CanPlay("'application/x-mpegurl; codecs=\"avc1.42E01E\"'"));
+ EXPECT_EQ(probablyCanPlayHLS,
+ CanPlay("'application/x-mpegurl; codecs=\"avc3.42E01E\"'"));
+ EXPECT_EQ(probablyCanPlayHLS,
CanPlay("'application/x-mpegurl; codecs=\"mp4a.40.2\"'"));
- EXPECT_EQ(canPlayHLS,
- CanPlay("'application/x-mpegurl; codecs=\"avc1.4D401E, mp4a.40.2\"'"));
- EXPECT_EQ(canPlayHLS,
- CanPlay("'application/x-mpegurl; codecs=\"avc3.64001F, mp4a.40.5\"'"));
+ EXPECT_EQ(probablyCanPlayHLS,
+ CanPlay("'application/x-mpegurl; codecs=\"avc1.42E01E, mp4a.40.2\"'"));
+ EXPECT_EQ(probablyCanPlayHLS,
+ CanPlay("'application/x-mpegurl; codecs=\"avc3.42E01E, 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.42E01E, mp4a.40\"'"));
+ EXPECT_EQ(maybeCanPlayHLS,
+ CanPlay("'application/x-mpegurl; codecs=\"avc3.42E01E, mp4a.40\"'"));
TestMPEGUnacceptableCombinations("application/x-mpegurl");
- EXPECT_EQ(canPlayHLS, CanPlay("'application/vnd.apple.mpegurl'"));
+ EXPECT_EQ(maybeCanPlayHLS, CanPlay("'application/vnd.apple.mpegurl'"));
- 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,
- CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc1.4D401E\"'"));
- EXPECT_EQ(canPlayHLS,
- CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc3.64001F\"'"));
- EXPECT_EQ(canPlayHLS,
+ EXPECT_EQ(probablyCanPlayHLS,
+ CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc1.42E01E\"'"));
+ EXPECT_EQ(probablyCanPlayHLS,
+ CanPlay("'application/vnd.apple.mpegurl; codecs=\"avc3.42E01E\"'"));
+ 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.42E01E, mp4a.40\"'"));
+ EXPECT_EQ(maybeCanPlayHLS,
+ CanPlay("'application/vnd.apple.mpegurl; "
+ "codecs=\"avc3.42E01E, mp4a.40\"'"));
+
TestMPEGUnacceptableCombinations("application/vnd.apple.mpegurl");
}
« no previous file with comments | « no previous file | net/base/mime_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698