content/browser/renderer_host/media/video_capture_controller.h - Issue 1090273006: Revert of VideoCapture: add support for GpuMemoryBuffer allocation and lifetime mgmt in VideoCaptureBufferPool

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_controller.h

Issue 1090273006: Revert of VideoCapture: add support for GpuMemoryBuffer allocation and lifetime mgmt in VideoCaptureBufferPool (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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_buffer_pool_unittest.cc ('k') | content/browser/renderer_host/media/video_capture_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/media/video_capture_controller.h

diff --git a/content/browser/renderer_host/media/video_capture_controller.h b/content/browser/renderer_host/media/video_capture_controller.h

index 0dd86842f6f91520b23b6671ec5ad8192f9f28d2..2954688bd8d8fa074949d27c97f076d8aa74e997 100644

--- a/content/browser/renderer_host/media/video_capture_controller.h

+++ b/content/browser/renderer_host/media/video_capture_controller.h

@@ -72,7 +72,8 @@

// instance. Some device clients need to allocate resources for the given

// capture |format| and/or work on Capture Thread (|capture_task_runner|).

scoped_ptr<media::VideoCaptureDevice::Client> NewDeviceClient(

- const scoped_refptr<base::SingleThreadTaskRunner>& capture_task_runner);

+ const scoped_refptr<base::SingleThreadTaskRunner>& capture_task_runner,

+ const media::VideoCaptureFormat& format);

// Start video capturing and try to use the resolution specified in |params|.

// Buffers will be shared to the client as necessary. The client will continue

@@ -120,7 +121,7 @@

// Worker functions on IO thread. Called by the VideoCaptureDeviceClient.

void DoIncomingCapturedVideoFrameOnIOThread(

- scoped_ptr<media::VideoCaptureDevice::Client::Buffer> buffer,

+ const scoped_refptr<media::VideoCaptureDevice::Client::Buffer>& buffer,

const scoped_refptr<media::VideoFrame>& frame,

const base::TimeTicks& timestamp);

void DoErrorOnIOThread();