OLD | NEW |
---|---|
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "media/base/key_systems.h" | 5 #include "media/base/key_systems.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <memory> | 9 #include <memory> |
10 | 10 |
(...skipping 28 matching lines...) Expand all Loading... | |
39 | 39 |
40 // Mapping between containers and their codecs. | 40 // Mapping between containers and their codecs. |
41 // Only audio codecs can belong to a "audio/*" mime_type, and only video codecs | 41 // Only audio codecs can belong to a "audio/*" mime_type, and only video codecs |
42 // can belong to a "video/*" mime_type. | 42 // can belong to a "video/*" mime_type. |
43 static const NamedCodec kMimeTypeToCodecMasks[] = { | 43 static const NamedCodec kMimeTypeToCodecMasks[] = { |
44 {"audio/webm", EME_CODEC_WEBM_AUDIO_ALL}, | 44 {"audio/webm", EME_CODEC_WEBM_AUDIO_ALL}, |
45 {"video/webm", EME_CODEC_WEBM_VIDEO_ALL}, | 45 {"video/webm", EME_CODEC_WEBM_VIDEO_ALL}, |
46 #if BUILDFLAG(USE_PROPRIETARY_CODECS) | 46 #if BUILDFLAG(USE_PROPRIETARY_CODECS) |
47 {"audio/mp4", EME_CODEC_MP4_AUDIO_ALL}, | 47 {"audio/mp4", EME_CODEC_MP4_AUDIO_ALL}, |
48 {"video/mp4", EME_CODEC_MP4_VIDEO_ALL}, | 48 {"video/mp4", EME_CODEC_MP4_VIDEO_ALL}, |
49 #if BUILDFLAG(ENABLE_MSE_MPEG2TS_STREAM_PARSER) | |
50 {"video/mp2t", EME_CODEC_MP2T_VIDEO_ALL}, | |
51 #endif // BUILDFLAG(ENABLE_MSE_MPEG2TS_STREAM_PARSER) | |
49 #endif // BUILDFLAG(USE_PROPRIETARY_CODECS) | 52 #endif // BUILDFLAG(USE_PROPRIETARY_CODECS) |
50 }; | 53 }; |
51 | 54 |
52 // Mapping between codec names and enum values. | 55 // Mapping between codec names and enum values. |
53 static const NamedCodec kCodecStrings[] = { | 56 static const NamedCodec kCodecStrings[] = { |
54 {"opus", EME_CODEC_WEBM_OPUS}, // Opus. | 57 {"opus", EME_CODEC_WEBM_OPUS}, // Opus. |
55 {"vorbis", EME_CODEC_WEBM_VORBIS}, // Vorbis. | 58 {"vorbis", EME_CODEC_WEBM_VORBIS}, // Vorbis. |
56 {"vp8", EME_CODEC_WEBM_VP8}, // VP8. | 59 {"vp8", EME_CODEC_WEBM_VP8}, // VP8. |
57 {"vp8.0", EME_CODEC_WEBM_VP8}, // VP8. | 60 {"vp8.0", EME_CODEC_WEBM_VP8}, // VP8. |
58 {"vp9", EME_CODEC_WEBM_VP9}, // VP9. | 61 {"vp9", EME_CODEC_WEBM_VP9}, // VP9. |
59 {"vp9.0", EME_CODEC_WEBM_VP9}, // VP9. | 62 {"vp9.0", EME_CODEC_WEBM_VP9}, // VP9. |
60 {"vp09", EME_CODEC_COMMON_VP9}, // New multi-part VP9 for WebM and MP4. | 63 {"vp09", EME_CODEC_COMMON_VP9}, // New multi-part VP9 for WebM and MP4. |
61 #if BUILDFLAG(USE_PROPRIETARY_CODECS) | 64 #if BUILDFLAG(USE_PROPRIETARY_CODECS) |
62 {"mp4a", EME_CODEC_MP4_AAC}, // AAC. | 65 {"mp4a", EME_CODEC_MP4_AAC}, // AAC. |
63 #if BUILDFLAG(ENABLE_AC3_EAC3_AUDIO_DEMUXING) | 66 #if BUILDFLAG(ENABLE_AC3_EAC3_AUDIO_DEMUXING) |
64 {"ac-3", EME_CODEC_MP4_AC3}, // AC3. | 67 {"ac-3", EME_CODEC_MP4_AC3}, // AC3. |
65 {"ec-3", EME_CODEC_MP4_EAC3}, // EAC3. | 68 {"ec-3", EME_CODEC_MP4_EAC3}, // EAC3. |
66 #endif | 69 #endif |
67 {"avc1", EME_CODEC_MP4_AVC1}, // AVC1. | 70 {"avc1", EME_CODEC_COMMON_AVC1}, // AVC1 for MP4 and MP2T |
ddorwin
2017/05/17 16:50:17
The additional comment text seems unnecessary.
| |
68 {"avc3", EME_CODEC_MP4_AVC1}, // AVC3. | 71 {"avc3", EME_CODEC_COMMON_AVC1}, // AVC3 for MP4 and MP2T |
69 #if BUILDFLAG(ENABLE_HEVC_DEMUXING) | 72 #if BUILDFLAG(ENABLE_HEVC_DEMUXING) |
70 {"hev1", EME_CODEC_MP4_HEVC}, // HEV1. | 73 {"hev1", EME_CODEC_MP4_HEVC}, // HEV1. |
71 {"hvc1", EME_CODEC_MP4_HEVC}, // HVC1. | 74 {"hvc1", EME_CODEC_MP4_HEVC}, // HVC1. |
72 #endif | 75 #endif |
73 #if BUILDFLAG(ENABLE_DOLBY_VISION_DEMUXING) | 76 #if BUILDFLAG(ENABLE_DOLBY_VISION_DEMUXING) |
74 {"dva1", EME_CODEC_MP4_DV_AVC}, // DolbyVision AVC | 77 {"dva1", EME_CODEC_MP4_DV_AVC}, // DolbyVision AVC |
75 {"dvav", EME_CODEC_MP4_DV_AVC}, // DolbyVision AVC | 78 {"dvav", EME_CODEC_MP4_DV_AVC}, // DolbyVision AVC |
76 #if BUILDFLAG(ENABLE_HEVC_DEMUXING) | 79 #if BUILDFLAG(ENABLE_HEVC_DEMUXING) |
77 {"dvh1", EME_CODEC_MP4_DV_HEVC}, // DolbyVision HEVC | 80 {"dvh1", EME_CODEC_MP4_DV_HEVC}, // DolbyVision HEVC |
78 {"dvhe", EME_CODEC_MP4_DV_HEVC}, // DolbyVision HEVC | 81 {"dvhe", EME_CODEC_MP4_DV_HEVC}, // DolbyVision HEVC |
(...skipping 656 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
735 uint32_t mask) { | 738 uint32_t mask) { |
736 KeySystemsImpl::GetInstance()->AddCodecMask(media_type, codec, mask); | 739 KeySystemsImpl::GetInstance()->AddCodecMask(media_type, codec, mask); |
737 } | 740 } |
738 | 741 |
739 MEDIA_EXPORT void AddMimeTypeCodecMask(const std::string& mime_type, | 742 MEDIA_EXPORT void AddMimeTypeCodecMask(const std::string& mime_type, |
740 uint32_t mask) { | 743 uint32_t mask) { |
741 KeySystemsImpl::GetInstance()->AddMimeTypeCodecMask(mime_type, mask); | 744 KeySystemsImpl::GetInstance()->AddMimeTypeCodecMask(mime_type, mask); |
742 } | 745 } |
743 | 746 |
744 } // namespace media | 747 } // namespace media |
OLD | NEW |