Add sub functions to remove duplicated code

[Version] 0.4.110
[Issue Type] Clean up

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

diff --git a/include/camera_private.h b/include/camera_private.h
index 18b16b8..a5b9156 100644 (file)
--- a/include/camera_private.h
+++ b/include/camera_private.h
@@ -289,6 +289,9 @@ void _camera_update_api_waiting(camera_cb_info_s *cb_info, int api, int value);
 void _camera_send_message_get_return(camera_cb_info_s *cb_info, muse_camera_api_e api, char *msg,
        int time_out, int *ret);
 int _camera_get_log_level(void);
+int _camera_attr_set_level(camera_h camera, muse_camera_api_e api, int level);
+int _camera_attr_get_level(camera_h camera, muse_camera_api_e api, muse_camera_get_int_e get_index, int *level);
+int _camera_attr_get_range(camera_h camera, muse_camera_api_e api, muse_camera_get_int_pair_e get_index, int *min, int *max);
 
 typedef bool (*camera_supported_cb_param1)(int param, void *user_data);
 typedef bool (*camera_supported_cb_param2)(int param1, int param2, void *user_data);

diff --git a/packaging/capi-media-camera.spec b/packaging/capi-media-camera.spec
index f0b554b..e4a8e42 100644 (file)
--- a/packaging/capi-media-camera.spec
+++ b/packaging/capi-media-camera.spec
@@ -1,6 +1,6 @@
 Name:       capi-media-camera
 Summary:    A Camera API
-Version:    0.4.109
+Version:    0.4.110
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/camera.c b/src/camera.c
index 4cf54ed..f061b94 100644 (file)
--- a/src/camera.c
+++ b/src/camera.c
@@ -4728,127 +4728,37 @@ int camera_attr_set_iso(camera_h camera, camera_attr_iso_e iso)
 
 int camera_attr_set_gain(camera_h camera, int level)
 {
-       int ret = CAMERA_ERROR_NONE;
-       camera_cli_s *pc = (camera_cli_s *)camera;
-       muse_camera_api_e api = MUSE_CAMERA_API_ATTR_SET_GAIN;
-       camera_msg_param param;
-
-       CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
-
-       CAM_LOG_INFO("Enter");
-
-       CAMERA_MSG_PARAM_SET(param, INT, level);
-
-       _camera_msg_send_param1(api, pc->cb_info, &ret, &param, CAMERA_CB_TIMEOUT);
-
-       CAM_LOG_INFO("ret : 0x%x", ret);
-
-       return ret;
+       return _camera_attr_set_level(camera, MUSE_CAMERA_API_ATTR_SET_GAIN, level);
 }
 
 
 int camera_attr_set_brightness(camera_h camera, int level)
 {
-       int ret = CAMERA_ERROR_NONE;
-       camera_cli_s *pc = (camera_cli_s *)camera;
-       muse_camera_api_e api = MUSE_CAMERA_API_ATTR_SET_BRIGHTNESS;
-       camera_msg_param param;
-
-       CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
-
-       CAM_LOG_INFO("Enter");
-
-       CAMERA_MSG_PARAM_SET(param, INT, level);
-
-       _camera_msg_send_param1(api, pc->cb_info, &ret, &param, CAMERA_CB_TIMEOUT);
-
-       CAM_LOG_INFO("ret : 0x%x", ret);
-
-       return ret;
+       return _camera_attr_set_level(camera, MUSE_CAMERA_API_ATTR_SET_BRIGHTNESS, level);
 }
 
 
 int camera_attr_set_contrast(camera_h camera, int level)
 {
-       int ret = CAMERA_ERROR_NONE;
-       camera_cli_s *pc = (camera_cli_s *)camera;
-       muse_camera_api_e api = MUSE_CAMERA_API_ATTR_SET_CONTRAST;
-       camera_msg_param param;
-
-       CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
-
-       CAM_LOG_INFO("Enter");
-
-       CAMERA_MSG_PARAM_SET(param, INT, level);
-
-       _camera_msg_send_param1(api, pc->cb_info, &ret, &param, CAMERA_CB_TIMEOUT);
-
-       CAM_LOG_INFO("ret : 0x%x", ret);
-
-       return ret;
+       return _camera_attr_set_level(camera, MUSE_CAMERA_API_ATTR_SET_CONTRAST, level);
 }
 
 
 int camera_attr_set_hue(camera_h camera, int level)
 {
-       int ret = CAMERA_ERROR_NONE;
-       camera_cli_s *pc = (camera_cli_s *)camera;
-       muse_camera_api_e api = MUSE_CAMERA_API_ATTR_SET_HUE;
-       camera_msg_param param;
-
-       CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
-
-       CAM_LOG_INFO("Enter");
-
-       CAMERA_MSG_PARAM_SET(param, INT, level);
-
-       _camera_msg_send_param1(api, pc->cb_info, &ret, &param, CAMERA_CB_TIMEOUT);
-
-       CAM_LOG_INFO("ret : 0x%x", ret);
-
-       return ret;
+       return _camera_attr_set_level(camera, MUSE_CAMERA_API_ATTR_SET_HUE, level);
 }
 
 
 int camera_attr_set_saturation(camera_h camera, int level)
 {
-       int ret = CAMERA_ERROR_NONE;
-       camera_cli_s *pc = (camera_cli_s *)camera;
-       muse_camera_api_e api = MUSE_CAMERA_API_ATTR_SET_SATURATION;
-       camera_msg_param param;
-
-       CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
-
-       CAM_LOG_INFO("Enter");
-
-       CAMERA_MSG_PARAM_SET(param, INT, level);
-
-       _camera_msg_send_param1(api, pc->cb_info, &ret, &param, CAMERA_CB_TIMEOUT);
-
-       CAM_LOG_INFO("ret : 0x%x", ret);
-
-       return ret;
+       return _camera_attr_set_level(camera, MUSE_CAMERA_API_ATTR_SET_SATURATION, level);
 }
 
 
 int camera_attr_set_sharpness(camera_h camera, int level)
 {
-       int ret = CAMERA_ERROR_NONE;
-       camera_cli_s *pc = (camera_cli_s *)camera;
-       muse_camera_api_e api = MUSE_CAMERA_API_ATTR_SET_SHARPNESS;
-       camera_msg_param param;
-
-       CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
-
-       CAM_LOG_INFO("Enter");
-
-       CAMERA_MSG_PARAM_SET(param, INT, level);
-
-       _camera_msg_send_param1(api, pc->cb_info, &ret, &param, CAMERA_CB_TIMEOUT);
-
-       CAM_LOG_INFO("ret : 0x%x", ret);
-
-       return ret;
+       return _camera_attr_set_level(camera, MUSE_CAMERA_API_ATTR_SET_SHARPNESS, level);
 }
 
 
