Changed functions

 ci_adv_ae_set_metering_mode(mode) and  ci_adv_ae_get_metering_mode(mode);   to  ci_adv_af_set and get
in file v4l2camsrc_call.c fixes to err parameter at function gst_v4l2cmasrc_set_capture_mode

diff --git a/gst-libs/atomisphal/gstv4l2mfldadvci.c b/gst-libs/atomisphal/gstv4l2mfldadvci.c
index 2aa68d3..8c115f8 100644 (file)
--- a/gst-libs/atomisphal/gstv4l2mfldadvci.c
+++ b/gst-libs/atomisphal/gstv4l2mfldadvci.c
@@ -398,14 +398,14 @@ static void
 lib_3a_AfSetMeteringMode(ia_3a_af_metering_mode mode)
 {
   cam_lib_3a_dbg("%s:%d\n", __func__, __LINE__);
-  ci_adv_ae_set_metering_mode(mode);
+  ci_adv_af_set_metering_mode(mode);
 }
 
 static void
 lib_3a_AfGetMeteringMode(ia_3a_af_metering_mode *mode)
 {
   cam_lib_3a_dbg("%s:%d\n", __func__, __LINE__);
-  ci_adv_ae_get_metering_mode(mode);
+  ci_adv_af_get_metering_mode(mode);
 }
 
 static void

diff --git a/gst/mfldv4l2cam/v4l2camsrc_calls.c b/gst/mfldv4l2cam/v4l2camsrc_calls.c
index 13a7f53..f36e1fc 100644 (file)
--- a/gst/mfldv4l2cam/v4l2camsrc_calls.c
+++ b/gst/mfldv4l2cam/v4l2camsrc_calls.c
@@ -3447,7 +3447,7 @@ gst_v4l2camsrc_set_capture_mode (GstCameraSrc * camsrc,
 {
   GstMFLDV4l2CamSrc *v4l2camsrc;
   gboolean ret = FALSE;
-  cam_err_t err;
+  int err; //cam_err_t err;
   cam_capture_mode_t cam_mode;
   static const gchar *cmodes[] = { "VIEWFINDER", "STILL", "VIDEO" };
   struct v4l2_streamparm parm;
@@ -3468,8 +3468,8 @@ gst_v4l2camsrc_set_capture_mode (GstCameraSrc * camsrc,
     memset (&parm, 0x00, sizeof (struct v4l2_streamparm));
 
     parm.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-    ret = ioctl(fd, VIDIOC_G_PARM, &parm);
-    if (ret < 0) {
+    err = ioctl(fd, VIDIOC_G_PARM, &parm);
+    if (err < 0) {
       GST_DEBUG(stderr,"Unable to get frame rate: %s (%d).\n",
       strerror(errno), errno);
       goto done;
@@ -3503,7 +3503,7 @@ gst_v4l2camsrc_set_capture_mode (GstCameraSrc * camsrc,
       GST_DEBUG("Switch Mode failed !\n");
     }
 
-    ret = (err == CAM_ERR_NONE);
+    ret = (err >= 0);
     GST_DEBUG_OBJECT (v4l2camsrc, "Setting capture mode done: %s",
         ret ? "OK" : "FAIL");
   }

diff --git a/packaging/mfldv4l2camsrc.changes b/packaging/mfldv4l2camsrc.changes
index fc70dc7..c5ddd32 100644 (file)
--- a/packaging/mfldv4l2camsrc.changes
+++ b/packaging/mfldv4l2camsrc.changes
@@ -1,3 +1,6 @@
+* Tue Nov 20 2012 Timo <timo.toikkanen@ixonos.com> accepted/trunk/20121119.191102@de82248
+- Changed functions
+
 * Mon Nov 19 2012 Telle-Tiia Pitkänen <telle-tiia.pitkanen@ixonos.com> submit/trunk/20121119.083552@4696d92
 - Exposure features implemented: