fix bugs came from 3a lib dynamic linking change.

Change-Id: I9d152ea6aaec794a026af625de17bda323d8a7c4

diff --git a/gst-libs/atomisphal/gstv4l2mfldadvci.c b/gst-libs/atomisphal/gstv4l2mfldadvci.c
index e63b281..d9ac6b4 100644 (file)
--- a/gst-libs/atomisphal/gstv4l2mfldadvci.c
+++ b/gst-libs/atomisphal/gstv4l2mfldadvci.c
@@ -19,7 +19,6 @@
 
 #include "gstv4l2mfldadvci.h"
 #include <linux/videodev2.h>
-#include <math.h>
 #include <sys/ioctl.h>
 #include <gst/gst.h>
 
@@ -276,12 +275,12 @@ wrapper_default_af_assist_light_needed(gboolean *need)
 {
 }
 
-static ci_adv_Err wrapper_default_AeSetManualIso(int sensitivity)
+static ci_adv_Err wrapper_default_AeSetManualIso(float sensitivity)
 {
   return 0;
 }
 
-static ci_adv_Err wrapper_default_AeGetManualIso(int *sensitivity)
+static ci_adv_Err wrapper_default_AeGetManualIso(float *sensitivity)
 {
   return 0;
 }

diff --git a/gst-libs/atomisphal/gstv4l2mfldadvci.h b/gst-libs/atomisphal/gstv4l2mfldadvci.h
index d24fc78..575624c 100644 (file)
--- a/gst-libs/atomisphal/gstv4l2mfldadvci.h
+++ b/gst-libs/atomisphal/gstv4l2mfldadvci.h
@@ -220,8 +220,8 @@ struct _GstV4l2MFLDAdvCI
   void (*AeSetWindow)(advci_window *window);
 
   void (*AeGetWindow)(advci_window *window);
-  ci_adv_Err (*AeSetIso)(int sensitivity);
-  ci_adv_Err (*AeGetIso)(int *sensitivity);
+  ci_adv_Err (*AeSetIso)(float sensitivity);
+  ci_adv_Err (*AeGetIso)(float *sensitivity);
 
   void (*AfSetMode)(advci_af_mode mode);
   advci_af_mode (*AfGetMode)(void);
@@ -244,7 +244,7 @@ struct _GstV4l2MFLDAdvCI
 
   /* AWB Light Source */
   void (*AwbSetLightSource)(advci_awb_light_source ls);
-  advci_awb_light_source (*AwbGetLightSource)(v);
+  advci_awb_light_source (*AwbGetLightSource)(void);
 
   ci_adv_Err (*AeGetWindowsNum)(int *num);
   void (*AwbVersion)(int * major, int * minor);

diff --git a/gst-libs/atomisphal/mfld_cam.c b/gst-libs/atomisphal/mfld_cam.c
index b9fb3c9..26d4a80 100644 (file)
--- a/gst-libs/atomisphal/mfld_cam.c
+++ b/gst-libs/atomisphal/mfld_cam.c
@@ -21,6 +21,7 @@
 #include <sys/mman.h>
 #include <string.h>
 #include <sys/ioctl.h>
+#include <math.h>
 
 #include <unistd.h>
 
@@ -213,7 +214,7 @@ get_wb_mode (int *wb_mode)
     return CAM_ERR_NONE;
   }
   //Manual Mode, check the error?
-  mfldadvci->AwbGetLightSource (&ls);
+  ls = mfldadvci->AwbGetLightSource();
   switch (ls) {
     case advci_awb_light_source_filament_lamp:
       *wb_mode = CAM_AWB_MODE_TUNGSTEN;
@@ -316,7 +317,7 @@ set_iso_speed (int iso)
     if (iso <=0)
       return CAM_ERR_PARAM;
     sv = log10((float)iso / 3.125) / log10(2.0);
-    ret = mfldadvci->AeSetIso(mfld_cam_settings.iso_speed);
+    ret = mfldadvci->AeSetIso(sv);
   }
   return ret;
 }