content/browser/renderer_host/media/video_capture_manager.h - Issue 616833004: chrome://media-internals: update MediaInternals when devices capabilities are enumerated.

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: content/browser/renderer_host/media/video_capture_manager.h

Issue 616833004: chrome://media-internals: update MediaInternals when devices capabilities are enumerated. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Moved DeviceInfo to media::VideoCaptureDevice and used from VCM and MediaInternals. Other perkj@ co… Created 6 years, 2 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

« content/browser/media/media_internals.cc ('K') | « content/browser/media/media_internals_proxy.cc ('k') | content/browser/renderer_host/media/video_capture_manager.cc » ('j') | media/video/capture/video_capture_device.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/media/video_capture_manager.h

diff --git a/content/browser/renderer_host/media/video_capture_manager.h b/content/browser/renderer_host/media/video_capture_manager.h

index 74b4d30e9d87f5388d034406654c5b92f159af24..d48051d4145b43f71f51c233903e671c44595fda 100644

--- a/content/browser/renderer_host/media/video_capture_manager.h

+++ b/content/browser/renderer_host/media/video_capture_manager.h

@@ -133,19 +133,8 @@ class CONTENT_EXPORT VideoCaptureManager : public MediaStreamProvider {

private:

virtual ~VideoCaptureManager();

struct DeviceEntry;

- // This data structure is a convenient wrap of a devices' name and associated

- // video capture supported formats.

- struct DeviceInfo {

- DeviceInfo();

- DeviceInfo(const media::VideoCaptureDevice::Name& name,

- const media::VideoCaptureFormats& supported_formats);

- ~DeviceInfo();

- media::VideoCaptureDevice::Name name;

- media::VideoCaptureFormats supported_formats;

- };

- typedef std::vector<DeviceInfo> DeviceInfos;

+ typedef media::VideoCaptureDevice::DeviceInfo DeviceInfo;

+ typedef media::VideoCaptureDevice::DeviceInfos DeviceInfos;

// Checks to see if |entry| has no clients left on its controller. If so,

// remove it from the list of devices, and delete it asynchronously. |entry|