Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / media / video / capture / video_capture_device_factory.h

diff --git a/src/media/video/capture/video_capture_device_factory.h b/src/media/video/capture/video_capture_device_factory.h
index ab58ad6..f8c2196 100644 (file)
--- a/src/media/video/capture/video_capture_device_factory.h
+++ b/src/media/video/capture/video_capture_device_factory.h
@@ -16,15 +16,19 @@ namespace media {
 // in Device Thread (a.k.a. Audio Thread).
 class MEDIA_EXPORT VideoCaptureDeviceFactory {
  public:
+  static scoped_ptr<VideoCaptureDeviceFactory> CreateFactory(
+      scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner);
+
   VideoCaptureDeviceFactory();
-  virtual ~VideoCaptureDeviceFactory() {}
+  virtual ~VideoCaptureDeviceFactory();
 
   // Creates a VideoCaptureDevice object. Returns NULL if something goes wrong.
   virtual scoped_ptr<VideoCaptureDevice> Create(
-      const VideoCaptureDevice::Name& device_name);
+      const VideoCaptureDevice::Name& device_name) = 0;
 
-  // Gets the names of all video capture devices connected to this computer.
-  virtual void GetDeviceNames(VideoCaptureDevice::Names* device_names);
+  // Asynchronous version of GetDeviceNames calling back to |callback|.
+  virtual void EnumerateDeviceNames(const base::Callback<
+      void(scoped_ptr<media::VideoCaptureDevice::Names>)>& callback);
 
   // Gets the supported formats of a particular device attached to the system.
   // This method should be called before allocating or starting a device. In
@@ -32,9 +36,20 @@ class MEDIA_EXPORT VideoCaptureDeviceFactory {
   // formats array will be empty.
   virtual void GetDeviceSupportedFormats(
       const VideoCaptureDevice::Name& device,
-      VideoCaptureFormats* supported_formats);
+      VideoCaptureFormats* supported_formats) = 0;
+
+  // Gets the supported formats for still image of a particular device attached
+  // to the system. In case format enumeration is not supported, or there was
+  // a problem, the formats array will be empty.
+  virtual void GetDeviceSupportedImageFormats(
+      const VideoCaptureDevice::Name& device,
+      ImageCaptureFormats* supported_formats) {}
 
  protected:
+  // Gets the names of all video capture devices connected to this computer.
+  // Used by the default implementation of EnumerateDeviceNames().
+  virtual void GetDeviceNames(VideoCaptureDevice::Names* device_names) = 0;
+
   base::ThreadChecker thread_checker_;
 
  private: