Merge branch 'tizen' into tizen_line_coveragetizen_line_coverage

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

4 files changed, 291 insertions, 146 deletions

diff --git a/include/camera.h b/include/camera.h
index a374a1e..d0a2f83 100644
--- a/include/camera.h
+++ b/include/camera.h
@@ -163,7 +163,7 @@ typedef enum {
 	CAMERA_FLIP_NONE,	/**< No Flip */
 	CAMERA_FLIP_HORIZONTAL,	/**< Horizontal flip */
 	CAMERA_FLIP_VERTICAL,	/**< Vertical flip */
-	CAMERA_FLIP_BOTH	/** Horizontal and vertical flip */
+	CAMERA_FLIP_BOTH	/**< Horizontal and vertical flip */
 } camera_flip_e;
 
 /**
@@ -178,7 +178,7 @@ typedef enum {
 } camera_focus_state_e;
 
 /**
- * @brief Enumeration for the facing direction of camera module
+ * @brief Enumeration for the facing direction of camera module.
  * @since_tizen 3.0
  */
 typedef enum {
@@ -274,7 +274,7 @@ typedef struct {
 /**
  * @brief The Camera handle.
  * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif
- * @see	recorder_create_videorecorder()
+ * @see recorder_create_videorecorder()
  */
 typedef struct camera_cli_s *camera_h;
 
@@ -511,7 +511,7 @@ typedef enum {
 } camera_attr_hdr_mode_e;
 
 /**
- * @brief Enumeration for PTZ(Pan Tilt Zoom) type.
+ * @brief Enumeration for PTZ (Pan Tilt Zoom) type.
  * @since_tizen 3.0
  */
 typedef enum {
@@ -520,7 +520,7 @@ typedef enum {
 } camera_attr_ptz_type_e;
 
 /**
- * @brief Enumeration for PTZ(Pan Tilt Zoom) movement type.
+ * @brief Enumeration for PTZ (Pan Tilt Zoom) movement type.
  * @since_tizen 3.0
  */
 typedef enum {
@@ -547,7 +547,7 @@ typedef enum {
  * @param[in] user_data The user data passed from the callback registration function
  * @pre camera_start_preview(), camera_start_capture() or camera_stop_preview()
  *      will invoke this callback if you register this callback using camera_set_state_changed_cb().
- * @see	camera_set_state_changed_cb()
+ * @see camera_set_state_changed_cb()
  */
 typedef void (*camera_state_changed_cb)(camera_state_e previous, camera_state_e current, bool by_policy, void *user_data);
 
@@ -1399,8 +1399,8 @@ int camera_get_display_mode(camera_h camera, camera_display_mode_e *mode);
 
 /**
  * @brief Sets the hint for display reuse.
- * @since_tizen 3.0
  * @details If the hint is set to true, the display will be reused when the camera device is changed with camera_change_device().
+ * @since_tizen 3.0
  * @remarks If the current display type is #CAMERA_DISPLAY_TYPE_NONE, this function will return #CAMERA_ERROR_INVALID_OPERATION.
  * @param[in] camera The handle to the camera
  * @param[in] hint The hint for display reuse; true - reuse the display, false - do not reuse
@@ -1683,12 +1683,12 @@ int camera_foreach_supported_preview_format(camera_h camera, camera_supported_pr
  * @remarks The specific error code can be obtained using the get_last_result() method. Error codes are described in Exception section.
  * @param[in] camera The handle to the camera
  * @return @c true if supported, otherwise @c false
- * @see camera_start_face_detection()
- * @see camera_stop_face_detection()
  * @exception #CAMERA_ERROR_NONE Successful
  * @exception #CAMERA_ERROR_INVALID_PARAMETER Invalid parameter
  * @exception #CAMERA_ERROR_PERMISSION_DENIED The access to the resources can not be granted
  * @exception #CAMERA_ERROR_NOT_SUPPORTED The feature is not supported
+ * @see camera_start_face_detection()
+ * @see camera_stop_face_detection()
  */
 bool camera_is_supported_face_detection(camera_h camera);
 
@@ -2129,7 +2129,7 @@ typedef bool (*camera_attr_supported_flash_mode_cb)(camera_attr_flash_mode_e mod
 /**
  * @brief Called to get each supported FPS mode.
  * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif
- * @param[in] mode The supported FPS mode
+ * @param[in] fps The supported FPS mode
  * @param[in] user_data The user data passed from the foreach function
  * @return @c true to continue with the next iteration of the loop, \n otherwise @c false to break out of the loop
  * @pre	camera_attr_foreach_supported_fps() will invoke this callback.
@@ -2140,7 +2140,7 @@ typedef bool (*camera_attr_supported_fps_cb)(camera_attr_fps_e fps, void *user_d
 /**
  * @brief Called to get each supported stream flip mode.
  * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif
- * @param[in] mode The supported stream flip mode
+ * @param[in] flip The supported stream flip mode
  * @param[in] user_data The user data passed from the foreach function
  * @return @c true to continue with the next iteration of the loop, \n @c false to break out of the loop
  * @pre	camera_attr_foreach_supported_stream_flip() will invoke this callback.
@@ -2151,7 +2151,7 @@ typedef bool (*camera_attr_supported_stream_flip_cb)(camera_flip_e flip, void *u
 /**
  * @brief Called to get each supported stream rotation mode.
  * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif
- * @param[in] mode The supported stream rotation mode
+ * @param[in] rotation The supported stream rotation mode
  * @param[in] user_data The user data passed from the foreach function
  * @return @c true to continue with the next iteration of the loop, \n @c false to break out of the loop
  * @pre	camera_attr_foreach_supported_stream_rotation() will invoke this callback.
@@ -2171,7 +2171,7 @@ typedef bool (*camera_attr_supported_stream_rotation_cb)(camera_rotation_e rotat
 typedef bool (*camera_attr_supported_theater_mode_cb)(camera_attr_theater_mode_e mode, void *user_data);
 
 /**
- * @brief Called to get each supported PTZ(Pan Tilt Zoom) type.
+ * @brief Called to get each supported PTZ (Pan Tilt Zoom) type.
  * @since_tizen 3.0
  * @param[in] type The supported ptz type
  * @param[in] user_data The user data passed from the foreach function
@@ -2352,7 +2352,7 @@ int camera_attr_get_encoded_preview_bitrate(camera_h camera, int *bitrate);
 int camera_attr_set_encoded_preview_bitrate(camera_h camera, int bitrate);
 
 /**
- * @brief Gets the GOP(Group Of Pictures) interval of encoded preview.
+ * @brief Gets the GOP (Group Of Pictures) interval of encoded preview.
  * @since_tizen 3.0
  * @param[in] camera The handle to the camera
  * @param[out] interval the GOP interval of encoded preview (millisecond)
@@ -2367,7 +2367,7 @@ int camera_attr_set_encoded_preview_bitrate(camera_h camera, int bitrate);
 int camera_attr_get_encoded_preview_gop_interval(camera_h camera, int *interval);
 
 /**
- * @brief Sets the GOP(Group Of Pictures) interval of encoded preview.
+ * @brief Sets the GOP (Group Of Pictures) interval of encoded preview.
  * @since_tizen 3.0
  * @remarks The recommended range is from 1,000 (1 second) to 600,000 (10 minutes). \n
  *          But, due to codec limitations, it may not apply.
@@ -3591,7 +3591,7 @@ int camera_attr_foreach_supported_stream_flip(camera_h camera, camera_attr_suppo
 typedef void (*camera_attr_hdr_progress_cb)(int percent, void *user_data);
 
 /**
- * @brief Sets the mode of HDR(High dynamic range) capture.
+ * @brief Sets the mode of HDR (High dynamic range) capture.
  * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif
  * @remarks Taking multiple pictures at different exposure levels and intelligently stitching them together so that we eventually arrive at a picture that is representative in both dark and bright areas.\n
  *          If this attribute is set to @c true. camera_attr_hdr_progress_cb() is invoked during capture.\n
@@ -3615,7 +3615,7 @@ typedef void (*camera_attr_hdr_progress_cb)(int percent, void *user_data);
 int camera_attr_set_hdr_mode(camera_h camera, camera_attr_hdr_mode_e mode);
 
 /**
- * @brief Gets the mode of HDR(High dynamic range) capture.
+ * @brief Gets the mode of HDR (High dynamic range) capture.
  * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif
  * @param[in] camera The handle to the camera
  * @param[out] mode The mode of HDR capture
diff --git a/include/camera_private.h b/include/camera_private.h
index e3603de..8ec8061 100644
--- a/include/camera_private.h
+++ b/include/camera_private.h
@@ -140,6 +140,9 @@ typedef struct _camera_cb_info_s {
 
 	/* tbm */
 	tbm_bufmgr bufmgr;
+	gboolean user_buffer_supported;
+	tbm_bo bos[MUSE_NUM_FD];
+	tbm_fd fds[MUSE_NUM_FD];
 
 	/* media packet */
 	media_format_h pkt_fmt;
diff --git a/packaging/capi-media-camera.spec b/packaging/capi-media-camera.spec
index 46ca000..182cf1e 100644
--- 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.21
+Version:    0.4.24
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0
diff --git a/src/camera.c b/src/camera.c
index 56d6593..3b24630 100644
--- a/src/camera.c
+++ b/src/camera.c
@@ -44,7 +44,7 @@ static GDBusConnection *g_cam_dev_state_changed_cb_conn;
 static guint g_cam_dev_state_changed_cb_subscribe_id;
 static GMutex g_cam_idle_event_lock;
 
-static void _camera_msg_send(int api, camera_cb_info_s *cb_info,
+static void _camera_msg_send(int api, int *fds, camera_cb_info_s *cb_info,
 	int *ret, int timeout);
 static void _camera_msg_send_param1(int api, camera_cb_info_s *cb_info,
 	int *ret, camera_msg_param *param, int timeout);
@@ -60,6 +60,126 @@ static int _camera_media_packet_create(camera_cb_info_s *cb_info, camera_stream_
 static int _camera_media_packet_data_create(int ret_fd, int *tfd, int num_buffer_fd, tbm_bo bo,
 	tbm_bo *buffer_bo, tbm_bo data_bo, camera_media_packet_data **mp_data);
 static void _camera_media_packet_data_release(camera_media_packet_data *mp_data, camera_cb_info_s *cb_info);
+static gboolean _camera_allocate_preview_buffer(camera_h camera);
+static void _camera_release_preview_buffer(camera_h camera);
+
+
+static gboolean _camera_allocate_preview_buffer(camera_h camera)
+{
+	int i = 0;
+	int ret = CAMERA_ERROR_NONE;
+	int format = CAMERA_PIXEL_FORMAT_INVALID;
+	int width = 0;
+	int height = 0;
+	int buffer_size = 0;
+	camera_cli_s *pc = (camera_cli_s *)camera;
+	camera_cb_info_s *cb_info = NULL;
+
+	if (!pc || !pc->cb_info) {
+		LOGE("invalid pointer %p %p", pc, pc ? pc->cb_info : NULL);
+		return FALSE;
+	}
+
+	cb_info = pc->cb_info;
+
+	LOGD("Enter");
+
+	/* get preview info and calculate size */
+	ret = camera_get_preview_format(camera, &format);
+	if (ret != CAMERA_ERROR_NONE) {
+		LOGE("get preview format failed 0x%x", ret);
+		return FALSE;
+	}
+
+	ret = camera_get_preview_resolution(camera, &width, &height);
+	if (ret != CAMERA_ERROR_NONE) {
+		LOGE("get preview resolution failed 0x%x", ret);
+		return FALSE;
+	}
+
+	LOGD("preview %dx%d, format %d", width, height, format);
+
+	switch (format) {
+	case CAMERA_PIXEL_FORMAT_INVZ:
+		buffer_size = width * height;
+		break;
+	case CAMERA_PIXEL_FORMAT_NV12:
+	case CAMERA_PIXEL_FORMAT_I420:
+		buffer_size = (width * height * 3) >> 1;
+		break;
+	case CAMERA_PIXEL_FORMAT_YUYV:
+	case CAMERA_PIXEL_FORMAT_UYVY:
+		buffer_size = width * height * 2;
+		break;
+	default:
+		LOGE("unhandled format %d", format);
+		goto _ALLOCATE_PREVIEW_BUFFER_FAILED;
+	}
+
+	LOGD("buffer size %d, num %d", buffer_size, MUSE_NUM_FD);
+
+	for (i = 0 ; i < MUSE_NUM_FD ; i++) {
+		cb_info->bos[i] = tbm_bo_alloc(cb_info->bufmgr, buffer_size, TBM_BO_DEFAULT);
+		if (!cb_info->bos[i]) {
+			LOGE("bo alloc failed [%d,i:%d]", buffer_size, i);
+			goto _ALLOCATE_PREVIEW_BUFFER_FAILED;
+		}
+
+		cb_info->fds[i] = tbm_bo_export_fd(cb_info->bos[i]);
+		if (cb_info->fds[i] < 0) {
+			LOGE("export fd failed [%d,i:%d] errno %d", buffer_size, i, errno);
+			goto _ALLOCATE_PREVIEW_BUFFER_FAILED;
+		}
+
+		LOGD("bo %p, fd %d", cb_info->bos[i], cb_info->fds[i]);
+	}
+
+	LOGD("Done");
+
+	return TRUE;
+
+_ALLOCATE_PREVIEW_BUFFER_FAILED:
+	_camera_release_preview_buffer(camera);
+	return FALSE;
+}
+
+
+static void _camera_release_preview_buffer(camera_h camera)
+{
+	int i = 0;
+	camera_cli_s *pc = (camera_cli_s *)camera;
+	camera_cb_info_s *cb_info = NULL;
+
+	if (!pc || !pc->cb_info) {
+		LOGE("invalid pointer %p %p", pc, pc ? pc->cb_info : NULL);
+		return;
+	}
+
+	LOGD("Enter");
+
+	cb_info = pc->cb_info;
+
+	/* close exported fd and bos */
+	for (i = 0 ; i < MUSE_NUM_FD ; i++) {
+		LOGD("unref bo %p, close fd %d", cb_info->bos[i], cb_info->fds[i]);
+
+		if (cb_info->bos[i]) {
+			tbm_bo_unref(cb_info->bos[i]);
+			cb_info->bos[i] = NULL;
+		} else {
+			break;
+		}
+
+		if (cb_info->fds[i] >= 0) {
+			close(cb_info->fds[i]);
+			cb_info->fds[i] = -1;
+		}
+	}
+
+	LOGD("Done");
+
+	return;
+}
 
 
 static void __camera_update_api_waiting(camera_cb_info_s *cb_info, int api, int value)
@@ -262,7 +382,7 @@ static void __camera_event_handler_preview(camera_cb_info_s *cb_info, char *recv
 
 	/* send message for preview callback return */
 	if (!CHECK_PREVIEW_CB(cb_info, PREVIEW_CB_TYPE_EVAS))
-		_camera_msg_send(MUSE_CAMERA_API_PREVIEW_CB_RETURN, cb_info, NULL, 0);
+		_camera_msg_send(MUSE_CAMERA_API_PREVIEW_CB_RETURN, NULL, cb_info, NULL, 0);
 
 _PREVIEW_CB_HANDLER_DONE:
 	if (mp_data == NULL) {
@@ -560,7 +680,7 @@ static int _camera_client_wait_for_cb_return(muse_camera_api_e api, camera_cb_in
 }
 
 
-static void _camera_msg_send(int api, camera_cb_info_s *cb_info,
+static void _camera_msg_send(int api, int *fds, camera_cb_info_s *cb_info,
 	int *ret, int timeout)
 {
 	int send_ret = 0;
@@ -591,7 +711,7 @@ static void _camera_msg_send(int api, camera_cb_info_s *cb_info,
 		__camera_update_api_waiting(cb_info, api, 1);
 
 		g_mutex_lock(&cb_info->fd_lock);
-		send_ret = muse_core_msg_send(cb_info->fd, msg);
+		send_ret = muse_core_msg_send_fd(cb_info->fd, fds, msg);
 		g_mutex_unlock(&cb_info->fd_lock);
 	}
 
@@ -1554,7 +1674,7 @@ IDLE_EVENT_CALLBACK_DONE:
 	return FALSE;
 }
 
-static void *_camera_msg_handler_func(gpointer data)
+static gpointer _camera_msg_handler_func(gpointer data)
 {
 	int api = 0;
 	int type = 0;
@@ -1911,7 +2031,7 @@ static void __camera_process_msg(camera_cb_info_s *cb_info, char *msg, int *tfd)
 }
 
 
-static void *_camera_msg_recv_func(gpointer data)
+static gpointer _camera_msg_recv_func(gpointer data)
 {
 	int i = 0;
 	int recv_length = 0;
@@ -1956,9 +2076,14 @@ static void *_camera_msg_recv_func(gpointer data)
 	if (!cb_info->is_server_connected) {
 		char *error_msg = NULL;
 
+		if (cb_info->bufmgr == NULL) {
+			LOGE("No need to send error(handle is not created)");
+			return NULL;
+		}
+
 		if (cb_info->fd < 0) {
 			LOGE("fd is closed in client side");
-			goto CB_HANDLER_EXIT;
+			return NULL;
 		}
 
 		/* send error msg for server disconnection */
@@ -1969,7 +2094,7 @@ static void *_camera_msg_recv_func(gpointer data)
 
 		if (!error_msg) {
 			LOGE("error_msg failed");
-			goto CB_HANDLER_EXIT;
+			return NULL;
 		}
 
 		__camera_add_msg_to_queue(cb_info,
@@ -1985,7 +2110,6 @@ static void *_camera_msg_recv_func(gpointer data)
 		LOGE("add error msg for service disconnection done");
 	}
 
-CB_HANDLER_EXIT:
 	return NULL;
 }
 
@@ -2129,6 +2253,10 @@ static camera_cb_info_s *_camera_client_callback_new(gint sockfd)
 		goto ErrorExit;
 	}
 
+	/* initialize fd */
+	for (i = 0 ; i < MUSE_NUM_FD ; i++)
+		cb_info->fds[i] = -1;
+
 	cb_info->is_server_connected = TRUE;
 
 	return cb_info;
@@ -2432,6 +2560,8 @@ int camera_create(camera_device_e device, camera_h *camera)
 	pc->cb_info->api_waiting[MUSE_CAMERA_API_CREATE] = 0;
 
 	if (ret == CAMERA_ERROR_NONE) {
+		int preview_format = CAMERA_PIXEL_FORMAT_INVALID;
+		int user_buffer_supported = 0;
 		intptr_t handle = 0;
 
 		muse_camera_msg_get_pointer(handle, pc->cb_info->recv_msg);
@@ -2441,28 +2571,23 @@ int camera_create(camera_device_e device, camera_h *camera)
 			goto ErrorExit;
 		}
 
+		muse_camera_msg_get(preview_format, pc->cb_info->recv_msg);
+		muse_camera_msg_get(user_buffer_supported, pc->cb_info->recv_msg);
+
 		pc->remote_handle = handle;
 		pc->cb_info->bufmgr = bufmgr;
+		pc->cb_info->preview_format = preview_format;
+		pc->cb_info->dp_type = CAMERA_DISPLAY_TYPE_NONE;
+		pc->cb_info->user_buffer_supported = (gboolean)user_buffer_supported;
 
-		ret = camera_set_display((camera_h)pc, CAMERA_DISPLAY_TYPE_NONE, NULL);
-		if (ret != CAMERA_ERROR_NONE) {
-			LOGE("init display failed 0x%x", ret);
-			goto ErrorExit;
-		}
-
-		LOGD("camera create 0x%td", pc->remote_handle);
+		LOGD("default preview format %d, user buffer %d",
+			preview_format, user_buffer_supported);
 
 		*camera = (camera_h)pc;
 
 		/* get display interface handle */
 		if (mm_display_interface_init(&pc->cb_info->dp_interface) != MM_ERROR_NONE)
 			LOGW("display interface init failed");
-
-		/* get default preview format */
-		if (camera_get_preview_format(*camera, &pc->cb_info->preview_format) != CAMERA_ERROR_NONE) {
-			LOGW("get default preview format failed");
-			pc->cb_info->preview_format = CAMERA_PIXEL_FORMAT_INVALID;
-		}
 	} else {
 		goto ErrorExit;
 	}
@@ -2550,7 +2675,7 @@ int camera_destroy(camera_h camera)
 	LOGD("Enter");
 
 	if (pc->cb_info->is_server_connected)
-		_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+		_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 	else
 		LOGW("server disconnected. release resource without send message.");
 
@@ -2573,6 +2698,7 @@ int camera_start_preview(camera_h camera)
 	int ret = CAMERA_ERROR_NONE;
 	muse_camera_api_e api = MUSE_CAMERA_API_START_PREVIEW;
 	camera_cli_s *pc = (camera_cli_s *)camera;
+	camera_state_e current_state = CAMERA_STATE_NONE;
 
 	if (!pc || !pc->cb_info) {
 		LOGE("NULL handle");
@@ -2582,6 +2708,12 @@ int camera_start_preview(camera_h camera)
 	LOGD("Enter : preview format %d, display type %d",
 		pc->cb_info->preview_format, pc->cb_info->dp_type);
 
+	ret = camera_get_state(camera, &current_state);
+	if (ret != CAMERA_ERROR_NONE) {
+		LOGE("failed to get current state 0x%x", ret);
+		return ret;
+	}
+
 	if (pc->cb_info->preview_format == CAMERA_PIXEL_FORMAT_INVZ &&
 		pc->cb_info->dp_type != CAMERA_DISPLAY_TYPE_NONE) {
 		LOGE("CAMERA_DISPLAY_TYPE_NONE[current %d] should be set with INVZ format",
@@ -2589,12 +2721,20 @@ int camera_start_preview(camera_h camera)
 		return CAMERA_ERROR_INVALID_OPERATION;
 	}
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_NO_TIMEOUT);
+	if (current_state == CAMERA_STATE_CREATED && pc->cb_info->user_buffer_supported) {
+		if (!_camera_allocate_preview_buffer(camera))
+			return CAMERA_ERROR_INVALID_OPERATION;
+
+		_camera_msg_send(api, pc->cb_info->fds, pc->cb_info, &ret, CAMERA_CB_NO_TIMEOUT);
+	} else {
+		_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_NO_TIMEOUT);
+	}
+
 	if (ret == CAMERA_ERROR_NONE && CHECK_PREVIEW_CB(pc->cb_info, PREVIEW_CB_TYPE_EVAS)) {
 		ret = _camera_start_evas_rendering(camera);
 		if (ret != CAMERA_ERROR_NONE) {
 			LOGE("stop preview because of error");
-			_camera_msg_send(MUSE_CAMERA_API_STOP_PREVIEW, pc->cb_info, NULL, 0);
+			_camera_msg_send(MUSE_CAMERA_API_STOP_PREVIEW, NULL, pc->cb_info, NULL, 0);
 		}
 	}
 
@@ -2634,10 +2774,12 @@ int camera_stop_preview(camera_h camera)
 	}
 //LCOV_EXCL_STOP
 	/* send stop preview message */
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
-	if (ret != CAMERA_ERROR_NONE &&
-		current_state == CAMERA_STATE_PREVIEW) {
+	if (ret == CAMERA_ERROR_NONE) {
+		if (pc->cb_info->user_buffer_supported)
+			_camera_release_preview_buffer(camera);
+	} else if (current_state == CAMERA_STATE_PREVIEW) {
 		LOGW("restart evas rendering");
 		_camera_start_evas_rendering(camera);
 	}
@@ -2667,7 +2809,7 @@ int camera_start_capture(camera_h camera, camera_capturing_cb capturing_cb, came
 	pc->cb_info->user_cb[MUSE_CAMERA_EVENT_TYPE_CAPTURE_COMPLETE] = completed_cb;
 	pc->cb_info->user_data[MUSE_CAMERA_EVENT_TYPE_CAPTURE_COMPLETE] = user_data;
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	LOGD("ret : 0x%x", ret);
 
@@ -2688,7 +2830,7 @@ bool camera_is_supported_continuous_capture(camera_h camera)
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret < 0) {
 		LOGE("error is occurred 0x%x", ret);
@@ -2746,7 +2888,7 @@ int camera_stop_continuous_capture(camera_h camera)
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	LOGD("ret : 0x%x", ret);
 
@@ -2767,7 +2909,7 @@ bool camera_is_supported_face_detection(camera_h camera)
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret < 0) {
 		LOGE("error is occurred 0x%x", ret);
@@ -2793,7 +2935,7 @@ bool camera_is_supported_zero_shutter_lag(camera_h camera)
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret < 0) {
 		LOGE("error is occurred 0x%x", ret);
@@ -2819,7 +2961,7 @@ bool camera_is_supported_media_packet_preview_cb(camera_h camera)
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret < 0) {
 		LOGE("error is occurred 0x%x", ret);
@@ -2844,7 +2986,7 @@ int camera_get_device_count(camera_h camera, int *device_count)
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret == CAMERA_ERROR_NONE)
 		*device_count = pc->cb_info->get_int[MUSE_CAMERA_GET_INT_DEVICE_COUNT];
@@ -2867,7 +3009,7 @@ int camera_start_face_detection(camera_h camera, camera_face_detected_cb callbac
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret == CAMERA_ERROR_NONE) {
 		g_mutex_lock(&pc->cb_info->user_cb_mutex[MUSE_CAMERA_EVENT_TYPE_FACE_DETECTION]);
@@ -2896,7 +3038,7 @@ int camera_stop_face_detection(camera_h camera)
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret == CAMERA_ERROR_NONE) {
 		g_mutex_lock(&pc->cb_info->user_cb_mutex[MUSE_CAMERA_EVENT_TYPE_FACE_DETECTION]);
@@ -2925,7 +3067,7 @@ int camera_get_state(camera_h camera, camera_state_e *state)
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret == CAMERA_ERROR_NONE)
 		*state = (camera_state_e)pc->cb_info->get_int[MUSE_CAMERA_GET_INT_STATE];
@@ -2972,7 +3114,7 @@ int camera_cancel_focusing(camera_h camera)
 
 	LOGD("Enter, remote_handle : %td", pc->remote_handle);
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	LOGD("ret : 0x%x", ret);
 
@@ -3191,7 +3333,7 @@ int camera_set_preview_format(camera_h camera, camera_pixel_format_e format)
 		return CAMERA_ERROR_INVALID_PARAMETER;
 	}
 
-	LOGD("Enter - capture_format %d", set_format);
+	LOGD("Enter - format %d", set_format);
 
 	CAMERA_MSG_PARAM_SET(param, INT, set_format);
 
@@ -3219,7 +3361,7 @@ int camera_get_preview_resolution(camera_h camera, int *width, int *height)
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret == CAMERA_ERROR_NONE) {
 		*width = pc->cb_info->get_int[MUSE_CAMERA_GET_INT_PREVIEW_RESOLUTION] >> 16;
@@ -3270,7 +3412,7 @@ int camera_get_display_rotation(camera_h camera, camera_rotation_e *rotation)
 		return CAMERA_ERROR_INVALID_PARAMETER;
 	}
 
-	_camera_msg_send(MUSE_CAMERA_API_GET_DISPLAY_ROTATION, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(MUSE_CAMERA_API_GET_DISPLAY_ROTATION, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret == CAMERA_ERROR_NONE)
 		*rotation = (camera_rotation_e)pc->cb_info->get_int[MUSE_CAMERA_GET_INT_DISPLAY_ROTATION];
@@ -3317,7 +3459,7 @@ int camera_get_display_flip(camera_h camera, camera_flip_e *flip)
 		return CAMERA_ERROR_INVALID_PARAMETER;
 	}
 
-	_camera_msg_send(MUSE_CAMERA_API_GET_DISPLAY_FLIP, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(MUSE_CAMERA_API_GET_DISPLAY_FLIP, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret == CAMERA_ERROR_NONE)
 		*flip = (camera_flip_e)pc->cb_info->get_int[MUSE_CAMERA_GET_INT_DISPLAY_FLIP];
@@ -3364,7 +3506,7 @@ int camera_is_display_visible(camera_h camera, bool *visible)
 		return CAMERA_ERROR_INVALID_PARAMETER;
 	}
 
-	_camera_msg_send(MUSE_CAMERA_API_IS_DISPLAY_VISIBLE, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(MUSE_CAMERA_API_IS_DISPLAY_VISIBLE, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret == CAMERA_ERROR_NONE)
 		*visible = (bool)pc->cb_info->get_int[MUSE_CAMERA_GET_INT_DISPLAY_VISIBLE];
@@ -3411,7 +3553,7 @@ int camera_get_display_mode(camera_h camera, camera_display_mode_e *mode)
 		return CAMERA_ERROR_INVALID_PARAMETER;
 	}
 
-	_camera_msg_send(MUSE_CAMERA_API_GET_DISPLAY_MODE, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(MUSE_CAMERA_API_GET_DISPLAY_MODE, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret == CAMERA_ERROR_NONE)
 		*mode = (camera_display_mode_e)pc->cb_info->get_int[MUSE_CAMERA_GET_INT_DISPLAY_MODE];
@@ -3453,7 +3595,7 @@ int camera_get_display_reuse_hint(camera_h camera, bool *hint)
 		return CAMERA_ERROR_INVALID_PARAMETER;
 	}
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret == CAMERA_ERROR_NONE) {
 		*hint = (bool)pc->cb_info->get_int[MUSE_CAMERA_GET_INT_DISPLAY_REUSE_HINT];
@@ -3477,7 +3619,7 @@ int camera_get_capture_resolution(camera_h camera, int *width, int *height)
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret == CAMERA_ERROR_NONE) {
 		*width = pc->cb_info->get_int[MUSE_CAMERA_GET_INT_CAPTURE_RESOLUTION] >> 16;
@@ -3503,7 +3645,7 @@ int camera_get_capture_format(camera_h camera, camera_pixel_format_e *format)
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret == CAMERA_ERROR_NONE)
 		*format = (camera_pixel_format_e)pc->cb_info->get_int[MUSE_CAMERA_GET_INT_CAPTURE_FORMAT];
@@ -3527,7 +3669,7 @@ int camera_get_preview_format(camera_h camera, camera_pixel_format_e *format)
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret == CAMERA_ERROR_NONE)
 		*format = (camera_pixel_format_e)pc->cb_info->get_int[MUSE_CAMERA_GET_INT_PREVIEW_FORMAT];
@@ -3551,7 +3693,7 @@ int camera_get_facing_direction(camera_h camera, camera_facing_direction_e *faci
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret == CAMERA_ERROR_NONE)
 		*facing_direction = (camera_facing_direction_e)pc->cb_info->get_int[MUSE_CAMERA_GET_INT_FACING_DIRECTION];
@@ -3575,7 +3717,7 @@ int camera_set_preview_cb(camera_h camera, camera_preview_cb callback, void *use
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret == CAMERA_ERROR_NONE) {
 		g_mutex_lock(&pc->cb_info->user_cb_mutex[MUSE_CAMERA_EVENT_TYPE_PREVIEW]);
@@ -3607,7 +3749,7 @@ int camera_unset_preview_cb(camera_h camera)
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret == CAMERA_ERROR_NONE) {
 		g_mutex_lock(&pc->cb_info->user_cb_mutex[MUSE_CAMERA_EVENT_TYPE_PREVIEW]);
@@ -3649,7 +3791,7 @@ int camera_set_media_packet_preview_cb(camera_h camera, camera_media_packet_prev
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret == CAMERA_ERROR_NONE) {
 		g_mutex_lock(&pc->cb_info->user_cb_mutex[MUSE_CAMERA_EVENT_TYPE_MEDIA_PACKET_PREVIEW]);
@@ -3679,7 +3821,7 @@ int camera_unset_media_packet_preview_cb(camera_h camera)
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret == CAMERA_ERROR_NONE) {
 		g_mutex_lock(&pc->cb_info->user_cb_mutex[MUSE_CAMERA_EVENT_TYPE_MEDIA_PACKET_PREVIEW]);
@@ -3709,7 +3851,7 @@ int camera_set_state_changed_cb(camera_h camera, camera_state_changed_cb callbac
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret == CAMERA_ERROR_NONE) {
 		g_mutex_lock(&pc->cb_info->user_cb_mutex[MUSE_CAMERA_EVENT_TYPE_STATE_CHANGE]);
@@ -3739,7 +3881,7 @@ int camera_unset_state_changed_cb(camera_h camera)
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret == CAMERA_ERROR_NONE) {
 		g_mutex_lock(&pc->cb_info->user_cb_mutex[MUSE_CAMERA_EVENT_TYPE_STATE_CHANGE]);
@@ -3769,7 +3911,7 @@ int camera_set_interrupted_cb(camera_h camera, camera_interrupted_cb callback, v
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret == CAMERA_ERROR_NONE) {
 		g_mutex_lock(&pc->cb_info->user_cb_mutex[MUSE_CAMERA_EVENT_TYPE_INTERRUPTED]);
@@ -3799,7 +3941,7 @@ int camera_unset_interrupted_cb(camera_h camera)
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret == CAMERA_ERROR_NONE) {
 		g_mutex_lock(&pc->cb_info->user_cb_mutex[MUSE_CAMERA_EVENT_TYPE_INTERRUPTED]);
@@ -3829,7 +3971,7 @@ int camera_set_interrupt_started_cb(camera_h camera, camera_interrupt_started_cb
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret == CAMERA_ERROR_NONE) {
 		g_mutex_lock(&pc->cb_info->user_cb_mutex[MUSE_CAMERA_EVENT_TYPE_INTERRUPT_STARTED]);
@@ -3859,7 +4001,7 @@ int camera_unset_interrupt_started_cb(camera_h camera)
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret == CAMERA_ERROR_NONE) {
 		g_mutex_lock(&pc->cb_info->user_cb_mutex[MUSE_CAMERA_EVENT_TYPE_INTERRUPT_STARTED]);
@@ -3889,7 +4031,7 @@ int camera_set_focus_changed_cb(camera_h camera, camera_focus_changed_cb callbac
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret == CAMERA_ERROR_NONE) {
 		g_mutex_lock(&pc->cb_info->user_cb_mutex[MUSE_CAMERA_EVENT_TYPE_FOCUS_CHANGE]);
@@ -3919,7 +4061,7 @@ int camera_unset_focus_changed_cb(camera_h camera)
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret == CAMERA_ERROR_NONE) {
 		g_mutex_lock(&pc->cb_info->user_cb_mutex[MUSE_CAMERA_EVENT_TYPE_FOCUS_CHANGE]);
@@ -3949,7 +4091,7 @@ int camera_set_error_cb(camera_h camera, camera_error_cb callback, void *user_da
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret == CAMERA_ERROR_NONE) {
 		g_mutex_lock(&pc->cb_info->user_cb_mutex[MUSE_CAMERA_EVENT_TYPE_ERROR]);
@@ -3979,7 +4121,7 @@ int camera_unset_error_cb(camera_h camera)
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret == CAMERA_ERROR_NONE) {
 		g_mutex_lock(&pc->cb_info->user_cb_mutex[MUSE_CAMERA_EVENT_TYPE_ERROR]);
@@ -4012,7 +4154,7 @@ int camera_foreach_supported_preview_resolution(camera_h camera, camera_supporte
 	pc->cb_info->user_cb[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_PREVIEW_RESOLUTION] = foreach_cb;
 	pc->cb_info->user_data[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_PREVIEW_RESOLUTION] = user_data;
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	LOGD("ret : 0x%x", ret);
 
@@ -4036,7 +4178,7 @@ int camera_foreach_supported_capture_resolution(camera_h camera, camera_supporte
 	pc->cb_info->user_cb[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_CAPTURE_RESOLUTION] = foreach_cb;
 	pc->cb_info->user_data[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_CAPTURE_RESOLUTION] = user_data;
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	LOGD("ret : 0x%x", ret);
 
@@ -4060,7 +4202,7 @@ int camera_foreach_supported_capture_format(camera_h camera, camera_supported_ca
 	pc->cb_info->user_cb[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_CAPTURE_FORMAT] = foreach_cb;
 	pc->cb_info->user_data[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_CAPTURE_FORMAT] = user_data;
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	LOGD("ret : 0x%x", ret);
 
@@ -4084,7 +4226,7 @@ int camera_foreach_supported_preview_format(camera_h camera, camera_supported_pr
 	pc->cb_info->user_cb[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_PREVIEW_FORMAT] = foreach_cb;
 	pc->cb_info->user_data[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_PREVIEW_FORMAT] = user_data;
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	LOGD("ret : 0x%x", ret);
 
@@ -4104,7 +4246,7 @@ int camera_get_recommended_preview_resolution(camera_h camera, int *width, int *
 	}
 
 	LOGD("Enter");
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret == CAMERA_ERROR_NONE) {
 		*width = pc->cb_info->get_int[MUSE_CAMERA_GET_INT_RECOMMENDED_PREVIEW_RESOLUTION] >> 16;
@@ -4130,7 +4272,7 @@ int camera_attr_get_lens_orientation(camera_h camera, int *angle)
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret == CAMERA_ERROR_NONE)
 		*angle = pc->cb_info->get_int[MUSE_CAMERA_GET_INT_LENS_ORIENTATION];
@@ -4179,7 +4321,7 @@ int camera_attr_get_theater_mode(camera_h camera, camera_attr_theater_mode_e *mo
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret == CAMERA_ERROR_NONE)
 		*mode = (camera_attr_theater_mode_e)pc->cb_info->get_int[MUSE_CAMERA_GET_INT_THEATER_MODE];
@@ -4206,7 +4348,7 @@ int camera_attr_foreach_supported_theater_mode(camera_h camera, camera_attr_supp
 	pc->cb_info->user_cb[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_THEATER_MODE] = foreach_cb;
 	pc->cb_info->user_data[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_THEATER_MODE] = user_data;
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	LOGD("Finish, return :%x", ret);
 
@@ -4276,7 +4418,7 @@ int camera_attr_get_preview_fps(camera_h camera, camera_attr_fps_e *fps)
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret == CAMERA_ERROR_NONE)
 		*fps = (camera_attr_fps_e)pc->cb_info->get_int[MUSE_CAMERA_GET_INT_PREVIEW_FPS];
@@ -4300,7 +4442,7 @@ int camera_attr_get_image_quality(camera_h camera, int *quality)
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret == CAMERA_ERROR_NONE)
 		*quality = pc->cb_info->get_int[MUSE_CAMERA_GET_INT_IMAGE_QUALITY];
@@ -4324,7 +4466,7 @@ int camera_attr_get_encoded_preview_bitrate(camera_h camera, int *bitrate)
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret == CAMERA_ERROR_NONE)
 		*bitrate = pc->cb_info->get_int[MUSE_CAMERA_GET_INT_ENCODED_PREVIEW_BITRATE];
@@ -4373,7 +4515,7 @@ int camera_attr_get_encoded_preview_gop_interval(camera_h camera, int *interval)
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret == CAMERA_ERROR_NONE)
 		*interval = pc->cb_info->get_int[MUSE_CAMERA_GET_INT_ENCODED_PREVIEW_GOP_INTERVAL];
@@ -4495,7 +4637,7 @@ int camera_attr_clear_af_area(camera_h camera)
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	LOGD("ret : 0x%x", ret);
 
@@ -4888,7 +5030,7 @@ int camera_attr_remove_geotag(camera_h camera)
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	LOGD("ret : 0x%x", ret);
 
@@ -4934,7 +5076,7 @@ int camera_attr_get_zoom(camera_h camera, int *zoom)
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret == CAMERA_ERROR_NONE)
 		*zoom = pc->cb_info->get_int[MUSE_CAMERA_GET_INT_ZOOM];
@@ -4958,7 +5100,7 @@ int camera_attr_get_zoom_range(camera_h camera, int *min, int *max)
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_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];
@@ -4984,7 +5126,7 @@ int camera_attr_get_af_mode(camera_h camera, camera_attr_af_mode_e *mode)
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret == CAMERA_ERROR_NONE)
 		*mode = (camera_attr_af_mode_e)pc->cb_info->get_int[MUSE_CAMERA_GET_INT_AF_MODE];
@@ -5008,7 +5150,7 @@ int camera_attr_get_exposure_mode(camera_h camera, camera_attr_exposure_mode_e *
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret == CAMERA_ERROR_NONE)
 		*mode = (camera_attr_exposure_mode_e)pc->cb_info->get_int[MUSE_CAMERA_GET_INT_EXPOSURE_MODE];
@@ -5032,7 +5174,7 @@ int camera_attr_get_exposure(camera_h camera, int *value)
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret == CAMERA_ERROR_NONE)
 		*value = pc->cb_info->get_int[MUSE_CAMERA_GET_INT_EXPOSURE];
@@ -5056,7 +5198,7 @@ int camera_attr_get_exposure_range(camera_h camera, int *min, int *max)
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_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];
@@ -5082,7 +5224,7 @@ int camera_attr_get_iso(camera_h camera, camera_attr_iso_e *iso)
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret == CAMERA_ERROR_NONE)
 		*iso = (camera_attr_iso_e)pc->cb_info->get_int[MUSE_CAMERA_GET_INT_ISO];
@@ -5106,7 +5248,7 @@ int camera_attr_get_brightness(camera_h camera, int *level)
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_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];
@@ -5130,7 +5272,7 @@ int camera_attr_get_brightness_range(camera_h camera, int *min, int *max)
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_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];
@@ -5156,7 +5298,7 @@ int camera_attr_get_contrast(camera_h camera, int *level)
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_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];
@@ -5180,7 +5322,7 @@ int camera_attr_get_contrast_range(camera_h camera, int *min, int *max)
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_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];
@@ -5207,7 +5349,7 @@ int camera_attr_get_hue(camera_h camera, int *level)
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_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];
@@ -5231,7 +5373,7 @@ int camera_attr_get_hue_range(camera_h camera, int *min, int *max)
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_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];
@@ -5258,7 +5400,7 @@ int camera_attr_get_whitebalance(camera_h camera, camera_attr_whitebalance_e *wb
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret == CAMERA_ERROR_NONE)
 		*wb = (camera_attr_whitebalance_e)pc->cb_info->get_int[MUSE_CAMERA_GET_INT_WHITE_BALANCE];
@@ -5282,7 +5424,7 @@ int camera_attr_get_effect(camera_h camera, camera_attr_effect_mode_e *effect)
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret == CAMERA_ERROR_NONE)
 		*effect = (camera_attr_effect_mode_e)pc->cb_info->get_int[MUSE_CAMERA_GET_INT_EFFECT];
