diff --git a/interfaces/inner_kits/native_cpp/camera_sink/include/dcamera_sink_handler_ipc.h b/interfaces/inner_kits/native_cpp/camera_sink/include/dcamera_sink_handler_ipc.h index faa8c73dee81b97d58636dd0aee64a40b31f96b9..1b177f3059791f27e689b79595e8453091d81c87 100644 --- a/interfaces/inner_kits/native_cpp/camera_sink/include/dcamera_sink_handler_ipc.h +++ b/interfaces/inner_kits/native_cpp/camera_sink/include/dcamera_sink_handler_ipc.h @@ -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 @@ -31,14 +31,14 @@ DECLARE_SINGLE_INSTANCE_BASE(DCameraSinkHandlerIpc); public: void Init(); void UnInit(); - sptr GetSinkLocalDHMS(); - void OnSinkLocalDmsDied(const wptr& remote); + sptr GetSinkLocalCamSrv(); + void OnSinkLocalCamSrvDied(const wptr& remote); private: DCameraSinkHandlerIpc(); ~DCameraSinkHandlerIpc(); - void OnSinkLocalDmsDied(const sptr& remote); - void DeleteSinkLocalDhms(); + void OnSinkLocalCamSrvDied(const sptr& remote); + void DeleteSinkLocalCamSrv(); class SinkLocalRecipient : public IRemoteObject::DeathRecipient { public: @@ -46,10 +46,10 @@ private: }; sptr sinkLocalRecipient_; sptr localSink_; - std::mutex sinkLocalDmsLock_; + std::mutex sinkLocalCamSrvLock_; bool isInit_; - std::mutex initDmsLock_; + std::mutex initCamSrvLock_; }; } // namespace DistributedHardware } // namespace OHOS diff --git a/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_handler.cpp b/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_handler.cpp index 499125c7217c4680c73ae7d58ddaf9fa434e08a5..704a454b812321b8abf2840f947af41b4771d14e 100644 --- a/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_handler.cpp +++ b/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_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 @@ -46,7 +46,7 @@ int32_t DCameraSinkHandler::InitSink(const std::string& params) DHLOGI("DCameraSinkHandler::InitSink"); sptr sm = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); if (sm == nullptr) { - DHLOGE("GetSourceLocalDHMS GetSystemAbilityManager failed"); + DHLOGE("GetSourceLocalCamSrv GetSystemAbilityManager failed"); return DCAMERA_INIT_ERR; } ReportSaEvent(INIT_SA_EVENT, DISTRIBUTED_HARDWARE_CAMERA_SINK_SA_ID, "init sink sa event."); @@ -72,7 +72,7 @@ int32_t DCameraSinkHandler::InitSink(const std::string& params) void DCameraSinkHandler::FinishStartSA(const std::string& params) { DCameraSinkHandlerIpc::GetInstance().Init(); - sptr dCameraSinkSrv = DCameraSinkHandlerIpc::GetInstance().GetSinkLocalDHMS(); + sptr dCameraSinkSrv = DCameraSinkHandlerIpc::GetInstance().GetSinkLocalCamSrv(); if (dCameraSinkSrv == nullptr) { DHLOGE("DCameraSinkHandler::InitSink get Service failed"); return; @@ -94,7 +94,7 @@ void DCameraSinkHandler::FinishStartSAFailed(int32_t systemAbilityId) int32_t DCameraSinkHandler::ReleaseSink() { DHLOGI("DCameraSinkHandler::ReleaseSink"); - sptr dCameraSinkSrv = DCameraSinkHandlerIpc::GetInstance().GetSinkLocalDHMS(); + sptr dCameraSinkSrv = DCameraSinkHandlerIpc::GetInstance().GetSinkLocalCamSrv(); if (dCameraSinkSrv == nullptr) { DHLOGE("DCameraSinkHandler::ReleaseSink get Service failed"); return DCAMERA_BAD_VALUE; @@ -117,7 +117,7 @@ int32_t DCameraSinkHandler::ReleaseSink() int32_t DCameraSinkHandler::SubscribeLocalHardware(const std::string& dhId, const std::string& parameters) { DHLOGI("DCameraSinkHandler::SubscribeLocalHardware dhId: %s", GetAnonyString(dhId).c_str()); - sptr dCameraSinkSrv = DCameraSinkHandlerIpc::GetInstance().GetSinkLocalDHMS(); + sptr dCameraSinkSrv = DCameraSinkHandlerIpc::GetInstance().GetSinkLocalCamSrv(); if (dCameraSinkSrv == nullptr) { DHLOGE("DCameraSinkHandler::SubscribeLocalHardware get Service failed"); return DCAMERA_BAD_VALUE; @@ -128,7 +128,7 @@ int32_t DCameraSinkHandler::SubscribeLocalHardware(const std::string& dhId, cons int32_t DCameraSinkHandler::UnsubscribeLocalHardware(const std::string& dhId) { DHLOGI("DCameraSinkHandler::UnsubscribeLocalHardware dhId: %s", GetAnonyString(dhId).c_str()); - sptr dCameraSinkSrv = DCameraSinkHandlerIpc::GetInstance().GetSinkLocalDHMS(); + sptr dCameraSinkSrv = DCameraSinkHandlerIpc::GetInstance().GetSinkLocalCamSrv(); if (dCameraSinkSrv == nullptr) { DHLOGE("DCameraSinkHandler::UnsubscribeLocalHardware get Service failed"); return DCAMERA_BAD_VALUE; diff --git a/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_handler_ipc.cpp b/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_handler_ipc.cpp index 15014344b099ce82bd27338509ff98a7e1ed95fe..5d642f67ae458fd99d73181bfbdd3da24e07ca05 100644 --- a/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_handler_ipc.cpp +++ b/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_handler_ipc.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 @@ -41,7 +41,7 @@ IMPLEMENT_SINGLE_INSTANCE(DCameraSinkHandlerIpc); void DCameraSinkHandlerIpc::Init() { - std::lock_guard autoLock(initDmsLock_); + std::lock_guard autoLock(initCamSrvLock_); DHLOGI("DCameraSinkHandlerIpc Init Start"); if (isInit_) { DHLOGI("DCameraSinkHandlerIpc has already init"); @@ -54,93 +54,93 @@ void DCameraSinkHandlerIpc::Init() void DCameraSinkHandlerIpc::UnInit() { - std::lock_guard autoLock(initDmsLock_); + std::lock_guard autoLock(initCamSrvLock_); DHLOGI("DCameraSinkHandlerIpc UnInit Start"); if (!isInit_) { DHLOGI("DCameraSinkHandlerIpc has already UnInit"); return; } - DeleteSinkLocalDhms(); + DeleteSinkLocalCamSrv(); DHLOGI("DCameraSinkHandlerIpc Start free recipient"); sinkLocalRecipient_ = nullptr; isInit_ = false; DHLOGI("DCameraSinkHandlerIpc UnInit End"); } -sptr DCameraSinkHandlerIpc::GetSinkLocalDHMS() +sptr DCameraSinkHandlerIpc::GetSinkLocalCamSrv() { { - std::lock_guard autoLock(sinkLocalDmsLock_); + std::lock_guard autoLock(sinkLocalCamSrvLock_); if (localSink_ != nullptr) { - DHLOGI("DCameraSinkHandlerIpc GetSinkLocalDHMS from cache"); + DHLOGI("DCameraSinkHandlerIpc GetSinkLocalCamSrv from cache"); return localSink_; } } - DHLOGI("GetSinkLocalDHMS Start"); + DHLOGI("GetSinkLocalCamSrv Start"); sptr sm = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); if (sm == nullptr) { - DHLOGE("GetSinkLocalDHMS GetSystemAbilityManager failed"); + DHLOGE("GetSinkLocalCamSrv GetSystemAbilityManager failed"); return nullptr; } sptr object = sm->GetSystemAbility(DISTRIBUTED_HARDWARE_CAMERA_SINK_SA_ID); if (object == nullptr) { - DHLOGE("GetSinkLocalDHMS GetSystemAbility failed"); + DHLOGE("GetSinkLocalCamSrv GetSystemAbility failed"); return nullptr; } int32_t ret = object->AddDeathRecipient(sinkLocalRecipient_); sptr localSink = iface_cast(object); if (localSink == nullptr) { - DHLOGI("GetSinkLocalDHMS failed, localSink is null ret: %d", ret); + DHLOGI("GetSinkLocalCamSrv failed, localSink is null ret: %d", ret); return nullptr; } { - std::lock_guard autoLock(sinkLocalDmsLock_); + std::lock_guard autoLock(sinkLocalCamSrvLock_); if (localSink_ != nullptr) { localSink_->AsObject()->RemoveDeathRecipient(sinkLocalRecipient_); } localSink_ = localSink; } - DHLOGI("GetSinkLocalDHMS success, AddDeathRecipient ret: %d", ret); + DHLOGI("GetSinkLocalCamSrv success, AddDeathRecipient ret: %d", ret); return localSink; } -void DCameraSinkHandlerIpc::DeleteSinkLocalDhms() +void DCameraSinkHandlerIpc::DeleteSinkLocalCamSrv() { - DHLOGI("DeleteSinkLocalDhms start"); - std::lock_guard autoLock(sinkLocalDmsLock_); + DHLOGI("DeleteSinkLocalCamSrv start"); + std::lock_guard autoLock(sinkLocalCamSrvLock_); if (localSink_ != nullptr) { localSink_->AsObject()->RemoveDeathRecipient(sinkLocalRecipient_); } localSink_ = nullptr; - DHLOGI("DeleteSinkLocalDhms end"); + DHLOGI("DeleteSinkLocalCamSrv end"); } void DCameraSinkHandlerIpc::SinkLocalRecipient::OnRemoteDied(const wptr& remote) { DHLOGI("SinkLocalRecipient OnRemoteDied received died notify!"); - DCameraSinkHandlerIpc::GetInstance().OnSinkLocalDmsDied(remote); + DCameraSinkHandlerIpc::GetInstance().OnSinkLocalCamSrvDied(remote); } -void DCameraSinkHandlerIpc::OnSinkLocalDmsDied(const wptr& remote) +void DCameraSinkHandlerIpc::OnSinkLocalCamSrvDied(const wptr& remote) { - DHLOGI("OnSinkLocalDmsDied delete diedRemoted"); - std::lock_guard autoLock(sinkLocalDmsLock_); + DHLOGI("OnSinkLocalCamSrvDied delete diedRemoted"); + std::lock_guard autoLock(sinkLocalCamSrvLock_); if (localSink_ == nullptr) { - DHLOGE("DCameraSinkHandlerIpc::OnSinkLocalDmsDied, localSink is null."); + DHLOGE("DCameraSinkHandlerIpc::OnSinkLocalCamSrvDied, localSink is null."); return; } sptr diedRemoted = remote.promote(); if (diedRemoted == nullptr) { - DHLOGE("OnSinkLocalDmsDied promote failed!"); + DHLOGE("OnSinkLocalCamSrvDied promote failed!"); return; } if (localSink_->AsObject() != diedRemoted) { - DHLOGI("OnSinkLocalDmsDied not found remote object."); + DHLOGI("OnSinkLocalCamSrvDied not found remote object."); return; } - DHLOGI("OnSinkLocalDmsDied Clear"); + DHLOGI("OnSinkLocalCamSrvDied Clear"); localSink_->AsObject()->RemoveDeathRecipient(sinkLocalRecipient_); localSink_ = nullptr; } diff --git a/interfaces/inner_kits/native_cpp/camera_source/include/dcamera_source_handler_ipc.h b/interfaces/inner_kits/native_cpp/camera_source/include/dcamera_source_handler_ipc.h index 7f4042ca73eb44fe2f35e4e05cc4bb56dd8e005e..fe36e578bddd47cc4c4f20563e48a7a8e65e9b55 100644 --- a/interfaces/inner_kits/native_cpp/camera_source/include/dcamera_source_handler_ipc.h +++ b/interfaces/inner_kits/native_cpp/camera_source/include/dcamera_source_handler_ipc.h @@ -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 @@ -31,13 +31,13 @@ DECLARE_SINGLE_INSTANCE_BASE(DCameraSourceHandlerIpc); public: void Init(); void UnInit(); - sptr GetSourceLocalDHMS(); - void OnSourceLocalDmsDied(const wptr& remote); + sptr GetSourceLocalCamSrv(); + void OnSourceLocalCamSrvDied(const wptr& remote); private: DCameraSourceHandlerIpc(); ~DCameraSourceHandlerIpc(); - void DeleteSourceLocalDhms(); + void DeleteSourceLocalCamSrv(); class SourceLocalRecipient : public IRemoteObject::DeathRecipient { public: @@ -45,10 +45,10 @@ private: }; sptr sourceLocalRecipient_; sptr localSource_; - std::mutex sourceLocalDmsLock_; + std::mutex sourceLocalCamSrvLock_; bool isInit_; - std::mutex initDmsLock_; + std::mutex initCamSrvLock_; }; } // namespace DistributedHardware } // namespace OHOS diff --git a/interfaces/inner_kits/native_cpp/camera_source/src/callback/dcamera_source_callback_stub.cpp b/interfaces/inner_kits/native_cpp/camera_source/src/callback/dcamera_source_callback_stub.cpp index bd97d27d0e44af414be3d2a8d8a2a53aaecc8729..29ffc0ebcf51560b4f2c015bee10bb3f1efbf285 100644 --- a/interfaces/inner_kits/native_cpp/camera_source/src/callback/dcamera_source_callback_stub.cpp +++ b/interfaces/inner_kits/native_cpp/camera_source/src/callback/dcamera_source_callback_stub.cpp @@ -64,7 +64,7 @@ int32_t DCameraSourceCallbackStub::NotifyRegResultInner(MessageParcel &data, Mes ret = OnNotifyRegResult(devId, dhId, reqId, status, result); } while (0); reply.WriteInt32(ret); - return ret; + return DCAMERA_OK; } int32_t DCameraSourceCallbackStub::NotifyUnregResultInner(MessageParcel &data, MessageParcel &reply) @@ -80,7 +80,7 @@ int32_t DCameraSourceCallbackStub::NotifyUnregResultInner(MessageParcel &data, M ret = OnNotifyUnregResult(devId, dhId, reqId, status, result); } while (0); reply.WriteInt32(ret); - return ret; + return DCAMERA_OK; } } // namespace DistributedHardware } // namespace OHOS 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 39d20da9d945e16a13376d095894f46370616052..d2ab0dfd11838d4c6bbc78a6530c01e34ba16f31 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 @@ -46,7 +46,7 @@ int32_t DCameraSourceHandler::InitSource(const std::string& params) DHLOGI("DCameraSourceHandler InitSource Start"); sptr sm = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); if (sm == nullptr) { - DHLOGE("GetSourceLocalDHMS GetSystemAbilityManager failed"); + DHLOGE("GetSourceLocalCamSrv GetSystemAbilityManager failed"); return DCAMERA_INIT_ERR; } ReportSaEvent(INIT_SA_EVENT, DISTRIBUTED_HARDWARE_CAMERA_SOURCE_SA_ID, "init source sa event."); @@ -72,7 +72,7 @@ int32_t DCameraSourceHandler::InitSource(const std::string& params) void DCameraSourceHandler::FinishStartSA(const std::string ¶ms) { DCameraSourceHandlerIpc::GetInstance().Init(); - sptr dCameraSourceSrv = DCameraSourceHandlerIpc::GetInstance().GetSourceLocalDHMS(); + sptr dCameraSourceSrv = DCameraSourceHandlerIpc::GetInstance().GetSourceLocalCamSrv(); if (dCameraSourceSrv == nullptr) { DHLOGE("DCameraSourceHandler InitSource get Service failed"); return; @@ -95,7 +95,7 @@ void DCameraSourceHandler::FinishStartSAFailed(const int32_t systemAbilityId) int32_t DCameraSourceHandler::ReleaseSource() { DHLOGI("DCameraSourceHandler ReleaseSource Start"); - sptr dCameraSourceSrv = DCameraSourceHandlerIpc::GetInstance().GetSourceLocalDHMS(); + sptr dCameraSourceSrv = DCameraSourceHandlerIpc::GetInstance().GetSourceLocalCamSrv(); if (dCameraSourceSrv == nullptr) { DHLOGE("DCameraSourceHandler ReleaseSource get Service failed"); return DCAMERA_INIT_ERR; @@ -118,15 +118,15 @@ int32_t DCameraSourceHandler::RegisterDistributedHardware(const std::string& dev DHLOGI("DCameraSourceHandler RegisterDistributedHardware RegisterCallback is null."); return DCAMERA_BAD_VALUE; } - sptr dCameraSourceSrv = DCameraSourceHandlerIpc::GetInstance().GetSourceLocalDHMS(); + sptr dCameraSourceSrv = DCameraSourceHandlerIpc::GetInstance().GetSourceLocalCamSrv(); if (dCameraSourceSrv == nullptr) { DHLOGE("DCameraSourceHandler RegisterDistributedHardware get Service failed"); return DCAMERA_BAD_VALUE; } - std::lock_guard autoLock(optLock_); std::string reqId = GetRandomID(); - + std::lock_guard autoLock(optLock_); + callback_->PushRegCallback(reqId, callback); int32_t ret = dCameraSourceSrv->RegisterDistributedHardware(devId, dhId, reqId, param); if (ret != DCAMERA_OK) { @@ -146,14 +146,14 @@ int32_t DCameraSourceHandler::UnregisterDistributedHardware(const std::string& d DHLOGI("DCameraSourceHandler RegisterDistributedHardware UnregisterCallback is null."); return DCAMERA_BAD_VALUE; } - sptr dCameraSourceSrv = DCameraSourceHandlerIpc::GetInstance().GetSourceLocalDHMS(); + sptr dCameraSourceSrv = DCameraSourceHandlerIpc::GetInstance().GetSourceLocalCamSrv(); if (dCameraSourceSrv == nullptr) { DHLOGE("DCameraSourceHandler UnregisterDistributedHardware get Service failed"); return DCAMERA_BAD_VALUE; } - std::lock_guard autoLock(optLock_); std::string reqId = GetRandomID(); + std::lock_guard autoLock(optLock_); callback_->PushUnregCallback(reqId, callback); int32_t ret = dCameraSourceSrv->UnregisterDistributedHardware(devId, dhId, reqId); diff --git a/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_handler_ipc.cpp b/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_handler_ipc.cpp index 6c08f2716b01dea9f2c5cd989f68b79fa3d305e7..593184389ba6125961b654219d9bbacf293a350c 100644 --- a/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_handler_ipc.cpp +++ b/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_handler_ipc.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 @@ -41,7 +41,7 @@ IMPLEMENT_SINGLE_INSTANCE(DCameraSourceHandlerIpc); void DCameraSourceHandlerIpc::Init() { - std::lock_guard autoLock(initDmsLock_); + std::lock_guard autoLock(initCamSrvLock_); DHLOGI("DCameraSourceHandlerIpc Init Start"); if (isInit_) { DHLOGI("DCameraSourceHandlerIpc has already init"); @@ -54,92 +54,92 @@ void DCameraSourceHandlerIpc::Init() void DCameraSourceHandlerIpc::UnInit() { - std::lock_guard autoLock(initDmsLock_); + std::lock_guard autoLock(initCamSrvLock_); DHLOGI("DCameraSourceHandlerIpc UnInit Start"); if (!isInit_) { DHLOGI("DCameraSourceHandlerIpc has already UnInit"); return; } - DeleteSourceLocalDhms(); + DeleteSourceLocalCamSrv(); DHLOGI("DCameraSourceHandlerIpc Start free recipient"); sourceLocalRecipient_ = nullptr; isInit_ = false; DHLOGI("DCameraSourceHandlerIpc UnInit End"); } -sptr DCameraSourceHandlerIpc::GetSourceLocalDHMS() +sptr DCameraSourceHandlerIpc::GetSourceLocalCamSrv() { { - std::lock_guard autoLock(sourceLocalDmsLock_); + std::lock_guard autoLock(sourceLocalCamSrvLock_); if (localSource_ != nullptr) { - DHLOGI("DCameraSourceHandlerIpc GetSourceLocalDHMS from cache"); + DHLOGI("DCameraSourceHandlerIpc GetSourceLocalCamSrv from cache"); return localSource_; } } - DHLOGI("GetSourceLocalDHMS Start"); + DHLOGI("GetSourceLocalCamSrv Start"); sptr sm = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); if (sm == nullptr) { - DHLOGE("GetSourceLocalDHMS GetSystemAbilityManager failed"); + DHLOGE("GetSourceLocalCamSrv GetSystemAbilityManager failed"); return nullptr; } sptr object = sm->GetSystemAbility(DISTRIBUTED_HARDWARE_CAMERA_SOURCE_SA_ID); if (object == nullptr) { - DHLOGE("GetSourceLocalDHMS GetSystemAbility failed"); + DHLOGE("GetSourceLocalCamSrv GetSystemAbility failed"); return nullptr; } int32_t ret = object->AddDeathRecipient(sourceLocalRecipient_); sptr localSource = iface_cast(object); if (localSource == nullptr) { - DHLOGI("GetSourceLocalDHMS failed, localSource is null ret: %d", ret); + DHLOGI("GetSourceLocalCamSrv failed, localSource is null ret: %d", ret); return nullptr; } { - std::lock_guard autoLock(sourceLocalDmsLock_); + std::lock_guard autoLock(sourceLocalCamSrvLock_); if (localSource_ != nullptr) { localSource_->AsObject()->RemoveDeathRecipient(sourceLocalRecipient_); } localSource_ = localSource; } - DHLOGI("GetSourceLocalDHMS success, AddDeathRecipient ret: %d", ret); + DHLOGI("GetSourceLocalCamSrv success, AddDeathRecipient ret: %d", ret); return localSource; } -void DCameraSourceHandlerIpc::DeleteSourceLocalDhms() +void DCameraSourceHandlerIpc::DeleteSourceLocalCamSrv() { - DHLOGI("DeleteSourceLocalDhms start"); - std::lock_guard autoLock(sourceLocalDmsLock_); + DHLOGI("DeleteSourceLocalCamSrv start"); + std::lock_guard autoLock(sourceLocalCamSrvLock_); if (localSource_ != nullptr) { localSource_->AsObject()->RemoveDeathRecipient(sourceLocalRecipient_); } localSource_ = nullptr; - DHLOGI("DeleteSourceLocalDhms end"); + DHLOGI("DeleteSourceLocalCamSrv end"); } void DCameraSourceHandlerIpc::SourceLocalRecipient::OnRemoteDied(const wptr& remote) { DHLOGI("SourceLocalRecipient OnRemoteDied received died notify!"); - DCameraSourceHandlerIpc::GetInstance().OnSourceLocalDmsDied(remote); + DCameraSourceHandlerIpc::GetInstance().OnSourceLocalCamSrvDied(remote); } -void DCameraSourceHandlerIpc::OnSourceLocalDmsDied(const wptr& remote) +void DCameraSourceHandlerIpc::OnSourceLocalCamSrvDied(const wptr& remote) { - DHLOGI("OnSourceLocalDmsDied delete diedRemoted"); - std::lock_guard autoLock(sourceLocalDmsLock_); + DHLOGI("OnSourceLocalCamSrvDied delete diedRemoted"); + std::lock_guard autoLock(sourceLocalCamSrvLock_); if (localSource_ == nullptr) { - DHLOGE("DCameraSourceHandlerIpc::OnSourceLocalDmsDied, localSource is null."); + DHLOGE("DCameraSourceHandlerIpc::OnSourceLocalCamSrvDied, localSource is null."); return; } sptr diedRemoted = remote.promote(); if (diedRemoted == nullptr) { - DHLOGE("OnSourceLocalDmsDied promote failed!"); + DHLOGE("OnSourceLocalCamSrvDied promote failed!"); return; } if (localSource_->AsObject() != diedRemoted) { - DHLOGI("OnSourceLocalDmsDied not found remote object."); + DHLOGI("OnSourceLocalCamSrvDied not found remote object."); return; } - DHLOGI("OnSourceLocalDmsDied Clear"); + DHLOGI("OnSourceLocalCamSrvDied Clear"); localSource_->AsObject()->RemoveDeathRecipient(sourceLocalRecipient_); localSource_ = nullptr; } diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/BUILD.gn index 8a6f83140fe4b165b05ae71c50368acc8d62a486..3ef21ccc527acc02541a242b9c480111108233aa 100644 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/BUILD.gn @@ -15,8 +15,8 @@ group("fuzztest") { testonly = true deps = [ - "onsinklocaldmsdied_fuzzer:fuzztest", - "onsourcelocaldmsdied_fuzzer:fuzztest", + "onsinklocalcamsrvdied_fuzzer:fuzztest", + "onsourcelocalcamsrvdied_fuzzer:fuzztest", "sinkhandlerinitsink_fuzzer:fuzztest", "sinkhandlersubscribelocalhardware_fuzzer:fuzztest", "sinkhandlerunsubscribelocalhardware_fuzzer:fuzztest", diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/onsinklocaldmsdied_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/onsinklocalcamsrvdied_fuzzer/BUILD.gn similarity index 85% rename from interfaces/inner_kits/native_cpp/test/fuzztest/onsinklocaldmsdied_fuzzer/BUILD.gn rename to interfaces/inner_kits/native_cpp/test/fuzztest/onsinklocalcamsrvdied_fuzzer/BUILD.gn index 6b59d5445a1a8ce17e44399a7ead08ddde81d256..486779d5bf6854cb793becda754cb181fbb7f024 100644 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/onsinklocaldmsdied_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/onsinklocalcamsrvdied_fuzzer/BUILD.gn @@ -18,11 +18,11 @@ import( "//foundation/distributedhardware/distributed_camera/distributedcamera.gni") ##############################fuzztest########################################## -ohos_fuzztest("OnSinkLocalDmsDiedFuzzTest") { - module_out_path = "distributed_camera/onsinklocaldmsdied" +ohos_fuzztest("OnSinkLocalCamSrvDiedFuzzTest") { + module_out_path = "distributed_camera/onsinklocalcamsrvdied" fuzz_config_file = - "${innerkits_path}/native_cpp/test/fuzztest/onsinklocaldmsdied_fuzzer" + "${innerkits_path}/native_cpp/test/fuzztest/onsinklocalcamsrvdied_fuzzer" include_dirs = [ "//commonlibrary/c_utils/base/include", @@ -45,7 +45,7 @@ ohos_fuzztest("OnSinkLocalDmsDiedFuzzTest") { "-fno-omit-frame-pointer", ] - sources = [ "onsinklocaldmsdied_fuzzer.cpp" ] + sources = [ "onsinklocalcamsrvdied_fuzzer.cpp" ] deps = [ "${common_path}:distributed_camera_utils", @@ -54,7 +54,7 @@ ohos_fuzztest("OnSinkLocalDmsDiedFuzzTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"OnSinkLocalDmsDiedFuzzTest\"", + "DH_LOG_TAG=\"OnSinkLocalCamSrvDiedFuzzTest\"", "LOG_DOMAIN=0xD004100", ] @@ -71,6 +71,6 @@ ohos_fuzztest("OnSinkLocalDmsDiedFuzzTest") { ############################################################################### group("fuzztest") { testonly = true - deps = [ ":OnSinkLocalDmsDiedFuzzTest" ] + deps = [ ":OnSinkLocalCamSrvDiedFuzzTest" ] } ############################################################################### diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/onsinklocaldmsdied_fuzzer/corpus/init b/interfaces/inner_kits/native_cpp/test/fuzztest/onsinklocalcamsrvdied_fuzzer/corpus/init similarity index 100% rename from interfaces/inner_kits/native_cpp/test/fuzztest/onsinklocaldmsdied_fuzzer/corpus/init rename to interfaces/inner_kits/native_cpp/test/fuzztest/onsinklocalcamsrvdied_fuzzer/corpus/init diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/onsinklocaldmsdied_fuzzer/onsinklocaldmsdied_fuzzer.cpp b/interfaces/inner_kits/native_cpp/test/fuzztest/onsinklocalcamsrvdied_fuzzer/onsinklocalcamsrvdied_fuzzer.cpp similarity index 84% rename from interfaces/inner_kits/native_cpp/test/fuzztest/onsinklocaldmsdied_fuzzer/onsinklocaldmsdied_fuzzer.cpp rename to interfaces/inner_kits/native_cpp/test/fuzztest/onsinklocalcamsrvdied_fuzzer/onsinklocalcamsrvdied_fuzzer.cpp index f59d7ed35026f3db9a988c63b9bf1f773ad3f423..8947d9236e8757fa04ff7c123b23f35cc0930710 100644 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/onsinklocaldmsdied_fuzzer/onsinklocaldmsdied_fuzzer.cpp +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/onsinklocalcamsrvdied_fuzzer/onsinklocalcamsrvdied_fuzzer.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "onsinklocaldmsdied_fuzzer.h" +#include "onsinklocalcamsrvdied_fuzzer.h" #include #include @@ -26,7 +26,7 @@ namespace OHOS { namespace DistributedHardware { -void OnSinkLocalDmsDiedFuzzTest(const uint8_t* data, size_t size) +void OnSinkLocalCamSrvDiedFuzzTest(const uint8_t* data, size_t size) { if ((data == nullptr) || (size < (sizeof(int32_t)))) { return; @@ -38,7 +38,7 @@ void OnSinkLocalDmsDiedFuzzTest(const uint8_t* data, size_t size) sptr remoteObject = samgr->GetSystemAbility(saId); wptr remote (remoteObject); - DCameraSinkHandlerIpc::GetInstance().OnSinkLocalDmsDied(remote); + DCameraSinkHandlerIpc::GetInstance().OnSinkLocalCamSrvDied(remote); } } } @@ -47,7 +47,7 @@ void OnSinkLocalDmsDiedFuzzTest(const uint8_t* data, size_t size) extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { /* Run your code on data */ - OHOS::DistributedHardware::OnSinkLocalDmsDiedFuzzTest(data, size); + OHOS::DistributedHardware::OnSinkLocalCamSrvDiedFuzzTest(data, size); return 0; } diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/onsinklocaldmsdied_fuzzer/onsinklocaldmsdied_fuzzer.h b/interfaces/inner_kits/native_cpp/test/fuzztest/onsinklocalcamsrvdied_fuzzer/onsinklocalcamsrvdied_fuzzer.h similarity index 82% rename from interfaces/inner_kits/native_cpp/test/fuzztest/onsinklocaldmsdied_fuzzer/onsinklocaldmsdied_fuzzer.h rename to interfaces/inner_kits/native_cpp/test/fuzztest/onsinklocalcamsrvdied_fuzzer/onsinklocalcamsrvdied_fuzzer.h index 4b3b2ae2824d6bd54c0943d636641f791e473915..573130cfe94700652e3ee701e9f6689ab8745143 100644 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/onsinklocaldmsdied_fuzzer/onsinklocaldmsdied_fuzzer.h +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/onsinklocalcamsrvdied_fuzzer/onsinklocalcamsrvdied_fuzzer.h @@ -13,9 +13,9 @@ * limitations under the License. */ -#ifndef ONSINKLOADMSDIED_FUZZER_H -#define ONSINKLOADMSDIED_FUZZER_H +#ifndef ONSINKLOACAMSRVDIED_FUZZER_H +#define ONSINKLOACAMSRVDIED_FUZZER_H -#define FUZZ_PROJECT_NAME "onsinklocaldmsdied_fuzzer" +#define FUZZ_PROJECT_NAME "onsinklocalcamsrvdied_fuzzer" #endif \ No newline at end of file diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/onsinklocaldmsdied_fuzzer/project.xml b/interfaces/inner_kits/native_cpp/test/fuzztest/onsinklocalcamsrvdied_fuzzer/project.xml similarity index 100% rename from interfaces/inner_kits/native_cpp/test/fuzztest/onsinklocaldmsdied_fuzzer/project.xml rename to interfaces/inner_kits/native_cpp/test/fuzztest/onsinklocalcamsrvdied_fuzzer/project.xml diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/onsourcelocaldmsdied_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/onsourcelocalcamsrvdied_fuzzer/BUILD.gn similarity index 84% rename from interfaces/inner_kits/native_cpp/test/fuzztest/onsourcelocaldmsdied_fuzzer/BUILD.gn rename to interfaces/inner_kits/native_cpp/test/fuzztest/onsourcelocalcamsrvdied_fuzzer/BUILD.gn index 79e0bdd5e0f1aafa396f70ac8e9dc043c9eece05..59a798669f6897539a83d8668479b334de83b988 100644 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/onsourcelocaldmsdied_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/onsourcelocalcamsrvdied_fuzzer/BUILD.gn @@ -18,11 +18,11 @@ import( "//foundation/distributedhardware/distributed_camera/distributedcamera.gni") ##############################fuzztest########################################## -ohos_fuzztest("OnSourceLocalDmsDiedFuzzTest") { - module_out_path = "distributed_camera/onsourcelocaldmsdied" +ohos_fuzztest("OnSourceLocalCamSrvDiedFuzzTest") { + module_out_path = "distributed_camera/onsourcelocalcamsrvdied" fuzz_config_file = - "${innerkits_path}/native_cpp/test/fuzztest/onsourcelocaldmsdied_fuzzer" + "${innerkits_path}/native_cpp/test/fuzztest/onsourcelocalcamsrvdied_fuzzer" include_dirs = [ "//utils/system/safwk/native/include", @@ -45,7 +45,7 @@ ohos_fuzztest("OnSourceLocalDmsDiedFuzzTest") { "-fno-omit-frame-pointer", ] - sources = [ "onsourcelocaldmsdied_fuzzer.cpp" ] + sources = [ "onsourcelocalcamsrvdied_fuzzer.cpp" ] deps = [ "${innerkits_path}/native_cpp/camera_source:distributed_camera_source_sdk", @@ -53,7 +53,7 @@ ohos_fuzztest("OnSourceLocalDmsDiedFuzzTest") { defines = [ "HI_LOG_ENABLE", - "DH_LOG_TAG=\"OnSourceLocalDmsDiedFuzzTest\"", + "DH_LOG_TAG=\"OnSourceLocalCamSrvDiedFuzzTest\"", "LOG_DOMAIN=0xD004100", ] @@ -70,6 +70,6 @@ ohos_fuzztest("OnSourceLocalDmsDiedFuzzTest") { ############################################################################### group("fuzztest") { testonly = true - deps = [ ":OnSourceLocalDmsDiedFuzzTest" ] + deps = [ ":OnSourceLocalCamSrvDiedFuzzTest" ] } ############################################################################### diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/onsourcelocaldmsdied_fuzzer/corpus/init b/interfaces/inner_kits/native_cpp/test/fuzztest/onsourcelocalcamsrvdied_fuzzer/corpus/init similarity index 100% rename from interfaces/inner_kits/native_cpp/test/fuzztest/onsourcelocaldmsdied_fuzzer/corpus/init rename to interfaces/inner_kits/native_cpp/test/fuzztest/onsourcelocalcamsrvdied_fuzzer/corpus/init diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/onsourcelocaldmsdied_fuzzer/onsourcelocaldmsdied_fuzzer.cpp b/interfaces/inner_kits/native_cpp/test/fuzztest/onsourcelocalcamsrvdied_fuzzer/onsourcelocalcamsrvdied_fuzzer.cpp similarity index 84% rename from interfaces/inner_kits/native_cpp/test/fuzztest/onsourcelocaldmsdied_fuzzer/onsourcelocaldmsdied_fuzzer.cpp rename to interfaces/inner_kits/native_cpp/test/fuzztest/onsourcelocalcamsrvdied_fuzzer/onsourcelocalcamsrvdied_fuzzer.cpp index c7bd3d6bf9c2f95fce9b37eb10fe70251afa7a70..d88493ec987e90b8754ed23c601989f0b443e559 100644 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/onsourcelocaldmsdied_fuzzer/onsourcelocaldmsdied_fuzzer.cpp +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/onsourcelocalcamsrvdied_fuzzer/onsourcelocalcamsrvdied_fuzzer.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "onsourcelocaldmsdied_fuzzer.h" +#include "onsourcelocalcamsrvdied_fuzzer.h" #include #include @@ -26,7 +26,7 @@ namespace OHOS { namespace DistributedHardware { -void OnSourceLocalDmsDiedFuzzTest(const uint8_t* data, size_t size) +void OnSourceLocalCamSrvDiedFuzzTest(const uint8_t* data, size_t size) { if ((data == nullptr) || (size < (sizeof(int32_t)))) { return; @@ -38,7 +38,7 @@ void OnSourceLocalDmsDiedFuzzTest(const uint8_t* data, size_t size) sptr remoteObject = samgr->GetSystemAbility(saId); wptr remote (remoteObject); - DCameraSourceHandlerIpc::GetInstance().OnSourceLocalDmsDied(remote); + DCameraSourceHandlerIpc::GetInstance().OnSourceLocalCamSrvDied(remote); } } } @@ -47,6 +47,6 @@ void OnSourceLocalDmsDiedFuzzTest(const uint8_t* data, size_t size) extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { /* Run your code on data */ - OHOS::DistributedHardware::OnSourceLocalDmsDiedFuzzTest(data, size); + OHOS::DistributedHardware::OnSourceLocalCamSrvDiedFuzzTest(data, size); return 0; } \ No newline at end of file diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/onsourcelocaldmsdied_fuzzer/onsourcelocaldmsdied_fuzzer.h b/interfaces/inner_kits/native_cpp/test/fuzztest/onsourcelocalcamsrvdied_fuzzer/onsourcelocalcamsrvdied_fuzzer.h similarity index 81% rename from interfaces/inner_kits/native_cpp/test/fuzztest/onsourcelocaldmsdied_fuzzer/onsourcelocaldmsdied_fuzzer.h rename to interfaces/inner_kits/native_cpp/test/fuzztest/onsourcelocalcamsrvdied_fuzzer/onsourcelocalcamsrvdied_fuzzer.h index a8fe409323987fbc8c558c2c50605e7306daa714..8e8690613d031aa7fd6b30e8dcf7cc09f801fc55 100644 --- a/interfaces/inner_kits/native_cpp/test/fuzztest/onsourcelocaldmsdied_fuzzer/onsourcelocaldmsdied_fuzzer.h +++ b/interfaces/inner_kits/native_cpp/test/fuzztest/onsourcelocalcamsrvdied_fuzzer/onsourcelocalcamsrvdied_fuzzer.h @@ -13,9 +13,9 @@ * limitations under the License. */ -#ifndef ONSOURCELOCALDMSDIED_FUZZER_H -#define ONSOURCELOCALDMSDIED_FUZZER_H +#ifndef ONSOURCELOCALCAMSRVDIED_FUZZER_H +#define ONSOURCELOCALCAMSRVDIED_FUZZER_H -#define FUZZ_PROJECT_NAME "onsourcelocaldmsdied_fuzzer" +#define FUZZ_PROJECT_NAME "onsourcelocalcamsrvdied_fuzzer" #endif \ No newline at end of file diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/onsourcelocaldmsdied_fuzzer/project.xml b/interfaces/inner_kits/native_cpp/test/fuzztest/onsourcelocalcamsrvdied_fuzzer/project.xml similarity index 100% rename from interfaces/inner_kits/native_cpp/test/fuzztest/onsourcelocaldmsdied_fuzzer/project.xml rename to interfaces/inner_kits/native_cpp/test/fuzztest/onsourcelocalcamsrvdied_fuzzer/project.xml diff --git a/services/cameraservice/sinkservice/include/distributedcameramgr/dcamera_sink_service_ipc.h b/services/cameraservice/sinkservice/include/distributedcameramgr/dcamera_sink_service_ipc.h index 9e047b202b3a005abf347a05c2b35f7442603d46..8838c26697904f562896bdfd4e6b32d3e0ce28d5 100644 --- a/services/cameraservice/sinkservice/include/distributedcameramgr/dcamera_sink_service_ipc.h +++ b/services/cameraservice/sinkservice/include/distributedcameramgr/dcamera_sink_service_ipc.h @@ -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 @@ -30,14 +30,14 @@ DECLARE_SINGLE_INSTANCE_BASE(DCameraSinkServiceIpc); public: void Init(); void UnInit(); - sptr GetSourceRemoteDHMS(const std::string& deviceId); - void OnSourceRemoteDmsDied(const wptr& remote); - void DeleteSourceRemoteDhms(const std::string& deviceId); + sptr GetSourceRemoteCamSrv(const std::string& deviceId); + void OnSourceRemoteCamSrvDied(const wptr& remote); + void DeleteSourceRemoteCamSrv(const std::string& deviceId); private: DCameraSinkServiceIpc(); ~DCameraSinkServiceIpc(); - void ClearSourceRemoteDhms(); + void ClearSourceRemoteCamSrv(); class SourceRemoteRecipient : public IRemoteObject::DeathRecipient { public: @@ -45,10 +45,10 @@ private: }; sptr sourceRemoteRecipient_; std::map> remoteSources_; - std::mutex sourceRemoteDmsLock_; + std::mutex sourceRemoteCamSrvLock_; bool isInit_; - std::mutex initDmsLock_; + std::mutex initCamSrvLock_; }; } // namespace DistributedHardware } // namespace OHOS 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 d790eb9396c8113ccdd24e82a4d00f63a7b82090..fe7ef95593dbadda2f3c71e2ea6bad3ff1ec14b0 100644 --- a/services/cameraservice/sinkservice/src/distributedcamera/distributed_camera_sink_stub.cpp +++ b/services/cameraservice/sinkservice/src/distributedcamera/distributed_camera_sink_stub.cpp @@ -60,7 +60,7 @@ int32_t DistributedCameraSinkStub::InitSinkInner(MessageParcel &data, MessagePar std::string params = data.ReadString(); int32_t ret = InitSink(params); reply.WriteInt32(ret); - return ret; + return DCAMERA_OK; } int32_t DistributedCameraSinkStub::ReleaseSinkInner(MessageParcel &data, MessageParcel &reply) @@ -68,7 +68,7 @@ int32_t DistributedCameraSinkStub::ReleaseSinkInner(MessageParcel &data, Message DHLOGD("DistributedCameraSinkStub::ReleaseSinkInner"); int32_t ret = ReleaseSink(); reply.WriteInt32(ret); - return ret; + return DCAMERA_OK; } int32_t DistributedCameraSinkStub::SubscribeLocalHardwareInner(MessageParcel &data, MessageParcel &reply) @@ -78,7 +78,7 @@ int32_t DistributedCameraSinkStub::SubscribeLocalHardwareInner(MessageParcel &da std::string parameters = data.ReadString(); int32_t ret = SubscribeLocalHardware(dhId, parameters); reply.WriteInt32(ret); - return ret; + return DCAMERA_OK; } int32_t DistributedCameraSinkStub::UnsubscribeLocalHardwareInner(MessageParcel &data, MessageParcel &reply) @@ -87,7 +87,7 @@ int32_t DistributedCameraSinkStub::UnsubscribeLocalHardwareInner(MessageParcel & std::string dhId = data.ReadString(); int32_t ret = UnsubscribeLocalHardware(dhId); reply.WriteInt32(ret); - return ret; + return DCAMERA_OK; } int32_t DistributedCameraSinkStub::StopCaptureInner(MessageParcel &data, MessageParcel &reply) @@ -96,7 +96,7 @@ int32_t DistributedCameraSinkStub::StopCaptureInner(MessageParcel &data, Message std::string dhId = data.ReadString(); int32_t ret = StopCapture(dhId); reply.WriteInt32(ret); - return ret; + return DCAMERA_OK; } int32_t DistributedCameraSinkStub::ChannelNegInner(MessageParcel &data, MessageParcel &reply) @@ -106,7 +106,7 @@ int32_t DistributedCameraSinkStub::ChannelNegInner(MessageParcel &data, MessageP std::string channelInfo = data.ReadString(); int32_t ret = ChannelNeg(dhId, channelInfo); reply.WriteInt32(ret); - return ret; + return DCAMERA_OK; } int32_t DistributedCameraSinkStub::GetCameraInfoInner(MessageParcel &data, MessageParcel &reply) @@ -116,7 +116,7 @@ int32_t DistributedCameraSinkStub::GetCameraInfoInner(MessageParcel &data, Messa std::string cameraInfo = data.ReadString(); int32_t ret = GetCameraInfo(dhId, cameraInfo); reply.WriteInt32(ret); - return ret; + return DCAMERA_OK; } int32_t DistributedCameraSinkStub::OpenChannelInner(MessageParcel &data, MessageParcel &reply) @@ -126,7 +126,7 @@ int32_t DistributedCameraSinkStub::OpenChannelInner(MessageParcel &data, Message std::string openInfo = data.ReadString(); int32_t ret = OpenChannel(dhId, openInfo); reply.WriteInt32(ret); - return ret; + return DCAMERA_OK; } int32_t DistributedCameraSinkStub::CloseChannelInner(MessageParcel &data, MessageParcel &reply) @@ -135,7 +135,7 @@ int32_t DistributedCameraSinkStub::CloseChannelInner(MessageParcel &data, Messag std::string dhId = data.ReadString(); int32_t ret = CloseChannel(dhId); reply.WriteInt32(ret); - return ret; + return DCAMERA_OK; } } // namespace DistributedHardware } // namespace OHOS \ No newline at end of file diff --git a/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_controller.cpp b/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_controller.cpp index bcbd27c39f8b3c3ce5dd704d99138b785be11a20..2f13d07f541fc1d26efca370fc9daf55375b9bbb 100644 --- a/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_controller.cpp +++ b/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_controller.cpp @@ -118,7 +118,7 @@ int32_t DCameraSinkController::DCameraNotify(std::shared_ptr& even return DCAMERA_BAD_VALUE; } - sptr sourceSA = DCameraSinkServiceIpc::GetInstance().GetSourceRemoteDHMS(srcDevId_); + sptr sourceSA = DCameraSinkServiceIpc::GetInstance().GetSourceRemoteCamSrv(srcDevId_); if (sourceSA == nullptr) { DHLOGE("DCameraSinkController::DCameraNotify sourceSA is null"); return DCAMERA_BAD_VALUE; @@ -206,7 +206,7 @@ int32_t DCameraSinkController::CloseChannel() { DHLOGI("DCameraSinkController::CloseChannel dhId: %s", GetAnonyString(dhId_).c_str()); std::lock_guard autoLock(channelLock_); - DCameraSinkServiceIpc::GetInstance().DeleteSourceRemoteDhms(srcDevId_); + DCameraSinkServiceIpc::GetInstance().DeleteSourceRemoteCamSrv(srcDevId_); srcDevId_.clear(); int32_t ret = channel_->ReleaseSession(); if (ret != DCAMERA_OK) { diff --git a/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_service_ipc.cpp b/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_service_ipc.cpp index ca457cc34c10bce988d7b7947eb90e33aee14085..e6ee40713dd7d41a35be3fc9c37fd8c752a69e6a 100644 --- a/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_service_ipc.cpp +++ b/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_service_ipc.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 @@ -40,7 +40,7 @@ IMPLEMENT_SINGLE_INSTANCE(DCameraSinkServiceIpc); void DCameraSinkServiceIpc::Init() { - std::lock_guard autoLock(initDmsLock_); + std::lock_guard autoLock(initCamSrvLock_); DHLOGI("DCameraSinkServiceIpc Init Start"); if (isInit_) { DHLOGI("DCameraSinkServiceIpc has already init"); @@ -53,74 +53,74 @@ void DCameraSinkServiceIpc::Init() void DCameraSinkServiceIpc::UnInit() { - std::lock_guard autoLock(initDmsLock_); + std::lock_guard autoLock(initCamSrvLock_); DHLOGI("DCameraSinkServiceIpc UnInit Start"); if (!isInit_) { DHLOGI("DCameraSinkServiceIpc has already UnInit"); return; } - ClearSourceRemoteDhms(); + ClearSourceRemoteCamSrv(); DHLOGI("DCameraSinkServiceIpc Start free recipient"); sourceRemoteRecipient_ = nullptr; isInit_ = false; DHLOGI("DCameraSinkServiceIpc UnInit End"); } -sptr DCameraSinkServiceIpc::GetSourceRemoteDHMS(const std::string& deviceId) +sptr DCameraSinkServiceIpc::GetSourceRemoteCamSrv(const std::string& deviceId) { if (deviceId.empty()) { - DHLOGE("GetSourceRemoteDHMS deviceId is empty"); + DHLOGE("GetSourceRemoteCamSrv deviceId is empty"); return nullptr; } { - std::lock_guard autoLock(sourceRemoteDmsLock_); + std::lock_guard autoLock(sourceRemoteCamSrvLock_); auto iter = remoteSources_.find(deviceId); if (iter != remoteSources_.end()) { auto object = iter->second; if (object != nullptr) { - DHLOGI("DCameraSinkServiceIpc GetSourceRemoteDHMS from cache devId: %s", + DHLOGI("DCameraSinkServiceIpc GetSourceRemoteCamSrv from cache devId: %s", GetAnonyString(deviceId).c_str()); return object; } } } - DHLOGI("GetSourceRemoteDHMS remote deviceid is %s", GetAnonyString(deviceId).c_str()); + DHLOGI("GetSourceRemoteCamSrv remote deviceid is %s", GetAnonyString(deviceId).c_str()); auto samgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); if (samgr == nullptr) { - DHLOGE("GetSourceRemoteDHMS failed to connect to systemAbilityMgr!"); + DHLOGE("GetSourceRemoteCamSrv failed to connect to systemAbilityMgr!"); return nullptr; } auto object = samgr->CheckSystemAbility(DISTRIBUTED_HARDWARE_CAMERA_SOURCE_SA_ID, deviceId); if (object == nullptr) { - DHLOGE("GetSourceRemoteDHMS failed get remote DHMS %s", GetAnonyString(deviceId).c_str()); + DHLOGE("GetSourceRemoteCamSrv failed get remote CamSrv %s", GetAnonyString(deviceId).c_str()); return nullptr; } int32_t ret = object->AddDeathRecipient(sourceRemoteRecipient_); - sptr remoteDmsObj = iface_cast(object); - if (remoteDmsObj == nullptr) { - DHLOGI("GetSourceRemoteDHMS failed, remoteDmsObj is null ret: %d", ret); + sptr remoteCamSrvObj = iface_cast(object); + if (remoteCamSrvObj == nullptr) { + DHLOGI("GetSourceRemoteCamSrv failed, remoteCamSrvObj is null ret: %d", ret); return nullptr; } { - std::lock_guard autoLock(sourceRemoteDmsLock_); + std::lock_guard autoLock(sourceRemoteCamSrvLock_); auto iter = remoteSources_.find(deviceId); if (iter != remoteSources_.end()) { iter->second->AsObject()->RemoveDeathRecipient(sourceRemoteRecipient_); } - remoteSources_[deviceId] = remoteDmsObj; + remoteSources_[deviceId] = remoteCamSrvObj; } - DHLOGI("GetSourceRemoteDHMS success, AddDeathRecipient ret: %d", ret); - return remoteDmsObj; + DHLOGI("GetSourceRemoteCamSrv success, AddDeathRecipient ret: %d", ret); + return remoteCamSrvObj; } -void DCameraSinkServiceIpc::DeleteSourceRemoteDhms(const std::string& deviceId) +void DCameraSinkServiceIpc::DeleteSourceRemoteCamSrv(const std::string& deviceId) { - DHLOGI("DeleteSourceRemoteDhms devId: %s", GetAnonyString(deviceId).c_str()); - std::lock_guard autoLock(sourceRemoteDmsLock_); + DHLOGI("DeleteSourceRemoteCamSrv devId: %s", GetAnonyString(deviceId).c_str()); + std::lock_guard autoLock(sourceRemoteCamSrvLock_); auto item = remoteSources_.find(deviceId); if (item == remoteSources_.end()) { - DHLOGI("DeleteSourceRemoteDhms not found device: %s", GetAnonyString(deviceId).c_str()); + DHLOGI("DeleteSourceRemoteCamSrv not found device: %s", GetAnonyString(deviceId).c_str()); return; } @@ -130,32 +130,32 @@ void DCameraSinkServiceIpc::DeleteSourceRemoteDhms(const std::string& deviceId) remoteSources_.erase(item); } -void DCameraSinkServiceIpc::ClearSourceRemoteDhms() +void DCameraSinkServiceIpc::ClearSourceRemoteCamSrv() { - DHLOGI("ClearSourceRemoteDhms Start"); - std::lock_guard autoLock(sourceRemoteDmsLock_); + DHLOGI("ClearSourceRemoteCamSrv Start"); + std::lock_guard autoLock(sourceRemoteCamSrvLock_); for (auto iter = remoteSources_.begin(); iter != remoteSources_.end(); iter++) { if (iter->second != nullptr) { iter->second->AsObject()->RemoveDeathRecipient(sourceRemoteRecipient_); } } remoteSources_.clear(); - DHLOGI("ClearSourceRemoteDhms end"); + DHLOGI("ClearSourceRemoteCamSrv end"); } void DCameraSinkServiceIpc::SourceRemoteRecipient::OnRemoteDied(const wptr& remote) { DHLOGI("SourceRemoteRecipient OnRemoteDied received died notify!"); - DCameraSinkServiceIpc::GetInstance().OnSourceRemoteDmsDied(remote); + DCameraSinkServiceIpc::GetInstance().OnSourceRemoteCamSrvDied(remote); } -void DCameraSinkServiceIpc::OnSourceRemoteDmsDied(const wptr& remote) +void DCameraSinkServiceIpc::OnSourceRemoteCamSrvDied(const wptr& remote) { - DHLOGI("OnSourceRemoteDmsDied delete diedRemoted"); - std::lock_guard autoLock(sourceRemoteDmsLock_); + DHLOGI("OnSourceRemoteCamSrvDied delete diedRemoted"); + std::lock_guard autoLock(sourceRemoteCamSrvLock_); sptr diedRemoted = remote.promote(); if (diedRemoted == nullptr) { - DHLOGE("OnSourceRemoteDmsDied promote failed!"); + DHLOGE("OnSourceRemoteCamSrvDied promote failed!"); return; } auto iter = std::find_if(remoteSources_.begin(), remoteSources_.end(), [&]( @@ -163,10 +163,10 @@ void DCameraSinkServiceIpc::OnSourceRemoteDmsDied(const wptr& rem return item.second->AsObject() == diedRemoted; }); if (iter == remoteSources_.end()) { - DHLOGI("OnSourceRemoteDmsDied not found remote object"); + DHLOGI("OnSourceRemoteCamSrvDied not found remote object"); return; } - DHLOGI("OnSourceRemoteDmsDied remote.devId: %s", GetAnonyString(iter->first).c_str()); + DHLOGI("OnSourceRemoteCamSrvDied remote.devId: %s", GetAnonyString(iter->first).c_str()); if (iter->second != nullptr) { iter->second->AsObject()->RemoveDeathRecipient(sourceRemoteRecipient_); } diff --git a/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/distributed_camera_sink_service_test.cpp b/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/distributed_camera_sink_service_test.cpp index 1eddd78a0f54c921b2942966700f998ccef493ee..e9b56f4510bfcef8016b7eede2b81df3c0b2f19f 100644 --- a/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/distributed_camera_sink_service_test.cpp +++ b/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/distributed_camera_sink_service_test.cpp @@ -60,7 +60,7 @@ void DistributedCameraSinkServiceTest::SetUpTestCase(void) g_dhId = DCameraHandler::GetInstance().GetCameras().front(); DCameraSinkHandler::GetInstance().InitSink(g_testParams); - g_service = DCameraSinkHandlerIpc::GetInstance().GetSinkLocalDHMS(); + g_service = DCameraSinkHandlerIpc::GetInstance().GetSinkLocalCamSrv(); } void DistributedCameraSinkServiceTest::TearDownTestCase(void) diff --git a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_service_ipc.h b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_service_ipc.h index abf6a69dee7710e9b17905489d4bb84a72463732..92ffac2e8f82f6797cbbd81d0fb4dbe33a65ac94 100644 --- a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_service_ipc.h +++ b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_service_ipc.h @@ -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 @@ -30,14 +30,14 @@ DECLARE_SINGLE_INSTANCE_BASE(DCameraSourceServiceIpc); public: void Init(); void UnInit(); - sptr GetSinkRemoteDHMS(const std::string& deviceId); - void OnSinkRemoteDmsDied(const wptr& remote); - void DeleteSinkRemoteDhms(const std::string& deviceId); + sptr GetSinkRemoteCamSrv(const std::string& deviceId); + void OnSinkRemoteCamSrvDied(const wptr& remote); + void DeleteSinkRemoteCamSrv(const std::string& deviceId); private: DCameraSourceServiceIpc(); ~DCameraSourceServiceIpc(); - void ClearSinkRemoteDhms(); + void ClearSinkRemoteCamSrv(); class SinkRemoteRecipient : public IRemoteObject::DeathRecipient { public: @@ -45,10 +45,10 @@ private: }; sptr sinkRemoteRecipient_; std::map> remoteSinks_; - std::mutex sinkRemoteDmsLock_; + std::mutex sinkRemoteCamSrvLock_; bool isInit_; - std::mutex initDmsLock_; + std::mutex initCamSrvLock_; }; } // namespace DistributedHardware } // namespace OHOS 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 b916b6380c1cda2f99dd697e9461d52f5ab4d8c7..e9461b544374c488e91cf79596ee663d5356069b 100644 --- a/services/cameraservice/sourceservice/src/distributedcamera/distributed_camera_source_stub.cpp +++ b/services/cameraservice/sourceservice/src/distributedcamera/distributed_camera_source_stub.cpp @@ -75,7 +75,7 @@ int32_t DistributedCameraSourceStub::InitSourceInner(MessageParcel &data, Messag ret = InitSource(params, callbackProxy); } while (0); reply.WriteInt32(ret); - return ret; + return DCAMERA_OK; } int32_t DistributedCameraSourceStub::ReleaseSourceInner(MessageParcel &data, MessageParcel &reply) @@ -84,7 +84,7 @@ int32_t DistributedCameraSourceStub::ReleaseSourceInner(MessageParcel &data, Mes (void)data; int32_t ret = ReleaseSource(); reply.WriteInt32(ret); - return ret; + return DCAMERA_OK; } int32_t DistributedCameraSourceStub::RegisterDistributedHardwareInner(MessageParcel &data, MessageParcel &reply) @@ -102,7 +102,7 @@ int32_t DistributedCameraSourceStub::RegisterDistributedHardwareInner(MessagePar DHLOGI("DistributedCameraSourceStub RegisterDistributedHardware %d", ret); } while (0); reply.WriteInt32(ret); - return ret; + return DCAMERA_OK; } int32_t DistributedCameraSourceStub::UnregisterDistributedHardwareInner(MessageParcel &data, MessageParcel &reply) @@ -116,7 +116,7 @@ int32_t DistributedCameraSourceStub::UnregisterDistributedHardwareInner(MessageP ret = UnregisterDistributedHardware(devId, dhId, reqId); } while (0); reply.WriteInt32(ret); - return ret; + return DCAMERA_OK; } int32_t DistributedCameraSourceStub::DCameraNotifyInner(MessageParcel &data, MessageParcel &reply) @@ -129,7 +129,7 @@ int32_t DistributedCameraSourceStub::DCameraNotifyInner(MessageParcel &data, Mes ret = DCameraNotify(devId, dhId, events); } while (0); reply.WriteInt32(ret); - return ret; + return DCAMERA_OK; } } // namespace DistributedHardware } // namespace OHOS diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_service_ipc.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_service_ipc.cpp index 0b1728e1dba9b0d3c9ea3697c9ab6c8224cb3195..666ca9d683caa2dfd597423385f2c7b0a0651ea3 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_service_ipc.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_service_ipc.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 @@ -40,7 +40,7 @@ IMPLEMENT_SINGLE_INSTANCE(DCameraSourceServiceIpc); void DCameraSourceServiceIpc::Init() { - std::lock_guard autoLock(initDmsLock_); + std::lock_guard autoLock(initCamSrvLock_); DHLOGI("DCameraSourceServiceIpc Init Start"); if (isInit_) { DHLOGI("DCameraSourceServiceIpc has already init"); @@ -53,74 +53,74 @@ void DCameraSourceServiceIpc::Init() void DCameraSourceServiceIpc::UnInit() { - std::lock_guard autoLock(initDmsLock_); + std::lock_guard autoLock(initCamSrvLock_); DHLOGI("DCameraSourceServiceIpc UnInit Start"); if (!isInit_) { DHLOGI("DCameraSourceServiceIpc has already UnInit"); return; } - ClearSinkRemoteDhms(); + ClearSinkRemoteCamSrv(); DHLOGI("DCameraSourceServiceIpc UnInit Start free recipient"); sinkRemoteRecipient_ = nullptr; isInit_ = false; DHLOGI("DCameraSourceServiceIpc UnInit End"); } -sptr DCameraSourceServiceIpc::GetSinkRemoteDHMS(const std::string& deviceId) +sptr DCameraSourceServiceIpc::GetSinkRemoteCamSrv(const std::string& deviceId) { if (deviceId.empty()) { - DHLOGE("GetSinkRemoteDHMS deviceId is empty"); + DHLOGE("GetSinkRemoteCamSrv deviceId is empty"); return nullptr; } { - std::lock_guard autoLock(sinkRemoteDmsLock_); + std::lock_guard autoLock(sinkRemoteCamSrvLock_); auto iter = remoteSinks_.find(deviceId); if (iter != remoteSinks_.end()) { auto object = iter->second; if (object != nullptr) { - DHLOGI("DCameraSourceServiceIpc GetSinkRemoteDHMS from cache devId: %s", + DHLOGI("DCameraSourceServiceIpc GetSinkRemoteCamSrv from cache devId: %s", GetAnonyString(deviceId).c_str()); return object; } } } - DHLOGI("GetSinkRemoteDHMS remote deviceid is %s", GetAnonyString(deviceId).c_str()); + DHLOGI("GetSinkRemoteCamSrv remote deviceid is %s", GetAnonyString(deviceId).c_str()); auto samgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); if (samgr == nullptr) { - DHLOGE("GetSinkRemoteDHMS failed to connect to systemAbilityMgr!"); + DHLOGE("GetSinkRemoteCamSrv failed to connect to systemAbilityMgr!"); return nullptr; } auto object = samgr->CheckSystemAbility(DISTRIBUTED_HARDWARE_CAMERA_SINK_SA_ID, deviceId); if (object == nullptr) { - DHLOGE("GetSinkRemoteDHMS failed get remote DHMS %s", GetAnonyString(deviceId).c_str()); + DHLOGE("GetSinkRemoteCamSrv failed get remote CamSrv %s", GetAnonyString(deviceId).c_str()); return nullptr; } int32_t ret = object->AddDeathRecipient(sinkRemoteRecipient_); - sptr remoteDmsObj = iface_cast(object); - if (remoteDmsObj == nullptr) { - DHLOGI("GetSinkRemoteDHMS failed, remoteDmsObj is null ret: %d", ret); + sptr remoteCamSrvObj = iface_cast(object); + if (remoteCamSrvObj == nullptr) { + DHLOGI("GetSinkRemoteCamSrv failed, remoteCamSrvObj is null ret: %d", ret); return nullptr; } { - std::lock_guard autoLock(sinkRemoteDmsLock_); + std::lock_guard autoLock(sinkRemoteCamSrvLock_); auto iter = remoteSinks_.find(deviceId); if (iter != remoteSinks_.end()) { iter->second->AsObject()->RemoveDeathRecipient(sinkRemoteRecipient_); } - remoteSinks_[deviceId] = remoteDmsObj; + remoteSinks_[deviceId] = remoteCamSrvObj; } - DHLOGI("GetSinkRemoteDHMS success, AddDeathRecipient ret: %d", ret); - return remoteDmsObj; + DHLOGI("GetSinkRemoteCamSrv success, AddDeathRecipient ret: %d", ret); + return remoteCamSrvObj; } -void DCameraSourceServiceIpc::DeleteSinkRemoteDhms(const std::string& deviceId) +void DCameraSourceServiceIpc::DeleteSinkRemoteCamSrv(const std::string& deviceId) { - DHLOGI("DeleteSinkRemoteDhms devId: %s", GetAnonyString(deviceId).c_str()); - std::lock_guard autoLock(sinkRemoteDmsLock_); + DHLOGI("DeleteSinkRemoteCamSrv devId: %s", GetAnonyString(deviceId).c_str()); + std::lock_guard autoLock(sinkRemoteCamSrvLock_); auto item = remoteSinks_.find(deviceId); if (item == remoteSinks_.end()) { - DHLOGI("DeleteSinkRemoteDhms not found device: %s", GetAnonyString(deviceId).c_str()); + DHLOGI("DeleteSinkRemoteCamSrv not found device: %s", GetAnonyString(deviceId).c_str()); return; } @@ -130,32 +130,32 @@ void DCameraSourceServiceIpc::DeleteSinkRemoteDhms(const std::string& deviceId) remoteSinks_.erase(item); } -void DCameraSourceServiceIpc::ClearSinkRemoteDhms() +void DCameraSourceServiceIpc::ClearSinkRemoteCamSrv() { - DHLOGI("ClearSinkRemoteDhms Start"); - std::lock_guard autoLock(sinkRemoteDmsLock_); + DHLOGI("ClearSinkRemoteCamSrv Start"); + std::lock_guard autoLock(sinkRemoteCamSrvLock_); for (auto iter = remoteSinks_.begin(); iter != remoteSinks_.end(); iter++) { if (iter->second != nullptr) { iter->second->AsObject()->RemoveDeathRecipient(sinkRemoteRecipient_); } } remoteSinks_.clear(); - DHLOGI("ClearSinkRemoteDhms end"); + DHLOGI("ClearSinkRemoteCamSrv end"); } void DCameraSourceServiceIpc::SinkRemoteRecipient::OnRemoteDied(const wptr& remote) { DHLOGI("SinkRemoteRecipient OnRemoteDied received died notify!"); - DCameraSourceServiceIpc::GetInstance().OnSinkRemoteDmsDied(remote); + DCameraSourceServiceIpc::GetInstance().OnSinkRemoteCamSrvDied(remote); } -void DCameraSourceServiceIpc::OnSinkRemoteDmsDied(const wptr& remote) +void DCameraSourceServiceIpc::OnSinkRemoteCamSrvDied(const wptr& remote) { - DHLOGI("OnSinkRemoteDmsDied delete diedRemoted"); - std::lock_guard autoLock(sinkRemoteDmsLock_); + DHLOGI("OnSinkRemoteCamSrvDied delete diedRemoted"); + std::lock_guard autoLock(sinkRemoteCamSrvLock_); sptr diedRemoted = remote.promote(); if (diedRemoted == nullptr) { - DHLOGE("OnSinkRemoteDmsDied promote failed!"); + DHLOGE("OnSinkRemoteCamSrvDied promote failed!"); return; } auto iter = std::find_if(remoteSinks_.begin(), remoteSinks_.end(), [&]( @@ -163,11 +163,11 @@ void DCameraSourceServiceIpc::OnSinkRemoteDmsDied(const wptr& rem return item.second->AsObject() == diedRemoted; }); if (iter == remoteSinks_.end()) { - DHLOGI("OnSinkRemoteDmsDied not found remote object"); + DHLOGI("OnSinkRemoteCamSrvDied not found remote object"); return; } - DHLOGI("OnSinkRemoteDmsDied remote.devId: %s", GetAnonyString(iter->first).c_str()); + DHLOGI("OnSinkRemoteCamSrvDied remote.devId: %s", GetAnonyString(iter->first).c_str()); if (iter->second != nullptr) { iter->second->AsObject()->RemoveDeathRecipient(sinkRemoteRecipient_); } diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcameracontrol/dcamera_source_controller.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcameracontrol/dcamera_source_controller.cpp index 212647a34d16db5685b3cb07167109a76aa98c96..2b36cf83d34291ed3701c1c36a2e1a89fd8b4e58 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcameracontrol/dcamera_source_controller.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcameracontrol/dcamera_source_controller.cpp @@ -107,7 +107,7 @@ int32_t DCameraSourceController::StopCapture() std::string devId = indexs_.begin()->devId_; DHLOGI("DCameraSourceController StopCapture devId: %s, dhId: %s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); - sptr camSinkSrv = DCameraSourceServiceIpc::GetInstance().GetSinkRemoteDHMS(devId); + sptr camSinkSrv = DCameraSourceServiceIpc::GetInstance().GetSinkRemoteCamSrv(devId); if (camSinkSrv == nullptr) { DHLOGE("DCameraSourceController StopCapture can not get service, devId: %s", GetAnonyString(devId).c_str()); return DCAMERA_BAD_OPERATE; @@ -134,7 +134,7 @@ int32_t DCameraSourceController::ChannelNeg(std::shared_ptr& std::string devId = indexs_.begin()->devId_; DHLOGI("DCameraSourceController ChannelNeg devId: %s, dhId: %s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); - sptr camSinkSrv = DCameraSourceServiceIpc::GetInstance().GetSinkRemoteDHMS(devId); + sptr camSinkSrv = DCameraSourceServiceIpc::GetInstance().GetSinkRemoteCamSrv(devId); if (camSinkSrv == nullptr) { DHLOGE("DCameraSourceController ChannelNeg can not get service, devId: %s", GetAnonyString(devId).c_str()); return DCAMERA_BAD_OPERATE; @@ -245,7 +245,7 @@ int32_t DCameraSourceController::GetCameraInfo(std::shared_ptr& cam std::string devId = indexs_.begin()->devId_; DHLOGI("DCameraSourceController GetCameraInfo devId: %s, dhId: %s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); - sptr camSinkSrv = DCameraSourceServiceIpc::GetInstance().GetSinkRemoteDHMS(devId); + sptr camSinkSrv = DCameraSourceServiceIpc::GetInstance().GetSinkRemoteCamSrv(devId); if (camSinkSrv == nullptr) { DHLOGE("DCameraSourceController GetCameraInfo can not get service, devId: %s", GetAnonyString(devId).c_str()); return DCAMERA_BAD_OPERATE; @@ -277,7 +277,7 @@ int32_t DCameraSourceController::OpenChannel(std::shared_ptr& o std::string devId = indexs_.begin()->devId_; DHLOGI("DCameraSourceController OpenChannel devId: %s, dhId: %s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); - sptr camSinkSrv = DCameraSourceServiceIpc::GetInstance().GetSinkRemoteDHMS(devId); + sptr camSinkSrv = DCameraSourceServiceIpc::GetInstance().GetSinkRemoteCamSrv(devId); if (camSinkSrv == nullptr) { DHLOGE("DCameraSourceController can not get service, devId: %s", GetAnonyString(devId).c_str()); return DCAMERA_BAD_OPERATE; @@ -342,13 +342,13 @@ int32_t DCameraSourceController::CloseChannel() if (ret != DCAMERA_OK) { DHLOGE("DCameraSourceController CloseChannel ReleaseSession failed %d", ret); } - sptr camSinkSrv = DCameraSourceServiceIpc::GetInstance().GetSinkRemoteDHMS(devId); + sptr camSinkSrv = DCameraSourceServiceIpc::GetInstance().GetSinkRemoteCamSrv(devId); if (camSinkSrv != nullptr) { ret = camSinkSrv->CloseChannel(dhId); if (ret != DCAMERA_OK) { DHLOGE("DCameraSourceController SA CloseChannel failed %d", ret); } - DCameraSourceServiceIpc::GetInstance().DeleteSinkRemoteDhms(devId); + DCameraSourceServiceIpc::GetInstance().DeleteSinkRemoteCamSrv(devId); } return ret; }