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

Side by Side Diff: chromecast/renderer/media/key_systems_cast.cc

Issue 2881443002: Add EME contentType checks for mp2t (Closed)
Patch Set: Created 3 years, 7 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "chromecast/renderer/media/key_systems_cast.h" 5 #include "chromecast/renderer/media/key_systems_cast.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 15 matching lines...) Expand all
26 using ::media::SupportedCodecs; 26 using ::media::SupportedCodecs;
27 27
28 namespace chromecast { 28 namespace chromecast {
29 namespace media { 29 namespace media {
30 namespace { 30 namespace {
31 31
32 #if defined(PLAYREADY_CDM_AVAILABLE) || \ 32 #if defined(PLAYREADY_CDM_AVAILABLE) || \
33 (defined(WIDEVINE_CDM_AVAILABLE) && !defined(OS_ANDROID)) 33 (defined(WIDEVINE_CDM_AVAILABLE) && !defined(OS_ANDROID))
34 SupportedCodecs GetCastEmeSupportedCodecs() { 34 SupportedCodecs GetCastEmeSupportedCodecs() {
35 SupportedCodecs codecs = 35 SupportedCodecs codecs =
36 ::media::EME_CODEC_MP4_AAC | ::media::EME_CODEC_MP4_AVC1 | 36 ::media::EME_CODEC_MP4_AAC | ::media::EME_CODEC_COMMON_AVC1 |
37 ::media::EME_CODEC_COMMON_VP9 | ::media::EME_CODEC_WEBM_VP8 | 37 ::media::EME_CODEC_COMMON_VP9 | ::media::EME_CODEC_WEBM_VP8 |
38 ::media::EME_CODEC_WEBM_VP9; 38 ::media::EME_CODEC_WEBM_VP9;
39 39
40 #if BUILDFLAG(ENABLE_HEVC_DEMUXING) 40 #if BUILDFLAG(ENABLE_HEVC_DEMUXING)
41 codecs |= ::media::EME_CODEC_MP4_HEVC; 41 codecs |= ::media::EME_CODEC_MP4_HEVC;
42 #endif // BUILDFLAG(ENABLE_HEVC_DEMUXING) 42 #endif // BUILDFLAG(ENABLE_HEVC_DEMUXING)
43 43
44 #if BUILDFLAG(ENABLE_DOLBY_VISION_DEMUXING) 44 #if BUILDFLAG(ENABLE_DOLBY_VISION_DEMUXING)
45 codecs |= ::media::EME_CODEC_MP4_DV_AVC; 45 codecs |= ::media::EME_CODEC_MP4_DV_AVC;
46 #if BUILDFLAG(ENABLE_HEVC_DEMUXING) 46 #if BUILDFLAG(ENABLE_HEVC_DEMUXING)
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 EmeSessionTypeSupport::NOT_SUPPORTED, // persistent-release-message. 139 EmeSessionTypeSupport::NOT_SUPPORTED, // persistent-release-message.
140 // Note: On Chromecast, all CDMs may have persistent state. 140 // Note: On Chromecast, all CDMs may have persistent state.
141 EmeFeatureSupport::ALWAYS_ENABLED, // Persistent state. 141 EmeFeatureSupport::ALWAYS_ENABLED, // Persistent state.
142 EmeFeatureSupport::ALWAYS_ENABLED)); // Distinctive identifier. 142 EmeFeatureSupport::ALWAYS_ENABLED)); // Distinctive identifier.
143 #endif // defined(OS_ANDROID) 143 #endif // defined(OS_ANDROID)
144 #endif // defined(WIDEVINE_CDM_AVAILABLE) 144 #endif // defined(WIDEVINE_CDM_AVAILABLE)
145 } 145 }
146 146
147 } // namespace media 147 } // namespace media
148 } // namespace chromecast 148 } // namespace chromecast
OLDNEW
« no previous file with comments | « no previous file | components/cdm/browser/cdm_message_filter_android.cc » ('j') | media/base/key_systems.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698