media/video/capture/video_capture_device.h - Issue 29423003: Added video capture capabilities retrieval and caching to VideoCaptureManager

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 29423003: Added video capture capabilities retrieval and caching to VideoCaptureManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: tommi@'s round of comments addressed. More UT. Capabilities reset on closing device. Created 7 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

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 2e60256a8f121f232b950e750391ac640b9e8484..40692f7692f5632d0109d90e84f82c7e1fa70508 100644

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

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

@@ -18,6 +18,7 @@

#include "base/logging.h"

#include "base/time/time.h"

#include "media/base/media_export.h"

+#include "media/base/video_frame.h"

mcasas 2013/10/28 12:50:08 VideoFrame was used but its header included transi

#include "media/video/capture/video_capture_types.h"

namespace media {

@@ -113,6 +114,7 @@ class MEDIA_EXPORT VideoCaptureDevice {

: public NON_EXPORTED_BASE(std::list<Name>) {

public:

// Returns NULL if no entry was found by that ID.

+ // TODO(mcasas): Possibly not used anymore, double check.

Name* FindById(const std::string& id);

// Allow generated copy constructor and assignment.

« content/browser/renderer_host/media/video_capture_manager_unittest.cc ('K') | « media/video/capture/fake_video_capture_device.cc ('k') | no next file » | no next file with comments »