@@ -5075,27 +4985,10 @@ int camera_attr_get_zoom(camera_h camera, int *zoom)
 
 int camera_attr_get_zoom_range(camera_h camera, int *min, int *max)
 {
-       int ret = CAMERA_ERROR_NONE;
-       camera_cli_s *pc = (camera_cli_s *)camera;
-       muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_ZOOM_RANGE;
-
-       if (!pc || !pc->cb_info || !min || !max) {
-               CAM_LOG_ERROR("NULL pointer %p %p %p", pc, min, max);
-               return CAMERA_ERROR_INVALID_PARAMETER;
-       }
-
-       CAM_LOG_INFO("Enter");
-
-       _camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
-
-       if (ret == CAMERA_ERROR_NONE) {
-               *min = pc->cb_info->get_int_pair[MUSE_CAMERA_GET_INT_PAIR_ZOOM_RANGE][0];
-               *max = pc->cb_info->get_int_pair[MUSE_CAMERA_GET_INT_PAIR_ZOOM_RANGE][1];
-       }
-
-       CAM_LOG_INFO("ret : 0x%x", ret);
-
-       return ret;
+       return _camera_attr_get_range(camera,
+               MUSE_CAMERA_API_ATTR_GET_ZOOM_RANGE,
+               MUSE_CAMERA_GET_INT_PAIR_ZOOM_RANGE,
+               min, max);
 }
 
 
@@ -5173,27 +5066,10 @@ int camera_attr_get_exposure(camera_h camera, int *value)
 
 int camera_attr_get_exposure_range(camera_h camera, int *min, int *max)
 {
-       int ret = CAMERA_ERROR_NONE;
-       camera_cli_s *pc = (camera_cli_s *)camera;
-       muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_EXPOSURE_RANGE;
-
-       if (!pc || !pc->cb_info || !min || !max) {
-               CAM_LOG_ERROR("NULL pointer %p %p %p", pc, min, max);
-               return CAMERA_ERROR_INVALID_PARAMETER;
-       }
-
-       CAM_LOG_INFO("Enter");
-
-       _camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
-
-       if (ret == CAMERA_ERROR_NONE) {
-               *min = pc->cb_info->get_int_pair[MUSE_CAMERA_GET_INT_PAIR_EXPOSURE_RANGE][0];
-               *max = pc->cb_info->get_int_pair[MUSE_CAMERA_GET_INT_PAIR_EXPOSURE_RANGE][1];
-       }
-
-       CAM_LOG_INFO("ret : 0x%x", ret);
-
-       return ret;
+       return _camera_attr_get_range(camera,
+               MUSE_CAMERA_API_ATTR_GET_EXPOSURE_RANGE,
+               MUSE_CAMERA_GET_INT_PAIR_EXPOSURE_RANGE,
+               min, max);
 }
 
 
