From b178453ccee21ac3c263c9a548f15632cb9a0be5 Mon Sep 17 00:00:00 2001 From: "443802242@qq.com" <443802242@qq.com> Date: Fri, 18 Aug 2023 07:14:14 +0000 Subject: [PATCH] feat:modify codec image xts Signed-off-by: 443802242@qq.com <443802242@qq.com> --- hdf/codec/hdi_image/BUILD.gn | 5 +- hdf/codec/hdi_image/codec_hdi_jpeg_test.cpp | 53 +++++++------------- hdf/codec/hdi_image/codec_image_callback.cpp | 33 ------------ hdf/codec/hdi_image/codec_image_callback.h | 38 -------------- 4 files changed, 20 insertions(+), 109 deletions(-) delete mode 100644 hdf/codec/hdi_image/codec_image_callback.cpp delete mode 100644 hdf/codec/hdi_image/codec_image_callback.h diff --git a/hdf/codec/hdi_image/BUILD.gn b/hdf/codec/hdi_image/BUILD.gn index 69074d0d..e1ed87fd 100644 --- a/hdf/codec/hdi_image/BUILD.gn +++ b/hdf/codec/hdi_image/BUILD.gn @@ -20,10 +20,7 @@ ohos_moduletest_suite("HatsHdfImageCodecTest") { module_out_path = module_output_path deps = [ "//third_party/googletest:gtest_main" ] - sources = [ - "codec_hdi_jpeg_test.cpp", - "codec_image_callback.cpp", - ] + sources = [ "codec_hdi_jpeg_test.cpp" ] if (is_standard_system) { external_deps = [ diff --git a/hdf/codec/hdi_image/codec_hdi_jpeg_test.cpp b/hdf/codec/hdi_image/codec_hdi_jpeg_test.cpp index d1580552..10cde949 100644 --- a/hdf/codec/hdi_image/codec_hdi_jpeg_test.cpp +++ b/hdf/codec/hdi_image/codec_hdi_jpeg_test.cpp @@ -15,12 +15,11 @@ #include #include -#include "codec_image_callback.h" #include "hdf_log.h" #include "v1_0/include/idisplay_buffer.h" #include "v1_0/display_composer_type.h" #include "v1_0/display_buffer_type.h" -#include "v1_0/icodec_image_jpeg.h" +#include "v1_0/icodec_image.h" #define HDF_LOG_TAG codec_jpeg_test using namespace std; @@ -33,7 +32,7 @@ constexpr int32_t WIDTH = 640; constexpr int32_t HEIGHT = 480; constexpr uint32_t NORMAL_BUFFER_SIZE = 1000; constexpr uint32_t CODEC_IMAGE_MAX_BUFFER_SIZE = 50 * 1024 *1024; -static OHOS::sptr hdiJpeg_; +static OHOS::sptr hdiJpeg_; static IDisplayBuffer *hdiBuffer_; class CodecHdiJpegTest : public testing::Test { public: @@ -56,7 +55,7 @@ public: static void SetUpTestCase() { - hdiJpeg_ = ICodecImageJpeg::Get(); + hdiJpeg_ = ICodecImage::Get(); hdiBuffer_ = IDisplayBuffer::Get(); } static void TearDownTestCase() @@ -67,13 +66,13 @@ public: void SetUp() { if (hdiJpeg_ != nullptr) { - hdiJpeg_->JpegInit(); + hdiJpeg_->Init(CODEC_IMAGE_JPEG); } } void TearDown() { if (hdiJpeg_ != nullptr) { - hdiJpeg_->JpegDeInit(); + hdiJpeg_->DeInit(CODEC_IMAGE_JPEG); } } }; @@ -90,7 +89,7 @@ HWTEST_F(CodecHdiJpegTest, HdfCodecHdiAllocateInBufferTest_001, TestSize.Level1) { ASSERT_TRUE(hdiJpeg_ != nullptr); struct CodecImageBuffer inBuffer; - auto ret = hdiJpeg_->AllocateInBuffer(inBuffer, 0); + auto ret = hdiJpeg_->AllocateInBuffer(inBuffer, 0, CODEC_IMAGE_JPEG); ASSERT_NE(ret, HDF_SUCCESS); } @@ -98,7 +97,7 @@ HWTEST_F(CodecHdiJpegTest, HdfCodecHdiAllocateInBufferTest_002, TestSize.Level1) { ASSERT_TRUE(hdiJpeg_ != nullptr); struct CodecImageBuffer inBuffer; - auto ret = hdiJpeg_->AllocateInBuffer(inBuffer, CODEC_IMAGE_MAX_BUFFER_SIZE + 1); + auto ret = hdiJpeg_->AllocateInBuffer(inBuffer, CODEC_IMAGE_MAX_BUFFER_SIZE + 1, CODEC_IMAGE_JPEG); ASSERT_NE(ret, HDF_SUCCESS); } @@ -106,7 +105,7 @@ HWTEST_F(CodecHdiJpegTest, HdfCodecHdiAllocateAndFreeInBufferTest_001, TestSize. { ASSERT_TRUE(hdiJpeg_ != nullptr); struct CodecImageBuffer inBuffer; - auto ret = hdiJpeg_->AllocateInBuffer(inBuffer, NORMAL_BUFFER_SIZE); + auto ret = hdiJpeg_->AllocateInBuffer(inBuffer, NORMAL_BUFFER_SIZE, CODEC_IMAGE_JPEG); ASSERT_EQ(ret, HDF_SUCCESS); ret = hdiJpeg_->FreeInBuffer(inBuffer); ASSERT_EQ(ret, HDF_SUCCESS); @@ -117,6 +116,7 @@ HWTEST_F(CodecHdiJpegTest, HdfCodecHdiFreeInBufferTest_001, TestSize.Level1) ASSERT_TRUE(hdiJpeg_ != nullptr); struct CodecImageBuffer inBuffer; inBuffer.id = -1; + inBuffer.fenceFd = -1; auto ret = hdiJpeg_->FreeInBuffer(inBuffer); ASSERT_NE(ret, HDF_SUCCESS); } @@ -127,8 +127,9 @@ HWTEST_F(CodecHdiJpegTest, HdfCodecHdiDoJpegDecodeTest_001, TestSize.Level1) struct CodecImageBuffer inBuffer; struct CodecImageBuffer outBuffer; struct CodecJpegDecInfo decInfo; - OHOS::sptr callback; - auto ret = hdiJpeg_->DoJpegDecode(inBuffer, outBuffer, callback, decInfo); + inBuffer.fenceFd = -1; + outBuffer.fenceFd = -1; + auto ret = hdiJpeg_->DoJpegDecode(inBuffer, outBuffer, decInfo); ASSERT_NE(ret, HDF_SUCCESS); } @@ -136,13 +137,13 @@ HWTEST_F(CodecHdiJpegTest, HdfCodecHdiDoJpegDecodeTest_002, TestSize.Level1) { ASSERT_TRUE(hdiJpeg_ != nullptr); struct CodecImageBuffer inBuffer; - auto ret = hdiJpeg_->AllocateInBuffer(inBuffer, NORMAL_BUFFER_SIZE); + auto ret = hdiJpeg_->AllocateInBuffer(inBuffer, NORMAL_BUFFER_SIZE, CODEC_IMAGE_JPEG); ASSERT_EQ(ret, HDF_SUCCESS); struct CodecImageBuffer outBuffer; struct CodecJpegDecInfo decInfo; - OHOS::sptr callback; - ret = hdiJpeg_->DoJpegDecode(inBuffer, outBuffer, callback, decInfo); + outBuffer.fenceFd = -1; + ret = hdiJpeg_->DoJpegDecode(inBuffer, outBuffer, decInfo); EXPECT_TRUE(ret != HDF_SUCCESS); ret = hdiJpeg_->FreeInBuffer(inBuffer); ASSERT_EQ(ret, HDF_SUCCESS); @@ -152,35 +153,19 @@ HWTEST_F(CodecHdiJpegTest, HdfCodecHdiDoJpegDecodeTest_003, TestSize.Level1) { ASSERT_TRUE(hdiJpeg_ != nullptr); struct CodecImageBuffer inBuffer; - auto ret = hdiJpeg_->AllocateInBuffer(inBuffer, NORMAL_BUFFER_SIZE); + auto ret = hdiJpeg_->AllocateInBuffer(inBuffer, NORMAL_BUFFER_SIZE, CODEC_IMAGE_JPEG); ASSERT_EQ(ret, HDF_SUCCESS); ASSERT_TRUE(hdiBuffer_ != nullptr); struct CodecImageBuffer outBuffer; InitOutBuffer(outBuffer); + outBuffer.fenceFd = -1; struct CodecJpegDecInfo decInfo; - OHOS::sptr callback; - ret = hdiJpeg_->DoJpegDecode(inBuffer, outBuffer, callback, decInfo); + ret = hdiJpeg_->DoJpegDecode(inBuffer, outBuffer, decInfo); EXPECT_TRUE(ret != HDF_SUCCESS); ret = hdiJpeg_->FreeInBuffer(inBuffer); ASSERT_EQ(ret, HDF_SUCCESS); } -HWTEST_F(CodecHdiJpegTest, HdfCodecHdiDoJpegDecodeTest_004, TestSize.Level1) -{ - ASSERT_TRUE(hdiJpeg_ != nullptr); - struct CodecImageBuffer inBuffer; - auto ret = hdiJpeg_->AllocateInBuffer(inBuffer, NORMAL_BUFFER_SIZE); - ASSERT_EQ(ret, HDF_SUCCESS); - - ASSERT_TRUE(hdiBuffer_ != nullptr); - struct CodecImageBuffer outBuffer; - InitOutBuffer(outBuffer); - - struct CodecJpegDecInfo decInfo; - OHOS::sptr callback = new CodecImageCallback; - ret = hdiJpeg_->DoJpegDecode(inBuffer, outBuffer, callback, decInfo); - EXPECT_TRUE(ret == HDF_SUCCESS); -} -} // namespace +} // namespace \ No newline at end of file diff --git a/hdf/codec/hdi_image/codec_image_callback.cpp b/hdf/codec/hdi_image/codec_image_callback.cpp deleted file mode 100644 index e1de267c..00000000 --- a/hdf/codec/hdi_image/codec_image_callback.cpp +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2023 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "codec_image_callback.h" -#include - -namespace OHOS { -namespace HDI { -namespace Codec { -namespace Image { -namespace V1_0 { -int32_t CodecImageCallback::OnImageEvent(int32_t status) -{ - return HDF_SUCCESS; -} - -} // V1_0 -} // Image -} // Codec -} // HDI -} // OHOS diff --git a/hdf/codec/hdi_image/codec_image_callback.h b/hdf/codec/hdi_image/codec_image_callback.h deleted file mode 100644 index 56755030..00000000 --- a/hdf/codec/hdi_image/codec_image_callback.h +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (c) 2023 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef OHOS_HDI_CODEC_IMAGE_V1_0_CODECIMAGECALLBACK_H -#define OHOS_HDI_CODEC_IMAGE_V1_0_CODECIMAGECALLBACK_H - -#include "v1_0/icodec_image_callback.h" - -namespace OHOS { -namespace HDI { -namespace Codec { -namespace Image { -namespace V1_0 { -class CodecImageCallback : public ICodecImageCallback { -public: - CodecImageCallback() = default; - virtual ~CodecImageCallback() = default; - - int32_t OnImageEvent(int32_t status) override; -}; -} // V1_0 -} // Image -} // Codec -} // HDI -} // OHOS -#endif // OHOS_HDI_CODEC_IMAGE_V1_0_CODECIMAGECALLBACK_H