media/capture/video/fake_video_capture_device_factory.h - Issue 2169013002: Change class VideoCaptureDevice::Name to struct VideoCaptureDeviceDescriptor

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/capture/video/fake_video_capture_device_factory.h

Issue 2169013002: Change class VideoCaptureDevice::Name to struct VideoCaptureDeviceDescriptor (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix build errors Created 4 years, 5 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 | « media/capture/video/android/video_capture_device_factory_android.cc ('k') | media/capture/video/fake_video_capture_device_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/capture/video/fake_video_capture_device_factory.h

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

index 6f67c811b9053daebdb0e6070374beb99415fee5..9951eb829b391c9c2a2de4e27540aaa18589c6cc 100644

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

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

@@ -20,11 +20,12 @@ class CAPTURE_EXPORT FakeVideoCaptureDeviceFactory

FakeVideoCaptureDeviceFactory();

~FakeVideoCaptureDeviceFactory() override {}

- std::unique_ptr<VideoCaptureDevice> Create(

- const VideoCaptureDevice::Name& device_name) override;

- void GetDeviceNames(VideoCaptureDevice::Names* device_names) override;

- void GetDeviceSupportedFormats(

- const VideoCaptureDevice::Name& device,

+ std::unique_ptr<VideoCaptureDevice> CreateDevice(

+ const VideoCaptureDeviceDescriptor& device_descriptor) override;

+ void GetDeviceDescriptors(

+ VideoCaptureDeviceDescriptors* device_descriptors) override;

+ void GetSupportedFormats(

+ const VideoCaptureDeviceDescriptor& device_descriptor,

VideoCaptureFormats* supported_formats) override;

void set_number_of_devices(int number_of_devices) {