@@ -5223,51 +5099,19 @@ int camera_attr_get_iso(camera_h camera, camera_attr_iso_e *iso)
 
 int camera_attr_get_gain(camera_h camera, int *level)
 {
-       int ret = CAMERA_ERROR_NONE;
-       camera_cli_s *pc = (camera_cli_s *)camera;
-       muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_GAIN;
-
-       if (!pc || !pc->cb_info || !level) {
-               CAM_LOG_ERROR("NULL pointer %p %p", pc, level);
-               return CAMERA_ERROR_INVALID_PARAMETER;
-       }
-
-       CAM_LOG_INFO("Enter");
-
-       _camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
-
-       if (ret == CAMERA_ERROR_NONE)
-               *level = pc->cb_info->get_int[MUSE_CAMERA_GET_INT_GAIN];
-
-       CAM_LOG_INFO("ret : 0x%x", ret);
-
-       return ret;
+       return _camera_attr_get_level(camera,
+               MUSE_CAMERA_API_ATTR_GET_GAIN,
+               MUSE_CAMERA_GET_INT_GAIN,
+               level);
 }
 
 
 int camera_attr_get_gain_range(camera_h camera, int *min, int *max)
 {
-       int ret = CAMERA_ERROR_NONE;
-       camera_cli_s *pc = (camera_cli_s *)camera;
-       muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_GAIN_RANGE;
-
-       if (!pc || !pc->cb_info || !min || !max) {
-               CAM_LOG_ERROR("NULL pointer %p %p %p", pc, min, max);
-               return CAMERA_ERROR_INVALID_PARAMETER;
-       }
-
-       CAM_LOG_INFO("Enter");
-
-       _camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
-
-       if (ret == CAMERA_ERROR_NONE) {
-               *min = pc->cb_info->get_int_pair[MUSE_CAMERA_GET_INT_PAIR_GAIN_RANGE][0];
-               *max = pc->cb_info->get_int_pair[MUSE_CAMERA_GET_INT_PAIR_GAIN_RANGE][1];
-       }
-
-       CAM_LOG_INFO("ret : 0x%x", ret);
-
-       return ret;
+       return _camera_attr_get_range(camera,
+               MUSE_CAMERA_API_ATTR_GET_GAIN_RANGE,
+               MUSE_CAMERA_GET_INT_PAIR_GAIN_RANGE,
+               min, max);
 }
 
 
