diff options
author | Jeongmo Yang <jm80.yang@samsung.com> | 2016-05-30 15:54:38 +0900 |
---|---|---|
committer | Jeongmo Yang <jm80.yang@samsung.com> | 2016-05-30 17:00:01 +0900 |
commit | ce5aa9a4aa1e3099c90c103d9a9dc4085f2bfda0 (patch) | |
tree | 0411b964145cc6c97392f60c536d7a3092444d2c | |
parent | 1da18c1cf515bd9a83da2ca009f1e99c91d0440f (diff) | |
download | camera-ce5aa9a4aa1e3099c90c103d9a9dc4085f2bfda0.tar.gz camera-ce5aa9a4aa1e3099c90c103d9a9dc4085f2bfda0.tar.bz2 camera-ce5aa9a4aa1e3099c90c103d9a9dc4085f2bfda0.zip |
[Release version 0.2.58] Add featuring for evas renderer
Change-Id: I3fb207856acc0902b1668524516253d0c2a43147
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>
-rw-r--r-- | CMakeLists.txt | 7 | ||||
-rw-r--r-- | include/camera_private.h | 2 | ||||
-rw-r--r-- | packaging/capi-media-camera.spec | 9 | ||||
-rw-r--r-- | src/camera.c | 197 |
4 files changed, 108 insertions, 107 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7df252c..87ac7fe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,11 @@ SET(service "media") SET(submodule "camera") # for package file +IF(EVAS_RENDERER_SUPPORT) SET(dependents "libtbm dlog mm-common capi-base-common capi-media-tool ecore elementary mmsvc-camera tizen-extension-client mm-evas-renderer") +ELSE(EVAS_RENDERER_SUPPORT) +SET(dependents "libtbm dlog mm-common capi-base-common capi-media-tool ecore elementary mmsvc-camera tizen-extension-client") +ENDIF(EVAS_RENDERER_SUPPORT) SET(pc_dependents "capi-base-common capi-media-tool libtbm evas ecore elementary") SET(fw_name "${project_prefix}-${service}-${submodule}") @@ -40,6 +44,9 @@ ENDIF(WAYLAND_SUPPORT) IF(X11_SUPPORT) ADD_DEFINITIONS("-DHAVE_X11") ENDIF(X11_SUPPORT) +IF(EVAS_RENDERER_SUPPORT) + ADD_DEFINITIONS("-DEVAS_RENDERER_SUPPORT") +ENDIF(EVAS_RENDERER_SUPPORT) ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"") ADD_DEFINITIONS("-DTIZEN_DEBUG") diff --git a/include/camera_private.h b/include/camera_private.h index 5466334..c4b389c 100644 --- a/include/camera_private.h +++ b/include/camera_private.h @@ -104,8 +104,10 @@ typedef struct _camera_cb_info_s { media_format_h pkt_fmt; int preview_cb_flag; GMutex mp_data_mutex; +#ifdef EVAS_RENDERER_SUPPORT void *evas_info; GMutex evas_mutex; +#endif /* EVAS_RENDERER_SUPPORT */ gboolean run_evas_render; } camera_cb_info_s; diff --git a/packaging/capi-media-camera.spec b/packaging/capi-media-camera.spec index 4126926..1a3e701 100644 --- a/packaging/capi-media-camera.spec +++ b/packaging/capi-media-camera.spec @@ -3,7 +3,7 @@ Name: capi-media-camera Summary: A Camera API -Version: 0.2.57 +Version: 0.2.58 Release: 0 Group: Multimedia/API License: Apache-2.0 @@ -25,7 +25,9 @@ BuildRequires: pkgconfig(ecore-wayland) %endif BuildRequires: pkgconfig(libtbm) BuildRequires: pkgconfig(tizen-extension-client) +%if "%{?profile}" == "mobile" BuildRequires: pkgconfig(mm-evas-renderer) +%endif Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig @@ -62,6 +64,11 @@ MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` %else -DWAYLAND_SUPPORT=Off \ %endif +%if "%{?profile}" == "mobile" + -DEVAS_RENDERER_SUPPORT=On \ +%else + -DEVAS_RENDERER_SUPPORT=Off \ +%endif %if %{with x} -DX11_SUPPORT=On %else diff --git a/src/camera.c b/src/camera.c index da4ea12..ba89508 100644 --- a/src/camera.c +++ b/src/camera.c @@ -35,10 +35,12 @@ #include <Ecore_Wayland.h> #include <wayland-client.h> #include <tizen-extension-client-protocol.h> -#else +#else /* HAVE_WAYLAND */ #include <Ecore.h> -#endif +#endif /* HAVE_WAYLAND */ +#ifdef EVAS_RENDERER_SUPPORT #include <mm_evas_renderer.h> +#endif /* EVAS_RENDERER_SUPPORT */ #ifdef LOG_TAG #undef LOG_TAG @@ -995,6 +997,7 @@ static void _client_user_callback(camera_cb_info_s *cb_info, char *recv_msg, mus /* call evas renderer */ if (CHECK_PREVIEW_CB(cb_info, PREVIEW_CB_TYPE_EVAS)) { +#ifdef EVAS_RENDERER_SUPPORT ret = _camera_media_packet_data_create(tbm_key, num_buffer_key, bo, buffer_bo, data_bo, &mp_data); if (ret == CAMERA_ERROR_NONE) { @@ -1018,6 +1021,9 @@ static void _client_user_callback(camera_cb_info_s *cb_info, char *recv_msg, mus mp_data = NULL; } } +#else /* EVAS_RENDERER_SUPPORT */ + LOGW("evas renderer is not supported"); +#endif /* EVAS_RENDERER_SUPPORT */ } /* send message for preview callback return */ @@ -1836,7 +1842,9 @@ static camera_cb_info_s *_client_callback_new(gint sockfd) g_mutex_init(&cb_info->idle_event_mutex); g_cond_init(&cb_info->idle_event_cond); g_mutex_init(&cb_info->mp_data_mutex); +#ifdef EVAS_RENDERER_SUPPORT g_mutex_init(&cb_info->evas_mutex); +#endif /* EVAS_RENDERER_SUPPORT */ for (i = 0 ; i < MUSE_CAMERA_API_MAX ; i++) { g_mutex_init(&cb_info->api_mutex[i]); @@ -1873,7 +1881,9 @@ static camera_cb_info_s *_client_callback_new(gint sockfd) cb_info->api_activating = tmp_activating; cb_info->api_ret = tmp_ret; cb_info->preview_cb_flag = 0; +#ifdef EVAS_RENDERER_SUPPORT cb_info->evas_info = NULL; +#endif /* EVAS_RENDERER_SUPPORT */ g_atomic_int_set(&cb_info->msg_recv_running, 1); cb_info->msg_recv_thread = g_thread_try_new("camera_msg_recv", @@ -1908,7 +1918,9 @@ ErrorExit: g_mutex_clear(&cb_info->idle_event_mutex); g_cond_clear(&cb_info->idle_event_cond); g_mutex_clear(&cb_info->mp_data_mutex); +#ifdef EVAS_RENDERER_SUPPORT g_mutex_clear(&cb_info->evas_mutex); +#endif /* EVAS_RENDERER_SUPPORT */ if (cb_info->msg_queue) { g_queue_free(cb_info->msg_queue); @@ -1967,7 +1979,9 @@ static void _client_callback_destroy(camera_cb_info_s *cb_info) g_mutex_clear(&cb_info->idle_event_mutex); g_cond_clear(&cb_info->idle_event_cond); g_mutex_clear(&cb_info->mp_data_mutex); +#ifdef EVAS_RENDERER_SUPPORT g_mutex_clear(&cb_info->evas_mutex); +#endif /* EVAS_RENDERER_SUPPORT */ LOGD("event thread removed"); @@ -1993,8 +2007,10 @@ static void _client_callback_destroy(camera_cb_info_s *cb_info) cb_info->pkt_fmt = NULL; } +#ifdef EVAS_RENDERER_SUPPORT if (cb_info->evas_info) mm_evas_renderer_destroy(&cb_info->evas_info); +#endif /* EVAS_RENDERER_SUPPORT */ cb_info->preview_cb_flag = 0; @@ -2027,6 +2043,7 @@ int _camera_start_evas_rendering(camera_h camera) return CAMERA_ERROR_NONE; } +#ifdef EVAS_RENDERER_SUPPORT g_mutex_lock(&pc->cb_info->evas_mutex); /* set evas render flag as RUN */ @@ -2034,6 +2051,10 @@ int _camera_start_evas_rendering(camera_h camera) ret = CAMERA_ERROR_NONE; g_mutex_unlock(&pc->cb_info->evas_mutex); +#else /* EVAS_RENDERER_SUPPORT */ + LOGW("evas renderer is not supported"); + ret = CAMERA_ERROR_NOT_SUPPORTED; +#endif /* EVAS_RENDERER_SUPPORT */ return ret; } @@ -2061,10 +2082,12 @@ int _camera_stop_evas_rendering(camera_h camera, bool keep_screen) return CAMERA_ERROR_NONE; } +#ifdef EVAS_RENDERER_SUPPORT g_mutex_lock(&pc->cb_info->evas_mutex); /* set evas render flag as STOP and release buffers */ pc->cb_info->run_evas_render = false; + ret = mm_evas_renderer_retrieve_all_packets(pc->cb_info->evas_info, keep_screen); if (ret != MM_ERROR_NONE) { LOGE("mm_evas_renderer_retrieve_all_packets failed 0x%x", ret); @@ -2072,6 +2095,10 @@ int _camera_stop_evas_rendering(camera_h camera, bool keep_screen) } g_mutex_unlock(&pc->cb_info->evas_mutex); +#else /* EVAS_RENDERER_SUPPORT */ + LOGW("evas renderer is not supported"); + ret = CAMERA_ERROR_NOT_SUPPORTED; +#endif /* EVAS_RENDERER_SUPPORT */ return ret; } @@ -2239,14 +2266,13 @@ int camera_start_preview(camera_h camera) if (ret != CAMERA_ERROR_NONE) { LOGE("start preview failed 0x%x", ret); - return ret; } else if (CHECK_PREVIEW_CB(pc->cb_info, PREVIEW_CB_TYPE_EVAS)) { ret = _camera_start_evas_rendering(camera); } LOGD("ret : 0x%x", ret); - return CAMERA_ERROR_NONE; + return ret; } int camera_stop_preview(camera_h camera) @@ -2721,6 +2747,7 @@ int camera_set_display(camera_h camera, camera_display_type_e type, camera_displ set_display_handle = (void *)display; LOGD("display type EVAS : handle %p", set_display_handle); +#ifdef EVAS_RENDERER_SUPPORT g_mutex_lock(&cb_info->evas_mutex); if (cb_info->evas_info) { @@ -2740,19 +2767,25 @@ int camera_set_display(camera_h camera, camera_display_type_e type, camera_displ camera_display_mode_e mode = CAMERA_DISPLAY_MODE_LETTER_BOX; camera_rotation_e rotation = CAMERA_ROTATION_NONE; bool visible = 0; + int x = 0; + int y = 0; + int width = 0; + int height = 0; camera_get_display_flip(camera, &flip); camera_get_display_mode(camera, &mode); camera_get_display_rotation(camera, &rotation); camera_is_display_visible(camera, &visible); + camera_attr_get_display_roi_area(camera, &x, &y, &width, &height); - LOGD("current setting : flip %d, mode %d, rotation %d, visible %d", - flip, mode, rotation, visible); + LOGD("current setting : flip %d, mode %d, rotation %d, visible %d, roi %d,%d,%dx%d", + flip, mode, rotation, visible, x, y, width, height); ret = mm_evas_renderer_set_flip(cb_info->evas_info, flip); ret |= mm_evas_renderer_set_geometry(cb_info->evas_info, mode); ret |= mm_evas_renderer_set_rotation(cb_info->evas_info, rotation); ret |= mm_evas_renderer_set_visible(cb_info->evas_info, visible); + ret |= mm_evas_renderer_set_roi_area(cb_info->evas_info, x, y, width, height); } g_mutex_unlock(&cb_info->evas_mutex); @@ -2761,7 +2794,10 @@ int camera_set_display(camera_h camera, camera_display_type_e type, camera_displ LOGE("mm_evas_renderer error 0x%x", ret); return CAMERA_ERROR_INVALID_OPERATION; } - +#else /* EVAS_RENDERER_SUPPORT */ + LOGE("EVAS surface is not supported"); + return CAMERA_ERROR_NOT_SUPPORTED; +#endif /* EVAS_RENDERER_SUPPORT */ } else { LOGE("unknown evas object [%p,%s] or type [%d] mismatch", obj, object_type, type); return CAMERA_ERROR_INVALID_PARAMETER; @@ -2954,6 +2990,7 @@ int camera_set_display_rotation(camera_h camera, camera_rotation_e rotation) return CAMERA_ERROR_INVALID_PARAMETER; } +#ifdef EVAS_RENDERER_SUPPORT if (CHECK_PREVIEW_CB(pc->cb_info, PREVIEW_CB_TYPE_EVAS)) { g_mutex_lock(&pc->cb_info->evas_mutex); @@ -2966,6 +3003,7 @@ int camera_set_display_rotation(camera_h camera, camera_rotation_e rotation) return CAMERA_ERROR_INVALID_OPERATION; } } +#endif /* EVAS_RENDERER_SUPPORT */ muse_camera_msg_send1(MUSE_CAMERA_API_SET_DISPLAY_ROTATION, pc->cb_info->fd, pc->cb_info, ret, INT, set_rotation); @@ -2991,25 +3029,12 @@ int camera_get_display_rotation(camera_h camera, camera_rotation_e *rotation) return CAMERA_ERROR_INVALID_PARAMETER; } - if (CHECK_PREVIEW_CB(pc->cb_info, PREVIEW_CB_TYPE_EVAS)) { - g_mutex_lock(&pc->cb_info->evas_mutex); - - ret = mm_evas_renderer_get_rotation(pc->cb_info->evas_info, (int *)rotation); + muse_camera_msg_send(MUSE_CAMERA_API_GET_DISPLAY_ROTATION, + pc->cb_info->fd, pc->cb_info, ret); - g_mutex_unlock(&pc->cb_info->evas_mutex); - - if (ret != MM_ERROR_NONE) { - LOGE("failed to get rotation for evas surface 0x%x", ret); - return CAMERA_ERROR_INVALID_OPERATION; - } - } else { - muse_camera_msg_send(MUSE_CAMERA_API_GET_DISPLAY_ROTATION, - pc->cb_info->fd, pc->cb_info, ret); - - if (ret == CAMERA_ERROR_NONE) { - muse_camera_msg_get(get_rotation, pc->cb_info->recv_msg); - *rotation = (camera_rotation_e)get_rotation; - } + if (ret == CAMERA_ERROR_NONE) { + muse_camera_msg_get(get_rotation, pc->cb_info->recv_msg); + *rotation = (camera_rotation_e)get_rotation; } return ret; @@ -3038,6 +3063,7 @@ int camera_set_display_flip(camera_h camera, camera_flip_e flip) return CAMERA_ERROR_INVALID_PARAMETER; } +#ifdef EVAS_RENDERER_SUPPORT if (CHECK_PREVIEW_CB(pc->cb_info, PREVIEW_CB_TYPE_EVAS)) { g_mutex_lock(&pc->cb_info->evas_mutex); @@ -3050,6 +3076,7 @@ int camera_set_display_flip(camera_h camera, camera_flip_e flip) return CAMERA_ERROR_INVALID_OPERATION; } } +#endif /* EVAS_RENDERER_SUPPORT */ muse_camera_msg_send1(MUSE_CAMERA_API_SET_DISPLAY_FLIP, pc->cb_info->fd, pc->cb_info, ret, INT, set_flip); @@ -3075,25 +3102,12 @@ int camera_get_display_flip(camera_h camera, camera_flip_e *flip) return CAMERA_ERROR_INVALID_PARAMETER; } - if (CHECK_PREVIEW_CB(pc->cb_info, PREVIEW_CB_TYPE_EVAS)) { - g_mutex_lock(&pc->cb_info->evas_mutex); - - ret = mm_evas_renderer_get_flip(pc->cb_info->evas_info, (int *)flip); + muse_camera_msg_send(MUSE_CAMERA_API_GET_DISPLAY_FLIP, + pc->cb_info->fd, pc->cb_info, ret); - g_mutex_unlock(&pc->cb_info->evas_mutex); - - if (ret != MM_ERROR_NONE) { - LOGE("failed to get flip for evas surface 0x%x", ret); - return CAMERA_ERROR_INVALID_OPERATION; - } - } else { - muse_camera_msg_send(MUSE_CAMERA_API_GET_DISPLAY_FLIP, - pc->cb_info->fd, pc->cb_info, ret); - - if (ret == CAMERA_ERROR_NONE) { - muse_camera_msg_get(get_flip, pc->cb_info->recv_msg); - *flip = (camera_flip_e)get_flip; - } + if (ret == CAMERA_ERROR_NONE) { + muse_camera_msg_get(get_flip, pc->cb_info->recv_msg); + *flip = (camera_flip_e)get_flip; } return ret; @@ -3117,6 +3131,7 @@ int camera_set_display_visible(camera_h camera, bool visible) return CAMERA_ERROR_INVALID_PARAMETER; } +#ifdef EVAS_RENDERER_SUPPORT if (CHECK_PREVIEW_CB(pc->cb_info, PREVIEW_CB_TYPE_EVAS)) { g_mutex_lock(&pc->cb_info->evas_mutex); @@ -3129,6 +3144,7 @@ int camera_set_display_visible(camera_h camera, bool visible) return CAMERA_ERROR_INVALID_OPERATION; } } +#endif /* EVAS_RENDERER_SUPPORT */ muse_camera_msg_send1(MUSE_CAMERA_API_SET_DISPLAY_VISIBLE, pc->cb_info->fd, pc->cb_info, ret, INT, set_visible); @@ -3154,25 +3170,12 @@ int camera_is_display_visible(camera_h camera, bool *visible) return CAMERA_ERROR_INVALID_PARAMETER; } - if (CHECK_PREVIEW_CB(pc->cb_info, PREVIEW_CB_TYPE_EVAS)) { - g_mutex_lock(&pc->cb_info->evas_mutex); - - ret = mm_evas_renderer_get_visible(pc->cb_info->evas_info, visible); - - g_mutex_unlock(&pc->cb_info->evas_mutex); + muse_camera_msg_send(MUSE_CAMERA_API_IS_DISPLAY_VISIBLE, + pc->cb_info->fd, pc->cb_info, ret); - if (ret != MM_ERROR_NONE) { - LOGE("failed to get visible for evas surface 0x%x", ret); - return CAMERA_ERROR_INVALID_OPERATION; - } - } else { - muse_camera_msg_send(MUSE_CAMERA_API_IS_DISPLAY_VISIBLE, - pc->cb_info->fd, pc->cb_info, ret); - - if (ret == CAMERA_ERROR_NONE) { - muse_camera_msg_get(get_visible, pc->cb_info->recv_msg); - *visible = (bool)get_visible; - } + if (ret == CAMERA_ERROR_NONE) { + muse_camera_msg_get(get_visible, pc->cb_info->recv_msg); + *visible = (bool)get_visible; } return ret; @@ -3201,6 +3204,7 @@ int camera_set_display_mode(camera_h camera, camera_display_mode_e mode) return CAMERA_ERROR_INVALID_PARAMETER; } +#ifdef EVAS_RENDERER_SUPPORT if (CHECK_PREVIEW_CB(pc->cb_info, PREVIEW_CB_TYPE_EVAS)) { g_mutex_lock(&pc->cb_info->evas_mutex); @@ -3213,6 +3217,7 @@ int camera_set_display_mode(camera_h camera, camera_display_mode_e mode) return CAMERA_ERROR_INVALID_OPERATION; } } +#endif /* EVAS_RENDERER_SUPPORT */ muse_camera_msg_send1(MUSE_CAMERA_API_SET_DISPLAY_MODE, pc->cb_info->fd, pc->cb_info, ret, INT, set_mode); @@ -3238,25 +3243,12 @@ int camera_get_display_mode(camera_h camera, camera_display_mode_e *mode) return CAMERA_ERROR_INVALID_PARAMETER; } - if (CHECK_PREVIEW_CB(pc->cb_info, PREVIEW_CB_TYPE_EVAS)) { - g_mutex_lock(&pc->cb_info->evas_mutex); - - ret = mm_evas_renderer_get_geometry(pc->cb_info->evas_info, (int *)mode); + muse_camera_msg_send(MUSE_CAMERA_API_GET_DISPLAY_MODE, + pc->cb_info->fd, pc->cb_info, ret); - g_mutex_unlock(&pc->cb_info->evas_mutex); - - if (ret != MM_ERROR_NONE) { - LOGE("failed to get geometry for evas surface 0x%x", ret); - return CAMERA_ERROR_INVALID_OPERATION; - } - } else { - muse_camera_msg_send(MUSE_CAMERA_API_GET_DISPLAY_MODE, - pc->cb_info->fd, pc->cb_info, ret); - - if (ret == CAMERA_ERROR_NONE) { - muse_camera_msg_get(get_mode, pc->cb_info->recv_msg); - *mode = (camera_display_mode_e)get_mode; - } + if (ret == CAMERA_ERROR_NONE) { + muse_camera_msg_get(get_mode, pc->cb_info->recv_msg); + *mode = (camera_display_mode_e)get_mode; } return ret; @@ -6400,6 +6392,9 @@ int camera_attr_set_display_roi_area(camera_h camera, int x, int y, int width, i int set_display_roi_area[4] = {x, y, width, height}; muse_camera_api_e api = MUSE_CAMERA_API_SET_DISPLAY_ROI_AREA; + LOGD("Enter, remote_handle : %x", pc->remote_handle); + +#ifdef EVAS_RENDERER_SUPPORT if(CHECK_PREVIEW_CB(pc->cb_info, PREVIEW_CB_TYPE_EVAS)) { g_mutex_lock(&pc->cb_info->evas_mutex); @@ -6411,12 +6406,13 @@ int camera_attr_set_display_roi_area(camera_h camera, int x, int y, int width, i LOGE("mm_evas_renderer_set_roi_area error 0x%x", ret); return CAMERA_ERROR_INVALID_OPERATION; } - } else { - LOGD("Enter, remote_handle : %x", pc->remote_handle); - muse_camera_msg_send_array(api, sock_fd, pc->cb_info, ret, - set_display_roi_area, sizeof(set_display_roi_area), sizeof(int)); - LOGD("ret : 0x%x", ret); } +#endif /* EVAS_RENDERER_SUPPORT */ + + muse_camera_msg_send_array(api, sock_fd, pc->cb_info, ret, + set_display_roi_area, sizeof(set_display_roi_area), sizeof(int)); + + LOGD("ret : 0x%x", ret); return ret; } @@ -6440,32 +6436,21 @@ int camera_attr_get_display_roi_area(camera_h camera, int *x, int *y, int *width int get_display_roi_area[4] = {0,}; muse_camera_api_e api = MUSE_CAMERA_API_GET_DISPLAY_ROI_AREA; - if(CHECK_PREVIEW_CB(pc->cb_info, PREVIEW_CB_TYPE_EVAS)) { - g_mutex_lock(&pc->cb_info->evas_mutex); - - ret = mm_evas_renderer_get_roi_area(pc->cb_info->evas_info, x, y, width, height); + LOGD("Enter, remote_handle : %x", pc->remote_handle); - g_mutex_unlock(&pc->cb_info->evas_mutex); + muse_camera_msg_send(api, sock_fd, pc->cb_info, ret); - if (ret != MM_ERROR_NONE) { - LOGE("mm_evas_renderer_get_roi_area error 0x%x", ret); - return CAMERA_ERROR_INVALID_OPERATION; - } - } else { - LOGD("Enter, remote_handle : %x", pc->remote_handle); - muse_camera_msg_send(api, sock_fd, pc->cb_info, ret); + if (ret == CAMERA_ERROR_NONE) { + muse_camera_msg_get_array(get_display_roi_area, pc->cb_info->recv_msg); - if (ret == CAMERA_ERROR_NONE) { - muse_camera_msg_get_array(get_display_roi_area, pc->cb_info->recv_msg); - *x = get_display_roi_area[0]; - *y = get_display_roi_area[1]; - *width = get_display_roi_area[2]; - *height = get_display_roi_area[3]; + *x = get_display_roi_area[0]; + *y = get_display_roi_area[1]; + *width = get_display_roi_area[2]; + *height = get_display_roi_area[3]; - LOGD("ret : 0x%x", ret); - } else { - LOGE("Returned value is not valid : 0x%x", ret); - } + LOGD("ret : 0x%x", ret); + } else { + LOGE("Returned value is not valid : 0x%x", ret); } return ret; |