openharmony/multimedia_video_processing_engine
1
0
Fork 0
mirror of https://github.com/openharmony/multimedia_video_processing_engine.git synced 2026-07-20 22:47:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

变更视频元数据生成风格模式枚举值的顺序

Browse Source 
Signed-off-by: Hennes <lurihong@h-partners.com>
This commit is contained in:
Hennes
2025-11-07 10:35:05 +08:00
parent 9ffc8ffaa5
commit 36abe99eb4
6 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/algorithm/metadata_generator_video/metadata_generator_video_impl.cpp
+4 -4
View File
@@ -242,8 +242,8 @@ int32_t MetadataGeneratorVideoImpl::Configure()
VPEAlgoErrCode MetadataGeneratorVideoImpl::SetParameter(const MetadataGeneratorParameter& parameter)
{
std::lock_guard<std::mutex> 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<std::mutex> 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_;
framework/capi/video_processing/metadata_generator/metadata_generator_video_native.cpp
+1 -1
View File
@@ -22,8 +22,8 @@ using namespace OHOS;
using namespace OHOS::Media::VideoProcessingEngine;
namespace {
const std::unordered_map<int, int> 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},
};
}
interfaces/inner_api/algorithm_common.h
+2 -2
View File
@@ -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 {
interfaces/inner_api/metadata_generator_video_common.h
+2 -2
View File
@@ -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 {
interfaces/kits/c/video_processing_types.h
+3 -3
View File
@@ -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;
/**
test/unittest/metadata_gen_video_ndk/metadata_gen_video_ndk_unit_test.cpp
+2 -2
View File
@@ -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();
}