cc/trees/layer_tree_host_unittest_context.cc - Issue 1117423002: media: Let VideoFrame carry more than one native texture.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: cc/trees/layer_tree_host_unittest_context.cc

Issue 1117423002: media: Let VideoFrame carry more than one native texture. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address reveman's comments. Created 5 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: cc/trees/layer_tree_host_unittest_context.cc

diff --git a/cc/trees/layer_tree_host_unittest_context.cc b/cc/trees/layer_tree_host_unittest_context.cc

index 8b09054894341ee5995163ffbd2d9d39c481c9c7..c1436e5368208f84ce8d2c4e69e52d5ba085c3b7 100644

--- a/cc/trees/layer_tree_host_unittest_context.cc

+++ b/cc/trees/layer_tree_host_unittest_context.cc

@@ -1076,13 +1076,11 @@ class LayerTreeHostContextTestDontUseLostResources

color_video_frame_ = VideoFrame::CreateColorFrame(

gfx::Size(4, 4), 0x80, 0x80, 0x80, base::TimeDelta());

hw_video_frame_ = VideoFrame::WrapNativeTexture(

- make_scoped_ptr(

- new gpu::MailboxHolder(mailbox, GL_TEXTURE_2D, sync_point)),

+ gpu::MailboxHolder(mailbox, GL_TEXTURE_2D, sync_point),

media::VideoFrame::ReleaseMailboxCB(), gfx::Size(4, 4),

gfx::Rect(0, 0, 4, 4), gfx::Size(4, 4), base::TimeDelta(), false);

scaled_hw_video_frame_ = VideoFrame::WrapNativeTexture(

- make_scoped_ptr(

- new gpu::MailboxHolder(mailbox, GL_TEXTURE_2D, sync_point)),

+ gpu::MailboxHolder(mailbox, GL_TEXTURE_2D, sync_point),

media::VideoFrame::ReleaseMailboxCB(), gfx::Size(4, 4),

gfx::Rect(0, 0, 3, 2), gfx::Size(4, 4), base::TimeDelta(), false);

« no previous file with comments | « cc/resources/video_resource_updater.cc ('k') | content/browser/media/capture/aura_window_capture_machine.cc » ('j') | media/base/video_frame.h » ('J')