Skip to content
This repository has been archived by the owner on Apr 3, 2020. It is now read-only.

Commit

Permalink
Don't report VAAPI failures for UMA for platforms that don't support it.
Browse files Browse the repository at this point in the history
On startup, VaapiWrapper::GetSupportedEncodeProfiles is
called to query HW encoder capabilities to fill GpuInfo
with. On VM test however there is no libva present, so we
error out, but also attempt to report an error to UMA,
which blocks and the GPU process gets killed by the GPU
watchdog.

We don't need to report failures on GetSupportedEncodeProfiles
however, as we will report them later when we attempt
to encode anyway.

BUG=402182
TEST=test lumpy under kvm and check chrome is not blocked by
GetSupportedEncodeProfiles
[email protected]

Review URL: https://codereview.chromium.org/613223002

Cr-Commit-Position: refs/heads/master@{#297564}
(cherry picked from commit 4505d0f)

Review URL: https://codereview.chromium.org/623613005

Cr-Commit-Position: refs/branch-heads/2171@{#25}
Cr-Branched-From: 267aeeb-refs/heads/master@{#297060}
  • Loading branch information
Wu-Cheng Li committed Oct 2, 2014
1 parent 5f3979e commit b294484
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion content/common/gpu/media/vaapi_video_encode_accelerator.cc
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ VaapiVideoEncodeAccelerator::GetSupportedProfiles() {

std::vector<media::VideoCodecProfile> hw_profiles =
VaapiWrapper::GetSupportedEncodeProfiles(
x_display_, base::Bind(&ReportToUMA, VAAPI_ERROR));
x_display_, base::Bind(&base::DoNothing));

media::VideoEncodeAccelerator::SupportedProfile profile;
profile.max_resolution.SetSize(1920, 1088);
Expand Down

0 comments on commit b294484

Please sign in to comment.