Commit 42cfbdc3 authored by Vasiliy Telezhnikov's avatar Vasiliy Telezhnikov Committed by Commit Bot

Revert "Add debug DumpWithoutCrashing to SurfaceTexture transform"

This reverts commit 2c0e0255.

Reason for revert: Necessary debug info was collected.

Original change's description:
> Add debug DumpWithoutCrashing to SurfaceTexture transform
> 
> This CL adds some debug checks to help debug crashes later on when
> creation of VideoFrame failed in VideoFrameFactoryImpl or
> StreamTextureWrapperImpl.
> 
> Bug: 1081695
> Change-Id: Ib612675066443fe01c0e897240203507cf5d9f39
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2214903
> Commit-Queue: Vasiliy Telezhnikov <vasilyt@chromium.org>
> Reviewed-by: Jonathan Backer <backer@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#771655}

TBR=backer@chromium.org,vasilyt@chromium.org

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

Bug: 1081695
Change-Id: I7409ef7a3788a0ccc198e956c5b51174b8c6ec3b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2219089Reviewed-by: default avatarVasiliy Telezhnikov <vasilyt@chromium.org>
Commit-Queue: Vasiliy Telezhnikov <vasilyt@chromium.org>
Cr-Commit-Position: refs/heads/master@{#772429}
parent 383faa4a
......@@ -9,9 +9,6 @@
#include "base/android/scoped_hardware_buffer_fence_sync.h"
#include "base/bind.h"
#include "base/check_op.h"
#include "base/debug/alias.h"
#include "base/debug/crash_logging.h"
#include "base/debug/dump_without_crashing.h"
#include "base/memory/ptr_util.h"
#include "base/metrics/histogram_macros.h"
#include "base/notreached.h"
......@@ -127,45 +124,6 @@ void SurfaceTextureGLOwner::GetCodedSizeAndVisibleRect(
surface_texture_->GetTransformMatrix(mtx);
DecomposeTransform(mtx, rotated_visible_size, coded_size, visible_rect);
// TODO(https://crbug.com/1081695): This is to debug crash when we fail to
// create video frame later.
{
gfx::Size coded_size_for_debug = *coded_size;
gfx::Rect visible_rect_for_debug = *visible_rect;
base::debug::Alias(mtx);
base::debug::Alias(&coded_size_for_debug);
base::debug::Alias(&visible_rect_for_debug);
// This is copy paste of VideoFrame::IsValidConfig, we'are not allowed to
// include media/base here and need this code only for debug.
constexpr int kMaxDimension = (1 << 15) - 1;
constexpr int kMaxCanvas = (1 << (14 * 2));
int coded_size_area =
coded_size_for_debug.GetCheckedArea().ValueOrDefault(INT_MAX);
if (coded_size_area > kMaxCanvas ||
coded_size_for_debug.width() > kMaxDimension ||
coded_size_for_debug.height() > kMaxDimension ||
visible_rect_for_debug.x() < 0 || visible_rect_for_debug.y() < 0 ||
visible_rect_for_debug.right() > coded_size_for_debug.width() ||
visible_rect_for_debug.bottom() > coded_size_for_debug.height()) {
LOG(ERROR) << "Wrong matrix decomposition: coded: "
<< coded_size_for_debug.ToString()
<< "visible: " << visible_rect_for_debug.ToString()
<< "matrix: " << mtx[0] << ", " << mtx[1] << ", " << mtx[4]
<< ", " << mtx[5] << ", " << mtx[12] << ", " << mtx[13];
static auto* coded_size_str = base::debug::AllocateCrashKeyString(
"coded_size", base::debug::CrashKeySize::Size64);
static auto* visible_rect_str = base::debug::AllocateCrashKeyString(
"visible_rect", base::debug::CrashKeySize::Size256);
base::debug::SetCrashKeyString(coded_size_str,
coded_size_for_debug.ToString());
base::debug::SetCrashKeyString(visible_rect_str,
visible_rect_for_debug.ToString());
base::debug::DumpWithoutCrashing();
}
}
}
// static
......
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