Commit bd4386f5 authored by Miguel Casas's avatar Miguel Casas Committed by Commit Bot

VaapiPictureFactory: correct DCHECK

crrev.com/c/1100535 landed a DCHECK that does not verify from ARC++,


[1814:1814:0619/160631.868318:FATAL:vaapi_picture_factory.cc(48)] Check failed: picture_buffer.texture_target() == GetGLTextureTarget() (0 vs. 36197)
#0 0x59c50521b4dc base::debug::StackTrace::StackTrace()
#1 0x59c50518f620 logging::LogMessage::~LogMessage()
#2 0x59c5026cc721 media::VaapiPictureFactory::Create()
#3 0x59c5026d2a94 media::VaapiVideoDecodeAccelerator::AssignPictureBuffers()
#4 0x59c506967623 arc::GpuArcVideoDecodeAccelerator::AssignPictureBuffers()
#5 0x59c50269c433 arc::mojom::VideoDecodeAcceleratorStubDispatch::Accept()
...

This CL corrects it.

Bug: 822346
Test: YT App playing back correctly with dcheck_always_on=true on nautilus.
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
Change-Id: Icff42847518df24dcc38998acdc2903e7928469f
Reviewed-on: https://chromium-review.googlesource.com/1106670Reviewed-by: default avatarHirokazu Honda <hiroh@chromium.org>
Commit-Queue: Miguel Casas <mcasas@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568703}
parent 63b70443
......@@ -45,7 +45,9 @@ std::unique_ptr<VaapiPicture> VaapiPictureFactory::Create(
const MakeGLContextCurrentCallback& make_context_current_cb,
const BindGLImageCallback& bind_image_cb,
const PictureBuffer& picture_buffer) {
DCHECK_EQ(picture_buffer.texture_target(), GetGLTextureTarget());
// ARC++ sends |picture_buffer| with no texture_target().
DCHECK(picture_buffer.texture_target() == GetGLTextureTarget() ||
picture_buffer.texture_target() == 0u);
// |client_texture_ids| and |service_texture_ids| are empty from ARC++.
const uint32_t client_texture_id =
......
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