@@ -5297,255 +5141,91 @@ int camera_attr_get_gain_step(camera_h camera, int *step)
 
 int camera_attr_get_brightness(camera_h camera, int *level)
 {
-       int ret = CAMERA_ERROR_NONE;
-       camera_cli_s *pc = (camera_cli_s *)camera;
-       muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_BRIGHTNESS;
-
-       if (!pc || !pc->cb_info || !level) {
-               CAM_LOG_ERROR("NULL pointer %p %p", pc, level);
-               return CAMERA_ERROR_INVALID_PARAMETER;
-       }
-
-       CAM_LOG_INFO("Enter");
-
-       _camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
-
-       if (ret == CAMERA_ERROR_NONE)
-               *level = pc->cb_info->get_int[MUSE_CAMERA_GET_INT_BRIGHTNESS];
-
-       CAM_LOG_INFO("ret : 0x%x", ret);
-
-       return ret;
+       return _camera_attr_get_level(camera,
+               MUSE_CAMERA_API_ATTR_GET_BRIGHTNESS,
+               MUSE_CAMERA_GET_INT_BRIGHTNESS,
+               level);
 }
 
 
 int camera_attr_get_brightness_range(camera_h camera, int *min, int *max)
 {
-       int ret = CAMERA_ERROR_NONE;
-       camera_cli_s *pc = (camera_cli_s *)camera;
-       muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_BRIGHTNESS_RANGE;
-
-       if (!pc || !pc->cb_info || !min || !max) {
-               CAM_LOG_ERROR("NULL pointer %p %p %p", pc, min, max);
-               return CAMERA_ERROR_INVALID_PARAMETER;
-       }
-
-       CAM_LOG_INFO("Enter");
-
-       _camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
-
-       if (ret == CAMERA_ERROR_NONE) {
-               *min = pc->cb_info->get_int_pair[MUSE_CAMERA_GET_INT_PAIR_BRIGHTNESS_RANGE][0];
-               *max = pc->cb_info->get_int_pair[MUSE_CAMERA_GET_INT_PAIR_BRIGHTNESS_RANGE][1];
-       }
-
-       CAM_LOG_INFO("ret : 0x%x", ret);
-
-       return ret;
+       return _camera_attr_get_range(camera,
+               MUSE_CAMERA_API_ATTR_GET_BRIGHTNESS_RANGE,
+               MUSE_CAMERA_GET_INT_PAIR_BRIGHTNESS_RANGE,
+               min, max);
 }
 
 
 int camera_attr_get_contrast(camera_h camera, int *level)
 {
-       int ret = CAMERA_ERROR_NONE;
-       camera_cli_s *pc = (camera_cli_s *)camera;
-       muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_CONTRAST;
-
-       if (!pc || !pc->cb_info || !level) {
-               CAM_LOG_ERROR("NULL pointer %p %p", pc, level);
-               return CAMERA_ERROR_INVALID_PARAMETER;
-       }
-
-       CAM_LOG_INFO("Enter");
-
-       _camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
-
-       if (ret == CAMERA_ERROR_NONE)
-               *level = pc->cb_info->get_int[MUSE_CAMERA_GET_INT_CONTRAST];
-
-       CAM_LOG_INFO("ret : 0x%x", ret);
-
-       return ret;
+       return _camera_attr_get_level(camera,
+               MUSE_CAMERA_API_ATTR_GET_CONTRAST,
+               MUSE_CAMERA_GET_INT_CONTRAST,
+               level);
 }
 
 
 int camera_attr_get_contrast_range(camera_h camera, int *min, int *max)
 {
-       int ret = CAMERA_ERROR_NONE;
-       camera_cli_s *pc = (camera_cli_s *)camera;
-       muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_CONTRAST_RANGE;
-
-       if (!pc || !pc->cb_info || !min || !max) {
-               CAM_LOG_ERROR("NULL pointer %p %p %p", pc, min, max);
-               return CAMERA_ERROR_INVALID_PARAMETER;
-       }
-
-       CAM_LOG_INFO("Enter");
-
-       _camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
-
-       if (ret == CAMERA_ERROR_NONE) {
-               *min = pc->cb_info->get_int_pair[MUSE_CAMERA_GET_INT_PAIR_CONTRAST_RANGE][0];
-               *max = pc->cb_info->get_int_pair[MUSE_CAMERA_GET_INT_PAIR_CONTRAST_RANGE][1];
-               CAM_LOG_INFO("min %d, max %d", *min, *max);
-       }
-
-       CAM_LOG_INFO("ret : 0x%x", ret);
-
-       return ret;
+       return _camera_attr_get_range(camera,
+               MUSE_CAMERA_API_ATTR_GET_CONTRAST_RANGE,
+               MUSE_CAMERA_GET_INT_PAIR_CONTRAST_RANGE,
+               min, max);
 }
 
 
 int camera_attr_get_hue(camera_h camera, int *level)
 {
-       int ret = CAMERA_ERROR_NONE;
-       camera_cli_s *pc = (camera_cli_s *)camera;
-       muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_HUE;
-
-       if (!pc || !pc->cb_info || !level) {
-               CAM_LOG_ERROR("NULL pointer %p %p", pc, level);
-               return CAMERA_ERROR_INVALID_PARAMETER;
-       }
-
-       CAM_LOG_INFO("Enter");
-
-       _camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
-
-       if (ret == CAMERA_ERROR_NONE)
-               *level = pc->cb_info->get_int[MUSE_CAMERA_GET_INT_HUE];
-
-       CAM_LOG_INFO("ret : 0x%x", ret);
-
-       return ret;
+       return _camera_attr_get_level(camera,
+               MUSE_CAMERA_API_ATTR_GET_HUE,
+               MUSE_CAMERA_GET_INT_HUE,
+               level);
 }
 
 
 int camera_attr_get_hue_range(camera_h camera, int *min, int *max)
 {
-       int ret = CAMERA_ERROR_NONE;
-       camera_cli_s *pc = (camera_cli_s *)camera;
-       muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_HUE_RANGE;
-
-       if (!pc || !pc->cb_info || !min || !max) {
-               CAM_LOG_ERROR("NULL pointer %p %p %p", pc, min, max);
-               return CAMERA_ERROR_INVALID_PARAMETER;
-       }
-
-       CAM_LOG_INFO("Enter");
-
-       _camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
-
-       if (ret == CAMERA_ERROR_NONE) {
-               *min = pc->cb_info->get_int_pair[MUSE_CAMERA_GET_INT_PAIR_HUE_RANGE][0];
-               *max = pc->cb_info->get_int_pair[MUSE_CAMERA_GET_INT_PAIR_HUE_RANGE][1];
-               CAM_LOG_INFO("min %d, max %d", *min, *max);
-       }
-
-       CAM_LOG_INFO("ret : 0x%x", ret);
-
-       return ret;
+       return _camera_attr_get_range(camera,
+               MUSE_CAMERA_API_ATTR_GET_HUE_RANGE,
+               MUSE_CAMERA_GET_INT_PAIR_HUE_RANGE,
+               min, max);
 }
 
 
 int camera_attr_get_saturation(camera_h camera, int *level)
 {
-       int ret = CAMERA_ERROR_NONE;
-       camera_cli_s *pc = (camera_cli_s *)camera;
-       muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_SATURATION;
-
-       if (!pc || !pc->cb_info || !level) {
-               CAM_LOG_ERROR("NULL pointer %p %p", pc, level);
-               return CAMERA_ERROR_INVALID_PARAMETER;
-       }
-
-       CAM_LOG_INFO("Enter");
-
-       _camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
-
-       if (ret == CAMERA_ERROR_NONE)
-               *level = pc->cb_info->get_int[MUSE_CAMERA_GET_INT_SATURATION];
-
-       CAM_LOG_INFO("ret : 0x%x", ret);
-
-       return ret;
+       return _camera_attr_get_level(camera,
+               MUSE_CAMERA_API_ATTR_GET_SATURATION,
+               MUSE_CAMERA_GET_INT_SATURATION,
+               level);
 }
 
 
 int camera_attr_get_saturation_range(camera_h camera, int *min, int *max)
 {
-       int ret = CAMERA_ERROR_NONE;
-       camera_cli_s *pc = (camera_cli_s *)camera;
-       muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_SATURATION_RANGE;
-
-       if (!pc || !pc->cb_info || !min || !max) {
-               CAM_LOG_ERROR("NULL pointer %p %p %p", pc, min, max);
-               return CAMERA_ERROR_INVALID_PARAMETER;
-       }
-
-       CAM_LOG_INFO("Enter");
-
-       _camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
-
-       if (ret == CAMERA_ERROR_NONE) {
-               *min = pc->cb_info->get_int_pair[MUSE_CAMERA_GET_INT_PAIR_SATURATION_RANGE][0];
-               *max = pc->cb_info->get_int_pair[MUSE_CAMERA_GET_INT_PAIR_SATURATION_RANGE][1];
-               CAM_LOG_INFO("min %d, max %d", *min, *max);
-       }
-
-       CAM_LOG_INFO("ret : 0x%x", ret);
-
-       return ret;
+       return _camera_attr_get_range(camera,
+               MUSE_CAMERA_API_ATTR_GET_SATURATION_RANGE,
+               MUSE_CAMERA_GET_INT_PAIR_SATURATION_RANGE,
+               min, max);
 }
 
 
 int camera_attr_get_sharpness(camera_h camera, int *level)
 {
-       int ret = CAMERA_ERROR_NONE;
-       camera_cli_s *pc = (camera_cli_s *)camera;
-       muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_SHARPNESS;
-
-       if (!pc || !pc->cb_info || !level) {
-               CAM_LOG_ERROR("NULL pointer %p %p", pc, level);
-               return CAMERA_ERROR_INVALID_PARAMETER;
-       }
-
-       CAM_LOG_INFO("Enter");
-
-       _camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
-
-       if (ret == CAMERA_ERROR_NONE)
-               *level = pc->cb_info->get_int[MUSE_CAMERA_GET_INT_SHARPNESS];
-
-       CAM_LOG_INFO("ret : 0x%x", ret);
-
-       return ret;
+       return _camera_attr_get_level(camera,
+               MUSE_CAMERA_API_ATTR_GET_SHARPNESS,
+               MUSE_CAMERA_GET_INT_SHARPNESS,
+               level);
 }
 
 
 int camera_attr_get_sharpness_range(camera_h camera, int *min, int *max)
 {
-       int ret = CAMERA_ERROR_NONE;
-       camera_cli_s *pc = (camera_cli_s *)camera;
-       muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_SHARPNESS_RANGE;
-
-       if (!pc || !pc->cb_info || !min || !max) {
-               CAM_LOG_ERROR("NULL pointer %p %p %p", pc, min, max);
-               return CAMERA_ERROR_INVALID_PARAMETER;
-       }
-
-       CAM_LOG_INFO("Enter");
-
-       _camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
-
-       if (ret == CAMERA_ERROR_NONE) {
-               *min = pc->cb_info->get_int_pair[MUSE_CAMERA_GET_INT_PAIR_SHARPNESS_RANGE][0];
-               *max = pc->cb_info->get_int_pair[MUSE_CAMERA_GET_INT_PAIR_SHARPNESS_RANGE][1];
-               CAM_LOG_INFO("min %d, max %d", *min, *max);
-       }
-
-       CAM_LOG_INFO("ret : 0x%x", ret);
-
-       return ret;
+       return _camera_attr_get_range(camera,
+               MUSE_CAMERA_API_ATTR_GET_SHARPNESS_RANGE,
+               MUSE_CAMERA_GET_INT_PAIR_SHARPNESS_RANGE,
+               min, max);
 }
 
 
