From 36abe99eb44f2e58729c41421375ed556986abd0 Mon Sep 17 00:00:00 2001 From: Hennes Date: Fri, 7 Nov 2025 10:35:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E6=9B=B4=E8=A7=86=E9=A2=91=E5=85=83?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=94=9F=E6=88=90=E9=A3=8E=E6=A0=BC=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E6=9E=9A=E4=B8=BE=E5=80=BC=E7=9A=84=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Hennes --- .../metadata_generator_video_impl.cpp | 8 ++++---- .../metadata_generator_video_native.cpp | 2 +- interfaces/inner_api/algorithm_common.h | 4 ++-- interfaces/inner_api/metadata_generator_video_common.h | 4 ++-- interfaces/kits/c/video_processing_types.h | 6 +++--- .../metadata_gen_video_ndk_unit_test.cpp | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/framework/algorithm/metadata_generator_video/metadata_generator_video_impl.cpp b/framework/algorithm/metadata_generator_video/metadata_generator_video_impl.cpp index 80981d1..2a95f33 100644 --- a/framework/algorithm/metadata_generator_video/metadata_generator_video_impl.cpp +++ b/framework/algorithm/metadata_generator_video/metadata_generator_video_impl.cpp @@ -242,8 +242,8 @@ int32_t MetadataGeneratorVideoImpl::Configure() VPEAlgoErrCode MetadataGeneratorVideoImpl::SetParameter(const MetadataGeneratorParameter& parameter) { std::lock_guard lock(mutex_); - CHECK_AND_RETURN_RET_LOG(parameter.styleType >= VideoMetadataGeneratorStyle::META_GEN_BRIGHT_STYLE && - parameter.styleType <= VideoMetadataGeneratorStyle::META_GEN_CONTRAST_STYLE, + CHECK_AND_RETURN_RET_LOG(parameter.styleType >= VideoMetadataGeneratorStyle::META_GEN_CONTRAST_STYLE && + parameter.styleType <= VideoMetadataGeneratorStyle::META_GEN_BRIGHT_STYLE, VPE_ALGO_ERR_INVALID_VAL, "Invalid metadata generator style"); MetadataGeneratorParameter param; param.algoType = MetadataGeneratorAlgoType::META_GEN_ALGO_TYPE_VIDEO; @@ -256,8 +256,8 @@ VPEAlgoErrCode MetadataGeneratorVideoImpl::SetParameter(const MetadataGeneratorP VPEAlgoErrCode MetadataGeneratorVideoImpl::GetParameter(MetadataGeneratorParameter& parameter) { std::lock_guard lock(mutex_); - CHECK_AND_RETURN_RET_LOG(style_ >= VideoMetadataGeneratorStyle::META_GEN_BRIGHT_STYLE && - style_ <= VideoMetadataGeneratorStyle::META_GEN_CONTRAST_STYLE, + CHECK_AND_RETURN_RET_LOG(style_ >= VideoMetadataGeneratorStyle::META_GEN_CONTRAST_STYLE && + style_ <= VideoMetadataGeneratorStyle::META_GEN_BRIGHT_STYLE, VPE_ALGO_ERR_INVALID_VAL, "Invalid metadata generator style"); parameter.algoType = MetadataGeneratorAlgoType::META_GEN_ALGO_TYPE_VIDEO; parameter.styleType = style_; diff --git a/framework/capi/video_processing/metadata_generator/metadata_generator_video_native.cpp b/framework/capi/video_processing/metadata_generator/metadata_generator_video_native.cpp index 3299aa3..7a99550 100644 --- a/framework/capi/video_processing/metadata_generator/metadata_generator_video_native.cpp +++ b/framework/capi/video_processing/metadata_generator/metadata_generator_video_native.cpp @@ -22,8 +22,8 @@ using namespace OHOS; using namespace OHOS::Media::VideoProcessingEngine; namespace { const std::unordered_map styleMap = { - {VIDEO_METADATA_GENERATOR_BRIGHT_MODE, META_GEN_BRIGHT_STYLE}, {VIDEO_METADATA_GENERATOR_CONTRAST_MODE, META_GEN_CONTRAST_STYLE}, + {VIDEO_METADATA_GENERATOR_BRIGHT_MODE, META_GEN_BRIGHT_STYLE}, }; } diff --git a/interfaces/inner_api/algorithm_common.h b/interfaces/inner_api/algorithm_common.h index 16148f0..ef19dba 100644 --- a/interfaces/inner_api/algorithm_common.h +++ b/interfaces/inner_api/algorithm_common.h @@ -119,8 +119,8 @@ enum class MetadataGeneratorAlgoType { }; enum class VideoMetadataGeneratorStyle { - META_GEN_BRIGHT_STYLE = 0, - META_GEN_CONTRAST_STYLE = 1 + META_GEN_CONTRAST_STYLE = 0, + META_GEN_BRIGHT_STYLE = 1 }; struct ColorSpaceConverterParameter { diff --git a/interfaces/inner_api/metadata_generator_video_common.h b/interfaces/inner_api/metadata_generator_video_common.h index 27475b8..867d41e 100644 --- a/interfaces/inner_api/metadata_generator_video_common.h +++ b/interfaces/inner_api/metadata_generator_video_common.h @@ -24,8 +24,8 @@ enum MdgBufferFlag : uint32_t { }; enum VIDEO_META_GEN_STYLE { - META_GEN_BRIGHT_STYLE = 0, - META_GEN_CONTRAST_STYLE = 1, + META_GEN_CONTRAST_STYLE = 0, + META_GEN_BRIGHT_STYLE = 1, }; class __attribute__((visibility("default"))) MetadataGeneratorVideoCallback { diff --git a/interfaces/kits/c/video_processing_types.h b/interfaces/kits/c/video_processing_types.h index d7decbd..6fc21e1 100644 --- a/interfaces/kits/c/video_processing_types.h +++ b/interfaces/kits/c/video_processing_types.h @@ -171,10 +171,10 @@ typedef enum VideoDetailEnhancer_QualityLevel { * @since 22 */ typedef enum VideoMetadataGeneratorStyleControl { - /** Style Control into bright mode */ - VIDEO_METADATA_GENERATOR_BRIGHT_MODE = 0, /** Style Control into contrast mode */ - VIDEO_METADATA_GENERATOR_CONTRAST_MODE = 1 + VIDEO_METADATA_GENERATOR_CONTRAST_MODE = 0, + /** Style Control into bright mode */ + VIDEO_METADATA_GENERATOR_BRIGHT_MODE = 1 } VideoMetadataGeneratorStyleControl; /** diff --git a/test/unittest/metadata_gen_video_ndk/metadata_gen_video_ndk_unit_test.cpp b/test/unittest/metadata_gen_video_ndk/metadata_gen_video_ndk_unit_test.cpp index 56b2d0c..b168fdd 100644 --- a/test/unittest/metadata_gen_video_ndk/metadata_gen_video_ndk_unit_test.cpp +++ b/test/unittest/metadata_gen_video_ndk/metadata_gen_video_ndk_unit_test.cpp @@ -459,7 +459,7 @@ HWTEST_F(MetadataGeneratorVideoNdkImplUnitTest, set_parameter_09, TestSize.Level OH_VideoProcessing_GetParameter(instance, parameterGetted); int32_t mode = -1; OH_AVFormat_GetIntValue(parameterGetted, VIDEO_METADATA_GENERATOR_STYLE_CONTROL, &mode); - EXPECT_EQ(mode, VIDEO_METADATA_GENERATOR_BRIGHT_MODE); + EXPECT_EQ(mode, VIDEO_METADATA_GENERATOR_CONTRAST_MODE); OH_VideoProcessing_Destroy(instance); OH_VideoProcessing_DeinitializeEnvironment(); } @@ -542,7 +542,7 @@ HWTEST_F(MetadataGeneratorVideoNdkImplUnitTest, get_parameter_05, TestSize.Level EXPECT_EQ(ret, VIDEO_PROCESSING_SUCCESS); int32_t mode = -1; OH_AVFormat_GetIntValue(parameter, VIDEO_METADATA_GENERATOR_STYLE_CONTROL, &mode); - EXPECT_EQ(mode, VIDEO_METADATA_GENERATOR_BRIGHT_MODE); + EXPECT_EQ(mode, VIDEO_METADATA_GENERATOR_CONTRAST_MODE); OH_VideoProcessing_Destroy(instance); OH_VideoProcessing_DeinitializeEnvironment(); }