0

Clean up GlobalVaapiLock enablement

Follow-up CL to crrev/c/3339096 for some post-submission comments.

Bug: b:182008564
Change-Id: I3157b08305bebb6ecb05115ec94e9c555c52699b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3365989
Reviewed-by: Andres Calderon Jaramillo <andrescj@chromium.org>
Commit-Queue: Andres Calderon Jaramillo <andrescj@chromium.org>
Cr-Commit-Position: refs/heads/main@{#955487}
This commit is contained in:
Jeff Chen
2022-01-05 01:05:06 +00:00
committed by Chromium LUCI CQ
parent cbaead3ac9
commit 72246b324f
4 changed files with 21 additions and 21 deletions

@ -86,29 +86,29 @@ Multiple command line arguments can be given to the command:
-v enable verbose mode, e.g. -v=2.
--vmodule enable verbose mode for the specified module,
e.g. --vmodule=*media/gpu*=2.
e.g. --vmodule=*media/gpu*=2.
--output_folder overwrite the output folder used to store
performance metrics, if not specified results
will be stored in the current working directory.
performance metrics, if not specified results
will be stored in the current working directory.
--use-legacy use the legacy VDA-based video decoders.
--use_vd use the new VD-based video decoders.
(enabled by default)
(enabled by default)
--use_vd_vda use the new VD-based video decoders with a
wrapper that translates to the VDA interface,
used to test interaction with older components
expecting the VDA interface.
wrapper that translates to the VDA interface,
used to test interaction with older components
expecting the VDA interface.
--linear_output use linear buffers as the final output of the
decoder which may require the use of an image
processor internally. This flag only works in
conjunction with --use_vd_vda.
Disabled by default.
--disable_vaapi_lock disable the global VA-API wrapper lock if applicable,
i.e., only on devices that use the VA-API with a libva
backend that's known to be thread-safe and only in
portions of the Chrome stack that should be able to
deal with the absence of the lock
(not the VaapiVideoDecodeAccelerator).
decoder which may require the use of an image
processor internally. This flag only works in
conjunction with --use_vd_vda.
Disabled by default.
--disable_vaapi_lock disable the global VA-API lock if applicable,
i.e., only on devices that use the VA-API with a libva
backend that's known to be thread-safe and only in
portions of the Chrome stack that should be able to
deal with the absence of the lock
(not the VaapiVideoDecodeAccelerator).
--gtest_help display the gtest help and exit.
--help display this help and exit.

@ -58,11 +58,11 @@ decoded frames. These frame checksums can be generated using ffmpeg, e.g.:
## Command line options
Multiple command line arguments can be given to the command:
-v enable verbose mode, e.g. -v=2.
-v enable verbose mode, e.g. -v=2.
--vmodule enable verbose mode for the specified module,
e.g. --vmodule=*media/gpu*=2.
--validator_type validate decoded frames, possible values are
--validator_type validate decoded frames, possible values are
md5 (default, compare against md5hash of expected
frames), ssim (compute SSIM against expected
frames, currently allowed for AV1 streams only)

@ -173,7 +173,7 @@ VideoEncoderTestEnvironment* VideoEncoderTestEnvironment::Create(
media::kVaapiEnforceVideoMinMaxResolution);
#endif
#if BUILDFLAG(IS_CHROMEOS_ASH) && defined(ARCH_CPU_X86_FAMILY)
#if BUILDFLAG(IS_CHROMEOS_ASH) && BUILDFLAG(USE_VAAPI)
// TODO(crbug.com/1186051): remove once enabled by default.
combined_enabled_features.push_back(media::kVaapiVp9kSVCHWEncoding);
#endif

@ -47,7 +47,7 @@ constexpr const char* usage_msg =
[--output_folder=<filepath>] [--output_limit=<number>]
[--disable_vaapi_lock]
[-v=<level>] [--vmodule=<config>]
[--gtest_help] [--help]
[--gtest_help] [--help]
[<video path>] [<video metadata path>]
)";