media/capture/video/linux/video_capture_device_linux.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/linux/video_capture_device_linux.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/linux/video_capture_device_factory_linux.cc ('k') | media/capture/video/linux/video_capture_device_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/capture/video/linux/video_capture_device_linux.h

diff --git a/media/capture/video/linux/video_capture_device_linux.h b/media/capture/video/linux/video_capture_device_linux.h

index 49ec2e461839f9df0361f66bcae3345b74ac21e7..48e2a6446ebdd5f47f5a0529e5d769584b66df58 100644

--- a/media/capture/video/linux/video_capture_device_linux.h

+++ b/media/capture/video/linux/video_capture_device_linux.h

@@ -31,7 +31,8 @@ class VideoCaptureDeviceLinux : public VideoCaptureDevice {

static VideoPixelFormat V4l2FourCcToChromiumPixelFormat(uint32_t v4l2_fourcc);

static std::list<uint32_t> GetListOfUsableFourCCs(bool favour_mjpeg);

- explicit VideoCaptureDeviceLinux(const Name& device_name);

+ explicit VideoCaptureDeviceLinux(

+ const VideoCaptureDeviceDescriptor& device_descriptor);

~VideoCaptureDeviceLinux() override;

// VideoCaptureDevice implementation.

@@ -52,7 +53,7 @@ class VideoCaptureDeviceLinux : public VideoCaptureDevice {

base::Thread v4l2_thread_; // Thread used for reading data from the device.

- const Name device_name_;

+ const VideoCaptureDeviceDescriptor device_descriptor_;

DISALLOW_IMPLICIT_CONSTRUCTORS(VideoCaptureDeviceLinux);

};