diff options
author | Jeongmo Yang <jm80.yang@samsung.com> | 2017-05-08 18:37:57 +0900 |
---|---|---|
committer | Jeongmo Yang <jm80.yang@samsung.com> | 2017-05-10 19:16:07 +0900 |
commit | 4294cc5245b9b4c14322ae409db1ce8418c40752 (patch) | |
tree | 21f68b634baeaf2c904195d63bac6e7f314db561 | |
parent | 2470d9741d6e6d9df996f6be5f06daf632b57fb5 (diff) | |
download | camera-4294cc5245b9b4c14322ae409db1ce8418c40752.tar.gz camera-4294cc5245b9b4c14322ae409db1ce8418c40752.tar.bz2 camera-4294cc5245b9b4c14322ae409db1ce8418c40752.zip |
[ACR-961] Remove camera privilege from some APIstizen_4.0.m1_releasesubmit/tizen/20170515.041223accepted/tizen/unified/20170515.074603
Actually, some APIs includes camera_create does not access camera device,
but, it couldn't be done without camera privilege.
[Version] 0.3.0
[Profile] Common
[Issue Type] Update
[Dependency module] N/A
Change-Id: If22055c8b5c3dffa17d4324d3131b2b5a4c9debf
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>
-rw-r--r-- | include/camera.h | 60 | ||||
-rw-r--r-- | packaging/capi-media-camera.spec | 2 |
2 files changed, 3 insertions, 59 deletions
diff --git a/include/camera.h b/include/camera.h index 31f16d0..5a8933c 100644 --- a/include/camera.h +++ b/include/camera.h @@ -739,12 +739,12 @@ typedef bool (*camera_supported_preview_format_cb)(camera_pixel_format_e format, * @brief Creates a new camera handle for controlling a camera. * * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif - * @privlevel public - * @privilege %http://tizen.org/privilege/camera * @remarks Multiple handles on a context at the same time are allowed to be created. However, * camera cannot guarantee proper operation because of limited resources, such as * camera device, audio device, and display device.\n. * A @a camera must be released using camera_destroy(). + * @remarks The privilege %http://tizen.org/privilege/camera is not required since 4.0,\n + * but it is required in all earlier versions. * @param[in] device The hardware camera to access * @param[out] camera A newly returned handle to the camera * @return @c 0 on success, otherwise a negative error value @@ -765,8 +765,6 @@ int camera_create(camera_device_e device, camera_h *camera); * @brief Changes the camera device. * * @since_tizen 3.0 - * @privlevel public - * @privilege %http://tizen.org/privilege/camera * @remarks This function can be used to change camera device simply without camera_destroy() and camera_create().\n * If display reuse hint is set by camera_set_display_reuse_hint() before stopping the preview,\n * display handle will be reused and last frame on display can be kept even though camera device is changed. @@ -792,8 +790,6 @@ int camera_change_device(camera_h camera, camera_device_e device); * @brief Destroys the camera handle and releases all its resources. * * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif - * @privlevel public - * @privilege %http://tizen.org/privilege/camera * @param[in] camera The handle to the camera * @return @c 0 on success, otherwise a negative error value * @retval #CAMERA_ERROR_NONE Successful @@ -1063,8 +1059,6 @@ int camera_set_display(camera_h camera, camera_display_type_e type, camera_displ * @brief Sets the resolution of the preview. * * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif - * @privlevel public - * @privilege %http://tizen.org/privilege/camera * @remarks This function should be called before previewing (camera_start_preview()). * @param[in] camera The handle to the camera * @param[in] width The preview width @@ -1230,8 +1224,6 @@ int camera_foreach_supported_preview_resolution(camera_h camera, camera_supporte * @brief Sets the display rotation. * * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif - * @privlevel public - * @privilege %http://tizen.org/privilege/camera * @remarks This function should be called before previewing (see camera_start_preview()) * @param[in] camera The handle to the camera * @param[in] rotation The display rotation @@ -1270,8 +1262,6 @@ int camera_get_display_rotation(camera_h camera, camera_rotation_e *rotation); * @brief Sets the display flip. * * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif - * @privlevel public - * @privilege %http://tizen.org/privilege/camera * @param[in] camera The handle to the camera * @param[in] flip The display flip * @return @c 0 on success, otherwise a negative error value @@ -1308,8 +1298,6 @@ int camera_get_display_flip(camera_h camera, camera_flip_e *flip); * @brief Sets the visible property for display. * * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif - * @privlevel public - * @privilege %http://tizen.org/privilege/camera * @param[in] camera The handle to the camera * @param[in] visible The display visibility property * @@ -1415,8 +1403,6 @@ int camera_get_display_reuse_hint(camera_h camera, bool *hint); /** * @brief Sets the resolution of the captured image. * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif - * @privlevel public - * @privilege %http://tizen.org/privilege/camera * @param[in] camera The handle to the camera * @param[in] width The capture width * @param[in] height The capture height @@ -2214,8 +2200,6 @@ int camera_attr_foreach_supported_fps(camera_h camera, camera_attr_supported_fps * @brief Retrieves all supported FPS modes by invoking the callback function once for each supported FPS mode. * @since_tizen @if MOBILE 2.4 @elseif WEARABLE 3.0 @endif * @param[in] camera The handle to the camera - * @privlevel public - * @privilege %http://tizen.org/privilege/camera * @param[in] width Required preview resolution's width * @param[in] height Required preview resolution's height * @param[in] callback The callback function to invoke @@ -2246,8 +2230,6 @@ int camera_attr_foreach_supported_fps_by_resolution(camera_h camera, int width, * @brief Sets quality of the image. * @details The range for image quality is 1 to 100. If @a quality is out of range, #CAMERA_ERROR_INVALID_PARAMETER error occurred. * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif - * @privlevel public - * @privilege %http://tizen.org/privilege/camera * @param[in] camera The handle to the camera * @param[in] quality The quality of image (1 ~ 100) * @return @c 0 on success, otherwise a negative error value @@ -2342,8 +2324,6 @@ int camera_attr_set_encoded_preview_gop_interval(camera_h camera, int interval); * @brief Sets the zoom level. * @details The range for the zoom level is received from camera_attr_get_zoom_range(). If @a zoom is out of range, the #CAMERA_ERROR_INVALID_PARAMETER error occurs. * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif - * @privlevel public - * @privilege %http://tizen.org/privilege/camera * @param[in] camera The handle to the camera * @param[in] zoom The zoom level * @return @c 0 on success, otherwise a negative error value @@ -2397,8 +2377,6 @@ int camera_attr_get_zoom_range(camera_h camera, int *min, int *max); /** * @brief Sets the auto focus mode. * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif - * @privlevel public - * @privilege %http://tizen.org/privilege/camera * @param[in] camera The handle to the camera * @param[in] mode The auto focus mode * @return @c 0 on success, otherwise a negative error value @@ -2418,8 +2396,6 @@ int camera_attr_set_af_mode(camera_h camera, camera_attr_af_mode_e mode); /** * @brief Gets the auto focus mode. * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif - * @privlevel public - * @privilege %http://tizen.org/privilege/camera * @param[in] camera The handle to the camera * @param[out] mode The auto focus mode * @return @c 0 on success, otherwise a negative error value @@ -2437,8 +2413,6 @@ int camera_attr_get_af_mode(camera_h camera, camera_attr_af_mode_e *mode); /** * @brief Sets auto focus area. * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif - * @privlevel public - * @privilege %http://tizen.org/privilege/camera * @remarks This API is invalid in the #CAMERA_ATTR_AF_NONE mode.\n * The coordinates are mapped to preview area. * @param[in] camera The handle to the camera @@ -2461,8 +2435,6 @@ int camera_attr_set_af_area(camera_h camera, int x, int y); /** * @brief Clears the auto focus area. * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif - * @privlevel public - * @privilege %http://tizen.org/privilege/camera * @remarks The focusing area is set to the center. * @param[in] camera The handle to the camera * @return @c 0 on success, otherwise a negative error value @@ -2517,8 +2489,6 @@ int camera_attr_foreach_supported_af_mode(camera_h camera, camera_attr_supported /** * @brief Sets the exposure mode. * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif - * @privlevel public - * @privilege %http://tizen.org/privilege/camera * @param[in] camera The handle to the camera * @param[in] mode The exposure mode * @return @c 0 on success, otherwise a negative error value @@ -2590,8 +2560,6 @@ int camera_attr_foreach_supported_exposure_mode(camera_h camera, camera_attr_sup /** * @brief Sets the exposure value. * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif - * @privlevel public - * @privilege %http://tizen.org/privilege/camera * @param[in] camera The handle to the camera * @param[in] value The exposure value * @return @c 0 on success, otherwise a negative error value @@ -2639,8 +2607,6 @@ int camera_attr_get_exposure_range(camera_h camera, int *min, int *max); /** * @brief Sets the ISO level. * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif - * @privlevel public - * @privilege %http://tizen.org/privilege/camera * @param[in] camera The handle to the camera * @param[in] iso The ISO level * @return @c 0 on success, otherwise a negative error value @@ -2712,8 +2678,6 @@ int camera_attr_foreach_supported_iso(camera_h camera, camera_attr_supported_iso /** * @brief Sets the theater mode. * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif - * @privlevel public - * @privilege %http://tizen.org/privilege/camera * @remarks If you want to display the preview image on the external display with the full screen mode, use this function. * @param[in] camera The handle to the camera * @param[in] mode The mode to change @@ -2784,8 +2748,6 @@ int camera_attr_foreach_supported_theater_mode(camera_h camera, camera_attr_supp /** * @brief Sets the brightness level. * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif - * @privlevel public - * @privilege %http://tizen.org/privilege/camera * @remarks If the min value is greater than the max value from camera_attr_get_brightness_range(), \n * it means that this feature is not supported. * @param[in] camera The handle to the camera @@ -2840,8 +2802,6 @@ int camera_attr_get_brightness_range(camera_h camera, int *min, int *max); /** * @brief Sets the contrast level. * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif - * @privlevel public - * @privilege %http://tizen.org/privilege/camera * @param[in] camera The handle to the camera * @param[in] level The contrast level * @return @c 0 on success, otherwise a negative error value @@ -2894,8 +2854,6 @@ int camera_attr_get_contrast_range(camera_h camera, int *min, int *max); /** * @brief Sets the white balance mode. * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif - * @privlevel public - * @privilege %http://tizen.org/privilege/camera * @param[in] camera The handle to the camera * @param[in] whitebalance The white balance mode * @return @c 0 on success, otherwise a negative error value @@ -2967,8 +2925,6 @@ int camera_attr_foreach_supported_whitebalance(camera_h camera, camera_attr_supp /** * @brief Sets the camera effect mode. * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif - * @privlevel public - * @privilege %http://tizen.org/privilege/camera * @param[in] camera The handle to the camera * @param[in] effect The camera effect mode * @return @c 0 on success, otherwise a negative error value @@ -3041,8 +2997,6 @@ int camera_attr_foreach_supported_effect(camera_h camera, camera_attr_supported_ /** * @brief Sets the scene mode. * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif - * @privlevel public - * @privilege %http://tizen.org/privilege/camera * @param[in] camera The handle to the camera * @param[in] mode The scene mode * @return @c 0 on success, otherwise a negative error value @@ -3291,8 +3245,6 @@ int camera_attr_remove_geotag(camera_h camera); /** * @brief Sets the camera's flash mode. * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif - * @privlevel public - * @privilege %http://tizen.org/privilege/camera * @remarks Since @if MOBILE 2.4 @elseif WEARABLE 3.0 @endif, while setting the flash mode, if the flash was preempted by other APIs,\n * then this function returns #CAMERA_ERROR_DEVICE_BUSY error. * @param[in] camera The handle to the camera @@ -3534,8 +3486,6 @@ typedef void (*camera_attr_hdr_progress_cb)(int percent, void *user_data); /** * @brief Sets the mode of HDR(High dynamic range) capture. * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif - * @privlevel public - * @privilege %http://tizen.org/privilege/camera * @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 * If you set #CAMERA_ATTR_HDR_MODE_KEEP_ORIGINAL, the capturing callback is invoked twice. The first callback is delivering origin image data. The second callback is delivering improved image data. @@ -3633,8 +3583,6 @@ bool camera_attr_is_supported_hdr_capture(camera_h camera); /** * @brief Enables/Disables the anti-shake feature. * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif - * @privlevel public - * @privilege %http://tizen.org/privilege/camera * @remarks This feature is used for image capture. * @param[in] camera The handle to the camera * @param[in] enable If @c true the anti-shake feature is enabled, otherwise @c false @@ -3685,8 +3633,6 @@ bool camera_attr_is_supported_anti_shake(camera_h camera); /** * @brief Enables/Disables the video stabilization feature. * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif - * @privlevel public - * @privilege %http://tizen.org/privilege/camera * @remarks If video stabilization is enabled, zero shutter lag is disabled.\n * This feature is used to record a video. * @param[in] camera The handle to the camera @@ -3738,8 +3684,6 @@ bool camera_attr_is_supported_video_stabilization(camera_h camera); /** * @brief Enables/Disables auto contrast. * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif - * @privlevel public - * @privilege %http://tizen.org/privilege/camera * @param[in] camera The handle to the camera * @param[in] enable If @c true auto contrast is enabled, otherwise @c false * @return @c 0 on success, otherwise a negative error value diff --git a/packaging/capi-media-camera.spec b/packaging/capi-media-camera.spec index e21a01c..2a3b0e4 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.2.100 +Version: 0.3.0 Release: 0 Group: Multimedia/API License: Apache-2.0 |