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

Unified Diff: media/video/capture/video_capture_device.h

Issue 91343002: Added supported formats caching to VideoCaptureManager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Mad formatting corrected in certain files. Created 7 years 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 c4930be1144f1dc2e92dd7ebcee43717d06ebc16..fc550a9730030aedbc6bb8cbdfc9b30ae20c9e45 100644
--- a/media/video/capture/video_capture_device.h
+++ b/media/video/capture/video_capture_device.h
@@ -112,14 +112,7 @@ class MEDIA_EXPORT VideoCaptureDevice {
};
// Manages a list of Name entries.
- class MEDIA_EXPORT Names
- : public NON_EXPORTED_BASE(std::list<Name>) {
- public:
- // Returns NULL if no entry was found by that ID.
- Name* FindById(const std::string& id);
-
- // Allow generated copy constructor and assignment.
- };
+ typedef std::list<Name> Names;
class MEDIA_EXPORT Client {
public:
@@ -201,14 +194,14 @@ class MEDIA_EXPORT VideoCaptureDevice {
// Gets the names of all video capture devices connected to this computer.
static void GetDeviceNames(Names* device_names);
- // Gets the capabilities of a particular device attached to the system. This
- // method should be called before allocating or starting a device. In case
- // format enumeration is not supported, or there was a problem, the formats
- // array will be empty.
+ // Gets the supported formats of a particular device attached to the system.
+ // This method should be called before allocating or starting a device. In
+ // case format enumeration is not supported, or there was a problem, the
+ // formats array will be empty.
static void GetDeviceSupportedFormats(const Name& device,
- VideoCaptureCapabilities* formats);
+ VideoCaptureFormats* supported_formats);
- // Prepare the camera for use. After this function has been called no other
+ // Prepares the camera for use. After this function has been called no other
// applications can use the camera. StopAndDeAllocate() must be called before
// the object is deleted.
virtual void AllocateAndStart(const VideoCaptureParams& params,

Powered by Google App Engine
This is Rietveld 408576698