@@ -5306,7 +5448,7 @@ int camera_attr_get_scene_mode(camera_h camera, camera_attr_scene_mode_e *mode)
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret == CAMERA_ERROR_NONE)
 		*mode = (camera_attr_scene_mode_e)pc->cb_info->get_int[MUSE_CAMERA_GET_INT_SCENE_MODE];
@@ -5330,7 +5472,7 @@ int camera_attr_is_enabled_tag(camera_h camera, bool *enable)
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret == CAMERA_ERROR_NONE)
 		*enable = (bool)pc->cb_info->get_int[MUSE_CAMERA_GET_INT_ENABLED_TAG];
@@ -5354,7 +5496,7 @@ int camera_attr_get_tag_image_description(camera_h camera, char **description)
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret == CAMERA_ERROR_NONE)
 		*description = strdup(pc->cb_info->get_string[MUSE_CAMERA_GET_STRING_TAG_IMAGE_DESCRIPTION]);
@@ -5378,7 +5520,7 @@ int camera_attr_get_tag_orientation(camera_h camera, camera_attr_tag_orientation
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret == CAMERA_ERROR_NONE)
 		*orientation = (camera_attr_tag_orientation_e)pc->cb_info->get_int[MUSE_CAMERA_GET_INT_TAG_ORIENTATION];
