Commit a506bffa authored by Sergey Ulanov's avatar Sergey Ulanov Committed by Commit Bot

[Fuchsia] Add audio codecs to HW-secure codecs set

Previously WidevineKeySystemProperties was initialized with
hw_secure_codecs containing only video codecs, which was preventing
playback on sites that require HW_SECURE_ALL robustness.

Bug: b/141148085, b/141251412
Change-Id: Ia2909e47fa844a50655047132bfa04cfe317c222
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1841744
Commit-Queue: Sergey Ulanov <sergeyu@chromium.org>
Auto-Submit: Sergey Ulanov <sergeyu@chromium.org>
Reviewed-by: default avatarYuchen Liu <yucliu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#703097}
parent 29a2ab29
...@@ -104,6 +104,11 @@ void WebEngineContentRendererClient::AddSupportedKeySystems( ...@@ -104,6 +104,11 @@ void WebEngineContentRendererClient::AddSupportedKeySystems(
supported_video_codecs |= media::EME_CODEC_AVC1; supported_video_codecs |= media::EME_CODEC_AVC1;
} }
media::SupportedCodecs supported_audio_codecs = media::EME_CODEC_AUDIO_ALL;
media::SupportedCodecs supported_codecs =
supported_video_codecs | supported_audio_codecs;
base::flat_set<media::EncryptionMode> encryption_schemes{ base::flat_set<media::EncryptionMode> encryption_schemes{
media::EncryptionMode::kCenc, media::EncryptionMode::kCbcs}; media::EncryptionMode::kCenc, media::EncryptionMode::kCbcs};
...@@ -111,10 +116,10 @@ void WebEngineContentRendererClient::AddSupportedKeySystems( ...@@ -111,10 +116,10 @@ void WebEngineContentRendererClient::AddSupportedKeySystems(
// Chromium. Hardware secured decoders are only available for supported // Chromium. Hardware secured decoders are only available for supported
// video codecs. // video codecs.
key_systems->emplace_back(new cdm::WidevineKeySystemProperties( key_systems->emplace_back(new cdm::WidevineKeySystemProperties(
media::EME_CODEC_AUDIO_ALL | supported_video_codecs, // codecs supported_codecs, // codecs
encryption_schemes, // encryption schemes encryption_schemes, // encryption schemes
supported_video_codecs, // hw secure codecs supported_codecs, // hw secure codecs
encryption_schemes, // hw secure encryption schemes encryption_schemes, // hw secure encryption schemes
cdm::WidevineKeySystemProperties::Robustness:: cdm::WidevineKeySystemProperties::Robustness::
HW_SECURE_CRYPTO, // max audio robustness HW_SECURE_CRYPTO, // max audio robustness
cdm::WidevineKeySystemProperties::Robustness:: cdm::WidevineKeySystemProperties::Robustness::
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment