diff --git a/framework/algorithm/aihdr_enhancer_video/aihdr_enhancer_video_impl.cpp b/framework/algorithm/aihdr_enhancer_video/aihdr_enhancer_video_impl.cpp index f44a604..6f565bf 100644 --- a/framework/algorithm/aihdr_enhancer_video/aihdr_enhancer_video_impl.cpp +++ b/framework/algorithm/aihdr_enhancer_video/aihdr_enhancer_video_impl.cpp @@ -92,7 +92,7 @@ int32_t AihdrEnhancerVideoImpl::SetCallback(const std::shared_ptr newSurface) { std::lock_guard lockrender(renderQueMutex_); - for (auto it = outputBufferAvilQueBak_.begin(); it != outputBufferAvilQueBak_.end(); ++it) { + for (auto it = outputBufferAvilQueBak_.begin(); it != outputBufferAvilQueBak_.end(); ++it) { auto buffer = it->second; GSError err = newSurface->AttachBufferToQueue(buffer->memory); CHECK_AND_RETURN_RET_LOG(err == GSERROR_OK, VPE_ALGO_ERR_UNKNOWN, "outputbuffer AttachToNewSurface fail"); @@ -423,6 +423,10 @@ bool AihdrEnhancerVideoImpl::WaitProcessing() cvTaskStart_.wait(lock, [this]() { std::lock_guard inQueueLock(onBqMutex_); std::lock_guard outQueueLock(renderQueMutex_); + if (initBuffer_.load()) { + InitBuffers(); + initBuffer_.store(false); + } return ((inputBufferAvilQue_.size() > 0 && outputBufferAvilQue_.size() > 0) || !isRunning_.load()); }); } @@ -600,7 +604,7 @@ GSError AihdrEnhancerVideoImpl::OnConsumerBufferAvailable() requestCfg_.width = buffer->memory->GetWidth(); requestCfg_.height = buffer->memory->GetHeight(); requestCfg_.format = buffer->memory->GetFormat(); - InitBuffers(); + initBuffer_.store(true); } if (state_ == VPEAlgoState::RUNNING) { diff --git a/framework/algorithm/aihdr_enhancer_video/include/aihdr_enhancer_video_impl.h b/framework/algorithm/aihdr_enhancer_video/include/aihdr_enhancer_video_impl.h index 44bd940..75e0e23 100644 --- a/framework/algorithm/aihdr_enhancer_video/include/aihdr_enhancer_video_impl.h +++ b/framework/algorithm/aihdr_enhancer_video/include/aihdr_enhancer_video_impl.h @@ -84,6 +84,7 @@ private: std::shared_ptr csc_{nullptr}; std::mutex mutex_; bool getUsage_{false}; + std::atomic initBuffer_{false}; // task相关 std::mutex mtxTaskDone_; diff --git a/framework/algorithm/colorspace_converter_video/colorspace_converter_video_impl.cpp b/framework/algorithm/colorspace_converter_video/colorspace_converter_video_impl.cpp index 833bac2..c0066ef 100644 --- a/framework/algorithm/colorspace_converter_video/colorspace_converter_video_impl.cpp +++ b/framework/algorithm/colorspace_converter_video/colorspace_converter_video_impl.cpp @@ -119,7 +119,7 @@ int32_t ColorSpaceConverterVideoImpl::SetCallback(const std::shared_ptr newSurface) { std::lock_guard lockrender(renderQueMutex_); - for (auto it = outputBufferAvilQueBak_.begin(); it != outputBufferAvilQueBak_.end(); ++it) { + for (auto it = outputBufferAvilQueBak_.begin(); it != outputBufferAvilQueBak_.end(); ++it) { auto buffer = it->second; GSError err = newSurface->AttachBufferToQueue(buffer->memory); CHECK_AND_RETURN_RET_LOG(err == GSERROR_OK, VPE_ALGO_ERR_UNKNOWN, "outputbuffer AttachToNewSurface fail"); @@ -628,12 +628,15 @@ bool ColorSpaceConverterVideoImpl::WaitProcessing() if (!isRunning_.load()) { return false; } - { std::unique_lock lock(mtxTaskStart_); cvTaskStart_.wait(lock, [this]() { std::lock_guard inQueueLock(onBqMutex_); std::lock_guard outQueueLock(renderQueMutex_); + if (initBuffer_.load()) { + InitBuffers(); + initBuffer_.store(false); + } return ((inputBufferAvilQue_.size() > 0 && outputBufferAvilQue_.size() > 0) || !isRunning_.load()); }); } @@ -815,7 +818,7 @@ GSError ColorSpaceConverterVideoImpl::OnConsumerBufferAvailable() getUsage_ = true; requestCfg_.width = buffer->memory->GetWidth(); requestCfg_.height = buffer->memory->GetHeight(); - InitBuffers(); + initBuffer_.store(true); } if (state_ == VPEAlgoState::RUNNING) { diff --git a/framework/algorithm/colorspace_converter_video/include/colorspace_converter_video_impl.h b/framework/algorithm/colorspace_converter_video/include/colorspace_converter_video_impl.h index 160a1bc..57611de 100644 --- a/framework/algorithm/colorspace_converter_video/include/colorspace_converter_video_impl.h +++ b/framework/algorithm/colorspace_converter_video/include/colorspace_converter_video_impl.h @@ -86,6 +86,7 @@ private: Format format_; Format outputFormat_; bool getUsage_{false}; + std::atomic initBuffer_{false}; // task std::mutex mtxTaskDone_; diff --git a/framework/algorithm/common/algorithm_utils.cpp b/framework/algorithm/common/algorithm_utils.cpp index 50aeaa7..4a1ffb9 100644 --- a/framework/algorithm/common/algorithm_utils.cpp +++ b/framework/algorithm/common/algorithm_utils.cpp @@ -88,7 +88,7 @@ bool AlgorithmUtils::CopySurfaceBufferToSurfaceBuffer(const sptr& return false; } std::vector attrInfo{}; - std::vector keys{}; + std::vector keys{}; GSError ret; if (srcBuffer->ListMetadataKeys(keys) == GSERROR_OK && !keys.empty()) { for (size_t i = 0; i < keys.size(); i++) { diff --git a/framework/algorithm/metadata_generator_video/include/metadata_generator_video_impl.h b/framework/algorithm/metadata_generator_video/include/metadata_generator_video_impl.h index cebe5c7..7cb289b 100644 --- a/framework/algorithm/metadata_generator_video/include/metadata_generator_video_impl.h +++ b/framework/algorithm/metadata_generator_video/include/metadata_generator_video_impl.h @@ -79,6 +79,7 @@ private: std::shared_ptr csc_{nullptr}; std::mutex mutex_; bool getUsage_{false}; + std::atomic initBuffer_{false}; // task相关 std::mutex mtxTaskDone_; 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 7a5f0f3..a773334 100644 --- a/framework/algorithm/metadata_generator_video/metadata_generator_video_impl.cpp +++ b/framework/algorithm/metadata_generator_video/metadata_generator_video_impl.cpp @@ -433,6 +433,10 @@ bool MetadataGeneratorVideoImpl::WaitProcessing() cvTaskStart_.wait(lock, [this]() { std::lock_guard inQueueLock(onBqMutex_); std::lock_guard outQueueLock(renderQueMutex_); + if (initBuffer_.load()) { + InitBuffers(); + initBuffer_.store(false); + } return ((inputBufferAvilQue_.size() > 0 && outputBufferAvilQue_.size() > 0) || !isRunning_.load()); }); } @@ -610,7 +614,7 @@ GSError MetadataGeneratorVideoImpl::OnConsumerBufferAvailable() requestCfg_.width = buffer->memory->GetWidth(); requestCfg_.height = buffer->memory->GetHeight(); requestCfg_.format = buffer->memory->GetFormat(); - InitBuffers(); + initBuffer_.store(true); } if (state_ == VPEAlgoState::RUNNING) { diff --git a/framework/capi/image_processing/detail_enhance_napi.cpp b/framework/capi/image_processing/detail_enhance_napi.cpp index bb7e145..3934edc 100644 --- a/framework/capi/image_processing/detail_enhance_napi.cpp +++ b/framework/capi/image_processing/detail_enhance_napi.cpp @@ -80,14 +80,14 @@ bool DetailEnhanceNapi::PrepareNapiEnv(napi_env env, napi_callback_info info, st return true; } - std::shared_ptr DetailEnhancerImageCreate() - { +std::shared_ptr DetailEnhancerImageCreate() +{ auto detailEnh = DetailEnhancerImage::Create(); if (detailEnh == nullptr) { return nullptr; } return detailEnh; - } +} napi_value DetailEnhanceNapi::Init(napi_env env, napi_callback_info info) { diff --git a/test/moduletest/metadata_generator_video/demo_test.cpp b/test/moduletest/metadata_generator_video/demo_test.cpp index 4e9c958..0c35763 100644 --- a/test/moduletest/metadata_generator_video/demo_test.cpp +++ b/test/moduletest/metadata_generator_video/demo_test.cpp @@ -94,6 +94,7 @@ public: GSError SetMeatadata(sptr &buffer, uint32_t value); GSError SetMeatadata(sptr &buffer, CM_ColorSpaceInfo &colorspaceInfo); void OutputBufferAvailable(uint32_t index, MdgBufferFlag flag); + void InitCfg(BufferRequestConfig &requestCfg, BufferFlushConfig &flushCfg); GSError OnProducerBufferReleased(); std::shared_ptr cscvCb_ = nullptr; }; @@ -144,6 +145,23 @@ GSError MdgDemoTest::OnProducerBufferReleased() return GSERROR_OK; } +void MdgDemoTest::InitCfg(BufferRequestConfig &requestCfg, BufferFlushConfig &flushCfg) +{ + GraphicPixelFormat surfacePixelFmt = GRAPHIC_PIXEL_FMT_YCBCR_P010; + requestCfg.format = surfacePixelFmt; + requestCfg.usage = BUFFER_USAGE_CPU_READ | BUFFER_USAGE_CPU_WRITE + | BUFFER_USAGE_HW_RENDER | BUFFER_USAGE_HW_TEXTURE; + requestCfg.width = DEFAULT_WIDTH; + requestCfg.height = DEFAULT_HEIGHT; + requestCfg.timeout = 0; + requestCfg.strideAlignment = 16; // alignment 16 + flushCfg.damage.x = 0; + flushCfg.damage.y = 0; + flushCfg.damage.w = DEFAULT_WIDTH; + flushCfg.damage.h = DEFAULT_HEIGHT; + flushCfg.timestamp = 0; +} + HWTEST_F(MdgDemoTest, DEMO_RUN_TEST, TestSize.Level1) { BufferFlushConfig flushCfg_{}; @@ -151,19 +169,7 @@ HWTEST_F(MdgDemoTest, DEMO_RUN_TEST, TestSize.Level1) // input SDR CM_ColorSpaceInfo inColspcInfo = COLORSPACE_INFO_HDR_BT2020; CM_HDR_Metadata_Type inMetaType = CM_VIDEO_HDR_VIVID; - GraphicPixelFormat surfacePixelFmt = GRAPHIC_PIXEL_FMT_YCBCR_P010; - requestCfg_.format = surfacePixelFmt; - requestCfg_.usage = BUFFER_USAGE_CPU_READ | BUFFER_USAGE_CPU_WRITE - | BUFFER_USAGE_HW_RENDER | BUFFER_USAGE_HW_TEXTURE; - requestCfg_.width = DEFAULT_WIDTH; - requestCfg_.height = DEFAULT_HEIGHT; - requestCfg_.timeout = 0; - requestCfg_.strideAlignment = 16; - flushCfg_.damage.x = 0; - flushCfg_.damage.y = 0; - flushCfg_.damage.w = DEFAULT_WIDTH; - flushCfg_.damage.h = DEFAULT_HEIGHT; - flushCfg_.timestamp = 0; + InitCfg(requestCfg_, flushCfg_); sptr surface1 = cscv_->CreateInputSurface(); outSurface_ = Surface::CreateSurfaceAsConsumer("ConvertInputSurface2"); sptr listener = new ImageProcessBufferConsumerListener(); @@ -180,7 +186,7 @@ HWTEST_F(MdgDemoTest, DEMO_RUN_TEST, TestSize.Level1) ASSERT_EQ(cscv_->Configure(), VPE_ALGO_ERR_OK); ASSERT_EQ(cscv_->Prepare(), VPE_ALGO_ERR_OK); ASSERT_EQ(cscv_->Start(), VPE_ALGO_ERR_OK); - int frames = 10; // 10 + int frames = 10; // 10 frame while (frames) { sptr fence{nullptr}; sptr buffer2; diff --git a/test/ndk/moduletest/video/api_test.cpp b/test/ndk/moduletest/video/api_test.cpp index 2f13eb6..4e8ed3c 100644 --- a/test/ndk/moduletest/video/api_test.cpp +++ b/test/ndk/moduletest/video/api_test.cpp @@ -72,7 +72,7 @@ const VideoProcessing_ColorSpaceInfo DST_INFO = {OH_VIDEO_HDR_VIVID, namespace { static int32_t g_userValue = 1; -static int32_t g_Index = 1; +static int32_t g_index = 1; static void onErrorEmptyCallback(OH_VideoProcessing* videoProcessor, VideoProcessing_ErrorCode error, void* userData) @@ -760,7 +760,7 @@ HWTEST_F(VpeVideoApiTest, VPE_VIDEO_API_TEST_0350, TestSize.Level0) HWTEST_F(VpeVideoApiTest, VPE_VIDEO_API_TEST_0360, TestSize.Level0) { OH_VideoProcessing_InitializeEnvironment(); - VideoProcessing_ErrorCode ret = OH_VideoProcessing_RenderOutputBuffer(nullptr, g_Index); + VideoProcessing_ErrorCode ret = OH_VideoProcessing_RenderOutputBuffer(nullptr, g_index); ASSERT_EQ(ret, VIDEO_PROCESSING_ERROR_INVALID_INSTANCE); } diff --git a/test/unittest/aihdr_enhancer/aihdr_enhancer_unit_test.cpp b/test/unittest/aihdr_enhancer/aihdr_enhancer_unit_test.cpp index bfe28f3..6923527 100644 --- a/test/unittest/aihdr_enhancer/aihdr_enhancer_unit_test.cpp +++ b/test/unittest/aihdr_enhancer/aihdr_enhancer_unit_test.cpp @@ -117,12 +117,12 @@ HWTEST_F(AihdrEnhancerUnitTest, aihdrenhancer_getparameter_01, TestSize.Level1) { auto aihdrEnh = AihdrEnhancer::Create(); int param = 1; - int param_temp = 0; - auto res_set = aihdrEnh->SetParameter(param); - auto res_get = aihdrEnh->GetParameter(param_temp); - EXPECT_EQ(res_set, VPE_ALGO_ERR_OK); - EXPECT_EQ(res_get, VPE_ALGO_ERR_OK); - EXPECT_EQ(param, param_temp); + int paramTemp = 0; + auto resSet = aihdrEnh->SetParameter(param); + auto resGet = aihdrEnh->GetParameter(paramTemp); + EXPECT_EQ(resSet, VPE_ALGO_ERR_OK); + EXPECT_EQ(resGet, VPE_ALGO_ERR_OK); + EXPECT_EQ(param, paramTemp); } // process diff --git a/test/unittest/detail_enhancer/detail_enhancer_unit_test.cpp b/test/unittest/detail_enhancer/detail_enhancer_unit_test.cpp index 401ba53..0ff5a8d 100644 --- a/test/unittest/detail_enhancer/detail_enhancer_unit_test.cpp +++ b/test/unittest/detail_enhancer/detail_enhancer_unit_test.cpp @@ -33,6 +33,9 @@ using namespace std; using namespace testing::ext; +constexpr int32_t DEFAULT_FORMAT_RGBAEIGHT = OHOS::GRAPHIC_PIXEL_FMT_RGBA_8888; +constexpr int32_t DEFAULT_FORMAT_YCBCRSP = OHOS::GRAPHIC_PIXEL_FMT_YCBCR_420_SP; + namespace OHOS { namespace Media { namespace VideoProcessingEngine { @@ -220,10 +223,7 @@ HWTEST_F(DetailEnhancerUnitTest, detailenhancer_init_13, TestSize.Level1) // test getBuffer with bad size HWTEST_F(DetailEnhancerUnitTest, detailenhancer_init_14, TestSize.Level1) { - int32_t width = -1; - int32_t height = -1; - int32_t format = OHOS::GRAPHIC_PIXEL_FMT_RGBA_8888; - auto createdBuffer = CreateSurfaceBuffer(format, width, height); + auto createdBuffer = CreateSurfaceBuffer(DEFAULT_FORMAT_RGBAEIGHT, -1, -1); EXPECT_EQ(createdBuffer, nullptr); } @@ -250,10 +250,8 @@ HWTEST_F(DetailEnhancerUnitTest, detailenhancer_process_01, TestSize.Level1) detailEnh->SetParameter(param); int32_t outputWidth = 4096; int32_t outputHeight = 3072; - int32_t inputFormat = OHOS::GRAPHIC_PIXEL_FMT_RGBA_8888; - int32_t outputFormat = OHOS::GRAPHIC_PIXEL_FMT_RGBA_8888; - auto input = CreateSurfaceBuffer(inputFormat, 1024, 768); - auto output = CreateSurfaceBuffer(outputFormat, outputWidth, outputHeight); + auto input = CreateSurfaceBuffer(DEFAULT_FORMAT_RGBAEIGHT, 1024, 768); + auto output = CreateSurfaceBuffer(DEFAULT_FORMAT_RGBAEIGHT, outputWidth, outputHeight); int32_t ret = detailEnh->Process(input, output); EXPECT_EQ(ret, VPE_ALGO_ERR_OK); } @@ -269,10 +267,8 @@ HWTEST_F(DetailEnhancerUnitTest, detailenhancer_process_02, TestSize.Level1) detailEnh->SetParameter(param); int32_t outputWidth = 2048; int32_t outputHeight = 1536; - int32_t inputFormat = OHOS::GRAPHIC_PIXEL_FMT_RGBA_8888; - int32_t outputFormat = OHOS::GRAPHIC_PIXEL_FMT_RGBA_8888; - auto input = CreateSurfaceBuffer(inputFormat, 4096, 3072); - auto output = CreateSurfaceBuffer(outputFormat, outputWidth, outputHeight); + auto input = CreateSurfaceBuffer(DEFAULT_FORMAT_RGBAEIGHT, 4096, 3072); + auto output = CreateSurfaceBuffer(DEFAULT_FORMAT_RGBAEIGHT, outputWidth, outputHeight); int32_t ret = detailEnh->Process(input, output); EXPECT_EQ(ret, VPE_ALGO_ERR_OK); } @@ -288,10 +284,8 @@ HWTEST_F(DetailEnhancerUnitTest, detailenhancer_process_03, TestSize.Level1) detailEnh->SetParameter(param); int32_t outputWidth = 2048; int32_t outputHeight = 1536; - int32_t inputFormat = OHOS::GRAPHIC_PIXEL_FMT_RGBA_8888; - int32_t outputFormat = OHOS::GRAPHIC_PIXEL_FMT_RGBA_8888; - auto input = CreateSurfaceBuffer(inputFormat, 4096, 3072); - auto output = CreateSurfaceBuffer(outputFormat, outputWidth, outputHeight); + auto input = CreateSurfaceBuffer(DEFAULT_FORMAT_RGBAEIGHT, 4096, 3072); + auto output = CreateSurfaceBuffer(DEFAULT_FORMAT_RGBAEIGHT, outputWidth, outputHeight); int32_t ret = detailEnh->Process(input, output); EXPECT_NE(ret, VPE_ALGO_ERR_OK); } @@ -307,10 +301,8 @@ HWTEST_F(DetailEnhancerUnitTest, detailenhancer_process_04, TestSize.Level1) detailEnh->SetParameter(param); int32_t outputWidth = 2048; int32_t outputHeight = 1536; - int32_t inputFormat = OHOS::GRAPHIC_PIXEL_FMT_RGBA_8888; - int32_t outputFormat = OHOS::GRAPHIC_PIXEL_FMT_RGBA_8888; - auto input = CreateSurfaceBuffer(inputFormat, 4096, 3072); - auto output = CreateSurfaceBuffer(outputFormat, outputWidth, outputHeight); + auto input = CreateSurfaceBuffer(DEFAULT_FORMAT_RGBAEIGHT, 4096, 3072); + auto output = CreateSurfaceBuffer(DEFAULT_FORMAT_RGBAEIGHT, outputWidth, outputHeight); int32_t ret = detailEnh->Process(input, output); EXPECT_NE(ret, VPE_ALGO_ERR_OK); } @@ -326,10 +318,8 @@ HWTEST_F(DetailEnhancerUnitTest, detailenhancer_process_05, TestSize.Level1) detailEnh->SetParameter(param); int32_t outputWidth = 2048; int32_t outputHeight = 1536; - int32_t inputFormat = OHOS::GRAPHIC_PIXEL_FMT_RGBA_8888; - int32_t outputFormat = OHOS::GRAPHIC_PIXEL_FMT_RGBA_8888; - auto input = CreateSurfaceBuffer(inputFormat, 4096, 3072); - auto output = CreateSurfaceBuffer(outputFormat, outputWidth, outputHeight); + auto input = CreateSurfaceBuffer(DEFAULT_FORMAT_RGBAEIGHT, 4096, 3072); + auto output = CreateSurfaceBuffer(DEFAULT_FORMAT_RGBAEIGHT, outputWidth, outputHeight); int32_t ret = detailEnh->Process(input, output); EXPECT_NE(ret, VPE_ALGO_ERR_OK); } @@ -345,10 +335,8 @@ HWTEST_F(DetailEnhancerUnitTest, detailenhancer_process_06, TestSize.Level1) detailEnh->SetParameter(param); int32_t outputWidth = 2048; int32_t outputHeight = 1536; - int32_t inputFormat = OHOS::GRAPHIC_PIXEL_FMT_RGBA_8888; - int32_t outputFormat = OHOS::GRAPHIC_PIXEL_FMT_RGBA_8888; - auto input = CreateSurfaceBuffer(inputFormat, 1024, 768); - auto output = CreateSurfaceBuffer(outputFormat, outputWidth, outputHeight); + auto input = CreateSurfaceBuffer(DEFAULT_FORMAT_RGBAEIGHT, 1024, 768); + auto output = CreateSurfaceBuffer(DEFAULT_FORMAT_RGBAEIGHT, outputWidth, outputHeight); int32_t ret = detailEnh->Process(input, output); EXPECT_EQ(ret, VPE_ALGO_ERR_OK); } @@ -364,10 +352,8 @@ HWTEST_F(DetailEnhancerUnitTest, detailenhancer_process_07, TestSize.Level1) detailEnh->SetParameter(param); int32_t outputWidth = 1024; int32_t outputHeight = 768; - int32_t inputFormat = OHOS::GRAPHIC_PIXEL_FMT_RGBA_8888; - int32_t outputFormat = OHOS::GRAPHIC_PIXEL_FMT_RGBA_8888; - auto input = CreateSurfaceBuffer(inputFormat, 4096, 3072); - auto output = CreateSurfaceBuffer(outputFormat, outputWidth, outputHeight); + auto input = CreateSurfaceBuffer(DEFAULT_FORMAT_RGBAEIGHT, 4096, 3072); + auto output = CreateSurfaceBuffer(DEFAULT_FORMAT_RGBAEIGHT, outputWidth, outputHeight); int32_t ret = detailEnh->Process(input, output); EXPECT_EQ(ret, VPE_ALGO_ERR_OK); } @@ -383,10 +369,8 @@ HWTEST_F(DetailEnhancerUnitTest, detailenhancer_process_08, TestSize.Level1) detailEnh->SetParameter(param); int32_t outputWidth = 1024; int32_t outputHeight = 768; - int32_t inputFormat = OHOS::GRAPHIC_PIXEL_FMT_RGBA_8888; - int32_t outputFormat = OHOS::GRAPHIC_PIXEL_FMT_RGBA_8888; - auto input = CreateSurfaceBuffer(inputFormat, 4096, 3072); - auto output = CreateSurfaceBuffer(outputFormat, outputWidth, outputHeight); + auto input = CreateSurfaceBuffer(DEFAULT_FORMAT_RGBAEIGHT, 4096, 3072); + auto output = CreateSurfaceBuffer(DEFAULT_FORMAT_RGBAEIGHT, outputWidth, outputHeight); int32_t ret = detailEnh->Process(input, output); EXPECT_NE(ret, VPE_ALGO_ERR_OK); } @@ -402,10 +386,8 @@ HWTEST_F(DetailEnhancerUnitTest, detailenhancer_process_09, TestSize.Level1) detailEnh->SetParameter(param); int32_t outputWidth = 1024; int32_t outputHeight = 768; - int32_t inputFormat = OHOS::GRAPHIC_PIXEL_FMT_RGBA_8888; - int32_t outputFormat = OHOS::GRAPHIC_PIXEL_FMT_RGBA_8888; - auto input = CreateSurfaceBuffer(inputFormat, 4096, 3072); - auto output = CreateSurfaceBuffer(outputFormat, outputWidth, outputHeight); + auto input = CreateSurfaceBuffer(DEFAULT_FORMAT_RGBAEIGHT, 4096, 3072); + auto output = CreateSurfaceBuffer(DEFAULT_FORMAT_RGBAEIGHT, outputWidth, outputHeight); int32_t ret = detailEnh->Process(input, output); EXPECT_NE(ret, VPE_ALGO_ERR_OK); } @@ -421,10 +403,8 @@ HWTEST_F(DetailEnhancerUnitTest, detailenhancer_process_10, TestSize.Level1) detailEnh->SetParameter(param); int32_t outputWidth = 1024; int32_t outputHeight = 768; - int32_t inputFormat = OHOS::GRAPHIC_PIXEL_FMT_RGBA_8888; - int32_t outputFormat = OHOS::GRAPHIC_PIXEL_FMT_RGBA_8888; - auto input = CreateSurfaceBuffer(inputFormat, 4096, 3072); - auto output = CreateSurfaceBuffer(outputFormat, outputWidth, outputHeight); + auto input = CreateSurfaceBuffer(DEFAULT_FORMAT_RGBAEIGHT, 4096, 3072); + auto output = CreateSurfaceBuffer(DEFAULT_FORMAT_RGBAEIGHT, outputWidth, outputHeight); int32_t ret = detailEnh->Process(input, output); EXPECT_NE(ret, VPE_ALGO_ERR_OK); } @@ -440,10 +420,8 @@ HWTEST_F(DetailEnhancerUnitTest, detailenhancer_process_11, TestSize.Level1) detailEnh->SetParameter(param); int32_t outputWidth = 8192; int32_t outputHeight = 6144; - int32_t inputFormat = OHOS::GRAPHIC_PIXEL_FMT_RGBA_8888; - int32_t outputFormat = OHOS::GRAPHIC_PIXEL_FMT_RGBA_8888; - auto input = CreateSurfaceBuffer(inputFormat, 1024, 768); - auto output = CreateSurfaceBuffer(outputFormat, outputWidth, outputHeight); + auto input = CreateSurfaceBuffer(DEFAULT_FORMAT_RGBAEIGHT, 1024, 768); + auto output = CreateSurfaceBuffer(DEFAULT_FORMAT_RGBAEIGHT, outputWidth, outputHeight); int32_t ret = detailEnh->Process(input, output); EXPECT_EQ(ret, VPE_ALGO_ERR_OK); } @@ -459,10 +437,8 @@ HWTEST_F(DetailEnhancerUnitTest, detailenhancer_process_12, TestSize.Level1) detailEnh->SetParameter(param); int32_t outputWidth = 4096; int32_t outputHeight = 3072; - int32_t inputFormat = OHOS::GRAPHIC_PIXEL_FMT_RGBA_8888; - int32_t outputFormat = OHOS::GRAPHIC_PIXEL_FMT_RGBA_8888; - auto input = CreateSurfaceBuffer(inputFormat, 4096, 3072); - auto output = CreateSurfaceBuffer(outputFormat, outputWidth, outputHeight); + auto input = CreateSurfaceBuffer(DEFAULT_FORMAT_RGBAEIGHT, 4096, 3072); + auto output = CreateSurfaceBuffer(DEFAULT_FORMAT_RGBAEIGHT, outputWidth, outputHeight); int32_t ret = detailEnh->Process(input, output); EXPECT_EQ(ret, VPE_ALGO_ERR_OK); } @@ -478,10 +454,8 @@ HWTEST_F(DetailEnhancerUnitTest, detailenhancer_process_13, TestSize.Level1) detailEnh->SetParameter(param); int32_t outputWidth = 4096; int32_t outputHeight = 3072; - int32_t inputFormat = OHOS::GRAPHIC_PIXEL_FMT_RGBA_8888; - int32_t outputFormat = OHOS::GRAPHIC_PIXEL_FMT_RGBA_8888; - auto input = CreateSurfaceBuffer(inputFormat, 4096, 3072); - auto output = CreateSurfaceBuffer(outputFormat, outputWidth, outputHeight); + auto input = CreateSurfaceBuffer(DEFAULT_FORMAT_RGBAEIGHT, 4096, 3072); + auto output = CreateSurfaceBuffer(DEFAULT_FORMAT_RGBAEIGHT, outputWidth, outputHeight); int32_t ret = detailEnh->Process(input, output); EXPECT_EQ(ret, VPE_ALGO_ERR_OK); } @@ -497,10 +471,8 @@ HWTEST_F(DetailEnhancerUnitTest, detailenhancer_process_14, TestSize.Level1) detailEnh->SetParameter(param); int32_t outputWidth = 4096; int32_t outputHeight = 3072; - int32_t inputFormat = OHOS::GRAPHIC_PIXEL_FMT_RGBA_8888; - int32_t outputFormat = OHOS::GRAPHIC_PIXEL_FMT_RGBA_8888; - auto input = CreateSurfaceBuffer(inputFormat, 4096, 3072); - auto output = CreateSurfaceBuffer(outputFormat, outputWidth, outputHeight); + auto input = CreateSurfaceBuffer(DEFAULT_FORMAT_RGBAEIGHT, 4096, 3072); + auto output = CreateSurfaceBuffer(DEFAULT_FORMAT_RGBAEIGHT, outputWidth, outputHeight); int32_t ret = detailEnh->Process(input, output); EXPECT_EQ(ret, VPE_ALGO_ERR_OK); } @@ -516,10 +488,8 @@ HWTEST_F(DetailEnhancerUnitTest, detailenhancer_process_15, TestSize.Level1) detailEnh->SetParameter(param); int32_t outputWidth = 4096; int32_t outputHeight = 3072; - int32_t inputFormat = OHOS::GRAPHIC_PIXEL_FMT_RGBA_8888; - int32_t outputFormat = OHOS::GRAPHIC_PIXEL_FMT_RGBA_8888; - auto input = CreateSurfaceBuffer(inputFormat, 4096, 3072); - auto output = CreateSurfaceBuffer(outputFormat, outputWidth, outputHeight); + auto input = CreateSurfaceBuffer(DEFAULT_FORMAT_RGBAEIGHT, 4096, 3072); + auto output = CreateSurfaceBuffer(DEFAULT_FORMAT_RGBAEIGHT, outputWidth, outputHeight); int32_t ret = detailEnh->Process(input, output); EXPECT_EQ(ret, VPE_ALGO_ERR_OK); } @@ -536,10 +506,8 @@ HWTEST_F(DetailEnhancerUnitTest, detailenhancer_process_16, TestSize.Level1) detailEnh->SetParameter(param); int32_t outputWidth = 3145728; int32_t outputHeight = 1; - int32_t inputFormat = OHOS::GRAPHIC_PIXEL_FMT_RGBA_8888; - int32_t outputFormat = OHOS::GRAPHIC_PIXEL_FMT_RGBA_8888; - auto input = CreateSurfaceBuffer(inputFormat, 1024, 768); - auto output = CreateSurfaceBuffer(outputFormat, outputWidth, outputHeight); + auto input = CreateSurfaceBuffer(DEFAULT_FORMAT_RGBAEIGHT, 1024, 768); + auto output = CreateSurfaceBuffer(DEFAULT_FORMAT_RGBAEIGHT, outputWidth, outputHeight); int32_t ret = detailEnh->Process(input, output); EXPECT_NE(ret, VPE_ALGO_ERR_OK); } @@ -555,10 +523,8 @@ HWTEST_F(DetailEnhancerUnitTest, detailenhancer_process_17, TestSize.Level1) detailEnh->SetParameter(param); int32_t outputWidth = 3145728; int32_t outputHeight = 1; - int32_t inputFormat = OHOS::GRAPHIC_PIXEL_FMT_RGBA_8888; - int32_t outputFormat = OHOS::GRAPHIC_PIXEL_FMT_RGBA_8888; - auto input = CreateSurfaceBuffer(inputFormat, 4096, 3072); - auto output = CreateSurfaceBuffer(outputFormat, outputWidth, outputHeight); + auto input = CreateSurfaceBuffer(DEFAULT_FORMAT_RGBAEIGHT, 4096, 3072); + auto output = CreateSurfaceBuffer(DEFAULT_FORMAT_RGBAEIGHT, outputWidth, outputHeight); int32_t ret = detailEnh->Process(input, output); EXPECT_NE(ret, VPE_ALGO_ERR_OK); } @@ -574,10 +540,8 @@ HWTEST_F(DetailEnhancerUnitTest, detailenhancer_process_18, TestSize.Level1) detailEnh->SetParameter(param); int32_t outputWidth = 3145728; int32_t outputHeight = 1; - int32_t inputFormat = OHOS::GRAPHIC_PIXEL_FMT_RGBA_8888; - int32_t outputFormat = OHOS::GRAPHIC_PIXEL_FMT_RGBA_8888; - auto input = CreateSurfaceBuffer(inputFormat, 4096, 3072); - auto output = CreateSurfaceBuffer(outputFormat, outputWidth, outputHeight); + auto input = CreateSurfaceBuffer(DEFAULT_FORMAT_RGBAEIGHT, 4096, 3072); + auto output = CreateSurfaceBuffer(DEFAULT_FORMAT_RGBAEIGHT, outputWidth, outputHeight); int32_t ret = detailEnh->Process(input, output); EXPECT_NE(ret, VPE_ALGO_ERR_OK); } @@ -593,10 +557,8 @@ HWTEST_F(DetailEnhancerUnitTest, detailenhancer_process_19, TestSize.Level1) detailEnh->SetParameter(param); int32_t outputWidth = 3145728; int32_t outputHeight = 1; - int32_t inputFormat = OHOS::GRAPHIC_PIXEL_FMT_RGBA_8888; - int32_t outputFormat = OHOS::GRAPHIC_PIXEL_FMT_RGBA_8888; - auto input = CreateSurfaceBuffer(inputFormat, 4096, 3072); - auto output = CreateSurfaceBuffer(outputFormat, outputWidth, outputHeight); + auto input = CreateSurfaceBuffer(DEFAULT_FORMAT_RGBAEIGHT, 4096, 3072); + auto output = CreateSurfaceBuffer(DEFAULT_FORMAT_RGBAEIGHT, outputWidth, outputHeight); int32_t ret = detailEnh->Process(input, output); EXPECT_NE(ret, VPE_ALGO_ERR_OK); } @@ -612,10 +574,8 @@ HWTEST_F(DetailEnhancerUnitTest, detailenhancer_process_20, TestSize.Level1) detailEnh->SetParameter(param); int32_t outputWidth = 3145728; int32_t outputHeight = 1; - int32_t inputFormat = OHOS::GRAPHIC_PIXEL_FMT_RGBA_8888; - int32_t outputFormat = OHOS::GRAPHIC_PIXEL_FMT_RGBA_8888; - auto input = CreateSurfaceBuffer(inputFormat, 4096, 3072); - auto output = CreateSurfaceBuffer(outputFormat, outputWidth, outputHeight); + auto input = CreateSurfaceBuffer(DEFAULT_FORMAT_RGBAEIGHT, 4096, 3072); + auto output = CreateSurfaceBuffer(DEFAULT_FORMAT_RGBAEIGHT, outputWidth, outputHeight); int32_t ret = detailEnh->Process(input, output); EXPECT_NE(ret, VPE_ALGO_ERR_OK); } @@ -631,10 +591,8 @@ HWTEST_F(DetailEnhancerUnitTest, detailenhancer_process_21, TestSize.Level1) detailEnh->SetParameter(param); int32_t outputWidth = 2048; int32_t outputHeight = 1536; - int32_t inputFormat = OHOS::GRAPHIC_PIXEL_FMT_YCBCR_420_SP; - int32_t outputFormat = OHOS::GRAPHIC_PIXEL_FMT_YCBCR_420_P; - auto input = CreateSurfaceBuffer(inputFormat, 1024, 768); - auto output = CreateSurfaceBuffer(outputFormat, outputWidth, outputHeight); + auto input = CreateSurfaceBuffer(DEFAULT_FORMAT_YCBCRSP, 1024, 768); + auto output = CreateSurfaceBuffer(DEFAULT_FORMAT_YCBCRSP, outputWidth, outputHeight); int32_t ret = detailEnh->Process(input, output); EXPECT_NE(ret, VPE_ALGO_ERR_OK); } @@ -650,10 +608,8 @@ HWTEST_F(DetailEnhancerUnitTest, detailenhancer_process_22, TestSize.Level1) detailEnh->SetParameter(param); int32_t outputWidth = 2048; int32_t outputHeight = 1536; - int32_t inputFormat = OHOS::GRAPHIC_PIXEL_FMT_YCBCR_420_SP; - int32_t outputFormat = OHOS::GRAPHIC_PIXEL_FMT_YCBCR_420_P; - auto input = CreateSurfaceBuffer(inputFormat, 4096, 3072); - auto output = CreateSurfaceBuffer(outputFormat, outputWidth, outputHeight); + auto input = CreateSurfaceBuffer(DEFAULT_FORMAT_YCBCRSP, 4096, 3072); + auto output = CreateSurfaceBuffer(DEFAULT_FORMAT_YCBCRSP, outputWidth, outputHeight); int32_t ret = detailEnh->Process(input, output); EXPECT_NE(ret, VPE_ALGO_ERR_OK); } @@ -669,10 +625,8 @@ HWTEST_F(DetailEnhancerUnitTest, detailenhancer_process_23, TestSize.Level1) detailEnh->SetParameter(param); int32_t outputWidth = 2048; int32_t outputHeight = 1536; - int32_t inputFormat = OHOS::GRAPHIC_PIXEL_FMT_YCBCR_420_SP; - int32_t outputFormat = OHOS::GRAPHIC_PIXEL_FMT_YCBCR_420_P; - auto input = CreateSurfaceBuffer(inputFormat, 4096, 3072); - auto output = CreateSurfaceBuffer(outputFormat, outputWidth, outputHeight); + auto input = CreateSurfaceBuffer(DEFAULT_FORMAT_YCBCRSP, 4096, 3072); + auto output = CreateSurfaceBuffer(DEFAULT_FORMAT_YCBCRSP, outputWidth, outputHeight); int32_t ret = detailEnh->Process(input, output); EXPECT_NE(ret, VPE_ALGO_ERR_OK); } @@ -688,10 +642,8 @@ HWTEST_F(DetailEnhancerUnitTest, detailenhancer_process_24, TestSize.Level1) detailEnh->SetParameter(param); int32_t outputWidth = 2048; int32_t outputHeight = 1536; - int32_t inputFormat = OHOS::GRAPHIC_PIXEL_FMT_YCBCR_420_SP; - int32_t outputFormat = OHOS::GRAPHIC_PIXEL_FMT_YCBCR_420_P; - auto input = CreateSurfaceBuffer(inputFormat, 4096, 3072); - auto output = CreateSurfaceBuffer(outputFormat, outputWidth, outputHeight); + auto input = CreateSurfaceBuffer(DEFAULT_FORMAT_YCBCRSP, 4096, 3072); + auto output = CreateSurfaceBuffer(DEFAULT_FORMAT_YCBCRSP, outputWidth, outputHeight); int32_t ret = detailEnh->Process(input, output); EXPECT_NE(ret, VPE_ALGO_ERR_OK); } @@ -707,10 +659,8 @@ HWTEST_F(DetailEnhancerUnitTest, detailenhancer_process_25, TestSize.Level1) detailEnh->SetParameter(param); int32_t outputWidth = 2048; int32_t outputHeight = 1536; - int32_t inputFormat = OHOS::GRAPHIC_PIXEL_FMT_YCBCR_420_SP; - int32_t outputFormat = OHOS::GRAPHIC_PIXEL_FMT_YCBCR_420_P; - auto input = CreateSurfaceBuffer(inputFormat, 4096, 3072); - auto output = CreateSurfaceBuffer(outputFormat, outputWidth, outputHeight); + auto input = CreateSurfaceBuffer(DEFAULT_FORMAT_YCBCRSP, 4096, 3072); + auto output = CreateSurfaceBuffer(DEFAULT_FORMAT_YCBCRSP, outputWidth, outputHeight); int32_t ret = detailEnh->Process(input, output); EXPECT_NE(ret, VPE_ALGO_ERR_OK); } @@ -727,9 +677,8 @@ HWTEST_F(DetailEnhancerUnitTest, detailenhancer_process_26, TestSize.Level1) int32_t outputWidth = 2048; int32_t outputHeight = 1536; int32_t inputFormat = OHOS::GRAPHIC_PIXEL_FMT_YCRCB_422_SP; // unsupported format - int32_t outputFormat = OHOS::GRAPHIC_PIXEL_FMT_RGBA_8888; auto input = CreateSurfaceBuffer(inputFormat, 4096, 3072); - auto output = CreateSurfaceBuffer(outputFormat, outputWidth, outputHeight); + auto output = CreateSurfaceBuffer(DEFAULT_FORMAT_RGBAEIGHT, outputWidth, outputHeight); int32_t ret = detailEnh->Process(input, output); EXPECT_NE(ret, VPE_ALGO_ERR_OK); } @@ -745,9 +694,8 @@ HWTEST_F(DetailEnhancerUnitTest, detailenhancer_process_27, TestSize.Level1) detailEnh->SetParameter(param); int32_t outputWidth = 2048; int32_t outputHeight = 1536; - int32_t inputFormat = OHOS::GRAPHIC_PIXEL_FMT_RGBA_8888; int32_t outputFormat = OHOS::GRAPHIC_PIXEL_FMT_YCRCB_422_SP; // unsupported format - auto input = CreateSurfaceBuffer(inputFormat, 4096, 3072); + auto input = CreateSurfaceBuffer(DEFAULT_FORMAT_RGBAEIGHT, 4096, 3072); auto output = CreateSurfaceBuffer(outputFormat, outputWidth, outputHeight); int32_t ret = detailEnh->Process(input, output); EXPECT_NE(ret, VPE_ALGO_ERR_OK); @@ -759,10 +707,8 @@ HWTEST_F(DetailEnhancerUnitTest, detailenhancer_process_28, TestSize.Level1) auto detailEnh = DetailEnhancerImage::Create(); int32_t outputWidth = 2048; int32_t outputHeight = 1536; - int32_t inputFormat = OHOS::GRAPHIC_PIXEL_FMT_RGBA_8888; - int32_t outputFormat = OHOS::GRAPHIC_PIXEL_FMT_RGBA_8888; - auto input = CreateSurfaceBuffer(inputFormat, 4096, 3072); - auto output = CreateSurfaceBuffer(outputFormat, outputWidth, outputHeight); + auto input = CreateSurfaceBuffer(DEFAULT_FORMAT_RGBAEIGHT, 4096, 3072); + auto output = CreateSurfaceBuffer(DEFAULT_FORMAT_RGBAEIGHT, outputWidth, outputHeight); int32_t ret = detailEnh->Process(input, output); EXPECT_NE(ret, VPE_ALGO_ERR_OK); } @@ -778,10 +724,8 @@ HWTEST_F(DetailEnhancerUnitTest, detailenhancer_process_29, TestSize.Level1) detailEnh->SetParameter(param); int32_t outputWidth = 1; int32_t outputHeight = 1; - int32_t inputFormat = OHOS::GRAPHIC_PIXEL_FMT_YCBCR_420_SP; - int32_t outputFormat = OHOS::GRAPHIC_PIXEL_FMT_YCBCR_420_SP; - auto input = CreateSurfaceBuffer(inputFormat, 1024, 768); - auto output = CreateSurfaceBuffer(outputFormat, outputWidth, outputHeight); + auto input = CreateSurfaceBuffer(DEFAULT_FORMAT_YCBCRSP, 1024, 768); + auto output = CreateSurfaceBuffer(DEFAULT_FORMAT_YCBCRSP, outputWidth, outputHeight); int32_t ret = detailEnh->Process(input, output); EXPECT_NE(ret, VPE_ALGO_ERR_OK); } @@ -797,10 +741,8 @@ HWTEST_F(DetailEnhancerUnitTest, detailenhancer_process_30, TestSize.Level1) detailEnh->SetParameter(param); int32_t outputWidth = 1; int32_t outputHeight = 1; - int32_t inputFormat = OHOS::GRAPHIC_PIXEL_FMT_YCBCR_420_SP; - int32_t outputFormat = OHOS::GRAPHIC_PIXEL_FMT_YCBCR_420_SP; - auto input = CreateSurfaceBuffer(inputFormat, 4096, 3072); - auto output = CreateSurfaceBuffer(outputFormat, outputWidth, outputHeight); + auto input = CreateSurfaceBuffer(DEFAULT_FORMAT_YCBCRSP, 4096, 3072); + auto output = CreateSurfaceBuffer(DEFAULT_FORMAT_YCBCRSP, outputWidth, outputHeight); int32_t ret = detailEnh->Process(input, output); EXPECT_NE(ret, VPE_ALGO_ERR_OK); } @@ -816,10 +758,8 @@ HWTEST_F(DetailEnhancerUnitTest, detailenhancer_process_31, TestSize.Level1) detailEnh->SetParameter(param); int32_t outputWidth = 1; int32_t outputHeight = 1; - int32_t inputFormat = OHOS::GRAPHIC_PIXEL_FMT_YCBCR_420_SP; - int32_t outputFormat = OHOS::GRAPHIC_PIXEL_FMT_YCBCR_420_SP; - auto input = CreateSurfaceBuffer(inputFormat, 4096, 3072); - auto output = CreateSurfaceBuffer(outputFormat, outputWidth, outputHeight); + auto input = CreateSurfaceBuffer(DEFAULT_FORMAT_YCBCRSP, 4096, 3072); + auto output = CreateSurfaceBuffer(DEFAULT_FORMAT_YCBCRSP, outputWidth, outputHeight); int32_t ret = detailEnh->Process(input, output); EXPECT_NE(ret, VPE_ALGO_ERR_OK); } @@ -835,10 +775,8 @@ HWTEST_F(DetailEnhancerUnitTest, detailenhancer_process_32, TestSize.Level1) detailEnh->SetParameter(param); int32_t outputWidth = 1; int32_t outputHeight = 1; - int32_t inputFormat = OHOS::GRAPHIC_PIXEL_FMT_YCBCR_420_SP; - int32_t outputFormat = OHOS::GRAPHIC_PIXEL_FMT_YCBCR_420_SP; - auto input = CreateSurfaceBuffer(inputFormat, 4096, 3072); - auto output = CreateSurfaceBuffer(outputFormat, outputWidth, outputHeight); + auto input = CreateSurfaceBuffer(DEFAULT_FORMAT_YCBCRSP, 4096, 3072); + auto output = CreateSurfaceBuffer(DEFAULT_FORMAT_YCBCRSP, outputWidth, outputHeight); int32_t ret = detailEnh->Process(input, output); EXPECT_NE(ret, VPE_ALGO_ERR_OK); } @@ -854,10 +792,8 @@ HWTEST_F(DetailEnhancerUnitTest, detailenhancer_process_33, TestSize.Level1) detailEnh->SetParameter(param); int32_t outputWidth = 1; int32_t outputHeight = 1; - int32_t inputFormat = OHOS::GRAPHIC_PIXEL_FMT_YCBCR_420_SP; - int32_t outputFormat = OHOS::GRAPHIC_PIXEL_FMT_YCBCR_420_SP; - auto input = CreateSurfaceBuffer(inputFormat, 4096, 3072); - auto output = CreateSurfaceBuffer(outputFormat, outputWidth, outputHeight); + auto input = CreateSurfaceBuffer(DEFAULT_FORMAT_YCBCRSP, 4096, 3072); + auto output = CreateSurfaceBuffer(DEFAULT_FORMAT_YCBCRSP, outputWidth, outputHeight); int32_t ret = detailEnh->Process(input, output); EXPECT_NE(ret, VPE_ALGO_ERR_OK); } @@ -873,10 +809,8 @@ HWTEST_F(DetailEnhancerUnitTest, detailenhancer_process_34, TestSize.Level1) detailEnh->SetParameter(param); int32_t outputWidth = 30720; int32_t outputHeight = 17280; - int32_t inputFormat = OHOS::GRAPHIC_PIXEL_FMT_YCBCR_420_SP; - int32_t outputFormat = OHOS::GRAPHIC_PIXEL_FMT_YCBCR_420_SP; - auto input = CreateSurfaceBuffer(inputFormat, 1024, 768); - auto output = CreateSurfaceBuffer(outputFormat, outputWidth, outputHeight); + auto input = CreateSurfaceBuffer(DEFAULT_FORMAT_YCBCRSP, 1024, 768); + auto output = CreateSurfaceBuffer(DEFAULT_FORMAT_YCBCRSP, outputWidth, outputHeight); int32_t ret = detailEnh->Process(input, output); EXPECT_NE(ret, VPE_ALGO_ERR_OK); } @@ -892,10 +826,8 @@ HWTEST_F(DetailEnhancerUnitTest, detailenhancer_process_35, TestSize.Level1) detailEnh->SetParameter(param); int32_t outputWidth = 30720; int32_t outputHeight = 17280; - int32_t inputFormat = OHOS::GRAPHIC_PIXEL_FMT_YCBCR_420_SP; - int32_t outputFormat = OHOS::GRAPHIC_PIXEL_FMT_YCBCR_420_SP; - auto input = CreateSurfaceBuffer(inputFormat, 4096, 3072); - auto output = CreateSurfaceBuffer(outputFormat, outputWidth, outputHeight); + auto input = CreateSurfaceBuffer(DEFAULT_FORMAT_YCBCRSP, 4096, 3072); + auto output = CreateSurfaceBuffer(DEFAULT_FORMAT_YCBCRSP, outputWidth, outputHeight); int32_t ret = detailEnh->Process(input, output); EXPECT_NE(ret, VPE_ALGO_ERR_OK); } @@ -911,10 +843,8 @@ HWTEST_F(DetailEnhancerUnitTest, detailenhancer_process_36, TestSize.Level1) detailEnh->SetParameter(param); int32_t outputWidth = 30720; int32_t outputHeight = 17280; - int32_t inputFormat = OHOS::GRAPHIC_PIXEL_FMT_YCBCR_420_SP; - int32_t outputFormat = OHOS::GRAPHIC_PIXEL_FMT_YCBCR_420_SP; - auto input = CreateSurfaceBuffer(inputFormat, 4096, 3072); - auto output = CreateSurfaceBuffer(outputFormat, outputWidth, outputHeight); + auto input = CreateSurfaceBuffer(DEFAULT_FORMAT_YCBCRSP, 4096, 3072); + auto output = CreateSurfaceBuffer(DEFAULT_FORMAT_YCBCRSP, outputWidth, outputHeight); int32_t ret = detailEnh->Process(input, output); EXPECT_NE(ret, VPE_ALGO_ERR_OK); } @@ -930,10 +860,8 @@ HWTEST_F(DetailEnhancerUnitTest, detailenhancer_process_37, TestSize.Level1) detailEnh->SetParameter(param); int32_t outputWidth = 30720; int32_t outputHeight = 17280; - int32_t inputFormat = OHOS::GRAPHIC_PIXEL_FMT_YCBCR_420_SP; - int32_t outputFormat = OHOS::GRAPHIC_PIXEL_FMT_YCBCR_420_SP; - auto input = CreateSurfaceBuffer(inputFormat, 4096, 3072); - auto output = CreateSurfaceBuffer(outputFormat, outputWidth, outputHeight); + auto input = CreateSurfaceBuffer(DEFAULT_FORMAT_YCBCRSP, 4096, 3072); + auto output = CreateSurfaceBuffer(DEFAULT_FORMAT_YCBCRSP, outputWidth, outputHeight); int32_t ret = detailEnh->Process(input, output); EXPECT_NE(ret, VPE_ALGO_ERR_OK); } @@ -949,10 +877,8 @@ HWTEST_F(DetailEnhancerUnitTest, detailenhancer_process_38, TestSize.Level1) detailEnh->SetParameter(param); int32_t outputWidth = 30720; int32_t outputHeight = 17280; - int32_t inputFormat = OHOS::GRAPHIC_PIXEL_FMT_YCBCR_420_SP; - int32_t outputFormat = OHOS::GRAPHIC_PIXEL_FMT_YCBCR_420_SP; - auto input = CreateSurfaceBuffer(inputFormat, 4096, 3072); - auto output = CreateSurfaceBuffer(outputFormat, outputWidth, outputHeight); + auto input = CreateSurfaceBuffer(DEFAULT_FORMAT_YCBCRSP, 4096, 3072); + auto output = CreateSurfaceBuffer(DEFAULT_FORMAT_YCBCRSP, outputWidth, outputHeight); int32_t ret = detailEnh->Process(input, output); EXPECT_NE(ret, VPE_ALGO_ERR_OK); } @@ -968,10 +894,8 @@ HWTEST_F(DetailEnhancerUnitTest, detailenhancer_process_39, TestSize.Level1) detailEnh->SetParameter(param); int32_t outputWidth = 1025; int32_t outputHeight = 767; - int32_t inputFormat = OHOS::GRAPHIC_PIXEL_FMT_YCBCR_420_SP; - int32_t outputFormat = OHOS::GRAPHIC_PIXEL_FMT_YCBCR_420_SP; - auto input = CreateSurfaceBuffer(inputFormat, 1024, 768); - auto output = CreateSurfaceBuffer(outputFormat, outputWidth, outputHeight); + auto input = CreateSurfaceBuffer(DEFAULT_FORMAT_YCBCRSP, 1024, 768); + auto output = CreateSurfaceBuffer(DEFAULT_FORMAT_YCBCRSP, outputWidth, outputHeight); int32_t ret = detailEnh->Process(input, output); EXPECT_EQ(ret, VPE_ALGO_ERR_OK); } @@ -987,10 +911,8 @@ HWTEST_F(DetailEnhancerUnitTest, detailenhancer_process_40, TestSize.Level1) detailEnh->SetParameter(param); int32_t outputWidth = 1025; int32_t outputHeight = 767; - int32_t inputFormat = OHOS::GRAPHIC_PIXEL_FMT_YCBCR_420_SP; - int32_t outputFormat = OHOS::GRAPHIC_PIXEL_FMT_YCBCR_420_SP; - auto input = CreateSurfaceBuffer(inputFormat, 4096, 3072); - auto output = CreateSurfaceBuffer(outputFormat, outputWidth, outputHeight); + auto input = CreateSurfaceBuffer(DEFAULT_FORMAT_YCBCRSP, 4096, 3072); + auto output = CreateSurfaceBuffer(DEFAULT_FORMAT_YCBCRSP, outputWidth, outputHeight); int32_t ret = detailEnh->Process(input, output); EXPECT_EQ(ret, VPE_ALGO_ERR_OK); } @@ -1006,10 +928,8 @@ HWTEST_F(DetailEnhancerUnitTest, detailenhancer_process_41, TestSize.Level1) detailEnh->SetParameter(param); int32_t outputWidth = 1025; int32_t outputHeight = 767; - int32_t inputFormat = OHOS::GRAPHIC_PIXEL_FMT_YCBCR_420_SP; - int32_t outputFormat = OHOS::GRAPHIC_PIXEL_FMT_YCBCR_420_SP; - auto input = CreateSurfaceBuffer(inputFormat, 4096, 3072); - auto output = CreateSurfaceBuffer(outputFormat, outputWidth, outputHeight); + auto input = CreateSurfaceBuffer(DEFAULT_FORMAT_YCBCRSP, 4096, 3072); + auto output = CreateSurfaceBuffer(DEFAULT_FORMAT_YCBCRSP, outputWidth, outputHeight); int32_t ret = detailEnh->Process(input, output); EXPECT_NE(ret, VPE_ALGO_ERR_OK); } @@ -1025,10 +945,8 @@ HWTEST_F(DetailEnhancerUnitTest, detailenhancer_process_42, TestSize.Level1) detailEnh->SetParameter(param); int32_t outputWidth = 1025; int32_t outputHeight = 767; - int32_t inputFormat = OHOS::GRAPHIC_PIXEL_FMT_YCBCR_420_SP; - int32_t outputFormat = OHOS::GRAPHIC_PIXEL_FMT_YCBCR_420_SP; - auto input = CreateSurfaceBuffer(inputFormat, 4096, 3072); - auto output = CreateSurfaceBuffer(outputFormat, outputWidth, outputHeight); + auto input = CreateSurfaceBuffer(DEFAULT_FORMAT_YCBCRSP, 4096, 3072); + auto output = CreateSurfaceBuffer(DEFAULT_FORMAT_YCBCRSP, outputWidth, outputHeight); int32_t ret = detailEnh->Process(input, output); EXPECT_NE(ret, VPE_ALGO_ERR_OK); } @@ -1044,10 +962,8 @@ HWTEST_F(DetailEnhancerUnitTest, detailenhancer_process_43, TestSize.Level1) detailEnh->SetParameter(param); int32_t outputWidth = 1025; int32_t outputHeight = 767; - int32_t inputFormat = OHOS::GRAPHIC_PIXEL_FMT_YCBCR_420_SP; - int32_t outputFormat = OHOS::GRAPHIC_PIXEL_FMT_YCBCR_420_SP; - auto input = CreateSurfaceBuffer(inputFormat, 4096, 3072); - auto output = CreateSurfaceBuffer(outputFormat, outputWidth, outputHeight); + auto input = CreateSurfaceBuffer(DEFAULT_FORMAT_YCBCRSP, 4096, 3072); + auto output = CreateSurfaceBuffer(DEFAULT_FORMAT_YCBCRSP, outputWidth, outputHeight); int32_t ret = detailEnh->Process(input, output); EXPECT_NE(ret, VPE_ALGO_ERR_OK); } @@ -1063,10 +979,8 @@ HWTEST_F(DetailEnhancerUnitTest, detailenhancer_process_44, TestSize.Level1) detailEnh->SetParameter(param); int32_t outputWidth = 1024; int32_t outputHeight = 480; - int32_t inputFormat = OHOS::GRAPHIC_PIXEL_FMT_YCBCR_420_SP; - int32_t outputFormat = OHOS::GRAPHIC_PIXEL_FMT_YCBCR_420_SP; - auto input = CreateSurfaceBuffer(inputFormat, 1024, 768); - auto output = CreateSurfaceBuffer(outputFormat, outputWidth, outputHeight); + auto input = CreateSurfaceBuffer(DEFAULT_FORMAT_YCBCRSP, 1024, 768); + auto output = CreateSurfaceBuffer(DEFAULT_FORMAT_YCBCRSP, outputWidth, outputHeight); int32_t ret = detailEnh->Process(input, output); EXPECT_EQ(ret, VPE_ALGO_ERR_OK); } @@ -1082,10 +996,8 @@ HWTEST_F(DetailEnhancerUnitTest, detailenhancer_process_45, TestSize.Level1) detailEnh->SetParameter(param); int32_t outputWidth = 1024; int32_t outputHeight = 480; - int32_t inputFormat = OHOS::GRAPHIC_PIXEL_FMT_YCBCR_420_SP; - int32_t outputFormat = OHOS::GRAPHIC_PIXEL_FMT_YCBCR_420_SP; - auto input = CreateSurfaceBuffer(inputFormat, 4096, 3072); - auto output = CreateSurfaceBuffer(outputFormat, outputWidth, outputHeight); + auto input = CreateSurfaceBuffer(DEFAULT_FORMAT_YCBCRSP, 4096, 3072); + auto output = CreateSurfaceBuffer(DEFAULT_FORMAT_YCBCRSP, outputWidth, outputHeight); int32_t ret = detailEnh->Process(input, output); EXPECT_NE(ret, VPE_ALGO_ERR_OK); } @@ -1101,10 +1013,8 @@ HWTEST_F(DetailEnhancerUnitTest, detailenhancer_process_46, TestSize.Level1) detailEnh->SetParameter(param); int32_t outputWidth = 1024; int32_t outputHeight = 480; - int32_t inputFormat = OHOS::GRAPHIC_PIXEL_FMT_YCBCR_420_SP; - int32_t outputFormat = OHOS::GRAPHIC_PIXEL_FMT_YCBCR_420_SP; - auto input = CreateSurfaceBuffer(inputFormat, 4096, 3072); - auto output = CreateSurfaceBuffer(outputFormat, outputWidth, outputHeight); + auto input = CreateSurfaceBuffer(DEFAULT_FORMAT_YCBCRSP, 4096, 3072); + auto output = CreateSurfaceBuffer(DEFAULT_FORMAT_YCBCRSP, outputWidth, outputHeight); int32_t ret = detailEnh->Process(input, output); EXPECT_NE(ret, VPE_ALGO_ERR_OK); } @@ -1120,10 +1030,8 @@ HWTEST_F(DetailEnhancerUnitTest, detailenhancer_process_47, TestSize.Level1) detailEnh->SetParameter(param); int32_t outputWidth = 1024; int32_t outputHeight = 480; - int32_t inputFormat = OHOS::GRAPHIC_PIXEL_FMT_YCBCR_420_SP; - int32_t outputFormat = OHOS::GRAPHIC_PIXEL_FMT_YCBCR_420_SP; - auto input = CreateSurfaceBuffer(inputFormat, 4096, 3072); - auto output = CreateSurfaceBuffer(outputFormat, outputWidth, outputHeight); + auto input = CreateSurfaceBuffer(DEFAULT_FORMAT_YCBCRSP, 4096, 3072); + auto output = CreateSurfaceBuffer(DEFAULT_FORMAT_YCBCRSP, outputWidth, outputHeight); int32_t ret = detailEnh->Process(input, output); EXPECT_NE(ret, VPE_ALGO_ERR_OK); } @@ -1139,10 +1047,8 @@ HWTEST_F(DetailEnhancerUnitTest, detailenhancer_process_48, TestSize.Level1) detailEnh->SetParameter(param); int32_t outputWidth = 1024; int32_t outputHeight = 480; - int32_t inputFormat = OHOS::GRAPHIC_PIXEL_FMT_YCBCR_420_SP; - int32_t outputFormat = OHOS::GRAPHIC_PIXEL_FMT_YCBCR_420_SP; - auto input = CreateSurfaceBuffer(inputFormat, 4096, 3072); - auto output = CreateSurfaceBuffer(outputFormat, outputWidth, outputHeight); + auto input = CreateSurfaceBuffer(DEFAULT_FORMAT_YCBCRSP, 4096, 3072); + auto output = CreateSurfaceBuffer(DEFAULT_FORMAT_YCBCRSP, outputWidth, outputHeight); int32_t ret = detailEnh->Process(input, output); EXPECT_NE(ret, VPE_ALGO_ERR_OK); } @@ -1171,10 +1077,8 @@ HWTEST_F(DetailEnhancerUnitTest, detailenhancer_process_50, TestSize.Level1) detailEnh->SetParameter(param); int32_t outputWidth = 2048; int32_t outputHeight = 1536; - int32_t inputFormat = OHOS::GRAPHIC_PIXEL_FMT_YCBCR_420_SP; - int32_t outputFormat = OHOS::GRAPHIC_PIXEL_FMT_YCBCR_420_SP; - auto input = CreateSurfaceBuffer(inputFormat, 4096, 3072); - auto output = CreateSurfaceBuffer(outputFormat, outputWidth, outputHeight); + auto input = CreateSurfaceBuffer(DEFAULT_FORMAT_YCBCRSP, 4096, 3072); + auto output = CreateSurfaceBuffer(DEFAULT_FORMAT_YCBCRSP, outputWidth, outputHeight); int32_t ret = detailEnh->Process(input, output); // repeat again with AISR DetailEnhancerParameters param2 { @@ -1216,10 +1120,8 @@ HWTEST_F(DetailEnhancerUnitTest, detailenhancer_process_51, TestSize.Level1) int32_t inputHeight = 3072; int32_t outputWidth = 2048; int32_t outputHeight = 1536; - int32_t inputFormat = OHOS::GRAPHIC_PIXEL_FMT_YCRCB_420_SP; - int32_t outputFormat = OHOS::GRAPHIC_PIXEL_FMT_YCRCB_420_SP; - auto input = CreateSurfaceBuffer(inputFormat, inputWidth, inputHeight); - auto output = CreateSurfaceBuffer(outputFormat, outputWidth, outputHeight); + auto input = CreateSurfaceBuffer(DEFAULT_FORMAT_YCBCRSP, inputWidth, inputHeight); + auto output = CreateSurfaceBuffer(DEFAULT_FORMAT_YCBCRSP, outputWidth, outputHeight); int32_t ret = detailEnh->Process(input, output); ret = detailEnh->Process(input, output); EXPECT_EQ(ret, VPE_ALGO_ERR_OK); @@ -1228,8 +1130,8 @@ HWTEST_F(DetailEnhancerUnitTest, detailenhancer_process_51, TestSize.Level1) // check extern c interface HWTEST_F(DetailEnhancerUnitTest, detailenhancer_process_52, TestSize.Level1) { - auto input = CreateSurfaceBuffer(OHOS::GRAPHIC_PIXEL_FMT_RGBA_8888, 4096, 3072); - auto output = CreateSurfaceBuffer(OHOS::GRAPHIC_PIXEL_FMT_RGBA_8888, 2048, 1536); + auto input = CreateSurfaceBuffer(DEFAULT_FORMAT_RGBAEIGHT, 4096, 3072); + auto output = CreateSurfaceBuffer(DEFAULT_FORMAT_RGBAEIGHT, 2048, 1536); DetailEnhancerLevel level = DETAIL_ENH_LEVEL_HIGH; void* lib = dlopen("/system/lib64/libvideoprocessingengine.z.so", RTLD_LAZY); if (lib == nullptr) { @@ -1281,8 +1183,8 @@ HWTEST_F(DetailEnhancerUnitTest, detailenhancer_process_52, TestSize.Level1) // check extern c interface, create with null instance HWTEST_F(DetailEnhancerUnitTest, detailenhancer_process_53, TestSize.Level1) { - auto input = CreateSurfaceBuffer(OHOS::GRAPHIC_PIXEL_FMT_RGBA_8888, 4096, 3072); - auto output = CreateSurfaceBuffer(OHOS::GRAPHIC_PIXEL_FMT_RGBA_8888, 2048, 1536); + auto input = CreateSurfaceBuffer(DEFAULT_FORMAT_RGBAEIGHT, 4096, 3072); + auto output = CreateSurfaceBuffer(DEFAULT_FORMAT_RGBAEIGHT, 2048, 1536); void* lib = dlopen("/system/lib64/libvideoprocessingengine.z.so", RTLD_LAZY); if (lib == nullptr) { printf("cannot load vpe lib\n"); @@ -1298,8 +1200,8 @@ HWTEST_F(DetailEnhancerUnitTest, detailenhancer_process_53, TestSize.Level1) // check extern c interface, process with null output buffer HWTEST_F(DetailEnhancerUnitTest, detailenhancer_process_54, TestSize.Level1) { - auto input = CreateSurfaceBuffer(OHOS::GRAPHIC_PIXEL_FMT_RGBA_8888, 4096, 3072); - auto output = CreateSurfaceBuffer(OHOS::GRAPHIC_PIXEL_FMT_RGBA_8888, 2048, 1536); + auto input = CreateSurfaceBuffer(DEFAULT_FORMAT_RGBAEIGHT, 4096, 3072); + auto output = CreateSurfaceBuffer(DEFAULT_FORMAT_RGBAEIGHT, 2048, 1536); DetailEnhancerLevel level = DETAIL_ENH_LEVEL_HIGH; void* lib = dlopen("/system/lib64/libvideoprocessingengine.z.so", RTLD_LAZY); if (lib == nullptr) { @@ -1348,8 +1250,8 @@ HWTEST_F(DetailEnhancerUnitTest, detailenhancer_process_54, TestSize.Level1) // check extern c interface, destroy nullptr HWTEST_F(DetailEnhancerUnitTest, detailenhancer_process_55, TestSize.Level1) { - auto input = CreateSurfaceBuffer(OHOS::GRAPHIC_PIXEL_FMT_RGBA_8888, 4096, 3072); - auto output = CreateSurfaceBuffer(OHOS::GRAPHIC_PIXEL_FMT_RGBA_8888, 2048, 1536); + auto input = CreateSurfaceBuffer(DEFAULT_FORMAT_RGBAEIGHT, 4096, 3072); + auto output = CreateSurfaceBuffer(DEFAULT_FORMAT_RGBAEIGHT, 2048, 1536); DetailEnhancerLevel level = DETAIL_ENH_LEVEL_HIGH; void* lib = dlopen("/system/lib64/libvideoprocessingengine.z.so", RTLD_LAZY); if (lib == nullptr) { @@ -2118,9 +2020,8 @@ HWTEST_F(DetailEnhancerUnitTest, extream_vision_engine_process_30, TestSize.Leve int32_t outputWidth = 2048; int32_t outputHeight = 1536; int32_t inputFormat = OHOS::GRAPHIC_PIXEL_FMT_RGBA_1010102; - int32_t outputFormat = OHOS::GRAPHIC_PIXEL_FMT_RGBA_8888; auto input = CreateSurfaceBuffer(inputFormat, inputWidth, inputHeight); - auto output = CreateSurfaceBuffer(outputFormat, outputWidth, outputHeight); + auto output = CreateSurfaceBuffer(DEFAULT_FORMAT_RGBAEIGHT, outputWidth, outputHeight); int32_t ret = detailEnh->Process(input, output); EXPECT_NE(ret, VPE_ALGO_ERR_OK); } @@ -2243,8 +2144,8 @@ HWTEST_F(DetailEnhancerUnitTest, aisr_process_13, TestSize.Level1) // destroy twice HWTEST_F(DetailEnhancerUnitTest, aisr_process_1, TestSize.Level1) { - auto input = CreateSurfaceBuffer(OHOS::GRAPHIC_PIXEL_FMT_RGBA_8888, 4096, 3072); - auto output = CreateSurfaceBuffer(OHOS::GRAPHIC_PIXEL_FMT_RGBA_8888, 2048, 1536); + auto input = CreateSurfaceBuffer(DEFAULT_FORMAT_RGBAEIGHT, 4096, 3072); + auto output = CreateSurfaceBuffer(DEFAULT_FORMAT_RGBAEIGHT, 2048, 1536); DetailEnhancerLevel level = DETAIL_ENH_LEVEL_HIGH; void* lib = dlopen("/system/lib64/libvideoprocessingengine.z.so", RTLD_LAZY); if (lib == nullptr) { diff --git a/test/unittest/utils/util_define.cpp b/test/unittest/utils/util_define.cpp index 6bfc06b..c0f4457 100644 --- a/test/unittest/utils/util_define.cpp +++ b/test/unittest/utils/util_define.cpp @@ -37,8 +37,8 @@ void ReadFileYuv42016(std::string yuvFilePath, sptr &buffer, int CHECK_AND_RETURN_LOG(yuvFile != nullptr, "Fatal: No memory"); yuvFile->open(yuvFilePath, ios::in | ios::binary); yuvFile->seekg(0, ios::beg); - long ySize = width * height; - long uvSize = width * height / 4; + long ySize = static_cast(width) * static_cast(height); + long uvSize = ySize / 4; uint16_t *yBuffer = new uint16_t[ySize + STRIDE * uvSize]; uint16_t *uBuffer = new uint16_t[uvSize]; uint16_t *vBuffer = new uint16_t[uvSize]; @@ -46,9 +46,11 @@ void ReadFileYuv42016(std::string yuvFilePath, sptr &buffer, int yuvFile->read(reinterpret_cast(uBuffer), uvSize * sizeof(uint16_t)); yuvFile->read(reinterpret_cast(vBuffer), uvSize * sizeof(uint16_t)); - memcpy_s(reinterpret_cast(buffer->GetVirAddr()), (ySize + uvSize * STRIDE) * sizeof(uint16_t), yBuffer, - (ySize + uvSize * STRIDE) * sizeof(uint16_t)); - + errno_t ret = memcpy_s(reinterpret_cast(buffer->GetVirAddr()), (ySize + uvSize * STRIDE) * sizeof(uint16_t), + yBuffer, (ySize + uvSize * STRIDE) * sizeof(uint16_t)); + if (ret != EOK) { + printf("memcpy_s failed, err = %d\n", ret); + } delete[] yBuffer; delete[] uBuffer; delete[] vBuffer; @@ -61,8 +63,8 @@ void ReadFileYuv42010ToNv1216(std::string yuvFilePath, sptr &buff CHECK_AND_RETURN_LOG(yuvFile != nullptr, "Fatal: No memory"); yuvFile->open(yuvFilePath, ios::in | ios::binary); yuvFile->seekg(0, ios::beg); - long ySize = width * height; - long uvSize = width * height / 4; + long ySize = static_cast(width) * static_cast(height); + long uvSize = ySize / 4; uint16_t *yBuffer = new uint16_t[ySize + STRIDE * uvSize]; uint16_t *uBuffer = new uint16_t[uvSize]; uint16_t *vBuffer = new uint16_t[uvSize]; @@ -81,9 +83,11 @@ void ReadFileYuv42010ToNv1216(std::string yuvFilePath, sptr &buff uvBufferPtr[numTwo * j + 1] = vBuffer[j] << num10To16; } - memcpy_s(reinterpret_cast(buffer->GetVirAddr()), (ySize + uvSize * STRIDE) * sizeof(uint16_t), yBuffer, - (ySize + uvSize * STRIDE) * sizeof(uint16_t)); - + errno_t ret = memcpy_s(reinterpret_cast(buffer->GetVirAddr()), (ySize + uvSize * STRIDE) * sizeof(uint16_t), + yBuffer, (ySize + uvSize * STRIDE) * sizeof(uint16_t)); + if (ret != EOK) { + printf("memcpy_s failed, err = %d\n", ret); + } delete[] yBuffer; delete[] uBuffer; delete[] vBuffer; @@ -123,7 +127,10 @@ static void SaveMetaDataToBin(int frameId, const char *fileName, unsigned char * if (len != metadataPayloadSize) { printf("write file Error:%s!", fileName); } - fclose(fileOut); + int fcloseResult = fclose(fileOut); + if (fcloseResult != 0) { + printf("fclose Error:%s!", fileName); + } } void SaveMetadataFromSurBuffer(const sptr &input, int frame, const string &metadataBin) @@ -282,7 +289,11 @@ void SetMeatadata(sptr &buffer, uint32_t value) { std::vector metadata; metadata.resize(sizeof(value)); - (void)memcpy_s(metadata.data(), metadata.size(), &value, sizeof(value)); + errno_t ret = memcpy_s(metadata.data(), metadata.size(), &value, sizeof(value)); + if (ret != EOK) { + printf("memcpy_s failed, err = %d\n", ret); + return; + } uint32_t err = buffer->SetMetadata(ATTRKEY_HDR_METADATA_TYPE, metadata); printf("Buffer set metadata type, ret: %u\n", err); } @@ -290,7 +301,11 @@ void SetMeatadata(sptr &buffer, const CM_ColorSpaceInfo &colorspa { std::vector metadata; metadata.resize(sizeof(CM_ColorSpaceInfo)); - (void)memcpy_s(metadata.data(), metadata.size(), &colorspaceInfo, sizeof(CM_ColorSpaceInfo)); + errno_t ret = memcpy_s(metadata.data(), metadata.size(), &colorspaceInfo, sizeof(CM_ColorSpaceInfo)); + if (ret != EOK) { + printf("memcpy_s failed, err = %d\n", ret); + return; + } uint32_t err = buffer->SetMetadata(ATTRKEY_COLORSPACE_INFO, metadata); printf("Buffer set colorspace info, ret: %u\n", err); } @@ -298,7 +313,11 @@ void SetMeatadata(sptr &buffer, int key, const float &data) { std::vector metadata; metadata.resize(sizeof(float)); - (void)memcpy_s(metadata.data(), metadata.size(), &data, sizeof(float)); + errno_t ret = memcpy_s(metadata.data(), metadata.size(), &data, sizeof(float)); + if (ret != EOK) { + printf("memcpy_s failed, err = %d\n", ret); + return; + } uint32_t err = buffer->SetMetadata(key, metadata); printf("Buffer set colorspace info, ret: %u\n", err); } @@ -306,7 +325,11 @@ void SetMeatadata(sptr &buffer, int key, const int &data) { std::vector metadata; metadata.resize(sizeof(int)); - (void)memcpy_s(metadata.data(), metadata.size(), &data, sizeof(int)); + errno_t ret = memcpy_s(metadata.data(), metadata.size(), &data, sizeof(int)); + if (ret != EOK) { + printf("memcpy_s failed, err = %d\n", ret); + return; + } uint32_t err = buffer->SetMetadata(key, metadata); printf("Buffer set colorspace info, ret: %u\n", err); } diff --git a/test/unittest/video_variable_refreshrate_test/BUILD.gn b/test/unittest/video_variable_refreshrate_test/BUILD.gn index 21c9c07..ec600dd 100644 --- a/test/unittest/video_variable_refreshrate_test/BUILD.gn +++ b/test/unittest/video_variable_refreshrate_test/BUILD.gn @@ -43,7 +43,8 @@ ohos_unittest("video_variable_refreshrate_unit_test") { external_deps = [ "c_utils:utils", "drivers_interface_display:display_commontype_idl_headers", - "drivers_interface_display:display_composer_idl_headers_1.1", + "drivers_interface_display:display_composer_idl_headers_1.2", + "drivers_interface_display:libdisplay_commontype_proxy_2.0", "drivers_interface_display:libdisplay_composer_hdi_impl", "graphic_surface:surface", "hilog:libhilog", diff --git a/test/unittest/video_variable_refreshrate_test/video_variable_refreshrate_unit_test.cpp b/test/unittest/video_variable_refreshrate_test/video_variable_refreshrate_unit_test.cpp index c97a8ad..d93183d 100644 --- a/test/unittest/video_variable_refreshrate_test/video_variable_refreshrate_unit_test.cpp +++ b/test/unittest/video_variable_refreshrate_test/video_variable_refreshrate_unit_test.cpp @@ -93,7 +93,10 @@ sptr CreateSurfaceBuffer(uint32_t pixelFormat, int32_t width, int inputCfg.format = pixelFormat; inputCfg.timeout = 0; GSError err = buffer->Alloc(inputCfg); - + if (GSERROR_OK != err) { + printf("Alloc surface buffer failed\n"); + return nullptr; + } using namespace HDI::Display::Graphic::Common; std::vector vec; V2_0::BlobDataType data; @@ -101,13 +104,13 @@ sptr CreateSurfaceBuffer(uint32_t pixelFormat, int32_t width, int CHECK_AND_RETURN_RET_LOG(ret == GSERROR_OK && (vec.size() == sizeof(V2_0::BlobDataType)), nullptr, "VRR got decode mv type from handle failed"); ret = memcpy_s(&data, sizeof(V2_0::BlobDataType), vec.data(), vec.size()); - if (GSERROR_OK != err) { - printf("Alloc surface buffer failed\n"); + if (ret != 0) { + printf("Alloc motion vector failed\n"); return nullptr; } ret = memcpy_s((void *)(data.vaddr + data.offset), mvLength, mvBuffer, mvLength); - if (GSERROR_OK != err) { - printf("Alloc surface buffer failed\n"); + if (ret != 0) { + printf("Set motion vector failed\n"); return nullptr; } printf("Alloc surface buffer with motion vecotr success\n");