From 7517ad419ef55194441ffcb1b5854ff0d2aa7060 Mon Sep 17 00:00:00 2001 From: zhuxu Date: Mon, 23 May 2022 15:51:52 +0800 Subject: [PATCH] fix distributed camera bug Signed-off-by: zhuxu --- camera_hdf/hdi_impl/BUILD.gn | 11 ++--------- camera_hdf/interfaces/hdi_ipc/client/BUILD.gn | 10 ++-------- camera_hdf/interfaces/hdi_ipc/config/host/BUILD.gn | 9 ++------- .../interfaces/hdi_ipc/config/provider/BUILD.gn | 9 ++------- .../server/operator/doffline_stream_operator_stub.cpp | 2 +- .../hdi_ipc/server/operator/dstream_operator_stub.cpp | 2 +- 6 files changed, 10 insertions(+), 33 deletions(-) diff --git a/camera_hdf/hdi_impl/BUILD.gn b/camera_hdf/hdi_impl/BUILD.gn index bd015647..7441c1b7 100644 --- a/camera_hdf/hdi_impl/BUILD.gn +++ b/camera_hdf/hdi_impl/BUILD.gn @@ -46,14 +46,7 @@ ohos_shared_library("distributed_camera_hdf") { "${hdf_uhdf_path}/ipc/include", "${hdf_uhdf_path}/include/host", "//third_party/jsoncpp/include", - - #producer - "//foundation/graphic/graphic/frameworks/surface/include", - "//foundation/graphic/graphic/interfaces/kits/surface", - "//foundation/graphic/graphic/utils/buffer_handle/export", - "//foundation/communication/ipc/ipc/native/src/core/include", "//drivers/peripheral/camera/interfaces/metadata/include", - "${camera_hdf_path}/camera/interfaces/include", "${camera_hdf_path}/camera/interfaces/hdi_ipc", ] @@ -85,8 +78,6 @@ ohos_shared_library("distributed_camera_hdf") { "${fwk_utils_path}:distributedhardwareutils", "//drivers/adapter/uhdf2/ipc:libhdf_ipc_adapter", "//drivers/peripheral/camera/interfaces/metadata:metadata", - "//drivers/peripheral/display/hal:hdi_display_gralloc", - "//foundation/graphic/graphic/frameworks/surface:surface", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utils", ] @@ -98,6 +89,8 @@ ohos_shared_library("distributed_camera_hdf") { ] external_deps = [ + "graphic_chipsetsdk:buffer_handle", + "graphic_chipsetsdk:surface", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_single", ] diff --git a/camera_hdf/interfaces/hdi_ipc/client/BUILD.gn b/camera_hdf/interfaces/hdi_ipc/client/BUILD.gn index 12ae6f5e..0c472f44 100644 --- a/camera_hdf/interfaces/hdi_ipc/client/BUILD.gn +++ b/camera_hdf/interfaces/hdi_ipc/client/BUILD.gn @@ -32,12 +32,6 @@ ohos_shared_library("distributed_camera_hdf_client") { "${hdf_uhdf_path}/include/hdi", "${hdf_uhdf_path}/osal/include", "//drivers/peripheral/base", - - #producer - "//foundation/graphic/graphic/frameworks/surface/include", - "//foundation/graphic/graphic/interfaces/kits/surface", - "//foundation/graphic/graphic/utils/include", - "//foundation/communication/ipc/ipc/native/src/core/include", "//drivers/peripheral/camera/interfaces/metadata/include", ] @@ -70,8 +64,6 @@ ohos_shared_library("distributed_camera_hdf_client") { "${fwk_utils_path}:distributedhardwareutils", "${hdf_uhdf_path}/hdi:libhdi", "//drivers/peripheral/camera/interfaces/metadata:metadata", - "//drivers/peripheral/display/hal:hdi_display_gralloc", - "//foundation/graphic/graphic/frameworks/surface:surface", "//utils/native/base:utils", ] @@ -82,6 +74,8 @@ ohos_shared_library("distributed_camera_hdf_client") { ] external_deps = [ + "graphic_chipsetsdk:buffer_handle", + "graphic_chipsetsdk:surface", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_single", ] diff --git a/camera_hdf/interfaces/hdi_ipc/config/host/BUILD.gn b/camera_hdf/interfaces/hdi_ipc/config/host/BUILD.gn index 96727ff3..58ab3a17 100644 --- a/camera_hdf/interfaces/hdi_ipc/config/host/BUILD.gn +++ b/camera_hdf/interfaces/hdi_ipc/config/host/BUILD.gn @@ -38,12 +38,6 @@ ohos_shared_library("distributed_camera_host_config") { "${hdf_uhdf_path}/osal/include", "${hdf_uhdf_path}/ipc/include", "${hdf_uhdf_path}/include/host", - - #producer - "//foundation/graphic/graphic/frameworks/surface/include", - "//foundation/graphic/graphic/interfaces/kits/surface", - "//foundation/graphic/graphic/utils/include", - "//foundation/communication/ipc/ipc/native/src/core/include", "//drivers/peripheral/camera/interfaces/metadata/include", ] @@ -51,7 +45,6 @@ ohos_shared_library("distributed_camera_host_config") { deps = [ "${distributedcamera_hdf_path}/hdi_impl:distributed_camera_hdf", - "//foundation/graphic/graphic/frameworks/surface:surface", "//utils/native/base:utils", ] @@ -63,6 +56,8 @@ ohos_shared_library("distributed_camera_host_config") { external_deps = [ "device_driver_framework:libhdf_host", + "graphic_chipsetsdk:buffer_handle", + "graphic_chipsetsdk:surface", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_single", ] diff --git a/camera_hdf/interfaces/hdi_ipc/config/provider/BUILD.gn b/camera_hdf/interfaces/hdi_ipc/config/provider/BUILD.gn index 0cc9dbdd..b1b08882 100644 --- a/camera_hdf/interfaces/hdi_ipc/config/provider/BUILD.gn +++ b/camera_hdf/interfaces/hdi_ipc/config/provider/BUILD.gn @@ -33,12 +33,6 @@ ohos_shared_library("distributed_camera_provider_config") { "${hdf_uhdf_path}/osal/include", "${hdf_uhdf_path}/ipc/include", "${hdf_uhdf_path}/include/host", - - #producer - "//foundation/graphic/graphic/frameworks/surface/include", - "//foundation/graphic/graphic/interfaces/kits/surface", - "//foundation/graphic/graphic/utils/include", - "//foundation/communication/ipc/ipc/native/src/core/include", "//drivers/peripheral/camera/interfaces/metadata/include", ] @@ -46,7 +40,6 @@ ohos_shared_library("distributed_camera_provider_config") { deps = [ "${distributedcamera_hdf_path}/hdi_impl:distributed_camera_hdf", - "//foundation/graphic/graphic/frameworks/surface:surface", "//utils/native/base:utils", ] @@ -58,6 +51,8 @@ ohos_shared_library("distributed_camera_provider_config") { external_deps = [ "device_driver_framework:libhdf_host", + "graphic_chipsetsdk:buffer_handle", + "graphic_chipsetsdk:surface", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_single", ] diff --git a/camera_hdf/interfaces/hdi_ipc/server/operator/doffline_stream_operator_stub.cpp b/camera_hdf/interfaces/hdi_ipc/server/operator/doffline_stream_operator_stub.cpp index a7c5e8f4..1f953093 100644 --- a/camera_hdf/interfaces/hdi_ipc/server/operator/doffline_stream_operator_stub.cpp +++ b/camera_hdf/interfaces/hdi_ipc/server/operator/doffline_stream_operator_stub.cpp @@ -98,7 +98,7 @@ int32_t DOfflineStreamOperatorStub::DOfflineStreamOperatorStubRelease(MessagePar CamRetCode ret = Release(); if (!reply.WriteInt32(static_cast(ret))) { - DHLOGE("%s: write retcode failed."); + DHLOGE("write retcode failed."); return HDF_FAILURE; } return HDF_SUCCESS; diff --git a/camera_hdf/interfaces/hdi_ipc/server/operator/dstream_operator_stub.cpp b/camera_hdf/interfaces/hdi_ipc/server/operator/dstream_operator_stub.cpp index 284af701..c3aa1f5a 100644 --- a/camera_hdf/interfaces/hdi_ipc/server/operator/dstream_operator_stub.cpp +++ b/camera_hdf/interfaces/hdi_ipc/server/operator/dstream_operator_stub.cpp @@ -336,7 +336,7 @@ int32_t DStreamOperatorStub::DStreamOperatorStubChangeToOfflineStream(MessagePar OHOS::sptr offlineOperator = nullptr; CamRetCode ret = ChangeToOfflineStream(streamIds, spStreamOperatorCallback, offlineOperator); if (!reply.WriteInt32(static_cast(ret))) { - DHLOGE("%s: write retcode failed."); + DHLOGE("write retcode failed."); return HDF_FAILURE; } -- Gitee