Commit 54f7608f authored by Hirokazu Honda's avatar Hirokazu Honda Committed by Chromium LUCI CQ

media/gpu/vaapi/VaapiUnittest: Enable AV1Decoder in the test

This CL enables AV1Decoder feature during VaapiUnittest so that
it can confirm av1 decode capability.

Bug: b:175895251
Test: vaapi_unittest on volteer
Change-Id: Id2aa79a1e02c19c337e946306c984f6018d159e5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2612549
Commit-Queue: Hirokazu Honda <hiroh@chromium.org>
Reviewed-by: default avatarAndres Calderon Jaramillo <andrescj@chromium.org>
Cr-Commit-Position: refs/heads/master@{#841379}
parent ccbe5c4d
...@@ -22,9 +22,11 @@ ...@@ -22,9 +22,11 @@
#include "base/strings/pattern.h" #include "base/strings/pattern.h"
#include "base/strings/string_split.h" #include "base/strings/string_split.h"
#include "base/test/launcher/unit_test_launcher.h" #include "base/test/launcher/unit_test_launcher.h"
#include "base/test/scoped_feature_list.h"
#include "base/test/test_suite.h" #include "base/test/test_suite.h"
#include "build/chromeos_buildflags.h" #include "build/chromeos_buildflags.h"
#include "gpu/config/gpu_driver_bug_workarounds.h" #include "gpu/config/gpu_driver_bug_workarounds.h"
#include "media/base/media_switches.h"
#include "media/gpu/vaapi/vaapi_wrapper.h" #include "media/gpu/vaapi/vaapi_wrapper.h"
#include "media/media_buildflags.h" #include "media/media_buildflags.h"
...@@ -104,12 +106,23 @@ base::Optional<VAEntrypoint> StringToVAEntrypoint( ...@@ -104,12 +106,23 @@ base::Optional<VAEntrypoint> StringToVAEntrypoint(
? base::make_optional<VAEntrypoint>(it->second) ? base::make_optional<VAEntrypoint>(it->second)
: base::nullopt; : base::nullopt;
} }
std::unique_ptr<base::test::ScopedFeatureList> CreateScopedFeatureList() {
auto scoped_feature_list = std::make_unique<base::test::ScopedFeatureList>();
scoped_feature_list->InitWithFeatures(
/*enabled_features=*/{media::kVaapiAV1Decoder},
/*disabled_features=*/{});
return scoped_feature_list;
}
} // namespace } // namespace
class VaapiTest : public testing::Test { class VaapiTest : public testing::Test {
public: public:
VaapiTest() = default; VaapiTest() : scoped_feature_list_(CreateScopedFeatureList()) {}
~VaapiTest() override = default; ~VaapiTest() override = default;
private:
std::unique_ptr<base::test::ScopedFeatureList> scoped_feature_list_;
}; };
std::map<VAProfile, std::vector<VAEntrypoint>> ParseVainfo( std::map<VAProfile, std::vector<VAEntrypoint>> ParseVainfo(
...@@ -334,10 +347,16 @@ TEST_F(VaapiTest, LowQualityEncodingSetting) { ...@@ -334,10 +347,16 @@ TEST_F(VaapiTest, LowQualityEncodingSetting) {
int main(int argc, char** argv) { int main(int argc, char** argv) {
base::TestSuite test_suite(argc, argv); base::TestSuite test_suite(argc, argv);
{
// PreSandboxInitialization() loads and opens the driver, queries its // Enables/Disables features during PreSandboxInitialization(). We have to
// capabilities and fills in the VASupportedProfiles. // destruct ScopedFeatureList after it because base::TestSuite::Run()
media::VaapiWrapper::PreSandboxInitialization(); // creates a ScopedFeatureList and multiple concurrent ScopedFeatureLists
// are not allowed.
auto scoped_feature_list = media::CreateScopedFeatureList();
// PreSandboxInitialization() loads and opens the driver, queries its
// capabilities and fills in the VASupportedProfiles.
media::VaapiWrapper::PreSandboxInitialization();
}
return base::LaunchUnitTests( return base::LaunchUnitTests(
argc, argv, argc, argv,
......
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