From 14f0c24e804e9a13cbba50b2ce980086a4bbcba4 Mon Sep 17 00:00:00 2001 From: feng <1362134550@qq.com> Date: Sat, 22 Feb 2025 14:20:14 +0800 Subject: [PATCH 1/6] =?UTF-8?q?docscode=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entry/src/main/cpp/ImageProcessing/ImageProcessing.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/UsingImageProcessingToProcessImages/entry/src/main/cpp/ImageProcessing/ImageProcessing.h b/UsingImageProcessingToProcessImages/entry/src/main/cpp/ImageProcessing/ImageProcessing.h index 7eff6a2..57dd73d 100644 --- a/UsingImageProcessingToProcessImages/entry/src/main/cpp/ImageProcessing/ImageProcessing.h +++ b/UsingImageProcessingToProcessImages/entry/src/main/cpp/ImageProcessing/ImageProcessing.h @@ -17,6 +17,7 @@ #define USINGIMAGEPROCESSINGTOPROCESSIMAGES_IMAGEPROCESSING_H // [Start import] +// [Start MetadataImport] #include #include #include @@ -25,10 +26,12 @@ #include #include // [End import] +#include +#include +// [End MetadataImport] #include #include #include -#include #include #include #include -- Gitee From f51d4404246b63e8e1b037112ee6c94fd8f3a89e Mon Sep 17 00:00:00 2001 From: feng <1362134550@qq.com> Date: Sat, 22 Feb 2025 14:33:36 +0800 Subject: [PATCH 2/6] =?UTF-8?q?docscode=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/cpp/ImageProcessing/ImageProcessing.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/UsingImageProcessingToProcessImages/entry/src/main/cpp/ImageProcessing/ImageProcessing.cpp b/UsingImageProcessingToProcessImages/entry/src/main/cpp/ImageProcessing/ImageProcessing.cpp index 736eace..2360d81 100644 --- a/UsingImageProcessingToProcessImages/entry/src/main/cpp/ImageProcessing/ImageProcessing.cpp +++ b/UsingImageProcessingToProcessImages/entry/src/main/cpp/ImageProcessing/ImageProcessing.cpp @@ -265,6 +265,19 @@ napi_value ImageProcessing::GenerateMetadata(napi_env env, napi_callback_info in OH_LOG_Print(LOG_APP, LOG_ERROR, LOG_PRINT_DOMAIN, "NativePixelMap", "OH_ImageProcessing_InitializeEnvironment err"); } + // [Start GenerateMetadataSupported] + // Input format. + ImageProcessing_ColorSpaceInfo SRC_INFO; + SRC_INFO.colorSpace = BT2020_HLG; + SRC_INFO.metadataType = HDR_METADATA_TYPE_ALTERNATE; + SRC_INFO.pixelFormat = PIXEL_FORMAT_RGBA_1010102; + // Ability inquiry. + bool flag = OH_ImageProcessing_IsMetadataGenerationSupported(&SRC_INFO); + // [End GenerateMetadataSupported] + if (!flag) { + OH_LOG_Print(LOG_APP, LOG_ERROR, LOG_PRINT_DOMAIN, "NativePixelMap", "not supported err"); + return nullptr; + } // [Start GenerateMetadataCreate] OH_ImageProcessing *instance = nullptr; ret1 = OH_ImageProcessing_Create(&instance, IMAGE_PROCESSING_TYPE_METADATA_GENERATION); -- Gitee From 4e40828d165da24654e8f5612eed5df713fbeb5c Mon Sep 17 00:00:00 2001 From: feng <1362134550@qq.com> Date: Sat, 22 Feb 2025 14:57:27 +0800 Subject: [PATCH 3/6] =?UTF-8?q?docscode=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cpp/ImageProcessing/ImageProcessing.cpp | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/UsingImageProcessingToProcessImages/entry/src/main/cpp/ImageProcessing/ImageProcessing.cpp b/UsingImageProcessingToProcessImages/entry/src/main/cpp/ImageProcessing/ImageProcessing.cpp index 2360d81..6f4dd3e 100644 --- a/UsingImageProcessingToProcessImages/entry/src/main/cpp/ImageProcessing/ImageProcessing.cpp +++ b/UsingImageProcessingToProcessImages/entry/src/main/cpp/ImageProcessing/ImageProcessing.cpp @@ -63,6 +63,24 @@ int processImage(OH_PixelmapNative *src, OH_PixelmapNative *dst) if (ret != IMAGE_PROCESSING_SUCCESS) { OH_LOG_Print(LOG_APP, LOG_ERROR, LOG_PRINT_DOMAIN, "NativePixelMap", "OH_ImageProcessing_Create err"); } + // [Start processImageSupported] + // Input format. + ImageProcessing_ColorSpaceInfo SRC_INFO; + ImageProcessing_ColorSpaceInfo DST_GAIN_INFO; + ImageProcessing_ColorSpaceInfo DST_INFO; + SRC_INFO.colorSpace = DISPLAY_P3; + SRC_INFO.metadataType = HDR_METADATA_TYPE_NONE; + SRC_INFO.pixelFormat = PIXEL_FORMAT_RGBA_8888; + DST_INFO.colorSpace = SRGB; + DST_INFO.metadataType = HDR_METADATA_TYPE_NONE; + DST_INFO.pixelFormat = PIXEL_FORMAT_RGBA_8888; + // Ability inquiry. + bool flag = OH_ImageProcessing_IsColorSpaceConversionSupported(&SRC_INFO, &DST_INFO); + // [End processImageSupported] + if (!flag) { + OH_LOG_Print(LOG_APP, LOG_ERROR, LOG_PRINT_DOMAIN, "NativePixelMap", "not supported err"); + return -1; + } // [Start processImageCreate] OH_ImageProcessing *instance = nullptr; ret = OH_ImageProcessing_Create(&instance, IMAGE_PROCESSING_TYPE_COLOR_SPACE_CONVERSION); -- Gitee From e9f42a916917923f9509a02714caabd41f546a1f Mon Sep 17 00:00:00 2001 From: feng <1362134550@qq.com> Date: Sat, 22 Feb 2025 15:07:51 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=8F=AF=E9=80=89=E9=A1=B9=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cpp/ImageProcessing/ImageProcessing.cpp | 25 ++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/UsingImageProcessingToProcessImages/entry/src/main/cpp/ImageProcessing/ImageProcessing.cpp b/UsingImageProcessingToProcessImages/entry/src/main/cpp/ImageProcessing/ImageProcessing.cpp index 6f4dd3e..eec69f4 100644 --- a/UsingImageProcessingToProcessImages/entry/src/main/cpp/ImageProcessing/ImageProcessing.cpp +++ b/UsingImageProcessingToProcessImages/entry/src/main/cpp/ImageProcessing/ImageProcessing.cpp @@ -215,6 +215,27 @@ napi_value ImageProcessing::HdrDecompose(napi_env env, napi_callback_info info) OH_LOG_Print(LOG_APP, LOG_ERROR, LOG_PRINT_DOMAIN, "NativePixelMap", "OH_ImageProcessing_InitializeEnvironment err"); } + // Input format. + ImageProcessing_ColorSpaceInfo SRC_INFO; + ImageProcessing_ColorSpaceInfo DST_GAIN_INFO; + ImageProcessing_ColorSpaceInfo DST_INFO; + SRC_INFO.colorSpace = BT2020_HLG; + SRC_INFO.metadataType = HDR_METADATA_TYPE_ALTERNATE; + SRC_INFO.pixelFormat = PIXEL_FORMAT_RGBA_1010102; + DST_INFO.colorSpace = DISPLAY_P3; + DST_INFO.metadataType = HDR_METADATA_TYPE_BASE; + DST_INFO.pixelFormat = PIXEL_FORMAT_RGBA_8888; + DST_GAIN_INFO.colorSpace = DISPLAY_P3; + DST_GAIN_INFO.metadataType = HDR_METADATA_TYPE_GAINMAP; + DST_GAIN_INFO.pixelFormat = PIXEL_FORMAT_RGBA_8888; + // Ability inquiry. + bool flag = OH_ImageProcessing_IsDecompositionSupported(&SRC_INFO, &DST_INFO, &DST_GAIN_INFO); + if (!flag) { + OH_LOG_Print(LOG_APP, LOG_ERROR, LOG_PRINT_DOMAIN, "NativePixelMap", "not supported err"); + napi_value retValErr; + napi_create_int32(env, -1, &retValErr); + return retValErr; + } // [Start HdrDecomposeCreate] OH_ImageProcessing *instance = nullptr; ret = OH_ImageProcessing_Create(&instance, IMAGE_PROCESSING_TYPE_DECOMPOSITION); @@ -294,7 +315,9 @@ napi_value ImageProcessing::GenerateMetadata(napi_env env, napi_callback_info in // [End GenerateMetadataSupported] if (!flag) { OH_LOG_Print(LOG_APP, LOG_ERROR, LOG_PRINT_DOMAIN, "NativePixelMap", "not supported err"); - return nullptr; + napi_value retValErr; + napi_create_int32(env, -1, &retValErr); + return retValErr; } // [Start GenerateMetadataCreate] OH_ImageProcessing *instance = nullptr; -- Gitee From 1030f6ce4abdb821a322b7a10d41f73a077b99f8 Mon Sep 17 00:00:00 2001 From: feng <1362134550@qq.com> Date: Sat, 22 Feb 2025 15:09:40 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=8F=AF=E9=80=89=E9=A1=B9=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entry/src/main/cpp/ImageProcessing/ImageProcessing.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/UsingImageProcessingToProcessImages/entry/src/main/cpp/ImageProcessing/ImageProcessing.cpp b/UsingImageProcessingToProcessImages/entry/src/main/cpp/ImageProcessing/ImageProcessing.cpp index eec69f4..9c47d40 100644 --- a/UsingImageProcessingToProcessImages/entry/src/main/cpp/ImageProcessing/ImageProcessing.cpp +++ b/UsingImageProcessingToProcessImages/entry/src/main/cpp/ImageProcessing/ImageProcessing.cpp @@ -215,6 +215,7 @@ napi_value ImageProcessing::HdrDecompose(napi_env env, napi_callback_info info) OH_LOG_Print(LOG_APP, LOG_ERROR, LOG_PRINT_DOMAIN, "NativePixelMap", "OH_ImageProcessing_InitializeEnvironment err"); } + // [Start HdrDecomposeSupported] // Input format. ImageProcessing_ColorSpaceInfo SRC_INFO; ImageProcessing_ColorSpaceInfo DST_GAIN_INFO; @@ -230,6 +231,7 @@ napi_value ImageProcessing::HdrDecompose(napi_env env, napi_callback_info info) DST_GAIN_INFO.pixelFormat = PIXEL_FORMAT_RGBA_8888; // Ability inquiry. bool flag = OH_ImageProcessing_IsDecompositionSupported(&SRC_INFO, &DST_INFO, &DST_GAIN_INFO); + // [End HdrDecomposeSupported] if (!flag) { OH_LOG_Print(LOG_APP, LOG_ERROR, LOG_PRINT_DOMAIN, "NativePixelMap", "not supported err"); napi_value retValErr; -- Gitee From ad5d2f77f7fb30627569249858f981f3d6ae5947 Mon Sep 17 00:00:00 2001 From: feng <1362134550@qq.com> Date: Sat, 22 Feb 2025 15:20:23 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=8F=AF=E9=80=89=E9=A1=B9=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cpp/ImageProcessing/ImageProcessing.cpp | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/UsingImageProcessingToProcessImages/entry/src/main/cpp/ImageProcessing/ImageProcessing.cpp b/UsingImageProcessingToProcessImages/entry/src/main/cpp/ImageProcessing/ImageProcessing.cpp index 9c47d40..310bae7 100644 --- a/UsingImageProcessingToProcessImages/entry/src/main/cpp/ImageProcessing/ImageProcessing.cpp +++ b/UsingImageProcessingToProcessImages/entry/src/main/cpp/ImageProcessing/ImageProcessing.cpp @@ -160,6 +160,29 @@ napi_value ImageProcessing::HdrCompose(napi_env env, napi_callback_info info) if (ret != IMAGE_PROCESSING_SUCCESS) { OH_LOG_Print(LOG_APP, LOG_ERROR, LOG_PRINT_DOMAIN, "NativePixelMap", "OH_ImageProcessing_Create err"); } + // [Start HdrComposeSupported] + // Input format. + ImageProcessing_ColorSpaceInfo DST_INFO; + ImageProcessing_ColorSpaceInfo SRC_INFO; + ImageProcessing_ColorSpaceInfo SRC_GAIN_INFO; + DST_INFO.colorSpace = BT2020_HLG; + DST_INFO.metadataType = HDR_METADATA_TYPE_ALTERNATE; + DST_INFO.pixelFormat = PIXEL_FORMAT_RGBA_1010102; + SRC_INFO.colorSpace = DCI_P3; + SRC_INFO.metadataType = HDR_METADATA_TYPE_BASE; + SRC_INFO.pixelFormat = PIXEL_FORMAT_RGBA_8888; + SRC_GAIN_INFO.colorSpace = DCI_P3; + SRC_GAIN_INFO.metadataType = HDR_METADATA_TYPE_GAINMAP; + SRC_GAIN_INFO.pixelFormat = PIXEL_FORMAT_RGBA_8888; + // Ability inquiry. + bool flag = OH_ImageProcessing_IsCompositionSupported(&SRC_INFO, &SRC_GAIN_INFO, &DST_INFO); + if (!flag) { + OH_LOG_Print(LOG_APP, LOG_ERROR, LOG_PRINT_DOMAIN, "NativePixelMap", "not support err"); + napi_value retValErr; + napi_create_int32(env, -1, &retValErr); + return retValErr; + } + // [End HdrComposeSupported] // [Start HdrComposeCreate] OH_ImageProcessing *instance = nullptr; ret = OH_ImageProcessing_Create(&instance, IMAGE_PROCESSING_TYPE_COMPOSITION); -- Gitee