Implement support for vp9 in ISO-BMFF

media/base/eme_constants.h

Index: media/base/eme_constants.h
diff --git a/media/base/eme_constants.h b/media/base/eme_constants.h
index ba49c7d6a72d9e3307f64449ee37d4821550ce00..d2676f37420af55676ddff893fe6c9b8c1e7644f 100644
--- a/media/base/eme_constants.h
+++ b/media/base/eme_constants.h
@@ -44,16 +44,20 @@ enum EmeCodec {
   EME_CODEC_MP4_AAC = 1 << 4,
   EME_CODEC_MP4_AUDIO_ALL = EME_CODEC_MP4_AAC,
   EME_CODEC_MP4_AVC1 = 1 << 5,
-  EME_CODEC_MP4_VIDEO_ALL = EME_CODEC_MP4_AVC1,
+  EME_CODEC_MP4_VP8 = 1 << 6,
+  EME_CODEC_MP4_VP9 = 1 << 7,
+  EME_CODEC_MP4_VIDEO_ALL =
+      (EME_CODEC_MP4_AVC1 | EME_CODEC_MP4_VP8 | EME_CODEC_MP4_VP9),
+#else
+  EME_CODEC_MP4_AUDIO_ALL = EME_CODEC_NONE,
+  EME_CODEC_MP4_VP8 = 1 << 6,

[sandersd (OOO until July 31), 2016/01/26 21:21:20]

Similarly, it doesn't make sense to declare these if !PROPRIETARY_CODECS.

[kqyang, 2016/01/27 00:17:42]

Done.

+  EME_CODEC_MP4_VP9 = 1 << 7,
+  EME_CODEC_MP4_VIDEO_ALL = (EME_CODEC_MP4_VP8 | EME_CODEC_MP4_VP9),
+#endif  // defined(USE_PROPRIETARY_CODECS)
   EME_CODEC_MP4_ALL = (EME_CODEC_MP4_AUDIO_ALL | EME_CODEC_MP4_VIDEO_ALL),
   EME_CODEC_AUDIO_ALL = (EME_CODEC_WEBM_AUDIO_ALL | EME_CODEC_MP4_AUDIO_ALL),
   EME_CODEC_VIDEO_ALL = (EME_CODEC_WEBM_VIDEO_ALL | EME_CODEC_MP4_VIDEO_ALL),
   EME_CODEC_ALL = (EME_CODEC_WEBM_ALL | EME_CODEC_MP4_ALL),
-#else
-  EME_CODEC_AUDIO_ALL = EME_CODEC_WEBM_AUDIO_ALL,
-  EME_CODEC_VIDEO_ALL = EME_CODEC_WEBM_VIDEO_ALL,
-  EME_CODEC_ALL = EME_CODEC_WEBM_ALL,
-#endif  // defined(USE_PROPRIETARY_CODECS)
 };
 
 typedef uint32_t SupportedCodecs;