content/browser/renderer_host/media/video_capture_texture_wrapper.cc - Issue 1064703002: VideoCaptureBufferPool: Refactor to allow support of non-ShMem backed buffers

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/browser/renderer_host/media/video_capture_texture_wrapper.cc

Issue 1064703002: VideoCaptureBufferPool: Refactor to allow support of non-ShMem backed buffers (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: miu@s nits Created 5 years, 8 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/browser/renderer_host/media/video_capture_device_client.cc ('k') | media/video/capture/fake_video_capture_device.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/media/video_capture_texture_wrapper.cc

diff --git a/content/browser/renderer_host/media/video_capture_texture_wrapper.cc b/content/browser/renderer_host/media/video_capture_texture_wrapper.cc

index 773de53f4b83132f03c9eb8a8b2b84948dfdcd31..b2e01742cdd726db912b2816f8d9f60566ea2e51 100644

--- a/content/browser/renderer_host/media/video_capture_texture_wrapper.cc

+++ b/content/browser/renderer_host/media/video_capture_texture_wrapper.cc

@@ -209,7 +209,7 @@ void VideoCaptureTextureWrapper::OnIncomingCapturedData(

// Reserve a temporary Buffer for conversion to ARGB.

scoped_refptr<media::VideoCaptureDevice::Client::Buffer> argb_buffer =

- ReserveOutputBuffer(media::VideoFrame::ARGB, frame_format.frame_size);

+ ReserveOutputBuffer(media::PIXEL_FORMAT_ARGB, frame_format.frame_size);

DVLOG_IF(1, !argb_buffer) << "Couldn't allocate ARGB Buffer";

if (!argb_buffer)

return;

@@ -235,7 +235,7 @@ void VideoCaptureTextureWrapper::OnIncomingCapturedData(

// Reserve output buffer for the texture on the IPC borderlands.

scoped_refptr<media::VideoCaptureDevice::Client::Buffer> texture_buffer =

- ReserveOutputBuffer(media::VideoFrame::NATIVE_TEXTURE, gfx::Size());

+ ReserveOutputBuffer(media::PIXEL_FORMAT_TEXTURE, frame_format.frame_size);

DVLOG_IF(1, !texture_buffer) << "Couldn't allocate Texture Buffer";

if (!texture_buffer)

return;