flash sequence for 3A added.

Change-Id: I770bf29ff57fcbd11cab5bdf8a50fee4ba92c33d

diff --git a/gst-libs/atomisphal/gstv4l2mfldadvci.c b/gst-libs/atomisphal/gstv4l2mfldadvci.c
index 6eba158..988f4be 100644 (file)
--- a/gst-libs/atomisphal/gstv4l2mfldadvci.c
+++ b/gst-libs/atomisphal/gstv4l2mfldadvci.c
@@ -420,7 +420,19 @@ lib_3a_af_stop( )
 static void
 lib_3a_ae_calc_for_flash( )
 {
-   /*  ?  TODO check */
+  cam_lib_3a_dbg("%s:%d\n", __func__, __LINE__);
+  ci_adv_process_for_flash(ia_3a_flash_stage_none);
+}
+static void
+lib_3a_calc_without_flash( )
+{
+  cam_lib_3a_dbg("%s:%d\n", __func__, __LINE__);
+  ci_adv_process_for_flash(ia_3a_flash_stage_pre);
+}
+
+static void
+lib_3a_calc_with_flash( )
+{
   cam_lib_3a_dbg("%s:%d\n", __func__, __LINE__);
   ci_adv_process_for_flash(ia_3a_flash_stage_main);
 }
@@ -485,8 +497,8 @@ lib_3a_link_functions_init (GstV4l2MFLDAdvCI *mfldadvci)
   mfldadvci->get_statistics = lib_3a_get_statistics; /* TODO atomisp_dis_statistics  ? */
 
   mfldadvci->ae_calc_for_flash = lib_3a_ae_calc_for_flash;
-  mfldadvci->ae_calc_without_flash = lib_3a_ae;
-  mfldadvci->ae_calc_with_flash = lib_3a_ae;
+  mfldadvci->ae_calc_without_flash = lib_3a_calc_without_flash;
+  mfldadvci->ae_calc_with_flash = lib_3a_calc_with_flash;
   mfldadvci->ae_apply_results = lib_3a_ae;
 
   mfldadvci->af_start = lib_3a_af_start;

diff --git a/gst-libs/atomisphal/mfld_cam.c b/gst-libs/atomisphal/mfld_cam.c
index 10befb3..930b5c7 100644 (file)
--- a/gst-libs/atomisphal/mfld_cam.c
+++ b/gst-libs/atomisphal/mfld_cam.c
@@ -298,6 +298,7 @@ set_flash_mode (int fd, int mode)
       ret = cam_driver_set_flash_mode(fd,ATOMISP_FLASH_MODE_OFF);
       break;
   }
+  set_ae_flash_mode(fd,mode);
   return ret;
 }
 

diff --git a/gst/mfldv4l2cam/v4l2camsrc_calls.c b/gst/mfldv4l2cam/v4l2camsrc_calls.c
index 4153a76..f8455a4 100644 (file)
--- a/gst/mfldv4l2cam/v4l2camsrc_calls.c
+++ b/gst/mfldv4l2cam/v4l2camsrc_calls.c
@@ -3289,8 +3289,6 @@ gst_v4l2camsrc_set_flash_mode (GstCameraSrc * camsrc,
   err= cam_feature_set (v4l2camsrc->video_fd, CAM_LIGHT_FLASH_MODE,
         flash);
 
-  set_ae_flash_mode(v4l2camsrc->video_fd,flash);
-
   if(err)
     goto error;
 

diff --git a/packaging/mfldv4l2camsrc.changes b/packaging/mfldv4l2camsrc.changes
index dd153e4..1887131 100644 (file)
--- a/packaging/mfldv4l2camsrc.changes
+++ b/packaging/mfldv4l2camsrc.changes
@@ -1,3 +1,6 @@
+* Thu Nov 15 2012 Marko Ollonen <marko.ollonen@ixonos.com> accepted/trunk/20121112.215039@ae18d70
+- flash sequence for 3A added.
+
 * Thu Nov 15 2012 Marko Ollonen <marko.ollonen@ixonos.com> accepted/trunk/20121112.215039@c15e86d
 - clean up flash setting in camera control interface. flash setting method for 3A lib added.