@@ -5599,27 +5279,10 @@ int camera_attr_get_whitebalance_temperature(camera_h camera, int *temperature)
 
 int camera_attr_get_whitebalance_temperature_range(camera_h camera, int *min, int *max)
 {
-       int ret = CAMERA_ERROR_NONE;
-       camera_cli_s *pc = (camera_cli_s *)camera;
-       muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_WHITEBALANCE_TEMPERATURE_RANGE;
-
-       if (!pc || !pc->cb_info || !min || !max) {
-               CAM_LOG_ERROR("NULL pointer %p %p %p", pc, min, max);
-               return CAMERA_ERROR_INVALID_PARAMETER;
-       }
-
-       CAM_LOG_INFO("Enter");
-
-       _camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
-
-       if (ret == CAMERA_ERROR_NONE) {
-               *min = pc->cb_info->get_int_pair[MUSE_CAMERA_GET_INT_PAIR_WHITE_BALANCE_TEMPERATURE_RANGE][0];
-               *max = pc->cb_info->get_int_pair[MUSE_CAMERA_GET_INT_PAIR_WHITE_BALANCE_TEMPERATURE_RANGE][1];
-       }
-
-       CAM_LOG_INFO("ret : 0x%x", ret);
-
-       return ret;
+       return _camera_attr_get_range(camera,
+               MUSE_CAMERA_API_ATTR_GET_WHITEBALANCE_TEMPERATURE_RANGE,
+               MUSE_CAMERA_GET_INT_PAIR_WHITE_BALANCE_TEMPERATURE_RANGE,
+               min, max);
 }
 
 
