Commit 9805ad98 authored by Miguel Casas's avatar Miguel Casas Committed by Commit Bot

media/gpu/vaapi_unittest: undo unintended changes by crrev.com/c/2292780

Said https://crrev.com/c/2292780 inadvertently restored VP9.1 and .3
entries in the test and removed a const. Having those profiles is
harmless but I expect it to be confusing, so let's remove them.

Bug: 1105103
Change-Id: I601edb3e9534cec12245058a10ad1f7b01aa8e0f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2300920
Auto-Submit: Miguel Casas <mcasas@chromium.org>
Commit-Queue: Andres Calderon Jaramillo <andrescj@chromium.org>
Reviewed-by: default avatarAndres Calderon Jaramillo <andrescj@chromium.org>
Cr-Commit-Position: refs/heads/master@{#788862}
parent fdf18312
...@@ -36,9 +36,7 @@ base::Optional<VAProfile> ConvertToVAProfile(VideoCodecProfile profile) { ...@@ -36,9 +36,7 @@ base::Optional<VAProfile> ConvertToVAProfile(VideoCodecProfile profile) {
{H264PROFILE_HIGH, VAProfileH264High}, {H264PROFILE_HIGH, VAProfileH264High},
{VP8PROFILE_ANY, VAProfileVP8Version0_3}, {VP8PROFILE_ANY, VAProfileVP8Version0_3},
{VP9PROFILE_PROFILE0, VAProfileVP9Profile0}, {VP9PROFILE_PROFILE0, VAProfileVP9Profile0},
{VP9PROFILE_PROFILE1, VAProfileVP9Profile1},
{VP9PROFILE_PROFILE2, VAProfileVP9Profile2}, {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)
...@@ -58,9 +56,7 @@ base::Optional<VAProfile> StringToVAProfile(const std::string& va_profile) { ...@@ -58,9 +56,7 @@ base::Optional<VAProfile> StringToVAProfile(const std::string& va_profile) {
{"VAProfileJPEGBaseline", VAProfileJPEGBaseline}, {"VAProfileJPEGBaseline", VAProfileJPEGBaseline},
{"VAProfileVP8Version0_3", VAProfileVP8Version0_3}, {"VAProfileVP8Version0_3", VAProfileVP8Version0_3},
{"VAProfileVP9Profile0", VAProfileVP9Profile0}, {"VAProfileVP9Profile0", VAProfileVP9Profile0},
{"VAProfileVP9Profile1", VAProfileVP9Profile1},
{"VAProfileVP9Profile2", VAProfileVP9Profile2}, {"VAProfileVP9Profile2", VAProfileVP9Profile2},
{"VAProfileVP9Profile3", VAProfileVP9Profile3},
}; };
auto it = kStringToVAProfile.find(va_profile); auto it = kStringToVAProfile.find(va_profile);
...@@ -184,7 +180,7 @@ TEST_F(VaapiTest, GetSupportedEncodeProfiles) { ...@@ -184,7 +180,7 @@ TEST_F(VaapiTest, GetSupportedEncodeProfiles) {
const auto va_info = RetrieveVAInfoOutput(); const auto va_info = RetrieveVAInfoOutput();
for (const auto& profile : VaapiWrapper::GetSupportedEncodeProfiles()) { for (const auto& profile : VaapiWrapper::GetSupportedEncodeProfiles()) {
auto va_profile = ConvertToVAProfile(profile.profile); const auto va_profile = ConvertToVAProfile(profile.profile);
ASSERT_TRUE(va_profile.has_value()); ASSERT_TRUE(va_profile.has_value());
EXPECT_TRUE(base::Contains(va_info.at(*va_profile), VAEntrypointEncSlice) || EXPECT_TRUE(base::Contains(va_info.at(*va_profile), VAEntrypointEncSlice) ||
......
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