media/video/capture/fake_video_capture_device.h - Issue 29423003: Added video capture capabilities retrieval and 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 29423003: Added video capture capabilities retrieval and caching to VideoCaptureManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Removed RunUntilIdle between Stop and Close in UT, after Valgrind found a NULL addressing. Created 7 years, 1 month 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_manager_unittest.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: 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 174ba06ae7e729161be19d831d1fdec668c94c0b..c69fbdf7ce7d6864c11653ddb3f0ce2558dbb43d 100644

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

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

@@ -23,6 +23,8 @@ class MEDIA_EXPORT FakeVideoCaptureDevice : public VideoCaptureDevice {

// Used for testing. This will make sure the next call to Create will

// return NULL;

static void SetFailNextCreate();

+ static void SetNumberOfFakeDevices(int num);

+ static int NumberOfFakeDevices();

static void GetDeviceNames(Names* device_names);

static void GetDeviceSupportedFormats(const Name& device,

@@ -63,6 +65,7 @@ class MEDIA_EXPORT FakeVideoCaptureDevice : public VideoCaptureDevice {

std::vector<VideoCaptureCapability> capabilities_roster_;

int capabilities_roster_index_;

+ static int number_of_fake_devices_;

static bool fail_next_create_;

DISALLOW_COPY_AND_ASSIGN(FakeVideoCaptureDevice);