Commit d1df6533 authored by Hirokazu Honda's avatar Hirokazu Honda Committed by Commit Bot

Revert "Vaapi: Activate |decode_using_client_picture_buffers_| for h264"

This reverts commit f0e7045f.

Reason for revert: Power regression on eve crbug.com/910986

Original change's description:
> Vaapi: Activate |decode_using_client_picture_buffers_| for h264
> 
> This CL cleans up and activates |decode_using_client_picture_buffers_|
> after recent power consumption measurements done by the Intel folks
> reveal that there should be no regression, and also because skipping
> the Vpp has a huge impact in memory consumption since Va doesn't need
> to allocate ~13/14 Buffer Objects inside (see crbug.com/909926).
> 
> Bug: 909926, 822346
> Change-Id: Ie8d6b41521f5d8ee62568f9674ae071a67c290bf
> Reviewed-on: https://chromium-review.googlesource.com/c/1356019
> Reviewed-by: Hirokazu Honda <hiroh@chromium.org>
> Commit-Queue: Miguel Casas <mcasas@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#612498}

TBR=mcasas@chromium.org,hiroh@chromium.org,sreerenj.balachandran@intel.com

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 909926, 822346 910986
Change-Id: I1cb5d54064413d27cd3472e9918c5fcd62385a1c
Reviewed-on: https://chromium-review.googlesource.com/c/1358099Reviewed-by: default avatarHirokazu Honda <hiroh@chromium.org>
Commit-Queue: Hirokazu Honda <hiroh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#612996}
parent f076c747
......@@ -92,16 +92,6 @@ bool IsGeminiLakeOrLater() {
cpuid.model() >= kGeminiLakeModelId;
return is_geminilake_or_later;
}
// Decides if the current platform and profile may decode using the client's
// PictureBuffers, or engage the Vpp to adapt VaApi's and the client's format.
bool ShouldDecodeOnclientPictureBuffers(bool has_va_surface_ids,
VideoCodecProfile profile) {
return has_va_surface_ids && (IsKabyLakeOrLater() || IsGeminiLakeOrLater()) &&
(profile == VP9PROFILE_PROFILE0 ||
(profile >= H264PROFILE_BASELINE && profile <= H264PROFILE_HIGH));
}
} // namespace
#define RETURN_AND_NOTIFY_ON_FAILURE(result, log, error_code, ret) \
......@@ -644,7 +634,9 @@ void VaapiVideoDecodeAccelerator::AssignPictureBuffers(
}
decode_using_client_picture_buffers_ =
ShouldDecodeOnclientPictureBuffers(!va_surface_ids.empty(), profile_);
!va_surface_ids.empty() &&
(IsKabyLakeOrLater() || IsGeminiLakeOrLater()) &&
profile_ == VP9PROFILE_PROFILE0;
// If we have some |va_surface_ids|, use them for decode, otherwise ask
// |vaapi_wrapper_| to allocate them for us.
......
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