diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-09-15 17:08:33 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-11-28 13:32:48 +0100 |
commit | 2d002e42a8b6e711e3c9ca5b6dd3611e9d8426ab (patch) | |
tree | 2da22e8e37770c245be1f72f1c454a9c798b8db4 /src/core/renderer/content_renderer_client_qt.cpp | |
parent | 4aa1690516fe76630a7cbb4816f56f0da081c596 (diff) |
Adaptations for 104-based
Change-Id: Ieb44b5c98b3342adca38916d8b77c54e8ed8e1d7
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'src/core/renderer/content_renderer_client_qt.cpp')
-rw-r--r-- | src/core/renderer/content_renderer_client_qt.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/core/renderer/content_renderer_client_qt.cpp b/src/core/renderer/content_renderer_client_qt.cpp index 600b23f4b..cdb4fdf12 100644 --- a/src/core/renderer/content_renderer_client_qt.cpp +++ b/src/core/renderer/content_renderer_client_qt.cpp @@ -499,7 +499,7 @@ media::SupportedCodecs GetVP9Codecs(const std::vector<media::VideoCodecProfile> } #if BUILDFLAG(ENABLE_PLATFORM_HEVC) -SupportedCodecs GetHevcCodecs(const std::vector<media::VideoCodecProfile> &profiles) +media::SupportedCodecs GetHevcCodecs(const base::flat_set<media::VideoCodecProfile> &profiles) { // If no profiles are specified, then all are supported. if (profiles.empty()) { @@ -592,6 +592,8 @@ static void AddWidevine(const media::mojom::KeySystemCapabilityPtr &capability, media::SupportedCodecs hw_secure_codecs = media::EME_CODEC_NONE; base::flat_set<media::EncryptionScheme> encryption_schemes; base::flat_set<media::EncryptionScheme> hw_secure_encryption_schemes; + base::flat_set<media::CdmSessionType> session_types; + base::flat_set<media::CdmSessionType> hw_secure_session_types; if (capability->sw_secure_capability) { codecs = GetSupportedCodecs(capability->sw_secure_capability.value(), /*is_secure=*/false); encryption_schemes = capability->sw_secure_capability->encryption_schemes; @@ -620,16 +622,16 @@ static void AddWidevine(const media::mojom::KeySystemCapabilityPtr &capability, max_video_robustness = Robustness::HW_SECURE_ALL; } - auto persistent_license_support = media::EmeSessionTypeSupport::NOT_SUPPORTED; - // Others. auto persistent_state_support = media::EmeFeatureSupport::REQUESTABLE; auto distinctive_identifier_support = media::EmeFeatureSupport::NOT_SUPPORTED; key_systems->emplace_back(new cdm::WidevineKeySystemProperties( - codecs, encryption_schemes, hw_secure_codecs, - hw_secure_encryption_schemes, max_audio_robustness, max_video_robustness, - persistent_license_support, persistent_state_support, + codecs, std::move(encryption_schemes), std::move(session_types), + hw_secure_codecs, std::move(hw_secure_encryption_schemes), + std::move(hw_secure_session_types), + max_audio_robustness, max_video_robustness, + persistent_state_support, distinctive_identifier_support)); } #endif // BUILDFLAG(ENABLE_WIDEVINE) |