Commit d3c5dfad authored by Thoren Paulson's avatar Thoren Paulson Committed by Commit Bot

[Chromecast] Fix key system build flag logic.

Should use Cast EME with PlayReady or Widevine+CMA.

BUG=internal 62721854
TEST=

Change-Id: Ide4de9e3dea6a1286415569bff68147caeb1cdc6
Reviewed-on: https://chromium-review.googlesource.com/570981Reviewed-by: default avatarLuke Halliwell <halliwell@chromium.org>
Reviewed-by: default avatarStephen Lanham <slan@chromium.org>
Commit-Queue: Thoren Paulson <thoren@chromium.org>
Cr-Commit-Position: refs/heads/master@{#487130}
parent 1d441d93
...@@ -30,8 +30,8 @@ namespace chromecast { ...@@ -30,8 +30,8 @@ namespace chromecast {
namespace media { namespace media {
namespace { namespace {
#if BUILDFLAG(IS_CAST_USING_CMA_BACKEND) && \ #if defined(PLAYREADY_CDM_AVAILABLE) || \
(defined(WIDEVINE_CDM_AVAILABLE) || defined(PLAYREADY_CDM_AVAILABLE)) (BUILDFLAG(IS_CAST_USING_CMA_BACKEND) && defined(WIDEVINE_CDM_AVAILABLE))
SupportedCodecs GetCastEmeSupportedCodecs() { SupportedCodecs GetCastEmeSupportedCodecs() {
SupportedCodecs codecs = SupportedCodecs codecs =
::media::EME_CODEC_MP4_AAC | ::media::EME_CODEC_MP4_AVC1 | ::media::EME_CODEC_MP4_AAC | ::media::EME_CODEC_MP4_AVC1 |
...@@ -55,7 +55,7 @@ SupportedCodecs GetCastEmeSupportedCodecs() { ...@@ -55,7 +55,7 @@ SupportedCodecs GetCastEmeSupportedCodecs() {
return codecs; return codecs;
} }
#endif // BUILDFLAG(IS_CAST_USING_CMA_BACKEND) && ... #endif // defined(PLAYREADY_CDM_AVAILABLE) || ...
#if defined(PLAYREADY_CDM_AVAILABLE) #if defined(PLAYREADY_CDM_AVAILABLE)
class PlayReadyKeySystemProperties : public ::media::KeySystemProperties { class PlayReadyKeySystemProperties : public ::media::KeySystemProperties {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment