From 96d552a0388176412e54cb89af279ddd3b661dc2 Mon Sep 17 00:00:00 2001 From: lin_c <1946558487@qq.com> Date: Tue, 19 Aug 2025 08:24:27 +0000 Subject: [PATCH 01/12] update codec/test/unittest/idl_omx/BUILD.gn. Signed-off-by: lin_c <1946558487@qq.com> --- codec/test/unittest/idl_omx/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codec/test/unittest/idl_omx/BUILD.gn b/codec/test/unittest/idl_omx/BUILD.gn index 25b2e8cf9b..03a8ffad75 100644 --- a/codec/test/unittest/idl_omx/BUILD.gn +++ b/codec/test/unittest/idl_omx/BUILD.gn @@ -16,7 +16,7 @@ import("//build/test.gni") import("../../../codec.gni") ohos_unittest("codec_idl_omx_test") { - module_out_path = "drivers_peripheral_codec/drivers_peripheral_codec/codec" + module_out_path = "drivers_peripheral_codec/drivers_peripheral_codec" include_dirs = [ "./", "../../../interfaces/include", -- Gitee From 28e304628564436a48d391e5a8d2720576419f5c Mon Sep 17 00:00:00 2001 From: lin_c <1946558487@qq.com> Date: Tue, 19 Aug 2025 08:23:44 +0000 Subject: [PATCH 02/12] update codec/test/unittest/hdi_image/BUILD.gn. Signed-off-by: lin_c <1946558487@qq.com> --- codec/test/unittest/hdi_image/BUILD.gn | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/codec/test/unittest/hdi_image/BUILD.gn b/codec/test/unittest/hdi_image/BUILD.gn index 487432eb23..43e25f5383 100644 --- a/codec/test/unittest/hdi_image/BUILD.gn +++ b/codec/test/unittest/hdi_image/BUILD.gn @@ -16,7 +16,7 @@ import("//build/test.gni") import("../../../codec.gni") ohos_unittest("codec_hdi_jpeg_test") { - module_out_path = "drivers_peripheral_codec/drivers_peripheral_codec/codec" + module_out_path = "drivers_peripheral_codec/drivers_peripheral_codec" sources = [ "codec_hdi_jpeg_test.cpp" ] @@ -42,7 +42,7 @@ ohos_unittest("codec_hdi_jpeg_test") { } ohos_unittest("codec_hdi_heif_encode_test") { - module_out_path = "drivers_peripheral_codec/drivers_peripheral_codec/codec" + module_out_path = "drivers_peripheral_codec/drivers_peripheral_codec" sources = [ "codec_hdi_heif_encode_test.cpp" ] @@ -74,7 +74,7 @@ ohos_unittest("codec_hdi_heif_encode_test") { } ohos_unittest("codec_hdi_heif_decode_test") { - module_out_path = "drivers_peripheral_codec/codec" + module_out_path = "drivers_peripheral_codec/drivers_peripheral_codec" sources = [ "codec_hdi_heif_decode_test.cpp" ] -- Gitee From a70b300b8ef9ab2a1ab7a2b8adc5b14b9bab491b Mon Sep 17 00:00:00 2001 From: lin_c <1946558487@qq.com> Date: Tue, 19 Aug 2025 08:22:39 +0000 Subject: [PATCH 03/12] update codec/test/benchmarktest/BUILD.gn. Signed-off-by: lin_c <1946558487@qq.com> --- codec/test/benchmarktest/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codec/test/benchmarktest/BUILD.gn b/codec/test/benchmarktest/BUILD.gn index c77a6c953c..add94daa73 100644 --- a/codec/test/benchmarktest/BUILD.gn +++ b/codec/test/benchmarktest/BUILD.gn @@ -16,7 +16,7 @@ import("//build/test.gni") import("../../codec.gni") ohos_benchmarktest("hdf_codec_benchmark_test") { - module_out_path = "drivers_peripheral_codec/codec" + module_out_path = "drivers_peripheral_codec/drivers_peripheral_codec" include_dirs = [ "./include", "../../interfaces/include", -- Gitee From 1ce5ee9a5af1fe79f96170c0ed2ae05088ed08c1 Mon Sep 17 00:00:00 2001 From: Sxs Date: Thu, 21 Aug 2025 02:15:30 +0000 Subject: [PATCH 04/12] codec HDI mutex fix Signed-off-by: lin_c <1946558487@qq.com> --- codec/hal/idl_service/src/component_node.cpp | 28 +++++++++++--------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/codec/hal/idl_service/src/component_node.cpp b/codec/hal/idl_service/src/component_node.cpp index ec2cd275a7..341e5c7ce3 100644 --- a/codec/hal/idl_service/src/component_node.cpp +++ b/codec/hal/idl_service/src/component_node.cpp @@ -438,19 +438,23 @@ int32_t ComponentNode::AllocateBuffer(uint32_t portIndex, OmxCodecBuffer &buffer int32_t ComponentNode::FreeBuffer(uint32_t portIndex, const OmxCodecBuffer &buffer) { - std::unique_lock poolLock(poolMutex_); - uint32_t bufferId = buffer.bufferId; - auto iter = std::find_if(bufferPool_.begin(), bufferPool_.end(), [bufferId, portIndex](const BufferInfo& info) { - return info.bufferId == bufferId && info.portIndex == portIndex; - }); - if (iter == bufferPool_.end()) { - CODEC_LOGE("Can not find buffer, port=%{public}u, id=%{public}u", portIndex, bufferId); - return OMX_ErrorBadParameter; + sptr codecBuffer = nullptr; + { + std::unique_lock poolLock(poolMutex_); + uint32_t bufferId = buffer.bufferId; + auto iter = std::find_if(bufferPool_.begin(), bufferPool_.end(), [bufferId, portIndex](const BufferInfo& info) { + return info.bufferId == bufferId && info.portIndex == portIndex; + }); + if (iter == bufferPool_.end()) { + CODEC_LOGE("Can not find buffer, port=%{public}u, id=%{public}u", portIndex, bufferId); + return OMX_ErrorBadParameter; + } + codecBuffer = iter->icodecBuf; + bufferPool_.erase(iter); + } + if (codecBuffer != nullptr) { + codecBuffer->FreeBuffer(); } - sptr codecBuffer = iter->icodecBuf; - CHECK_AND_RETURN_RET_LOG(codecBuffer != nullptr, OMX_ErrorBadParameter, "codecBuffer is null"); - codecBuffer->FreeBuffer(); - bufferPool_.erase(iter); return 0; } -- Gitee From 7c3d293666f15d28d82f71021061922251975795 Mon Sep 17 00:00:00 2001 From: lin_c <1946558487@qq.com> Date: Thu, 21 Aug 2025 02:39:11 +0000 Subject: [PATCH 05/12] update codec/test/unittest/idl_omx/BUILD.gn. Signed-off-by: lin_c <1946558487@qq.com> --- codec/test/unittest/idl_omx/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codec/test/unittest/idl_omx/BUILD.gn b/codec/test/unittest/idl_omx/BUILD.gn index 03a8ffad75..9ede4c653c 100644 --- a/codec/test/unittest/idl_omx/BUILD.gn +++ b/codec/test/unittest/idl_omx/BUILD.gn @@ -35,7 +35,7 @@ ohos_unittest("codec_idl_omx_test") { "drivers_interface_codec:libcodec_proxy_4.0", "drivers_interface_display:libdisplay_buffer_hdi_impl", "drivers_interface_display:libdisplay_buffer_proxy_1.0", - "drivers_interface_display:libdisplay_composer_hdi_impl_1.2", + "drivers_interface_display:libdisplay_composer_hdi_impl_1.3", "drivers_interface_display:libdisplay_composer_proxy_1.0", "graphic_surface:buffer_handle", "hdf_core:libhdf_host", -- Gitee From 639ba0dc45dddccd60bc671d96718463562e1c8e Mon Sep 17 00:00:00 2001 From: lin_c <1946558487@qq.com> Date: Thu, 21 Aug 2025 02:38:46 +0000 Subject: [PATCH 06/12] update codec/test/unittest/hdi_image/BUILD.gn. Signed-off-by: lin_c <1946558487@qq.com> --- codec/test/unittest/hdi_image/BUILD.gn | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/codec/test/unittest/hdi_image/BUILD.gn b/codec/test/unittest/hdi_image/BUILD.gn index 43e25f5383..115c314340 100644 --- a/codec/test/unittest/hdi_image/BUILD.gn +++ b/codec/test/unittest/hdi_image/BUILD.gn @@ -26,7 +26,7 @@ ohos_unittest("codec_hdi_jpeg_test") { "drivers_interface_codec:libimage_proxy_2.1", "drivers_interface_display:libdisplay_buffer_hdi_impl", "drivers_interface_display:libdisplay_buffer_proxy_1.0", - "drivers_interface_display:libdisplay_composer_hdi_impl_1.2", + "drivers_interface_display:libdisplay_composer_hdi_impl_1.3", "drivers_interface_display:libdisplay_composer_proxy_1.0", "graphic_surface:buffer_handle", "hdf_core:libhdf_host", @@ -56,7 +56,7 @@ ohos_unittest("codec_hdi_heif_encode_test") { "drivers_interface_display:libdisplay_composer_proxy_1.1", "drivers_interface_display:libdisplay_composer_proxy_1.2", "drivers_interface_display:libdisplay_buffer_hdi_impl_v1_2", - "drivers_interface_display:libdisplay_composer_hdi_impl_1.2", + "drivers_interface_display:libdisplay_composer_hdi_impl_1.3", "hdf_core:libhdf_host", "hdf_core:libhdf_ipc_adapter", "hdf_core:libhdf_utils", @@ -88,7 +88,7 @@ ohos_unittest("codec_hdi_heif_decode_test") { "drivers_interface_display:libdisplay_composer_proxy_1.1", "drivers_interface_display:libdisplay_composer_proxy_1.2", "drivers_interface_display:libdisplay_buffer_hdi_impl_v1_2", - "drivers_interface_display:libdisplay_composer_hdi_impl_1.2", + "drivers_interface_display:libdisplay_composer_hdi_impl_1.3", "hdf_core:libhdf_host", "hdf_core:libhdf_ipc_adapter", "hdf_core:libhdf_utils", -- Gitee From 48cf1b7daefa94a956b979fb7571f6b6c8e73c0d Mon Sep 17 00:00:00 2001 From: lin_c <1946558487@qq.com> Date: Thu, 21 Aug 2025 02:38:03 +0000 Subject: [PATCH 07/12] update codec/test/fuzztest/image_fuzzer/imagedoheifencode_fuzzer/BUILD.gn. Signed-off-by: lin_c <1946558487@qq.com> --- .../fuzztest/image_fuzzer/imagedoheifencode_fuzzer/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codec/test/fuzztest/image_fuzzer/imagedoheifencode_fuzzer/BUILD.gn b/codec/test/fuzztest/image_fuzzer/imagedoheifencode_fuzzer/BUILD.gn index e16c6bca86..17d28e17c2 100644 --- a/codec/test/fuzztest/image_fuzzer/imagedoheifencode_fuzzer/BUILD.gn +++ b/codec/test/fuzztest/image_fuzzer/imagedoheifencode_fuzzer/BUILD.gn @@ -35,7 +35,7 @@ ohos_fuzztest("ImageDoHeifEncodeFuzzTest") { "drivers_interface_display:libdisplay_composer_proxy_1.1", "drivers_interface_display:libdisplay_composer_proxy_1.2", "drivers_interface_display:libdisplay_buffer_hdi_impl_v1_2", - "drivers_interface_display:libdisplay_composer_hdi_impl_1.2", + "drivers_interface_display:libdisplay_composer_hdi_impl_1.3", "hdf_core:libhdf_host", "hdf_core:libhdf_ipc_adapter", "hdf_core:libhdf_utils", -- Gitee From dd218d5b93a418ce3e75444f0d942297343721e1 Mon Sep 17 00:00:00 2001 From: lin_c <1946558487@qq.com> Date: Thu, 21 Aug 2025 02:37:05 +0000 Subject: [PATCH 08/12] update codec/test/fuzztest/image_fuzzer/imagedoheifdecode_fuzzer/BUILD.gn. --- .../fuzztest/image_fuzzer/imagedoheifdecode_fuzzer/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codec/test/fuzztest/image_fuzzer/imagedoheifdecode_fuzzer/BUILD.gn b/codec/test/fuzztest/image_fuzzer/imagedoheifdecode_fuzzer/BUILD.gn index 665cef4247..5586f57f64 100644 --- a/codec/test/fuzztest/image_fuzzer/imagedoheifdecode_fuzzer/BUILD.gn +++ b/codec/test/fuzztest/image_fuzzer/imagedoheifdecode_fuzzer/BUILD.gn @@ -35,7 +35,7 @@ ohos_fuzztest("ImageDoHeifDecodeFuzzTest") { "drivers_interface_display:libdisplay_composer_proxy_1.1", "drivers_interface_display:libdisplay_composer_proxy_1.2", "drivers_interface_display:libdisplay_buffer_hdi_impl_v1_2", - "drivers_interface_display:libdisplay_composer_hdi_impl_1.2", + "drivers_interface_display:libdisplay_composer_hdi_impl_1.3", "hdf_core:libhdf_host", "hdf_core:libhdf_ipc_adapter", "hdf_core:libhdf_utils", -- Gitee From 3eb4efd29ff17a1576d921273e927a38d597b687 Mon Sep 17 00:00:00 2001 From: lin_c <1946558487@qq.com> Date: Thu, 21 Aug 2025 02:35:41 +0000 Subject: [PATCH 09/12] update codec/test/demo/jpeg/BUILD.gn. --- codec/test/demo/jpeg/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codec/test/demo/jpeg/BUILD.gn b/codec/test/demo/jpeg/BUILD.gn index 4aa5111327..3dd3a4e6e2 100644 --- a/codec/test/demo/jpeg/BUILD.gn +++ b/codec/test/demo/jpeg/BUILD.gn @@ -33,7 +33,7 @@ ohos_executable("codec_jpeg_decode") { "drivers_interface_codec:libimage_proxy_2.1", "drivers_interface_display:libdisplay_buffer_hdi_impl", "drivers_interface_display:libdisplay_buffer_proxy_1.0", - "drivers_interface_display:libdisplay_composer_hdi_impl_1.2", + "drivers_interface_display:libdisplay_composer_hdi_impl_1.3", "drivers_interface_display:libdisplay_composer_proxy_1.0", "graphic_surface:buffer_handle", "hdf_core:libhdf_host", -- Gitee From d7ee35254fa7bb8ea358b040a0c682c75014b7bc Mon Sep 17 00:00:00 2001 From: lin_c <1946558487@qq.com> Date: Thu, 21 Aug 2025 02:35:15 +0000 Subject: [PATCH 10/12] update codec/test/demo/idl/BUILD.gn. --- codec/test/demo/idl/BUILD.gn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/codec/test/demo/idl/BUILD.gn b/codec/test/demo/idl/BUILD.gn index e09326a0b4..e75bb46ca3 100644 --- a/codec/test/demo/idl/BUILD.gn +++ b/codec/test/demo/idl/BUILD.gn @@ -31,7 +31,7 @@ ohos_executable("codec_idl_omx_decode") { "drivers_interface_codec:libcodec_proxy_4.0", "drivers_interface_display:libdisplay_buffer_hdi_impl", "drivers_interface_display:libdisplay_buffer_proxy_1.0", - "drivers_interface_display:libdisplay_composer_hdi_impl_1.2", + "drivers_interface_display:libdisplay_composer_hdi_impl_1.3", "drivers_interface_display:libdisplay_composer_proxy_1.0", "graphic_surface:buffer_handle", "hdf_core:libhdf_host", @@ -69,7 +69,7 @@ ohos_executable("codec_idl_omx_encode") { "drivers_interface_codec:libcodec_proxy_4.0", "drivers_interface_display:libdisplay_buffer_hdi_impl", "drivers_interface_display:libdisplay_buffer_proxy_1.0", - "drivers_interface_display:libdisplay_composer_hdi_impl_1.2", + "drivers_interface_display:libdisplay_composer_hdi_impl_1.3", "drivers_interface_display:libdisplay_composer_proxy_1.0", "graphic_surface:buffer_handle", "hdf_core:libhdf_host", -- Gitee From 7d2a541062f76ffe1a5d3bf6cd9dbb0309ce48b9 Mon Sep 17 00:00:00 2001 From: lin_c <1946558487@qq.com> Date: Thu, 21 Aug 2025 02:34:09 +0000 Subject: [PATCH 11/12] update codec/test/demo/heif/BUILD.gn. --- codec/test/demo/heif/BUILD.gn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/codec/test/demo/heif/BUILD.gn b/codec/test/demo/heif/BUILD.gn index 962809e7be..0403fff6ad 100644 --- a/codec/test/demo/heif/BUILD.gn +++ b/codec/test/demo/heif/BUILD.gn @@ -33,7 +33,7 @@ ohos_executable("codec_heif_encode") { "drivers_interface_display:libdisplay_composer_proxy_1.1", "drivers_interface_display:libdisplay_composer_proxy_1.2", "drivers_interface_display:libdisplay_buffer_hdi_impl_v1_2", - "drivers_interface_display:libdisplay_composer_hdi_impl_1.2", + "drivers_interface_display:libdisplay_composer_hdi_impl_1.3", "hdf_core:libhdf_host", "hdf_core:libhdf_ipc_adapter", "hdf_core:libhdf_utils", @@ -69,7 +69,7 @@ ohos_executable("codec_heif_decode") { "drivers_interface_display:libdisplay_composer_proxy_1.1", "drivers_interface_display:libdisplay_composer_proxy_1.2", "drivers_interface_display:libdisplay_buffer_hdi_impl_v1_2", - "drivers_interface_display:libdisplay_composer_hdi_impl_1.2", + "drivers_interface_display:libdisplay_composer_hdi_impl_1.3", "drivers_interface_display:libdisplay_commontype_proxy_2.0", "hdf_core:libhdf_host", "hdf_core:libhdf_ipc_adapter", -- Gitee From 3208f5b0239ec0d8e4118a1eba276efb61da02d8 Mon Sep 17 00:00:00 2001 From: lin_c <1946558487@qq.com> Date: Thu, 21 Aug 2025 02:30:59 +0000 Subject: [PATCH 12/12] update codec/test/benchmarktest/BUILD.gn. --- codec/test/benchmarktest/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codec/test/benchmarktest/BUILD.gn b/codec/test/benchmarktest/BUILD.gn index add94daa73..ed3efe732d 100644 --- a/codec/test/benchmarktest/BUILD.gn +++ b/codec/test/benchmarktest/BUILD.gn @@ -33,7 +33,7 @@ ohos_benchmarktest("hdf_codec_benchmark_test") { "drivers_interface_codec:libcodec_proxy_4.0", "drivers_interface_display:libdisplay_buffer_hdi_impl", "drivers_interface_display:libdisplay_buffer_proxy_1.0", - "drivers_interface_display:libdisplay_composer_hdi_impl_1.2", + "drivers_interface_display:libdisplay_composer_hdi_impl_1.3", "drivers_interface_display:libdisplay_composer_proxy_1.0", "graphic_surface:buffer_handle", "hdf_core:libhdf_host", -- Gitee