content/renderer/media/video_capture_impl.cc - Issue 1412223009: Reland: GpuMemoryBuffer interface change: Map(**) to Map() and memory(plane); stride(plane)

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: content/renderer/media/video_capture_impl.cc

Issue 1412223009: Reland: GpuMemoryBuffer interface change: Map(**) to Map() and memory(plane); stride(plane) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Win X64 compile fix Created 5 years, 2 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

« no previous file with comments | « content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.cc ('k') | content/renderer/media/video_capture_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/video_capture_impl.cc

diff --git a/content/renderer/media/video_capture_impl.cc b/content/renderer/media/video_capture_impl.cc

index 28ac64917b7d0f26541c486cd69ae04087cd4bff..df0ec54fde08b8f6bf3d2f4765adc919d69ab47c 100644

--- a/content/renderer/media/video_capture_impl.cc

+++ b/content/renderer/media/video_capture_impl.cc

@@ -79,9 +79,9 @@ class VideoCaptureImpl::ClientBuffer2

gfx::BufferUsage::MAP,

base::Bind(&ClientBuffer2::DestroyGpuMemoryBuffer,

base::Unretained(this))));

- void* data_ptr = nullptr;

- buffers_[i]->Map(&data_ptr);

- data_[i] = reinterpret_cast<uint8*>(data_ptr);

+ bool rv = buffers_[i]->Map();

+ DCHECK(rv);

+ data_[i] = reinterpret_cast<uint8*>(buffers_[i]->memory(0u));

strides_[i] = width;

}