| 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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 // Mapping between codec names and enum values. | 52 // Mapping between codec names and enum values. |
| 53 static const NamedCodec kCodecStrings[] = { | 53 static const NamedCodec kCodecStrings[] = { |
| 54 {"opus", EME_CODEC_WEBM_OPUS}, // Opus. | 54 {"opus", EME_CODEC_WEBM_OPUS}, // Opus. |
| 55 {"vorbis", EME_CODEC_WEBM_VORBIS}, // Vorbis. | 55 {"vorbis", EME_CODEC_WEBM_VORBIS}, // Vorbis. |
| 56 {"vp8", EME_CODEC_WEBM_VP8}, // VP8. | 56 {"vp8", EME_CODEC_WEBM_VP8}, // VP8. |
| 57 {"vp8.0", EME_CODEC_WEBM_VP8}, // VP8. | 57 {"vp8.0", EME_CODEC_WEBM_VP8}, // VP8. |
| 58 {"vp9", EME_CODEC_WEBM_VP9}, // VP9. | 58 {"vp9", EME_CODEC_WEBM_VP9}, // VP9. |
| 59 {"vp9.0", EME_CODEC_WEBM_VP9}, // VP9. | 59 {"vp9.0", EME_CODEC_WEBM_VP9}, // VP9. |
| 60 {"vp09", EME_CODEC_COMMON_VP9}, // New multi-part VP9 for WebM and MP4. | 60 {"vp09", EME_CODEC_COMMON_VP9}, // New multi-part VP9 for WebM and MP4. |
| 61 #if BUILDFLAG(USE_PROPRIETARY_CODECS) | 61 #if BUILDFLAG(USE_PROPRIETARY_CODECS) |
| 62 {"mp4a", EME_CODEC_MP4_AAC}, // AAC. | 62 {"mp4a", EME_CODEC_MP4_AAC}, // AAC. |
| 63 #if BUILDFLAG(ENABLE_AC3_EAC3_AUDIO_DEMUXING) |
| 64 {"ac-3", EME_CODEC_MP4_AC3}, // AC3. |
| 65 {"ec-3", EME_CODEC_MP4_EAC3}, // EAC3. |
| 66 #endif |
| 63 {"avc1", EME_CODEC_MP4_AVC1}, // AVC1. | 67 {"avc1", EME_CODEC_MP4_AVC1}, // AVC1. |
| 64 {"avc3", EME_CODEC_MP4_AVC1}, // AVC3. | 68 {"avc3", EME_CODEC_MP4_AVC1}, // AVC3. |
| 65 #if BUILDFLAG(ENABLE_HEVC_DEMUXING) | 69 #if BUILDFLAG(ENABLE_HEVC_DEMUXING) |
| 66 {"hev1", EME_CODEC_MP4_HEVC}, // HEV1. | 70 {"hev1", EME_CODEC_MP4_HEVC}, // HEV1. |
| 67 {"hvc1", EME_CODEC_MP4_HEVC}, // HVC1. | 71 {"hvc1", EME_CODEC_MP4_HEVC}, // HVC1. |
| 68 #endif | 72 #endif |
| 69 #if BUILDFLAG(ENABLE_DOLBY_VISION_DEMUXING) | 73 #if BUILDFLAG(ENABLE_DOLBY_VISION_DEMUXING) |
| 70 {"dva1", EME_CODEC_MP4_DV_AVC}, // DolbyVision AVC | 74 {"dva1", EME_CODEC_MP4_DV_AVC}, // DolbyVision AVC |
| 71 {"dvav", EME_CODEC_MP4_DV_AVC}, // DolbyVision AVC | 75 {"dvav", EME_CODEC_MP4_DV_AVC}, // DolbyVision AVC |
| 72 #if BUILDFLAG(ENABLE_HEVC_DEMUXING) | 76 #if BUILDFLAG(ENABLE_HEVC_DEMUXING) |
| (...skipping 658 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 731 uint32_t mask) { | 735 uint32_t mask) { |
| 732 KeySystemsImpl::GetInstance()->AddCodecMask(media_type, codec, mask); | 736 KeySystemsImpl::GetInstance()->AddCodecMask(media_type, codec, mask); |
| 733 } | 737 } |
| 734 | 738 |
| 735 MEDIA_EXPORT void AddMimeTypeCodecMask(const std::string& mime_type, | 739 MEDIA_EXPORT void AddMimeTypeCodecMask(const std::string& mime_type, |
| 736 uint32_t mask) { | 740 uint32_t mask) { |
| 737 KeySystemsImpl::GetInstance()->AddMimeTypeCodecMask(mime_type, mask); | 741 KeySystemsImpl::GetInstance()->AddMimeTypeCodecMask(mime_type, mask); |
| 738 } | 742 } |
| 739 | 743 |
| 740 } // namespace media | 744 } // namespace media |
| OLD | NEW |