@@ -6506,27 +6169,10 @@ int camera_attr_get_pan(camera_h camera, int *pan_step)
 
 int camera_attr_get_pan_range(camera_h camera, int *min, int *max)
 {
-       int ret = CAMERA_ERROR_NONE;
-       camera_cli_s *pc = (camera_cli_s *)camera;
-       muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_PAN_RANGE;
-
-       if (!pc || !pc->cb_info || !min || !max) {
-               CAM_LOG_ERROR("NULL pointer %p %p %p", pc, min, max);
-               return CAMERA_ERROR_INVALID_PARAMETER;
-       }
-
-       CAM_LOG_INFO("Enter");
-
-       _camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
-
-       if (ret == CAMERA_ERROR_NONE) {
-               *min = pc->cb_info->get_int_pair[MUSE_CAMERA_GET_INT_PAIR_PAN_RANGE][0];
-               *max = pc->cb_info->get_int_pair[MUSE_CAMERA_GET_INT_PAIR_PAN_RANGE][1];
-       }
-
-       CAM_LOG_INFO("ret : 0x%x", ret);
-
-       return ret;
+       return _camera_attr_get_range(camera,
+               MUSE_CAMERA_API_ATTR_GET_PAN_RANGE,
+               MUSE_CAMERA_GET_INT_PAIR_PAN_RANGE,
+               min, max);
 }
 
 
@@ -6580,27 +6226,10 @@ int camera_attr_get_tilt(camera_h camera, int *tilt_step)
 
 int camera_attr_get_tilt_range(camera_h camera, int *min, int *max)
 {
-       int ret = CAMERA_ERROR_NONE;
-       camera_cli_s *pc = (camera_cli_s *)camera;
-       muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_TILT_RANGE;
-
-       if (!pc || !pc->cb_info || !min || !max) {
-               CAM_LOG_ERROR("NULL pointer %p %p %p", pc, min, max);
-               return CAMERA_ERROR_INVALID_PARAMETER;
-       }
-
-       CAM_LOG_INFO("Enter");
-
-       _camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
-
-       if (ret == CAMERA_ERROR_NONE) {
-               *min = pc->cb_info->get_int_pair[MUSE_CAMERA_GET_INT_PAIR_TILT_RANGE][0];
-               *max = pc->cb_info->get_int_pair[MUSE_CAMERA_GET_INT_PAIR_TILT_RANGE][1];
-       }
-
-       CAM_LOG_INFO("ret : 0x%x", ret);
-
-       return ret;
+       return _camera_attr_get_range(camera,
+               MUSE_CAMERA_API_ATTR_GET_TILT_RANGE,
+               MUSE_CAMERA_GET_INT_PAIR_TILT_RANGE,
+               min, max);
 }
 
 
