content/browser/renderer_host/media/video_capture_controller.h - Issue 48113011: Remove media::VideoFrame from media::VideoCaptureDevice::Client interface

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 48113011: Remove media::VideoFrame from media::VideoCaptureDevice::Client interface (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@git-svn

Patch Set: 4969ee91 Initial. Created 7 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

« content/browser/renderer_host/media/video_capture_buffer_pool_unittest.cc ('K') | « content/browser/renderer_host/media/video_capture_buffer_pool_unittest.cc ('k') | content/browser/renderer_host/media/video_capture_controller.cc » ('j') | content/browser/renderer_host/media/web_contents_video_capture_device.cc » ('J')
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 0e9fd788923341b3d8788a4d047fb40a80887c73..5398bf39aab8a9ceb6ce3a3ba4ad545df2bf8efc 100644

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

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

@@ -48,7 +48,6 @@

#define CONTENT_BROWSER_RENDERER_HOST_MEDIA_VIDEO_CAPTURE_CONTROLLER_H_

#include <list>

-#include <map>

#include "base/compiler_specific.h"

#include "base/memory/ref_counted.h"

@@ -111,8 +110,9 @@ class CONTENT_EXPORT VideoCaptureController {

typedef std::list<ControllerClient*> ControllerClients;

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

- void DoIncomingCapturedFrameOnIOThread(

- const scoped_refptr<media::VideoFrame>& captured_frame,

+ void DoIncomingCapturedI420BufferOnIOThread(

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

+ const gfx::Size& dimensions,

int frame_rate,

base::Time timestamp);

void DoErrorOnIOThread();