From cb6f7af97bfd9a4debf684797c62e9221f24002e Mon Sep 17 00:00:00 2001 From: Jeongmo Yang Date: Wed, 22 Mar 2023 15:21:22 +0900 Subject: [PATCH] Add new interface for exposure mode and command - exposure mode : CAMERA_EXPOSURE_MODE_SHUTTER_PRIORITY : CAMERA_EXPOSURE_MODE_APERTURE_PRIORITY - command : CAMERA_COMMAND_WHITE_BALANCE_TEMPERATURE : CAMERA_COMMAND_GAIN [Version] 0.0.20 [Issue Type] New feature Change-Id: I14c26e3e6439ce0f25deab4d96a72b0669f44637 Signed-off-by: Jeongmo Yang --- include/hal-camera-interface.h | 88 ++++++++++++++++++---------------- packaging/hal-api-camera.spec | 2 +- 2 files changed, 47 insertions(+), 43 deletions(-) diff --git a/include/hal-camera-interface.h b/include/hal-camera-interface.h index 7c577b0..48feece 100644 --- a/include/hal-camera-interface.h +++ b/include/hal-camera-interface.h @@ -335,11 +335,13 @@ typedef enum camera_scene_mode { * @since_tizen 6.5 */ typedef enum camera_exposure_mode { - CAMERA_EXPOSURE_MODE_OFF = 0, /**< Off */ - CAMERA_EXPOSURE_MODE_ALL, /**< All mode */ - CAMERA_EXPOSURE_MODE_CENTER, /**< Center mode */ - CAMERA_EXPOSURE_MODE_SPOT, /**< Spot mode */ - CAMERA_EXPOSURE_MODE_CUSTOM /**< Custom mode */ + CAMERA_EXPOSURE_MODE_OFF = 0, /**< Off */ + CAMERA_EXPOSURE_MODE_ALL, /**< All mode */ + CAMERA_EXPOSURE_MODE_CENTER, /**< Center mode */ + CAMERA_EXPOSURE_MODE_SPOT, /**< Spot mode */ + CAMERA_EXPOSURE_MODE_CUSTOM, /**< Custom mode */ + CAMERA_EXPOSURE_MODE_SHUTTER_PRIORITY, /**< Shutter priority mode */ + CAMERA_EXPOSURE_MODE_APERTURE_PRIORITY /**< Aperture priority mode */ } camera_exposure_mode_e; /** @@ -390,43 +392,45 @@ typedef enum camera_ptz_type { * @brief Definitions for the camera command. * @since_tizen 6.5 */ -#define CAMERA_COMMAND_BASE ((int64_t)1) -#define CAMERA_COMMAND_WHITE_BALANCE ((int64_t)(CAMERA_COMMAND_BASE << 1)) -#define CAMERA_COMMAND_ISO ((int64_t)(CAMERA_COMMAND_BASE << 2)) -#define CAMERA_COMMAND_CONTRAST ((int64_t)(CAMERA_COMMAND_BASE << 3)) -#define CAMERA_COMMAND_SATURATION ((int64_t)(CAMERA_COMMAND_BASE << 4)) -#define CAMERA_COMMAND_HUE ((int64_t)(CAMERA_COMMAND_BASE << 5)) -#define CAMERA_COMMAND_SHARPNESS ((int64_t)(CAMERA_COMMAND_BASE << 6)) -#define CAMERA_COMMAND_EFFECT ((int64_t)(CAMERA_COMMAND_BASE << 7)) -#define CAMERA_COMMAND_SCENE_MODE ((int64_t)(CAMERA_COMMAND_BASE << 8)) -#define CAMERA_COMMAND_EXPOSURE_MODE ((int64_t)(CAMERA_COMMAND_BASE << 9)) -#define CAMERA_COMMAND_EXPOSURE ((int64_t)(CAMERA_COMMAND_BASE << 10)) -#define CAMERA_COMMAND_ROTATION ((int64_t)(CAMERA_COMMAND_BASE << 11)) -#define CAMERA_COMMAND_FLIP ((int64_t)(CAMERA_COMMAND_BASE << 12)) -#define CAMERA_COMMAND_FOCUS_MODE ((int64_t)(CAMERA_COMMAND_BASE << 13)) -#define CAMERA_COMMAND_FOCUS_RANGE ((int64_t)(CAMERA_COMMAND_BASE << 14)) -#define CAMERA_COMMAND_SHOT_MODE ((int64_t)(CAMERA_COMMAND_BASE << 15)) -#define CAMERA_COMMAND_ANTI_SHAKE ((int64_t)(CAMERA_COMMAND_BASE << 16)) -#define CAMERA_COMMAND_FOCUS_AREA ((int64_t)(CAMERA_COMMAND_BASE << 17)) -#define CAMERA_COMMAND_DIGITAL_ZOOM ((int64_t)(CAMERA_COMMAND_BASE << 18)) -#define CAMERA_COMMAND_OPTICAL_ZOOM ((int64_t)(CAMERA_COMMAND_BASE << 19)) -#define CAMERA_COMMAND_RECORDING_HINT ((int64_t)(CAMERA_COMMAND_BASE << 20)) -#define CAMERA_COMMAND_WDR ((int64_t)(CAMERA_COMMAND_BASE << 21)) -#define CAMERA_COMMAND_SHUTTER_SPEED ((int64_t)(CAMERA_COMMAND_BASE << 22)) -#define CAMERA_COMMAND_FLASH_MODE ((int64_t)(CAMERA_COMMAND_BASE << 23)) -#define CAMERA_COMMAND_FACE_DETECTION ((int64_t)(CAMERA_COMMAND_BASE << 24)) -#define CAMERA_COMMAND_BITRATE ((int64_t)(CAMERA_COMMAND_BASE << 25)) -#define CAMERA_COMMAND_PTZ_TYPE ((int64_t)(CAMERA_COMMAND_BASE << 26)) -#define CAMERA_COMMAND_PAN ((int64_t)(CAMERA_COMMAND_BASE << 27)) -#define CAMERA_COMMAND_TILT ((int64_t)(CAMERA_COMMAND_BASE << 28)) -#define CAMERA_COMMAND_BRIGHTNESS ((int64_t)(CAMERA_COMMAND_BASE << 29)) -#define CAMERA_COMMAND_GOP_INTERVAL ((int64_t)(CAMERA_COMMAND_BASE << 30)) -#define CAMERA_COMMAND_CAPTURE_COUNT ((int64_t)(CAMERA_COMMAND_BASE << 31)) -#define CAMERA_COMMAND_CAPTURE_INTERVAL ((int64_t)(CAMERA_COMMAND_BASE << 32)) -#define CAMERA_COMMAND_FLASH_BRIGHTNESS ((int64_t)(CAMERA_COMMAND_BASE << 33)) -#define CAMERA_COMMAND_FOCUS_LEVEL ((int64_t)(CAMERA_COMMAND_BASE << 34)) -#define CAMERA_COMMAND_DEVICE_BUS ((int64_t)(CAMERA_COMMAND_BASE << 35)) -#define CAMERA_COMMAND_DEVICE_PORT ((int64_t)(CAMERA_COMMAND_BASE << 36)) +#define CAMERA_COMMAND_BASE ((int64_t)1) +#define CAMERA_COMMAND_WHITE_BALANCE ((int64_t)(CAMERA_COMMAND_BASE << 1)) +#define CAMERA_COMMAND_ISO ((int64_t)(CAMERA_COMMAND_BASE << 2)) +#define CAMERA_COMMAND_CONTRAST ((int64_t)(CAMERA_COMMAND_BASE << 3)) +#define CAMERA_COMMAND_SATURATION ((int64_t)(CAMERA_COMMAND_BASE << 4)) +#define CAMERA_COMMAND_HUE ((int64_t)(CAMERA_COMMAND_BASE << 5)) +#define CAMERA_COMMAND_SHARPNESS ((int64_t)(CAMERA_COMMAND_BASE << 6)) +#define CAMERA_COMMAND_EFFECT ((int64_t)(CAMERA_COMMAND_BASE << 7)) +#define CAMERA_COMMAND_SCENE_MODE ((int64_t)(CAMERA_COMMAND_BASE << 8)) +#define CAMERA_COMMAND_EXPOSURE_MODE ((int64_t)(CAMERA_COMMAND_BASE << 9)) +#define CAMERA_COMMAND_EXPOSURE ((int64_t)(CAMERA_COMMAND_BASE << 10)) +#define CAMERA_COMMAND_ROTATION ((int64_t)(CAMERA_COMMAND_BASE << 11)) +#define CAMERA_COMMAND_FLIP ((int64_t)(CAMERA_COMMAND_BASE << 12)) +#define CAMERA_COMMAND_FOCUS_MODE ((int64_t)(CAMERA_COMMAND_BASE << 13)) +#define CAMERA_COMMAND_FOCUS_RANGE ((int64_t)(CAMERA_COMMAND_BASE << 14)) +#define CAMERA_COMMAND_SHOT_MODE ((int64_t)(CAMERA_COMMAND_BASE << 15)) +#define CAMERA_COMMAND_ANTI_SHAKE ((int64_t)(CAMERA_COMMAND_BASE << 16)) +#define CAMERA_COMMAND_FOCUS_AREA ((int64_t)(CAMERA_COMMAND_BASE << 17)) +#define CAMERA_COMMAND_DIGITAL_ZOOM ((int64_t)(CAMERA_COMMAND_BASE << 18)) +#define CAMERA_COMMAND_OPTICAL_ZOOM ((int64_t)(CAMERA_COMMAND_BASE << 19)) +#define CAMERA_COMMAND_RECORDING_HINT ((int64_t)(CAMERA_COMMAND_BASE << 20)) +#define CAMERA_COMMAND_WDR ((int64_t)(CAMERA_COMMAND_BASE << 21)) +#define CAMERA_COMMAND_SHUTTER_SPEED ((int64_t)(CAMERA_COMMAND_BASE << 22)) +#define CAMERA_COMMAND_FLASH_MODE ((int64_t)(CAMERA_COMMAND_BASE << 23)) +#define CAMERA_COMMAND_FACE_DETECTION ((int64_t)(CAMERA_COMMAND_BASE << 24)) +#define CAMERA_COMMAND_BITRATE ((int64_t)(CAMERA_COMMAND_BASE << 25)) +#define CAMERA_COMMAND_PTZ_TYPE ((int64_t)(CAMERA_COMMAND_BASE << 26)) +#define CAMERA_COMMAND_PAN ((int64_t)(CAMERA_COMMAND_BASE << 27)) +#define CAMERA_COMMAND_TILT ((int64_t)(CAMERA_COMMAND_BASE << 28)) +#define CAMERA_COMMAND_BRIGHTNESS ((int64_t)(CAMERA_COMMAND_BASE << 29)) +#define CAMERA_COMMAND_GOP_INTERVAL ((int64_t)(CAMERA_COMMAND_BASE << 30)) +#define CAMERA_COMMAND_CAPTURE_COUNT ((int64_t)(CAMERA_COMMAND_BASE << 31)) +#define CAMERA_COMMAND_CAPTURE_INTERVAL ((int64_t)(CAMERA_COMMAND_BASE << 32)) +#define CAMERA_COMMAND_FLASH_BRIGHTNESS ((int64_t)(CAMERA_COMMAND_BASE << 33)) +#define CAMERA_COMMAND_FOCUS_LEVEL ((int64_t)(CAMERA_COMMAND_BASE << 34)) +#define CAMERA_COMMAND_DEVICE_BUS ((int64_t)(CAMERA_COMMAND_BASE << 35)) +#define CAMERA_COMMAND_DEVICE_PORT ((int64_t)(CAMERA_COMMAND_BASE << 36)) +#define CAMERA_COMMAND_WHITE_BALANCE_TEMPERATURE ((int64_t)(CAMERA_COMMAND_BASE << 37)) +#define CAMERA_COMMAND_GAIN ((int64_t)(CAMERA_COMMAND_BASE << 38)) typedef struct camera_batch_command_control { diff --git a/packaging/hal-api-camera.spec b/packaging/hal-api-camera.spec index 640a7e2..875698c 100644 --- a/packaging/hal-api-camera.spec +++ b/packaging/hal-api-camera.spec @@ -4,7 +4,7 @@ ### main package ######### Name: %{name} Summary: %{name} interface -Version: 0.0.19 +Version: 0.0.20 Release: 0 Group: Development/Libraries License: Apache-2.0 -- 2.34.1