Added video capture capabilities retrieval and caching to VideoCaptureManager

content/browser/renderer_host/media/media_stream_provider.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // MediaStreamProvider is used to capture media of the types defined in
 // MediaStreamType. There is only one MediaStreamProvider instance per media
 // type and a MediaStreamProvider instance can have only one registered
 // listener.
 // The MediaStreamManager is expected to be called on Browser::IO thread and
 // the listener will be called on the same thread.
 
 #ifndef CONTENT_BROWSER_RENDERER_HOST_MEDIA_MEDIA_STREAM_PROVIDER_H_
 #define CONTENT_BROWSER_RENDERER_HOST_MEDIA_MEDIA_STREAM_PROVIDER_H_
 
 #include <list>
 #include <string>
 
 #include "base/memory/ref_counted.h"
 #include "content/common/content_export.h"
 #include "content/common/media/media_stream_options.h"
 
 namespace base {
 class MessageLoopProxy;
 }
 
+namespace media {
+class VideoCaptureCapability;
+typedef std::vector<VideoCaptureCapability>  VideoCaptureCapabilities;

[tommi (sloooow) - chröme, 2013/10/25 14:15:34]

only one space after >

[mcasas, 2013/10/28 12:50:08]

Done.

+}
+
 namespace content {
 
 enum MediaStreamProviderError {
   kMediaStreamOk = 0,
   kInvalidMediaStreamType,
   kInvalidSession,
   kUnknownSession,
   kDeviceNotAvailable,
   kDeviceAlreadyInUse,
   kUnknownError
 };
 
 enum { kInvalidMediaCaptureSessionId = 0xFFFFFFFF };
 
 // Callback class used by MediaStreamProvider.
 class CONTENT_EXPORT MediaStreamProviderListener {
  public:
   // Called by a MediaStreamProvider when a stream has been opened.
   virtual void Opened(MediaStreamType stream_type,
                       int capture_session_id) = 0;
 
   // Called by a MediaStreamProvider when a stream has been closed.
   virtual void Closed(MediaStreamType stream_type,
                       int capture_session_id) = 0;
 
   // Called by a MediaStreamProvider when available devices has been enumerated.
   virtual void DevicesEnumerated(MediaStreamType stream_type,
                                  const StreamDeviceInfoArray& devices) = 0;
 
-  // Called by a MediaStreamProvider when an error has occured.
+  // Called by a MediaStreamProvider when an error has occurred.
   virtual void Error(MediaStreamType stream_type,
                      int capture_session_id,
                      MediaStreamProviderError error) = 0;
 
+  // Called by a MediaStreamProvider when available devices' formats have been
+  // enumerated.
+  virtual void DeviceCapabilitiesEnumerated(
+      const StreamDeviceInfo& device_info,
+      const media::VideoCaptureCapabilities& capabilities) {}

[tommi (sloooow) - chröme, 2013/10/25 14:15:34]

why not pure virtual like the other methods?

[mcasas, 2013/10/28 12:50:08]

Because the AudioInputDeviceManager also implements this interface and it should
not have to override this method (nor pull video-related data structures).

+
  protected:
   virtual ~MediaStreamProviderListener() {}
 };
 
 // Implemented by a manager class providing captured media.
 class CONTENT_EXPORT MediaStreamProvider
     : public base::RefCountedThreadSafe<MediaStreamProvider> {
  public:
   // Registers a listener and a device message loop.
   virtual void Register(MediaStreamProviderListener* listener,
@@ skipping 15 matching lines @@
   virtual void Close(int capture_session_id) = 0;
 
  protected:
   friend class base::RefCountedThreadSafe<MediaStreamProvider>;
   virtual ~MediaStreamProvider() {}
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_MEDIA_MEDIA_STREAM_PROVIDER_H_