@@ -7217,3 +6846,87 @@ int _camera_get_log_level(void)
 {
        return g_camera_log_level;
 }
+
+
+int _camera_attr_set_level(camera_h camera, muse_camera_api_e api, int level)
+{
+       int ret = CAMERA_ERROR_NONE;
+       camera_cli_s *pc = (camera_cli_s *)camera;
+       camera_msg_param param;
+
+       if (!pc || !pc->cb_info) {
+               CAM_LOG_ERROR("api[%d] NULL handle", api);
+               return CAMERA_ERROR_INVALID_PARAMETER;
+       }
+
+       CAM_LOG_INFO("api[%d] Enter - level[%d]", api, level);
+
+       CAMERA_MSG_PARAM_SET(param, INT, level);
+
+       _camera_msg_send_param1(api, pc->cb_info, &ret, &param, CAMERA_CB_TIMEOUT);
+
+       CAM_LOG_INFO("api[%d] ret[0x%x]", api, ret);
+
+       return ret;
+}
+
+
+int _camera_attr_get_level(camera_h camera, muse_camera_api_e api, muse_camera_get_int_e get_index, int *level)
+{
+       int ret = CAMERA_ERROR_NONE;
+       camera_cli_s *pc = (camera_cli_s *)camera;
+
+       if (!pc || !pc->cb_info || !level) {
+               CAM_LOG_ERROR("api[%d] NULL param[%p,%p]", api, pc, level);
+               return CAMERA_ERROR_INVALID_PARAMETER;
+       }
+
+       if (get_index >= MUSE_CAMERA_GET_INT_NUM) {
+               CAM_LOG_ERROR("api[%d] INVALID index[%d]", api, get_index);
+               return CAMERA_ERROR_INVALID_OPERATION;
+       }
+
+       CAM_LOG_INFO("api[%d] Enter", api);
+
+       _camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+
+       if (ret == CAMERA_ERROR_NONE) {
+               *level = pc->cb_info->get_int[get_index];
+               CAM_LOG_INFO("api[%d] level[%d]", api, *level);
+       }
+
+       CAM_LOG_INFO("api[%d] ret[0x%x]", api, ret);
+
+       return ret;
+}
+
+
+int _camera_attr_get_range(camera_h camera, muse_camera_api_e api, muse_camera_get_int_pair_e get_index, int *min, int *max)
+{
+       int ret = CAMERA_ERROR_NONE;
+       camera_cli_s *pc = (camera_cli_s *)camera;
+
+       if (!pc || !pc->cb_info || !min || !max) {
+               CAM_LOG_ERROR("api[%d] NULL param[%p,%p,%p]", api, pc, min, max);
+               return CAMERA_ERROR_INVALID_PARAMETER;
+       }
+
+       if (get_index >= MUSE_CAMERA_GET_INT_PAIR_NUM) {
+               CAM_LOG_ERROR("api[%d] INVALID index[%d]", api, get_index);
+               return CAMERA_ERROR_INVALID_OPERATION;
+       }
+
+       CAM_LOG_INFO("api[%d] Enter", api);
+
+       _camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+
+       if (ret == CAMERA_ERROR_NONE) {
+               *min = pc->cb_info->get_int_pair[get_index][0];
+               *max = pc->cb_info->get_int_pair[get_index][1];
+               CAM_LOG_INFO("api[%d] min[%d], max[%d]", api, *min, *max);
+       }
+
+       CAM_LOG_INFO("api[%d] ret[0x%x]", api, ret);
+
+       return ret;
+}

