Implement support for vp9 in ISO-BMFF

media/base/mime_util_unittest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stddef.h>
 
 #include "base/macros.h"
 #include "base/strings/string_split.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
@@ skipping 264 matching lines @@
           // a platform decoder is available.
           case MimeUtil::OPUS:
             EXPECT_EQ(info.supports_opus, result);
             break;
 
           case MimeUtil::VP8:
             EXPECT_EQ(info.has_platform_vp8_decoder, result);
             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:
             EXPECT_EQ(HasHevcSupport(), result);
             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) {
   // Vary all parameters except |is_unified_media_pipeline_enabled|.
   MimeUtil::PlatformInfo states_to_vary = VaryAllFields();
   states_to_vary.is_unified_media_pipeline_enabled = false;
 
   // Disable the unified pipeline.
   MimeUtil::PlatformInfo test_states;
   test_states.is_unified_media_pipeline_enabled = false;
@@ skipping 26 matching lines @@
           case MimeUtil::VP8:
             EXPECT_TRUE(result);
             break;
 
           // The remaining codecs depend on the platform version.
           case MimeUtil::OPUS:
             EXPECT_EQ(info.supports_opus, result);
             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:
             EXPECT_EQ(HasHevcSupport(), result);
             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) {
   // Vary all parameters except |is_unified_media_pipeline_enabled|.
   MimeUtil::PlatformInfo states_to_vary = VaryAllFields();
   states_to_vary.is_unified_media_pipeline_enabled = false;
 
   // Enable the unified pipeline.
   MimeUtil::PlatformInfo test_states;
   test_states.is_unified_media_pipeline_enabled = true;
@@ skipping 49 matching lines @@
       states_to_vary, test_states,
       [](const MimeUtil::PlatformInfo& info, MimeUtil::Codec codec) {
         EXPECT_EQ(info.is_unified_media_pipeline_enabled,
                   MimeUtil::IsCodecSupportedOnPlatform(
                       MimeUtil::OPUS, "audio/ogg", false, info));
       });
 }
 
 }  // namespace internal
 }  // namespace media