Setting scene mode moved to correct place

Change-Id: Iee11732e740ab8397ac4578848cd1e67d737b805

diff --git a/gst-libs/atomisphal/mfld_cam.c b/gst-libs/atomisphal/mfld_cam.c
index 68db722..5666510 100644 (file)
--- a/gst-libs/atomisphal/mfld_cam.c
+++ b/gst-libs/atomisphal/mfld_cam.c
@@ -677,7 +677,7 @@ cam_set_zoom (int fd, float zoom)
     zoomval = 64;
 
   ret = cam_driver_set_zoom (fd, zoomval);
-  cam_driver_dbg ("%s\n set zoom to %u, return %d", __func__, zoomval, ret);
+  cam_driver_dbg ("%s\n set zoom to %u, return %d\n", __func__, zoomval, ret);
 
   return ret;
 }

diff --git a/gst-libs/gst/camera/gstmfldcameracontroliface.c b/gst-libs/gst/camera/gstmfldcameracontroliface.c
index bf0c11f..4640b5b 100644 (file)
--- a/gst-libs/gst/camera/gstmfldcameracontroliface.c
+++ b/gst-libs/gst/camera/gstmfldcameracontroliface.c
@@ -126,6 +126,7 @@ gst_camerasrc_camera_control_set_exposure(  GstCameraSrc * camerasrc,
        GstCameraSrcClass *bclass;
        gboolean opened;
        gboolean write = FALSE;
+       gboolean scene_override = FALSE;
        guint32 val;
 
        GST_DEBUG_OBJECT (camerasrc, "%s",__func__);
@@ -150,7 +151,7 @@ gst_camerasrc_camera_control_set_exposure(  GstCameraSrc * camerasrc,
        case GST_CAMERA_CONTROL_PROGRAM_MODE:
                GST_DEBUG_OBJECT (camerasrc, "GST_CAMERA_CONTROL_PROGRAM_MODE value:%d", value1);
                camerasrc->photoconf.scene_mode = value1;
-               write = TRUE;
+               write = scene_override = TRUE;
                break;
        case GST_CAMERA_CONTROL_EXPOSURE_MODE:
                GST_DEBUG_OBJECT (camerasrc, "GST_CAMERA_CONTROL_EXPOSURE_MODE value:%d", value1);
@@ -168,7 +169,7 @@ gst_camerasrc_camera_control_set_exposure(  GstCameraSrc * camerasrc,
        GST_OBJECT_UNLOCK (camerasrc);
 
        if (write && bclass->is_active (camerasrc)) {
-               ret = bclass->write_settings (camerasrc, &camerasrc->photoconf, FALSE);
+               ret = bclass->write_settings (camerasrc, &camerasrc->photoconf, scene_override);
        }
        GST_DEBUG_OBJECT (camerasrc, "%s ret:%d",__func__, ret);
 

diff --git a/gst/mfldv4l2cam/v4l2camsrc_calls.c b/gst/mfldv4l2cam/v4l2camsrc_calls.c
index f36e1fc..d3747db 100644 (file)
--- a/gst/mfldv4l2cam/v4l2camsrc_calls.c
+++ b/gst/mfldv4l2cam/v4l2camsrc_calls.c
@@ -3292,6 +3292,8 @@ gst_v4l2camsrc_write_settings (GstCameraSrc * camsrc,
       photoconf->scene_mode != GST_PHOTOGRAPHY_SCENE_MODE_MANUAL) {
     /* If scene override flag is set, we just leave the new settings in use */
     GST_DEBUG ("SCENE OVERRIDE, ext=%d", photoconf->scene_mode);
+       cam_feature_set (v4l2camsrc->video_fd, CAM_GENERAL_SCENE_MODE,
+               gst_v4l2camsrc_scene_map[photoconf->scene_mode]);
   } else {
     GST_DEBUG ("Normal settings");
     cam_feature_set (v4l2camsrc->video_fd, CAM_AWB_MODE,
@@ -3303,9 +3305,6 @@ gst_v4l2camsrc_write_settings (GstCameraSrc * camsrc,
     cam_feature_set (v4l2camsrc->video_fd, CAM_LIGHT_FLASH_MODE,
         gst_v4l2camsrc_flash_map[photoconf->flash_mode]);
 
-       cam_feature_set (v4l2camsrc->video_fd, CAM_GENERAL_SCENE_MODE,
-               gst_v4l2camsrc_scene_map[photoconf->scene_mode]);
-
     /* These will set exposure mode to MANUAL, is value is != 0 */
     cam_feature_set (v4l2camsrc->video_fd, CAM_EXPOSURE_MANUAL_TIME,
         photoconf->exposure);

diff --git a/packaging/mfldv4l2camsrc.changes b/packaging/mfldv4l2camsrc.changes
index c24061a..ee5b86b 100644 (file)
--- a/packaging/mfldv4l2camsrc.changes
+++ b/packaging/mfldv4l2camsrc.changes
@@ -1,3 +1,6 @@
+* Fri Nov 23 2012 Telle-Tiia Pitkänen <telle-tiia.pitkanen@ixonos.com> accepted/trunk/20121120.150732@187c1fa
+- Setting scene mode moved to correct place
+
 * Thu Nov 22 2012 Marko Ollonen <marko.ollonen@ixonos.com> accepted/trunk/20121120.150732@36839a7
 - wrapper for 3a added.
 - Makernote cleanup.