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

Index: media/capture/video/win/video_capture_device_mf_win.h

diff --git a/media/capture/video/win/video_capture_device_mf_win.h b/media/capture/video/win/video_capture_device_mf_win.h

index 971b5378cf7bf0dcd70c7cc419e73e5c1024273a..68cd4f8b489bb46a59ecda81ecb34add7e3291bf 100644

--- a/media/capture/video/win/video_capture_device_mf_win.h

+++ b/media/capture/video/win/video_capture_device_mf_win.h

@@ -40,7 +40,8 @@ class CAPTURE_EXPORT VideoCaptureDeviceMFWin : public base::NonThreadSafe,

public:

static bool FormatFromGuid(const GUID& guid, VideoPixelFormat* format);

- explicit VideoCaptureDeviceMFWin(const Name& device_name);

+ explicit VideoCaptureDeviceMFWin(

+ const VideoCaptureDeviceDescriptor& device_descriptor);

~VideoCaptureDeviceMFWin() override;

// Opens the device driver for this device.

@@ -62,7 +63,7 @@ class CAPTURE_EXPORT VideoCaptureDeviceMFWin : public base::NonThreadSafe,

private:

void OnError(const tracked_objects::Location& from_here, HRESULT hr);

- Name name_;

+ VideoCaptureDeviceDescriptor descriptor_;

base::win::ScopedComPtr<IMFActivate> device_;

scoped_refptr<MFReaderCallback> callback_;