Implement support for vp9 in ISO-BMFF

media/base/eme_constants.h

 // Copyright 2014 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.
 
 #ifndef MEDIA_BASE_EME_CONSTANTS_H_
 #define MEDIA_BASE_EME_CONSTANTS_H_
 
 #include <stdint.h>
 
 namespace media {
@@ skipping 26 matching lines @@
   EME_CODEC_WEBM_VORBIS = 1 << 1,
   EME_CODEC_WEBM_AUDIO_ALL = EME_CODEC_WEBM_OPUS | EME_CODEC_WEBM_VORBIS,
   EME_CODEC_WEBM_VP8 = 1 << 2,
   EME_CODEC_WEBM_VP9 = 1 << 3,
   EME_CODEC_WEBM_VIDEO_ALL = (EME_CODEC_WEBM_VP8 | EME_CODEC_WEBM_VP9),
   EME_CODEC_WEBM_ALL = (EME_CODEC_WEBM_AUDIO_ALL | EME_CODEC_WEBM_VIDEO_ALL),
 #if defined(USE_PROPRIETARY_CODECS)
   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;
 
 enum class EmeSessionTypeSupport {
   // Invalid default value.
   INVALID,
   // The session type is not supported.
   NOT_SUPPORTED,
   // The session type is supported if a distinctive identifier is available.
@@ skipping 70 matching lines @@
   // This rule only has meaning on platforms that distinguish hardware-secure
   // codecs (ie. Android).
   HW_SECURE_CODECS_REQUIRED,
   // The configuration option is supported without conditions.
   SUPPORTED,
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_EME_CONSTANTS_H_