Chromium Code Reviews| Index: media/base/key_systems.cc |
| diff --git a/media/base/key_systems.cc b/media/base/key_systems.cc |
| index 6c2c8c2db31312b7074a4cc816a4ce3f9fb1a765..a20aa567556c0844c1b6e1f8dc219b7436b61726 100644 |
| --- a/media/base/key_systems.cc |
| +++ b/media/base/key_systems.cc |
| @@ -43,10 +43,8 @@ struct NamedCodec { |
| 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. |
| @@ -55,8 +53,10 @@ static NamedCodec kCodecStrings[] = { |
| {"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 stran
kqyang
2016/01/27 00:17:42
The codec strings are of the form "vp08.xxxxxxx" o
|
| {"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}, |