Implement support for vp9 in ISO-BMFF

media/base/mime_util_unittest.cc

Index: media/base/mime_util_unittest.cc
diff --git a/media/base/mime_util_unittest.cc b/media/base/mime_util_unittest.cc
index 34a2ea3a33aff50c604ee4e62752191749566c0f..879851fbe5ddfec1863db2adc38bf446d9cc357d 100644
--- a/media/base/mime_util_unittest.cc
+++ b/media/base/mime_util_unittest.cc
@@ -111,4 +111,45 @@ TEST(MimeUtilTest, ParseCodecString) {
   EXPECT_EQ("mp4a.40.2", codecs_out[1]);
 }
 
+TEST(MimeUtilTest, AreSupportedMediaCodecs) {

[ddorwin, 2016/01/27 01:39:15]

These things are tested in
content/browser/media/media_canplaytype_browsertest.cc. It's weird to have only
a subset of types here.

Also, the expectation should be based on the preprocessor define, not the
running of the tests. See that file for examples and pre-existing constants to
use.

[kqyang, 2016/01/29 00:34:17]

I think these things should really be tested here instead of in
content/browser/media/media_canplaytype_browsertest.cc. It runs much faster and
is much easier to debug.

Anyway, I will move the tests to media_canplaytype_browsertest.cc to be
consistent.

+#if defined(USE_PROPRIETARY_CODECS)
+  EXPECT_TRUE(AreSupportedMediaCodecs({"vp08"}));

[ddorwin, 2016/01/27 01:39:15]

There are no extended tests for vp8.

[kqyang, 2016/01/29 00:34:17]

Added.

+  EXPECT_TRUE(AreSupportedMediaCodecs({"vp09"}));
+  EXPECT_TRUE(AreSupportedMediaCodecs({"vp09.00.01.08"}));
+  EXPECT_FALSE(AreSupportedMediaCodecs({"vp09.0x.01.08"}));
+  EXPECT_FALSE(AreSupportedMediaCodecs({"vp09.00.-1.08"}));
+  EXPECT_TRUE(AreSupportedMediaCodecs({"vp09.01.01.08.02.01.01.00"}));
+  EXPECT_FALSE(AreSupportedMediaCodecs({"vp09.01.01.08.02.01.01.00.00"}));
+#endif  // USE_PROPRIETARY_CODECS
+}
+
+TEST(MimeUtilTest, IsSupportedStrictMediaMimeType) {
+#if defined(USE_PROPRIETARY_CODECS)
+  EXPECT_EQ(MayBeSupported,
+            IsSupportedStrictMediaMimeType("video/mp4", {"vp08"}));
+  EXPECT_EQ(MayBeSupported,
+            IsSupportedStrictMediaMimeType("video/mp4", {"vp09"}));
+  EXPECT_EQ(MayBeSupported,
+            IsSupportedStrictMediaMimeType("video/mp4", {"vp09.00.01.08"}));
+  EXPECT_EQ(IsNotSupported,
+            IsSupportedStrictMediaMimeType("video/mp4", {"vp09.00.-1.08"}));
+  EXPECT_EQ(IsSupported, IsSupportedStrictMediaMimeType(
+                             "video/mp4", {"vp09.01.01.08.02.01.01.00"}));
+  EXPECT_EQ(MayBeSupported, IsSupportedStrictMediaMimeType(
+                                "video/mp4", {"vp09.01.01..02.01.01.00"}));
+  EXPECT_EQ(IsSupported, IsSupportedStrictMediaMimeType(
+                             "video/mp4", {"vp09.01.01.08.04.03.00.00"}));
+  EXPECT_EQ(MayBeSupported,
+            IsSupportedStrictMediaMimeType("video/mp4", {"vp09.04"}));
+  EXPECT_EQ(MayBeSupported, IsSupportedStrictMediaMimeType(
+                                "video/mp4", {"vp09.01.01.09.02.01.01.00"}));
+  EXPECT_EQ(MayBeSupported, IsSupportedStrictMediaMimeType(
+                                "video/mp4", {"vp09.01.01.08.05.01.01"}));
+  EXPECT_EQ(MayBeSupported, IsSupportedStrictMediaMimeType(
+                                "video/mp4", {"vp09.01.01.08.04.04.00.00"}));
+  EXPECT_EQ(MayBeSupported, IsSupportedStrictMediaMimeType(
+                                "video/mp4", {"vp09.01.01.08.04.03.02.00"}));
+#endif  // USE_PROPRIETARY_CODECS
+}
+
 }  // namespace media