strobe mode setting via camera control interface added.

Change-Id: I7a6813217924b15fec11448c4e99a5d843afc615

diff --git a/gst-libs/gst/camera/gstmfldcameracontroliface.c b/gst-libs/gst/camera/gstmfldcameracontroliface.c
index 4784605..f24b8f5 100644 (file)
--- a/gst-libs/gst/camera/gstmfldcameracontroliface.c
+++ b/gst-libs/gst/camera/gstmfldcameracontroliface.c
@@ -141,13 +141,37 @@ gboolean
 gst_camerasrc_camera_control_set_strobe( GstCameraSrc* camerasrc,
     gint type, gint value )
 {
-  return FALSE;
+  GstCameraSrcClass *bclass;
+  gboolean ret = FALSE;
+  gboolean opened;
+
+  bclass = GST_CAMERA_SRC_GET_CLASS (camerasrc);
+  opened = bclass->is_open (camerasrc);
+  g_return_val_if_fail (opened, FALSE);
+
+  GST_OBJECT_LOCK (camerasrc);
+  camerasrc->cam_ctrl.flash_mode = value;
+  GST_OBJECT_UNLOCK (camerasrc);
+
+  ret = bclass->set_flash_mode(camerasrc, value);
+  return ret;
 }
 gboolean
 gst_camerasrc_camera_control_get_strobe( GstCameraSrc* camerasrc,
     gint type, gint *value )
 {
-  return FALSE;
+  GstCameraSrcClass *bclass;
+  gboolean opened;
+
+  bclass = GST_CAMERA_SRC_GET_CLASS (camerasrc);
+  opened = bclass->is_open (camerasrc);
+  g_return_val_if_fail (opened, FALSE);
+
+  GST_OBJECT_LOCK (camerasrc);
+  *value =  camerasrc->cam_ctrl.flash_mode;
+  GST_OBJECT_UNLOCK (camerasrc);
+
+  return TRUE;
 }
 
 gboolean 

diff --git a/gst-libs/gst/camera/gstmfldcamerasrc.c b/gst-libs/gst/camera/gstmfldcamerasrc.c
index c8e0255..6f3a57c 100644 (file)
--- a/gst-libs/gst/camera/gstmfldcamerasrc.c
+++ b/gst-libs/gst/camera/gstmfldcamerasrc.c
@@ -2271,6 +2271,12 @@ gst_camerasrc_default_get_caps (GstCameraSrc * camsrc, GstOperationMode mode)
   return NULL;
 }
 
+static gboolean
+gst_camerasrc_default_set_flash_mode (GstCameraSrc *camsrc, int value)
+{
+  return TRUE;
+}
+
 static void
 gst_camerasrc_default_functions_init (GstCameraSrcClass * camera_class)
 {
@@ -2280,6 +2286,7 @@ gst_camerasrc_default_functions_init (GstCameraSrcClass * camera_class)
   camera_class->read_settings = gst_camerasrc_default_ret_true_with_settings;
   camera_class->write_settings = gst_camerasrc_default_write_settings;
   camera_class->get_supported_caps = gst_camerasrc_default_get_caps;
+  camera_class->set_flash_mode = gst_camerasrc_default_set_flash_mode;
 
   GST_DEBUG ("Default functions set");
 }

diff --git a/gst-libs/gst/camera/gstmfldcamerasrc.h b/gst-libs/gst/camera/gstmfldcamerasrc.h
index c6b385f..7f971f9 100644 (file)
--- a/gst-libs/gst/camera/gstmfldcamerasrc.h
+++ b/gst-libs/gst/camera/gstmfldcamerasrc.h
@@ -157,6 +157,12 @@ typedef struct _GstCameraSrc GstCameraSrc;
 typedef struct _GstCameraSrcClass GstCameraSrcClass;
 typedef struct _GstCameraFocusStatus GstCameraFocusStatus;
 
+typedef struct
+{
+  guint  flash_mode;
+} GstCameraControlInt;
+
+
 /**
  * GstCameraSrc:
  * @element: the parent element.
@@ -187,6 +193,9 @@ struct _GstCameraSrc {
   GstPhotoCapturePrepared prep_func;
   gpointer                prep_udata;
 
+  /* camera control interface related */
+  GstCameraControlInt cam_ctrl;
+
   /* Image capture format */
   guint   capture_w, capture_h;
   guint   capture_fps_n, capture_fps_d;
@@ -352,6 +361,9 @@ struct _GstCameraSrcClass
   gboolean
   (*makernote_uninit)(GstCameraSrc * camsrc, int handle);
 
