Commit e9dd9c5a authored by Dale Curtis's avatar Dale Curtis Committed by Commit Bot

Fix VideoFrame::HasTextures() DCHECK.

Wrapped frame should always take precedent and the DCHECK prevents
wrapping frames that have textures.

R=ccameron, sandersd

Bug: None
Test: Passes existing tests.
Change-Id: Ibfbc5b329918a9223699dc6b01187a3b283d126c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2466838
Commit-Queue: Dale Curtis <dalecurtis@chromium.org>
Commit-Queue: Dan Sanders <sandersd@chromium.org>
Auto-Submit: Dale Curtis <dalecurtis@chromium.org>
Reviewed-by: default avatarDan Sanders <sandersd@chromium.org>
Cr-Commit-Position: refs/heads/master@{#816398}
parent 2c5a1a06
......@@ -1102,12 +1102,9 @@ bool VideoFrame::IsMappable() const {
bool VideoFrame::HasTextures() const {
// A SharedImage can be turned into a texture, and so it counts as a texture
// in the context of this call.
if (mailbox_holders_[0].mailbox.IsSharedImage())
return true;
DCHECK(!wrapped_frame_ || !wrapped_frame_->HasTextures());
return wrapped_frame_ ? wrapped_frame_->HasTextures()
: !mailbox_holders_[0].mailbox.IsZero();
: (mailbox_holders_[0].mailbox.IsSharedImage() ||
!mailbox_holders_[0].mailbox.IsZero());
}
size_t VideoFrame::NumTextures() const {
......
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