Commit c13484a6 authored by Miguel Casas's avatar Miguel Casas Committed by Commit Bot

media/gpu/vaapi: un-comment VP9.2,3 in vaapi_unittest.cc

crrev.com/c/2226774 enabled VP9 Profile 2 and 3 Hw decoding on VA-API
platforms supporting it, e.g. kohaku, but forgot to update the unittest,
provoking sadness in the ChromeOS CQ. This CL fixes that.

Test: Verified locally building and deploying vaapi_unittest on kohaku.

Bug: 911754, 1091786
Change-Id: I902026b2a1ed38595efb80c42979082c8e348acb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2233580Reviewed-by: default avatarAndres Calderon Jaramillo <andrescj@chromium.org>
Commit-Queue: Miguel Casas <mcasas@chromium.org>
Cr-Commit-Position: refs/heads/master@{#775769}
parent 6c0e20ae
...@@ -34,10 +34,8 @@ base::Optional<VAProfile> ConvertToVAProfile(VideoCodecProfile profile) { ...@@ -34,10 +34,8 @@ base::Optional<VAProfile> ConvertToVAProfile(VideoCodecProfile profile) {
{VP8PROFILE_ANY, VAProfileVP8Version0_3}, {VP8PROFILE_ANY, VAProfileVP8Version0_3},
{VP9PROFILE_PROFILE0, VAProfileVP9Profile0}, {VP9PROFILE_PROFILE0, VAProfileVP9Profile0},
{VP9PROFILE_PROFILE1, VAProfileVP9Profile1}, {VP9PROFILE_PROFILE1, VAProfileVP9Profile1},
// TODO(crbug.com/1011454, crbug.com/1011469): Reenable {VP9PROFILE_PROFILE2, VAProfileVP9Profile2},
// VP9PROFILE_PROFILE2 and _PROFILE3 when P010 is completely supported. {VP9PROFILE_PROFILE3, VAProfileVP9Profile3},
//{VP9PROFILE_PROFILE2, VAProfileVP9Profile2},
//{VP9PROFILE_PROFILE3, VAProfileVP9Profile3},
}; };
auto it = kProfileMap.find(profile); auto it = kProfileMap.find(profile);
return it != kProfileMap.end() ? base::make_optional<VAProfile>(it->second) return it != kProfileMap.end() ? base::make_optional<VAProfile>(it->second)
...@@ -56,10 +54,8 @@ base::Optional<VAProfile> StringToVAProfile(const std::string& va_profile) { ...@@ -56,10 +54,8 @@ base::Optional<VAProfile> StringToVAProfile(const std::string& va_profile) {
{"VAProfileVP8Version0_3", VAProfileVP8Version0_3}, {"VAProfileVP8Version0_3", VAProfileVP8Version0_3},
{"VAProfileVP9Profile0", VAProfileVP9Profile0}, {"VAProfileVP9Profile0", VAProfileVP9Profile0},
{"VAProfileVP9Profile1", VAProfileVP9Profile1}, {"VAProfileVP9Profile1", VAProfileVP9Profile1},
// TODO(crbug.com/1011454, crbug.com/1011469): Reenable {"VAProfileVP9Profile2", VAProfileVP9Profile2},
// VP9PROFILE_PROFILE2 and _PROFILE3 when P010 is completely supported. {"VAProfileVP9Profile3", VAProfileVP9Profile3},
// {"VAProfileVP9Profile2", VAProfileVP9Profile2},
// {"VAProfileVP9Profile3", VAProfileVP9Profile3},
}; };
auto it = kStringToVAProfile.find(va_profile); auto it = kStringToVAProfile.find(va_profile);
......
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