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

Unified Diff: components/cdm/renderer/widevine_key_systems.cc

Issue 665343002: Move KeySystemInfo to media. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase only Created 6 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/cdm/renderer/widevine_key_systems.h ('k') | content/content_common.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/cdm/renderer/widevine_key_systems.cc
diff --git a/components/cdm/renderer/widevine_key_systems.cc b/components/cdm/renderer/widevine_key_systems.cc
index d08b6ad9239e6d242a1bd2cf3e9e3f9e545ae091..f803e8e3fefffaa3b3715e2c7665b1df08dfc86f 100644
--- a/components/cdm/renderer/widevine_key_systems.cc
+++ b/components/cdm/renderer/widevine_key_systems.cc
@@ -8,14 +8,14 @@
#include <vector>
#include "base/logging.h"
-#include "content/public/common/eme_constants.h"
+#include "media/base/eme_constants.h"
#include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.
#if defined(WIDEVINE_CDM_AVAILABLE)
-using content::KeySystemInfo;
-using content::SupportedCodecs;
+using media::KeySystemInfo;
+using media::SupportedCodecs;
namespace cdm {
@@ -53,11 +53,11 @@ void AddWidevineWithCodecs(WidevineCdmType widevine_cdm_type,
// Here we assume that support for a container imples support for the
// associated initialization data type. KeySystems handles validating
// |init_data_type| x |container| pairings.
- if (supported_codecs & content::EME_CODEC_WEBM_ALL)
- info.supported_init_data_types |= content::EME_INIT_DATA_TYPE_WEBM;
+ if (supported_codecs & media::EME_CODEC_WEBM_ALL)
+ info.supported_init_data_types |= media::EME_INIT_DATA_TYPE_WEBM;
#if defined(USE_PROPRIETARY_CODECS)
- if (supported_codecs & content::EME_CODEC_MP4_ALL)
- info.supported_init_data_types |= content::EME_INIT_DATA_TYPE_CENC;
+ if (supported_codecs & media::EME_CODEC_MP4_ALL)
+ info.supported_init_data_types |= media::EME_INIT_DATA_TYPE_CENC;
#endif // defined(USE_PROPRIETARY_CODECS)
#if defined(ENABLE_PEPPER_CDMS)
« no previous file with comments | « components/cdm/renderer/widevine_key_systems.h ('k') | content/content_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698