Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(177)

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: 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 c10a3aefca076ae9fa9da255b928ea44e86567e5..bd2248f467b5c53c02a9da7a20d56268ccbf7321 100644
--- a/media/video/capture/video_capture_device.h
+++ b/media/video/capture/video_capture_device.h
@@ -34,9 +34,8 @@ class MEDIA_EXPORT VideoCaptureDevice {
// VideoCaptureDevice::Create.
class MEDIA_EXPORT Name {
public:
- Name() {}
- Name(const std::string& name, const std::string& id)
- : device_name_(name), unique_id_(id) {}
+ Name();
+ Name(const std::string& name, const std::string& id);
#if defined(OS_WIN)
// Windows targets Capture Api type: it can only be set on construction.
@@ -51,7 +50,7 @@ class MEDIA_EXPORT VideoCaptureDevice {
const CaptureApiType api_type)
: device_name_(name), unique_id_(id), capture_api_class_(api_type) {}
#endif // if defined(OS_WIN)
- ~Name() {}
+ ~Name();
// Friendly name of a device
const std::string& name() const { return device_name_; }
@@ -87,6 +86,8 @@ class MEDIA_EXPORT VideoCaptureDevice {
private:
std::string device_name_;
std::string unique_id_;
+ VideoCaptureCapabilities capture_formats_;
+
#if defined(OS_WIN)
// This class wraps the CaptureApiType, so it has a by default value if not
// inititalized, and I (mcasas) do a DCHECK on reading its value.
@@ -105,6 +106,7 @@ class MEDIA_EXPORT VideoCaptureDevice {
CaptureApiClass capture_api_class_;
#endif // if defined(OS_WIN)
+
// Allow generated copy constructor and assignment.
};

Powered by Google App Engine
This is Rietveld 408576698