merge with master

[adaptation/intel_mfld/gst-plugins-atomisp.git] / gst-libs / gst / camera / gstmfldcamerasrc.h

diff --git a/gst-libs/gst/camera/gstmfldcamerasrc.h b/gst-libs/gst/camera/gstmfldcamerasrc.h
index 34be3e5..0d467d4 100644 (file)
--- a/gst-libs/gst/camera/gstmfldcamerasrc.h
+++ b/gst-libs/gst/camera/gstmfldcamerasrc.h
@@ -159,6 +159,14 @@ typedef enum {
   GST_CAMERA_CAPTURE_DONE
 } GstCameraCapturePhase;
 
+/* Signal Enumerations */
+enum {
+  /*signal*/
+  CAMERA_IN_SIGNAL_STILL_CAPTURE,
+  CAMERA_IN_SIGNAL_NEGO_COMPLETE,
+  CAMERA_IN_SIGNAL_STILL_USRPTR_BUFFER,
+  CAMERA_IN_LAST_SIGNAL
+};
 
 typedef struct _GstCameraSrc GstCameraSrc;
 typedef struct _GstCameraSrcClass GstCameraSrcClass;
@@ -266,7 +274,6 @@ struct _GstCameraSrc {
  * @set_vfinder_mode: Set viewfinder mode.
  * @set_capture_mode: Set capturing mode.
  * @set_autofocus: Turn on / off autofocus algorithm.
- * @set_autoexposure: Turn on / off auto exposure algorithm.
  * @write_settings: Write all GstPhotoSettings to subclass at once.
  * @read_settings: Read all device settings to given GstPhotoSettings structure.
  * @set_zoom: Set the zoom factor.
@@ -346,10 +353,6 @@ struct _GstCameraSrcClass
 
   gboolean
   (*set_autofocus)     (GstCameraSrc *camsrc, gboolean on_off);
-
-  gboolean
-  (*set_autoexposure)  (GstCameraSrc *camsrc, gboolean on_off);
-
   gboolean
   (*write_settings)    (GstCameraSrc *camsrc,
                         GstPhotoSettings *photoconf,
@@ -405,6 +408,7 @@ struct _GstCameraSrcClass
   /* signals */
   void (*nego_complete) (GstElement *element);
   void (*still_capture) (GstElement *element, GstBuffer *main, GstBuffer *sub, GstBuffer *scrnl);
+  void (*still_capture_usrptr_buffer) (GstElement *element, GstBuffer *usrptr);
 
 
   /*< private >*/