diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2013-12-11 21:33:03 +0100 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@digia.com> | 2013-12-13 12:34:07 +0100 |
| commit | f2a33ff9cbc6d19943f1c7fbddd1f23d23975577 (patch) | |
| tree | 0586a32aa390ade8557dfd6b4897f43a07449578 /chromium/third_party/widevine | |
| parent | 5362912cdb5eea702b68ebe23702468d17c3017a (diff) | |
| download | qtwebengine-chromium-f2a33ff9cbc6d19943f1c7fbddd1f23d23975577.tar.gz | |
Update Chromium to branch 1650 (31.0.1650.63)
Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'chromium/third_party/widevine')
3 files changed, 26 insertions, 5 deletions
diff --git a/chromium/third_party/widevine/cdm/android/widevine_cdm_version.h b/chromium/third_party/widevine/cdm/android/widevine_cdm_version.h new file mode 100644 index 00000000000..c1584cfdd2a --- /dev/null +++ b/chromium/third_party/widevine/cdm/android/widevine_cdm_version.h @@ -0,0 +1,18 @@ +// Copyright (c) 2013 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef WIDEVINE_CDM_VERSION_H_ +#define WIDEVINE_CDM_VERSION_H_ + +#include "third_party/widevine/cdm/widevine_cdm_common.h" + +// Indicates that the Widevine CDM is available. +#define WIDEVINE_CDM_AVAILABLE + +// Indicates that AVC1 decoding is available for ISO BMFF CENC. +#define WIDEVINE_CDM_AVC1_SUPPORT_AVAILABLE +// Indicates that AAC decoding is available for ISO BMFF CENC. +#define WIDEVINE_CDM_AAC_SUPPORT_AVAILABLE + +#endif // WIDEVINE_CDM_VERSION_H_ diff --git a/chromium/third_party/widevine/cdm/widevine_cdm.gyp b/chromium/third_party/widevine/cdm/widevine_cdm.gyp index a4185e6f772..3114393fb72 100644 --- a/chromium/third_party/widevine/cdm/widevine_cdm.gyp +++ b/chromium/third_party/widevine/cdm/widevine_cdm.gyp @@ -40,6 +40,10 @@ }], ], }], + [ 'OS == "android" and google_tv != 1', { + 'widevine_cdm_version_h_file%': + 'android/widevine_cdm_version.h', + }], ], }, # Always provide a target, so we can put the logic about whether there's diff --git a/chromium/third_party/widevine/cdm/widevine_cdm_common.h b/chromium/third_party/widevine/cdm/widevine_cdm_common.h index 7ea705cea3d..2b3ef0dbb65 100644 --- a/chromium/third_party/widevine/cdm/widevine_cdm_common.h +++ b/chromium/third_party/widevine/cdm/widevine_cdm_common.h @@ -19,11 +19,11 @@ const char kWidevineCdmDisplayName[] = "Widevine Content Decryption Module"; // Will be parsed as HTML. const char kWidevineCdmDescription[] = "Enables Widevine licenses for playback of HTML audio/video content."; + #if defined(ENABLE_PEPPER_CDMS) const char kWidevineCdmPluginMimeType[] = "application/x-ppapi-widevine-cdm"; const char kWidevineCdmPluginMimeTypeDescription[] = "Widevine Content Decryption Module"; -#endif // File name of the CDM on different platforms. const char kWidevineCdmFileName[] = @@ -35,7 +35,6 @@ const char kWidevineCdmFileName[] = "libwidevinecdm.so"; #endif -#if defined(ENABLE_PEPPER_CDMS) // File name of the adapter on different platforms. const char kWidevineCdmAdapterFileName[] = #if defined(OS_MACOSX) @@ -45,12 +44,12 @@ const char kWidevineCdmAdapterFileName[] = #else // OS_LINUX, etc. "libwidevinecdmadapter.so"; #endif -#endif // defined(ENABLE_PEPPER_CDMS) -#if defined(ENABLE_PEPPER_CDMS) && (defined(OS_MACOSX) || defined(OS_WIN)) +#if defined(OS_MACOSX) || defined(OS_WIN) // CDM is installed by the component installer instead of the Chrome installer. #define WIDEVINE_CDM_IS_COMPONENT -#endif +#endif // defined(OS_MACOSX) || defined(OS_WIN) +#endif // defined(ENABLE_PEPPER_CDMS) #endif // WIDEVINE_CDM_WIDEVINE_CDM_COMMON_H_ |