From b69b8cce142fbc9b4e268aa7860ac2815caea205 Mon Sep 17 00:00:00 2001 From: xiongyangyang Date: Thu, 28 Aug 2025 15:12:20 +0800 Subject: [PATCH 1/2] =?UTF-8?q?ndk=E6=9E=9A=E4=B8=BE=E5=91=BD=E5=90=8D?= =?UTF-8?q?=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: xiongyangyang --- multimedia/camera_framework/camera.h | 64 ++++++++++++++++++++++++++-- 1 file changed, 60 insertions(+), 4 deletions(-) diff --git a/multimedia/camera_framework/camera.h b/multimedia/camera_framework/camera.h index c158c5ebe6b..8a429fbc2c3 100644 --- a/multimedia/camera_framework/camera.h +++ b/multimedia/camera_framework/camera.h @@ -439,20 +439,40 @@ typedef enum Camera_ImageRotation { */ IAMGE_ROTATION_0 = 0, + /** + * The capture image rotates 0 degrees. + */ + CAMERA_IMAGE_ROTATION_0 = 0, + /** * The capture image rotates 90 degrees. */ IAMGE_ROTATION_90 = 90, + /** + * The capture image rotates 90 degrees. + */ + CAMERA_IMAGE_ROTATION_90 = 90, + /** * The capture image rotates 180 degrees. */ IAMGE_ROTATION_180 = 180, + /** + * The capture image rotates 180 degrees. + */ + CAMERA_IMAGE_ROTATION_180 = 180, + /** * The capture image rotates 270 degrees. */ - IAMGE_ROTATION_270 = 270 + IAMGE_ROTATION_270 = 270, + + /** + * The capture image rotates 270 degrees. + */ + CAMERA_IMAGE_ROTATION_270 = 270 } Camera_ImageRotation; /** @@ -503,16 +523,32 @@ typedef enum Camera_TorchMode { */ OFF = 0, + /** + * The device torch is always off. + */ + CAMERA_TORCH_MODE_OFF = 0, + /** * The device torch is always on. */ ON = 1, + /** + * The device torch is always on. + */ + CAMERA_TORCH_MODE_ON = 1, + + /** + * The device continuously monitors light levels and + * uses the torch when necessary. + */ + AUTO = 2, + /** * The device continuously monitors light levels and * uses the torch when necessary. */ - AUTO = 2 + CAMERA_TORCH_MODE_AUTO = 2 } Camera_TorchMode; /** @@ -525,7 +561,12 @@ typedef enum Camera_SmoothZoomMode { /** * Normal zoom mode. */ - NORMAL = 0 + NORMAL = 0, + + /** + * Normal zoom mode. + */ + CAMERA_SMOOTH_ZOOM_MODE_NORMAL = 0 } Camera_SmoothZoomMode; /** @@ -1008,15 +1049,30 @@ typedef enum Camera_FoldStatus { */ NON_FOLDABLE = 0, + /** + * Non_foldable status. + */ + CAMERA_FOLD_STATUS_NON_FOLDABLE = 0, + /** * Expanded status. */ EXPANDED = 1, + /** + * Expanded status. + */ + CAMERA_FOLD_STATUS_EXPANDED = 1, + + /** + * Folded status. + */ + FOLDED = 2, + /** * Folded status. */ - FOLDED = 2 + CAMERA_FOLD_STATUS_FOLDED = 2 } Camera_FoldStatus; /** -- Gitee From 19cc2bef88fac58140c0af652f56c94430080ee2 Mon Sep 17 00:00:00 2001 From: xiongyangyang Date: Fri, 29 Aug 2025 16:52:51 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=89=88=E6=9C=AC=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: xiongyangyang --- multimedia/camera_framework/camera.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/multimedia/camera_framework/camera.h b/multimedia/camera_framework/camera.h index 8a429fbc2c3..fbd0317ca0e 100644 --- a/multimedia/camera_framework/camera.h +++ b/multimedia/camera_framework/camera.h @@ -441,6 +441,7 @@ typedef enum Camera_ImageRotation { /** * The capture image rotates 0 degrees. + * @since 20 */ CAMERA_IMAGE_ROTATION_0 = 0, @@ -451,6 +452,7 @@ typedef enum Camera_ImageRotation { /** * The capture image rotates 90 degrees. + * @since 20 */ CAMERA_IMAGE_ROTATION_90 = 90, @@ -461,6 +463,7 @@ typedef enum Camera_ImageRotation { /** * The capture image rotates 180 degrees. + * @since 20 */ CAMERA_IMAGE_ROTATION_180 = 180, @@ -471,6 +474,7 @@ typedef enum Camera_ImageRotation { /** * The capture image rotates 270 degrees. + * @since 20 */ CAMERA_IMAGE_ROTATION_270 = 270 } Camera_ImageRotation; @@ -525,6 +529,7 @@ typedef enum Camera_TorchMode { /** * The device torch is always off. + * @since 20 */ CAMERA_TORCH_MODE_OFF = 0, @@ -535,6 +540,7 @@ typedef enum Camera_TorchMode { /** * The device torch is always on. + * @since 20 */ CAMERA_TORCH_MODE_ON = 1, @@ -547,6 +553,7 @@ typedef enum Camera_TorchMode { /** * The device continuously monitors light levels and * uses the torch when necessary. + * @since 20 */ CAMERA_TORCH_MODE_AUTO = 2 } Camera_TorchMode; @@ -565,6 +572,7 @@ typedef enum Camera_SmoothZoomMode { /** * Normal zoom mode. + * @since 20 */ CAMERA_SMOOTH_ZOOM_MODE_NORMAL = 0 } Camera_SmoothZoomMode; @@ -1051,6 +1059,7 @@ typedef enum Camera_FoldStatus { /** * Non_foldable status. + * @since 20 */ CAMERA_FOLD_STATUS_NON_FOLDABLE = 0, @@ -1061,6 +1070,7 @@ typedef enum Camera_FoldStatus { /** * Expanded status. + * @since 20 */ CAMERA_FOLD_STATUS_EXPANDED = 1, @@ -1071,6 +1081,7 @@ typedef enum Camera_FoldStatus { /** * Folded status. + * @since 20 */ CAMERA_FOLD_STATUS_FOLDED = 2 } Camera_FoldStatus; -- Gitee