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

Index: media/video/capture/video_capture_device.h

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

index 187145ffa84596ed5ea6f7eeccb3d790af4dafc2..1db969bbd72bcb0de7eab6e5a09a01ec7297f196 100644

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

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

@@ -165,6 +165,18 @@ class MEDIA_EXPORT VideoCaptureDevice {

// Manages a list of Name entries.

typedef std::list<Name> Names;

+ // A convenience wrap of a devices' name and associated supported formats.

+ struct DeviceInfo {

perkj_chrome 2014/10/08 11:49:59 Please move this out of VideoCaptureDevice and why

mcasas 2014/10/08 14:05:18 Done.

+ DeviceInfo();

+ DeviceInfo(const Name& name,

+ const VideoCaptureFormats& supported_formats);

+ ~DeviceInfo();

+ Name name;

+ VideoCaptureFormats supported_formats;

+ };

+ typedef std::vector<DeviceInfo> DeviceInfos;

class MEDIA_EXPORT Client {

public:

// Memory buffer returned by Client::ReserveOutputBuffer().