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

!98 fix distributed camera bug

Browse Source 
Merge pull request !98 from zhuxu/master
This commit is contained in:
openharmony_ci
2022-05-24 12:46:58 +00:00
committed by Gitee
parent d47c229952 f5593f8c4c
commit ee02c8970e
6 changed files with 10 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
camera_hdf/hdi_impl/BUILD.gn
+2 -9
View File
@@ -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",
]
camera_hdf/interfaces/hdi_ipc/client/BUILD.gn
+2 -8
View File
@@ -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",
]
camera_hdf/interfaces/hdi_ipc/config/host/BUILD.gn
+2 -7
View File
@@ -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",
]
camera_hdf/interfaces/hdi_ipc/config/provider/BUILD.gn
+2 -7
View File
@@ -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",
]
camera_hdf/interfaces/hdi_ipc/server/operator/doffline_stream_operator_stub.cpp
+1 -1
View File
@@ -98,7 +98,7 @@ int32_t DOfflineStreamOperatorStub::DOfflineStreamOperatorStubRelease(MessagePar
CamRetCode ret = Release();
if (!reply.WriteInt32(static_cast<int32_t>(ret))) {
DHLOGE("%s: write retcode failed.");
DHLOGE("write retcode failed.");
return HDF_FAILURE;
}
return HDF_SUCCESS;
camera_hdf/interfaces/hdi_ipc/server/operator/dstream_operator_stub.cpp
+1 -1
View File
@@ -336,7 +336,7 @@ int32_t DStreamOperatorStub::DStreamOperatorStubChangeToOfflineStream(MessagePar
OHOS::sptr<IOfflineStreamOperator> offlineOperator = nullptr;
CamRetCode ret = ChangeToOfflineStream(streamIds, spStreamOperatorCallback, offlineOperator);
if (!reply.WriteInt32(static_cast<int32_t>(ret))) {
DHLOGE("%s: write retcode failed.");
DHLOGE("write retcode failed.");
return HDF_FAILURE;
}