+  gboolean
+  (*set_flash_mode)(GstCameraSrc *camsrc, int value);
+
   /*< private >*/
   gpointer       _gst_reserved[GST_PADDING_LARGE];
 };

diff --git a/gst/mfldv4l2cam/gstv4l2camsrc.c b/gst/mfldv4l2cam/gstv4l2camsrc.c
index 38b7d25..1ce554b 100644 (file)
--- a/gst/mfldv4l2cam/gstv4l2camsrc.c
+++ b/gst/mfldv4l2cam/gstv4l2camsrc.c
@@ -712,6 +712,9 @@ gst_v4l2camsrc_read_settings (GstCameraSrc * camsrc,
     GstPhotoSettings * photoconf);
 gboolean gst_v4l2camsrc_write_settings (GstCameraSrc * camsrc,
     GstPhotoSettings * photoconf, gboolean scene_override);
+gboolean
+gst_v4l2camsrc_set_flash_mode (GstCameraSrc *camsrc, int value);
+
 
 /*
  * gst_v4l2camsrc_class_init:
@@ -952,6 +955,9 @@ gst_v4l2camsrc_class_init (GstMFLDV4l2CamSrcClass * klass)
   camera_class->makernote_init = GST_DEBUG_FUNCPTR(gst_v4l2camsrc_makernote_init);
   camera_class->makernote_deal = GST_DEBUG_FUNCPTR(gst_v4l2camsrc_makernote_deal);
   camera_class->makernote_uninit = GST_DEBUG_FUNCPTR(gst_v4l2camsrc_makernote_uninit);
+  camera_class->set_flash_mode = GST_DEBUG_FUNCPTR(gst_v4l2camsrc_set_flash_mode);
+
+
 //camera_class->fill_image_tags = GST_DEBUG_FUNCPTR(gst_v4l2camsrc_fill_image_tags);
 //camera_class->get_preview_image = GST_DEBUG_FUNCPTR(gst_v4l2camsrc_get_preview_image);
 }

diff --git a/gst/mfldv4l2cam/v4l2camsrc_calls.c b/gst/mfldv4l2cam/v4l2camsrc_calls.c
index f8416a1..bedf0e7 100644 (file)
--- a/gst/mfldv4l2cam/v4l2camsrc_calls.c
+++ b/gst/mfldv4l2cam/v4l2camsrc_calls.c
@@ -3037,6 +3037,62 @@ error:
 }
 
 gboolean
+gst_v4l2camsrc_set_flash_mode (GstCameraSrc * camsrc,
+    int value)
+{
+  GstMFLDV4l2CamSrc *v4l2camsrc;
+  cam_err_t err;
+  gint32 flash;
+
+
+  v4l2camsrc = GST_V4L2CAMSRC (camsrc);
+
+  g_mutex_lock (v4l2camsrc->device_mutex);
+
+  if (!v4l2camsrc->initialized) {
+    GST_DEBUG ("Device not initialized");
+    g_mutex_unlock (v4l2camsrc->device_mutex);
+    return FALSE;
+  }
+
+  switch (value) {
+    case GST_CAMERA_STROBE_CAP_NONE:
+    case GST_CAMERA_STROBE_CAP_OFF:
+      flash = CAM_LIGHT_FLASH_MODE_OFF;
+      break;
+    case GST_CAMERA_STROBE_CAP_ON:
+      flash = CAM_LIGHT_FLASH_MODE_ON;
+      break;
+    case GST_CAMERA_STROBE_CAP_AUTO:
+      flash = CAM_LIGHT_FLASH_MODE_AUTO;
+      break;
+    case GST_CAMERA_STROBE_CAP_REDEYE:
+      flash = CAM_LIGHT_FLASH_MODE_RED_EYE;
+      break;
+    default:
+      flash = CAM_LIGHT_FLASH_MODE_OFF;
+      break;
+   }
+
+  err= cam_feature_set (v4l2camsrc->video_fd, CAM_LIGHT_FLASH_MODE,
+        flash);
+
+  if(err)
+    goto error;
+
+  g_mutex_unlock (v4l2camsrc->device_mutex);
+
+  return TRUE;
+
+/* ERRORS */
+error:
+  {
+    g_mutex_unlock (v4l2camsrc->device_mutex);
+    return FALSE;
+  }
+}
+
+gboolean
 gst_v4l2camsrc_write_settings (GstCameraSrc * camsrc,
     GstPhotoSettings * photoconf, gboolean scene_override)
 {