diff options
| -rw-r--r-- | include/camera.h | 2 | ||||
| -rw-r--r-- | packaging/capi-media-camera.spec | 2 | ||||
| -rw-r--r-- | src/camera.c | 6 |
3 files changed, 7 insertions, 3 deletions
diff --git a/include/camera.h b/include/camera.h index 4ff28b5..ab40935 100644 --- a/include/camera.h +++ b/include/camera.h @@ -987,6 +987,7 @@ int camera_cancel_focusing(camera_h camera); * * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif * @remarks This function must be called before previewing (see camera_start_preview()). + * In Custom ROI display mode, camera_attr_set_display_roi_area() function must be called before calling this function. * @param[in] camera The handle to the camera * @param[in] type The display type * @param[in] display The display handle from #GET_DISPLAY @@ -3695,6 +3696,7 @@ int camera_attr_foreach_supported_ptz_type(camera_h camera, camera_attr_supporte * @brief Sets the ROI(Region Of Interest) area of display. * @since_tizen 3.0 * @remarks Before set display ROI area, #CAMERA_DISPLAY_MODE_CUSTOM_ROI should be set with camera_set_display_mode(). + * The minimum value of width and height are 1. * @param[in] camera The handle to the camera * @param[in] x X coordinate of area * @param[in] y Y coordinate of area diff --git a/packaging/capi-media-camera.spec b/packaging/capi-media-camera.spec index 1a3e701..43ad5dc 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.58 +Version: 0.2.59 Release: 0 Group: Multimedia/API License: Apache-2.0 diff --git a/src/camera.c b/src/camera.c index ba89508..58f5f02 100644 --- a/src/camera.c +++ b/src/camera.c @@ -2785,7 +2785,9 @@ int camera_set_display(camera_h camera, camera_display_type_e type, camera_displ 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); + + if (mode == CAMERA_DISPLAY_MODE_CUSTOM_ROI) + ret |= mm_evas_renderer_set_roi_area(cb_info->evas_info, x, y, width, height); } g_mutex_unlock(&cb_info->evas_mutex); @@ -2814,7 +2816,7 @@ int camera_set_display(camera_h camera, camera_display_type_e type, camera_displ #ifdef HAVE_WAYLAND wl_info = &pc->wl_info; muse_camera_msg_send_array_and_value(api, sock_fd, cb_info, ret, - wl_info, 5, sizeof(int), INT, type); + wl_info, sizeof(camera_wl_info_s), sizeof(int), INT, type); LOGD("wayland parent id : %d, window %d,%d,%dx%d", wl_info->parent_id, wl_info->window_x, wl_info->window_y, |