diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-23 18:26:28 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-09-22 08:47:19 +0000 |
| commit | c0419ae89fbc4fbdc58aef5b8b01ab0b45f8ff98 (patch) | |
| tree | d0bdc1f0ef144bb63ed75b8e6fcfb6f039628210 /src/core/renderer/content_renderer_client_qt.cpp | |
| parent | 1e89fa4226be870d97d3b21c6c7087886c81bbc5 (diff) | |
Adaptations for Chromium 68
Together-with: Tamas Zakor<ztamas@inf.u-szeged.hu>
Change-Id: I805246b6f01cb151fff48588744408c676d87c14
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'src/core/renderer/content_renderer_client_qt.cpp')
| -rw-r--r-- | src/core/renderer/content_renderer_client_qt.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/core/renderer/content_renderer_client_qt.cpp b/src/core/renderer/content_renderer_client_qt.cpp index e9f404cb1..0466bfeb4 100644 --- a/src/core/renderer/content_renderer_client_qt.cpp +++ b/src/core/renderer/content_renderer_client_qt.cpp @@ -311,9 +311,11 @@ static void AddExternalClearKey(std::vector<std::unique_ptr<media::KeySystemProp std::vector<media::VideoCodec> supported_video_codecs; bool supports_persistent_license; + std::vector<media::EncryptionMode> supported_encryption_schemes; if (!content::IsKeySystemSupported(kExternalClearKeyKeySystem, &supported_video_codecs, - &supports_persistent_license)) { + &supports_persistent_license, + &supported_encryption_schemes)) { return; } @@ -373,9 +375,11 @@ static void AddWidevine(std::vector<std::unique_ptr<media::KeySystemProperties>> { std::vector<media::VideoCodec> supported_video_codecs; bool supports_persistent_license = false; + std::vector<media::EncryptionMode> supported_encryption_schemes; if (!content::IsKeySystemSupported(kWidevineKeySystem, &supported_video_codecs, - &supports_persistent_license)) { + &supports_persistent_license, + &supported_encryption_schemes)) { DVLOG(1) << "Widevine CDM is not currently available."; return; } @@ -417,7 +421,7 @@ static void AddWidevine(std::vector<std::unique_ptr<media::KeySystemProperties>> using Robustness = cdm::WidevineKeySystemProperties::Robustness; concrete_key_systems->emplace_back(new cdm::WidevineKeySystemProperties( - supported_codecs, + supported_encryption_schemes, supported_codecs, Robustness::SW_SECURE_CRYPTO, // Maximum audio robustness. Robustness::SW_SECURE_DECODE, // Maximum video robustness. persistent_license_support, // persistent-license. |