diff --git a/src/camera_internal.c b/src/camera_internal.c
index 00cfb5b..8222451 100644 (file)
--- a/src/camera_internal.c
+++ b/src/camera_internal.c
@@ -226,113 +226,49 @@ void camera_create_preview_frame(MMCamcorderVideoStreamDataType *stream, int num
 //LCOV_EXCL_START
 int camera_attr_set_flash_brightness(camera_h camera, int level)
 {
-       return __set_level(camera, MUSE_CAMERA_API_ATTR_SET_FLASH_BRIGHTNESS, level);
+       return _camera_attr_set_level(camera, MUSE_CAMERA_API_ATTR_SET_FLASH_BRIGHTNESS, level);
 }
 
 
 int camera_attr_get_flash_brightness(camera_h camera, int *level)
 {
-       int ret = CAMERA_ERROR_NONE;
-       camera_cli_s *pc = (camera_cli_s *)camera;
-       muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_FLASH_BRIGHTNESS;
-
-       if (!pc || !pc->cb_info || !level) {
-               CAM_LOG_ERROR("NULL pointer %p %p", pc, level);
-               return CAMERA_ERROR_INVALID_PARAMETER;
-       }
-
-       CAM_LOG_INFO("Enter");
-
-       _camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
-
-       if (ret == CAMERA_ERROR_NONE)
-               *level = pc->cb_info->get_int[MUSE_CAMERA_GET_INT_FLASH_BRIGHTNESS];
-
-       CAM_LOG_INFO("ret : 0x%x", ret);
-
-       return ret;
+       return _camera_attr_get_level(camera,
+               MUSE_CAMERA_API_ATTR_GET_FLASH_BRIGHTNESS,
+               MUSE_CAMERA_GET_INT_FLASH_BRIGHTNESS,
+               level);
 }
 
 
 int camera_attr_get_flash_brightness_range(camera_h camera, int *min, int *max)
 {
-       int ret = CAMERA_ERROR_NONE;
-       camera_cli_s *pc = (camera_cli_s *)camera;
-       muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_FLASH_BRIGHTNESS_RANGE;
-
-       if (!pc || !pc->cb_info || !min || !max) {
-               CAM_LOG_ERROR("NULL pointer %p %p %p", pc, min, max);
-               return CAMERA_ERROR_INVALID_PARAMETER;
-       }
-
-       CAM_LOG_INFO("Enter");
-
-       _camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
-
-       if (ret == CAMERA_ERROR_NONE) {
-               *min = pc->cb_info->get_int_pair[MUSE_CAMERA_GET_INT_PAIR_FLASH_BRIGHTNESS_RANGE][0];
-               *max = pc->cb_info->get_int_pair[MUSE_CAMERA_GET_INT_PAIR_FLASH_BRIGHTNESS_RANGE][1];
-       }
-
-       CAM_LOG_INFO("ret : 0x%x", ret);
-
-       return ret;
+       return _camera_attr_get_range(camera,
+               MUSE_CAMERA_API_ATTR_GET_FLASH_BRIGHTNESS_RANGE,
+               MUSE_CAMERA_GET_INT_PAIR_FLASH_BRIGHTNESS_RANGE,
+               min, max);
 }
 
 
 int camera_attr_set_focus_level(camera_h camera, int level)
 {
-       return __set_level(camera, MUSE_CAMERA_API_ATTR_SET_FOCUS_LEVEL, level);
+       return _camera_attr_set_level(camera, MUSE_CAMERA_API_ATTR_SET_FOCUS_LEVEL, level);
 }
 
 
 int camera_attr_get_focus_level(camera_h camera, int *level)
 {
-       int ret = CAMERA_ERROR_NONE;
-       camera_cli_s *pc = (camera_cli_s *)camera;
-       muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_FOCUS_LEVEL;
-
-       if (!pc || !pc->cb_info || !level) {
-               CAM_LOG_ERROR("NULL pointer %p %p", pc, level);
-               return CAMERA_ERROR_INVALID_PARAMETER;
-       }
-
-       CAM_LOG_INFO("Enter");
-
-       _camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
-
-       if (ret == CAMERA_ERROR_NONE)
-               *level = pc->cb_info->get_int[MUSE_CAMERA_GET_INT_FOCUS_LEVEL];
-
-       CAM_LOG_INFO("ret : 0x%x", ret);
-
-       return ret;
+       return _camera_attr_get_level(camera,
+               MUSE_CAMERA_API_ATTR_GET_FOCUS_LEVEL,
+               MUSE_CAMERA_GET_INT_FOCUS_LEVEL,
+               level);
 }
 
 
 int camera_attr_get_focus_level_range(camera_h camera, int *min, int *max)
 {
-       int ret = CAMERA_ERROR_NONE;
-       camera_cli_s *pc = (camera_cli_s *)camera;
-       muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_FOCUS_LEVEL_RANGE;
-
-       if (!pc || !pc->cb_info || !min || !max) {
-               CAM_LOG_ERROR("NULL pointer %p %p %p", pc, min, max);
-               return CAMERA_ERROR_INVALID_PARAMETER;
-       }
-
-       CAM_LOG_INFO("Enter");
-
-       _camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
-
-       if (ret == CAMERA_ERROR_NONE) {
-               *min = pc->cb_info->get_int_pair[MUSE_CAMERA_GET_INT_PAIR_FOCUS_LEVEL_RANGE][0];
-               *max = pc->cb_info->get_int_pair[MUSE_CAMERA_GET_INT_PAIR_FOCUS_LEVEL_RANGE][1];
-       }
-
-       CAM_LOG_INFO("ret : 0x%x", ret);
-
-       return ret;
+       return _camera_attr_get_range(camera,
+               MUSE_CAMERA_API_ATTR_GET_FOCUS_LEVEL_RANGE,
+               MUSE_CAMERA_GET_INT_PAIR_FOCUS_LEVEL_RANGE,
+               min, max);
 }