Implement support for vp9 in ISO-BMFF

media/base/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 "media/base/key_systems.h"
 
 #include <stddef.h>
 
 #include "base/containers/hash_tables.h"
 #include "base/lazy_instance.h"
@@ skipping 25 matching lines @@
 };
 
 // Mapping between containers and their codecs.
 // Only audio codec can belong to a "audio/*" container. Both audio and video
 // codecs can belong to a "video/*" container.
 // TODO(sandersd): This definition only makes sense for prefixed EME. Change it
 // when prefixed EME is removed. http://crbug.com/249976
 static NamedCodec kContainerToCodecMasks[] = {
     {"audio/webm", EME_CODEC_WEBM_AUDIO_ALL},
     {"video/webm", EME_CODEC_WEBM_ALL},
-#if defined(USE_PROPRIETARY_CODECS)

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

Should be left in.

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

Done.

     {"audio/mp4", EME_CODEC_MP4_AUDIO_ALL},
     {"video/mp4", EME_CODEC_MP4_ALL}
-#endif  // defined(USE_PROPRIETARY_CODECS)
 };
 
 // Mapping between codec names and enum values.
 static NamedCodec kCodecStrings[] = {
     {"opus", EME_CODEC_WEBM_OPUS},
     {"vorbis", EME_CODEC_WEBM_VORBIS},
     {"vp8", EME_CODEC_WEBM_VP8},
     {"vp8.0", EME_CODEC_WEBM_VP8},
+    {"vp08", EME_CODEC_MP4_VP8},

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

Is this the actual codec string? It's rather strange :-(. Will we need to update
all of the codec string parsing in Chrome to distinguish the MP4 and WebM
versions?

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

The codec strings are of the form "vp08.xxxxxxx" or "vp09.xxxxxx", see
mime_util.cc or draft spec
https://github.com/Netflix/vp9-dash/blob/master/Downloads/VPCodecISOMediaFile...
for details.

It uses 4 characters, to be consistent to other codec strings used in mp4, e.g.
avc1.xxxx, mp4a.xxxx.

I don't like having different codec strings for webm and mp4 too... We may want
to consider supporting the mp4 style codec strings vp08.xxxx in webm too.


Will we need to update
I think I have updated all relevant places. Let me know if I missed any.

     {"vp9", EME_CODEC_WEBM_VP9},
     {"vp9.0", EME_CODEC_WEBM_VP9},
+    {"vp09", EME_CODEC_MP4_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 EmeRobustness ConvertRobustness(const std::string& robustness) {
   if (robustness.empty())
     return EmeRobustness::EMPTY;
@@ skipping 868 matching lines @@
   KeySystemsImpl::GetInstance()->AddContainerMask(container, mask);
 }
 
 MEDIA_EXPORT void AddCodecMask(EmeMediaType media_type,
                                const std::string& codec,
                                uint32_t mask) {
   KeySystemsImpl::GetInstance()->AddCodecMask(media_type, codec, mask);
 }
 
 }  // namespace media