diff options
author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-08-08 14:30:41 +0200 |
---|---|---|
committer | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-08-12 13:49:54 +0200 |
commit | ab0a50979b9eb4dfa3320eff7e187e41efedf7a9 (patch) | |
tree | 498dfb8a97ff3361a9f7486863a52bb4e26bb898 /chromium/third_party/widevine | |
parent | 4ce69f7403811819800e7c5ae1318b2647e778d1 (diff) | |
download | qtwebengine-chromium-ab0a50979b9eb4dfa3320eff7e187e41efedf7a9.tar.gz |
Update Chromium to beta version 37.0.2062.68
Change-Id: I188e3b5aff1bec75566014291b654eb19f5bc8ca
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'chromium/third_party/widevine')
-rw-r--r-- | chromium/third_party/widevine/cdm/BUILD.gn | 102 | ||||
-rw-r--r-- | chromium/third_party/widevine/cdm/widevine_cdm.gyp | 65 | ||||
-rw-r--r-- | chromium/third_party/widevine/cdm/widevine_cdm_common.h | 1 |
3 files changed, 128 insertions, 40 deletions
diff --git a/chromium/third_party/widevine/cdm/BUILD.gn b/chromium/third_party/widevine/cdm/BUILD.gn new file mode 100644 index 00000000000..79fad228776 --- /dev/null +++ b/chromium/third_party/widevine/cdm/BUILD.gn @@ -0,0 +1,102 @@ +# Copyright 2014 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. + +widevine_arch = cpu_arch +if (widevine_arch == "x86") { + widevine_arch = "ia32" +} + +if (is_android) { + # Always available on Android regardless of branding. + widevine_cdm_version_h_file = "android/widevine_cdm_version.h" + widevine_cdm_binary_files = [] +} else if (is_chrome_branded) { + if (is_chromeos) { + widevine_cdm_version_h_file = + "chromeos/$widevine_arch/widevine_cdm_version.h" + widevine_cdm_binary_files = [ + "chromeos/$widevine_arch/libwidevinecdm.so", + ] + } else if (is_linux) { + widevine_cdm_version_h_file = + "linux/$widevine_arch/widevine_cdm_version.h" + widevine_cdm_binary_files = [ + "linux/$widevine_arch/libwidevinecdm.so", + ] + } else if (is_win) { + widevine_cdm_version_h_file = + "win/$widevine_arch/widevine_cdm_version.h" + widevine_cdm_binary_files = [ + "win/$widevine_arch/widevinecdm.dll", + "win/$widevine_arch/widevinecdm.dll.lib", + ] + } else if (is_mac) { + widevine_cdm_version_h_file = + "mac/$widevine_arch/widevine_cdm_version.h" + widevine_cdm_binary_files = [ + "mac/$widevine_arch/libwidevinecdm.dylib", + ] + } else { + # Other platforms, use the default one. + widevine_cdm_version_h_file = "widevine_cdm_version.h" + widevine_cdm_binary_files = [] + } +} else { + # No branding, use the default one. + widevine_cdm_version_h_file = "widevine_cdm_version.h" + widevine_cdm_binary_files = [] +} + +# GYP version: third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h +copy("version_h") { + sources = [ widevine_cdm_version_h_file ] + # TODO(brettw) this should go into target_out_dir and callers should include + # it from there. This requires, however, renaming the default + # widevine_cdm_version.h in this directory to avoid conflicts. + outputs = [ "$root_gen_dir/widevine_cdm_version.h" ] +} + +# GYP version: third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_binaries +if (widevine_cdm_binary_files == []) { + group("binaries") { + # NOP + } +} else { + copy("binaries") { + sources = widevine_cdm_binary_files + outputs = [ "$root_out_dir/{{source_file_part}}" ] + # TODO(GYP) + # 'COPY_PHASE_STRIP': 'NO', + } +} + +source_set("adapter") { + if (is_chrome_branded) { + deps = [ + ":widevine_cdm_version_h", + ":widevine_cdm_binaries", + "//ppapi:ppapi_cpp", + #'<(DEPTH)/media/media_cdm_adapter.gyp:cdmadapter', TODO(GYP) + ] + } + + if (is_linux) { + libs = [ "$root_out_dir/libwidevinecdm.sp" ] + } else if (is_win) { + libs = [ "$root_out_dir/widevinecdm.dll.lib" ] + } else if (is_mac) { + libs = [ "$root_out_dir/libwidevinecdm.dylib" ] + } +} + +# This target exists for tests to depend on that pulls in a runtime dependency +# on the license server. +source_set("widevine_test_license_server") { + if (is_chrome_branded && is_linux) { + deps = [ + # TODO(GYP) + #"//third_party/widevine/test/license_server/license_server.gyp:test_license_server" + ] + } +} diff --git a/chromium/third_party/widevine/cdm/widevine_cdm.gyp b/chromium/third_party/widevine/cdm/widevine_cdm.gyp index 26b10435eb8..48896c153c4 100644 --- a/chromium/third_party/widevine/cdm/widevine_cdm.gyp +++ b/chromium/third_party/widevine/cdm/widevine_cdm.gyp @@ -11,36 +11,36 @@ 'conditions': [ [ 'chromeos == 1', { 'widevine_cdm_version_h_file%': - 'symbols/chromeos/<(target_arch)/widevine_cdm_version.h', + 'chromeos/<(target_arch)/widevine_cdm_version.h', 'widevine_cdm_binary_files%': [ - 'binaries/chromeos/<(target_arch)/libwidevinecdm.so', + 'chromeos/<(target_arch)/libwidevinecdm.so', ], }], [ 'OS == "linux" and chromeos == 0', { 'widevine_cdm_version_h_file%': - 'symbols/linux/<(target_arch)/widevine_cdm_version.h', + 'linux/<(target_arch)/widevine_cdm_version.h', 'widevine_cdm_binary_files%': [ - 'binaries/linux/<(target_arch)/libwidevinecdm.so', + 'linux/<(target_arch)/libwidevinecdm.so', ], }], [ 'OS == "mac"', { 'widevine_cdm_version_h_file%': - 'symbols/mac/<(target_arch)/widevine_cdm_version.h', + 'mac/<(target_arch)/widevine_cdm_version.h', 'widevine_cdm_binary_files%': [ - 'binaries/mac/<(target_arch)/libwidevinecdm.dylib', + 'mac/<(target_arch)/libwidevinecdm.dylib', ], }], [ 'OS == "win"', { 'widevine_cdm_version_h_file%': - 'symbols/win/<(target_arch)/widevine_cdm_version.h', + 'win/<(target_arch)/widevine_cdm_version.h', 'widevine_cdm_binary_files%': [ - 'binaries/win/<(target_arch)/widevinecdm.dll', - 'binaries/win/<(target_arch)/widevinecdm.dll.lib', + 'win/<(target_arch)/widevinecdm.dll', + 'win/<(target_arch)/widevinecdm.dll.lib', ], }], ], }], - [ 'OS == "android" and google_tv != 1', { + [ 'OS == "android"', { 'widevine_cdm_version_h_file%': 'android/widevine_cdm_version.h', }], @@ -50,69 +50,42 @@ # anything to be done in this file (instead of a higher-level .gyp file). 'targets': [ { + # GN version: //third_party/widevine/cdm:adapter 'target_name': 'widevinecdmadapter', 'type': 'none', 'conditions': [ [ 'branding == "Chrome" and enable_pepper_cdms==1', { 'dependencies': [ '<(DEPTH)/ppapi/ppapi.gyp:ppapi_cpp', + '<(DEPTH)/media/media_cdm_adapter.gyp:cdmadapter', 'widevine_cdm_version_h', 'widevine_cdm_binaries', ], - 'sources': [ - '<(DEPTH)/media/cdm/ppapi/api/content_decryption_module.h', - '<(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 adapter to find the CDM in the same directory. - 'ldflags': ['-Wl,-rpath=\$$ORIGIN'], 'libraries': [ # Copied by widevine_cdm_binaries. '<(PRODUCT_DIR)/libwidevinecdm.so', ], }], [ 'OS == "win"', { - 'type': 'shared_library', - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - 'msvs_disabled_warnings': [ 4267, ], 'libraries': [ # Copied by widevine_cdm_binaries. '<(PRODUCT_DIR)/widevinecdm.dll.lib', ], }], [ 'OS == "mac"', { - 'type': 'loadable_module', - 'product_extension': 'plugin', 'libraries': [ # Copied by widevine_cdm_binaries. '<(PRODUCT_DIR)/libwidevinecdm.dylib', ], - 'xcode_settings': { - 'OTHER_LDFLAGS': [ - # Not to strip important symbols by -Wl,-dead_strip. - '-Wl,-exported_symbol,_PPP_GetInterface', - '-Wl,-exported_symbol,_PPP_InitializeModule', - '-Wl,-exported_symbol,_PPP_ShutdownModule', - ], - 'DYLIB_INSTALL_NAME_BASE': '@loader_path', - }, }], ], }], ], }, { + # GN version: //third_party/widevine/cdm:version_h 'target_name': 'widevine_cdm_version_h', 'type': 'none', 'copies': [{ @@ -121,6 +94,7 @@ }], }, { + # GN version: //third_party/widevine/cdm:binaries 'target_name': 'widevine_cdm_binaries', 'type': 'none', 'conditions': [ @@ -137,5 +111,16 @@ 'files': [ '<@(widevine_cdm_binary_files)' ], }], }, + { + 'target_name': 'widevine_test_license_server', + 'type': 'none', + 'conditions': [ + [ 'branding == "Chrome" and OS == "linux"', { + 'dependencies': [ + '<(DEPTH)/third_party/widevine/test/license_server/license_server.gyp:test_license_server', + ], + }], + ], + }, ], } diff --git a/chromium/third_party/widevine/cdm/widevine_cdm_common.h b/chromium/third_party/widevine/cdm/widevine_cdm_common.h index fb8ff855838..726808bef4f 100644 --- a/chromium/third_party/widevine/cdm/widevine_cdm_common.h +++ b/chromium/third_party/widevine/cdm/widevine_cdm_common.h @@ -51,6 +51,7 @@ const char kCdmSupportedCodecsParamName[] = "codecs"; const char kCdmSupportedCodecsValueDelimiter = ','; const char kCdmSupportedCodecVorbis[] = "vorbis"; const char kCdmSupportedCodecVp8[] = "vp8"; +const char kCdmSupportedCodecVp9[] = "vp9.0"; #if defined(USE_PROPRIETARY_CODECS) const char kCdmSupportedCodecAac[] = "aac"; const char kCdmSupportedCodecAvc1[] = "avc1"; |