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

Unified Diff: components/cdm/common/widevine_drm_delegate_android.cc

Issue 2572883002: Convert USE_PROPRIETARY_CODECS to a buildflag header. (Closed)
Patch Set: Merge Created 4 years 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 side-by-side diff with in-line comments
Download patch
Index: components/cdm/common/widevine_drm_delegate_android.cc
diff --git a/components/cdm/common/widevine_drm_delegate_android.cc b/components/cdm/common/widevine_drm_delegate_android.cc
index d8e0f4391269f302d1016057aec9e516d68562b7..8c96a12587242f1177ed28ccb205084c34fbb3e6 100644
--- a/components/cdm/common/widevine_drm_delegate_android.cc
+++ b/components/cdm/common/widevine_drm_delegate_android.cc
@@ -6,6 +6,7 @@
#include "base/macros.h"
#include "media/cdm/cenc_utils.h"
+#include "media/media_features.h"
namespace cdm {
@@ -34,7 +35,7 @@ bool WidevineDrmDelegateAndroid::OnCreateSession(
if (init_data_type != media::EmeInitDataType::CENC)
return true;
-#if defined(USE_PROPRIETARY_CODECS)
+#if BUILDFLAG(USE_PROPRIETARY_CODECS)
// Widevine MediaDrm plugin only accepts the "data" part of the PSSH box as
// the init data when using MP4 container.
return media::GetPsshData(init_data, GetUUID(), init_data_out);
« no previous file with comments | « components/cdm/browser/cdm_message_filter_android.cc ('k') | components/cdm/renderer/android_key_systems.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698