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 ca1f393723567ca8a4dc7fdd08db2b4c05892525..7abb9641fc1d79f2db42ee3365334c9b2925760e 100644
--- a/media/base/mime_util_unittest.cc
+++ b/media/base/mime_util_unittest.cc
@@ -282,7 +282,8 @@ TEST(IsCodecSupportedOnPlatformTest, EncryptedCodecBehavior) {
             break;
 
           case MimeUtil::VP9:
-            EXPECT_EQ(info.supports_vp9, result);
+            // VP9 is only supported with WebM.

[ddorwin, 2016/03/10 18:16:54]

// *Encrypted* VP9...

We should probably have a TODO/bug to figure out whether that is true. If the
blocks are exactly the same, then MediaCodec shouldn't care.

[kqyang, 2016/03/10 21:05:13]

Done.

+            EXPECT_FALSE(result);
             break;
 
           case MimeUtil::HEVC_MAIN:
@@ -290,6 +291,14 @@ TEST(IsCodecSupportedOnPlatformTest, EncryptedCodecBehavior) {
             break;
         }
       });
+  RunCodecSupportTest(

[ddorwin, 2016/03/10 18:16:54]

Empty line.
Then explain the purpose of this in a comment.

[kqyang, 2016/03/10 21:05:13]

Removed. No longer needed.

+      states_to_vary, test_states,
+      [](const MimeUtil::PlatformInfo& info, MimeUtil::Codec codec) {
+        const bool result = MimeUtil::IsCodecSupportedOnPlatform(
+            codec, "video/webm", true, info);
+        if (codec == MimeUtil::VP9)
+          EXPECT_EQ(info.supports_vp9, result);
+      });
 }
 
 TEST(IsCodecSupportedOnPlatformTest, ClearCodecBehaviorWithAndroidPipeline) {
@@ -336,7 +345,8 @@ TEST(IsCodecSupportedOnPlatformTest, ClearCodecBehaviorWithAndroidPipeline) {
             break;
 
           case MimeUtil::VP9:
-            EXPECT_EQ(info.supports_vp9, result);
+            // VP9 is only supported with WebM.

[ddorwin, 2016/03/10 18:16:54]

MediaPlayer only supports VP9 in WebM.

+            EXPECT_FALSE(result);
             break;
 
           case MimeUtil::HEVC_MAIN:
@@ -344,6 +354,14 @@ TEST(IsCodecSupportedOnPlatformTest, ClearCodecBehaviorWithAndroidPipeline) {
             break;
         }
       });
+  RunCodecSupportTest(

[ddorwin, 2016/03/10 18:16:53]

ditto

[kqyang, 2016/03/10 21:05:13]

Done.

+      states_to_vary, test_states,
+      [](const MimeUtil::PlatformInfo& info, MimeUtil::Codec codec) {
+        const bool result = MimeUtil::IsCodecSupportedOnPlatform(
+            codec, "video/webm", true, info);
+        if (codec == MimeUtil::VP9)
+          EXPECT_EQ(info.supports_vp9, result);
+      });
 }
 
 TEST(IsCodecSupportedOnPlatformTest, ClearCodecBehaviorWithUnifiedPipeline) {