Commit 06359cf6 authored by Miguel Casas's avatar Miguel Casas Committed by Commit Bot

media/vaapi: do not enumerate VP9 Profile 2 as supported in VaVDA

VaapiWrapper enumerates VP9 Profile 2 where available because decoding
this profile is supported by the new direct VideoDecoder [1] (VaVD).
This makes it available to the legacy VideoDecodeAccelerator (VaVDA),
which we don't want (for unrelated reasons), but in particular this
crashes zork (AMD Picasso), so let's just remove it.

[1] tinyurl.com/chromeos-video-decoders

Test: tast run video.Play.vp9_2_hw: with ToT legacy VideoDecoder,
it crashes (info in dmesg: https://pastebin.com/5qu14NMv), with the
patch, it falls back to sw decoding as expected.

Bug: b:162496990
Change-Id: Ie6fc3aed91c0a542cf3d418798780bd3e930cd42
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2329911
Auto-Submit: Miguel Casas <mcasas@chromium.org>
Commit-Queue: Jao-ke Chin-Lee <jchinlee@chromium.org>
Reviewed-by: default avatarJao-ke Chin-Lee <jchinlee@chromium.org>
Cr-Commit-Position: refs/heads/master@{#793357}
parent c4338a62
......@@ -1159,7 +1159,13 @@ void VaapiVideoDecodeAccelerator::RecycleVASurface(
// static
VideoDecodeAccelerator::SupportedProfiles
VaapiVideoDecodeAccelerator::GetSupportedProfiles() {
return VaapiWrapper::GetSupportedDecodeProfiles();
VideoDecodeAccelerator::SupportedProfiles profiles =
VaapiWrapper::GetSupportedDecodeProfiles();
// VaVDA never supported VP9 Profile 2, but VaapiWrapper does. Filter it out.
base::EraseIf(profiles, [](const auto& profile) {
return profile.profile == VP9PROFILE_PROFILE2;
});
return profiles;
}
VaapiVideoDecodeAccelerator::BufferAllocationMode
......
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