| Index: components/cdm/renderer/android_key_systems.cc
|
| diff --git a/components/cdm/renderer/android_key_systems.cc b/components/cdm/renderer/android_key_systems.cc
|
| index 7953dd61f195f2683ba7c4a35c5e62c486799c7e..9f3e6d11f47137bdf8aa9a07f6a43a14e5613ff0 100644
|
| --- a/components/cdm/renderer/android_key_systems.cc
|
| +++ b/components/cdm/renderer/android_key_systems.cc
|
| @@ -14,6 +14,7 @@
|
| #include "content/public/renderer/render_thread.h"
|
| #include "media/base/eme_constants.h"
|
| #include "media/base/media_switches.h"
|
| +#include "media/media_features.h"
|
|
|
| #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.
|
|
|
| @@ -48,11 +49,11 @@ class AndroidPlatformKeySystemProperties : public KeySystemProperties {
|
| case EmeInitDataType::WEBM:
|
| return (supported_codecs_ & media::EME_CODEC_WEBM_ALL) != 0;
|
| case EmeInitDataType::CENC:
|
| -#if defined(USE_PROPRIETARY_CODECS)
|
| +#if BUILDFLAG(USE_PROPRIETARY_CODECS)
|
| return (supported_codecs_ & media::EME_CODEC_MP4_ALL) != 0;
|
| #else
|
| return false;
|
| -#endif // defined(USE_PROPRIETARY_CODECS)
|
| +#endif // BUILDFLAG(USE_PROPRIETARY_CODECS)
|
| case EmeInitDataType::KEYIDS:
|
| case EmeInitDataType::UNKNOWN:
|
| return false;
|
|
|