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 5c520b2b0d311cf42b60d9b98fb995fb940df6c4..39d20da9d945e16a13376d095894f46370616052 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 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -52,8 +52,8 @@ int32_t DCameraSourceHandler::InitSource(const std::string& params) ReportSaEvent(INIT_SA_EVENT, DISTRIBUTED_HARDWARE_CAMERA_SOURCE_SA_ID, "init source sa event."); sptr loadCallback = new DCameraSourceLoadCallback(params); int32_t ret = sm->LoadSystemAbility(DISTRIBUTED_HARDWARE_CAMERA_SOURCE_SA_ID, loadCallback); - if (ret != DCAMERA_OK) { - DHLOGE("systemAbilityId: %d load filed,result code: %d.", DISTRIBUTED_HARDWARE_CAMERA_SINK_SA_ID, ret); + if (ret != ERR_OK) { + DHLOGE("systemAbilityId: %d load failed,result code: %d.", DISTRIBUTED_HARDWARE_CAMERA_SINK_SA_ID, ret); return DCAMERA_INIT_ERR; } uint32_t interval = 1; @@ -79,12 +79,12 @@ void DCameraSourceHandler::FinishStartSA(const std::string ¶ms) } dCameraSourceSrv->InitSource(params, callback_); - std::unique_lock lock(producerMutex_); + std::lock_guard lock(producerMutex_); state_ = DCAMERA_SA_STATE_START; producerCon_.notify_one(); } -void DCameraSourceHandler::FinishStartSAFailed(int32_t systemAbilityId) +void DCameraSourceHandler::FinishStartSAFailed(const int32_t systemAbilityId) { DHLOGE("SourceSA Start failed, systemAbilityId: %d.", systemAbilityId); std::unique_lock lock(producerMutex_); @@ -114,6 +114,10 @@ int32_t DCameraSourceHandler::RegisterDistributedHardware(const std::string& dev { DHLOGI("DCameraSourceHandler RegisterDistributedHardware devId: %s dhId: %s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); + if (callback == nullptr) { + DHLOGI("DCameraSourceHandler RegisterDistributedHardware RegisterCallback is null."); + return DCAMERA_BAD_VALUE; + } sptr dCameraSourceSrv = DCameraSourceHandlerIpc::GetInstance().GetSourceLocalDHMS(); if (dCameraSourceSrv == nullptr) { DHLOGE("DCameraSourceHandler RegisterDistributedHardware get Service failed"); @@ -138,6 +142,10 @@ int32_t DCameraSourceHandler::UnregisterDistributedHardware(const std::string& d { DHLOGI("DCameraSourceHandler UnregisterDistributedHardware devId: %s dhId: %s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); + if (callback == nullptr) { + DHLOGI("DCameraSourceHandler RegisterDistributedHardware UnregisterCallback is null."); + return DCAMERA_BAD_VALUE; + } sptr dCameraSourceSrv = DCameraSourceHandlerIpc::GetInstance().GetSourceLocalDHMS(); if (dCameraSourceSrv == nullptr) { DHLOGE("DCameraSourceHandler UnregisterDistributedHardware get Service failed"); diff --git a/services/cameraservice/sinkservice/src/distributedcamera/distributed_camera_sink_stub.cpp b/services/cameraservice/sinkservice/src/distributedcamera/distributed_camera_sink_stub.cpp index 8ebb31524dff4a77b7548c32664dbe536f2bdf67..d790eb9396c8113ccdd24e82a4d00f63a7b82090 100644 --- a/services/cameraservice/sinkservice/src/distributedcamera/distributed_camera_sink_stub.cpp +++ b/services/cameraservice/sinkservice/src/distributedcamera/distributed_camera_sink_stub.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -38,7 +38,7 @@ DistributedCameraSinkStub::~DistributedCameraSinkStub() int32_t DistributedCameraSinkStub::OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) { - DHLOGI("DistributedCameraSinkStub::OnRemoteRequest code: %d", code); + DHLOGD("DistributedCameraSinkStub::OnRemoteRequest code: %d", code); std::u16string desc = DistributedCameraSinkStub::GetDescriptor(); std::u16string remoteDesc = data.ReadInterfaceToken(); if (desc != remoteDesc) { @@ -56,7 +56,7 @@ int32_t DistributedCameraSinkStub::OnRemoteRequest(uint32_t code, MessageParcel int32_t DistributedCameraSinkStub::InitSinkInner(MessageParcel &data, MessageParcel &reply) { - DHLOGI("DistributedCameraSinkStub::InitSinkInner"); + DHLOGD("DistributedCameraSinkStub::InitSinkInner"); std::string params = data.ReadString(); int32_t ret = InitSink(params); reply.WriteInt32(ret); @@ -65,7 +65,7 @@ int32_t DistributedCameraSinkStub::InitSinkInner(MessageParcel &data, MessagePar int32_t DistributedCameraSinkStub::ReleaseSinkInner(MessageParcel &data, MessageParcel &reply) { - DHLOGI("DistributedCameraSinkStub::ReleaseSinkInner"); + DHLOGD("DistributedCameraSinkStub::ReleaseSinkInner"); int32_t ret = ReleaseSink(); reply.WriteInt32(ret); return ret; @@ -73,7 +73,7 @@ int32_t DistributedCameraSinkStub::ReleaseSinkInner(MessageParcel &data, Message int32_t DistributedCameraSinkStub::SubscribeLocalHardwareInner(MessageParcel &data, MessageParcel &reply) { - DHLOGI("DistributedCameraSinkStub::SubscribeLocalHardwareInner"); + DHLOGD("DistributedCameraSinkStub::SubscribeLocalHardwareInner"); std::string dhId = data.ReadString(); std::string parameters = data.ReadString(); int32_t ret = SubscribeLocalHardware(dhId, parameters); @@ -83,7 +83,7 @@ int32_t DistributedCameraSinkStub::SubscribeLocalHardwareInner(MessageParcel &da int32_t DistributedCameraSinkStub::UnsubscribeLocalHardwareInner(MessageParcel &data, MessageParcel &reply) { - DHLOGI("DistributedCameraSinkStub::UnsubscribeLocalHardwareInner"); + DHLOGD("DistributedCameraSinkStub::UnsubscribeLocalHardwareInner"); std::string dhId = data.ReadString(); int32_t ret = UnsubscribeLocalHardware(dhId); reply.WriteInt32(ret); @@ -92,7 +92,7 @@ int32_t DistributedCameraSinkStub::UnsubscribeLocalHardwareInner(MessageParcel & int32_t DistributedCameraSinkStub::StopCaptureInner(MessageParcel &data, MessageParcel &reply) { - DHLOGI("DistributedCameraSinkStub::StopCaptureInner"); + DHLOGD("DistributedCameraSinkStub::StopCaptureInner"); std::string dhId = data.ReadString(); int32_t ret = StopCapture(dhId); reply.WriteInt32(ret); @@ -101,7 +101,7 @@ int32_t DistributedCameraSinkStub::StopCaptureInner(MessageParcel &data, Message int32_t DistributedCameraSinkStub::ChannelNegInner(MessageParcel &data, MessageParcel &reply) { - DHLOGI("DistributedCameraSinkStub::ChannelNegInner"); + DHLOGD("DistributedCameraSinkStub::ChannelNegInner"); std::string dhId = data.ReadString(); std::string channelInfo = data.ReadString(); int32_t ret = ChannelNeg(dhId, channelInfo); @@ -111,7 +111,7 @@ int32_t DistributedCameraSinkStub::ChannelNegInner(MessageParcel &data, MessageP int32_t DistributedCameraSinkStub::GetCameraInfoInner(MessageParcel &data, MessageParcel &reply) { - DHLOGI("DistributedCameraSinkStub::GetCameraInfoInner"); + DHLOGD("DistributedCameraSinkStub::GetCameraInfoInner"); std::string dhId = data.ReadString(); std::string cameraInfo = data.ReadString(); int32_t ret = GetCameraInfo(dhId, cameraInfo); @@ -121,7 +121,7 @@ int32_t DistributedCameraSinkStub::GetCameraInfoInner(MessageParcel &data, Messa int32_t DistributedCameraSinkStub::OpenChannelInner(MessageParcel &data, MessageParcel &reply) { - DHLOGI("DistributedCameraSinkStub::OpenChannelInner"); + DHLOGD("DistributedCameraSinkStub::OpenChannelInner"); std::string dhId = data.ReadString(); std::string openInfo = data.ReadString(); int32_t ret = OpenChannel(dhId, openInfo); @@ -131,7 +131,7 @@ int32_t DistributedCameraSinkStub::OpenChannelInner(MessageParcel &data, Message int32_t DistributedCameraSinkStub::CloseChannelInner(MessageParcel &data, MessageParcel &reply) { - DHLOGI("DistributedCameraSinkStub::CloseChannelInner"); + DHLOGD("DistributedCameraSinkStub::CloseChannelInner"); std::string dhId = data.ReadString(); int32_t ret = CloseChannel(dhId); reply.WriteInt32(ret); diff --git a/services/cameraservice/sourceservice/src/distributedcamera/dcamera_service_state_listener.cpp b/services/cameraservice/sourceservice/src/distributedcamera/dcamera_service_state_listener.cpp index 36cdd886b7761ec976d8e1b8e2c96cc11aae6d15..bca5ee252999fc33b5c6b6c4a0d91db767f0ec67 100644 --- a/services/cameraservice/sourceservice/src/distributedcamera/dcamera_service_state_listener.cpp +++ b/services/cameraservice/sourceservice/src/distributedcamera/dcamera_service_state_listener.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -49,10 +49,6 @@ int32_t DCameraServiceStateListener::OnRegisterNotify(const std::string& devId, DHLOGI("DCameraServiceStateListener OnRegisterNotify devId: %s, dhId: %s, status: %d", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str(), status); std::lock_guard autoLock(proxyMutex_); - if (callbackProxy_ == nullptr) { - DHLOGE("DCameraServiceStateListener OnRegisterNotify callbackProxy_ is nullptr"); - return DCAMERA_BAD_VALUE; - } if (status != DCAMERA_OK) { std::thread([=]() mutable { @@ -60,13 +56,20 @@ int32_t DCameraServiceStateListener::OnRegisterNotify(const std::string& devId, GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); DCameraIndex camIndex(devId, dhId); DistributedCameraSourceService::camerasMap_.erase(camIndex); - + if (callbackProxy_ == nullptr) { + DHLOGE("DCameraServiceStateListener OnRegisterNotify callbackProxy_ is nullptr"); + return; + } int32_t ret = callbackProxy_->OnNotifyRegResult(devId, dhId, reqId, status, data); if (ret != DCAMERA_OK) { DHLOGE("DCameraServiceStateListener OnRegisterNotify OnNotifyRegResult failed: %d", ret); } }).detach(); } else { + if (callbackProxy_ == nullptr) { + DHLOGE("DCameraServiceStateListener OnRegisterNotify callbackProxy_ is nullptr"); + return DCAMERA_BAD_VALUE; + } int32_t ret = callbackProxy_->OnNotifyRegResult(devId, dhId, reqId, status, data); if (ret != DCAMERA_OK) { DHLOGE("DCameraServiceStateListener OnRegisterNotify OnNotifyRegResult failed: %d", 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 313a5a744a4083daba68dab5fddec6512b56bc01..b916b6380c1cda2f99dd697e9461d52f5ab4d8c7 100644 --- a/services/cameraservice/sourceservice/src/distributedcamera/distributed_camera_source_stub.cpp +++ b/services/cameraservice/sourceservice/src/distributedcamera/distributed_camera_source_stub.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -36,7 +36,7 @@ DistributedCameraSourceStub::~DistributedCameraSourceStub() int32_t DistributedCameraSourceStub::OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) { - DHLOGI("DistributedCameraSourceStub OnRemoteRequest code: %u", code); + DHLOGD("DistributedCameraSourceStub OnRemoteRequest code: %u", code); std::u16string desc = DistributedCameraSourceStub::GetDescriptor(); std::u16string remoteDesc = data.ReadInterfaceToken(); if (desc != remoteDesc) { @@ -54,7 +54,7 @@ int32_t DistributedCameraSourceStub::OnRemoteRequest(uint32_t code, MessageParce int32_t DistributedCameraSourceStub::InitSourceInner(MessageParcel &data, MessageParcel &reply) { - DHLOGI("DistributedCameraSourceStub InitSourceInner"); + DHLOGD("DistributedCameraSourceStub InitSourceInner"); int32_t ret = DCAMERA_OK; do { std::string params = data.ReadString(); @@ -80,7 +80,7 @@ int32_t DistributedCameraSourceStub::InitSourceInner(MessageParcel &data, Messag int32_t DistributedCameraSourceStub::ReleaseSourceInner(MessageParcel &data, MessageParcel &reply) { - DHLOGI("DistributedCameraSourceStub ReleaseSourceInner"); + DHLOGD("DistributedCameraSourceStub ReleaseSourceInner"); (void)data; int32_t ret = ReleaseSource(); reply.WriteInt32(ret); @@ -89,7 +89,7 @@ int32_t DistributedCameraSourceStub::ReleaseSourceInner(MessageParcel &data, Mes int32_t DistributedCameraSourceStub::RegisterDistributedHardwareInner(MessageParcel &data, MessageParcel &reply) { - DHLOGI("DistributedCameraSourceStub RegisterDistributedHardwareInner"); + DHLOGD("DistributedCameraSourceStub RegisterDistributedHardwareInner"); int32_t ret = DCAMERA_OK; do { std::string devId = data.ReadString(); @@ -107,7 +107,7 @@ int32_t DistributedCameraSourceStub::RegisterDistributedHardwareInner(MessagePar int32_t DistributedCameraSourceStub::UnregisterDistributedHardwareInner(MessageParcel &data, MessageParcel &reply) { - DHLOGI("DistributedCameraSourceStub UnregisterDistributedHardwareInner"); + DHLOGD("DistributedCameraSourceStub UnregisterDistributedHardwareInner"); int32_t ret = DCAMERA_OK; do { std::string devId = data.ReadString(); diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp index 403f09b764b4f249195a171bddfeb20ac9cfd58e..8da11cc3b7adf000d0ad878b23411bc7b843923d 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -353,7 +353,7 @@ int32_t DCameraSourceDev::ExecuteConfigStreams(std::vector chanInfo = std::make_shared(); ret = GetLocalDeviceNetworkId(chanInfo->sourceDevId_); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceDev getMyId failed ret: %d, devId: %s, dhId: %s", ret, + DHLOGE("DCameraSourceDev getLocalNetworkId failed ret: %d, devId: %s, dhId: %s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return ret; }