Encrypted Media: Add VP9 support to IsTypeSupported().

content/renderer/media/crypto/key_systems.cc

Index: content/renderer/media/crypto/key_systems.cc
diff --git a/content/renderer/media/crypto/key_systems.cc b/content/renderer/media/crypto/key_systems.cc
index 75a13a65eefd9c9b19b047c571b08831a898ac3f..0e5426592176d156be69169cd2f3c309e7492115 100644
--- a/content/renderer/media/crypto/key_systems.cc
+++ b/content/renderer/media/crypto/key_systems.cc
@@ -50,6 +50,8 @@ 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},
@@ -60,11 +62,17 @@ CodecMask kCodecMasks[] = {
 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)