diff --git a/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_handler.cpp b/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_handler.cpp index 8559b00208de795a45f48d1ab9b54146fb30b06d..cb66085f456149535c027200442ba88b78708908 100644 --- a/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_handler.cpp +++ b/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_handler.cpp @@ -141,7 +141,7 @@ int32_t DCameraSourceHandler::RegisterDistributedHardware(const std::string& dev callback_->PopRegCallback(reqId); } DHLOGI("end, ret: %d devId: %s dhId: %s version: %s", - ret, GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str(), param.version.c_str()); + ret, GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str(), param.sinkVersion.c_str()); return ret; } diff --git a/interfaces/inner_kits/native_cpp/camera_source/src/distributed_camera_source_proxy.cpp b/interfaces/inner_kits/native_cpp/camera_source/src/distributed_camera_source_proxy.cpp index 7204e28ee1891bfe238e826fd5735fe70a287026..eab9d98eb9dce690822a7b6b61983edc3d6644c4 100644 --- a/interfaces/inner_kits/native_cpp/camera_source/src/distributed_camera_source_proxy.cpp +++ b/interfaces/inner_kits/native_cpp/camera_source/src/distributed_camera_source_proxy.cpp @@ -103,7 +103,8 @@ int32_t DistributedCameraSourceProxy::RegisterDistributedHardware(const std::str } if (!data.WriteString(devId) || !data.WriteString(dhId) || !data.WriteString(reqId) || - !data.WriteString(param.version) || !data.WriteString(param.attrs)) { + !data.WriteString(param.sinkVersion) || !data.WriteString(param.sinkAttrs) || + !data.WriteString(param.sourceVersion) || !data.WriteString(param.sourceAttrs)) { DHLOGE("write params failed"); return DCAMERA_BAD_VALUE; } @@ -126,8 +127,10 @@ bool DistributedCameraSourceProxy::CheckRegParams(const std::string& devId, cons return false; } - if (param.version.empty() || param.version.size() > PARAM_MAX_SIZE || - param.attrs.empty() || param.attrs.size() > PARAM_MAX_SIZE) { + if (param.sinkVersion.empty() || param.sinkVersion.size() > PARAM_MAX_SIZE || + param.sinkAttrs.empty() || param.sinkAttrs.size() > PARAM_MAX_SIZE || + param.sourceVersion.empty() || param.sourceVersion.size() > PARAM_MAX_SIZE || + param.sourceAttrs.empty() || param.sourceAttrs.size() > PARAM_MAX_SIZE) { DHLOGE("param is invalid"); return false; } diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourcehandlerregisterdistributedhardware_fuzzer/sourcehandlerregisterdistributedhardware_fuzzer.cpp b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourcehandlerregisterdistributedhardware_fuzzer/sourcehandlerregisterdistributedhardware_fuzzer.cpp index 94359021c5ee0a9dd057d42e99c1b09920b3348c..466475da69aeaad3d129c069689bbe6b640498ac 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourcehandlerregisterdistributedhardware_fuzzer/sourcehandlerregisterdistributedhardware_fuzzer.cpp +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourcehandlerregisterdistributedhardware_fuzzer/sourcehandlerregisterdistributedhardware_fuzzer.cpp @@ -34,11 +34,15 @@ void SourceHandlerRegisterDistributedHardwareFuzzTest(const uint8_t* data, size_ } std::string devId(reinterpret_cast(data), size); std::string dhId(reinterpret_cast(data), size); - std::string version(reinterpret_cast(data), size); - std::string attrs(reinterpret_cast(data), size); + std::string sourceVersion(reinterpret_cast(data), size); + std::string sourceAttrs(reinterpret_cast(data), size); + std::string sinkVersion(reinterpret_cast(data), size); + std::string sinkAttrs(reinterpret_cast(data), size); EnableParam param; - param.version = version; - param.attrs = attrs; + param.sourceVersion = sourceVersion; + param.sourceAttrs = sourceAttrs; + param.sinkVersion = sinkVersion; + param.sinkAttrs = sinkAttrs; std::shared_ptr callback = std::make_shared(); DCameraSourceHandler::GetInstance().RegisterDistributedHardware(devId, dhId, param, callback); diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceproxyregisterdistributedhardware_fuzzer/sourceproxyregisterdistributedhardware_fuzzer.cpp b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceproxyregisterdistributedhardware_fuzzer/sourceproxyregisterdistributedhardware_fuzzer.cpp index 54e321e71a14b882d402f591f877775cd4b8e4cb..e04c84d8c7515411c956b318aaabcc051253f2e8 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceproxyregisterdistributedhardware_fuzzer/sourceproxyregisterdistributedhardware_fuzzer.cpp +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceproxyregisterdistributedhardware_fuzzer/sourceproxyregisterdistributedhardware_fuzzer.cpp @@ -32,11 +32,15 @@ void SourceProxyRegisterDistributedHardwareFuzzTest(const uint8_t* data, size_t std::string dhId(reinterpret_cast(data), size); std::string devId(reinterpret_cast(data), size); std::string reqId(reinterpret_cast(data), size); - std::string version(reinterpret_cast(data), size); - std::string attrs(reinterpret_cast(data), size); + std::string sourceVersion(reinterpret_cast(data), size); + std::string sourceAttrs(reinterpret_cast(data), size); + std::string sinkVersion(reinterpret_cast(data), size); + std::string sinkAttrs(reinterpret_cast(data), size); EnableParam param; - param.version = version; - param.attrs = attrs; + param.sourceVersion = sourceVersion; + param.sourceAttrs = sourceAttrs; + param.sinkVersion = sinkVersion; + param.sinkAttrs = sinkAttrs; sptr samgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceserviceregisterdistributedhardware_fuzzer/sourceserviceregisterdistributedhardware_fuzzer.cpp b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceserviceregisterdistributedhardware_fuzzer/sourceserviceregisterdistributedhardware_fuzzer.cpp index 7b7dc581919920a52c74017c03263f8abbadc0cd..7aec3949c2ff9fbf7fb781e7dc0e585ea6dd112e 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceserviceregisterdistributedhardware_fuzzer/sourceserviceregisterdistributedhardware_fuzzer.cpp +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/sourceserviceregisterdistributedhardware_fuzzer/sourceserviceregisterdistributedhardware_fuzzer.cpp @@ -32,11 +32,15 @@ void SourceServiceRegisterDistributedHardwareFuzzTest(const uint8_t* data, size_ std::string dhId(reinterpret_cast(data), size); std::string devId(reinterpret_cast(data), size); std::string reqId(reinterpret_cast(data), size); - std::string version(reinterpret_cast(data), size); - std::string attrs(reinterpret_cast(data), size); + std::string sourceVersion(reinterpret_cast(data), size); + std::string sourceAttrs(reinterpret_cast(data), size); + std::string sinkVersion(reinterpret_cast(data), size); + std::string sinkAttrs(reinterpret_cast(data), size); EnableParam param; - param.version = version; - param.attrs = attrs; + param.sourceVersion = sourceVersion; + param.sourceAttrs = sourceAttrs; + param.sinkVersion = sinkVersion; + param.sinkAttrs = sinkAttrs; std::shared_ptr sourceService = std::make_shared(DISTRIBUTED_HARDWARE_CAMERA_SOURCE_SA_ID, true); diff --git a/interfaces/inner_kits/native_cpp/test/unittest/common/camera_source/dcamera_source_handler_test.cpp b/interfaces/inner_kits/native_cpp/test/unittest/common/camera_source/dcamera_source_handler_test.cpp index 6370855c9b91cfd19d2dff7cef1e6cef2a23b9a5..e65d9745d23e246622705ae1076579a367157d47 100644 --- a/interfaces/inner_kits/native_cpp/test/unittest/common/camera_source/dcamera_source_handler_test.cpp +++ b/interfaces/inner_kits/native_cpp/test/unittest/common/camera_source/dcamera_source_handler_test.cpp @@ -112,8 +112,10 @@ HWTEST_F(DCameraSourceHandlerTest, dcamera_source_handler_test_003, TestSize.Lev std::string devId = TEST_DEVICE_ID; std::string dhId = TEST_CAMERA_DH_ID_0; EnableParam param; - param.version = TEST_VER; - param.attrs = TEST_ATTRS; + param.sourceVersion = TEST_VER; + param.sourceAttrs = TEST_ATTRS; + param.sinkVersion = TEST_VER; + param.sinkAttrs = TEST_ATTRS; std::shared_ptr callback = std::make_shared(); int32_t ret = DCameraSourceHandler::GetInstance().RegisterDistributedHardware(devId, dhId, param, callback); EXPECT_NE(DCAMERA_OK, ret); diff --git a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_dev.h b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_dev.h index b42d5ab6c587c06759ab666f8383ada37925dbbc..fce546f046f19da3ad401f49926467eb0acc4587 100644 --- a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_dev.h +++ b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_dev.h @@ -23,6 +23,7 @@ #include "icamera_controller.h" #include "icamera_state_listener.h" #include "icamera_input.h" +#include "idistributed_camera_source.h" #include "v1_0/id_camera_provider_callback.h" #include "v1_0/id_camera_provider.h" @@ -37,7 +38,7 @@ public: int32_t InitDCameraSourceDev(); int32_t RegisterDistributedHardware(const std::string& devId, const std::string& dhId, const std::string& reqId, - const std::string& ver, const std::string attrs); + const EnableParam& param); int32_t UnRegisterDistributedHardware(const std::string devId, const std::string dhId, const std::string reqId); int32_t DCameraNotify(std::string& eventStr); diff --git a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_event.h b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_event.h index 18c0f3c1c810cf835b03e8b45b0bc786941734e6..725bba076d422656c0a551da6c033d632ca8cb6b 100644 --- a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_event.h +++ b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_event.h @@ -43,14 +43,15 @@ typedef enum { class DCameraRegistParam { public: DCameraRegistParam() = default; - DCameraRegistParam(std::string devId, std::string dhId, std::string reqId, std::string param) - : devId_(devId), dhId_(dhId), reqId_(reqId), param_(param) + DCameraRegistParam(std::string devId, std::string dhId, std::string reqId, std::string sinkParam, + std::string srcParam) : devId_(devId), dhId_(dhId), reqId_(reqId), sinkParam_(sinkParam), srcParam_(srcParam) {} ~DCameraRegistParam() = default; std::string devId_; std::string dhId_; std::string reqId_; - std::string param_; + std::string sinkParam_; + std::string srcParam_; }; class DCameraSourceEvent : public Event { diff --git a/services/cameraservice/sourceservice/src/distributedcamera/distributed_camera_source_service.cpp b/services/cameraservice/sourceservice/src/distributedcamera/distributed_camera_source_service.cpp index 596db9d1d50d4e3b89b1827a40db2b5986c01000..952e414424c28a3a5129481cf86009ed4238f4e0 100644 --- a/services/cameraservice/sourceservice/src/distributedcamera/distributed_camera_source_service.cpp +++ b/services/cameraservice/sourceservice/src/distributedcamera/distributed_camera_source_service.cpp @@ -127,8 +127,8 @@ int32_t DistributedCameraSourceService::ReleaseSource() int32_t DistributedCameraSourceService::RegisterDistributedHardware(const std::string& devId, const std::string& dhId, const std::string& reqId, const EnableParam& param) { - DHLOGI("RegisterDistributedHardware devId: %s, dhId: %s, version: %s", - GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str(), param.version.c_str()); + DHLOGI("RegisterDistributedHardware devId: %s, dhId: %s, sinkVersion: %s", + GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str(), param.sinkVersion.c_str()); if (GetCamDevNum() > MAX_CAMERAS_NUMBER) { DHLOGE("cameras exceed the upper limit"); return DCAMERA_BAD_VALUE; @@ -137,8 +137,8 @@ int32_t DistributedCameraSourceService::RegisterDistributedHardware(const std::s int32_t ret = DCAMERA_OK; std::shared_ptr camDev = GetCamDevByIndex(camIndex); if (camDev == nullptr) { - DHLOGI("new dev devId: %s, dhId: %s, version: %s", - GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str(), param.version.c_str()); + DHLOGI("new dev devId: %s, dhId: %s, sinkVersion: %s", + GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str(), param.sinkVersion.c_str()); camDev = std::make_shared(devId, dhId, listener_); ret = camDev->InitDCameraSourceDev(); if (ret != DCAMERA_OK) { @@ -148,20 +148,20 @@ int32_t DistributedCameraSourceService::RegisterDistributedHardware(const std::s } CamDevInsert(camIndex, camDev); } else { - DHLOGE("RegisterDistributedHardware exist devId: %s, dhId: %s, version: %s", - GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str(), param.version.c_str()); + DHLOGE("RegisterDistributedHardware exist devId: %s, dhId: %s, sinkVersion: %s", + GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str(), param.sinkVersion.c_str()); return DCAMERA_ALREADY_EXISTS; } - ret = camDev->RegisterDistributedHardware(devId, dhId, reqId, param.version, param.attrs); + ret = camDev->RegisterDistributedHardware(devId, dhId, reqId, param); if (ret != DCAMERA_OK) { DHLOGE("RegisterDistributedHardware failed, ret: %d", ret); - ReportRegisterCameraFail(DCAMERA_REGISTER_FAIL, GetAnonyString(devId), dhId, param.version, + ReportRegisterCameraFail(DCAMERA_REGISTER_FAIL, GetAnonyString(devId), dhId, param.sinkVersion, "dcamera source RegisterDistributedHardware fail."); CamDevErase(camIndex); } - DHLOGI("RegisterDistributedHardware end devId: %s, dhId: %s, version: %s", - GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str(), param.version.c_str()); + DHLOGI("RegisterDistributedHardware end devId: %s, dhId: %s, sinkVersion: %s", + GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str(), param.sinkVersion.c_str()); return ret; } diff --git a/services/cameraservice/sourceservice/src/distributedcamera/distributed_camera_source_stub.cpp b/services/cameraservice/sourceservice/src/distributedcamera/distributed_camera_source_stub.cpp index 566f947f4af59eec715f92e2dc00a5ce4d59a9a9..c70b2992c8ed5d760a18ad2ec6008b0d7614f6a0 100644 --- a/services/cameraservice/sourceservice/src/distributedcamera/distributed_camera_source_stub.cpp +++ b/services/cameraservice/sourceservice/src/distributedcamera/distributed_camera_source_stub.cpp @@ -107,8 +107,10 @@ int32_t DistributedCameraSourceStub::RegisterDistributedHardwareInner(MessagePar std::string dhId = data.ReadString(); std::string reqId = data.ReadString(); EnableParam params; - params.version = data.ReadString(); - params.attrs = data.ReadString(); + params.sinkVersion = data.ReadString(); + params.sinkAttrs = data.ReadString(); + params.sourceVersion = data.ReadString(); + params.sourceAttrs = data.ReadString(); if (!CheckRegParams(devId, dhId, reqId, params)) { DHLOGE("input is invalid"); ret = DCAMERA_BAD_VALUE; @@ -134,8 +136,10 @@ bool DistributedCameraSourceStub::CheckRegParams(const std::string& devId, const return false; } - if (param.version.empty() || param.version.size() > PARAM_MAX_SIZE || - param.attrs.empty() || param.attrs.size() > PARAM_MAX_SIZE) { + if (param.sinkVersion.empty() || param.sinkVersion.size() > PARAM_MAX_SIZE || + param.sinkAttrs.empty() || param.sinkAttrs.size() > PARAM_MAX_SIZE || + param.sourceVersion.empty() || param.sourceVersion.size() > PARAM_MAX_SIZE || + param.sourceAttrs.empty() || param.sourceAttrs.size() > PARAM_MAX_SIZE) { DHLOGE("param is invalid"); return false; } diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp index b8c16c8913a300e2d89c8d6f4426b93288fd8b38..ba11a523a96ff308fa45df536ebe7a8fb25c9eb4 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp @@ -95,15 +95,16 @@ int32_t DCameraSourceDev::InitDCameraSourceDev() } int32_t DCameraSourceDev::RegisterDistributedHardware(const std::string& devId, const std::string& dhId, - const std::string& reqId, const std::string& ver, const std::string attrs) + const std::string& reqId, const EnableParam& param) { DHLOGI("DCameraSourceDev PostTask RegisterDistributedHardware devId %s dhId %s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); - version_ = ver; + version_ = param.sinkVersion; DCameraIndex index(devId, dhId); actualDevInfo_.insert(index); - std::shared_ptr regParam = std::make_shared(devId, dhId, reqId, attrs); + std::shared_ptr regParam = std::make_shared(devId, dhId, reqId, + param.sinkAttrs, param.sourceAttrs); DCameraSourceEvent event(*this, DCAMERA_EVENT_REGIST, regParam); eventBus_->PostEvent(event); return DCAMERA_OK; @@ -114,8 +115,10 @@ int32_t DCameraSourceDev::UnRegisterDistributedHardware(const std::string devId, { DHLOGI("DCameraSourceDev PostTask UnRegisterDistributedHardware devId %s dhId %s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); - std::string param; - std::shared_ptr regParam = std::make_shared(devId, dhId, reqId, param); + std::string sinkAttrs; + std::string sourceAttrs; + std::shared_ptr regParam = std::make_shared(devId, dhId, reqId, sinkAttrs, + sourceAttrs); DCameraSourceEvent event(*this, DCAMERA_EVENT_UNREGIST, regParam); eventBus_->PostEvent(event); return DCAMERA_OK; @@ -248,7 +251,7 @@ int32_t DCameraSourceDev::Register(std::shared_ptr& param) DHBase dhBase; dhBase.deviceId_ = param->devId_; dhBase.dhId_ = param->dhId_; - int32_t retHdi = camHdiProvider->EnableDCameraDevice(dhBase, param->param_, hdiCallback_); + int32_t retHdi = camHdiProvider->EnableDCameraDevice(dhBase, param->sinkParam_, hdiCallback_); DHLOGI("DCameraSourceDev Execute Register register hal, ret: %d, devId: %s dhId: %s", retHdi, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); if (retHdi != SUCCESS) { diff --git a/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/distributed_camera_source_stub_test.cpp b/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/distributed_camera_source_stub_test.cpp index a45ab4c3a873a3deca419f78f85f8bf775de5039..1b653c24c18b89779b10a5309e415e3e073e25a8 100644 --- a/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/distributed_camera_source_stub_test.cpp +++ b/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/distributed_camera_source_stub_test.cpp @@ -100,8 +100,10 @@ HWTEST_F(DcameraSourceStubTest, dcamera_source_stub_test_003, TestSize.Level1) std::string dhId = "dhId000"; std::string reqId = "reqId000"; EnableParam param; - param.version = "1"; - param.attrs = "attrs"; + param.sourceVersion = "1"; + param.sourceAttrs = "sourceattrs"; + param.sinkVersion = "1"; + param.sinkAttrs = "sinkattrs"; int32_t ret = sourceProxy.RegisterDistributedHardware(devId, dhId, reqId, param); EXPECT_EQ(DCAMERA_OK, ret); } diff --git a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_source_config_stream_state_test.cpp b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_source_config_stream_state_test.cpp index 0bd9c62ec33c26808bc833920ea405fd7e0e9513..7c5720255776c31b77d3bce0b40f1994cafaa7ea 100644 --- a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_source_config_stream_state_test.cpp +++ b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_source_config_stream_state_test.cpp @@ -52,8 +52,8 @@ namespace { const std::string TEST_DEVICE_ID = "bb536a637105409e904d4da83790a4a7"; const std::string TEST_CAMERA_DH_ID_0 = "camera_0"; const std::string TEST_REQID = "0xFFFF"; -const std::string TEST_PARAM = "0xFFFF"; - +const std::string TEST_SINK_PARAM = "0xFFFF"; +const std::string TEST_SRC_PARAM = "0xFFFF"; } void DCameraSourceConfigStreamStateTest::SetUpTestCase(void) @@ -69,7 +69,8 @@ void DCameraSourceConfigStreamStateTest::SetUp(void) stateListener_ = std::make_shared(); camDev_ = std::make_shared(TEST_DEVICE_ID, TEST_CAMERA_DH_ID_0, stateListener_); stateMachine_ = std::make_shared(camDev_); - g_registParam = std::make_shared(TEST_DEVICE_ID, TEST_CAMERA_DH_ID_0, TEST_REQID, TEST_PARAM); + g_registParam = std::make_shared(TEST_DEVICE_ID, TEST_CAMERA_DH_ID_0, TEST_REQID, + TEST_SINK_PARAM, TEST_SRC_PARAM); } void DCameraSourceConfigStreamStateTest::TearDown(void) diff --git a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_source_dev_test.cpp b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_source_dev_test.cpp index 9b2294094b584f75c6ad9ebc8b9f481be2baa48b..447935fc19cdd40c1828a8e394552881d8919f75 100644 --- a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_source_dev_test.cpp +++ b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_source_dev_test.cpp @@ -49,7 +49,8 @@ const std::string TEST_DEVICE_ID = "bb536a637105409e904d4da83790a4a7"; const std::string TEST_CAMERA_DH_ID_0 = "camera_0"; const std::string TEST_REQID = ""; const std::string TEST_VER = "1.0"; -const std::string TEST_ATTRS = ""; +const std::string TEST_SINK_ATTRS = ""; +const std::string TEST_SRC_ATTRS = ""; const int32_t TEST_WIDTH = 1920; const int32_t TEST_HEIGTH = 1080; const int32_t TEST_SLEEP_SEC = 200000; @@ -124,8 +125,12 @@ HWTEST_F(DCameraSourceDevTest, dcamera_source_dev_test_001, TestSize.Level1) HWTEST_F(DCameraSourceDevTest, dcamera_source_dev_test_002, TestSize.Level1) { camDev_->InitDCameraSourceDev(); - int32_t ret = camDev_->RegisterDistributedHardware(TEST_DEVICE_ID, TEST_CAMERA_DH_ID_0, TEST_REQID, - TEST_VER, TEST_ATTRS); + EnableParam param; + param.sinkVersion = TEST_VER; + param.sinkAttrs = TEST_SINK_ATTRS; + param.sourceAttrs = TEST_SRC_ATTRS; + param.sourceVersion = TEST_VER; + int32_t ret = camDev_->RegisterDistributedHardware(TEST_DEVICE_ID, TEST_CAMERA_DH_ID_0, TEST_REQID, param); EXPECT_EQ(DCAMERA_OK, ret); } @@ -361,8 +366,10 @@ HWTEST_F(DCameraSourceDevTest, dcamera_source_dev_test_013, TestSize.Level1) std::string devId = TEST_DEVICE_ID; std::string dhId = TEST_CAMERA_DH_ID_0; std::string reqId = TEST_REQID; - std::string params = TEST_VER; - std::shared_ptr param = std::make_shared(devId, dhId, reqId, params); + std::string sinkParams = TEST_VER; + std::string srcParams = TEST_VER; + std::shared_ptr param = std::make_shared(devId, dhId, reqId, sinkParams, + srcParams); int32_t ret = camDev_->Register(param); EXPECT_EQ(DCAMERA_BAD_OPERATE, ret); } @@ -379,8 +386,10 @@ HWTEST_F(DCameraSourceDevTest, dcamera_source_dev_test_014, TestSize.Level1) std::string devId = TEST_DEVICE_ID; std::string dhId = TEST_CAMERA_DH_ID_0; std::string reqId = TEST_REQID; - std::string params = TEST_VER; - std::shared_ptr param = std::make_shared(devId, dhId, reqId, params); + std::string sinkParams = TEST_VER; + std::string srcParams = TEST_VER; + std::shared_ptr param = std::make_shared(devId, dhId, reqId, sinkParams, + srcParams); int32_t ret = camDev_->UnRegister(param); EXPECT_EQ(DCAMERA_BAD_OPERATE, ret); } diff --git a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_source_state_machine_test.cpp b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_source_state_machine_test.cpp index cadfb7c9eee5b91d1cc5b1dab61c3e58df7227ce..8a8655a0512070f8068b124c8361081f58e2f5c5 100644 --- a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_source_state_machine_test.cpp +++ b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_source_state_machine_test.cpp @@ -58,7 +58,8 @@ namespace { const std::string TEST_DEVICE_ID = "bb536a637105409e904d4da83790a4a7"; const std::string TEST_CAMERA_DH_ID_0 = "camera_0"; const std::string TEST_REQID = "0xFFFF"; -const std::string TEST_PARAM = "0xFFFF"; +const std::string TEST_SINK_PARAM = "0xFFFF"; +const std::string TEST_SRC_PARAM = "0xFFFF"; const int32_t TEST_WIDTH = 1920; const int32_t TEST_HEIGTH = 1080; const int32_t TEST_STREAMID = 2; @@ -143,7 +144,8 @@ void DCameraSourceStateMachineTest::SetCaptureInfos() g_streamIdSnap.push_back(1); g_streamIdSnap.push_back(TEST_STREAMID); - g_registParam = std::make_shared(TEST_DEVICE_ID, TEST_CAMERA_DH_ID_0, TEST_REQID, TEST_PARAM); + g_registParam = std::make_shared(TEST_DEVICE_ID, TEST_CAMERA_DH_ID_0, TEST_REQID, + TEST_SINK_PARAM, TEST_SRC_PARAM); } void DCameraSourceStateMachineTest::TearDownTestCase(void)