Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(183)

Side by Side Diff: media/base/key_systems.cc

Issue 1909313002: Support HEVC through EME (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: CR feedback Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« chromecast/chromecast.gyp ('K') | « media/base/eme_constants.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 {"vp8", EME_CODEC_WEBM_VP8}, // VP8. 55 {"vp8", EME_CODEC_WEBM_VP8}, // VP8.
56 {"vp8.0", EME_CODEC_WEBM_VP8}, // VP8. 56 {"vp8.0", EME_CODEC_WEBM_VP8}, // VP8.
57 {"vp9", EME_CODEC_WEBM_VP9}, // VP9. 57 {"vp9", EME_CODEC_WEBM_VP9}, // VP9.
58 {"vp9.0", EME_CODEC_WEBM_VP9}, // VP9. 58 {"vp9.0", EME_CODEC_WEBM_VP9}, // VP9.
59 #if defined(USE_PROPRIETARY_CODECS) 59 #if defined(USE_PROPRIETARY_CODECS)
60 #if BUILDFLAG(ENABLE_MP4_VP9_DEMUXING) 60 #if BUILDFLAG(ENABLE_MP4_VP9_DEMUXING)
61 {"vp09", EME_CODEC_MP4_VP9}, // VP9 in MP4. 61 {"vp09", EME_CODEC_MP4_VP9}, // VP9 in MP4.
62 #endif 62 #endif
63 {"mp4a", EME_CODEC_MP4_AAC}, // AAC. 63 {"mp4a", EME_CODEC_MP4_AAC}, // AAC.
64 {"avc1", EME_CODEC_MP4_AVC1}, // AVC1. 64 {"avc1", EME_CODEC_MP4_AVC1}, // AVC1.
65 {"avc3", EME_CODEC_MP4_AVC1} // AVC3. 65 {"avc3", EME_CODEC_MP4_AVC1}, // AVC3.
66 #if BUILDFLAG(ENABLE_HEVC_DEMUXING)
67 {"hev1", EME_CODEC_MP4_HEVC}, // HEV1.
68 {"hvc1", EME_CODEC_MP4_HEVC}, // HVC1.
69 #endif
66 #endif // defined(USE_PROPRIETARY_CODECS) 70 #endif // defined(USE_PROPRIETARY_CODECS)
67 }; 71 };
68 72
69 class ClearKeyProperties : public KeySystemProperties { 73 class ClearKeyProperties : public KeySystemProperties {
70 public: 74 public:
71 std::string GetKeySystemName() const override { return kClearKeyKeySystem; } 75 std::string GetKeySystemName() const override { return kClearKeyKeySystem; }
72 76
73 bool IsSupportedInitDataType(EmeInitDataType init_data_type) const override { 77 bool IsSupportedInitDataType(EmeInitDataType init_data_type) const override {
74 #if defined(USE_PROPRIETARY_CODECS) 78 #if defined(USE_PROPRIETARY_CODECS)
75 if (init_data_type == EmeInitDataType::CENC) 79 if (init_data_type == EmeInitDataType::CENC)
(...skipping 652 matching lines...) Expand 10 before | Expand all | Expand 10 after
728 uint32_t mask) { 732 uint32_t mask) {
729 KeySystemsImpl::GetInstance()->AddCodecMask(media_type, codec, mask); 733 KeySystemsImpl::GetInstance()->AddCodecMask(media_type, codec, mask);
730 } 734 }
731 735
732 MEDIA_EXPORT void AddMimeTypeCodecMask(const std::string& mime_type, 736 MEDIA_EXPORT void AddMimeTypeCodecMask(const std::string& mime_type,
733 uint32_t mask) { 737 uint32_t mask) {
734 KeySystemsImpl::GetInstance()->AddMimeTypeCodecMask(mime_type, mask); 738 KeySystemsImpl::GetInstance()->AddMimeTypeCodecMask(mime_type, mask);
735 } 739 }
736 740
737 } // namespace media 741 } // namespace media
OLDNEW
« chromecast/chromecast.gyp ('K') | « media/base/eme_constants.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698