diff --git a/common/test/unittest/common/utils/BUILD.gn b/common/test/unittest/common/utils/BUILD.gn index 0ac844eebf02453d7e2ab5cee83c9098a0f91add..570135486fc9ef98a6b0cb12a9d70ace9e33e682 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 2365e6a60cb8843e67920cc40002bc162eae0a7d..e9e3129771f6dff15ac0fa74a56a8cbaf24ad02f 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 70ab23ddea5c8bd5a284e709b17a8b49579e22e2..75054e3e7d99968df764a995c2af9e9f818eabde 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 f823ef369f1c9c4de4b4daa2a8f78d287084acc7..c1d8c636606ae6d4b5bed5b8e149c221adb66f80 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 3ec44db3e0cbadf553419e5141eb0ad77935fd44..e924c9db5f4b0edebd8933effdcdbbfd51c0349a 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 4b25de41883f313f0e004dbf7375e38ff97a3278..3d2843400e8c289bcde427b975e036a2f3ff4f14 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 f623f3679ee1f90ae5bb29b4e161c87801b97f00..24db5a9688b261bbfa9938c362a8e2c3509b11b4 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 726ddc4a33f11e5160945f930d4d4d7f0e5ff1c7..18b05e21341ba9835b91f82753106c7c96c96c02 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 83f5dd98288ae71606cc9601e0db5e3debaf41c9..df13b8d9caaa84eaee518556446fd0cb928a8cab 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 eaa3645b617f48f813816c2aec7d6def1468bc7f..d6aaddc3a28b3e6701bcb138965365fde3916846 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 04411a9c80f5465f1966bd8d52ab2367945bc488..7b655a4bc33bc57dd58c1efff6e1a532b9b77f75 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 c593c5c831b37d888171a7fc5cb4c00ba6b8a518..83aab437cd5bde7411c67ebb55959b985b7e524e 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 0266535388a39609298b24cb2da8e58f06994fa8..5de12d6308cebb3cd59fb67b563a9ca1c93f3322 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 7c5005bb1949da4254ce798ad747b9e338d703e5..362ec6b3efeb816c8f907aa2ff53b273e5452dd0 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 067bd8e9fb662f1f478a80832113f032454bab2b..ccf77c8a790ac9b7081e751e6c0ae63a052e0836 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 d9ff534d3d022a1ba49472d8de44c0ee9a88abb2..338cd95aadd75bf662c1e085f4e35569c1c1985c 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 8d342c7d0993a9832b713ce5c90d64cc3d24b984..61586747aab765ae85cc11543494c667e50912b7 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 2444514bca3018c2c3bcce3bd61f83ce0b833438..ed97eb4cad2f509b15124eef400e6b3526b52dab 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 37b1a53a5cdc405ba902601202715a12132c8164..5110fe6adfded4de3c911c070735e082626368fa 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 316c3aacbbf4267ed77a916e49a5609fbb1bef44..07fe054f5cc8b61061553aed4556fc5f347d7c43 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 acfbcbc12be7584d3188c3e85c16507f2714d37b..5b14b8c83843fb3545b7b319b92bcc690859c611 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 e186c91122d0078e71280ba77a102de9f1e3a7f3..91e06b71ce9d7a680a1d3cafe6464c8c13f4594d 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 6812392558c9799b58e65d02e56d0a688ec0cad8..8bc8fd95ba64ad49b6373a85ec7f3f9cd363eca8 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 6540a455638dc4f588bb48eee3988e9e1786cd78..6682d0415dee1b6c08b140e50ad679a01d8207a9 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 2ade878fd9745a34c006d0885b1f63ee9c66597c..f513cb39e8a6e4a3ad1009191ea2072aeb9489d7 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 72ce2636c8f9e7ae6864d4852c23e186d2361aad..f8313166646212c072a9cb2589cbf2a6acfa2a08 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 a8eba5ba0ed904afb6dfbe74d17baa631732ddff..4e06be49e265201a430dfdd0255a72e44c681cec 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 20f7a265bb865f168021144490f71361e3f822c4..8ce5271549ad67b797cf9f86ad9b39b6e4bba11c 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 3acd473ff7db7933460edc60c58eac4b3aac8966..01671fa2d010d08ef803144d7b8e03389ce5a7b5 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 9b05c98a5a1e47974e4b21cad6864c488844491b..c188529b1c700157f44b526eda3862e37c61bc1b 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 9e531fecc27636ee4103dc783b172366e3e12cbd..46099eb989b822510b8272e83ddd9dddd2b18f70 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 0e3363556a9301c8bba7899ef1de1178d54ad71c..485d4d6ef0fb6efc83d9409cec0f280b7903b86d 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 fcca268c6ef7e3844bb7bdeb55ab818491b01949..e2f01ce9032adf72a93203d9988757bf4b58e99a 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 0f9a1d2120800555de5eb8dd7dc8a3ed0f99eb8f..4932d54989aabcc672ae38392d0b86ef8224b2f5 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 4664d7ca188db14c41a2ec837351fa86682d85fa..a820fc8f1df4d107587cb8dacd5fe827dca33edb 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 34e74fa6a9cec14ae01d26e63fd9afd39eb18ddd..b46a54f325bc5ae3b779bde11b82dd221df124c3 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 e04e54a741e77c55f0d763c65cbc9dd5a5d61f5f..c92b3c17315f5922901d760494c9019c16b6bc19 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 83090424d34eb5467c3acdcb4be8859dcd6a4665..5c74d24f77eae0700b03ae131f2b7b9f54b49461 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 eb1ef0824e16a3ffa2c2e80c5f3de04af9ef3899..8be56c23c4ef74b7969087937ec0b83f8b40a144 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 d485dfe9d8708144ecb9fbd1381af1d3b4f8dc31..6a45d1d3356a96b4d03235fdbd589c8eee446962 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 6cdc653583b740c2c8171a568ba82c11b93c5190..2a7dc353ee8f4f6b28ae8f911090b41c96c193d0 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 516b32df9511efce1013be9d838afa8e094fc261..8d4e80516c9c8357bc0cc59bc30e5aa19a84f867 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 1359dbab7572ac1d05af1ea67139b7a9a886c613..84e5182eccee078af634533239c32727efa57b45 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 045471f1bd3aeb0f5ac083c36bb41e19b179669b..1bdc3bb41cd91d8c89f1908e3ff68e951692567c 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 3a82dc54079ddf370d93f2fca24fb257d0166940..c6404b98b1b58efe5acf1135378fcefabcacf325 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 cabed97fba5dfe26ac0d12d5a353b402dc47ad41..a9a72215ac531fe011059c8cdfe7a8c7b156062c 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 551758506195430f6e219b527f35fc4f1ea5f38c..9506f0b14f45d09906b054875cb0d3a9c71e30f5 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 244fff2760f0b933c4003cc8073bc37344fc210b..511e05f01e94fd21d1387c5fef592b2940b22a0d 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 dad88a87674caf4ddf5a68e0aa73792cc8f2971a..5d4125db065d92f3a79ae297fca63826b28eafcd 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",