Update to API changes of Chrome 52
This commit is contained in:
parent
eb378bef3a
commit
1ba3907038
74 changed files with 304 additions and 176 deletions
|
@ -4,6 +4,8 @@
|
|||
|
||||
#include "chrome/renderer/media/chrome_key_systems.h"
|
||||
|
||||
#include <stddef.h>
|
||||
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
|
@ -12,13 +14,10 @@
|
|||
#include "base/strings/string_split.h"
|
||||
#include "base/strings/utf_string_conversions.h"
|
||||
#include "chrome/common/widevine_cdm_messages.h"
|
||||
#include "components/cdm/renderer/widevine_key_systems.h"
|
||||
#include "components/cdm/renderer/widevine_key_system_properties.h"
|
||||
#include "content/public/renderer/render_thread.h"
|
||||
#include "media/base/eme_constants.h"
|
||||
|
||||
#if defined(OS_ANDROID)
|
||||
#include "components/cdm/renderer/android_key_systems.h"
|
||||
#endif
|
||||
#include "media/base/key_system_properties.h"
|
||||
|
||||
// #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.
|
||||
#include "third_party/widevine/cdm/stub/widevine_cdm_version.h"
|
||||
|
@ -30,10 +29,13 @@
|
|||
#include "base/version.h"
|
||||
#endif
|
||||
|
||||
using media::KeySystemInfo;
|
||||
using media::KeySystemProperties;
|
||||
using media::SupportedCodecs;
|
||||
|
||||
#if defined(ENABLE_PEPPER_CDMS)
|
||||
static const char kExternalClearKeyPepperType[] =
|
||||
"application/x-ppapi-clearkey-cdm";
|
||||
|
||||
static bool IsPepperCdmAvailable(
|
||||
const std::string& pepper_type,
|
||||
std::vector<base::string16>* additional_param_names,
|
||||
|
@ -49,6 +51,120 @@ static bool IsPepperCdmAvailable(
|
|||
return is_available;
|
||||
}
|
||||
|
||||
// KeySystemProperties implementation for external Clear Key systems.
|
||||
class ExternalClearKeyProperties : public KeySystemProperties {
|
||||
public:
|
||||
explicit ExternalClearKeyProperties(const std::string& key_system_name)
|
||||
: key_system_name_(key_system_name) {}
|
||||
|
||||
std::string GetKeySystemName() const override { return key_system_name_; }
|
||||
bool IsSupportedInitDataType(
|
||||
media::EmeInitDataType init_data_type) const override {
|
||||
switch (init_data_type) {
|
||||
case media::EmeInitDataType::WEBM:
|
||||
case media::EmeInitDataType::KEYIDS:
|
||||
return true;
|
||||
|
||||
case media::EmeInitDataType::CENC:
|
||||
#if defined(USE_PROPRIETARY_CODECS)
|
||||
return true;
|
||||
#else
|
||||
return false;
|
||||
#endif // defined(USE_PROPRIETARY_CODECS)
|
||||
|
||||
case media::EmeInitDataType::UNKNOWN:
|
||||
return false;
|
||||
}
|
||||
NOTREACHED();
|
||||
return false;
|
||||
}
|
||||
|
||||
SupportedCodecs GetSupportedCodecs() const override {
|
||||
#if defined(USE_PROPRIETARY_CODECS)
|
||||
return media::EME_CODEC_MP4_ALL | media::EME_CODEC_WEBM_ALL;
|
||||
#else
|
||||
return media::EME_CODEC_WEBM_ALL;
|
||||
#endif
|
||||
}
|
||||
|
||||
media::EmeConfigRule GetRobustnessConfigRule(
|
||||
media::EmeMediaType media_type,
|
||||
const std::string& requested_robustness) const override {
|
||||
return requested_robustness.empty() ? media::EmeConfigRule::SUPPORTED
|
||||
: media::EmeConfigRule::NOT_SUPPORTED;
|
||||
}
|
||||
|
||||
// Persistent license sessions are faked.
|
||||
media::EmeSessionTypeSupport GetPersistentLicenseSessionSupport()
|
||||
const override {
|
||||
return media::EmeSessionTypeSupport::SUPPORTED;
|
||||
}
|
||||
|
||||
media::EmeSessionTypeSupport GetPersistentReleaseMessageSessionSupport()
|
||||
const override {
|
||||
return media::EmeSessionTypeSupport::NOT_SUPPORTED;
|
||||
}
|
||||
|
||||
media::EmeFeatureSupport GetPersistentStateSupport() const override {
|
||||
return media::EmeFeatureSupport::REQUESTABLE;
|
||||
}
|
||||
|
||||
media::EmeFeatureSupport GetDistinctiveIdentifierSupport() const override {
|
||||
return media::EmeFeatureSupport::NOT_SUPPORTED;
|
||||
}
|
||||
|
||||
std::string GetPepperType() const override {
|
||||
return kExternalClearKeyPepperType;
|
||||
}
|
||||
|
||||
private:
|
||||
const std::string key_system_name_;
|
||||
};
|
||||
|
||||
// External Clear Key (used for testing).
|
||||
static void AddExternalClearKey(
|
||||
std::vector<std::unique_ptr<KeySystemProperties>>* concrete_key_systems) {
|
||||
static const char kExternalClearKeyKeySystem[] =
|
||||
"org.chromium.externalclearkey";
|
||||
static const char kExternalClearKeyDecryptOnlyKeySystem[] =
|
||||
"org.chromium.externalclearkey.decryptonly";
|
||||
static const char kExternalClearKeyFileIOTestKeySystem[] =
|
||||
"org.chromium.externalclearkey.fileiotest";
|
||||
static const char kExternalClearKeyInitializeFailKeySystem[] =
|
||||
"org.chromium.externalclearkey.initializefail";
|
||||
static const char kExternalClearKeyCrashKeySystem[] =
|
||||
"org.chromium.externalclearkey.crash";
|
||||
|
||||
std::vector<base::string16> additional_param_names;
|
||||
std::vector<base::string16> additional_param_values;
|
||||
if (!IsPepperCdmAvailable(kExternalClearKeyPepperType,
|
||||
&additional_param_names,
|
||||
&additional_param_values)) {
|
||||
return;
|
||||
}
|
||||
|
||||
concrete_key_systems->emplace_back(
|
||||
new ExternalClearKeyProperties(kExternalClearKeyKeySystem));
|
||||
|
||||
// Add support of decrypt-only mode in ClearKeyCdm.
|
||||
concrete_key_systems->emplace_back(
|
||||
new ExternalClearKeyProperties(kExternalClearKeyDecryptOnlyKeySystem));
|
||||
|
||||
// A key system that triggers FileIO test in ClearKeyCdm.
|
||||
concrete_key_systems->emplace_back(
|
||||
new ExternalClearKeyProperties(kExternalClearKeyFileIOTestKeySystem));
|
||||
|
||||
// A key system that Chrome thinks is supported by ClearKeyCdm, but actually
|
||||
// will be refused by ClearKeyCdm. This is to test the CDM initialization
|
||||
// failure case.
|
||||
concrete_key_systems->emplace_back(
|
||||
new ExternalClearKeyProperties(kExternalClearKeyInitializeFailKeySystem));
|
||||
|
||||
// A key system that triggers a crash in ClearKeyCdm.
|
||||
concrete_key_systems->emplace_back(
|
||||
new ExternalClearKeyProperties(kExternalClearKeyCrashKeySystem));
|
||||
}
|
||||
|
||||
#if defined(WIDEVINE_CDM_AVAILABLE)
|
||||
// This function finds "codecs" and parses the value into the vector |codecs|.
|
||||
// Converts the codec strings to UTF-8 since we only expect ASCII strings and
|
||||
|
@ -79,11 +195,11 @@ void GetSupportedCodecsForPepperCdm(
|
|||
}
|
||||
|
||||
static void AddPepperBasedWidevine(
|
||||
std::vector<KeySystemInfo>* concrete_key_systems) {
|
||||
std::vector<std::unique_ptr<KeySystemProperties>>* concrete_key_systems) {
|
||||
#if defined(WIDEVINE_CDM_MIN_GLIBC_VERSION)
|
||||
Version glibc_version(gnu_get_libc_version());
|
||||
DCHECK(glibc_version.IsValid());
|
||||
if (glibc_version.IsOlderThan(WIDEVINE_CDM_MIN_GLIBC_VERSION))
|
||||
if (glibc_version < base::Version(WIDEVINE_CDM_MIN_GLIBC_VERSION))
|
||||
return;
|
||||
#endif // defined(WIDEVINE_CDM_MIN_GLIBC_VERSION)
|
||||
|
||||
|
@ -120,10 +236,12 @@ static void AddPepperBasedWidevine(
|
|||
#if defined(USE_PROPRIETARY_CODECS)
|
||||
if (codecs[i] == kCdmSupportedCodecAvc1)
|
||||
supported_codecs |= media::EME_CODEC_MP4_AVC1;
|
||||
if (codecs[i] == kCdmSupportedCodecVp9)
|
||||
supported_codecs |= media::EME_CODEC_MP4_VP9;
|
||||
#endif // defined(USE_PROPRIETARY_CODECS)
|
||||
}
|
||||
|
||||
cdm::AddWidevineWithCodecs(
|
||||
concrete_key_systems->emplace_back(new cdm::WidevineKeySystemProperties(
|
||||
supported_codecs,
|
||||
#if defined(OS_CHROMEOS)
|
||||
media::EmeRobustness::HW_SECURE_ALL, // Maximum audio robustness.
|
||||
|
@ -131,27 +249,29 @@ static void AddPepperBasedWidevine(
|
|||
media::EmeSessionTypeSupport::
|
||||
SUPPORTED_WITH_IDENTIFIER, // Persistent-license.
|
||||
media::EmeSessionTypeSupport::
|
||||
NOT_SUPPORTED, // Persistent-release-message.
|
||||
media::EmeFeatureSupport::REQUESTABLE, // Persistent state.
|
||||
media::EmeFeatureSupport::REQUESTABLE, // Distinctive identifier.
|
||||
NOT_SUPPORTED, // Persistent-release-message.
|
||||
media::EmeFeatureSupport::REQUESTABLE, // Persistent state.
|
||||
media::EmeFeatureSupport::REQUESTABLE)); // Distinctive identifier.
|
||||
#else // (Desktop)
|
||||
media::EmeRobustness::SW_SECURE_CRYPTO, // Maximum audio robustness.
|
||||
media::EmeRobustness::SW_SECURE_DECODE, // Maximum video robustness.
|
||||
media::EmeSessionTypeSupport::NOT_SUPPORTED, // persistent-license.
|
||||
media::EmeSessionTypeSupport::
|
||||
NOT_SUPPORTED, // persistent-release-message.
|
||||
media::EmeFeatureSupport::REQUESTABLE, // Persistent state.
|
||||
media::EmeFeatureSupport::NOT_SUPPORTED, // Distinctive identifier.
|
||||
NOT_SUPPORTED, // persistent-release-message.
|
||||
media::EmeFeatureSupport::REQUESTABLE, // Persistent state.
|
||||
media::EmeFeatureSupport::NOT_SUPPORTED)); // Distinctive identifier.
|
||||
#endif // defined(OS_CHROMEOS)
|
||||
concrete_key_systems);
|
||||
}
|
||||
#endif // defined(WIDEVINE_CDM_AVAILABLE)
|
||||
#endif // defined(ENABLE_PEPPER_CDMS)
|
||||
|
||||
void AddChromeKeySystems(std::vector<KeySystemInfo>* key_systems_info) {
|
||||
void AddChromeKeySystems(
|
||||
std::vector<std::unique_ptr<KeySystemProperties>>* key_systems_properties) {
|
||||
#if defined(ENABLE_PEPPER_CDMS)
|
||||
AddExternalClearKey(key_systems_properties);
|
||||
|
||||
#if defined(WIDEVINE_CDM_AVAILABLE)
|
||||
AddPepperBasedWidevine(key_systems_info);
|
||||
AddPepperBasedWidevine(key_systems_properties);
|
||||
#endif // defined(WIDEVINE_CDM_AVAILABLE)
|
||||
#endif // defined(ENABLE_PEPPER_CDMS)
|
||||
}
|
||||
|
|
|
@ -5,10 +5,16 @@
|
|||
#ifndef CHROME_RENDERER_MEDIA_CHROME_KEY_SYSTEMS_H_
|
||||
#define CHROME_RENDERER_MEDIA_CHROME_KEY_SYSTEMS_H_
|
||||
|
||||
#include <memory>
|
||||
#include <vector>
|
||||
|
||||
#include "media/base/key_system_info.h"
|
||||
namespace media {
|
||||
class KeySystemProperties;
|
||||
}
|
||||
|
||||
void AddChromeKeySystems(std::vector<media::KeySystemInfo>* key_systems_info);
|
||||
// Register the key systems supported by populating |key_systems_properties|.
|
||||
void AddChromeKeySystems(
|
||||
std::vector<std::unique_ptr<media::KeySystemProperties>>*
|
||||
key_systems_properties);
|
||||
|
||||
#endif // CHROME_RENDERER_MEDIA_CHROME_KEY_SYSTEMS_H_
|
||||
|
|
|
@ -4,7 +4,8 @@
|
|||
|
||||
#include "chrome/renderer/pepper/pepper_shared_memory_message_filter.h"
|
||||
|
||||
#include "base/memory/scoped_ptr.h"
|
||||
#include <memory>
|
||||
|
||||
#include "base/memory/shared_memory.h"
|
||||
#include "base/process/process_handle.h"
|
||||
#include "content/public/common/content_client.h"
|
||||
|
|
|
@ -5,11 +5,11 @@
|
|||
#ifndef CHROME_RENDERER_PRINTING_PRINT_WEB_VIEW_HELPER_H_
|
||||
#define CHROME_RENDERER_PRINTING_PRINT_WEB_VIEW_HELPER_H_
|
||||
|
||||
#include <memory>
|
||||
#include <vector>
|
||||
|
||||
#include "base/callback.h"
|
||||
#include "base/gtest_prod_util.h"
|
||||
#include "base/memory/scoped_ptr.h"
|
||||
#include "base/memory/shared_memory.h"
|
||||
#include "base/memory/weak_ptr.h"
|
||||
#include "base/time/time.h"
|
||||
|
|
|
@ -4,8 +4,9 @@
|
|||
|
||||
#include "chrome/renderer/printing/print_web_view_helper.h"
|
||||
|
||||
#include <memory>
|
||||
|
||||
#include "base/logging.h"
|
||||
#include "base/memory/scoped_ptr.h"
|
||||
#include "chrome/common/print_messages.h"
|
||||
#include "content/public/renderer/render_thread.h"
|
||||
#include "printing/metafile_skia_wrapper.h"
|
||||
|
|
|
@ -4,8 +4,9 @@
|
|||
|
||||
#include "chrome/renderer/printing/print_web_view_helper.h"
|
||||
|
||||
#include <memory>
|
||||
|
||||
#include "base/logging.h"
|
||||
#include "base/memory/scoped_ptr.h"
|
||||
#include "base/process/process_handle.h"
|
||||
#include "chrome/common/print_messages.h"
|
||||
#include "content/public/renderer/render_thread.h"
|
||||
|
|
|
@ -9,10 +9,10 @@
|
|||
#ifndef CHROME_RENDERER_SPELLCHECKER_SPELLCHECK_WORDITERATOR_H_
|
||||
#define CHROME_RENDERER_SPELLCHECKER_SPELLCHECK_WORDITERATOR_H_
|
||||
|
||||
#include <memory>
|
||||
#include <string>
|
||||
|
||||
#include "base/macros.h"
|
||||
#include "base/memory/scoped_ptr.h"
|
||||
#include "base/strings/string16.h"
|
||||
#include "third_party/icu/source/common/unicode/uscript.h"
|
||||
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
#include <vector>
|
||||
|
||||
#include "base/containers/hash_tables.h"
|
||||
#include "content/public/renderer/render_process_observer.h"
|
||||
#include "content/public/renderer/render_thread_observer.h"
|
||||
#include "third_party/WebKit/public/platform/WebSpeechSynthesizer.h"
|
||||
#include "third_party/WebKit/public/platform/WebSpeechSynthesizerClient.h"
|
||||
|
||||
|
@ -27,7 +27,7 @@ struct TtsVoice;
|
|||
// the utterance id (which is globally unique) matches.
|
||||
class TtsDispatcher
|
||||
: public blink::WebSpeechSynthesizer,
|
||||
public content::RenderProcessObserver {
|
||||
public content::RenderThreadObserver {
|
||||
public:
|
||||
explicit TtsDispatcher(blink::WebSpeechSynthesizerClient* client);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue