diff --git a/zh-cn/native_sdk/multimedia/image_framework/include/image/pixelmap_native.h b/zh-cn/native_sdk/multimedia/image_framework/include/image/pixelmap_native.h index 40ff26ea03d722dab1fc5564c8ac9dd5ef90f041..90c32649356e5673c6a7fcf0725809b14771f871 100644 --- a/zh-cn/native_sdk/multimedia/image_framework/include/image/pixelmap_native.h +++ b/zh-cn/native_sdk/multimedia/image_framework/include/image/pixelmap_native.h @@ -19,6 +19,7 @@ * * @brief 提供图片编解码能力。 * + * @syscap SystemCapability.Multimedia.Image.Core * @since 12 */ @@ -35,6 +36,9 @@ #ifndef INTERFACES_KITS_NATIVE_INCLUDE_IMAGE_PIXELMAP_NATIVE_H_ #define INTERFACES_KITS_NATIVE_INCLUDE_IMAGE_PIXELMAP_NATIVE_H_ + +#include + #include "image_common.h" #include "napi/native_api.h" @@ -132,6 +136,18 @@ typedef enum { * NV12格式 */ PIXEL_FORMAT_NV12 = 9, + /* + * RGBA_1010102 format + */ + PIXEL_FORMAT_RGBA_1010102 = 10, + /* + * YCBCR_P010 format + */ + PIXEL_FORMAT_YCBCR_P010 = 11, + /* + * YCRCB_P010 format + */ + PIXEL_FORMAT_YCRCB_P010 = 12, } PIXEL_FORMAT; /** @@ -781,7 +797,7 @@ Image_ErrorCode OH_PixelmapNative_ScaleWithAntiAliasing(OH_PixelmapNative *pixel * @param scaleY 高度的缩放比例。 * @return 如果操作成功返回 {@link IMAGE_SUCCESS} * 如果参数错误返回 {@link IMAGE_BAD_PARAMETER} - * @since 16 + * @since 18 */ Image_ErrorCode OH_PixelmapNative_CreateScaledPixelMap(OH_PixelmapNative *srcPixelmap, OH_PixelmapNative **dstPixelmap, float scaleX, float scaleY); @@ -798,7 +814,7 @@ Image_ErrorCode OH_PixelmapNative_CreateScaledPixelMap(OH_PixelmapNative *srcPix * 如果参数错误返回 {@link IMAGE_BAD_PARAMETER} * 如果图片过大返回 {@link IMAGE_TOO_LARGE} * 如果内存申请失败返回 {@link IMAGE_ALLOC_FAILED} - * @since 16 + * @since 18 */ Image_ErrorCode OH_PixelmapNative_CreateScaledPixelMapWithAntiAliasing(OH_PixelmapNative *srcPixelmap, OH_PixelmapNative **dstPixelmap, float scaleX, float scaleY, OH_PixelmapNative_AntiAliasingLevel level); diff --git a/zh-cn/native_sdk/multimedia/image_framework/include/image_pixel_map_mdk.h b/zh-cn/native_sdk/multimedia/image_framework/include/image_pixel_map_mdk.h index bb41194507fec20dc9a85c8f5309428fb15d4dda..3355621a1602227ecdac3128449710667acbb194 100644 --- a/zh-cn/native_sdk/multimedia/image_framework/include/image_pixel_map_mdk.h +++ b/zh-cn/native_sdk/multimedia/image_framework/include/image_pixel_map_mdk.h @@ -30,6 +30,8 @@ * @brief 声明可以锁定并访问pixelmap数据的方法,声明解锁的方法。 * Need link libpixelmapndk.z.so * + * @library libpixelmap_ndk.so + * @syscap SystemCapability.Multimedia.Image * @kit ImageKit * @since 10 * @version 1.0 diff --git a/zh-cn/native_sdk/multimedia/image_framework/include/image_pixel_map_napi.h b/zh-cn/native_sdk/multimedia/image_framework/include/image_pixel_map_napi.h index 1152af3f606dc1a3308bf1119e9968c85b1fd240..db2cd9420823f69a414d03b1cd09476de8b054c1 100644 --- a/zh-cn/native_sdk/multimedia/image_framework/include/image_pixel_map_napi.h +++ b/zh-cn/native_sdk/multimedia/image_framework/include/image_pixel_map_napi.h @@ -29,6 +29,8 @@ * * @brief 声明可以锁定并访问pixelmap数据的方法,声明解锁的方法。 * + * @library libpixelmap_ndk.so + * @syscap SystemCapability.Multimedia.Image * @kit ImageKit * @since 8 * @version 1.0 @@ -36,7 +38,11 @@ #ifndef INTERFACES_KITS_NATIVE_INCLUDE_IMAGE_PIXEL_MAP_NAPI_H_ #define INTERFACES_KITS_NATIVE_INCLUDE_IMAGE_PIXEL_MAP_NAPI_H_ -#include +#ifdef __cplusplus +#include +#else +#include +#endif #include "napi/native_api.h" namespace OHOS { namespace Media {