Commit da7efff1 authored by Jeffrey Kardatzke's avatar Jeffrey Kardatzke Committed by Chromium LUCI CQ

vaapi: Fix encryption types used for protected content

This is done to match changes Intel is making in the driver which will
be merged shortly.

BUG=b:153111783,b:155508443
TEST=CBC HEVC/AVC, CENCv1 AVC, CENCv3 VP9/AVC/HEVC work

Change-Id: I45b4c7d1399040baebdf47aa31f06f6ea502445f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2625772Reviewed-by: default avatarJao-ke Chin-Lee <jchinlee@chromium.org>
Commit-Queue: Jeffrey Kardatzke <jkardatzke@google.com>
Cr-Commit-Position: refs/heads/master@{#842810}
parent 0aa42de3
......@@ -795,7 +795,7 @@ bool GetRequiredAttribs(const base::Lock* va_lock,
#if BUILDFLAG(IS_CHROMEOS_ASH)
if (mode == VaapiWrapper::kDecodeProtected && profile != VAProfileProtected) {
required_attribs->push_back(
{VAConfigAttribEncryption, VA_ENCRYPTION_TYPE_CENC_CTR});
{VAConfigAttribEncryption, VA_ENCRYPTION_TYPE_CTR_128});
}
#endif
......@@ -2591,8 +2591,8 @@ bool VaapiWrapper::Initialize(CodecMode mode,
for (auto& attrib : required_attribs) {
if (attrib.type == VAConfigAttribEncryption) {
attrib.value = (encryption_scheme == EncryptionScheme::kCbcs)
? VA_ENCRYPTION_TYPE_CENC_CBC
: VA_ENCRYPTION_TYPE_CENC_CTR;
? VA_ENCRYPTION_TYPE_CBC
: VA_ENCRYPTION_TYPE_CTR_128;
}
}
}
......
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