fix up! Support new APIs for camera settings

[Version] 0.3.58
[Issue Type] Bug fix

Change-Id: Icb42aa2515b6fa534736f9b5f9240d2eada79a5e
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>

diff --git a/legacy/include/legacy_camera.h b/legacy/include/legacy_camera.h
index b1fa346..781c414 100644 (file)
--- a/legacy/include/legacy_camera.h
+++ b/legacy/include/legacy_camera.h
@@ -445,11 +445,13 @@ typedef enum {
  * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif
  */
 typedef enum {
-       CAMERA_ATTR_EXPOSURE_MODE_OFF = 0,   /**< Off */
-       CAMERA_ATTR_EXPOSURE_MODE_ALL,       /**< All mode */
-       CAMERA_ATTR_EXPOSURE_MODE_CENTER,    /**< Center mode */
-       CAMERA_ATTR_EXPOSURE_MODE_SPOT,      /**< Spot mode */
-       CAMERA_ATTR_EXPOSURE_MODE_CUSTOM,    /**< Custom mode */
+       CAMERA_ATTR_EXPOSURE_MODE_OFF = 0,          /**< Off */
+       CAMERA_ATTR_EXPOSURE_MODE_ALL,              /**< All mode */
+       CAMERA_ATTR_EXPOSURE_MODE_CENTER,           /**< Center mode */
+       CAMERA_ATTR_EXPOSURE_MODE_SPOT,             /**< Spot mode */
+       CAMERA_ATTR_EXPOSURE_MODE_CUSTOM,           /**< Custom mode */
+       CAMERA_ATTR_EXPOSURE_MODE_SHUTTER_PRIORITY, /**< Shutter priority mode (Since 7.5) */
+       CAMERA_ATTR_EXPOSURE_MODE_APERTURE_PRIORITY /**< Aperture priority mode (Since 7.5) */
 } camera_attr_exposure_mode_e;
 
 /**

diff --git a/legacy/src/legacy_camera.c b/legacy/src/legacy_camera.c
index c8fe18c..0906dea 100644 (file)
--- a/legacy/src/legacy_camera.c
+++ b/legacy/src/legacy_camera.c
@@ -2394,15 +2394,17 @@ int legacy_camera_attr_set_exposure_mode(camera_h camera, camera_attr_exposure_m
        int ret = MM_ERROR_NONE;
        camera_s *handle = (camera_s *)camera;
        int maptable[] = {
-               MM_CAMCORDER_AUTO_EXPOSURE_OFF,       /* CAMERA_ATTR_EXPOSURE_MODE_OFF */
-               MM_CAMCORDER_AUTO_EXPOSURE_ALL,       /* CAMERA_ATTR_EXPOSURE_MODE_ALL */
-               MM_CAMCORDER_AUTO_EXPOSURE_CENTER_1,  /* CAMERA_ATTR_EXPOSURE_MODE_CENTER */
-               MM_CAMCORDER_AUTO_EXPOSURE_SPOT_1,    /* CAMERA_ATTR_EXPOSURE_MODE_SPOT */
-               MM_CAMCORDER_AUTO_EXPOSURE_CUSTOM_1,  /* CAMERA_ATTR_EXPOSURE_MODE_CUSTOM */
+               MM_CAMCORDER_AUTO_EXPOSURE_OFF,                 /* CAMERA_ATTR_EXPOSURE_MODE_OFF */
+               MM_CAMCORDER_AUTO_EXPOSURE_ALL,                 /* CAMERA_ATTR_EXPOSURE_MODE_ALL */
+               MM_CAMCORDER_AUTO_EXPOSURE_CENTER_1,            /* CAMERA_ATTR_EXPOSURE_MODE_CENTER */
+               MM_CAMCORDER_AUTO_EXPOSURE_SPOT_1,              /* CAMERA_ATTR_EXPOSURE_MODE_SPOT */
+               MM_CAMCORDER_AUTO_EXPOSURE_CUSTOM_1,            /* CAMERA_ATTR_EXPOSURE_MODE_CUSTOM */
+               MM_CAMCORDER_AUTO_EXPOSURE_SHUTTER_PRIORITY,    /* CAMERA_ATTR_EXPOSURE_MODE_SHUTTER_PRIORITY */
+               MM_CAMCORDER_AUTO_EXPOSURE_APERTURE_PRIORITY    /* CAMERA_ATTR_EXPOSURE_MODE_APERTURE_PRIORITY */
        };
 
        camera_return_val_if_fail(handle, CAMERA_ERROR_INVALID_PARAMETER);