@@ -5402,7 +5544,7 @@ int camera_attr_get_tag_software(camera_h camera, char **software)
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret == CAMERA_ERROR_NONE)
 		*software = strdup(pc->cb_info->get_string[MUSE_CAMERA_GET_STRING_TAG_SOFTWARE]);
@@ -5426,7 +5568,7 @@ int camera_attr_get_geotag(camera_h camera, double *latitude, double *longitude,
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret == CAMERA_ERROR_NONE) {
 		*latitude = pc->cb_info->get_geotag[0];
@@ -5453,7 +5595,7 @@ int camera_attr_get_flash_mode(camera_h camera, camera_attr_flash_mode_e *mode)
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret == CAMERA_ERROR_NONE)
 		*mode = (camera_attr_flash_mode_e)pc->cb_info->get_int[MUSE_CAMERA_GET_INT_FLASH_MODE];
@@ -5504,7 +5646,7 @@ int camera_attr_foreach_supported_af_mode(camera_h camera, camera_attr_supported
 	pc->cb_info->user_cb[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_AF_MODE] = foreach_cb;
 	pc->cb_info->user_data[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_AF_MODE] = user_data;
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	LOGD("ret : 0x%x", ret);
 
@@ -5528,7 +5670,7 @@ int camera_attr_foreach_supported_exposure_mode(camera_h camera, camera_attr_sup
 	pc->cb_info->user_cb[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_EXPOSURE_MODE] = foreach_cb;
 	pc->cb_info->user_data[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_EXPOSURE_MODE] = user_data;
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	LOGD("ret : 0x%x", ret);
 
@@ -5552,7 +5694,7 @@ int camera_attr_foreach_supported_iso(camera_h camera, camera_attr_supported_iso
 	pc->cb_info->user_cb[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_ISO] = foreach_cb;
 	pc->cb_info->user_data[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_ISO] = user_data;
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	LOGD("ret : 0x%x", ret);
 
@@ -5576,7 +5718,7 @@ int camera_attr_foreach_supported_whitebalance(camera_h camera, camera_attr_supp
 	pc->cb_info->user_cb[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_WHITEBALANCE] = foreach_cb;
 	pc->cb_info->user_data[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_WHITEBALANCE] = user_data;
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	LOGD("ret : 0x%x", ret);
 
@@ -5600,7 +5742,7 @@ int camera_attr_foreach_supported_effect(camera_h camera, camera_attr_supported_
 	pc->cb_info->user_cb[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_EFFECT] = foreach_cb;
 	pc->cb_info->user_data[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_EFFECT] = user_data;
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	LOGD("ret : 0x%x", ret);
 
@@ -5624,7 +5766,7 @@ int camera_attr_foreach_supported_scene_mode(camera_h camera, camera_attr_suppor
 	pc->cb_info->user_cb[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_SCENE_MODE] = foreach_cb;
 	pc->cb_info->user_data[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_SCENE_MODE] = user_data;
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	LOGD("ret : 0x%x", ret);
 
@@ -5648,7 +5790,7 @@ int camera_attr_foreach_supported_flash_mode(camera_h camera, camera_attr_suppor
 	pc->cb_info->user_cb[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_FLASH_MODE] = foreach_cb;
 	pc->cb_info->user_data[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_FLASH_MODE] = user_data;
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	LOGD("ret : 0x%x", ret);
 
@@ -5672,7 +5814,7 @@ int camera_attr_foreach_supported_fps(camera_h camera, camera_attr_supported_fps
 	pc->cb_info->user_cb[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_FPS] = foreach_cb;
 	pc->cb_info->user_data[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_FPS] = user_data;
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	LOGD("Enter, handle :%td", pc->remote_handle);
 
@@ -5725,7 +5867,7 @@ int camera_attr_foreach_supported_stream_flip(camera_h camera, camera_attr_suppo
 	pc->cb_info->user_cb[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_STREAM_FLIP] = foreach_cb;
 	pc->cb_info->user_data[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_STREAM_FLIP] = user_data;
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	LOGD("ret : 0x%x", ret);
 
@@ -5749,7 +5891,7 @@ int camera_attr_foreach_supported_stream_rotation(camera_h camera, camera_attr_s
 	pc->cb_info->user_cb[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_STREAM_ROTATION] = foreach_cb;
 	pc->cb_info->user_data[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_STREAM_ROTATION] = user_data;
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	LOGD("ret : 0x%x", ret);
 
@@ -5795,7 +5937,7 @@ int camera_attr_get_stream_rotation(camera_h camera, camera_rotation_e *rotation
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret == CAMERA_ERROR_NONE)
 		*rotation = (camera_rotation_e)pc->cb_info->get_int[MUSE_CAMERA_GET_INT_STREAM_ROTATION];
@@ -5844,7 +5986,7 @@ int camera_attr_get_stream_flip(camera_h camera, camera_flip_e *flip)
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret == CAMERA_ERROR_NONE)
 		*flip = (camera_flip_e)pc->cb_info->get_int[MUSE_CAMERA_GET_INT_STREAM_FLIP];
@@ -5892,7 +6034,7 @@ int camera_attr_get_hdr_mode(camera_h camera, camera_attr_hdr_mode_e *mode)
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret == CAMERA_ERROR_NONE)
 		*mode = (camera_attr_hdr_mode_e)pc->cb_info->get_int[MUSE_CAMERA_GET_INT_HDR_MODE];
@@ -5916,7 +6058,7 @@ bool camera_attr_is_supported_hdr_capture(camera_h camera)
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret < 0) {
 		LOGE("error is occurred 0x%x", ret);
@@ -5952,7 +6094,7 @@ int camera_attr_set_hdr_capture_progress_cb(camera_h camera, camera_attr_hdr_pro
 		return CAMERA_ERROR_INVALID_PARAMETER;
 	}
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret == CAMERA_ERROR_NONE) {
 		g_mutex_lock(&pc->cb_info->user_cb_mutex[MUSE_CAMERA_EVENT_TYPE_HDR_PROGRESS]);
@@ -5982,7 +6124,7 @@ int camera_attr_unset_hdr_capture_progress_cb(camera_h camera)
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret == CAMERA_ERROR_NONE) {
 		g_mutex_lock(&pc->cb_info->user_cb_mutex[MUSE_CAMERA_EVENT_TYPE_HDR_PROGRESS]);
@@ -6037,7 +6179,7 @@ int camera_attr_is_enabled_anti_shake(camera_h camera, bool *enabled)
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret == CAMERA_ERROR_NONE)
 		*enabled = (bool)pc->cb_info->get_int[MUSE_CAMERA_GET_INT_ENABLED_ANTI_SHAKE];
@@ -6061,7 +6203,7 @@ bool camera_attr_is_supported_anti_shake(camera_h camera)
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret < 0) {
 		LOGE("error is occurred 0x%x", ret);
@@ -6112,7 +6254,7 @@ int camera_attr_is_enabled_video_stabilization(camera_h camera, bool *enabled)
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret == CAMERA_ERROR_NONE)
 		*enabled = (bool)pc->cb_info->get_int[MUSE_CAMERA_GET_INT_ENABLED_VIDEO_STABILIZATION];
@@ -6136,7 +6278,7 @@ bool camera_attr_is_supported_video_stabilization(camera_h camera)
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret < 0) {
 		LOGE("error is occurred 0x%x", ret);
@@ -6187,7 +6329,7 @@ int camera_attr_is_enabled_auto_contrast(camera_h camera, bool *enabled)
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret == CAMERA_ERROR_NONE)
 		*enabled = (bool)pc->cb_info->get_int[MUSE_CAMERA_GET_INT_ENABLED_AUTO_CONTRAST];
@@ -6211,7 +6353,7 @@ bool camera_attr_is_supported_auto_contrast(camera_h camera)
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret < 0) {
 		LOGE("error is occurred 0x%x", ret);
@@ -6289,7 +6431,7 @@ int camera_attr_get_pan(camera_h camera, int *pan_step)
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret == CAMERA_ERROR_NONE)
 		*pan_step = pc->cb_info->get_int[MUSE_CAMERA_GET_INT_PAN];
@@ -6313,7 +6455,7 @@ int camera_attr_get_pan_range(camera_h camera, int *min, int *max)
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_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];
@@ -6366,7 +6508,7 @@ int camera_attr_get_tilt(camera_h camera, int *tilt_step)
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret == CAMERA_ERROR_NONE)
 		*tilt_step = pc->cb_info->get_int[MUSE_CAMERA_GET_INT_TILT];
@@ -6390,7 +6532,7 @@ int camera_attr_get_tilt_range(camera_h camera, int *min, int *max)
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_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];
@@ -6444,7 +6586,7 @@ int camera_attr_foreach_supported_ptz_type(camera_h camera, camera_attr_supporte
 	pc->cb_info->user_cb[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_PTZ_TYPE] = foreach_cb;
 	pc->cb_info->user_data[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_PTZ_TYPE] = user_data;
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	LOGD("ret : 0x%x", ret);
 
@@ -6526,7 +6668,7 @@ int camera_attr_get_display_roi_area(camera_h camera, int *x, int *y, int *width
 
 	LOGD("Enter");
 
-	_camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+	_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
 
 	if (ret == CAMERA_ERROR_NONE) {
 		*x = pc->cb_info->get_display_roi_area[0];