From: Marko Ollonen <marko.ollonen@ixonos.com>
Date: Fri, 24 May 2013 08:15:05 +0000 (+0300)
Subject: change flash sequence.
X-Git-Tag: 2.2.1_release~1^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8c6e4b5de7b5a4f992ea7020ba370f6af607f46f;p=adaptation%2Fintel_mfld%2Fgst-plugins-atomisp.git

change flash sequence.

works now better in case when object is close and
light conditions very dark.

Change-Id: Ie84f174f7f1d04b2bf5bddbdc3751b8e62cf5eb5
---

diff --git a/gst-libs/atomisphal/mfld_cam.c b/gst-libs/atomisphal/mfld_cam.c
index 02ff1a4..cb1def2 100644
--- a/gst-libs/atomisphal/mfld_cam.c
+++ b/gst-libs/atomisphal/mfld_cam.c
@@ -1574,59 +1574,37 @@ mfldcam_3a_stop (void)
 static cam_err_t
 run_flash_sequence (int fd, struct v4l2_buffer *buffer)
 {
-	// non flash
-    led_flash_off (fd);	
-	mfldadvci->process_flash(advci_flash_stage_none);
-    if (-1 == ioctl (fd, VIDIOC_DQBUF, buffer)) {
-      cam_driver_dbg ("%s: Error dqbuf %d\n", __func__, 0);
-      return CAM_ERR_SYS;
-    }
-	// main flash
-	mfldadvci->process_flash (advci_flash_stage_main);
-    cam_driver_request_flash(fd, 1);
-    if (-1 == ioctl (fd, VIDIOC_QBUF, buffer)) {
-      cam_driver_dbg ("%s: Error qbuf %d\n", __func__, 1);
-      return CAM_ERR_SYS;
-    }	
-    if (-1 == ioctl (fd, VIDIOC_DQBUF, buffer)) {
-      cam_driver_dbg ("%s: Error dqbuf %d\n", __func__, 1);
-      return CAM_ERR_SYS;
-    }
+  // non flash
+  led_flash_off (fd);
 
-    if (-1 == ioctl (fd, VIDIOC_QBUF, buffer)) {
-      cam_driver_dbg ("%s: Error qbuf %d\n", __func__, 2);
-      return CAM_ERR_SYS;
-    }	
-    if (-1 == ioctl (fd, VIDIOC_DQBUF, buffer)) {
-      cam_driver_dbg ("%s: Error dqbuf %d\n", __func__, 2);
-      return CAM_ERR_SYS;
-    }
-    /* In case of small images we need to do extra flash to get
-     * auto exposure and auto white balance tuned for flash
-     */
-    if(mfld_driver.width  < 2048 || mfld_driver.height  < 1536)  {
-      cam_driver_request_flash(fd, 1);
-      if (-1 == ioctl (fd, VIDIOC_QBUF, buffer)) {
-        cam_driver_dbg ("%s: Error qbuf %d\n", __func__, 1);
-        return CAM_ERR_SYS;
-      }
-      if (-1 == ioctl (fd, VIDIOC_DQBUF, buffer)) {
-      cam_driver_dbg ("%s: Error dqbuf %d\n", __func__, 1);
-      return CAM_ERR_SYS;
-      }
+  if (-1 == ioctl (fd, VIDIOC_DQBUF, buffer)) {
+    cam_driver_dbg ("%s: Error dqbuf %d\n", __func__, 1);
+    return CAM_ERR_SYS;
+  }
+  mfldadvci->process_flash(advci_flash_stage_none);
 
-      if (-1 == ioctl (fd, VIDIOC_QBUF, buffer)) {
-        cam_driver_dbg ("%s: Error qbuf %d\n", __func__, 2);
-        return CAM_ERR_SYS;
-      }
-      if (-1 == ioctl (fd, VIDIOC_DQBUF, buffer)) {
-        cam_driver_dbg ("%s: Error dqbuf %d\n", __func__, 2);
-        return CAM_ERR_SYS;
-      }
-    }
+  if (-1 == ioctl (fd, VIDIOC_QBUF, buffer)) {
+    cam_driver_dbg ("%s: Error qbuf %d\n", __func__, 1);
+    return CAM_ERR_SYS;
+  }
+  if (-1 == ioctl (fd, VIDIOC_DQBUF, buffer)) {
+    cam_driver_dbg ("%s: Error dqbuf %d\n", __func__, 1);
+    return CAM_ERR_SYS;
+  }
+  mfldadvci->process_flash (advci_flash_stage_pre);
 
-    mfld_driver.flash_used = TRUE;
-    return CAM_ERR_NONE;
+  cam_driver_request_flash(fd, 1);
+  if (-1 == ioctl (fd, VIDIOC_QBUF, buffer)) {
+    cam_driver_dbg ("%s: Error qbuf %d\n", __func__, 1);
+    return CAM_ERR_SYS;
+  }
+  if (-1 == ioctl (fd, VIDIOC_DQBUF, buffer)) {
+    cam_driver_dbg ("%s: Error dqbuf %d\n", __func__, 1);
+    return CAM_ERR_SYS;
+  }
+  mfldadvci->process_flash (advci_flash_stage_main);
+  mfld_driver.flash_used = TRUE;
+  return CAM_ERR_NONE;
 }
 
 /* Discard the first two frames because of the first frame