diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-05-16 18:34:48 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-08-04 11:20:50 +0200 |
| commit | fae023b184f6c044e85f4ca6052c306d519e2e85 (patch) | |
| tree | 0c470f156e41fbe5d47782f34a3a8afc17ee3147 /src/core/content_client_qt.cpp | |
| parent | 38a6d268b09c49878b3a9b4819771f5c74925c35 (diff) | |
Adaptations for Chromium 100
Pick-to: 6.4
Change-Id: I217c87657f544a2e868de7291353ff1143e20902
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core/content_client_qt.cpp')
| -rw-r--r-- | src/core/content_client_qt.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/content_client_qt.cpp b/src/core/content_client_qt.cpp index 553e4b4c8..f0b89e2da 100644 --- a/src/core/content_client_qt.cpp +++ b/src/core/content_client_qt.cpp @@ -37,9 +37,9 @@ // File name of the CDM on different platforms. const char kWidevineCdmFileName[] = -#if defined(OS_MAC) +#if BUILDFLAG(IS_MAC) "widevinecdm.plugin"; -#elif defined(OS_WIN) +#elif BUILDFLAG(IS_WIN) "widevinecdm.dll"; #else // OS_LINUX, etc. "libwidevinecdm.so"; @@ -312,7 +312,7 @@ void ContentClientQt::AddContentDecryptionModules(std::vector<content::CdmInfo> const base::Version version; cdms->push_back(content::CdmInfo(kWidevineKeySystem, Robustness::kSoftwareSecure, std::move(capability), /*supports_sub_key_systems=*/false, kWidevineCdmDisplayName, - kWidevineCdmType, version, cdm_path, kWidevineCdmFileSystemId)); + kWidevineCdmType, version, cdm_path)); } #endif // defined(WIDEVINE_CDM_AVAILABLE_NOT_COMPONENT) @@ -343,13 +343,13 @@ void ContentClientQt::AddContentDecryptionModules(std::vector<content::CdmInfo> Robustness::kSoftwareSecure, capability, /*supports_sub_key_systems=*/false, media::kClearKeyCdmDisplayName, media::kClearKeyCdmDifferentCdmType, base::Version("0.1.0.0"), - clear_key_cdm_path, media::kClearKeyCdmFileSystemId)); + clear_key_cdm_path)); cdms->push_back(content::CdmInfo(kExternalClearKeyKeySystem, Robustness::kSoftwareSecure, capability, /*supports_sub_key_systems=*/true, media::kClearKeyCdmDisplayName, media::kClearKeyCdmType, base::Version("0.1.0.0"), - clear_key_cdm_path, media::kClearKeyCdmFileSystemId)); + clear_key_cdm_path)); } #endif // BUILDFLAG(ENABLE_LIBRARY_CDMS) } |