-       camera_return_val_if_fail(mode <= CAMERA_ATTR_EXPOSURE_MODE_CUSTOM, CAMERA_ERROR_INVALID_PARAMETER);
+       camera_return_val_if_fail(mode <= CAMERA_ATTR_EXPOSURE_MODE_APERTURE_PRIORITY, CAMERA_ERROR_INVALID_PARAMETER);
 
        ret = mm_camcorder_set_attributes(handle->mm_handle, NULL,
                MMCAM_CAMERA_EXPOSURE_MODE, maptable[mode],
@@ -2801,15 +2803,17 @@ int legacy_camera_attr_get_exposure_mode(camera_h camera, camera_attr_exposure_m
        int exposure_mode;
        camera_s *handle = (camera_s *)camera;
        int maptable[] = {
-               CAMERA_ATTR_EXPOSURE_MODE_OFF,        /* MM_CAMCORDER_AUTO_EXPOSURE_OFF */
-               CAMERA_ATTR_EXPOSURE_MODE_ALL,        /* MM_CAMCORDER_AUTO_EXPOSURE_ALL */
-               CAMERA_ATTR_EXPOSURE_MODE_CENTER,     /* MM_CAMCORDER_AUTO_EXPOSURE_CENTER_1 */
-               CAMERA_ATTR_EXPOSURE_MODE_CENTER,     /* MM_CAMCORDER_AUTO_EXPOSURE_CENTER_2 */
-               CAMERA_ATTR_EXPOSURE_MODE_CENTER,     /* MM_CAMCORDER_AUTO_EXPOSURE_CENTER_3 */
-               CAMERA_ATTR_EXPOSURE_MODE_SPOT,       /* MM_CAMCORDER_AUTO_EXPOSURE_SPOT_1 */
-               CAMERA_ATTR_EXPOSURE_MODE_SPOT,       /* MM_CAMCORDER_AUTO_EXPOSURE_SPOT_2 */
-               CAMERA_ATTR_EXPOSURE_MODE_CUSTOM,     /* MM_CAMCORDER_AUTO_EXPOSURE_CUSTOM_1 */
-               CAMERA_ATTR_EXPOSURE_MODE_CUSTOM      /* MM_CAMCORDER_AUTO_EXPOSURE_CUSTOM_2 */
+               CAMERA_ATTR_EXPOSURE_MODE_OFF,              /* MM_CAMCORDER_AUTO_EXPOSURE_OFF */
+               CAMERA_ATTR_EXPOSURE_MODE_ALL,              /* MM_CAMCORDER_AUTO_EXPOSURE_ALL */
+               CAMERA_ATTR_EXPOSURE_MODE_CENTER,           /* MM_CAMCORDER_AUTO_EXPOSURE_CENTER_1 */
+               CAMERA_ATTR_EXPOSURE_MODE_CENTER,           /* MM_CAMCORDER_AUTO_EXPOSURE_CENTER_2 */
+               CAMERA_ATTR_EXPOSURE_MODE_CENTER,           /* MM_CAMCORDER_AUTO_EXPOSURE_CENTER_3 */
+               CAMERA_ATTR_EXPOSURE_MODE_SPOT,             /* MM_CAMCORDER_AUTO_EXPOSURE_SPOT_1 */
+               CAMERA_ATTR_EXPOSURE_MODE_SPOT,             /* MM_CAMCORDER_AUTO_EXPOSURE_SPOT_2 */
+               CAMERA_ATTR_EXPOSURE_MODE_CUSTOM,           /* MM_CAMCORDER_AUTO_EXPOSURE_CUSTOM_1 */
+               CAMERA_ATTR_EXPOSURE_MODE_CUSTOM,           /* MM_CAMCORDER_AUTO_EXPOSURE_CUSTOM_2 */
+               CAMERA_ATTR_EXPOSURE_MODE_SHUTTER_PRIORITY, /* MM_CAMCORDER_AUTO_EXPOSURE_SHUTTER_PRIORITY */
+               CAMERA_ATTR_EXPOSURE_MODE_APERTURE_PRIORITY /* MM_CAMCORDER_AUTO_EXPOSURE_APERTURE_PRIORITY */
        };
 
        camera_return_val_if_fail(handle && mode, CAMERA_ERROR_INVALID_PARAMETER);
@@ -3319,15 +3323,17 @@ int legacy_camera_attr_foreach_supported_exposure_mode(camera_h camera, camera_a
        camera_s *handle = (camera_s *)camera;
        MMCamAttrsInfo info;
        int maptable[] = {
-               CAMERA_ATTR_EXPOSURE_MODE_OFF,        /* MM_CAMCORDER_AUTO_EXPOSURE_OFF */
-               CAMERA_ATTR_EXPOSURE_MODE_ALL,        /* MM_CAMCORDER_AUTO_EXPOSURE_ALL */
-               CAMERA_ATTR_EXPOSURE_MODE_CENTER,     /* MM_CAMCORDER_AUTO_EXPOSURE_CENTER_1 */
-               -1,                                   /* MM_CAMCORDER_AUTO_EXPOSURE_CENTER_2 */
-               -1,                                   /* MM_CAMCORDER_AUTO_EXPOSURE_CENTER_3 */
-               CAMERA_ATTR_EXPOSURE_MODE_SPOT,       /* MM_CAMCORDER_AUTO_EXPOSURE_SPOT_1 */
-               -1,                                   /* MM_CAMCORDER_AUTO_EXPOSURE_SPOT_2 */
-               CAMERA_ATTR_EXPOSURE_MODE_CUSTOM,     /* MM_CAMCORDER_AUTO_EXPOSURE_CUSTOM_1 */
-               -1                                    /* MM_CAMCORDER_AUTO_EXPOSURE_CUSTOM_2 */
+               CAMERA_ATTR_EXPOSURE_MODE_OFF,              /* MM_CAMCORDER_AUTO_EXPOSURE_OFF */
+               CAMERA_ATTR_EXPOSURE_MODE_ALL,              /* MM_CAMCORDER_AUTO_EXPOSURE_ALL */
+               CAMERA_ATTR_EXPOSURE_MODE_CENTER,           /* MM_CAMCORDER_AUTO_EXPOSURE_CENTER_1 */
+               -1,                                         /* MM_CAMCORDER_AUTO_EXPOSURE_CENTER_2 */
+               -1,                                         /* MM_CAMCORDER_AUTO_EXPOSURE_CENTER_3 */
+               CAMERA_ATTR_EXPOSURE_MODE_SPOT,             /* MM_CAMCORDER_AUTO_EXPOSURE_SPOT_1 */
+               -1,                                         /* MM_CAMCORDER_AUTO_EXPOSURE_SPOT_2 */
+               CAMERA_ATTR_EXPOSURE_MODE_CUSTOM,           /* MM_CAMCORDER_AUTO_EXPOSURE_CUSTOM_1 */
+               -1,                                         /* MM_CAMCORDER_AUTO_EXPOSURE_CUSTOM_2 */
+               CAMERA_ATTR_EXPOSURE_MODE_SHUTTER_PRIORITY, /* MM_CAMCORDER_AUTO_EXPOSURE_SHUTTER_PRIORITY */
+               CAMERA_ATTR_EXPOSURE_MODE_APERTURE_PRIORITY /* MM_CAMCORDER_AUTO_EXPOSURE_APERTURE_PRIORITY */
        };
 
        camera_return_val_if_fail(handle && foreach_cb, CAMERA_ERROR_INVALID_PARAMETER);
@@ -3338,7 +3344,7 @@ int legacy_camera_attr_foreach_supported_exposure_mode(camera_h camera, camera_a
 
        for (i = 0 ; i < info.int_array.count ; i++) {
                if (info.int_array.array[i] >= MM_CAMCORDER_AUTO_EXPOSURE_OFF &&
-                   info.int_array.array[i] <= MM_CAMCORDER_AUTO_EXPOSURE_CUSTOM_2) {
+                   info.int_array.array[i] <= MM_CAMCORDER_AUTO_EXPOSURE_APERTURE_PRIORITY) {
                        if (maptable[info.int_array.array[i]] != -1) {
                                if (!foreach_cb(maptable[info.int_array.array[i]], user_data))
                                        break;

diff --git a/packaging/mmsvc-camera.spec b/packaging/mmsvc-camera.spec
index 431e7cd..0fe7fdf 100644 (file)
--- a/packaging/mmsvc-camera.spec
+++ b/packaging/mmsvc-camera.spec
@@ -1,6 +1,6 @@
 Name:       mmsvc-camera
 Summary:    A Camera module for muse server
-Version:    0.3.57
+Version:    0.3.58
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0