From a175986accb722c81eef17ed7470ff88cfe834dd Mon Sep 17 00:00:00 2001 From: zhubingwei Date: Wed, 17 Apr 2024 15:52:59 +0800 Subject: [PATCH 1/3] add aisr api Signed-off-by: zhubingwei --- .../include/image/image_common.h | 17 +++++++++++++ .../include/image/image_source_native.h | 24 +++++++++++++++++++ .../image_framework/libimage_source.ndk.json | 8 +++++++ 3 files changed, 49 insertions(+) diff --git a/multimedia/image_framework/include/image/image_common.h b/multimedia/image_framework/include/image/image_common.h index a567e4615..5b028a495 100644 --- a/multimedia/image_framework/include/image/image_common.h +++ b/multimedia/image_framework/include/image/image_common.h @@ -146,6 +146,23 @@ typedef enum { IMAGE_ENCODE_FAILED = 7800301, } Image_ErrorCode; +/** + * @brief Enumerates the resolution quality that may be used by the interface. + * + * @since 12 + * @version 2.0 + */ +typedef enum { + /** resolution quality super */ + IMAGE_RESOLUTION_QUALITY_SUPER = 0, + /** resolution quality high */ + IMAGE_RESOLUTION_QUALITY_HIGH = 1, + /** resolution quality medium */ + IMAGE_RESOLUTION_QUALITY_MEDIUM = 2, + /** resolution quality low */ + IMAGE_RESOLUTION_QUALITY_LOW = 3, + } Image_ResolutionQuality; + /** * @brief Defines the bmp mime type. * diff --git a/multimedia/image_framework/include/image/image_source_native.h b/multimedia/image_framework/include/image/image_source_native.h index c172388ee..846da62d3 100644 --- a/multimedia/image_framework/include/image/image_source_native.h +++ b/multimedia/image_framework/include/image/image_source_native.h @@ -222,6 +222,30 @@ Image_ErrorCode OH_DecodingOptions_GetDesiredRegion(OH_DecodingOptions *options, Image_ErrorCode OH_DecodingOptions_SetDesiredRegion(OH_DecodingOptions *options, Image_Region *desiredRegion); +/** + * @brief Get Resolution Quality for DecodingOptions struct. + * + * @param options The DecodingOptions pointer will be operated. + * @param resolutionQuality the pointer of image resolution quality. + * @return Returns {@link Image_ErrorCode} + * @see OH_ImageSource2_DecodingOptionsGetResolutionQuality + * @since 12 + */ +Image_ErrorCode OH_DecodingOptions_GetResolutionQuality(OH_DecodingOptions *options, + Image_ResolutionQuality *resolutionQuality); + +/** + * @brief Set Resolution Quality for DecodingOptions struct. + * + * @param options The DecodingOptions pointer will be operated. + * @param resolutionQuality the number of image resolutionQuality. + * @return Returns {@link Image_ErrorCode} + * @see OH_ImageSource2_DecodingOptionsSetResolutionQuality + * @since 12 + */ +Image_ErrorCode OH_DecodingOptions_SetResolutionQuality(OH_DecodingOptions *options, + Image_ResolutionQuality resolutionQuality); + /** * @brief delete OH_DecodingOptions pointer. * diff --git a/multimedia/image_framework/libimage_source.ndk.json b/multimedia/image_framework/libimage_source.ndk.json index 0c91a11dc..f7209bbf7 100644 --- a/multimedia/image_framework/libimage_source.ndk.json +++ b/multimedia/image_framework/libimage_source.ndk.json @@ -59,6 +59,14 @@ "first_introduced": "12", "name": "OH_DecodingOptions_SetDesiredRegion" }, + { + "first_introduced": "12", + "name": "OH_DecodingOptions_GetResolutionQuality" + }, + { + "first_introduced": "12", + "name": "OH_DecodingOptions_SetResolutionQuality" + }, { "first_introduced": "12", "name": "OH_DecodingOptions_Release" -- Gitee From 040118a91783c8d26facaa810b2e02d772d5b431 Mon Sep 17 00:00:00 2001 From: zhubingwei Date: Wed, 17 Apr 2024 16:02:49 +0800 Subject: [PATCH 2/3] fix format Signed-off-by: zhubingwei --- multimedia/image_framework/include/image/image_common.h | 1 - .../image_framework/include/image/image_source_native.h | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/multimedia/image_framework/include/image/image_common.h b/multimedia/image_framework/include/image/image_common.h index 5b028a495..8c0f0341f 100644 --- a/multimedia/image_framework/include/image/image_common.h +++ b/multimedia/image_framework/include/image/image_common.h @@ -150,7 +150,6 @@ typedef enum { * @brief Enumerates the resolution quality that may be used by the interface. * * @since 12 - * @version 2.0 */ typedef enum { /** resolution quality super */ diff --git a/multimedia/image_framework/include/image/image_source_native.h b/multimedia/image_framework/include/image/image_source_native.h index 846da62d3..b4db5719f 100644 --- a/multimedia/image_framework/include/image/image_source_native.h +++ b/multimedia/image_framework/include/image/image_source_native.h @@ -228,7 +228,7 @@ Image_ErrorCode OH_DecodingOptions_SetDesiredRegion(OH_DecodingOptions *options, * @param options The DecodingOptions pointer will be operated. * @param resolutionQuality the pointer of image resolution quality. * @return Returns {@link Image_ErrorCode} - * @see OH_ImageSource2_DecodingOptionsGetResolutionQuality + * @see OH_DecodingOptions_GetResolutionQuality * @since 12 */ Image_ErrorCode OH_DecodingOptions_GetResolutionQuality(OH_DecodingOptions *options, @@ -240,7 +240,7 @@ Image_ErrorCode OH_DecodingOptions_GetResolutionQuality(OH_DecodingOptions *opti * @param options The DecodingOptions pointer will be operated. * @param resolutionQuality the number of image resolutionQuality. * @return Returns {@link Image_ErrorCode} - * @see OH_ImageSource2_DecodingOptionsSetResolutionQuality + * @see OH_DecodingOptions_SetResolutionQuality * @since 12 */ Image_ErrorCode OH_DecodingOptions_SetResolutionQuality(OH_DecodingOptions *options, -- Gitee From 4961c0fa7ce698aea93b2f6ea9ff0d72feaf5020 Mon Sep 17 00:00:00 2001 From: zhubingwei Date: Sat, 20 Apr 2024 18:23:08 +0800 Subject: [PATCH 3/3] Add Description Signed-off-by: zhubingwei --- multimedia/image_framework/include/image/image_common.h | 8 ++++---- .../image_framework/include/image/image_source_native.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/multimedia/image_framework/include/image/image_common.h b/multimedia/image_framework/include/image/image_common.h index 8c0f0341f..526b5b3ea 100644 --- a/multimedia/image_framework/include/image/image_common.h +++ b/multimedia/image_framework/include/image/image_common.h @@ -152,13 +152,13 @@ typedef enum { * @since 12 */ typedef enum { - /** resolution quality super */ + /** Highest quality images, longer decoding time */ IMAGE_RESOLUTION_QUALITY_SUPER = 0, - /** resolution quality high */ + /** High quality images, shorter decoding time than SUPER, longer than MEDIUM */ IMAGE_RESOLUTION_QUALITY_HIGH = 1, - /** resolution quality medium */ + /** Medium quality images, moderate decoding time */ IMAGE_RESOLUTION_QUALITY_MEDIUM = 2, - /** resolution quality low */ + /** Low quality images, short decoding time */ IMAGE_RESOLUTION_QUALITY_LOW = 3, } Image_ResolutionQuality; diff --git a/multimedia/image_framework/include/image/image_source_native.h b/multimedia/image_framework/include/image/image_source_native.h index b4db5719f..fc146c9a7 100644 --- a/multimedia/image_framework/include/image/image_source_native.h +++ b/multimedia/image_framework/include/image/image_source_native.h @@ -232,7 +232,7 @@ Image_ErrorCode OH_DecodingOptions_SetDesiredRegion(OH_DecodingOptions *options, * @since 12 */ Image_ErrorCode OH_DecodingOptions_GetResolutionQuality(OH_DecodingOptions *options, - Image_ResolutionQuality *resolutionQuality); + int32_t *resolutionQuality); /** * @brief Set Resolution Quality for DecodingOptions struct. @@ -244,7 +244,7 @@ Image_ErrorCode OH_DecodingOptions_GetResolutionQuality(OH_DecodingOptions *opti * @since 12 */ Image_ErrorCode OH_DecodingOptions_SetResolutionQuality(OH_DecodingOptions *options, - Image_ResolutionQuality resolutionQuality); + int32_t resolutionQuality); /** * @brief delete OH_DecodingOptions pointer. -- Gitee