diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2014-03-18 13:16:26 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-20 15:55:39 +0100 |
| commit | 3f0f86b0caed75241fa71c95a5d73bc0164348c5 (patch) | |
| tree | 92b9fb00f2e9e90b0be2262093876d4f43b6cd13 /chromium/third_party/widevine | |
| parent | e90d7c4b152c56919d963987e2503f9909a666d2 (diff) | |
| download | qtwebengine-chromium-3f0f86b0caed75241fa71c95a5d73bc0164348c5.tar.gz | |
Update to new stable branch 1750
This also includes an updated ninja and chromium dependencies
needed on Windows.
Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'chromium/third_party/widevine')
| -rw-r--r-- | chromium/third_party/widevine/cdm/widevine_cdm.gyp | 11 | ||||
| -rw-r--r-- | chromium/third_party/widevine/cdm/widevine_cdm_common.h | 10 |
2 files changed, 19 insertions, 2 deletions
diff --git a/chromium/third_party/widevine/cdm/widevine_cdm.gyp b/chromium/third_party/widevine/cdm/widevine_cdm.gyp index 3114393fb72..26b10435eb8 100644 --- a/chromium/third_party/widevine/cdm/widevine_cdm.gyp +++ b/chromium/third_party/widevine/cdm/widevine_cdm.gyp @@ -61,14 +61,21 @@ ], 'sources': [ '<(DEPTH)/media/cdm/ppapi/api/content_decryption_module.h', - '<(DEPTH)/media/cdm/ppapi/cdm_wrapper.cc', + '<(DEPTH)/media/cdm/ppapi/cdm_adapter.cc', + '<(DEPTH)/media/cdm/ppapi/cdm_adapter.h', + '<(DEPTH)/media/cdm/ppapi/cdm_helpers.cc', + '<(DEPTH)/media/cdm/ppapi/cdm_helpers.h', + '<(DEPTH)/media/cdm/ppapi/cdm_logging.cc', + '<(DEPTH)/media/cdm/ppapi/cdm_logging.h', + '<(DEPTH)/media/cdm/ppapi/cdm_wrapper.h', '<(DEPTH)/media/cdm/ppapi/linked_ptr.h', + '<(DEPTH)/media/cdm/ppapi/supported_cdm_versions.h', ], 'conditions': [ [ 'os_posix == 1 and OS != "mac"', { 'cflags': ['-fvisibility=hidden'], 'type': 'loadable_module', - # Allow the plugin wrapper to find the CDM in the same directory. + # Allow the plugin adapter to find the CDM in the same directory. 'ldflags': ['-Wl,-rpath=\$$ORIGIN'], 'libraries': [ # Copied by widevine_cdm_binaries. diff --git a/chromium/third_party/widevine/cdm/widevine_cdm_common.h b/chromium/third_party/widevine/cdm/widevine_cdm_common.h index 2b3ef0dbb65..fb8ff855838 100644 --- a/chromium/third_party/widevine/cdm/widevine_cdm_common.h +++ b/chromium/third_party/widevine/cdm/widevine_cdm_common.h @@ -45,6 +45,16 @@ const char kWidevineCdmAdapterFileName[] = "libwidevinecdmadapter.so"; #endif +// The following strings are used to communicate supported codecs (from the +// component manifest) via WebPluginInfo::WebPluginMimeType's additional params. +const char kCdmSupportedCodecsParamName[] = "codecs"; +const char kCdmSupportedCodecsValueDelimiter = ','; +const char kCdmSupportedCodecVorbis[] = "vorbis"; +const char kCdmSupportedCodecVp8[] = "vp8"; +#if defined(USE_PROPRIETARY_CODECS) +const char kCdmSupportedCodecAac[] = "aac"; +const char kCdmSupportedCodecAvc1[] = "avc1"; +#endif // defined(USE_PROPRIETARY_CODECS) #if defined(OS_MACOSX) || defined(OS_WIN) // CDM is installed by the component installer instead of the Chrome installer. |