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

Unified Diff: content/browser/media/media_canplaytype_browsertest.cc

Issue 1837963004: Make CanPlayType return "probably" for HI10P h264 videos. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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 | media/base/mime_util_internal.h » ('j') | media/base/mime_util_internal.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 1a3af5a3c6e5ffd53ecca8329e1c9178f43a980a..1c6dcc7100b4252d66b90fc4305448175fb5c245 100644
--- a/content/browser/media/media_canplaytype_browsertest.cc
+++ b/content/browser/media/media_canplaytype_browsertest.cc
@@ -1075,6 +1075,33 @@ IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_Avc3Variants) {
EXPECT_EQ(kPropMaybe, CanPlay("'video/mp4; codecs=\"avc3.64E0FF\"'"));
//
+ // High 10-bit Profile (110 == 0x6E).
+ // The first two digits after the dot must be 66. The third and fourth digits
+ // contain constraint_set_flags and must be valid hex. The last two digits
+ // should be any valid H.264 level. If the level value is invalid the result
+ // will be kMaybe.
+ // High 10-bit profile is not currently supported on android because it
ddorwin 2016/03/31 05:44:05 nit: _A_ndroid
hubbe 2016/03/31 21:53:48 Done.
+ // relies on ffmpeg decoder fallback.
ddorwin 2016/03/31 05:44:05 This makes it sound like Android has FFmpeg fallba
hubbe 2016/03/31 21:53:48 Done.
+ //
+#if defined(OS_ANDROID)
ddorwin 2016/03/31 05:44:05 The actual test calls should not be duplicated. In
ddorwin 2016/03/31 05:58:44 You may need more complex logic, though, to avoid
hubbe 2016/03/31 21:53:48 Done.
hubbe 2016/03/31 21:53:48 Done.
+ EXPECT_EQ(kPropMaybe, CanPlay("'video/mp4; codecs=\"avc3.6E001E\"'"));
+ EXPECT_EQ(kPropMaybe, CanPlay("'video/mp4; codecs=\"avc3.6E400A\"'"));
+ EXPECT_EQ(kPropMaybe, CanPlay("'video/mp4; codecs=\"avc3.6E800A\"'"));
+ EXPECT_EQ(kPropMaybe, CanPlay("'video/mp4; codecs=\"avc3.6EE00A\"'"));
+ EXPECT_EQ(kNot, CanPlay("'video/mp4; codecs=\"avc3.6EG01E\"'"));
+ EXPECT_EQ(kNot, CanPlay("'video/mp4; codecs=\"avc3.6E000G\"'"));
+ EXPECT_EQ(kPropMaybe, CanPlay("'video/mp4; codecs=\"avc3.6EE0FF\"'"));
+#else
+ EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc3.6E001E\"'"));
+ EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc3.6E400A\"'"));
+ EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc3.6E800A\"'"));
+ EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"avc3.6EE00A\"'"));
+ EXPECT_EQ(kNot, CanPlay("'video/mp4; codecs=\"avc3.6EG01E\"'"));
+ EXPECT_EQ(kNot, CanPlay("'video/mp4; codecs=\"avc3.6E000G\"'"));
+ EXPECT_EQ(kPropMaybe, CanPlay("'video/mp4; codecs=\"avc3.6EE0FF\"'"));
+#endif
+
+ //
// Other profiles are not known to be supported.
//
« no previous file with comments | « no previous file | media/base/mime_util_internal.h » ('j') | media/base/mime_util_internal.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698