media/video/capture/fake_video_capture_device.h - Issue 91343002: Added supported formats caching to VideoCaptureManager.

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: media/video/capture/fake_video_capture_device.h

Issue 91343002: Added supported formats caching to VideoCaptureManager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Mad formatting corrected in certain files. Created 7 years 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_manager_unittest.cc ('K') | « media/video/capture/android/video_capture_device_android.cc ('k') | media/video/capture/fake_video_capture_device.cc » ('j') | media/video/capture/fake_video_capture_device.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/video/capture/fake_video_capture_device.h

diff --git a/media/video/capture/fake_video_capture_device.h b/media/video/capture/fake_video_capture_device.h

index 2a884a3986e4df71ba3c913a04caebb987bbfb3a..3830ed42c6ace61d66e68a44c54a380b2c2ce714 100644

--- a/media/video/capture/fake_video_capture_device.h

+++ b/media/video/capture/fake_video_capture_device.h

@@ -26,10 +26,11 @@ class MEDIA_EXPORT FakeVideoCaptureDevice : public VideoCaptureDevice {

// return NULL;

static void SetFailNextCreate();

static void SetNumberOfFakeDevices(size_t number_of_devices);

+ static int NumberOfFakeDevices();

perkj_chrome 2013/12/10 12:27:14 size_t to match SetNumberOfFakeDevices

mcasas 2013/12/12 10:38:05 Done.

static void GetDeviceNames(Names* device_names);

static void GetDeviceSupportedFormats(const Name& device,

- VideoCaptureCapabilities* formats);

+ VideoCaptureFormats* supported_formats);

// VideoCaptureDevice implementation.

virtual void AllocateAndStart(const VideoCaptureParams& params,