content/browser/renderer_host/media/video_capture_controller.h - Issue 10035054: Merge VideoCaptureDevice::Capability with media::VideoCaptureCapability

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 10035054: Merge VideoCaptureDevice::Capability with media::VideoCaptureCapability (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: fix a namespace issue Created 8 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/media_stream_device_settings.h ('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 2faa29d362431a6bab4f90e686e30aa0f383f304..27f149fd558fc9ee0fe140632d2556b125212fe7 100644

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

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

@@ -72,7 +72,7 @@ class VideoCaptureController

base::Time timestamp) OVERRIDE;

virtual void OnError() OVERRIDE;

virtual void OnFrameInfo(

- const media::VideoCaptureDevice::Capability& info) OVERRIDE;

+ const media::VideoCaptureCapability& info) OVERRIDE;

private:

struct ControllerClient;

@@ -83,7 +83,7 @@ class VideoCaptureController

// Worker functions on IO thread.

void DoIncomingCapturedFrameOnIOThread(int buffer_id, base::Time timestamp);

- void DoFrameInfoOnIOThread(const media::VideoCaptureDevice::Capability info);

+ void DoFrameInfoOnIOThread(const media::VideoCaptureCapability info);

void DoErrorOnIOThread();

void DoDeviceStateOnIOThread(bool in_use);

void DoDeviceStoppedOnIOThread();

@@ -123,7 +123,7 @@ class VideoCaptureController

// It's modified on caller thread, assuming there is only one OnFrameInfo()

// call per StartCapture().

- media::VideoCaptureDevice::Capability frame_info_;

+ media::VideoCaptureCapability frame_info_;

// It's accessed only on IO thread.

bool frame_info_available_;