From 08af1752fd30ac41bfd4c15fb818c7a597f0d676 Mon Sep 17 00:00:00 2001 From: byndyx Date: Tue, 7 May 2024 11:03:17 +0800 Subject: [PATCH] add i Signed-off-by: byndyx --- common/test/unittest/common/utils/BUILD.gn | 2 +- .../test/sinkfuzztest/sinkservicechannelneg_fuzzer/BUILD.gn | 2 +- .../sinkfuzztest/sinkserviceclosechannel_fuzzer/BUILD.gn | 2 +- .../sinkfuzztest/sinkservicegetcamerainfo_fuzzer/BUILD.gn | 2 +- .../test/sinkfuzztest/sinkserviceinitsink_fuzzer/BUILD.gn | 2 +- .../test/sinkfuzztest/sinkserviceopenchannel_fuzzer/BUILD.gn | 2 +- .../sinkservicepausedistributedhardware_fuzzer/BUILD.gn | 2 +- .../test/sinkfuzztest/sinkservicereleasesink_fuzzer/BUILD.gn | 2 +- .../sinkserviceresumedistributedhardware_fuzzer/BUILD.gn | 2 +- .../test/sinkfuzztest/sinkservicestopcapture_fuzzer/BUILD.gn | 2 +- .../sinkservicestopdistributedhardware_fuzzer/BUILD.gn | 2 +- .../sinkservicesubscribelocalhardware_fuzzer/BUILD.gn | 2 +- .../sinkserviceunsubscribelocalhardware_fuzzer/BUILD.gn | 2 +- .../sourceservicedcameranotify_fuzzer/BUILD.gn | 2 +- .../sourcefuzztest/sourceserviceinitsource_fuzzer/BUILD.gn | 2 +- .../sourceserviceregisterdistributedhardware_fuzzer/BUILD.gn | 2 +- .../sourceservicereleasesource_fuzzer/BUILD.gn | 2 +- .../BUILD.gn | 2 +- .../cameraservice/base/include/dcamera_capture_info_cmd.h | 4 ++-- .../cameraservice/base/include/dcamera_channel_info_cmd.h | 4 ++-- .../base/include/dcamera_metadata_setting_cmd.h | 4 ++-- .../cameraservice/base/test/unittest/common/base/BUILD.gn | 2 +- services/cameraservice/cameraoperator/client/BUILD.gn | 2 +- .../cameraoperator/client/include/icamera_operator.h | 4 ++-- .../cameraservice/cameraoperator/client/test/sample/BUILD.gn | 2 +- .../client/test/unittest/common/cameraoperator/BUILD.gn | 2 +- services/cameraservice/cameraoperator/handler/BUILD.gn | 2 +- .../cameraoperator/handler/include/dcamera_handler.h | 4 ++-- .../handler/test/unittest/common/dcamerahandler/BUILD.gn | 2 +- services/cameraservice/sinkservice/BUILD.gn | 2 +- .../test/unittest/common/distributedcamera/BUILD.gn | 2 +- .../test/unittest/common/distributedcameramgr/BUILD.gn | 2 +- services/cameraservice/sourceservice/BUILD.gn | 2 +- .../include/distributedcameramgr/dcamera_source_dev.h | 4 ++-- .../include/distributedcameramgr/dcamera_source_event.h | 4 ++-- .../dcameracontrol/dcamera_source_controller.h | 2 +- .../dcameradata/dcamera_source_data_process.h | 4 ++-- .../dcameradata/dcamera_source_input_channel_listener.h | 4 ++-- .../dcameradata/dcamera_stream_data_process.h | 4 ++-- .../dcameradata/dcamera_stream_data_process_producer.h | 4 ++-- .../dcamerahdf/dcamera_provider_callback_impl.h | 5 +++-- .../distributedcameramgr/dcamerainterface/icamera_input.h | 4 ++-- .../dcamerainterface/icamera_source_data_process.h | 4 ++-- .../dcamerahdf/dcamera_provider_callback_impl.cpp | 5 +++++ .../test/unittest/common/distributedcamera/BUILD.gn | 2 +- .../test/unittest/common/distributedcameramgr/BUILD.gn | 2 +- .../dcamera_stream_data_process_producer_test.cpp | 2 +- services/channel/test/unittest/common/channel/BUILD.gn | 2 +- test/distributedcameraclienttest/BUILD.gn | 2 +- 49 files changed, 68 insertions(+), 62 deletions(-) diff --git a/common/test/unittest/common/utils/BUILD.gn b/common/test/unittest/common/utils/BUILD.gn index 0ac844ee..57013548 100644 --- a/common/test/unittest/common/utils/BUILD.gn +++ b/common/test/unittest/common/utils/BUILD.gn @@ -55,7 +55,7 @@ ohos_unittest("CommonUtilsTest") { "access_token:libtoken_setproc", "c_utils:utils", "distributed_hardware_fwk:distributedhardwareutils", - "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0", + "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.1", "hdf_core:libhdi", "hilog:libhilog", "safwk:system_ability_fwk", diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicechannelneg_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicechannelneg_fuzzer/BUILD.gn index 2365e6a6..e9e31297 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicechannelneg_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicechannelneg_fuzzer/BUILD.gn @@ -71,7 +71,7 @@ ohos_fuzztest("SinkServiceChannelNegFuzzTest") { "cJSON:cjson", "c_utils:utils", "device_manager:devicemanagersdk", - "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0", + "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.1", "graphic_surface:surface", "hilog:libhilog", "ipc:ipc_core", diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceclosechannel_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceclosechannel_fuzzer/BUILD.gn index 70ab23dd..75054e3e 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceclosechannel_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceclosechannel_fuzzer/BUILD.gn @@ -73,7 +73,7 @@ ohos_fuzztest("SinkServiceCloseChannelFuzzTest") { "c_utils:utils", "device_manager:devicemanagersdk", "distributed_hardware_fwk:distributedhardwareutils", - "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0", + "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.1", "graphic_surface:surface", "hilog:libhilog", "ipc:ipc_core", diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicegetcamerainfo_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicegetcamerainfo_fuzzer/BUILD.gn index f823ef36..c1d8c636 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicegetcamerainfo_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicegetcamerainfo_fuzzer/BUILD.gn @@ -72,7 +72,7 @@ ohos_fuzztest("SinkServiceGetCameraInfoFuzzTest") { "c_utils:utils", "device_manager:devicemanagersdk", "distributed_hardware_fwk:distributedhardwareutils", - "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0", + "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.1", "graphic_surface:surface", "hilog:libhilog", "ipc:ipc_core", diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceinitsink_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceinitsink_fuzzer/BUILD.gn index 3ec44db3..e924c9db 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceinitsink_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceinitsink_fuzzer/BUILD.gn @@ -72,7 +72,7 @@ ohos_fuzztest("SinkServiceInitSinkFuzzTest") { "c_utils:utils", "device_manager:devicemanagersdk", "distributed_hardware_fwk:distributedhardwareutils", - "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0", + "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.1", "graphic_surface:surface", "hilog:libhilog", "ipc:ipc_core", diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceopenchannel_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceopenchannel_fuzzer/BUILD.gn index 4b25de41..3d284340 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceopenchannel_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceopenchannel_fuzzer/BUILD.gn @@ -71,7 +71,7 @@ ohos_fuzztest("SinkServiceOpenChannelFuzzTest") { "cJSON:cjson", "c_utils:utils", "device_manager:devicemanagersdk", - "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0", + "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.1", "graphic_surface:surface", "hilog:libhilog", "ipc:ipc_core", diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicepausedistributedhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicepausedistributedhardware_fuzzer/BUILD.gn index f623f367..24db5a96 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicepausedistributedhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicepausedistributedhardware_fuzzer/BUILD.gn @@ -70,7 +70,7 @@ ohos_fuzztest("SinkServicePauseDistributedHardwareFuzzTest") { "cJSON:cjson", "c_utils:utils", "device_manager:devicemanagersdk", - "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0", + "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.1", "graphic_surface:surface", "hilog:libhilog", "ipc:ipc_core", diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicereleasesink_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicereleasesink_fuzzer/BUILD.gn index 726ddc4a..18b05e21 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicereleasesink_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicereleasesink_fuzzer/BUILD.gn @@ -71,7 +71,7 @@ ohos_fuzztest("SinkServiceReleaseSinkFuzzTest") { "cJSON:cjson", "c_utils:utils", "device_manager:devicemanagersdk", - "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0", + "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.1", "graphic_surface:surface", "hilog:libhilog", "ipc:ipc_core", diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceresumedistributedhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceresumedistributedhardware_fuzzer/BUILD.gn index 83f5dd98..df13b8d9 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceresumedistributedhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceresumedistributedhardware_fuzzer/BUILD.gn @@ -70,7 +70,7 @@ ohos_fuzztest("SinkServiceResumeDistributedHardwareFuzzTest") { "cJSON:cjson", "c_utils:utils", "device_manager:devicemanagersdk", - "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0", + "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.1", "graphic_surface:surface", "hilog:libhilog", "ipc:ipc_core", diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicestopcapture_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicestopcapture_fuzzer/BUILD.gn index eaa3645b..d6aaddc3 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicestopcapture_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicestopcapture_fuzzer/BUILD.gn @@ -72,7 +72,7 @@ ohos_fuzztest("SinkServiceStopCaptureFuzzTest") { "c_utils:utils", "device_manager:devicemanagersdk", "distributed_hardware_fwk:distributedhardwareutils", - "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0", + "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.1", "graphic_surface:surface", "hilog:libhilog", "ipc:ipc_core", diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicestopdistributedhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicestopdistributedhardware_fuzzer/BUILD.gn index 04411a9c..7b655a4b 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicestopdistributedhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicestopdistributedhardware_fuzzer/BUILD.gn @@ -70,7 +70,7 @@ ohos_fuzztest("SinkServiceStopDistributedHardwareFuzzTest") { "cJSON:cjson", "c_utils:utils", "device_manager:devicemanagersdk", - "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0", + "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.1", "graphic_surface:surface", "hilog:libhilog", "ipc:ipc_core", diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicesubscribelocalhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicesubscribelocalhardware_fuzzer/BUILD.gn index c593c5c8..83aab437 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicesubscribelocalhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkservicesubscribelocalhardware_fuzzer/BUILD.gn @@ -71,7 +71,7 @@ ohos_fuzztest("SinkServiceSubscribeLocalHardwareFuzzTest") { "cJSON:cjson", "c_utils:utils", "device_manager:devicemanagersdk", - "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0", + "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.1", "graphic_surface:surface", "hilog:libhilog", "ipc:ipc_core", diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceunsubscribelocalhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceunsubscribelocalhardware_fuzzer/BUILD.gn index 02665353..5de12d63 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceunsubscribelocalhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/sinkserviceunsubscribelocalhardware_fuzzer/BUILD.gn @@ -72,7 +72,7 @@ ohos_fuzztest("SinkServiceUnsubscribeLocalHardwareFuzzTest") { "cJSON:cjson", "c_utils:utils", "device_manager:devicemanagersdk", - "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0", + "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.1", "graphic_surface:surface", "hilog:libhilog", "ipc:ipc_core", diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceservicedcameranotify_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceservicedcameranotify_fuzzer/BUILD.gn index 7c5005bb..362ec6b3 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceservicedcameranotify_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceservicedcameranotify_fuzzer/BUILD.gn @@ -71,7 +71,7 @@ ohos_fuzztest("SourceServiceDCameraNotifyFuzzTest") { external_deps = [ "cJSON:cjson", "c_utils:utils", - "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0", + "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.1", "hilog:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceserviceinitsource_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceserviceinitsource_fuzzer/BUILD.gn index 067bd8e9..ccf77c8a 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceserviceinitsource_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceserviceinitsource_fuzzer/BUILD.gn @@ -72,7 +72,7 @@ ohos_fuzztest("SourceServiceInitSourceFuzzTest") { external_deps = [ "cJSON:cjson", "c_utils:utils", - "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0", + "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.1", "hilog:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceserviceregisterdistributedhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceserviceregisterdistributedhardware_fuzzer/BUILD.gn index d9ff534d..338cd95a 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceserviceregisterdistributedhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceserviceregisterdistributedhardware_fuzzer/BUILD.gn @@ -72,7 +72,7 @@ ohos_fuzztest("SourceServiceRegisterDistributedHardwareFuzzTest") { external_deps = [ "cJSON:cjson", "c_utils:utils", - "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0", + "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.1", "hilog:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceservicereleasesource_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceservicereleasesource_fuzzer/BUILD.gn index 8d342c7d..61586747 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceservicereleasesource_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceservicereleasesource_fuzzer/BUILD.gn @@ -71,7 +71,7 @@ ohos_fuzztest("SourceServiceReleaseSourceFuzzTest") { external_deps = [ "cJSON:cjson", "c_utils:utils", - "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0", + "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.1", "hilog:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceserviceunregisterdistributedhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceserviceunregisterdistributedhardware_fuzzer/BUILD.gn index 2444514b..ed97eb4c 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceserviceunregisterdistributedhardware_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceserviceunregisterdistributedhardware_fuzzer/BUILD.gn @@ -72,7 +72,7 @@ ohos_fuzztest("SourceServiceUnregisterDistributedHardwareFuzzTest") { external_deps = [ "cJSON:cjson", "c_utils:utils", - "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0", + "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.1", "hilog:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/services/cameraservice/base/include/dcamera_capture_info_cmd.h b/services/cameraservice/base/include/dcamera_capture_info_cmd.h index 37b1a53a..5110fe6a 100644 --- a/services/cameraservice/base/include/dcamera_capture_info_cmd.h +++ b/services/cameraservice/base/include/dcamera_capture_info_cmd.h @@ -18,11 +18,11 @@ #include "distributed_camera_constants.h" #include "cJSON.h" -#include "v1_0/dcamera_types.h" +#include "v1_1/dcamera_types.h" namespace OHOS { namespace DistributedHardware { -using namespace OHOS::HDI::DistributedCamera::V1_0; +using namespace OHOS::HDI::DistributedCamera::V1_1; class DCameraCaptureInfo { public: int32_t width_; diff --git a/services/cameraservice/base/include/dcamera_channel_info_cmd.h b/services/cameraservice/base/include/dcamera_channel_info_cmd.h index 316c3aac..07fe054f 100644 --- a/services/cameraservice/base/include/dcamera_channel_info_cmd.h +++ b/services/cameraservice/base/include/dcamera_channel_info_cmd.h @@ -20,11 +20,11 @@ #include #include #include "cJSON.h" -#include "v1_0/dcamera_types.h" +#include "v1_1/dcamera_types.h" namespace OHOS { namespace DistributedHardware { -using namespace OHOS::HDI::DistributedCamera::V1_0; +using namespace OHOS::HDI::DistributedCamera::V1_1; class DCameraChannelDetail { public: DCameraChannelDetail() = default; diff --git a/services/cameraservice/base/include/dcamera_metadata_setting_cmd.h b/services/cameraservice/base/include/dcamera_metadata_setting_cmd.h index acfbcbc1..5b14b8c8 100644 --- a/services/cameraservice/base/include/dcamera_metadata_setting_cmd.h +++ b/services/cameraservice/base/include/dcamera_metadata_setting_cmd.h @@ -16,11 +16,11 @@ #ifndef OHOS_DCAMERA_METADATA_SETTING_H #define OHOS_DCAMERA_METADATA_SETTING_H -#include "v1_0/dcamera_types.h" +#include "v1_1/dcamera_types.h" namespace OHOS { namespace DistributedHardware { -using namespace OHOS::HDI::DistributedCamera::V1_0; +using namespace OHOS::HDI::DistributedCamera::V1_1; class DCameraMetadataSettingCmd { public: std::string type_; diff --git a/services/cameraservice/base/test/unittest/common/base/BUILD.gn b/services/cameraservice/base/test/unittest/common/base/BUILD.gn index e186c911..91e06b71 100755 --- a/services/cameraservice/base/test/unittest/common/base/BUILD.gn +++ b/services/cameraservice/base/test/unittest/common/base/BUILD.gn @@ -63,7 +63,7 @@ ohos_unittest("DCameraServicesBaseTest") { external_deps = [ "cJSON:cjson", "c_utils:utils", - "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0", + "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.1", "dsoftbus:softbus_client", "hilog:libhilog", "ipc:ipc_core", diff --git a/services/cameraservice/cameraoperator/client/BUILD.gn b/services/cameraservice/cameraoperator/client/BUILD.gn index 68123925..8bc8fd95 100644 --- a/services/cameraservice/cameraoperator/client/BUILD.gn +++ b/services/cameraservice/cameraoperator/client/BUILD.gn @@ -70,7 +70,7 @@ ohos_shared_library("distributed_camera_client") { "camera_framework:camera_framework", "drivers_interface_camera:libcamera_proxy_1.0", "drivers_interface_camera:metadata", - "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0", + "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.1", "drivers_peripheral_display:hdi_gralloc_client", "graphic_surface:surface", "hilog:libhilog", diff --git a/services/cameraservice/cameraoperator/client/include/icamera_operator.h b/services/cameraservice/cameraoperator/client/include/icamera_operator.h index 6540a455..6682d041 100644 --- a/services/cameraservice/cameraoperator/client/include/icamera_operator.h +++ b/services/cameraservice/cameraoperator/client/include/icamera_operator.h @@ -24,13 +24,13 @@ #include "data_buffer.h" #include "dcamera_capture_info_cmd.h" #include "dcamera_event_cmd.h" -#include "v1_0/dcamera_types.h" +#include "v1_1/dcamera_types.h" #include "surface.h" namespace OHOS { namespace DistributedHardware { -using namespace OHOS::HDI::DistributedCamera::V1_0; +using namespace OHOS::HDI::DistributedCamera::V1_1; class StateCallback { public: StateCallback() = default; diff --git a/services/cameraservice/cameraoperator/client/test/sample/BUILD.gn b/services/cameraservice/cameraoperator/client/test/sample/BUILD.gn index 2ade878f..f513cb39 100644 --- a/services/cameraservice/cameraoperator/client/test/sample/BUILD.gn +++ b/services/cameraservice/cameraoperator/client/test/sample/BUILD.gn @@ -67,7 +67,7 @@ ohos_executable("dcamera_client_demo") { "c_utils:utils", "camera_framework:camera_framework", "drivers_interface_camera:metadata", - "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0", + "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.1", "drivers_peripheral_display:hdi_gralloc_client", "graphic_surface:surface", "hilog:libhilog", diff --git a/services/cameraservice/cameraoperator/client/test/unittest/common/cameraoperator/BUILD.gn b/services/cameraservice/cameraoperator/client/test/unittest/common/cameraoperator/BUILD.gn index 72ce2636..f8313166 100644 --- a/services/cameraservice/cameraoperator/client/test/unittest/common/cameraoperator/BUILD.gn +++ b/services/cameraservice/cameraoperator/client/test/unittest/common/cameraoperator/BUILD.gn @@ -76,7 +76,7 @@ ohos_unittest("DCameraClientTest") { "c_utils:utils", "drivers_interface_camera:libcamera_proxy_1.0", "drivers_interface_camera:metadata", - "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0", + "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.1", "drivers_peripheral_display:hdi_gralloc_client", "eventhandler:libeventhandler", "graphic_surface:surface", diff --git a/services/cameraservice/cameraoperator/handler/BUILD.gn b/services/cameraservice/cameraoperator/handler/BUILD.gn index a8eba5ba..4e06be49 100644 --- a/services/cameraservice/cameraoperator/handler/BUILD.gn +++ b/services/cameraservice/cameraoperator/handler/BUILD.gn @@ -55,7 +55,7 @@ ohos_shared_library("distributed_camera_handler") { "camera_framework:camera_framework", "distributed_hardware_fwk:distributedhardwareutils", "drivers_interface_camera:metadata", - "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0", + "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.1", "drivers_peripheral_display:hdi_gralloc_client", "graphic_surface:surface", "hilog:libhilog", diff --git a/services/cameraservice/cameraoperator/handler/include/dcamera_handler.h b/services/cameraservice/cameraoperator/handler/include/dcamera_handler.h index 20f7a265..8ce52715 100644 --- a/services/cameraservice/cameraoperator/handler/include/dcamera_handler.h +++ b/services/cameraservice/cameraoperator/handler/include/dcamera_handler.h @@ -25,12 +25,12 @@ #include "camera_manager.h" #include "camera_output_capability.h" #include "single_instance.h" -#include "v1_0/dcamera_types.h" +#include "v1_1/dcamera_types.h" #include "cJSON.h" namespace OHOS { namespace DistributedHardware { -using namespace OHOS::HDI::DistributedCamera::V1_0; +using namespace OHOS::HDI::DistributedCamera::V1_1; class DCameraHandler : public IHardwareHandler { DECLARE_SINGLE_INSTANCE_BASE(DCameraHandler); diff --git a/services/cameraservice/cameraoperator/handler/test/unittest/common/dcamerahandler/BUILD.gn b/services/cameraservice/cameraoperator/handler/test/unittest/common/dcamerahandler/BUILD.gn index 3acd473f..01671fa2 100644 --- a/services/cameraservice/cameraoperator/handler/test/unittest/common/dcamerahandler/BUILD.gn +++ b/services/cameraservice/cameraoperator/handler/test/unittest/common/dcamerahandler/BUILD.gn @@ -63,7 +63,7 @@ ohos_unittest("DCameraHandlerTest") { "cJSON:cjson", "c_utils:utils", "drivers_interface_camera:metadata", - "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0", + "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.1", "drivers_peripheral_display:hdi_gralloc_client", "eventhandler:libeventhandler", "graphic_surface:surface", diff --git a/services/cameraservice/sinkservice/BUILD.gn b/services/cameraservice/sinkservice/BUILD.gn index 9b05c98a..c188529b 100644 --- a/services/cameraservice/sinkservice/BUILD.gn +++ b/services/cameraservice/sinkservice/BUILD.gn @@ -114,7 +114,7 @@ ohos_shared_library("distributed_camera_sink") { "distributed_hardware_fwk:distributed_av_receiver", "distributed_hardware_fwk:distributedhardwareutils", "distributed_hardware_fwk:libdhfwk_sdk", - "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0", + "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.1", "drivers_peripheral_display:hdi_gralloc_client", "eventhandler:libeventhandler", "graphic_surface:surface", diff --git a/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/BUILD.gn b/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/BUILD.gn index 9e531fec..46099eb9 100644 --- a/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/BUILD.gn +++ b/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/BUILD.gn @@ -84,7 +84,7 @@ ohos_unittest("DistributedCameraSinkServiceTest") { "cJSON:cjson", "c_utils:utils", "drivers_interface_camera:metadata", - "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0", + "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.1", "drivers_peripheral_display:hdi_gralloc_client", "dsoftbus:softbus_client", "eventhandler:libeventhandler", diff --git a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/BUILD.gn b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/BUILD.gn index 0e336355..485d4d6e 100644 --- a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/BUILD.gn +++ b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/BUILD.gn @@ -97,7 +97,7 @@ ohos_unittest("DCameraSinkMgrTest") { "device_manager:devicemanagersdk", "distributed_hardware_fwk:distributedhardwareutils", "drivers_interface_camera:metadata", - "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0", + "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.1", "drivers_peripheral_display:hdi_gralloc_client", "dsoftbus:softbus_client", "eventhandler:libeventhandler", diff --git a/services/cameraservice/sourceservice/BUILD.gn b/services/cameraservice/sourceservice/BUILD.gn index fcca268c..e2f01ce9 100644 --- a/services/cameraservice/sourceservice/BUILD.gn +++ b/services/cameraservice/sourceservice/BUILD.gn @@ -122,7 +122,7 @@ ohos_shared_library("distributed_camera_source") { "distributed_hardware_fwk:distributed_av_receiver", "distributed_hardware_fwk:distributedhardwareutils", "distributed_hardware_fwk:libdhfwk_sdk", - "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0", + "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.1", "eventhandler:libeventhandler", "graphic_surface:surface", "hdf_core:libhdi", diff --git a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_dev.h b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_dev.h index 0f9a1d21..4932d549 100644 --- a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_dev.h +++ b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_dev.h @@ -27,8 +27,8 @@ #include "icamera_input.h" #include "idistributed_camera_source.h" -#include "v1_0/id_camera_provider_callback.h" -#include "v1_0/id_camera_provider.h" +#include "v1_1/id_camera_provider_callback.h" +#include "v1_1/id_camera_provider.h" namespace OHOS { namespace DistributedHardware { diff --git a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_event.h b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_event.h index 4664d7ca..a820fc8f 100644 --- a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_event.h +++ b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_event.h @@ -18,14 +18,14 @@ #include -#include "v1_0/dcamera_types.h" +#include "v1_1/dcamera_types.h" #include "dcamera_event_cmd.h" #include "dcamera_index.h" namespace OHOS { namespace DistributedHardware { -using namespace OHOS::HDI::DistributedCamera::V1_0; +using namespace OHOS::HDI::DistributedCamera::V1_1; typedef enum { DCAMERA_EVENT_REGIST = 0, DCAMERA_EVENT_UNREGIST = 1, diff --git a/services/cameraservice/sourceservice/include/distributedcameramgr/dcameracontrol/dcamera_source_controller.h b/services/cameraservice/sourceservice/include/distributedcameramgr/dcameracontrol/dcamera_source_controller.h index 34e74fa6..b46a54f3 100644 --- a/services/cameraservice/sourceservice/include/distributedcameramgr/dcameracontrol/dcamera_source_controller.h +++ b/services/cameraservice/sourceservice/include/distributedcameramgr/dcameracontrol/dcamera_source_controller.h @@ -25,7 +25,7 @@ #include "icamera_channel.h" #include "iremote_object.h" -#include "v1_0/id_camera_provider.h" +#include "v1_1/id_camera_provider.h" namespace OHOS { namespace DistributedHardware { diff --git a/services/cameraservice/sourceservice/include/distributedcameramgr/dcameradata/dcamera_source_data_process.h b/services/cameraservice/sourceservice/include/distributedcameramgr/dcameradata/dcamera_source_data_process.h index e04e54a7..c92b3c17 100644 --- a/services/cameraservice/sourceservice/include/distributedcameramgr/dcameradata/dcamera_source_data_process.h +++ b/services/cameraservice/sourceservice/include/distributedcameramgr/dcameradata/dcamera_source_data_process.h @@ -23,11 +23,11 @@ #include "dcamera_stream_data_process.h" #include "icamera_source_data_process.h" -#include "v1_0/dcamera_types.h" +#include "v1_1/dcamera_types.h" namespace OHOS { namespace DistributedHardware { -using namespace OHOS::HDI::DistributedCamera::V1_0; +using namespace OHOS::HDI::DistributedCamera::V1_1; class DCameraSourceDataProcess : public ICameraSourceDataProcess { public: DCameraSourceDataProcess(std::string devId, std::string dhId, DCStreamType streamType); diff --git a/services/cameraservice/sourceservice/include/distributedcameramgr/dcameradata/dcamera_source_input_channel_listener.h b/services/cameraservice/sourceservice/include/distributedcameramgr/dcameradata/dcamera_source_input_channel_listener.h index 83090424..5c74d24f 100644 --- a/services/cameraservice/sourceservice/include/distributedcameramgr/dcameradata/dcamera_source_input_channel_listener.h +++ b/services/cameraservice/sourceservice/include/distributedcameramgr/dcameradata/dcamera_source_input_channel_listener.h @@ -19,11 +19,11 @@ #include #include "icamera_channel_listener.h" -#include "v1_0/dcamera_types.h" +#include "v1_1/dcamera_types.h" namespace OHOS { namespace DistributedHardware { -using namespace OHOS::HDI::DistributedCamera::V1_0; +using namespace OHOS::HDI::DistributedCamera::V1_1; class DCameraSourceInput; class DCameraSourceInputChannelListener : public ICameraChannelListener { public: diff --git a/services/cameraservice/sourceservice/include/distributedcameramgr/dcameradata/dcamera_stream_data_process.h b/services/cameraservice/sourceservice/include/distributedcameramgr/dcameradata/dcamera_stream_data_process.h index eb1ef082..8be56c23 100644 --- a/services/cameraservice/sourceservice/include/distributedcameramgr/dcameradata/dcamera_stream_data_process.h +++ b/services/cameraservice/sourceservice/include/distributedcameramgr/dcameradata/dcamera_stream_data_process.h @@ -23,13 +23,13 @@ #include "icamera_source_data_process.h" #include "idata_process_pipeline.h" #include "image_common_type.h" -#include "v1_0/dcamera_types.h" +#include "v1_1/dcamera_types.h" #include "dcamera_stream_data_process_producer.h" namespace OHOS { namespace DistributedHardware { -using namespace OHOS::HDI::DistributedCamera::V1_0; +using namespace OHOS::HDI::DistributedCamera::V1_1; class DCameraStreamDataProcess : public std::enable_shared_from_this { public: DCameraStreamDataProcess(std::string devId, std::string dhId, DCStreamType streamType); diff --git a/services/cameraservice/sourceservice/include/distributedcameramgr/dcameradata/dcamera_stream_data_process_producer.h b/services/cameraservice/sourceservice/include/distributedcameramgr/dcameradata/dcamera_stream_data_process_producer.h index d485dfe9..6a45d1d3 100644 --- a/services/cameraservice/sourceservice/include/distributedcameramgr/dcameradata/dcamera_stream_data_process_producer.h +++ b/services/cameraservice/sourceservice/include/distributedcameramgr/dcameradata/dcamera_stream_data_process_producer.h @@ -24,12 +24,12 @@ #include "data_buffer.h" #include "event_handler.h" -#include "v1_0/id_camera_provider.h" +#include "v1_1/id_camera_provider.h" #include "dcamera_feeding_smoother.h" namespace OHOS { namespace DistributedHardware { -using namespace OHOS::HDI::DistributedCamera::V1_0; +using namespace OHOS::HDI::DistributedCamera::V1_1; class DCameraStreamDataProcessProducer : public IFeedableDataProducer, public std::enable_shared_from_this { public: diff --git a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerahdf/dcamera_provider_callback_impl.h b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerahdf/dcamera_provider_callback_impl.h index 6cdc6535..2a7dc353 100644 --- a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerahdf/dcamera_provider_callback_impl.h +++ b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerahdf/dcamera_provider_callback_impl.h @@ -16,11 +16,11 @@ #ifndef OHOS_DCAMERA_PROVIDER_CALLBACK_IMPL_H #define OHOS_DCAMERA_PROVIDER_CALLBACK_IMPL_H -#include "v1_0/id_camera_provider_callback.h" +#include "v1_1/id_camera_provider_callback.h" namespace OHOS { namespace DistributedHardware { -using namespace OHOS::HDI::DistributedCamera::V1_0; +using namespace OHOS::HDI::DistributedCamera::V1_1; class DCameraSourceDev; class DCameraProviderCallbackImpl : public IDCameraProviderCallback { public: @@ -34,6 +34,7 @@ public: int32_t StartCapture(const DHBase& dhBase, const std::vector& captureInfos) override; int32_t StopCapture(const DHBase& dhBase, const std::vector& streamIds) override; int32_t UpdateSettings(const DHBase& dhBase, const std::vector& settings) override; + int32_t NotifyEvent(const DHBase& dhBase, const DCameraHDFEvent& event) override; private: bool CheckDHBase(const DHBase& dhBase); diff --git a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerainterface/icamera_input.h b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerainterface/icamera_input.h index 516b32df..8d4e8051 100644 --- a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerainterface/icamera_input.h +++ b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerainterface/icamera_input.h @@ -16,11 +16,11 @@ #ifndef OHOS_ICAMERA_INPUT_H #define OHOS_ICAMERA_INPUT_H -#include "v1_0/dcamera_types.h" +#include "v1_1/dcamera_types.h" namespace OHOS { namespace DistributedHardware { -using namespace OHOS::HDI::DistributedCamera::V1_0; +using namespace OHOS::HDI::DistributedCamera::V1_1; class ICameraInput { public: virtual ~ICameraInput() = default; diff --git a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerainterface/icamera_source_data_process.h b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerainterface/icamera_source_data_process.h index 1359dbab..84e5182e 100644 --- a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerainterface/icamera_source_data_process.h +++ b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerainterface/icamera_source_data_process.h @@ -19,11 +19,11 @@ #include #include "data_buffer.h" -#include "v1_0/dcamera_types.h" +#include "v1_1/dcamera_types.h" namespace OHOS { namespace DistributedHardware { -using namespace OHOS::HDI::DistributedCamera::V1_0; +using namespace OHOS::HDI::DistributedCamera::V1_1; class DCameraStreamConfig { public: DCameraStreamConfig(int32_t width, int32_t height, int32_t format, int32_t dataspace, diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerahdf/dcamera_provider_callback_impl.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerahdf/dcamera_provider_callback_impl.cpp index 045471f1..1bdc3bb4 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerahdf/dcamera_provider_callback_impl.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerahdf/dcamera_provider_callback_impl.cpp @@ -298,5 +298,10 @@ int32_t DCameraProviderCallbackImpl::UpdateSettings(const DHBase& dhBase, const } return SUCCESS; } + +int32_t DCameraProviderCallbackImpl::NotifyEvent(const DHBase& dhBase, const DCameraHDFEvent& event) +{ + return SUCCESS; +} } // namespace DistributedHardware } // namespace OHOS diff --git a/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/BUILD.gn b/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/BUILD.gn index 3a82dc54..c6404b98 100644 --- a/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/BUILD.gn +++ b/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/BUILD.gn @@ -81,7 +81,7 @@ ohos_unittest("DCameraSourceTest") { "access_token:libtoken_setproc", "cJSON:cjson", "c_utils:utils", - "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0", + "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.1", "dsoftbus:softbus_client", "eventhandler:libeventhandler", "graphic_surface:surface", diff --git a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/BUILD.gn b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/BUILD.gn index cabed97f..a9a72215 100644 --- a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/BUILD.gn +++ b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/BUILD.gn @@ -93,7 +93,7 @@ ohos_unittest("DCameraSourceMgrTest") { "access_token:libtoken_setproc", "cJSON:cjson", "c_utils:utils", - "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0", + "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.1", "dsoftbus:softbus_client", "eventhandler:libeventhandler", "graphic_surface:surface", diff --git a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_stream_data_process_producer_test.cpp b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_stream_data_process_producer_test.cpp index 55175850..9506f0b1 100644 --- a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_stream_data_process_producer_test.cpp +++ b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_stream_data_process_producer_test.cpp @@ -24,7 +24,7 @@ #include "distributed_camera_constants.h" #include "distributed_camera_errno.h" #include "distributed_hardware_log.h" -#include "v1_0/dcamera_types.h" +#include "v1_1/dcamera_types.h" using namespace testing::ext; diff --git a/services/channel/test/unittest/common/channel/BUILD.gn b/services/channel/test/unittest/common/channel/BUILD.gn index 244fff27..511e05f0 100644 --- a/services/channel/test/unittest/common/channel/BUILD.gn +++ b/services/channel/test/unittest/common/channel/BUILD.gn @@ -83,7 +83,7 @@ ohos_unittest("DCameraChannelTest") { external_deps = [ "cJSON:cjson", "c_utils:utils", - "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0", + "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.1", "eventhandler:libeventhandler", "graphic_surface:surface", "hdf_core:libhdi", diff --git a/test/distributedcameraclienttest/BUILD.gn b/test/distributedcameraclienttest/BUILD.gn index dad88a87..5d4125db 100644 --- a/test/distributedcameraclienttest/BUILD.gn +++ b/test/distributedcameraclienttest/BUILD.gn @@ -63,7 +63,7 @@ ohos_moduletest_suite("SubDctsdisCameraClientTest") { "camera_framework:camera_framework", "distributed_hardware_fwk:libdhfwk_sdk", "drivers_interface_camera:metadata", - "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0", + "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.1", "graphic_surface:surface", "hilog:libhilog", "ipc:ipc_core", -- Gitee