diff --git a/audiohandler/src/daudio_handler.cpp b/audiohandler/src/daudio_handler.cpp index f8ed4866f22965e0d4a411fbaf6b5d1c7b7ee6e3..b12f08c71d46cda55acb885322736d9800266fc5 100644 --- a/audiohandler/src/daudio_handler.cpp +++ b/audiohandler/src/daudio_handler.cpp @@ -138,10 +138,7 @@ int32_t DAudioHandler::QueryCodecInfo() { DHLOGD("Query codec information."); auto avCodecList = Media::AVCodecListFactory::CreateAVCodecList(); - if (avCodecList == nullptr) { - DHLOGE("Failed to query the avcodec information."); - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(avCodecList, ERR_DH_AUDIO_NULLPTR); bool queryFlag = false; for (auto codec : avCodecList->GetAudioEncoderCaps()) { @@ -249,10 +246,7 @@ bool DAudioHandler::IsSupportPlugin() void DAudioHandler::RegisterPluginListener(std::shared_ptr listener) { DHLOGI("Register plugin listener"); - if (listener == nullptr) { - DHLOGE("The parameter is empty."); - return; - } + CHECK_NULL_VOID(listener); listener_ = listener; } diff --git a/interfaces/inner_kits/native_cpp/audio_sink/src/daudio_sink_handler.cpp b/interfaces/inner_kits/native_cpp/audio_sink/src/daudio_sink_handler.cpp index c495bf3e241056b486fe6032fb5c4458428df92c..4a4a971fc81bb2b0de62cab82ffd797aa01a0021 100644 --- a/interfaces/inner_kits/native_cpp/audio_sink/src/daudio_sink_handler.cpp +++ b/interfaces/inner_kits/native_cpp/audio_sink/src/daudio_sink_handler.cpp @@ -50,10 +50,7 @@ int32_t DAudioSinkHandler::InitSink(const std::string ¶ms) DHLOGI("Init sink handler."); if (dAudioSinkProxy_ == nullptr) { sptr samgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - if (samgr == nullptr) { - DHLOGE("Failed to get system ability mgr."); - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(samgr, ERR_DH_AUDIO_NULLPTR); sptr loadCallback(new DAudioSinkLoadCallback(params)); int32_t ret = samgr->LoadSystemAbility(DISTRIBUTED_HARDWARE_AUDIO_SINK_SA_ID, loadCallback); if (ret != ERR_OK) { @@ -96,10 +93,7 @@ int32_t DAudioSinkHandler::SubscribeLocalHardware(const std::string &dhId, const { DHLOGI("Subscribe to local hardware."); std::lock_guard lock(sinkProxyMutex_); - if (dAudioSinkProxy_ == nullptr) { - DHLOGE("daudio sink proxy not init."); - return ERR_DH_AUDIO_SA_PROXY_NOT_INIT; - } + CHECK_NULL_RETURN(dAudioSinkProxy_, ERR_DH_AUDIO_SA_PROXY_NOT_INIT); if (dhId.length() > DAUDIO_MAX_DEVICE_ID_LEN) { return ERR_DH_AUDIO_SA_DEVID_ILLEGAL; } @@ -111,10 +105,7 @@ int32_t DAudioSinkHandler::UnsubscribeLocalHardware(const std::string &dhId) { DHLOGI("Unsubscribe from local hardware."); std::lock_guard lock(sinkProxyMutex_); - if (dAudioSinkProxy_ == nullptr) { - DHLOGE("daudio sink proxy not init."); - return ERR_DH_AUDIO_SA_PROXY_NOT_INIT; - } + CHECK_NULL_RETURN(dAudioSinkProxy_, ERR_DH_AUDIO_SA_PROXY_NOT_INIT); if (dhId.length() > DAUDIO_MAX_DEVICE_ID_LEN) { return ERR_DH_AUDIO_SA_DEVID_ILLEGAL; } @@ -126,10 +117,7 @@ void DAudioSinkHandler::OnRemoteSinkSvrDied(const wptr &remote) { DHLOGD("The daudio service of sink device died."); sptr remoteObject = remote.promote(); - if (remoteObject == nullptr) { - DHLOGE("OnRemoteDied remote promoted failed."); - return; - } + CHECK_NULL_VOID(remoteObject); std::lock_guard lock(sinkProxyMutex_); if (dAudioSinkProxy_ != nullptr) { @@ -169,10 +157,7 @@ IDistributedHardwareSink *GetSinkHardwareHandler() int32_t DAudioSinkHandler::RegisterPrivacyResources(std::shared_ptr listener) { DHLOGI("RegisterPrivacyResources start."); - if (dAudioSinkIpcCallback_ == nullptr) { - DHLOGE("Daudio sink ipc callback is nullptr."); - return ERR_DH_AUDIO_SA_PROXY_NOT_INIT; - } + CHECK_NULL_RETURN(dAudioSinkIpcCallback_, ERR_DH_AUDIO_SA_PROXY_NOT_INIT); dAudioSinkIpcCallback_->PushPrivacyResCallback(listener); return DH_SUCCESS; } @@ -181,10 +166,7 @@ int32_t DAudioSinkHandler::PauseDistributedHardware(const std::string &networkId { DHLOGI("pause distributed hardware."); std::lock_guard lock(sinkProxyMutex_); - if (dAudioSinkProxy_ == nullptr) { - DHLOGE("daudio sink proxy not init."); - return ERR_DH_AUDIO_SA_PROXY_NOT_INIT; - } + CHECK_NULL_RETURN(dAudioSinkProxy_, ERR_DH_AUDIO_SA_PROXY_NOT_INIT); return dAudioSinkProxy_->PauseDistributedHardware(networkId); } @@ -192,10 +174,7 @@ int32_t DAudioSinkHandler::ResumeDistributedHardware(const std::string &networkI { DHLOGI("resume distributed hardware."); std::lock_guard lock(sinkProxyMutex_); - if (dAudioSinkProxy_ == nullptr) { - DHLOGE("daudio sink proxy not init."); - return ERR_DH_AUDIO_SA_PROXY_NOT_INIT; - } + CHECK_NULL_RETURN(dAudioSinkProxy_, ERR_DH_AUDIO_SA_PROXY_NOT_INIT); return dAudioSinkProxy_->ResumeDistributedHardware(networkId); } @@ -203,10 +182,7 @@ int32_t DAudioSinkHandler::StopDistributedHardware(const std::string &networkId) { DHLOGI("stop distributed hardware."); std::lock_guard lock(sinkProxyMutex_); - if (dAudioSinkProxy_ == nullptr) { - DHLOGE("daudio sink proxy not init."); - return ERR_DH_AUDIO_SA_PROXY_NOT_INIT; - } + CHECK_NULL_RETURN(dAudioSinkProxy_, ERR_DH_AUDIO_SA_PROXY_NOT_INIT); return dAudioSinkProxy_->StopDistributedHardware(networkId); } } // namespace DistributedHardware diff --git a/interfaces/inner_kits/native_cpp/audio_sink/src/daudio_sink_load_callback.cpp b/interfaces/inner_kits/native_cpp/audio_sink/src/daudio_sink_load_callback.cpp index 3635929b52b74c21745703b26ee6fa23a2223b79..c81bcdbf0cdfcbb8376359d1ddaef18d2ac9bd84 100644 --- a/interfaces/inner_kits/native_cpp/audio_sink/src/daudio_sink_load_callback.cpp +++ b/interfaces/inner_kits/native_cpp/audio_sink/src/daudio_sink_load_callback.cpp @@ -28,10 +28,7 @@ void DAudioSinkLoadCallback::OnLoadSystemAbilitySuccess( int32_t systemAbilityId, const sptr &remoteObject) { DHLOGI("Load audio SA success, systemAbilityId: %d.", systemAbilityId); - if (remoteObject == nullptr) { - DHLOGE("RemoteObject is nullptr."); - return; - } + CHECK_NULL_VOID(remoteObject); DAudioSinkHandler::GetInstance().FinishStartSA(params_, remoteObject); } diff --git a/interfaces/inner_kits/native_cpp/audio_source/src/daudio_source_handler.cpp b/interfaces/inner_kits/native_cpp/audio_source/src/daudio_source_handler.cpp index 750855e1989d2f9636aa90bfea95b208a9714fbf..cc6ad07242883e05a3008f1f1f1627fc28d23755 100644 --- a/interfaces/inner_kits/native_cpp/audio_source/src/daudio_source_handler.cpp +++ b/interfaces/inner_kits/native_cpp/audio_source/src/daudio_source_handler.cpp @@ -54,10 +54,7 @@ int32_t DAudioSourceHandler::InitSource(const std::string ¶ms) DHLOGI("Init source handler."); if (dAudioSourceProxy_ == nullptr) { sptr samgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - if (samgr == nullptr) { - DHLOGE("Failed to get system ability mgr."); - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(samgr, ERR_DH_AUDIO_NULLPTR); sptr loadCallback = new DAudioSourceLoadCallback(params); int32_t ret = samgr->LoadSystemAbility(DISTRIBUTED_HARDWARE_AUDIO_SOURCE_SA_ID, loadCallback); if (ret != ERR_OK) { @@ -102,14 +99,8 @@ int32_t DAudioSourceHandler::RegisterDistributedHardware(const std::string &devI { DHLOGI("Register distributed hardware, devId: %s, dhId: %s.", GetAnonyString(devId).c_str(), dhId.c_str()); std::lock_guard lock(sourceProxyMutex_); - if (dAudioSourceProxy_ == nullptr) { - DHLOGE("Daudio source proxy not init."); - return ERR_DH_AUDIO_SA_PROXY_NOT_INIT; - } - if (dAudioIpcCallback_ == nullptr) { - DHLOGE("Daudio ipc callback is null."); - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(dAudioSourceProxy_, ERR_DH_AUDIO_SA_PROXY_NOT_INIT); + CHECK_NULL_RETURN(dAudioIpcCallback_, ERR_DH_AUDIO_NULLPTR); if (devId.length() > DAUDIO_MAX_DEVICE_ID_LEN || dhId.length() > DAUDIO_MAX_DEVICE_ID_LEN) { return ERR_DH_AUDIO_SA_DEVID_ILLEGAL; } @@ -124,14 +115,8 @@ int32_t DAudioSourceHandler::UnregisterDistributedHardware(const std::string &de { DHLOGI("Unregister distributed hardware, devId: %s, dhId: %s.", GetAnonyString(devId).c_str(), dhId.c_str()); std::lock_guard lock(sourceProxyMutex_); - if (dAudioSourceProxy_ == nullptr) { - DHLOGE("Daudio source proxy not init."); - return ERR_DH_AUDIO_SA_PROXY_NOT_INIT; - } - if (dAudioIpcCallback_ == nullptr) { - DHLOGE("Daudio ipc callback is null."); - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(dAudioSourceProxy_, ERR_DH_AUDIO_SA_PROXY_NOT_INIT); + CHECK_NULL_RETURN(dAudioIpcCallback_, ERR_DH_AUDIO_NULLPTR); if (devId.length() > DAUDIO_MAX_DEVICE_ID_LEN || dhId.length() > DAUDIO_MAX_DEVICE_ID_LEN) { return ERR_DH_AUDIO_SA_DEVID_ILLEGAL; } @@ -146,10 +131,7 @@ int32_t DAudioSourceHandler::ConfigDistributedHardware(const std::string &devId, { DHLOGI("Config distributed hardware, devId: %s, dhId: %s.", GetAnonyString(devId).c_str(), dhId.c_str()); std::lock_guard lock(sourceProxyMutex_); - if (dAudioSourceProxy_ == nullptr) { - DHLOGE("Daudio source proxy not init."); - return ERR_DH_AUDIO_SA_PROXY_NOT_INIT; - } + CHECK_NULL_RETURN(dAudioSourceProxy_, ERR_DH_AUDIO_SA_PROXY_NOT_INIT); if (devId.length() > DAUDIO_MAX_DEVICE_ID_LEN || dhId.length() > DAUDIO_MAX_DEVICE_ID_LEN) { return ERR_DH_AUDIO_SA_DEVID_ILLEGAL; } diff --git a/interfaces/inner_kits/native_cpp/audio_source/src/daudio_source_load_callback.cpp b/interfaces/inner_kits/native_cpp/audio_source/src/daudio_source_load_callback.cpp index 3d72678b8482449ba18698e80c68ff419db70a4a..134c18ef82f0eada7148a8b89d6009e9a59e3e49 100644 --- a/interfaces/inner_kits/native_cpp/audio_source/src/daudio_source_load_callback.cpp +++ b/interfaces/inner_kits/native_cpp/audio_source/src/daudio_source_load_callback.cpp @@ -28,10 +28,7 @@ void DAudioSourceLoadCallback::OnLoadSystemAbilitySuccess(int32_t systemAbilityI const sptr &remoteObject) { DHLOGI("Load audio SA success, systemAbilityId: %d.", systemAbilityId); - if (remoteObject == nullptr) { - DHLOGE("remoteObject is nullptr"); - return; - } + CHECK_NULL_VOID(remoteObject); DAudioSourceHandler::GetInstance().FinishStartSA(params_, remoteObject); } diff --git a/services/audiohdiproxy/src/daudio_hdf_operate.cpp b/services/audiohdiproxy/src/daudio_hdf_operate.cpp index 6598973d0d90ac8aab05c42d40e9a1361f8274e8..f9e0f3155fa4946ea2f659a86831d8fd50b8eeb3 100644 --- a/services/audiohdiproxy/src/daudio_hdf_operate.cpp +++ b/services/audiohdiproxy/src/daudio_hdf_operate.cpp @@ -44,10 +44,8 @@ int32_t DaudioHdfOperate::LoadDaudioHDFImpl() } servMgr_ = IServiceManager::Get(); devmgr_ = IDeviceManager::Get(); - if (servMgr_ == nullptr || devmgr_ == nullptr) { - DHLOGE("Get hdi service manager or device manager failed!"); - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(servMgr_, ERR_DH_AUDIO_NULLPTR); + CHECK_NULL_RETURN(devmgr_, ERR_DH_AUDIO_NULLPTR); ::OHOS::sptr listener( new DAudioHdfServStatListener(DAudioHdfServStatListener::StatusCallback([&](const ServiceStatus& status) { @@ -110,10 +108,7 @@ int32_t DaudioHdfOperate::UnLoadDaudioHDFImpl() { DHLOGI("UnLoad daudio hdf impl begin!"); devmgr_ = IDeviceManager::Get(); - if (devmgr_ == nullptr) { - DHLOGE("Get hdi device manager failed!"); - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(devmgr_, ERR_DH_AUDIO_NULLPTR); int32_t ret = devmgr_->UnloadDevice(AUDIO_SERVICE_NAME); if (ret != HDF_SUCCESS) { diff --git a/services/audiohdiproxy/src/daudio_hdi_handler.cpp b/services/audiohdiproxy/src/daudio_hdi_handler.cpp index 8aeba250b14bb418c5c35ba47f0a2bc02681ee3c..bd0100509a560bf5004e6f33f115170ec842b065 100644 --- a/services/audiohdiproxy/src/daudio_hdi_handler.cpp +++ b/services/audiohdiproxy/src/daudio_hdi_handler.cpp @@ -64,11 +64,7 @@ int32_t DAudioHdiHandler::InitHdiHandler() DHLOGD("Load hdf driver end."); audioSrvHdf_ = IDAudioManager::Get(HDF_AUDIO_SERVICE_NAME.c_str(), false); - if (audioSrvHdf_ == nullptr) { - DHLOGE("Can not get hdf audio manager."); - return ERR_DH_AUDIO_NULLPTR; - } - + CHECK_NULL_RETURN(audioSrvHdf_, ERR_DH_AUDIO_NULLPTR); remote_ = OHOS::HDI::hdi_objcast(audioSrvHdf_); remote_->AddDeathRecipient(audioHdiRecipient_); DHLOGI("Init hdi handler success."); @@ -78,15 +74,10 @@ int32_t DAudioHdiHandler::InitHdiHandler() int32_t DAudioHdiHandler::UninitHdiHandler() { DHLOGI("Unload hdf driver start."); - if (remote_ == nullptr) { - DHLOGE("Remote is nullptr."); - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(remote_, ERR_DH_AUDIO_NULLPTR); remote_->RemoveDeathRecipient(audioHdiRecipient_); - if (audioSrvHdf_ == nullptr) { - DHLOGI("Audio hdi proxy not init. Do not need to uninit."); - return DH_SUCCESS; - } + CHECK_NULL_RETURN(audioSrvHdf_, DH_SUCCESS); + int32_t ret = DaudioHdfOperate::GetInstance().UnLoadDaudioHDFImpl(); if (ret != DH_SUCCESS) { DHLOGE("Unload hdf driver failed, ret: %d", ret); @@ -100,10 +91,7 @@ int32_t DAudioHdiHandler::RegisterAudioDevice(const std::string &devId, const in const std::string &capability, const std::shared_ptr &callbackObjParam) { DHLOGI("Register audio device, adpname: %s, dhId: %d", GetAnonyString(devId).c_str(), dhId); - if (audioSrvHdf_ == nullptr) { - DHLOGE("Audio hdi proxy not init."); - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(audioSrvHdf_, ERR_DH_AUDIO_NULLPTR); std::string searchKey; switch (GetDevTypeByDHId(dhId)) { case AUDIO_DEVICE_TYPE_SPEAKER: @@ -146,11 +134,7 @@ int32_t DAudioHdiHandler::RegisterAudioDevice(const std::string &devId, const in int32_t DAudioHdiHandler::UnRegisterAudioDevice(const std::string &devId, const int32_t dhId) { DHLOGI("Unregister audio device, adpname: %s, dhId: %d", GetAnonyString(devId).c_str(), dhId); - if (audioSrvHdf_ == nullptr) { - DHLOGE("Audio hdi proxy not init"); - return ERR_DH_AUDIO_NULLPTR; - } - + CHECK_NULL_RETURN(audioSrvHdf_, ERR_DH_AUDIO_NULLPTR); int32_t res = audioSrvHdf_->UnRegisterAudioDevice(devId, dhId); if (res != HDF_SUCCESS) { DHLOGE("Call hdf proxy unregister failed, res: %d", res); @@ -220,16 +204,12 @@ int32_t DAudioHdiHandler::NotifyEvent(const std::string &devId, const int32_t dh { DHLOGD("Notify event adpname: %s, dhId: %d, event type: %d, event content: %s.", GetAnonyString(devId).c_str(), dhId, audioEvent.type, audioEvent.content.c_str()); - if (audioSrvHdf_ == nullptr) { - DHLOGE("Audio hdi proxy not init"); - return ERR_DH_AUDIO_NULLPTR; - } DAudioEvent newEvent = {AUDIO_EVENT_UNKNOWN, audioEvent.content}; ProcessEventMsg(audioEvent, newEvent); - int32_t res = audioSrvHdf_->NotifyEvent(devId, dhId, newEvent); - if (res != HDF_SUCCESS) { - DHLOGE("Call hdf proxy NotifyEvent failed, res: %d", res); + CHECK_NULL_RETURN(audioSrvHdf_, ERR_DH_AUDIO_NULLPTR); + if (audioSrvHdf_->NotifyEvent(devId, dhId, newEvent) != HDF_SUCCESS) { + DHLOGE("Call hdf proxy NotifyEvent failed."); return ERR_DH_AUDIO_HDI_CALL_FAILED; } return DH_SUCCESS; diff --git a/services/audiohdiproxy/src/daudio_manager_callback.cpp b/services/audiohdiproxy/src/daudio_manager_callback.cpp index 25ef232e36165b7035b8ae9661163639edea5444..f87c4807ee9fd326f8a7f919e7b6a22588a179b3 100644 --- a/services/audiohdiproxy/src/daudio_manager_callback.cpp +++ b/services/audiohdiproxy/src/daudio_manager_callback.cpp @@ -35,12 +35,8 @@ namespace DistributedHardware { int32_t DAudioManagerCallback::OpenDevice(const std::string& adpName, int32_t devId) { DHLOGI("Open device."); - if (callback_ == nullptr) { - DHLOGE("Register hdi callback is nullptr."); - return HDF_FAILURE; - } - int32_t ret = callback_->OpenDevice(adpName, devId); - if (ret != DH_SUCCESS) { + CHECK_NULL_RETURN(callback_, HDF_FAILURE); + if (callback_->OpenDevice(adpName, devId) != DH_SUCCESS) { DHLOGE("Call hdi callback failed."); return HDF_FAILURE; } @@ -50,12 +46,8 @@ int32_t DAudioManagerCallback::OpenDevice(const std::string& adpName, int32_t de int32_t DAudioManagerCallback::CloseDevice(const std::string& adpName, int32_t devId) { DHLOGI("Close device."); - if (callback_ == nullptr) { - DHLOGE("Register hdi callback is nullptr."); - return HDF_FAILURE; - } - int32_t ret = callback_->CloseDevice(adpName, devId); - if (ret != DH_SUCCESS) { + CHECK_NULL_RETURN(callback_, HDF_FAILURE); + if (callback_->CloseDevice(adpName, devId) != DH_SUCCESS) { DHLOGE("Rall hdi callback failed."); return HDF_FAILURE; } @@ -112,11 +104,7 @@ int32_t DAudioManagerCallback::GetAudioParamHDF(const AudioParameter& param, Aud int32_t DAudioManagerCallback::SetParameters(const std::string& adpName, int32_t devId, const AudioParameter& param) { DHLOGD("Set Parameters."); - if (callback_ == nullptr) { - DHLOGE("Register hdi callback is nullptr."); - return HDF_FAILURE; - } - + CHECK_NULL_RETURN(callback_, HDF_FAILURE); AudioParamHDF paramHDF; int32_t ret = GetAudioParamHDF(param, paramHDF); if (ret != DH_SUCCESS) { @@ -135,10 +123,7 @@ int32_t DAudioManagerCallback::NotifyEvent(const std::string& adpName, int32_t d const OHOS::HDI::DistributedAudio::Audioext::V1_0::DAudioEvent& event) { DHLOGI("Notify event."); - if (callback_ == nullptr) { - DHLOGE("Register hdi callback is nullptr."); - return HDF_FAILURE; - } + CHECK_NULL_RETURN(callback_, HDF_FAILURE); AudioEvent newEvent(AudioEventType::EVENT_UNKNOWN, event.content); switch (event.type) { case AudioEventHDF::AUDIO_EVENT_VOLUME_SET: @@ -184,12 +169,7 @@ int32_t DAudioManagerCallback::NotifyEvent(const std::string& adpName, int32_t d int32_t DAudioManagerCallback::WriteStreamData(const std::string &adpName, int32_t devId, const OHOS::HDI::DistributedAudio::Audioext::V1_0::AudioData &data) { - DHLOGD("Write Stream Data."); - if (callback_ == nullptr) { - DHLOGE("Register hdi callback is nullptr."); - return HDF_FAILURE; - } - DHLOGD("Audio data param frameSize is %d.", data.param.frameSize); + DHLOGD("Write Stream Data, audio data param frameSize is %d.", data.param.frameSize); if (data.param.frameSize == 0 || data.param.frameSize > DEFAULT_AUDIO_DATA_SIZE) { DHLOGE("Audio data param frameSize is 0. or > 4096"); return HDF_FAILURE; @@ -201,8 +181,9 @@ int32_t DAudioManagerCallback::WriteStreamData(const std::string &adpName, int32 DHLOGE("Copy audio data failed, error code %d.", ret); return HDF_FAILURE; } - ret = callback_->WriteStreamData(adpName, devId, audioData); - if (ret != DH_SUCCESS) { + + CHECK_NULL_RETURN(callback_, HDF_FAILURE); + if (callback_->WriteStreamData(adpName, devId, audioData) != DH_SUCCESS) { DHLOGE("WriteStreamData failed."); return HDF_FAILURE; } @@ -213,17 +194,14 @@ int32_t DAudioManagerCallback::ReadStreamData(const std::string &adpName, int32_ OHOS::HDI::DistributedAudio::Audioext::V1_0::AudioData &data) { DHLOGD("Read stream data."); - if (callback_ == nullptr) { - DHLOGE("Register hdi callback is nullptr."); - return HDF_FAILURE; - } - std::shared_ptr audioData = nullptr; - int32_t ret = callback_->ReadStreamData(adpName, devId, audioData); - if (ret != DH_SUCCESS || audioData == nullptr) { + CHECK_NULL_RETURN(callback_, HDF_FAILURE); + if (callback_->ReadStreamData(adpName, devId, audioData) != DH_SUCCESS) { DHLOGE("Read stream data failed."); return HDF_FAILURE; } + + CHECK_NULL_RETURN(audioData, HDF_FAILURE); data.data.assign(audioData->Data(), audioData->Data()+audioData->Capacity()); DHLOGD("Read stream data success."); return HDF_SUCCESS; @@ -233,13 +211,9 @@ int32_t DAudioManagerCallback::ReadMmapPosition(const std::string &adpName, int3 uint64_t &frames, OHOS::HDI::DistributedAudio::Audioext::V1_0::CurrentTime &time) { DHLOGD("Read mmap position"); - if (callback_ == nullptr) { - DHLOGE("Regisiter hdi callback id nullptr."); - return HDF_FAILURE; - } CurrentTimeHDF timeHdf; - int32_t ret = callback_->ReadMmapPosition(adpName, devId, frames, timeHdf); - if (ret != DH_SUCCESS) { + CHECK_NULL_RETURN(callback_, HDF_FAILURE); + if (callback_->ReadMmapPosition(adpName, devId, frames, timeHdf) != DH_SUCCESS) { DHLOGE("Read mmap position failed."); return HDF_FAILURE; } @@ -253,12 +227,8 @@ int32_t DAudioManagerCallback::RefreshAshmemInfo(const std::string &adpName, int int fd, int32_t ashmemLength, int32_t lengthPerTrans) { DHLOGD("Refresh ashmem info."); - if (callback_ == nullptr) { - DHLOGE("Regisiter hdi callback id nullptr."); - return HDF_FAILURE; - } - int32_t ret = callback_->RefreshAshmemInfo(adpName, devId, fd, ashmemLength, lengthPerTrans); - if (ret != DH_SUCCESS) { + CHECK_NULL_RETURN(callback_, HDF_FAILURE); + if (callback_->RefreshAshmemInfo(adpName, devId, fd, ashmemLength, lengthPerTrans) != DH_SUCCESS) { DHLOGE("Refresh ashmem info failed."); return HDF_FAILURE; } diff --git a/services/audiomanager/servicesink/src/daudio_sink_service.cpp b/services/audiomanager/servicesink/src/daudio_sink_service.cpp index 8e504ec9ca5187e5f38d96cdffdd0f7389f7456d..d8afb8bb6e5780f8991a3cb14ec76477f8bee734 100644 --- a/services/audiomanager/servicesink/src/daudio_sink_service.cpp +++ b/services/audiomanager/servicesink/src/daudio_sink_service.cpp @@ -84,10 +84,7 @@ int32_t DAudioSinkService::ReleaseSink() DAudioSinkManager::GetInstance().UnInit(); DHLOGI("Audio sink service process exit."); auto systemAbilityMgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - if (systemAbilityMgr == nullptr) { - DHLOGE("Failed to get systemabilitymanager."); - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(systemAbilityMgr, ERR_DH_AUDIO_NULLPTR); int32_t ret = systemAbilityMgr->UnloadSystemAbility(DISTRIBUTED_HARDWARE_AUDIO_SINK_SA_ID); if (ret != DH_SUCCESS) { DHLOGE("Sink systemabilitymgr unloadsystemability failed, ret: %d", ret); diff --git a/services/audiomanager/servicesink/src/daudio_sink_stub.cpp b/services/audiomanager/servicesink/src/daudio_sink_stub.cpp index af9123502afc351a3cf6bfd11292e43bad735b2c..6f4a4cb470cd76d06c1889e505e49bf14316a576 100644 --- a/services/audiomanager/servicesink/src/daudio_sink_stub.cpp +++ b/services/audiomanager/servicesink/src/daudio_sink_stub.cpp @@ -93,11 +93,7 @@ int32_t DAudioSinkStub::InitSinkInner(MessageParcel &data, MessageParcel &reply, } std::string param = data.ReadString(); sptr remoteObject = data.ReadRemoteObject(); - if (remoteObject == nullptr) { - DHLOGE("Read ReadRemoteObject failed."); - return ERR_DH_AUDIO_NULLPTR; - } - + CHECK_NULL_RETURN(remoteObject, ERR_DH_AUDIO_NULLPTR); sptr dAudioSinkIpcCallbackProxy(new DAudioSinkIpcCallbackProxy(remoteObject)); int32_t ret = InitSink(param, dAudioSinkIpcCallbackProxy); reply.WriteInt32(ret); diff --git a/services/audiomanager/servicesource/src/daudio_source_service.cpp b/services/audiomanager/servicesource/src/daudio_source_service.cpp index c620d1d873daf4320d0dc9090cd4ab14280c251a..69eaffe9f9120622fa631f22eb904cf38d81d6e9 100644 --- a/services/audiomanager/servicesource/src/daudio_source_service.cpp +++ b/services/audiomanager/servicesource/src/daudio_source_service.cpp @@ -84,10 +84,7 @@ int32_t DAudioSourceService::ReleaseSource() DAudioSourceManager::GetInstance().UnInit(); DHLOGI("Audio source service process exit."); auto systemAbilityMgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - if (systemAbilityMgr == nullptr) { - DHLOGE("Failed to get systemabilitymanager."); - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(systemAbilityMgr, ERR_DH_AUDIO_NULLPTR); int32_t ret = systemAbilityMgr->UnloadSystemAbility(DISTRIBUTED_HARDWARE_AUDIO_SOURCE_SA_ID); if (ret != DH_SUCCESS) { DHLOGE("Source systemabilitymgr unloadsystemability failed, ret: %d", ret); diff --git a/services/audiomanager/servicesource/src/daudio_source_stub.cpp b/services/audiomanager/servicesource/src/daudio_source_stub.cpp index 2ddea3bee9863a0b7e9eb5d46de01e0e3976033d..85b9083ce885e1361e25f271c82102c79166fe73 100644 --- a/services/audiomanager/servicesource/src/daudio_source_stub.cpp +++ b/services/audiomanager/servicesource/src/daudio_source_stub.cpp @@ -83,11 +83,7 @@ int32_t DAudioSourceStub::InitSourceInner(MessageParcel &data, MessageParcel &re } std::string param = data.ReadString(); sptr remoteObject = data.ReadRemoteObject(); - if (remoteObject == nullptr) { - DHLOGE("Read param failed."); - return ERR_DH_AUDIO_NULLPTR; - } - + CHECK_NULL_RETURN(remoteObject, ERR_DH_AUDIO_NULLPTR); sptr dAudioIpcCallbackProxy(new DAudioIpcCallbackProxy(remoteObject)); int32_t ret = InitSource(param, dAudioIpcCallbackProxy); reply.WriteInt32(ret); diff --git a/services/audioprocessor/directprocessor/src/audio_direct_processor.cpp b/services/audioprocessor/directprocessor/src/audio_direct_processor.cpp index 02a360f6a45f481159e47f6b4f2cf0ec9328d381..cc71510f7f8818cf72264c97fa5fa59a3bcf0f7e 100644 --- a/services/audioprocessor/directprocessor/src/audio_direct_processor.cpp +++ b/services/audioprocessor/directprocessor/src/audio_direct_processor.cpp @@ -29,11 +29,7 @@ int32_t AudioDirectProcessor::ConfigureAudioProcessor(const AudioCommonParam &lo const AudioCommonParam &remoteDevParam, const std::shared_ptr &procCallback) { DHLOGI("Configure direct audio processor."); - if (procCallback == nullptr) { - DHLOGE("Processor callback is null."); - return ERR_DH_AUDIO_BAD_VALUE; - } - + CHECK_NULL_RETURN(procCallback, ERR_DH_AUDIO_BAD_VALUE); procCallback_ = procCallback; return DH_SUCCESS; } @@ -59,16 +55,9 @@ int32_t AudioDirectProcessor::StopAudioProcessor() int32_t AudioDirectProcessor::FeedAudioProcessor(const std::shared_ptr &inputData) { DHLOGD("Feed audio processor."); - if (inputData == nullptr) { - DHLOGE("Input data is null."); - return ERR_DH_AUDIO_BAD_VALUE; - } - + CHECK_NULL_RETURN(inputData, ERR_DH_AUDIO_BAD_VALUE); auto cbObj = procCallback_.lock(); - if (cbObj == nullptr) { - DHLOGE("Processor callback is null."); - return ERR_DH_AUDIO_BAD_VALUE; - } + CHECK_NULL_RETURN(cbObj, ERR_DH_AUDIO_BAD_VALUE); cbObj->OnAudioDataDone(inputData); return DH_SUCCESS; } diff --git a/services/audiotransport/audiochannel/audiodatachannel/src/audio_data_channel.cpp b/services/audiotransport/audiochannel/audiodatachannel/src/audio_data_channel.cpp index 80992e5cf2c22f474006909ad98bfebe7c087fd3..3da91b9f2609416c5ebcfba4a5d4bc6316aa750e 100644 --- a/services/audiotransport/audiochannel/audiodatachannel/src/audio_data_channel.cpp +++ b/services/audiotransport/audiochannel/audiodatachannel/src/audio_data_channel.cpp @@ -28,11 +28,7 @@ int32_t AudioDataChannel::CreateSession(const std::shared_ptrGetStateType()); return currentState_->GetStateType(); } int32_t AudioTransportContext::Start() { - if (currentState_ == nullptr) { - DHLOGD("CurrentState is nullptr."); - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(currentState_, ERR_DH_AUDIO_NULLPTR); DHLOGI("Audio transport context start."); return currentState_->Start(audioChannel_, processor_); } int32_t AudioTransportContext::Stop() { - if (currentState_ == nullptr) { - DHLOGD("CurrentState is nullptr."); - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(currentState_, ERR_DH_AUDIO_NULLPTR); DHLOGI("Audio transport context stop."); return currentState_->Stop(audioChannel_, processor_); } int32_t AudioTransportContext::Pause() { - if (currentState_ == nullptr) { - DHLOGD("CurrentState is nullptr."); - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(currentState_, ERR_DH_AUDIO_NULLPTR); DHLOGI("Audio transport context pause."); return currentState_->Pause(processor_); } int32_t AudioTransportContext::Restart(const AudioParam &localParam, const AudioParam &remoteParam) { - if (currentState_ == nullptr) { - DHLOGD("CurrentState is nullptr."); - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(currentState_, ERR_DH_AUDIO_NULLPTR); DHLOGI("Audio transport context restart."); return currentState_->Restart(localParam, remoteParam, processor_); } diff --git a/services/audiotransport/audiotransportstatus/src/audio_transport_pause_status.cpp b/services/audiotransport/audiotransportstatus/src/audio_transport_pause_status.cpp index a9ea72f05e39e74ceacbc7e0ccddf32f26e1741d..afe7fb329bf92d4d48e83ba1cad5d0e4b8b8d0d8 100644 --- a/services/audiotransport/audiotransportstatus/src/audio_transport_pause_status.cpp +++ b/services/audiotransport/audiotransportstatus/src/audio_transport_pause_status.cpp @@ -42,21 +42,16 @@ int32_t AudioTransportPauseStatus::Stop(std::shared_ptr audioChan std::shared_ptr processor) { (void)processor; - DHLOGI("Audiotransport status is pause."); - if (audioChannel == nullptr) { - DHLOGE("audioChannel is null."); - return ERR_DH_AUDIO_NULLPTR; - } + DHLOGI("Audio transport status is pause."); + CHECK_NULL_RETURN(audioChannel, ERR_DH_AUDIO_NULLPTR); int32_t ret = audioChannel->CloseSession(); if (ret != DH_SUCCESS) { DHLOGE("Close session failed, ret: %d.", ret); return ret; } + std::shared_ptr stateContext = stateContext_.lock(); - if (stateContext == nullptr) { - DHLOGE("AudioTransport start can not get context"); - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(stateContext, ERR_DH_AUDIO_NULLPTR); stateContext->SetTransportStatus(TRANSPORT_STATE_STOP); return DH_SUCCESS; } @@ -64,7 +59,7 @@ int32_t AudioTransportPauseStatus::Stop(std::shared_ptr audioChan int32_t AudioTransportPauseStatus::Pause(std::shared_ptr processor) { (void)processor; - DHLOGI("Audiotransport status is pasue."); + DHLOGI("Audio transport status is pasue."); return DH_SUCCESS; } @@ -72,20 +67,15 @@ int32_t AudioTransportPauseStatus::Restart(const AudioParam &localParam, const A std::shared_ptr processor) { DHLOGI("Restart."); - if (processor == nullptr) { - DHLOGE("processor is null."); - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(processor, ERR_DH_AUDIO_NULLPTR); auto ret = processor->StartAudioProcessor(); if (ret != DH_SUCCESS) { - DHLOGE("Restart processor_ failed, ret: %d.", ret); + DHLOGE("Restart processor failed, ret: %d.", ret); return ret; } + std::shared_ptr stateContext = stateContext_.lock(); - if (stateContext == nullptr) { - DHLOGE("AudioTransport start can not get context"); - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(stateContext, ERR_DH_AUDIO_NULLPTR); stateContext->SetTransportStatus(TRANSPORT_STATE_START); DHLOGI("Restart success."); return DH_SUCCESS; @@ -93,7 +83,7 @@ int32_t AudioTransportPauseStatus::Restart(const AudioParam &localParam, const A TransportStateType AudioTransportPauseStatus::GetStateType() { - DHLOGI("Audiotransport get state stype."); + DHLOGI("Audio transport get state stype."); return TRANSPORT_STATE_PAUSE; } } // namespace DistributedHardware diff --git a/services/audiotransport/audiotransportstatus/src/audio_transport_start_status.cpp b/services/audiotransport/audiotransportstatus/src/audio_transport_start_status.cpp index 5d5a364a7c873f3aa61df2554ff274c8ebea9759..8db19bf8a79e70d6b2fb1ea50aeb07f6bfbf7e80 100644 --- a/services/audiotransport/audiotransportstatus/src/audio_transport_start_status.cpp +++ b/services/audiotransport/audiotransportstatus/src/audio_transport_start_status.cpp @@ -33,49 +33,37 @@ int32_t AudioTransportStartStatus::Start(std::shared_ptr audioCha { (void)audioChannel; (void)processor; - DHLOGI("Audiotransport status is start."); + DHLOGI("Audio transport status is start."); return DH_SUCCESS; } int32_t AudioTransportStartStatus::Stop(std::shared_ptr audioChannel, std::shared_ptr processor) { - DHLOGI("Audiotransport status is start."); - if (processor == nullptr) { - DHLOGE("processor is null."); - return ERR_DH_AUDIO_NULLPTR; - } + DHLOGI("Audio transport status is start."); + CHECK_NULL_RETURN(processor, ERR_DH_AUDIO_NULLPTR); + CHECK_NULL_RETURN(audioChannel, ERR_DH_AUDIO_NULLPTR); + int32_t ret = processor->StopAudioProcessor(); if (ret != DH_SUCCESS) { DHLOGE("Stop audio processor failed, ret: %d.", ret); return ret; } - if (audioChannel == nullptr) { - DHLOGE("audioChannel is null."); - return ERR_DH_AUDIO_NULLPTR; - } ret = audioChannel->CloseSession(); if (ret != DH_SUCCESS) { DHLOGE("Close session failed, ret: %d.", ret); return ret; } std::shared_ptr stateContext = stateContext_.lock(); - if (stateContext == nullptr) { - DHLOGE("AudioTransport start can not get context"); - return ERR_DH_AUDIO_BAD_VALUE; - } + CHECK_NULL_RETURN(stateContext, ERR_DH_AUDIO_BAD_VALUE); stateContext->SetTransportStatus(TRANSPORT_STATE_STOP); return DH_SUCCESS; } int32_t AudioTransportStartStatus::Pause(std::shared_ptr processor) { - DHLOGI("Audiotransport status is start."); - if (processor == nullptr) { - DHLOGE("Processor_ is null."); - return ERR_DH_AUDIO_NULLPTR; - } - + DHLOGI("Audio transport status is start."); + CHECK_NULL_RETURN(processor, ERR_DH_AUDIO_NULLPTR); int32_t ret = processor->StopAudioProcessor(); if (ret != DH_SUCCESS) { DHLOGE("Pause processor failed, ret: %d.", ret); @@ -86,11 +74,9 @@ int32_t AudioTransportStartStatus::Pause(std::shared_ptr proces DHLOGE("Release audio processor failed, ret: %d.", ret); return ret; } + std::shared_ptr stateContext = stateContext_.lock(); - if (stateContext == nullptr) { - DHLOGE("AudioTransport start can not get context"); - return ERR_DH_AUDIO_BAD_VALUE; - } + CHECK_NULL_RETURN(stateContext, ERR_DH_AUDIO_BAD_VALUE); stateContext->SetTransportStatus(TRANSPORT_STATE_PAUSE); DHLOGI("Pause success."); return DH_SUCCESS; @@ -102,13 +88,13 @@ int32_t AudioTransportStartStatus::Restart(const AudioParam &localParam, const A (void)localParam; (void)remoteParam; (void)processor; - DHLOGE("Audiotransport status is start."); + DHLOGE("Audio transport status is start."); return DH_SUCCESS; } TransportStateType AudioTransportStartStatus::GetStateType() { - DHLOGD("Get audiotransport status."); + DHLOGD("Get audio transport status."); return TRANSPORT_STATE_START; } } // namespace DistributedHardware diff --git a/services/audiotransport/audiotransportstatus/src/audio_transport_stop_status.cpp b/services/audiotransport/audiotransportstatus/src/audio_transport_stop_status.cpp index 73f3bcb48df39c67ce05517b6d8ac7eaad7df6fb..4614ae82d172aa7d8a64644330a880fc625a6caf 100644 --- a/services/audiotransport/audiotransportstatus/src/audio_transport_stop_status.cpp +++ b/services/audiotransport/audiotransportstatus/src/audio_transport_stop_status.cpp @@ -32,21 +32,16 @@ int32_t AudioTransportStopStatus::Start(std::shared_ptr audioChan std::shared_ptr processor) { (void)audioChannel; - if (processor == nullptr) { - DHLOGE("Processor is null, setup first."); - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(processor, ERR_DH_AUDIO_NULLPTR); int32_t ret = processor->StartAudioProcessor(); if (ret != DH_SUCCESS) { DHLOGE("Open audio processor failed ret: %d.", ret); processor = nullptr; return ERR_DH_AUDIO_NULLPTR; } + std::shared_ptr stateContext = stateContext_.lock(); - if (stateContext == nullptr) { - DHLOGE("AudioTransport start can not get context"); - return ERR_DH_AUDIO_BAD_VALUE; - } + CHECK_NULL_RETURN(stateContext, ERR_DH_AUDIO_BAD_VALUE); stateContext->SetTransportStatus(TRANSPORT_STATE_START); DHLOGI("Start success."); return DH_SUCCESS; @@ -57,14 +52,14 @@ int32_t AudioTransportStopStatus::Stop(std::shared_ptr audioChann { (void)audioChannel; (void)processor; - DHLOGE("Audiotransportstatus status is stop."); + DHLOGE("Audio transport status status is stop."); return DH_SUCCESS; } int32_t AudioTransportStopStatus::Pause(std::shared_ptr processor) { (void)processor; - DHLOGE("Audiotransport status is stop, can not pause."); + DHLOGE("Audio transport status is stop, can not pause."); return ERR_DH_AUDIO_TRANS_ILLEGAL_OPERATION; } @@ -74,7 +69,7 @@ int32_t AudioTransportStopStatus::Restart(const AudioParam &localParam, const Au (void)localParam; (void)remoteParam; (void)processor; - DHLOGE("Audiotransport status status is stop, can not restart."); + DHLOGE("Audio transport status status is stop, can not restart."); return ERR_DH_AUDIO_TRANS_ILLEGAL_OPERATION; } diff --git a/services/audiotransport/decodetransport/src/audio_decode_transport.cpp b/services/audiotransport/decodetransport/src/audio_decode_transport.cpp index 178ee56b8fccaf4ab37b03107bdcaae87dd0a04f..9c129c291c1e9dc490a228359afece5ee08b1c36 100644 --- a/services/audiotransport/decodetransport/src/audio_decode_transport.cpp +++ b/services/audiotransport/decodetransport/src/audio_decode_transport.cpp @@ -29,10 +29,7 @@ namespace DistributedHardware { int32_t AudioDecodeTransport::SetUp(const AudioParam &localParam, const AudioParam &remoteParam, const std::shared_ptr &callback, const PortCapType capType) { - if (callback == nullptr) { - DHLOGE("The parameter is empty."); - return ERR_DH_AUDIO_TRANS_ERROR; - } + CHECK_NULL_RETURN(callback, ERR_DH_AUDIO_TRANS_ERROR); dataTransCallback_ = callback; context_ = std::make_shared(); context_->SetTransportStatus(TRANSPORT_STATE_STOP); @@ -49,10 +46,9 @@ int32_t AudioDecodeTransport::SetUp(const AudioParam &localParam, const AudioPar int32_t AudioDecodeTransport::Start() { DHLOGI("Start audio decode transport."); - if (audioChannel_ == nullptr || context_ == nullptr) { - DHLOGE("Audio channel or context is null."); - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(audioChannel_, ERR_DH_AUDIO_NULLPTR); + CHECK_NULL_RETURN(context_, ERR_DH_AUDIO_NULLPTR); + if (capType_ == CAP_MIC && audioChannel_->OpenSession() != DH_SUCCESS) { DHLOGE("Audio channel open session failed."); return ERR_DH_AUDIO_TRANS_SESSION_NOT_OPEN; @@ -72,20 +68,14 @@ int32_t AudioDecodeTransport::Stop() if (audioChannel_ != nullptr) { audioChannel_->CloseSession(); } - if (context_ == nullptr) { - DHLOGE("Context is null."); - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(context_, ERR_DH_AUDIO_NULLPTR); return context_->Stop(); } int32_t AudioDecodeTransport::Pause() { DHLOGI("Pause."); - if (context_ == nullptr) { - DHLOGE("Context is null."); - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(context_, ERR_DH_AUDIO_NULLPTR); return context_->Pause(); } @@ -98,10 +88,7 @@ int32_t AudioDecodeTransport::Restart(const AudioParam &localParam, const AudioP processor_ = nullptr; return ERR_DH_AUDIO_TRANS_ERROR; } - if (context_ == nullptr) { - DHLOGE("Context is null."); - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(context_, ERR_DH_AUDIO_NULLPTR); return context_->Restart(localParam, remoteParam); } @@ -162,10 +149,7 @@ void AudioDecodeTransport::OnSessionOpened() { DHLOGI("On channel session opened."); auto cbObj = dataTransCallback_.lock(); - if (cbObj == nullptr) { - DHLOGE("On channel session opened. Callback is nullptr."); - return; - } + CHECK_NULL_VOID(cbObj); cbObj->OnStateChange(AudioEventType::DATA_OPENED); } @@ -173,24 +157,16 @@ void AudioDecodeTransport::OnSessionClosed() { DHLOGI("On channel session closed."); auto cbObj = dataTransCallback_.lock(); - if (cbObj == nullptr) { - DHLOGE("On channel session closed. Callback is nullptr."); - return; - } + CHECK_NULL_VOID(cbObj); cbObj->OnStateChange(AudioEventType::DATA_CLOSED); } void AudioDecodeTransport::OnDataReceived(const std::shared_ptr &data) { DHLOGI("On audio data received."); - if (processor_ == nullptr) { - DHLOGE("Processor is null, setup first."); - return; - } - - int32_t ret = processor_->FeedAudioProcessor(data); - if (ret != DH_SUCCESS) { - DHLOGE("Feed audio processor failed ret: %d.", ret); + CHECK_NULL_VOID(processor_); + if (processor_->FeedAudioProcessor(data) != DH_SUCCESS) { + DHLOGE("Feed audio processor failed."); } } @@ -204,10 +180,7 @@ void AudioDecodeTransport::OnAudioDataDone(const std::shared_ptr &out DHLOGI("On audio data done."); std::lock_guard lock(dataQueueMtx_); auto cbObj = dataTransCallback_.lock(); - if (cbObj == nullptr) { - DHLOGE("On audio data done. Callback is nullptr."); - return; - } + CHECK_NULL_VOID(cbObj); cbObj->OnDecodeTransDataDone(outputData); } @@ -247,10 +220,7 @@ int32_t AudioDecodeTransport::RegisterChannelListener(const PortCapType capType) DHLOGE("Create session failed."); return ERR_DH_AUDIO_TRANS_ERROR; } - if (context_ == nullptr) { - DHLOGE("Register channel listener error, state context is null"); - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(context_, ERR_DH_AUDIO_NULLPTR); context_->SetAudioChannel(audioChannel_); return DH_SUCCESS; } @@ -268,10 +238,7 @@ int32_t AudioDecodeTransport::RegisterProcessorListener(const AudioParam &localP DHLOGE("Configure audio processor failed."); return ret; } - if (context_ == nullptr) { - DHLOGE("Register processor listener error, state context is null"); - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(context_, ERR_DH_AUDIO_NULLPTR); context_->SetAudioProcessor(processor_); return DH_SUCCESS; } diff --git a/services/audiotransport/encodetransport/src/audio_encode_transport.cpp b/services/audiotransport/encodetransport/src/audio_encode_transport.cpp index 1ce3b332ef37ef20ba7a4188ce06acf9cdcdf740..4510bae688bdc7242d54a3cec42c758cc0af28e7 100644 --- a/services/audiotransport/encodetransport/src/audio_encode_transport.cpp +++ b/services/audiotransport/encodetransport/src/audio_encode_transport.cpp @@ -29,10 +29,7 @@ namespace DistributedHardware { int32_t AudioEncodeTransport::SetUp(const AudioParam &localParam, const AudioParam &remoteParam, const std::shared_ptr &callback, const PortCapType capType) { - if (callback == nullptr) { - DHLOGE("The parameter is empty."); - return ERR_DH_AUDIO_TRANS_ERROR; - } + CHECK_NULL_RETURN(callback, ERR_DH_AUDIO_TRANS_ERROR); dataTransCallback_ = callback; context_ = std::make_shared(); context_->SetTransportStatus(TRANSPORT_STATE_STOP); @@ -49,10 +46,8 @@ int32_t AudioEncodeTransport::SetUp(const AudioParam &localParam, const AudioPar int32_t AudioEncodeTransport::Start() { DHLOGI("Start audio encode transport."); - if (audioChannel_ == nullptr || context_ == nullptr) { - DHLOGE("Audio channel or context is null."); - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(audioChannel_, ERR_DH_AUDIO_NULLPTR); + CHECK_NULL_RETURN(context_, ERR_DH_AUDIO_NULLPTR); if (capType_ == CAP_SPK && audioChannel_->OpenSession() != DH_SUCCESS) { DHLOGE("Audio channel open session failed."); return ERR_DH_AUDIO_TRANS_SESSION_NOT_OPEN; @@ -70,20 +65,14 @@ int32_t AudioEncodeTransport::Start() int32_t AudioEncodeTransport::Stop() { DHLOGI("Stop audio encode transport."); - if (context_ == nullptr) { - DHLOGE("Context is null."); - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(context_, ERR_DH_AUDIO_NULLPTR); return context_->Stop(); } int32_t AudioEncodeTransport::Pause() { DHLOGI("Pause."); - if (context_ == nullptr) { - DHLOGE("Context is null."); - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(context_, ERR_DH_AUDIO_NULLPTR); return context_->Pause(); } @@ -96,10 +85,7 @@ int32_t AudioEncodeTransport::Restart(const AudioParam &localParam, const AudioP processor_ = nullptr; return ERR_DH_AUDIO_TRANS_ERROR; } - if (context_ == nullptr) { - DHLOGE("Context is null."); - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(context_, ERR_DH_AUDIO_NULLPTR); return context_->Restart(localParam, remoteParam); } @@ -197,10 +183,7 @@ int32_t AudioEncodeTransport::RegisterChannelListener(const PortCapType capType) DHLOGE("CreateSession failed."); return ERR_DH_AUDIO_TRANS_ERROR; } - if (context_ == nullptr) { - DHLOGE("Register channel listener error. state Context is null"); - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(context_, ERR_DH_AUDIO_NULLPTR); context_->SetAudioChannel(audioChannel_); return DH_SUCCESS; } @@ -213,20 +196,15 @@ int32_t AudioEncodeTransport::RegisterProcessorListener(const AudioParam &localP localParam.renderOpts.renderFlags, localParam.captureOpts.capturerFlags); processor_ = std::make_shared(); } - if (audioChannel_ == nullptr) { - DHLOGE("Create audio processor failed."); - return ERR_DH_AUDIO_TRANS_ERROR; - } - + CHECK_NULL_RETURN(audioChannel_, ERR_DH_AUDIO_TRANS_ERROR); + CHECK_NULL_RETURN(processor_, ERR_DH_AUDIO_NULLPTR); auto ret = processor_->ConfigureAudioProcessor(localParam.comParam, remoteParam.comParam, shared_from_this()); if (ret != DH_SUCCESS) { DHLOGE("Configure audio processor failed."); return ERR_DH_AUDIO_TRANS_ERROR; } - if (context_ == nullptr) { - DHLOGE("Register processor listener error. state Context is null"); - return ERR_DH_AUDIO_NULLPTR; - } + + CHECK_NULL_RETURN(context_, ERR_DH_AUDIO_NULLPTR); context_->SetAudioProcessor(processor_); return DH_SUCCESS; } @@ -235,10 +213,7 @@ void AudioEncodeTransport::OnSessionOpened() { DHLOGD("On channel session opened."); auto cbObj = dataTransCallback_.lock(); - if (cbObj == nullptr) { - DHLOGE("On channel session opened. callback is nullptr."); - return; - } + CHECK_NULL_VOID(cbObj); cbObj->OnStateChange(AudioEventType::DATA_OPENED); } @@ -246,10 +221,7 @@ void AudioEncodeTransport::OnSessionClosed() { DHLOGD("On channel session close."); auto cbObj = dataTransCallback_.lock(); - if (cbObj == nullptr) { - DHLOGE("On channel session closed. callback is nullptr."); - return; - } + CHECK_NULL_VOID(cbObj); cbObj->OnStateChange(AudioEventType::DATA_CLOSED); } diff --git a/services/audiotransport/receiverengine/src/av_receiver_engine_adapter.cpp b/services/audiotransport/receiverengine/src/av_receiver_engine_adapter.cpp index 75d3eb578ee7e81a4350a9761864d893f9f3b653..2fc07ea8ddc702869fb91b790feeefd9593712ab 100644 --- a/services/audiotransport/receiverengine/src/av_receiver_engine_adapter.cpp +++ b/services/audiotransport/receiverengine/src/av_receiver_engine_adapter.cpp @@ -30,17 +30,13 @@ namespace DistributedHardware { constexpr int32_t WAIT_TIMEOUT_MS = 5000; int32_t AVTransReceiverAdapter::Initialize(IAVEngineProvider *providerPtr, const std::string &peerDevId) { - DHLOGI("Initialize!"); + DHLOGI("Init av reveiver engine."); if (initialized_.load()) { return DH_SUCCESS; } - if (providerPtr == nullptr) { - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(providerPtr, ERR_DH_AUDIO_NULLPTR); receiverEngine_ = providerPtr->CreateAVReceiverEngine(peerDevId); - if (receiverEngine_ == nullptr) { - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(receiverEngine_, ERR_DH_AUDIO_NULLPTR); receiverEngine_->RegisterReceiverCallback(shared_from_this()); initialized_ = true; return DH_SUCCESS; @@ -48,11 +44,11 @@ int32_t AVTransReceiverAdapter::Initialize(IAVEngineProvider *providerPtr, const int32_t AVTransReceiverAdapter::Release() { - DHLOGI("Release!"); + DHLOGI("Release av reveiver engine."); if (receiverEngine_ != nullptr) { int32_t ret = receiverEngine_->Release(); if (ret != DH_SUCCESS) { - DHLOGE("Release av transport receiver engine failed"); + DHLOGE("Release av receiver engine failed"); } } initialized_ = false; @@ -63,59 +59,44 @@ int32_t AVTransReceiverAdapter::Release() int32_t AVTransReceiverAdapter::Start() { - DHLOGI("Start enter"); - if (receiverEngine_ == nullptr) { - DHLOGE("Av transport receiver engine is null."); - return ERR_DH_AUDIO_NULLPTR; - } + DHLOGI("Start av reveiver engine."); + CHECK_NULL_RETURN(receiverEngine_, ERR_DH_AUDIO_NULLPTR); return receiverEngine_->Start(); } int32_t AVTransReceiverAdapter::Stop() { - DHLOGI("Stop!"); - if (receiverEngine_ == nullptr) { - DHLOGE("Av transport receiver engine is null."); - return ERR_DH_AUDIO_NULLPTR; - } + DHLOGI("Stop av reveiver engine."); + CHECK_NULL_RETURN(receiverEngine_, ERR_DH_AUDIO_NULLPTR); return receiverEngine_->Stop(); } int32_t AVTransReceiverAdapter::SetParameter(const AVTransTag &tag, const std::string ¶m) { - if (receiverEngine_ == nullptr) { - DHLOGE("av transport receiver engine is null"); - return ERR_DH_AUDIO_NULLPTR; - } - int32_t ret = receiverEngine_->SetParameter(tag, param); - if (ret != DH_SUCCESS) { - DHLOGE("Set av transport receiver parameter failed, ret: %d.", ret); - } - return ret; + DHLOGI("Set parameter."); + CHECK_NULL_RETURN(receiverEngine_, ERR_DH_AUDIO_NULLPTR); + return receiverEngine_->SetParameter(tag, param); } int32_t AVTransReceiverAdapter::CreateControlChannel(const std::string &peerDevId) { - DHLOGI("CreateControlChannel enter, peerDevId:%s", GetAnonyString(peerDevId).c_str()); + DHLOGI("Create control channel, peerDevId:%s.", GetAnonyString(peerDevId).c_str()); if (chnCreateSuccess_.load()) { - DHLOGI("Av transport receiver channel already created"); + DHLOGI("Receiver channel already created."); return DH_SUCCESS; } - if (receiverEngine_ == nullptr) { - DHLOGE("Av transport receiver engine is null"); - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(receiverEngine_, ERR_DH_AUDIO_NULLPTR); std::vector dstDevIds = {peerDevId}; int32_t ret = receiverEngine_->CreateControlChannel(dstDevIds, ChannelAttribute{TransStrategy::LOW_LATANCY_STRATEGY}); if (ret != DH_SUCCESS) { - DHLOGE("Create av transport receiver channel failed, ret: %d", ret); + DHLOGE("Create av receiver channel failed, ret: %d", ret); return ERR_DH_AV_TRANS_CREATE_CHANNEL_FAILED; } ret = WaitForChannelCreated(); if (ret != DH_SUCCESS) { - DHLOGE("Wait for create av transport sender channel failed, ret: %d", ret); + DHLOGE("Wait create sender channel failed, ret: %d", ret); return ERR_DH_AV_TRANS_CREATE_CHANNEL_FAILED; } return DH_SUCCESS; @@ -124,22 +105,14 @@ int32_t AVTransReceiverAdapter::CreateControlChannel(const std::string &peerDevI int32_t AVTransReceiverAdapter::SendMessageToRemote(const std::shared_ptr &message) { DHLOGI("Send message to remote."); - if (receiverEngine_ == nullptr) { - return ERR_DH_AUDIO_NULLPTR; - } - int32_t ret = receiverEngine_->SendMessage(message); - if (ret != DH_SUCCESS) { - DHLOGE("Send meassage to remote sender engine failed, ret: %d.", ret); - return ret; - } - return DH_SUCCESS; + CHECK_NULL_RETURN(receiverEngine_, ERR_DH_AUDIO_NULLPTR); + return receiverEngine_->SendMessage(message); } int32_t AVTransReceiverAdapter::RegisterAdapterCallback(const std::shared_ptr &callback) { - if (callback == nullptr) { - return ERR_DH_AUDIO_NULLPTR; - } + DHLOGI("Register adapter callback."); + CHECK_NULL_RETURN(callback, ERR_DH_AUDIO_NULLPTR); adapterCallback_ = callback; return DH_SUCCESS; } @@ -149,11 +122,11 @@ int32_t AVTransReceiverAdapter::WaitForChannelCreated() std::unique_lock lock(chnCreatedMtx_); auto status = chnCreatedCondVar_.wait_for(lock, std::chrono::milliseconds(WAIT_TIMEOUT_MS)); if (status == std::cv_status::timeout) { - DHLOGI("Wait for av transport receiver channel created timeout"); + DHLOGI("Wait timeout."); return ERR_DH_AUDIO_SA_WAIT_TIMEOUT; } if (!chnCreateSuccess_.load()) { - DHLOGE("Create av transport receiver channel failed"); + DHLOGE("Create av receiver channel failed."); return ERR_DH_AV_TRANS_CREATE_CHANNEL_FAILED; } return DH_SUCCESS; @@ -161,7 +134,7 @@ int32_t AVTransReceiverAdapter::WaitForChannelCreated() int32_t AVTransReceiverAdapter::OnReceiverEvent(const AVTransEvent &event) { - DHLOGI("On Receiver event, type: %d", event.type); + DHLOGI("On receive event, type: %d", event.type); switch (event.type) { case EventType::EVENT_CHANNEL_OPEN_FAIL: case EventType::EVENT_CHANNEL_OPENED: { @@ -176,12 +149,12 @@ int32_t AVTransReceiverAdapter::OnReceiverEvent(const AVTransEvent &event) case EventType::EVENT_ENGINE_ERROR: case EventType::EVENT_REMOTE_ERROR: if (adapterCallback_ != nullptr) { - DHLOGI("callback on engine event."); + DHLOGI("On receive event."); adapterCallback_->OnEngineEvent(event); } break; default: - DHLOGI("Invaild event type"); + DHLOGI("Invaild event type."); break; } return DH_SUCCESS; diff --git a/services/audiotransport/receiverengine/src/av_receiver_engine_transport.cpp b/services/audiotransport/receiverengine/src/av_receiver_engine_transport.cpp index feb40bb6282e3cce2412bd338f18dd9622e9af6c..a311d5f1edfc4ee7ad79c177c4a28da6366de7ff 100644 --- a/services/audiotransport/receiverengine/src/av_receiver_engine_transport.cpp +++ b/services/audiotransport/receiverengine/src/av_receiver_engine_transport.cpp @@ -28,18 +28,17 @@ namespace OHOS { namespace DistributedHardware { int32_t AVTransReceiverTransport::InitEngine(IAVEngineProvider *providerPtr) { - DHLOGI("InitReceiverEngine enter."); + DHLOGI("Init av receiver engine."); if (receiverAdapter_ == nullptr) { receiverAdapter_ = std::make_shared(); } int32_t ret = receiverAdapter_->Initialize(providerPtr, devId_); if (ret != DH_SUCCESS) { - DHLOGE("initialize av receiver adapter failed."); + DHLOGE("Init av receiver adapter failed."); return ret; } - ret = receiverAdapter_->RegisterAdapterCallback(shared_from_this()); - if (ret != DH_SUCCESS) { - DHLOGE("InitReceiverEngine register callback error."); + if (receiverAdapter_->RegisterAdapterCallback(shared_from_this()) != DH_SUCCESS) { + DHLOGE("Register callback error."); } return ret; } @@ -56,84 +55,50 @@ int32_t AVTransReceiverTransport::SetUp(const AudioParam &localParam, const Audi int32_t AVTransReceiverTransport::CreateCtrl() { DHLOGI("Create ctrl enter."); - if (receiverAdapter_ == nullptr) { - DHLOGE("av transport receiver adapter is null"); - return ERR_DH_AUDIO_NULLPTR; - } - int32_t ret = receiverAdapter_->CreateControlChannel(devId_); - if (ret != DH_SUCCESS) { - DHLOGE("create av receiver control channel failed."); - } - return ret; + CHECK_NULL_RETURN(receiverAdapter_, ERR_DH_AUDIO_NULLPTR); + return receiverAdapter_->CreateControlChannel(devId_); } int32_t AVTransReceiverTransport::Start() { - DHLOGI("StartReceiverEngine enter."); - if (receiverAdapter_ == nullptr) { - DHLOGE("av transport receiver adapter is null"); - return ERR_DH_AUDIO_NULLPTR; - } - int32_t ret = receiverAdapter_->Start(); - if (ret != DH_SUCCESS) { - DHLOGE("start av receiver engine failed"); - } - return ret; + DHLOGI("Start av receiver engine."); + CHECK_NULL_RETURN(receiverAdapter_, ERR_DH_AUDIO_NULLPTR); + return receiverAdapter_->Start(); } int32_t AVTransReceiverTransport::Stop() { - DHLOGI("StopReceiverEngine enter."); - if (receiverAdapter_ == nullptr) { - DHLOGE("StopReceiverEngine adapter is null"); - return ERR_DH_AUDIO_NULLPTR; - } - int32_t ret = receiverAdapter_->Stop(); - if (ret != DH_SUCCESS) { - DHLOGE("StopReceiveEngine error."); - } - return ret; + DHLOGI("Stop av receiver engine."); + CHECK_NULL_RETURN(receiverAdapter_, ERR_DH_AUDIO_NULLPTR); + return receiverAdapter_->Stop(); } int32_t AVTransReceiverTransport::Release() { - DHLOGI("ReleaseReceiverEngine enter."); - if (receiverAdapter_ == nullptr) { - DHLOGE("ReleaseReceiverEngine adapter is null"); - return ERR_DH_AUDIO_NULLPTR; - } - int32_t ret = receiverAdapter_->Release(); - if (ret != DH_SUCCESS) { - DHLOGE("ReleaseReceiverEngine error."); - } - return ret; + DHLOGI("Release av receiver engine."); + CHECK_NULL_RETURN(receiverAdapter_, ERR_DH_AUDIO_NULLPTR); + return receiverAdapter_->Release(); } int32_t AVTransReceiverTransport::Pause() { - DHLOGI("AVTransReceiverTransport Pause enter."); - if (receiverAdapter_ == nullptr) { - DHLOGE("Pause error. receiver adapter is null."); - return ERR_DH_AUDIO_NULLPTR; - } + DHLOGI("Pause av receiver engine."); + CHECK_NULL_RETURN(receiverAdapter_, ERR_DH_AUDIO_NULLPTR); return receiverAdapter_->SetParameter(AVTransTag::ENGINE_PAUSE, ""); } int32_t AVTransReceiverTransport::Restart(const AudioParam &localParam, const AudioParam &remoteParam) { + DHLOGI("Restart av receiver engine."); (void)localParam; (void)remoteParam; - DHLOGI("AVTransReceiverTransport Restart enter."); - if (receiverAdapter_ == nullptr) { - DHLOGE("Restart error. receiver adapter is null."); - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(receiverAdapter_, ERR_DH_AUDIO_NULLPTR); return receiverAdapter_->SetParameter(AVTransTag::ENGINE_RESUME, ""); } int32_t AVTransReceiverTransport::FeedAudioData(std::shared_ptr &audioData) { - DHLOGI("ReceiverEngine feed audiodata not support."); + DHLOGI("Receiver engine not support."); (void)audioData; return DH_SUCCESS; } @@ -141,47 +106,28 @@ int32_t AVTransReceiverTransport::FeedAudioData(std::shared_ptr &audi int32_t AVTransReceiverTransport::SendMessage(uint32_t type, std::string content, std::string dstDevId) { DHLOGI("Send message to remote. type: %u, content: %s.", type, content.c_str()); - if (receiverAdapter_ == nullptr) { - DHLOGE("FeedAudioData receiver adapter is null."); - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(receiverAdapter_, ERR_DH_AUDIO_NULLPTR); auto message = std::make_shared(type, content, dstDevId); - int32_t ret = receiverAdapter_->SendMessageToRemote(message); - if (ret != DH_SUCCESS) { - DHLOGE("Send message to remote engine failed"); - } - return ret; + return receiverAdapter_->SendMessageToRemote(message); } void AVTransReceiverTransport::OnEngineEvent(const AVTransEvent &event) { - if (transCallback_ == nullptr) { - DHLOGE("Trans callback is nullptr."); - return; - } + CHECK_NULL_VOID(transCallback_); transCallback_->OnEngineTransEvent(event); } void AVTransReceiverTransport::OnEngineMessage(const std::shared_ptr &message) { - if (message == nullptr) { - DHLOGE("The parameter is nullptr"); - return; - } - if (transCallback_ == nullptr) { - DHLOGE("Event callback is nullptr."); - return; - } + CHECK_NULL_VOID(message); + CHECK_NULL_VOID(transCallback_); transCallback_->OnEngineTransMessage(message); } void AVTransReceiverTransport::OnEngineDataAvailable(const std::shared_ptr &buffer) { - DHLOGI("On Engine Data available"); - if (buffer == nullptr) { - DHLOGE("The parameter is nullptr"); - return; - } + DHLOGI("On data availabled."); + CHECK_NULL_VOID(buffer); auto bufferData = buffer->GetBufferData(0); std::shared_ptr audioData = std::make_shared(bufferData->GetSize()); int32_t ret = memcpy_s(audioData->Data(), audioData->Capacity(), bufferData->GetAddress(), bufferData->GetSize()); @@ -189,16 +135,14 @@ void AVTransReceiverTransport::OnEngineDataAvailable(const std::shared_ptrOnEngineTransDataAvailable(audioData); } int32_t AVTransReceiverTransport::SetParameter(const AudioParam &audioParam) { DHLOGI("SetParameter."); - if (receiverAdapter_ == nullptr) { - DHLOGE("SetParameter error. adapter is null."); - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(receiverAdapter_, ERR_DH_AUDIO_NULLPTR); receiverAdapter_->SetParameter(AVTransTag::AUDIO_SAMPLE_RATE, std::to_string(audioParam.comParam.sampleRate)); receiverAdapter_->SetParameter(AVTransTag::AUDIO_SAMPLE_FORMAT, std::to_string(AudioSampleFormat::SAMPLE_F32LE)); receiverAdapter_->SetParameter(AVTransTag::AUDIO_CHANNEL_MASK, std::to_string(audioParam.comParam.channelMask)); diff --git a/services/audiotransport/senderengine/src/av_sender_engine_adapter.cpp b/services/audiotransport/senderengine/src/av_sender_engine_adapter.cpp index 51881a2618874af38a61966a48b56477beff955c..85dca86af032ee2203bfce7c4a0290204e0bffb4 100644 --- a/services/audiotransport/senderengine/src/av_sender_engine_adapter.cpp +++ b/services/audiotransport/senderengine/src/av_sender_engine_adapter.cpp @@ -32,19 +32,14 @@ constexpr int32_t WAIT_TIMEOUT_MS = 5000; int32_t AVTransSenderAdapter::Initialize(IAVEngineProvider *providerPtr, const std::string &peerDevId) { - DHLOGI("Initialize!"); + DHLOGI("Init av sender engine."); + CHECK_NULL_RETURN(providerPtr, ERR_DH_AUDIO_NULLPTR); if (initialized_.load()) { return DH_SUCCESS; } - if (providerPtr == nullptr) { - DHLOGE("Av Transport sender engine provider ptr is null"); - return ERR_DH_AUDIO_NULLPTR; - } + senderEngine_ = providerPtr->CreateAVSenderEngine(peerDevId); - if (senderEngine_ == nullptr) { - DHLOGE("Create av transport sender engine is null"); - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(senderEngine_, ERR_DH_AUDIO_NULLPTR); senderEngine_->RegisterSenderCallback(shared_from_this()); initialized_ = true; return DH_SUCCESS; @@ -52,11 +47,10 @@ int32_t AVTransSenderAdapter::Initialize(IAVEngineProvider *providerPtr, const s int32_t AVTransSenderAdapter::Release() { - DHLOGI("Release!"); + DHLOGI("Release av sender engine."); if (senderEngine_ != nullptr) { - int32_t ret = senderEngine_->Release(); - if (ret != DH_SUCCESS) { - DHLOGE("Release av transport sender engine failed"); + if (senderEngine_->Release() != DH_SUCCESS) { + DHLOGE("Release av sender engine failed"); } } initialized_ = false; @@ -67,41 +61,32 @@ int32_t AVTransSenderAdapter::Release() int32_t AVTransSenderAdapter::Start() { - DHLOGI("Start!"); - if (senderEngine_ == nullptr) { - DHLOGE("Av transport sender engine is null"); - return ERR_DH_AUDIO_NULLPTR; - } + DHLOGI("Start av sender engine."); + CHECK_NULL_RETURN(senderEngine_, ERR_DH_AUDIO_NULLPTR); return senderEngine_->Start(); } int32_t AVTransSenderAdapter::Stop() { - DHLOGI("Stop"); - if (senderEngine_ == nullptr) { - DHLOGE("Av transport sender engine is null"); - return ERR_DH_AUDIO_NULLPTR; - } + DHLOGI("Stop av sender engine."); + CHECK_NULL_RETURN(senderEngine_, ERR_DH_AUDIO_NULLPTR); return senderEngine_->Stop(); } int32_t AVTransSenderAdapter::CreateControlChannel(const std::string &peerDevId) { - DHLOGI("createControlChannel enter, peerDevId:%s", GetAnonyString(peerDevId).c_str()); + DHLOGI("Create control channel,peerDevId:%s", GetAnonyString(peerDevId).c_str()); if (chnCreateSuccess_.load()) { - DHLOGI("Av transport sender channel already created"); + DHLOGI("Channel already created."); return DH_SUCCESS; } - if (senderEngine_ == nullptr) { - DHLOGE("Av transport sender engine is null"); - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(senderEngine_, ERR_DH_AUDIO_NULLPTR); std::vector dstDevIds = {peerDevId}; int32_t ret = senderEngine_->CreateControlChannel(dstDevIds, ChannelAttribute{TransStrategy::LOW_LATANCY_STRATEGY}); if (ret != DH_SUCCESS) { - DHLOGI("Create av transport sender channel failed, ret: %d", ret); + DHLOGI("Create control channel failed, ret: %d", ret); return ERR_DH_AV_TRANS_CREATE_CHANNEL_FAILED; } ret = WaitForChannelCreated(); @@ -114,56 +99,33 @@ int32_t AVTransSenderAdapter::CreateControlChannel(const std::string &peerDevId) int32_t AVTransSenderAdapter::SetParameter(const AVTransTag &tag, const std::string ¶m) { - if (senderEngine_ == nullptr) { - DHLOGE("av transport sender engine is null"); - return ERR_DH_AUDIO_NULLPTR; - } - int32_t ret = senderEngine_->SetParameter(tag, param); - if (ret != DH_SUCCESS) { - DHLOGE("Set av transport sender parameter failed, ret: %d", ret); - } - return ret; + DHLOGI("Set audio param."); + CHECK_NULL_RETURN(senderEngine_, ERR_DH_AUDIO_NULLPTR); + return senderEngine_->SetParameter(tag, param); } int32_t AVTransSenderAdapter::PushData(std::shared_ptr &audioData) { - if (senderEngine_ == nullptr) { - DHLOGE("Av transport sender engine null"); - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(senderEngine_, ERR_DH_AUDIO_NULLPTR); auto transBuffer = std::make_shared(MetaType::AUDIO); auto bufferData = transBuffer->CreateBufferData(audioData->Size()); - bufferData->Write(audioData->Data(), audioData->Size()); + CHECK_NULL_RETURN(bufferData, ERR_DH_AUDIO_NULLPTR); - int32_t ret = senderEngine_->PushData(transBuffer); - if (ret != DH_SUCCESS) { - DHLOGE("Push data to av transport sender failed"); - return ret; - } - return DH_SUCCESS; + bufferData->Write(audioData->Data(), audioData->Size()); + return senderEngine_->PushData(transBuffer); } int32_t AVTransSenderAdapter::SendMessageToRemote(const std::shared_ptr &message) { - DHLOGI("Send message to remote"); - if (senderEngine_ == nullptr) { - DHLOGE("Av transport sender engine is null"); - return ERR_DH_AUDIO_NULLPTR; - } - int32_t ret = senderEngine_->SendMessage(message); - if (ret != DH_SUCCESS) { - DHLOGE("Send Message to remote receiver engine failed, ret: %d", ret); - return ret; - } - return DH_SUCCESS; + DHLOGI("Send message to remote."); + CHECK_NULL_RETURN(senderEngine_, ERR_DH_AUDIO_NULLPTR); + return senderEngine_->SendMessage(message); } int32_t AVTransSenderAdapter::RegisterAdapterCallback(const std::shared_ptr &callback) { - DHLOGI("RegisterAdapterCallback"); - if (callback == nullptr) { - return ERR_DH_AUDIO_NULLPTR; - } + DHLOGI("Register adapter callback."); + CHECK_NULL_RETURN(callback, ERR_DH_AUDIO_NULLPTR); adapterCallback_ = callback; return DH_SUCCESS; } @@ -173,11 +135,11 @@ int32_t AVTransSenderAdapter::WaitForChannelCreated() std::unique_lock lock(chnCreatedMtx_); auto status = chnCreatedCondVar_.wait_for(lock, std::chrono::milliseconds(WAIT_TIMEOUT_MS)); if (status == std::cv_status::timeout) { - DHLOGI("Wait for av transport sender channel created timeout"); + DHLOGI("Wait timeout."); return ERR_DH_AUDIO_SA_WAIT_TIMEOUT; } if (!chnCreateSuccess_.load()) { - DHLOGE("Create av transport sender channel failed"); + DHLOGE("Create av sender channel failed."); return ERR_DH_AV_TRANS_CREATE_CHANNEL_FAILED; } return DH_SUCCESS; @@ -200,12 +162,12 @@ int32_t AVTransSenderAdapter::OnSenderEvent(const AVTransEvent &event) case EventType::EVENT_ENGINE_ERROR: case EventType::EVENT_REMOTE_ERROR: if (adapterCallback_ != nullptr) { - DHLOGI("callback on engine event."); + DHLOGI("Send event."); adapterCallback_->OnEngineEvent(event); } break; default: - DHLOGI("Invaild event type"); + DHLOGI("Invaild event type."); break; } return DH_SUCCESS; diff --git a/services/audiotransport/senderengine/src/av_sender_engine_transport.cpp b/services/audiotransport/senderengine/src/av_sender_engine_transport.cpp index 65321ec1706390913d6e8d4b36c9eb4992c467fa..8493465a1aa732871f75896ab34fedbedb27b853 100644 --- a/services/audiotransport/senderengine/src/av_sender_engine_transport.cpp +++ b/services/audiotransport/senderengine/src/av_sender_engine_transport.cpp @@ -27,23 +27,22 @@ namespace OHOS { namespace DistributedHardware { int32_t AVTransSenderTransport::InitEngine(IAVEngineProvider *providerPtr) { - DHLOGI("InitSenderEngine enter"); + DHLOGI("Init av sender engine."); if (senderAdapter_ == nullptr) { - DHLOGD("SenderAdapter_ is null, create new."); senderAdapter_ = std::make_shared(); } int32_t ret = senderAdapter_->Initialize(providerPtr, devId_); if (ret != DH_SUCCESS) { - DHLOGE("initialize av sender adapter failed."); + DHLOGE("Init av adapter failed."); return ret; } - DHLOGI("Init SenderEngine success"); ret = senderAdapter_->RegisterAdapterCallback(shared_from_this()); if (ret != DH_SUCCESS) { - DHLOGE("InitSenderEngine register callback error."); + DHLOGE("Register callback failed."); } return ret; } + int32_t AVTransSenderTransport::SetUp(const AudioParam &localParam, const AudioParam &remoteParam, const std::shared_ptr &callback, const PortCapType capType) { @@ -55,139 +54,79 @@ int32_t AVTransSenderTransport::SetUp(const AudioParam &localParam, const AudioP int32_t AVTransSenderTransport::Start() { - DHLOGI("StartSenderEngine enter."); - if (senderAdapter_ == nullptr) { - DHLOGE("av transport sender adapter is null"); - return ERR_DH_AUDIO_NULLPTR; - } - int32_t ret = senderAdapter_->Start(); - if (ret != DH_SUCCESS) { - DHLOGE("start av sender engine failed"); - } - return ret; + DHLOGI("Start av sender engine."); + CHECK_NULL_RETURN(senderAdapter_, ERR_DH_AUDIO_NULLPTR); + return senderAdapter_->Start(); } int32_t AVTransSenderTransport::CreateCtrl() { - DHLOGI("Create ctrl enter."); - if (senderAdapter_ == nullptr) { - DHLOGE("av transport sender adapter is null"); - return ERR_DH_AUDIO_NULLPTR; - } - int32_t ret = senderAdapter_->CreateControlChannel(devId_); - if (ret != DH_SUCCESS) { - DHLOGE("create av sender control channel failed."); - } - return ret; + DHLOGI("Create control channel."); + CHECK_NULL_RETURN(senderAdapter_, ERR_DH_AUDIO_NULLPTR); + return senderAdapter_->CreateControlChannel(devId_); } int32_t AVTransSenderTransport::Stop() { - DHLOGI("StopSenderEngine enter."); - if (senderAdapter_ == nullptr) { - DHLOGE("av transport sender adapter is null"); - return ERR_DH_AUDIO_NULLPTR; - } - int32_t ret = senderAdapter_->Stop(); - if (ret != DH_SUCCESS) { - DHLOGE("av transport sender adapter is null"); - } - return ret; + DHLOGI("Stop av sender engine."); + CHECK_NULL_RETURN(senderAdapter_, ERR_DH_AUDIO_NULLPTR); + return senderAdapter_->Stop(); } int32_t AVTransSenderTransport::Pause() { - DHLOGI("AVTransSenderTransport Pause enter."); - if (senderAdapter_ == nullptr) { - DHLOGE("Pause error. sender adapter is null."); - return ERR_DH_AUDIO_NULLPTR; - } + DHLOGI("Pause av sender engine."); + CHECK_NULL_RETURN(senderAdapter_, ERR_DH_AUDIO_NULLPTR); return senderAdapter_->SetParameter(AVTransTag::ENGINE_PAUSE, ""); } int32_t AVTransSenderTransport::Restart(const AudioParam &localParam, const AudioParam &remoteParam) { + DHLOGI("Restart av sender engine."); (void)localParam; (void)remoteParam; - DHLOGI("AVTransSenderTransport Restart enter."); - if (senderAdapter_ == nullptr) { - DHLOGE("Pause error. sender adapter is null."); - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(senderAdapter_, ERR_DH_AUDIO_NULLPTR); return senderAdapter_->SetParameter(AVTransTag::ENGINE_RESUME, ""); } int32_t AVTransSenderTransport::Release() { - DHLOGI("RelaseSenderEngine enter."); - if (senderAdapter_ == nullptr) { - DHLOGE("ReleaseSenderEngine sender adapter is null."); - return ERR_DH_AUDIO_NULLPTR; - } - int32_t ret = senderAdapter_->Release(); - if (ret != DH_SUCCESS) { - DHLOGE("Release av sender engine failed."); - } - return ret; + DHLOGI("Relase av sender engine."); + CHECK_NULL_RETURN(senderAdapter_, ERR_DH_AUDIO_NULLPTR); + return senderAdapter_->Release(); } int32_t AVTransSenderTransport::FeedAudioData(std::shared_ptr &audioData) { - if (senderAdapter_ == nullptr) { - DHLOGE("FeedAudioData sender adapter is null."); - return ERR_DH_AUDIO_NULLPTR; - } - int32_t ret = senderAdapter_->PushData(audioData); - if (ret != DH_SUCCESS) { - DHLOGE("push data failed."); - } - return ret; + CHECK_NULL_RETURN(senderAdapter_, ERR_DH_AUDIO_NULLPTR); + return senderAdapter_->PushData(audioData); } int32_t AVTransSenderTransport::SendMessage(uint32_t type, std::string content, std::string dstDevId) { - DHLOGI("Send message to remote. type: %u, content: %s.", type, content.c_str()); - if (senderAdapter_ == nullptr) { - DHLOGE("FeedAudioData sender adapter is null."); - return ERR_DH_AUDIO_NULLPTR; - } + DHLOGI("Send message, msg type: %u, msg content: %s.", type, content.c_str()); + CHECK_NULL_RETURN(senderAdapter_, ERR_DH_AUDIO_NULLPTR); auto message = std::make_shared(type, content, dstDevId); - int32_t ret = senderAdapter_->SendMessageToRemote(message); - if (ret != DH_SUCCESS) { - DHLOGE("Send message to remote engine failed"); - } - return ret; + return senderAdapter_->SendMessageToRemote(message); } void AVTransSenderTransport::OnEngineEvent(const AVTransEvent &event) { - if (transCallback_ == nullptr) { - DHLOGE("Trans callback is nullptr."); - return; - } + CHECK_NULL_VOID(transCallback_); transCallback_->OnEngineTransEvent(event); } void AVTransSenderTransport::OnEngineMessage(const std::shared_ptr &message) { - if (message == nullptr) { - DHLOGE("The parameter is nullptr"); - return; - } - if (transCallback_ == nullptr) { - DHLOGE("Event callback is nullptr."); - return; - } + CHECK_NULL_VOID(message); + CHECK_NULL_VOID(transCallback_); transCallback_->OnEngineTransMessage(message); } int32_t AVTransSenderTransport::SetParameter(const AudioParam &audioParam) { - DHLOGI("SetParameter."); - if (senderAdapter_ == nullptr) { - DHLOGE("SetParameter error. adapter is null."); - return ERR_DH_AUDIO_NULLPTR; - } + DHLOGI("Set audio parameter."); + CHECK_NULL_RETURN(senderAdapter_, ERR_DH_AUDIO_NULLPTR); senderAdapter_->SetParameter(AVTransTag::AUDIO_SAMPLE_RATE, std::to_string(audioParam.comParam.sampleRate)); senderAdapter_->SetParameter(AVTransTag::AUDIO_SAMPLE_FORMAT, std::to_string(audioParam.comParam.bitFormat)); senderAdapter_->SetParameter(AVTransTag::AUDIO_CHANNEL_MASK, std::to_string(audioParam.comParam.channelMask)); diff --git a/services/hdfaudioclient/src/daudio_adapter_internal.cpp b/services/hdfaudioclient/src/daudio_adapter_internal.cpp index 7ce5bc0929b3c9ff2b75ce940077c6a7584554fc..b6128c28084e09ca129fdfd97b4fd41d495f68ee 100644 --- a/services/hdfaudioclient/src/daudio_adapter_internal.cpp +++ b/services/hdfaudioclient/src/daudio_adapter_internal.cpp @@ -34,15 +34,9 @@ using namespace OHOS::HDI::DistributedAudio::Audio::V1_0; static int32_t InitAllPortsInternal(struct AudioAdapter *adapter) { - if (adapter == nullptr) { - DHLOGE("The parameter is empty."); - return ERR_DH_AUDIO_HDI_INVALID_PARAM; - } + CHECK_NULL_RETURN(adapter, ERR_DH_AUDIO_HDI_INVALID_PARAM); AudioAdapterContext *context = reinterpret_cast(adapter); - if (context->proxy_ == nullptr) { - DHLOGE("The context or proxy for the context is nullptr."); - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(context->proxy_, ERR_DH_AUDIO_NULLPTR); return context->proxy_->InitAllPorts(); } @@ -68,16 +62,13 @@ static int32_t CreateRenderInternal(struct AudioAdapter *adapter, const struct : const struct ::AudioSampleAttributes *attrs, struct AudioRender **render) { DHLOGI("Create distributed audio render."); - if (adapter == nullptr || desc == nullptr || attrs == nullptr || render == nullptr) { - DHLOGE("The parameter is empty."); - return ERR_DH_AUDIO_HDI_INVALID_PARAM; - } + CHECK_NULL_RETURN(adapter, ERR_DH_AUDIO_HDI_INVALID_PARAM); + CHECK_NULL_RETURN(desc, ERR_DH_AUDIO_HDI_INVALID_PARAM); + CHECK_NULL_RETURN(attrs, ERR_DH_AUDIO_HDI_INVALID_PARAM); + CHECK_NULL_RETURN(render, ERR_DH_AUDIO_HDI_INVALID_PARAM); AudioAdapterContext *context = reinterpret_cast(adapter); - if (context->proxy_ == nullptr) { - DHLOGE("The context or proxy for the context is nullptr."); - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(context->proxy_, ERR_DH_AUDIO_NULLPTR); AudioDeviceDescriptor descHal = { .portId = desc->portId, .pins = static_cast(desc->pins), @@ -108,19 +99,13 @@ static int32_t CreateRenderInternal(struct AudioAdapter *adapter, const struct : static int32_t DestroyRenderInternal(struct AudioAdapter *adapter, struct AudioRender *render) { DHLOGI("Destroy distributed audio render."); - if (adapter == nullptr || render == nullptr) { - DHLOGE("The parameter is empty."); - return ERR_DH_AUDIO_HDI_INVALID_PARAM; - } - + CHECK_NULL_RETURN(adapter, ERR_DH_AUDIO_HDI_INVALID_PARAM); + CHECK_NULL_RETURN(render, ERR_DH_AUDIO_HDI_INVALID_PARAM); AudioAdapterContext *adapterContext = reinterpret_cast(adapter); AudioRenderContext *renderContext = reinterpret_cast(render); - if (adapterContext->proxy_ == nullptr) { - DHLOGE("The adapter context or proxy for the adapter context is nullptr."); - return ERR_DH_AUDIO_NULLPTR; - } - std::lock_guard lock(adapterContext->mtx_); + CHECK_NULL_RETURN(adapterContext->proxy_, ERR_DH_AUDIO_NULLPTR); + std::lock_guard lock(adapterContext->mtx_); for (auto it = adapterContext->renders_.begin(); it != adapterContext->renders_.end(); ++it) { if ((it->second).get() == renderContext) { int32_t ret = adapterContext->proxy_->DestroyRender(it->first); @@ -138,16 +123,13 @@ static int32_t CreateCaptureInternal(struct AudioAdapter *adapter, const struct const struct ::AudioSampleAttributes *attrs, struct AudioCapture **capture) { DHLOGI("Create distributed audio capture."); - if (adapter == nullptr || desc == nullptr || attrs == nullptr || capture == nullptr) { - DHLOGE("The parameter is empty."); - return ERR_DH_AUDIO_HDI_INVALID_PARAM; - } - + CHECK_NULL_RETURN(adapter, ERR_DH_AUDIO_HDI_INVALID_PARAM); + CHECK_NULL_RETURN(desc, ERR_DH_AUDIO_HDI_INVALID_PARAM); + CHECK_NULL_RETURN(attrs, ERR_DH_AUDIO_HDI_INVALID_PARAM); + CHECK_NULL_RETURN(capture, ERR_DH_AUDIO_HDI_INVALID_PARAM); AudioAdapterContext *context = reinterpret_cast(adapter); - if (context->proxy_ == nullptr) { - DHLOGE("The context or proxy for the context is nullptr."); - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(context->proxy_, ERR_DH_AUDIO_NULLPTR); + AudioDeviceDescriptor descHal = { .portId = desc->portId, .pins = static_cast(desc->pins), @@ -178,19 +160,13 @@ static int32_t CreateCaptureInternal(struct AudioAdapter *adapter, const struct static int32_t DestroyCaptureInternal(struct AudioAdapter *adapter, struct AudioCapture *capture) { DHLOGI("Destroy distributed audio capture."); - if (adapter == nullptr || capture == nullptr) { - DHLOGE("The parameter is empty."); - return ERR_DH_AUDIO_HDI_INVALID_PARAM; - } - + CHECK_NULL_RETURN(adapter, ERR_DH_AUDIO_HDI_INVALID_PARAM); + CHECK_NULL_RETURN(capture, ERR_DH_AUDIO_HDI_INVALID_PARAM); AudioAdapterContext *adapterContext = reinterpret_cast(adapter); AudioCaptureContext *captureContext = reinterpret_cast(capture); - if (adapterContext->proxy_ == nullptr) { - DHLOGE("The adapter context or proxy for the adapter context is nullptr."); - return ERR_DH_AUDIO_NULLPTR; - } - std::lock_guard lock(adapterContext->mtx_); + CHECK_NULL_RETURN(adapterContext->proxy_, ERR_DH_AUDIO_NULLPTR); + std::lock_guard lock(adapterContext->mtx_); for (auto it = adapterContext->captures_.begin(); it != adapterContext->captures_.end(); ++it) { if ((it->second).get() == captureContext) { int32_t ret = adapterContext->proxy_->DestroyCapture(it->first); @@ -207,16 +183,12 @@ static int32_t DestroyCaptureInternal(struct AudioAdapter *adapter, struct Audio static int32_t GetPassthroughModeInternal(struct AudioAdapter *adapter, const struct ::AudioPort *port, enum ::AudioPortPassthroughMode *mode) { - if (adapter == nullptr || port == nullptr || mode == nullptr) { - DHLOGE("The parameter is empty."); - return ERR_DH_AUDIO_HDI_INVALID_PARAM; - } - + CHECK_NULL_RETURN(adapter, ERR_DH_AUDIO_HDI_INVALID_PARAM); + CHECK_NULL_RETURN(port, ERR_DH_AUDIO_HDI_INVALID_PARAM); + CHECK_NULL_RETURN(mode, ERR_DH_AUDIO_HDI_INVALID_PARAM); AudioAdapterContext *context = reinterpret_cast(adapter); - if (context->proxy_ == nullptr) { - DHLOGE("The context or proxy for the context is nullptr."); - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(context->proxy_, ERR_DH_AUDIO_NULLPTR); + AudioPort portHal = { .dir = static_cast(port->dir), .portId = port->portId, @@ -236,10 +208,7 @@ static int32_t InitAudioPortCapability(std::unique_ptr<::AudioPortCapability> &c return ERR_DH_AUDIO_HDI_INVALID_PARAM; } ::AudioFormat *audioFormats = (::AudioFormat *)malloc(capabilityHal.formatNum * sizeof(::AudioFormat)); - if (audioFormats == nullptr) { - DHLOGE("Malloc failed."); - return ERR_DH_AUDIO_HDI_CALL_FAILED; - } + CHECK_NULL_RETURN(audioFormats, ERR_DH_AUDIO_HDI_CALL_FAILED); capInternal->deviceType = capabilityHal.deviceType; capInternal->deviceId = capabilityHal.deviceId; @@ -261,16 +230,13 @@ static int32_t InitAudioPortCapability(std::unique_ptr<::AudioPortCapability> &c static int32_t GetPortCapabilityInternal(struct AudioAdapter *adapter, const struct ::AudioPort *port, struct ::AudioPortCapability *capability) { - if (adapter == nullptr || port == nullptr || port->portName == nullptr || capability == nullptr) { - DHLOGE("The parameter is empty."); - return ERR_DH_AUDIO_HDI_INVALID_PARAM; - } - + CHECK_NULL_RETURN(adapter, ERR_DH_AUDIO_HDI_INVALID_PARAM); + CHECK_NULL_RETURN(port, ERR_DH_AUDIO_HDI_INVALID_PARAM); + CHECK_NULL_RETURN(port->portName, ERR_DH_AUDIO_HDI_INVALID_PARAM); + CHECK_NULL_RETURN(capability, ERR_DH_AUDIO_HDI_INVALID_PARAM); AudioAdapterContext *context = reinterpret_cast(adapter); - if (context->proxy_ == nullptr) { - DHLOGE("The context or proxy for the context is nullptr."); - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(context->proxy_, ERR_DH_AUDIO_NULLPTR); + { std::lock_guard lock(context->mtx_); auto iter = context->caps_.find(port->portId); @@ -306,32 +272,20 @@ static int32_t GetPortCapabilityInternal(struct AudioAdapter *adapter, const str static int32_t ReleaseAudioRouteInternal(struct AudioAdapter *adapter, int32_t routeHandle) { - if (adapter == nullptr) { - DHLOGE("The parameter is empty."); - return ERR_DH_AUDIO_HDI_INVALID_PARAM; - } - + CHECK_NULL_RETURN(adapter, ERR_DH_AUDIO_HDI_INVALID_PARAM); AudioAdapterContext *context = reinterpret_cast(adapter); - if (context->proxy_ == nullptr) { - DHLOGE("The context or proxy for the context is nullptr."); - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(context->proxy_, ERR_DH_AUDIO_NULLPTR); return context->proxy_->ReleaseAudioRoute(routeHandle); } static int32_t SetPassthroughModeInternal(struct AudioAdapter *adapter, const struct ::AudioPort *port, enum ::AudioPortPassthroughMode mode) { - if (adapter == nullptr || port == nullptr) { - DHLOGE("The parameter is empty."); - return ERR_DH_AUDIO_HDI_INVALID_PARAM; - } - + CHECK_NULL_RETURN(adapter, ERR_DH_AUDIO_HDI_INVALID_PARAM); + CHECK_NULL_RETURN(port, ERR_DH_AUDIO_HDI_INVALID_PARAM); AudioAdapterContext *context = reinterpret_cast(adapter); - if (context->proxy_ == nullptr) { - DHLOGE("The context or proxy for the context is nullptr."); - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(context->proxy_, ERR_DH_AUDIO_NULLPTR); + AudioPort portHal = { .dir = static_cast(port->dir), .portId = port->portId, @@ -383,11 +337,9 @@ static void ConvertAudioRouteNodeToHAL(const ::AudioRouteNode &node, AudioRouteN static int32_t UpdateAudioRouteInternal(struct AudioAdapter *adapter, const struct ::AudioRoute *route, int32_t *routeHandle) { - if (adapter == nullptr || route == nullptr || routeHandle == nullptr) { - DHLOGE("The parameter is empty."); - return ERR_DH_AUDIO_HDI_INVALID_PARAM; - } - + CHECK_NULL_RETURN(adapter, ERR_DH_AUDIO_HDI_INVALID_PARAM); + CHECK_NULL_RETURN(route, ERR_DH_AUDIO_HDI_INVALID_PARAM); + CHECK_NULL_RETURN(routeHandle, ERR_DH_AUDIO_HDI_INVALID_PARAM); AudioRoute audioRoute; for (uint32_t i = 0; i < route->sourcesNum; ++i) { AudioRouteNode halNode = {0}; @@ -403,10 +355,7 @@ static int32_t UpdateAudioRouteInternal(struct AudioAdapter *adapter, const stru int32_t handle = -1; AudioAdapterContext *context = reinterpret_cast(adapter); - if (context->proxy_ == nullptr) { - DHLOGE("The context or proxy for the context is nullptr."); - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(context->proxy_, ERR_DH_AUDIO_NULLPTR); int32_t ret = context->proxy_->UpdateAudioRoute(audioRoute, handle); *routeHandle = handle; return ret; @@ -415,16 +364,12 @@ static int32_t UpdateAudioRouteInternal(struct AudioAdapter *adapter, const stru static int32_t SetExtraParamsInternal(struct AudioAdapter *adapter, enum ::AudioExtParamKey key, const char *condition, const char *value) { - if (adapter == nullptr || condition == nullptr || value == nullptr) { - DHLOGE("The parameter is empty."); - return ERR_DH_AUDIO_HDI_INVALID_PARAM; - } + CHECK_NULL_RETURN(adapter, ERR_DH_AUDIO_HDI_INVALID_PARAM); + CHECK_NULL_RETURN(condition, ERR_DH_AUDIO_HDI_INVALID_PARAM); + CHECK_NULL_RETURN(value, ERR_DH_AUDIO_HDI_INVALID_PARAM); AudioAdapterContext *context = reinterpret_cast(adapter); - if (context->proxy_ == nullptr) { - DHLOGE("The context or proxy for the context is nullptr."); - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(context->proxy_, ERR_DH_AUDIO_NULLPTR); return context->proxy_->SetExtraParams(static_cast(key), std::string(condition), std::string(value)); } @@ -432,16 +377,12 @@ static int32_t SetExtraParamsInternal(struct AudioAdapter *adapter, enum ::Audio static int32_t GetExtraParamsInternal(struct AudioAdapter *adapter, enum ::AudioExtParamKey key, const char *condition, char *value, int32_t length) { - if (adapter == nullptr || condition == nullptr || value == nullptr) { - DHLOGE("The parameter is empty."); - return ERR_DH_AUDIO_HDI_INVALID_PARAM; - } - + CHECK_NULL_RETURN(adapter, ERR_DH_AUDIO_HDI_INVALID_PARAM); + CHECK_NULL_RETURN(condition, ERR_DH_AUDIO_HDI_INVALID_PARAM); + CHECK_NULL_RETURN(value, ERR_DH_AUDIO_HDI_INVALID_PARAM); AudioAdapterContext *context = reinterpret_cast(adapter); - if (context->proxy_ == nullptr) { - DHLOGE("The context or proxy for the context is nullptr."); - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(context->proxy_, ERR_DH_AUDIO_NULLPTR); + std::string valueHal; int32_t ret = context->proxy_->GetExtraParams(static_cast(key), @@ -459,16 +400,11 @@ static int32_t GetExtraParamsInternal(struct AudioAdapter *adapter, enum ::Audio static int32_t RegExtraParamObserverInternal(struct AudioAdapter *adapter, ParamCallback callback, void* cookie) { - if (adapter == nullptr || callback == nullptr) { - DHLOGE("The parameter is empty."); - return ERR_DH_AUDIO_HDI_INVALID_PARAM; - } - + CHECK_NULL_RETURN(adapter, ERR_DH_AUDIO_HDI_INVALID_PARAM); + CHECK_NULL_RETURN(callback, ERR_DH_AUDIO_HDI_INVALID_PARAM); AudioAdapterContext *context = reinterpret_cast(adapter); - if (context->proxy_ == nullptr) { - DHLOGE("The context or proxy for the context is nullptr."); - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(context->proxy_, ERR_DH_AUDIO_NULLPTR); + std::lock_guard lock(context->mtx_); if (context->callbackInternal_ == nullptr || callback != context->callback_) { context->callbackInternal_ = std::make_unique(callback, cookie); diff --git a/services/hdfaudioclient/src/daudio_capture_internal.cpp b/services/hdfaudioclient/src/daudio_capture_internal.cpp index 8aedd4eb54ef1962b0aac5df7cf632934e8bac44..8091c438f6f4192a4bc571d43314dd3086587b11 100644 --- a/services/hdfaudioclient/src/daudio_capture_internal.cpp +++ b/services/hdfaudioclient/src/daudio_capture_internal.cpp @@ -35,15 +35,12 @@ using namespace OHOS::HDI::DistributedAudio::Audio::V1_0; static int32_t GetCapturePositionInternal(struct AudioCapture *capture, uint64_t *frames, struct ::AudioTimeStamp *time) { - if (capture == nullptr || frames == nullptr || time == nullptr) { - DHLOGE("The parameter is empty."); - return ERR_DH_AUDIO_HDI_INVALID_PARAM; - } + CHECK_NULL_RETURN(capture, ERR_DH_AUDIO_HDI_INVALID_PARAM); + CHECK_NULL_RETURN(frames, ERR_DH_AUDIO_HDI_INVALID_PARAM); + CHECK_NULL_RETURN(time, ERR_DH_AUDIO_HDI_INVALID_PARAM); + AudioCaptureContext *context = reinterpret_cast(capture); - if (context->proxy_ == nullptr) { - DHLOGE("The context or proxy for the context is nullptr."); - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(context->proxy_, ERR_DH_AUDIO_NULLPTR); AudioTimeStamp timeHal; int32_t ret = context->proxy_->GetCapturePosition(*frames, timeHal); if (ret != DH_SUCCESS) { @@ -58,16 +55,12 @@ static int32_t GetCapturePositionInternal(struct AudioCapture *capture, uint64_t static int32_t CaptureFrameInternal(struct AudioCapture *capture, void *frame, uint64_t requestBytes, uint64_t *replyBytes) { - if (capture == nullptr || frame == nullptr || requestBytes == 0 || replyBytes == nullptr) { - DHLOGE("The parameter is empty."); - return ERR_DH_AUDIO_HDI_INVALID_PARAM; - } + CHECK_NULL_RETURN(capture, ERR_DH_AUDIO_HDI_INVALID_PARAM); + CHECK_NULL_RETURN(frame, ERR_DH_AUDIO_HDI_INVALID_PARAM); + CHECK_NULL_RETURN(replyBytes, ERR_DH_AUDIO_HDI_INVALID_PARAM); AudioCaptureContext *context = reinterpret_cast(capture); - if (context->proxy_ == nullptr) { - DHLOGE("The context or proxy for the context is nullptr."); - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(context->proxy_, ERR_DH_AUDIO_NULLPTR); int8_t *uframe = reinterpret_cast(frame); std::vector frameHal; int32_t ret = context->proxy_->CaptureFrame(frameHal, *replyBytes); diff --git a/services/hdfaudioclient/src/daudio_render_internal.cpp b/services/hdfaudioclient/src/daudio_render_internal.cpp index bfbae3e9150ed52fa4dcda2d7f62637b24b5f068..f1839a0b53f5fe9e4cb907e1bdfe21c63cf6197d 100644 --- a/services/hdfaudioclient/src/daudio_render_internal.cpp +++ b/services/hdfaudioclient/src/daudio_render_internal.cpp @@ -32,16 +32,10 @@ using namespace OHOS::HDI::DistributedAudio::Audio::V1_0; static int32_t GetLatencyInternal(struct AudioRender *render, uint32_t *ms) { - if (render == nullptr || ms == nullptr) { - DHLOGE("The parameter is empty."); - return ERR_DH_AUDIO_HDI_INVALID_PARAM; - } - + CHECK_NULL_RETURN(render, ERR_DH_AUDIO_HDI_INVALID_PARAM); + CHECK_NULL_RETURN(ms, ERR_DH_AUDIO_HDI_INVALID_PARAM); AudioRenderContext *context = reinterpret_cast(render); - if (context->proxy_ == nullptr) { - DHLOGE("The context or proxy for the context is nullptr."); - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(context->proxy_, ERR_DH_AUDIO_NULLPTR); return context->proxy_->GetLatency(*ms); } @@ -49,16 +43,12 @@ static int32_t RenderFrameInternal(struct AudioRender *render, const void *frame uint64_t *replyBytes) { DHLOGI("Render frame."); - if (render == nullptr || frame == nullptr || requestBytes == 0 || replyBytes == nullptr) { - DHLOGE("The parameter is empty."); - return ERR_DH_AUDIO_HDI_INVALID_PARAM; - } - + CHECK_NULL_RETURN(render, ERR_DH_AUDIO_HDI_INVALID_PARAM); + CHECK_NULL_RETURN(frame, ERR_DH_AUDIO_HDI_INVALID_PARAM); + CHECK_NULL_RETURN(replyBytes, ERR_DH_AUDIO_HDI_INVALID_PARAM); AudioRenderContext *context = reinterpret_cast(render); - if (context->proxy_ == nullptr) { - DHLOGE("The context or proxy for the context is nullptr."); - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(context->proxy_, ERR_DH_AUDIO_NULLPTR); + const uint8_t *uframe = reinterpret_cast(frame); std::vector frameHal(requestBytes); int32_t ret = memcpy_s(frameHal.data(), requestBytes, uframe, requestBytes); @@ -72,16 +62,12 @@ static int32_t RenderFrameInternal(struct AudioRender *render, const void *frame static int32_t GetRenderPositionInternal(struct AudioRender *render, uint64_t *frames, struct ::AudioTimeStamp *time) { - if (render == nullptr || frames == nullptr || time == nullptr) { - DHLOGE("The parameter is empty."); - return ERR_DH_AUDIO_HDI_INVALID_PARAM; - } + CHECK_NULL_RETURN(render, ERR_DH_AUDIO_HDI_INVALID_PARAM); + CHECK_NULL_RETURN(frames, ERR_DH_AUDIO_HDI_INVALID_PARAM); + CHECK_NULL_RETURN(time, ERR_DH_AUDIO_HDI_INVALID_PARAM); AudioRenderContext *context = reinterpret_cast(render); - if (context->proxy_ == nullptr) { - DHLOGE("The context or proxy for the context is nullptr."); - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(context->proxy_, ERR_DH_AUDIO_NULLPTR); AudioTimeStamp timeHal; int32_t ret = context->proxy_->GetRenderPosition(*frames, timeHal); if (ret != DH_SUCCESS) { @@ -94,76 +80,46 @@ static int32_t GetRenderPositionInternal(struct AudioRender *render, uint64_t *f static int32_t SetRenderSpeedInternal(struct AudioRender *render, float speed) { - if (render == nullptr) { - DHLOGE("The parameter is empty."); - return ERR_DH_AUDIO_HDI_INVALID_PARAM; - } - + CHECK_NULL_RETURN(render, ERR_DH_AUDIO_HDI_INVALID_PARAM); AudioRenderContext *context = reinterpret_cast(render); - if (context->proxy_ == nullptr) { - DHLOGE("The context or proxy for the context is nullptr."); - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(context->proxy_, ERR_DH_AUDIO_NULLPTR); return context->proxy_->SetRenderSpeed(speed); } static int32_t GetRenderSpeedInternal(struct AudioRender *render, float *speed) { - if (render == nullptr || speed == nullptr) { - DHLOGE("The parameter is empty."); - return ERR_DH_AUDIO_HDI_INVALID_PARAM; - } - + CHECK_NULL_RETURN(render, ERR_DH_AUDIO_HDI_INVALID_PARAM); + CHECK_NULL_RETURN(speed, ERR_DH_AUDIO_HDI_INVALID_PARAM); AudioRenderContext *context = reinterpret_cast(render); - if (context->proxy_ == nullptr) { - DHLOGE("The context or proxy for the context is nullptr."); - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(context->proxy_, ERR_DH_AUDIO_NULLPTR); return context->proxy_->GetRenderSpeed(*speed); } static int32_t SetChannelModeInternal(struct AudioRender *render, enum ::AudioChannelMode mode) { - if (render == nullptr) { - DHLOGE("The parameter is empty."); - return ERR_DH_AUDIO_HDI_INVALID_PARAM; - } - + CHECK_NULL_RETURN(render, ERR_DH_AUDIO_HDI_INVALID_PARAM); AudioRenderContext *context = reinterpret_cast(render); - if (context->proxy_ == nullptr) { - DHLOGE("The context or proxy for the context is nullptr."); - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(context->proxy_, ERR_DH_AUDIO_NULLPTR); return context->proxy_->SetChannelMode(static_cast(mode)); } static int32_t GetChannelModeInternal(struct AudioRender *render, enum ::AudioChannelMode *mode) { - if (render == nullptr || mode == nullptr) { - DHLOGE("The parameter is empty."); - return ERR_DH_AUDIO_HDI_INVALID_PARAM; - } - + CHECK_NULL_RETURN(render, ERR_DH_AUDIO_HDI_INVALID_PARAM); + CHECK_NULL_RETURN(mode, ERR_DH_AUDIO_HDI_INVALID_PARAM); AudioRenderContext *context = reinterpret_cast(render); - if (context->proxy_ == nullptr) { - DHLOGE("The context or proxy for the context is nullptr."); - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(context->proxy_, ERR_DH_AUDIO_NULLPTR); return context->proxy_->GetChannelMode(*(reinterpret_cast(mode))); } static int32_t RegCallbackInternal(struct AudioRender *render, ::RenderCallback callback, void *cookie) { - if (render == nullptr || callback == nullptr || cookie == nullptr) { - DHLOGE("The parameter is empty."); - return ERR_DH_AUDIO_HDI_INVALID_PARAM; - } + CHECK_NULL_RETURN(render, ERR_DH_AUDIO_HDI_INVALID_PARAM); + CHECK_NULL_RETURN(callback, ERR_DH_AUDIO_HDI_INVALID_PARAM); + CHECK_NULL_RETURN(cookie, ERR_DH_AUDIO_HDI_INVALID_PARAM); AudioRenderContext *context = reinterpret_cast(render); - if (context->proxy_ == nullptr) { - DHLOGE("The context or proxy for the context is nullptr."); - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(context->proxy_, ERR_DH_AUDIO_NULLPTR); std::lock_guard lock(context->mtx_); if (context->callbackInternal_ == nullptr || callback != context->callback_) { context->callbackInternal_ = std::make_unique(callback, cookie); @@ -186,16 +142,10 @@ static int32_t RegCallbackInternal(struct AudioRender *render, ::RenderCallback static int32_t DrainBufferInternal(struct AudioRender *render, enum ::AudioDrainNotifyType *type) { - if (render == nullptr || type == nullptr) { - DHLOGE("The parameter is empty."); - return ERR_DH_AUDIO_HDI_INVALID_PARAM; - } - + CHECK_NULL_RETURN(render, ERR_DH_AUDIO_HDI_INVALID_PARAM); + CHECK_NULL_RETURN(type, ERR_DH_AUDIO_HDI_INVALID_PARAM); AudioRenderContext *context = reinterpret_cast(render); - if (context->proxy_ == nullptr) { - DHLOGE("The context or proxy for the context is nullptr."); - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(context->proxy_, ERR_DH_AUDIO_NULLPTR); return context->proxy_->DrainBuffer(*(reinterpret_cast(type))); } diff --git a/services/hdfaudioclient/src/distributed_audio_client.cpp b/services/hdfaudioclient/src/distributed_audio_client.cpp index 41781fe74884fb2b0be5f75f056ac532dfd8508d..0bba46de6042fd8cf350074fdd1f939cbbb6f6a6 100644 --- a/services/hdfaudioclient/src/distributed_audio_client.cpp +++ b/services/hdfaudioclient/src/distributed_audio_client.cpp @@ -36,10 +36,7 @@ static int32_t InitDescriptorPort(const AudioAdapterDescriptor &desc, ::AudioAda { DHLOGI("Init audio adapter descriptor port."); ::AudioPort *audioPorts = (::AudioPort *)malloc(desc.ports.size() * sizeof(AudioPort)); - if (audioPorts == nullptr) { - DHLOGE("Audio ports is nullptr."); - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(audioPorts, ERR_DH_AUDIO_NULLPTR); descInternal.ports = audioPorts; bool isSuccess = true; @@ -98,10 +95,7 @@ static int32_t InitAudioAdapterDescriptor(AudioManagerContext *context, continue; } char* adapterName = reinterpret_cast(calloc(desc.adapterName.length() + STR_TERM_LEN, sizeof(char))); - if (adapterName == nullptr) { - DHLOGE("Calloc failed."); - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(adapterName, ERR_DH_AUDIO_NULLPTR); if (strcpy_s(adapterName, desc.adapterName.length() + STR_TERM_LEN, desc.adapterName.c_str()) != EOK) { DHLOGD("Strcpy_s adapter name failed."); free(adapterName); @@ -128,19 +122,14 @@ static int32_t GetAllAdaptersInternal(struct AudioManager *manager, struct ::Aud int32_t *size) { DHLOGI("Get all adapters."); - if (manager == nullptr || descs == nullptr || size == nullptr) { - DHLOGE("The parameter is empty."); - return ERR_DH_AUDIO_HDI_INVALID_PARAM; - } - + CHECK_NULL_RETURN(manager, ERR_DH_AUDIO_HDI_INVALID_PARAM); + CHECK_NULL_RETURN(descs, ERR_DH_AUDIO_HDI_INVALID_PARAM); + CHECK_NULL_RETURN(size, ERR_DH_AUDIO_HDI_INVALID_PARAM); AudioManagerContext *context = reinterpret_cast(manager); - std::lock_guard lock(context->mtx_); + CHECK_NULL_RETURN(context->proxy_, ERR_DH_AUDIO_NULLPTR); + std::lock_guard lock(context->mtx_); std::vector descriptors; - if (context->proxy_ == nullptr) { - DHLOGE("The context or proxy for the context is nullptr."); - return ERR_DH_AUDIO_NULLPTR; - } int32_t ret = context->proxy_->GetAllAdapters(descriptors); if (ret != DH_SUCCESS) { *descs = nullptr; @@ -162,10 +151,10 @@ static int32_t LoadAdapterInternal(struct AudioManager *manager, const struct :: struct AudioAdapter **adapter) { DHLOGI("Load adapter."); - if (manager == nullptr || desc == nullptr || desc->adapterName == nullptr || adapter == nullptr) { - DHLOGE("The parameter is empty."); - return ERR_DH_AUDIO_HDI_INVALID_PARAM; - } + CHECK_NULL_RETURN(manager, ERR_DH_AUDIO_HDI_INVALID_PARAM); + CHECK_NULL_RETURN(desc, ERR_DH_AUDIO_HDI_INVALID_PARAM); + CHECK_NULL_RETURN(desc->adapterName, ERR_DH_AUDIO_HDI_INVALID_PARAM); + CHECK_NULL_RETURN(adapter, ERR_DH_AUDIO_HDI_INVALID_PARAM); AudioManagerContext *context = reinterpret_cast(manager); std::string adpName = desc->adapterName; { @@ -181,10 +170,7 @@ static int32_t LoadAdapterInternal(struct AudioManager *manager, const struct :: .adapterName = desc->adapterName, }; sptr adapterProxy = nullptr; - if (context->proxy_ == nullptr) { - DHLOGE("The context or proxy for the context is nullptr."); - return ERR_DH_AUDIO_NULLPTR; - } + CHECK_NULL_RETURN(context->proxy_, ERR_DH_AUDIO_NULLPTR); int32_t ret = context->proxy_->LoadAdapter(descriptor, adapterProxy); if (ret != DH_SUCCESS) { DHLOGE("Failed to load the adapter."); @@ -206,17 +192,11 @@ static int32_t LoadAdapterInternal(struct AudioManager *manager, const struct :: static void UnloadAdapterInternal(struct AudioManager *manager, struct AudioAdapter *adapter) { DHLOGI("Unload adapter."); - if (manager == nullptr || adapter == nullptr) { - DHLOGE("Param is nullptr."); - return; - } - + CHECK_NULL_VOID(manager); + CHECK_NULL_VOID(adapter); AudioManagerContext *context = reinterpret_cast(manager); AudioAdapterContext *adapterContext = reinterpret_cast(adapter); - if (context->proxy_ == nullptr) { - DHLOGE("The context or proxy for the context is nullptr."); - return; - } + CHECK_NULL_VOID(context->proxy_); std::lock_guard lock(context->mtx_); for (auto it = context->adapters_.begin(); it != context->adapters_.end(); it++) { @@ -273,9 +253,7 @@ static bool AudioManagerInit() std::lock_guard lock(g_AudioManagerContext.mtx_); sptr audioMgr = IAudioManager::Get("daudio_primary_service", false); - if (audioMgr == nullptr) { - return false; - } + CHECK_NULL_RETURN(audioMgr, false); g_AudioManagerContext.proxy_ = audioMgr; return true; }