Encrypted Media: Add VP9 support to IsTypeSupported().

content/renderer/media/crypto/key_systems.cc

 // Copyright 2013 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 "content/renderer/media/crypto/key_systems.h"
 
 #include <string>
 
 #include "base/containers/hash_tables.h"
 #include "base/lazy_instance.h"
@@ skipping 32 matching lines @@
     {"audio/mp4", EME_CODEC_MP4_AUDIO_ALL},
     {"video/mp4", EME_CODEC_MP4_ALL}
 #endif  // defined(USE_PROPRIETARY_CODECS)
 };
 
 // Mapping between codec types and their masks.
 CodecMask kCodecMasks[] = {
     {"vorbis", EME_CODEC_WEBM_VORBIS},
     {"vp8", EME_CODEC_WEBM_VP8},
     {"vp8.0", EME_CODEC_WEBM_VP8},
+    {"vp9", EME_CODEC_WEBM_VP9},

[ddorwin, 2014/04/24 23:00:23]

I thought the .x was going to be required for VP9. I see that mime_util.cc
doesn't do this, but we should check with fgalligan.

[xhwang, 2014/04/25 16:49:08]

Checked and we don't need to support x > 0.

http://www.webmproject.org/docs/container/

[ddorwin, 2014/04/28 18:30:51]

That doesn't say anything about VP9.

+    {"vp9.0", EME_CODEC_WEBM_VP9},
 #if defined(USE_PROPRIETARY_CODECS)
     {"mp4a", EME_CODEC_MP4_AAC},
     {"avc1", EME_CODEC_MP4_AVC1},
     {"avc3", EME_CODEC_MP4_AVC1}
 #endif  // defined(USE_PROPRIETARY_CODECS)
 };
 
 static void AddClearKey(std::vector<KeySystemInfo>* concrete_key_systems) {
   KeySystemInfo info(kClearKeyKeySystem);
 
-  // On Android, Vorbis, VP8, AAC and AVC1 are supported in all MediaCodec
-  // implementations:
+  info.supported_codecs = EME_CODEC_WEBM_ALL;
+
+#if defined(OS_ANDROID)
+  // On Android, all WebM codecs (Vorbis, VP8, AAC and AVC1) except VP9 are

[ddorwin, 2014/04/24 23:00:23]

I think you need to reword this "all" statement.

[xhwang, 2014/04/25 16:49:08]

Done.

+  // supported in MediaCodec implementations:
   // http://developer.android.com/guide/appendix/media-formats.html
+  // Temporarily disable VP9 support for Android.
+  // TODO(xhwang): Query MediaCodec for VP9 support on Android.

[ddorwin, 2014/04/24 23:00:23]

Or just mime_util? Can content/renderer access net/?

[xhwang, 2014/04/25 16:49:08]

It seems so:
https://code.google.com/p/chromium/codesearch#chromium/src/content/DEPS&l=43

Updated comment.

+  info.supported_codecs &= ~EME_CODEC_WEBM_VP9;
+#endif  // defined(OS_ANDROID)
 
-  info.supported_codecs = EME_CODEC_WEBM_ALL;
 #if defined(USE_PROPRIETARY_CODECS)
   info.supported_codecs |= EME_CODEC_MP4_ALL;
 #endif  // defined(USE_PROPRIETARY_CODECS)
 
   info.use_aes_decryptor = true;
 
   concrete_key_systems->push_back(info);
 }
 
 class KeySystems {
@@ skipping 366 matching lines @@
 CONTENT_EXPORT void AddContainerMask(const std::string& container,
                                      uint32 mask) {
   KeySystems::GetInstance().AddContainerMask(container, mask);
 }
 
 CONTENT_EXPORT void AddCodecMask(const std::string& codec, uint32 mask) {
   KeySystems::GetInstance().AddCodecMask(codec, mask);
 }
 
 }  // namespace content