Commit 7642df82 authored by Xiaohan Wang's avatar Xiaohan Wang Committed by Commit Bot

media: Check CENC-v3 in GetWidevineHardwareCaps()

This CL checks CENC-v3 instead of CENC-v1. See Bug for more details.

Bug: 899984
Test: Tested manually.
Change-Id: I860ebae0657f76af91e7346524fdbb8b16f42f89
Reviewed-on: https://chromium-review.googlesource.com/c/1306635Reviewed-by: default avatarRintaro Kuroiwa <rkuroiwa@chromium.org>
Commit-Queue: Xiaohan Wang <xhwang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#603690}
parent 6fff7d80
......@@ -114,14 +114,16 @@ void GetWidevineHardwareCaps(
return;
}
// There are contents encrypted with kCencVersion1 out there. Therefore we
// require kCencVersion1 to declare "cenc" support.
if (!capability.test(IntelWidevineCaps::kCencVersion1)) {
DVLOG(1) << "CENC version 1 not supported";
// Query for CENC.
// TODO(crbug.com/899984): There are contents encrypted with kCencVersion1 out
// there, so this check is not sufficient. Update this to check kCencVersion1.
if (!capability.test(IntelWidevineCaps::kCencVersion3)) {
DVLOG(1) << "CENC version 3 not supported";
return;
}
DVLOG(1) << "Widevine hardware secure H264/CENC decryption supported";
DVLOG(1) << "Widevine hardware secure H264 CENC-v3 decryption supported. "
"CENC-v1 playback may fail!";
video_codecs->insert(media::VideoCodec::kCodecH264);
encryption_schemes->insert(media::EncryptionMode::kCenc);
}
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