diff --git a/bundle.json b/bundle.json index 29021d21c4a800edf56b7a2cab8f88df6c4b41e8..59de4502abacc870d300e8e8defc8b8494f336fc 100755 --- a/bundle.json +++ b/bundle.json @@ -70,7 +70,6 @@ "//foundation/distributedhardware/distributed_audio/services/softbusadapter:distributed_audio_softbus_adapter", - "//foundation/distributedhardware/distributed_audio/services/audiotransport/audioctrltransport:distributed_audio_control", "//foundation/distributedhardware/distributed_audio/services/audiotransport/audiochannel/audiodatachannel:distributed_audio_data_channel", "//foundation/distributedhardware/distributed_audio/services/audiotransport/audiotransportstatus:distributed_audio_transport_status", "//foundation/distributedhardware/distributed_audio/services/audiotransport/decodetransport:distributed_audio_decode_transport", diff --git a/common/dfx_utils/test/unittest/BUILD.gn b/common/dfx_utils/test/unittest/BUILD.gn index 3a863e45071569b84b26f79ae93068ee51e1ecff..a9d5dfde1d1966d1dda38f5eac4f45074851db1d 100644 --- a/common/dfx_utils/test/unittest/BUILD.gn +++ b/common/dfx_utils/test/unittest/BUILD.gn @@ -30,8 +30,6 @@ config("module_private_config") { "${audio_processor_path}/decodeprocessor/include", "${audio_transport_path}/audiochannel/interface", "${audio_transport_path}/audiochannel/audiodatachannel/include", - "${audio_transport_path}/audioctrltransport/include", - "${audio_transport_path}/audioctrltransport/interface", "${audio_transport_path}/audiotransportstatus/include", "${audio_transport_path}/audiotransportstatus/interface", "${audio_transport_path}/decodetransport/include", @@ -50,7 +48,6 @@ config("module_private_config") { "${innerkits_path}/native_cpp/audio_source/include", "${innerkits_path}/native_cpp/audio_sink/include", "${services_path}/common/audioparam", - "${services_path}/common/taskProcessor/include", "${services_path}/common/audiodata/include", "${services_path}/common/audioeventcallback", "${services_path}/audiomanager/managersource/include", diff --git a/common/include/daudio_constants.h b/common/include/daudio_constants.h index 60b9a412a79ad174761984d2b0656fa50e41abb9..278be8c0a420fa8d62fbf1862d657f16bfc9f0bb 100644 --- a/common/include/daudio_constants.h +++ b/common/include/daudio_constants.h @@ -94,6 +94,10 @@ const std::string KEY_HISTREAMER_AUDIO_ENCODER = "histmAudEnc"; const std::string KEY_HISTREAMER_AUDIO_DECODER = "histmAudDec"; const std::string HDF_EVENT_RESULT_SUCCESS = "DH_SUCCESS"; +const std::string HDF_EVENT_INIT_ENGINE_FAILED = "ERR_DH_AUDIO_INIT_ENGINE_FAILED"; +const std::string HDF_EVENT_NOTIFY_SINK_FAILED = "ERR_DH_AUDIO_NOTIFY_SINK_FAILED"; +const std::string HDF_EVENT_TRANS_SETUP_FAILED = "ERR_DH_AUDIO_TRANS_SETUP_FAILED"; +const std::string HDF_EVENT_TRANS_START_FAILED = "ERR_DH_AUDIO_TRANS_START_FAILED"; const std::string HDF_EVENT_RESULT_FAILED = "DH_FAILED"; const std::string STREAM_MUTE_STATUS = "STREAM_MUTE_STATUS"; diff --git a/common/include/daudio_errorcode.h b/common/include/daudio_errorcode.h index f0672cc071cd007479c56183d99930a0a66ccb72..f0307dcc515c784453d4169b81e5e25bf964a19c 100644 --- a/common/include/daudio_errorcode.h +++ b/common/include/daudio_errorcode.h @@ -23,129 +23,51 @@ enum DAudioErrorCode { ERR_DH_AUDIO_NULLPTR = -40000, ERR_DH_AUDIO_FAILED = -40001, ERR_DH_AUDIO_NOT_SUPPORT = -40002, - ERR_DH_AUDIO_REPEAT_OPREATOR = -40003, - ERR_DH_AUDIO_SA_WRITE_INTERFACE_TOKEN_FAILED = -40004, - ERR_DH_AUDIO_SA_WRITE_PARAM_FAIED = -40005, - ERR_DH_AUDIO_SA_IPCCALLBACK_NOT_INIT = -40006, - ERR_DH_AUDIO_SA_REGISTERCALLBACK_NOT_FOUND = -40007, - ERR_DH_AUDIO_SA_UNREGISTERCALLBACK_NOT_FOUND = -40008, - ERR_DH_AUDIO_SA_INVALID_INTERFACE_TOKEN = -40009, - ERR_DH_AUDIO_SA_INVALID_REQUEST_CODE = -40010, - ERR_DH_AUDIO_SA_READ_PARAM_FAILED = -40011, - ERR_DH_AUDIO_SA_CTRL_TRANS_NULL = -40012, - ERR_DH_AUDIO_SA_CTRL_CHANNEL_WAIT_TIMEOUT = -40013, - ERR_DH_AUDIO_SA_MIC_CHANNEL_WAIT_TIMEOUT = -40014, - ERR_DH_AUDIO_SA_SINK_CTRL_TRANS_NULL = -40015, - ERR_DH_AUDIO_SA_MICCALLBACK_NULL = -40016, - ERR_DH_AUDIO_SA_MICTRANS_NULL = -40017, - ERR_DH_AUDIO_SA_EVENT_CALLBACK_NULL = -40018, - ERR_DH_AUDIO_SA_MIC_TRANS_NULL = -40019, - ERR_DH_AUDIO_SA_FUNCTION_NOT_IMPLEMENT = -40020, - ERR_DH_AUDIO_SA_SINKCTRLMGR_NOT_INIT = -40021, - ERR_DH_AUDIO_SA_RPC_WAIT_TIMEOUT = -40022, - ERR_DH_AUDIO_SA_SPEAKER_CLIENT_NOT_INIT = -40023, - ERR_DH_AUDIO_SA_SPEAKER_TRANS_NULL = -40024, - ERR_DH_AUDIO_SA_SPEAKER_CHANNEL_WAIT_TIMEOUT = -40025, - ERR_DH_AUDIO_SA_PARAM_INVALID = -40026, - ERR_DH_AUDIO_SA_GET_REMOTE_SINK_FAILED = -40027, - ERR_DH_AUDIO_SA_DEVICE_NOT_EXIST = -40028, - ERR_DH_AUDIO_SA_INVALID_NETWORKID = -40029, - ERR_DH_AUDIO_SA_OPEN_CTRL_FAILED = -40030, - ERR_DH_AUDIO_SA_ENABLE_PARAM_INVALID = -40031, - ERR_DH_AUDIO_SA_DEVICE_TYPE_INVALID = -40032, - ERR_DH_AUDIO_SA_DISABLE_PARAM_INVALID = -40033, - ERR_DH_AUDIO_SA_DISABLE_SPEAKER_NOT_EXIST = -40034, - ERR_DH_AUDIO_SA_DISABLE_MIC_NOT_EXIST = -40035, - ERR_DH_AUDIO_SA_SPEAKER_DEVICE_NOT_INIT = -40036, - ERR_DH_AUDIO_SA_MIC_DEVICE_NOT_INIT = -40037, - ERR_DH_AUDIO_SA_SOURCECTRLMGR_NOT_INIT = -40038, - ERR_DH_AUDIO_SA_TASKQUEUE_FULL = -40039, - ERR_DH_AUDIO_SA_GET_REMOTE_SOURCE_FAILED = -40040, - ERR_DH_AUDIO_SA_PROXY_NOT_INIT = -40041, - ERR_DH_AUDIO_SA_MIC_CLIENT_NOT_INIT = -40042, - ERR_DH_AUDIO_SA_GET_SAMGR_FAILED = -40043, - ERR_DH_AUDIO_SA_LOAD_FAILED = -40044, - ERR_DH_AUDIO_SA_LOAD_TIMEOUT = -40045, - ERR_DH_AUDIO_SA_STATUS_ERR = -40046, - ERR_DH_AUDIO_NOT_FOUND_KEY = -40047, - ERR_DH_AUDIO_SA_DEVID_ILLEGAL = -40048, - ERR_DH_AUDIO_TRANS_NULL_VALUE = -41000, - ERR_DH_AUDIO_TRANS_PROCESSOR_FAILED = -41001, - ERR_DH_AUDIO_TRANS_ERROR = -41002, - ERR_DH_AUDIO_TRANS_ILLEGAL_OPERATION = -41003, - ERR_DH_AUDIO_TRANS_SESSION_NOT_OPEN = -41004, + ERR_DH_AUDIO_SA_WRITE_INTERFACE_TOKEN_FAILED = -40003, + ERR_DH_AUDIO_SA_WRITE_PARAM_FAIED = -40004, + ERR_DH_AUDIO_SA_CALLBACK_NOT_FOUND = -40005, + ERR_DH_AUDIO_SA_INVALID_INTERFACE_TOKEN = -40006, + ERR_DH_AUDIO_SA_WAIT_TIMEOUT = -40007, + ERR_DH_AUDIO_SA_PARAM_INVALID = -40008, + ERR_DH_AUDIO_SA_DEVICE_NOT_EXIST = -40009, + ERR_DH_AUDIO_SA_PROXY_NOT_INIT = -40010, + ERR_DH_AUDIO_SA_LOAD_FAILED = -40011, + ERR_DH_AUDIO_SA_STATUS_ERR = -40012, + ERR_DH_AUDIO_NOT_FOUND_KEY = -40013, + ERR_DH_AUDIO_SA_DEVID_ILLEGAL = -40014, - ERR_DH_AUDIO_ADAPTER_PARA_ERROR = -42000, - ERR_DH_AUDIO_ADAPTER_OPEN_SESSION_FAIL = -42001, - ERR_DH_AUDIO_ADAPTER_REGISTER_SOFTBUS_LISTENER_FAIL = -42002, + // trans error + ERR_DH_AUDIO_TRANS_ERROR = -40015, + ERR_DH_AUDIO_TRANS_ILLEGAL_OPERATION = -40016, + ERR_DH_AUDIO_TRANS_SESSION_NOT_OPEN = -40017, - ERR_DH_AUDIO_BAD_VALUE = -43000, - ERR_DH_AUDIO_BAD_OPERATE = -43001, - ERR_DH_AUDIO_CODEC_CONFIG = -43002, - ERR_DH_AUDIO_CODEC_START = -43003, - ERR_DH_AUDIO_CODEC_STOP = -43004, - ERR_DH_AUDIO_CODEC_RELEASE = -43005, - ERR_DH_AUDIO_CODEC_INPUT = -43006, + // codec error + ERR_DH_AUDIO_BAD_VALUE = -42000, + ERR_DH_AUDIO_BAD_OPERATE = -42001, + ERR_DH_AUDIO_CODEC_CONFIG = -42002, + ERR_DH_AUDIO_CODEC_START = -42003, + ERR_DH_AUDIO_CODEC_STOP = -42004, + ERR_DH_AUDIO_CODEC_RELEASE = -42005, + ERR_DH_AUDIO_CODEC_INPUT = -42006, - ERR_DH_AUDIO_CLIENT_PARAM_IS_NULL = -44000, - ERR_DH_AUDIO_CLIENT_CREATE_RENDER_FAILED = -44001, - ERR_DH_AUDIO_CLIENT_RENDER_WITHOUT_INSTANCE = -44002, - ERR_DH_AUDIO_CLIENT_RENDER_FREE_FAILED = -44003, - ERR_DH_AUDIO_CLIENT_RENDER_STARTUP_FAILURE = -44004, - ERR_DH_AUDIO_CLIENT_RENDER_OR_TRANS_IS_NULL = -44005, - ERR_DH_AUDIO_CLIENT_LACE_OF_GFRAMES = -44006, - ERR_DH_AUDIO_CLIENT_REBDER_PAUSE_FAILURE = -44007, - ERR_DH_AUDIO_CLIENT_STATE_IS_INVALID = -44008, - ERR_DH_AUDIO_CLIENT_INVALID_VOLUME_PARAMETER = -44009, - ERR_DH_AUDIO_CLIENT_SET_VOLUME_FAILED = -44010, - ERR_DH_AUDIO_CLIENT_SET_RENDER_RATE_FAILED = -44011, - ERR_DH_AUDIO_CLIENT_SET_CALLBACK_FAILED = -44012, - ERR_DH_AUDIO_CLIENT_GET_MINBUFFER_FAILED = -44013, - ERR_DH_AUDIO_CLIENT_CAPTURER_WITHOUT_INSTANCE = -44014, - ERR_DH_AUDIO_CLIENT_CAPTURER_FREE_FAILED = -44015, - ERR_DH_AUDIO_CLIENT_CAPTURER_START_FAILED = -44016, - ERR_DH_AUDIO_CLIENT_CAPTURER_STOP_FAILED = -44017, - ERR_DH_AUDIO_CLIENT_CAPTURER_RELEASE_FAILED = -44018, - ERR_DH_AUDIO_CLIENT_CAPTURER_OR_MICTRANS_INSTANCE = -44019, - ERR_DH_AUDIO_CLIENT_CREATE_CAPTURER_FAILED = -44020, - ERR_DH_AUDIO_CLIENT_RENDER_STOP_FAILED = -44021, - ERR_DH_AUDIO_CLIENT_EVENT_CALLBACK_IS_NULL = -44022, - ERR_DH_AUDIO_CLIENT_TRANS_TIMEOUT = -44023, - ERR_DH_AUDIO_CLIENT_VOLUME_SET_FAILED = -44024, - ERR_DH_AUDIO_CLIENT_GET_MAX_VOLUME_FAILED = -44025, - ERR_DH_AUDIO_CLIENT_GET_MIX_VOLUME_FAILED = -44026, - ERR_DH_AUDIO_CLIENT_GET_VOLUME_FAILED = -44027, - ERR_DH_AUDIO_CLIENT_INVALID_EVENT_PARAM = -44028, - ERR_DH_AUDIO_CLIENT_RENDER_RELEASE_FAILED = -44029, - ERR_DH_AUDIO_CLIENT_TRANS_IS_NULL = -44030, - ERR_DH_AUDIO_CLIENT_RENDER_IS_NULL = -44031, - ERR_DH_AUDIO_CLIENT_CAPTURER_IS_NULL = -44032, - ERR_DH_AUDIO_CLIENT_RENDER_START_FAILED = -44033, - ERR_DH_AUDIO_CLIENT_RENDER_REQ_DATA_FAILED = -44034, - ERR_DH_AUDIO_CLIENT_SET_MUTE_FAILED = -44035, + // spk client error + ERR_DH_AUDIO_CLIENT_PARAM_ERROR = -43000, + ERR_DH_AUDIO_CLIENT_RENDER_CREATE_FAILED = -43001, + ERR_DH_AUDIO_CLIENT_RENDER_STARTUP_FAILURE = -43002, + ERR_DH_AUDIO_CLIENT_RENDER_STOP_FAILED = -43003, + ERR_DH_AUDIO_CLIENT_RENDER_RELEASE_FAILED = -43004, + ERR_DH_AUDIO_CLIENT_SET_VOLUME_FAILED = -43005, + ERR_DH_AUDIO_CLIENT_SET_MUTE_FAILED = -43006, - ERR_DH_AUDIO_HDI_PROXY_NOT_INIT = -45000, - ERR_DH_AUDIO_HDI_CALLBACK_NOT_EXIST = -45001, - ERR_DH_AUDIO_HDI_CALL_FAILED = -45002, - ERR_DH_AUDIO_HDI_UNKNOWN_DEVTYPE = -45003, - ERR_DH_AUDIO_HDI_INVALID_PARAM = -45004, - ERR_DH_AUDIO_HDI_NULLPTR = -45005, + // mic client error + ERR_DH_AUDIO_CLIENT_CAPTURER_CREATE_FAILED = -43007, + ERR_DH_AUDIO_CLIENT_CAPTURER_START_FAILED = -43008, - ERR_DH_AUDIO_CTRL_CHANNEL_SEND_MSG_FAIL = -46001, - - // AV Transport component error code - ERR_DH_AV_TRANS_NULL_VALUE = -47000, - ERR_DH_AV_TRANS_ILLEGAL_PARAM = -47001, - ERR_DH_AV_TRANS_TIMEOUT = -47002, - ERR_DH_AV_TRANS_LOAD_ERROR = -47003, - ERR_DH_AV_TRANS_INIT_FAILED = -47004, - ERR_DH_AV_TRANS_CREATE_CHANNEL_FAILED = -47005, - ERR_DH_AV_TRANS_SETUP_FAILED = -47006, - ERR_DH_AV_TRANS_START_FAILED = -47007, - ERR_DH_AV_TRANS_STOP_FAILED = -47008, - ERR_DH_AV_TRANS_FEED_DATA_FAILED = -47009, - ERR_DH_AV_TRANS_SEND_MSG_FAILED = -47010, + // other error + ERR_DH_AUDIO_HDI_CALL_FAILED = -44000, + ERR_DH_AUDIO_HDI_INVALID_PARAM = -44001, + ERR_DH_AV_TRANS_CREATE_CHANNEL_FAILED = -44002, }; } // namespace DistributedHardware } // namespace OHOS diff --git a/common/src/daudio_util.cpp b/common/src/daudio_util.cpp index c0b048a14b30db1828af3f760729b7e1261753fe..ecfee5dcd9997e13e96b8228e4abe73d2f1fe6b2 100644 --- a/common/src/daudio_util.cpp +++ b/common/src/daudio_util.cpp @@ -31,7 +31,7 @@ #include "parameter.h" #undef DH_LOG_TAG -#define DH_LOG_TAG "DAudioUtils" +#define DH_LOG_TAG "DAudioUtil" namespace OHOS { namespace DistributedHardware { @@ -123,6 +123,7 @@ std::string GetAnonyString(const std::string &value) int32_t GetDevTypeByDHId(int32_t dhId) { + DHLOGI("Get dev type by dhId: %d.", dhId); if (static_cast(dhId) & 0x8000000) { return AUDIO_DEVICE_TYPE_MIC; } else if (static_cast(dhId) & 0x7ffffff) { @@ -188,7 +189,10 @@ int32_t GetAudioParamInt(const std::string ¶ms, const std::string &key, int3 DHLOGE("Get audio param string fail, error code %d.", ret); return ret; } - + if (!CheckIsNum(val)) { + DHLOGE("String is not number. str:%s.", val.c_str()); + return ERR_DH_AUDIO_NOT_SUPPORT; + } value = std::stoi(val); return DH_SUCCESS; } diff --git a/hdf_service/distributed_audio/hdi_service/audio/v1_0/include/audio_adapter_interface_impl.h b/hdf_service/distributed_audio/hdi_service/audio/v1_0/include/audio_adapter_interface_impl.h index 42eea2824ed10bea8ffc8467015d10324b016431..5509e44c4951b010b20e74421315e1197032205f 100644 --- a/hdf_service/distributed_audio/hdi_service/audio/v1_0/include/audio_adapter_interface_impl.h +++ b/hdf_service/distributed_audio/hdi_service/audio/v1_0/include/audio_adapter_interface_impl.h @@ -135,6 +135,7 @@ private: sptr MatchStreamCallback(const AudioSampleAttributes &attrs, const AudioDeviceDescriptor &desc, int32_t &dhId); int32_t GetVolFromEvent(const std::string &content, const std::string &key, int32_t &vol); + int32_t ConvertMsg2Code(const std::string &msg); private: static constexpr uint8_t WAIT_SECONDS = 20; @@ -162,6 +163,7 @@ private: std::condition_variable micWaitCond_; bool isSpkOpened_ = false; + int32_t errCode_ = -1; bool isMicOpened_ = false; bool spkNotifyFlag_ = false; bool micNotifyFlag_ = false; diff --git a/hdf_service/distributed_audio/hdi_service/audio/v1_0/src/audio_adapter_interface_impl.cpp b/hdf_service/distributed_audio/hdi_service/audio/v1_0/src/audio_adapter_interface_impl.cpp index d64462cf672b0273ac3f1b0b0668f2675d7eaa6a..76497af532859c068654613df8b7396e6755d547 100644 --- a/hdf_service/distributed_audio/hdi_service/audio/v1_0/src/audio_adapter_interface_impl.cpp +++ b/hdf_service/distributed_audio/hdi_service/audio/v1_0/src/audio_adapter_interface_impl.cpp @@ -573,7 +573,7 @@ int32_t AudioAdapterInterfaceImpl::OpenRenderDevice(const AudioDeviceDescriptor ret = WaitForSANotify(EVENT_OPEN_SPK); if (ret != DH_SUCCESS) { - DHLOGE("Wait SA notify failed."); + DHLOGE("Wait SA notify failed. ret: %d", ret); return ret; } DHLOGI("Open render device success."); @@ -602,7 +602,7 @@ int32_t AudioAdapterInterfaceImpl::CloseRenderDevice(const AudioDeviceDescriptor ret = WaitForSANotify(EVENT_CLOSE_SPK); if (ret != DH_SUCCESS) { - DHLOGE("Wait SA notify failed."); + DHLOGE("Wait SA notify failed. ret: %d.", ret); return ret; } spkPinInUse_ = 0; @@ -641,7 +641,7 @@ int32_t AudioAdapterInterfaceImpl::OpenCaptureDevice(const AudioDeviceDescriptor ret = WaitForSANotify(EVENT_OPEN_MIC); if (ret != DH_SUCCESS) { - DHLOGE("Wait SA notify failed."); + DHLOGE("Wait SA notify failed. ret: %d.", ret); return ret; } DHLOGI("Open capture device success."); @@ -666,7 +666,7 @@ int32_t AudioAdapterInterfaceImpl::CloseCaptureDevice(const AudioDeviceDescripto ret = WaitForSANotify(EVENT_CLOSE_MIC); if (ret != DH_SUCCESS) { - DHLOGE("Wait SA notify failed."); + DHLOGE("Wait SA notify failed. ret:%d.", ret); return ret; } micPinInUse_ = 0; @@ -790,7 +790,12 @@ int32_t AudioAdapterInterfaceImpl::GetAudioVolume(const std::string& condition, int32_t AudioAdapterInterfaceImpl::getEventTypeFromCondition(const std::string &condition) { std::string::size_type position = condition.find_first_of(";"); - int32_t type = std::stoi(condition.substr(TYPE_CONDITION, position - TYPE_CONDITION)); + std::string val = condition.substr(TYPE_CONDITION, position - TYPE_CONDITION); + if (!CheckIsNum(val)) { + DHLOGE("String is not number. str:%s.", val.c_str()); + return ERR_DH_AUDIO_HDF_FAIL; + } + int32_t type = std::stoi(val); return static_cast(type); } @@ -860,7 +865,12 @@ int32_t AudioAdapterInterfaceImpl::GetVolFromEvent(const std::string &content, c cJSON_Delete(jParam); return ERR_DH_AUDIO_HDF_FAIL; } - vol = std::stoi(std::string(dhIdItem->valuestring)); + std::string val(dhIdItem->valuestring); + if (!CheckIsNum(val)) { + DHLOGE("String is not number. str:%s.", val.c_str()); + return ERR_DH_AUDIO_HDF_FAIL; + } + vol = std::stoi(val); cJSON_Delete(jParam); return DH_SUCCESS; } @@ -899,6 +909,23 @@ int32_t AudioAdapterInterfaceImpl::HandleRenderStateChangeEvent(const DAudioEven return DH_SUCCESS; } +int32_t AudioAdapterInterfaceImpl::ConvertMsg2Code(const std::string &msg) +{ + if (msg == HDF_EVENT_RESULT_SUCCESS) { + return DH_SUCCESS; + } else if (msg == HDF_EVENT_INIT_ENGINE_FAILED) { + return ERR_DH_AUDIO_HDF_INIT_ENGINE_FAILED; + } else if (msg == HDF_EVENT_NOTIFY_SINK_FAILED) { + return ERR_DH_AUDIO_HDF_NOTIFY_SINK_FAILED; + } else if (msg == HDF_EVENT_TRANS_SETUP_FAILED) { + return ERR_DH_AUDIO_HDF_TRANS_SETUP_FAILED; + } else if (msg == HDF_EVENT_TRANS_START_FAILED) { + return ERR_DH_AUDIO_HDF_TRANS_START_FAILED; + } else { + return ERR_DH_AUDIO_HDF_FAIL; + } +} + int32_t AudioAdapterInterfaceImpl::HandleSANotifyEvent(const DAudioEvent &event) { DHLOGD("Notify event type %d, event content: %s.", event.type, event.content.c_str()); @@ -907,6 +934,7 @@ int32_t AudioAdapterInterfaceImpl::HandleSANotifyEvent(const DAudioEvent &event) if (event.content == HDF_EVENT_RESULT_SUCCESS) { isSpkOpened_ = true; } + errCode_ = ConvertMsg2Code(event.content); spkNotifyFlag_ = true; spkWaitCond_.notify_all(); break; @@ -914,6 +942,7 @@ int32_t AudioAdapterInterfaceImpl::HandleSANotifyEvent(const DAudioEvent &event) if (event.content == HDF_EVENT_RESULT_SUCCESS) { isSpkOpened_ = false; } + errCode_ = ConvertMsg2Code(event.content); spkNotifyFlag_ = true; spkWaitCond_.notify_all(); break; @@ -921,6 +950,7 @@ int32_t AudioAdapterInterfaceImpl::HandleSANotifyEvent(const DAudioEvent &event) if (event.content == HDF_EVENT_RESULT_SUCCESS) { isMicOpened_ = true; } + errCode_ = ConvertMsg2Code(event.content); micNotifyFlag_ = true; micWaitCond_.notify_all(); break; @@ -928,6 +958,7 @@ int32_t AudioAdapterInterfaceImpl::HandleSANotifyEvent(const DAudioEvent &event) if (event.content == HDF_EVENT_RESULT_SUCCESS) { isMicOpened_ = false; } + errCode_ = ConvertMsg2Code(event.content); micNotifyFlag_ = true; micWaitCond_.notify_all(); break; @@ -959,10 +990,10 @@ int32_t AudioAdapterInterfaceImpl::WaitForSANotify(const AudioDeviceEvent &event } if (event == EVENT_OPEN_SPK && !isSpkOpened_) { DHLOGE("Wait open render device failed."); - return ERR_DH_AUDIO_HDF_OPEN_DEVICE_FAIL; + return errCode_; } else if (event == EVENT_CLOSE_SPK && isSpkOpened_) { DHLOGE("Wait close render device failed."); - return ERR_DH_AUDIO_HDF_CLOSE_DEVICE_FAIL; + return errCode_; } return DH_SUCCESS; } @@ -980,10 +1011,10 @@ int32_t AudioAdapterInterfaceImpl::WaitForSANotify(const AudioDeviceEvent &event } if (event == EVENT_OPEN_MIC && !isMicOpened_) { DHLOGE("Wait open capture device failed."); - return ERR_DH_AUDIO_HDF_OPEN_DEVICE_FAIL; + return errCode_; } else if (event == EVENT_CLOSE_MIC && isMicOpened_) { DHLOGE("Wait close capture device failed."); - return ERR_DH_AUDIO_HDF_CLOSE_DEVICE_FAIL; + return errCode_; } return DH_SUCCESS; } diff --git a/hdf_service/distributed_audio/hdi_service/audio/v1_0/src/audio_manager_interface_impl.cpp b/hdf_service/distributed_audio/hdi_service/audio/v1_0/src/audio_manager_interface_impl.cpp index 9890a83a2093bd1f0bc30798848d1ea37fa9f595..bd160cfd13f777c90cf0c7197f5637cadc9580d8 100644 --- a/hdf_service/distributed_audio/hdi_service/audio/v1_0/src/audio_manager_interface_impl.cpp +++ b/hdf_service/distributed_audio/hdi_service/audio/v1_0/src/audio_manager_interface_impl.cpp @@ -130,6 +130,10 @@ int32_t AudioManagerInterfaceImpl::AddAudioDevice(const std::string &adpName, co } } remote_ = OHOS::HDI::hdi_objcast(callback); + if (remote_ == nullptr) { + DHLOGE("remote callback is nullptr."); + return ERR_DH_AUDIO_HDF_FAIL; + } remote_->AddDeathRecipient(audioManagerRecipient_); adp = mapAudioAdapter_.find(adpName); if (adp == mapAudioAdapter_.end() || adp->second == nullptr) { @@ -143,7 +147,6 @@ int32_t AudioManagerInterfaceImpl::AddAudioDevice(const std::string &adpName, co case AUDIO_DEVICE_TYPE_MIC: adp->second->SetMicCallback(dhId, callback); break; - case AUDIO_DEVICE_TYPE_UNKNOWN: default: DHLOGE("DhId is illegal, devType is unknow."); return ERR_DH_AUDIO_HDF_FAIL; @@ -154,11 +157,8 @@ int32_t AudioManagerInterfaceImpl::AddAudioDevice(const std::string &adpName, co return ERR_DH_AUDIO_HDF_FAIL; } - DAudioDevEvent event = { adpName, - dhId, - HDF_AUDIO_DEVICE_ADD, - 0, - adp->second->GetVolumeGroup(dhId), + DAudioDevEvent event = { adpName, dhId, HDF_AUDIO_DEVICE_ADD, + 0, adp->second->GetVolumeGroup(dhId), adp->second->GetInterruptGroup(dhId) }; ret = NotifyFwk(event); if (ret != DH_SUCCESS) { diff --git a/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/unittest/audio_adapter_interface/src/audio_adapter_interface_impl_test.cpp b/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/unittest/audio_adapter_interface/src/audio_adapter_interface_impl_test.cpp index e79d276660c72dfdc1a438bd40135f251214e9b9..970c928357f5e43481f90122a48f34d842c7af49 100644 --- a/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/unittest/audio_adapter_interface/src/audio_adapter_interface_impl_test.cpp +++ b/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/unittest/audio_adapter_interface/src/audio_adapter_interface_impl_test.cpp @@ -281,7 +281,7 @@ HWTEST_F(AudioAdapterInterfaceImpTest, ReleaseAudioRoute_001, TestSize.Level1) HWTEST_F(AudioAdapterInterfaceImpTest, SetExtraParams_001, TestSize.Level1) { AudioExtParamKey key = AudioExtParamKey::AUDIO_EXT_PARAM_KEY_NONE; - std::string condition = "hello"; + std::string condition = "{\"dhId\":\"1\"}"; std::string value = "world"; EXPECT_EQ(HDF_SUCCESS, AdapterTest_->SetExtraParams(key, condition, value)); key = AudioExtParamKey::AUDIO_EXT_PARAM_KEY_VOLUME; diff --git a/hdf_service/distributed_audio/hdi_service/common/include/daudio_constants.h b/hdf_service/distributed_audio/hdi_service/common/include/daudio_constants.h index d342d62d9d9121942153d5aa938b46f171988f07..d11b29114f84e08c1afd3e99f8b9a4e48e30e038 100644 --- a/hdf_service/distributed_audio/hdi_service/common/include/daudio_constants.h +++ b/hdf_service/distributed_audio/hdi_service/common/include/daudio_constants.h @@ -44,6 +44,10 @@ const std::string MIN_VOLUME_LEVEL = "MIN_VOLUME_LEVEL"; const std::string STREAM_MUTE_STATUS = "STREAM_MUTE_STATUS"; const std::string HDF_EVENT_RESULT_SUCCESS = "DH_SUCCESS"; +const std::string HDF_EVENT_INIT_ENGINE_FAILED = "ERR_DH_AUDIO_INIT_ENGINE_FAILED"; +const std::string HDF_EVENT_NOTIFY_SINK_FAILED = "ERR_DH_AUDIO_NOTIFY_SINK_FAILED"; +const std::string HDF_EVENT_TRANS_SETUP_FAILED = "ERR_DH_AUDIO_TRANS_SETUP_FAILED"; +const std::string HDF_EVENT_TRANS_START_FAILED = "ERR_DH_AUDIO_TRANS_START_FAILED"; const std::string HDF_EVENT_RESULT_FAILED = "DH_FAILED"; const std::string HDF_EVENT_RESTART = "restart"; diff --git a/hdf_service/distributed_audio/hdi_service/common/include/daudio_errcode.h b/hdf_service/distributed_audio/hdi_service/common/include/daudio_errcode.h index c8cce97c4d0b7bdf6d97881935b485c521aac1c8..b408d5698a2d3f11714dbbd41da4308ff327a447 100644 --- a/hdf_service/distributed_audio/hdi_service/common/include/daudio_errcode.h +++ b/hdf_service/distributed_audio/hdi_service/common/include/daudio_errcode.h @@ -31,6 +31,12 @@ enum DAudioErrorCode { ERR_DH_AUDIO_HDF_CLOSE_DEVICE_FAIL = -46008, ERR_DH_AUDIO_COMMON_NOT_FOUND_KEY = -46009, ERR_DH_AUDIO_HDF_WAIT_TIMEOUT = -46010, + + ERR_DH_AUDIO_HDF_INIT_ENGINE_FAILED = -46011, + ERR_DH_AUDIO_HDF_NOTIFY_SINK_FAILED = -46012, + ERR_DH_AUDIO_HDF_TRANS_SETUP_FAILED = -46013, + ERR_DH_AUDIO_HDF_TRANS_START_FAILED = -46014, + ERR_DH_AUDIO_HDF_RESULT_FAILED = -46015, }; } // Distributedaudio } // OHOS diff --git a/hdf_service/distributed_audio/hdi_service/common/utils/include/daudio_utils.h b/hdf_service/distributed_audio/hdi_service/common/utils/include/daudio_utils.h index 7b842a232eee144c05ed3a9164aa2b03b9c10fd0..4d87892aeae77aeb6827bb585b57737440fcb4c1 100644 --- a/hdf_service/distributed_audio/hdi_service/common/utils/include/daudio_utils.h +++ b/hdf_service/distributed_audio/hdi_service/common/utils/include/daudio_utils.h @@ -58,6 +58,8 @@ bool IsOutDurationRange(int64_t startTime, int64_t endTime, int64_t lastStartTim void SaveFile(std::string fileName, uint8_t *audioData, int32_t size); int32_t WrapCJsonItem(const std::initializer_list> &keys, std::string &content); + +bool CheckIsNum(const std::string &jsonString); } // DistributedHardware } // OHOS #endif \ No newline at end of file diff --git a/hdf_service/distributed_audio/hdi_service/common/utils/src/daudio_utils.cpp b/hdf_service/distributed_audio/hdi_service/common/utils/src/daudio_utils.cpp index 5de3d91c73fb60f8980d641631813fe91fd8e4c7..2c1d231c3c28abd606fa46505867dd922c252ef9 100644 --- a/hdf_service/distributed_audio/hdi_service/common/utils/src/daudio_utils.cpp +++ b/hdf_service/distributed_audio/hdi_service/common/utils/src/daudio_utils.cpp @@ -21,12 +21,17 @@ #include "daudio_constants.h" #include "daudio_errcode.h" +#include "daudio_log.h" + +#undef DH_LOG_TAG +#define DH_LOG_TAG "DAudioUtils" namespace OHOS { namespace DistributedHardware { constexpr size_t INT32_SHORT_ID_LENGTH = 20; constexpr size_t INT32_PLAINTEXT_LENGTH = 4; constexpr size_t INT32_MIN_ID_LENGTH = 3; +constexpr uint8_t MAX_KEY_DH_ID_LEN = 20; std::string GetAnonyString(const std::string &value) { @@ -71,12 +76,31 @@ int32_t GetAudioParamStr(const std::string ¶ms, const std::string &key, std: int32_t GetAudioParamInt(const std::string ¶ms, const std::string &key, int32_t &value) { - std::string val = "0"; + std::string val = "-1"; int32_t ret = GetAudioParamStr(params, key, val); + if (!CheckIsNum(val)) { + DHLOGE("String is not number. str:%s.", val.c_str()); + return -1; + } value = std::stoi(val); return ret; } +bool CheckIsNum(const std::string &jsonString) +{ + if (jsonString.empty() || jsonString.size() > MAX_KEY_DH_ID_LEN) { + DHLOGE("Json string size %d, is zero or too long.", jsonString.size()); + return false; + } + for (char const &c : jsonString) { + if (!std::isdigit(c)) { + DHLOGE("Json string is not number."); + return false; + } + } + return true; +} + int32_t GetAudioParamUInt(const std::string ¶ms, const std::string &key, uint32_t &value) { value = 0; 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 7a89c7547b555c991764f58ee5f16784668865f8..8361fa6a8d1f33d2d442a41a5511daa1903ba62d 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 @@ -68,8 +68,8 @@ int32_t DAudioSinkHandler::InitSink(const std::string ¶ms) if (!waitStatus) { DHLOGE("Audio load sa timeout."); DAudioHisysevent::GetInstance().SysEventWriteFault(DAUDIO_INIT_FAIL, DISTRIBUTED_HARDWARE_AUDIO_SINK_SA_ID, - ERR_DH_AUDIO_SA_LOAD_TIMEOUT, "daudio sink sa load timeout."); - return ERR_DH_AUDIO_SA_LOAD_TIMEOUT; + ERR_DH_AUDIO_SA_LOAD_FAILED, "daudio sink sa load timeout."); + return ERR_DH_AUDIO_SA_LOAD_FAILED; } return DH_SUCCESS; } diff --git a/interfaces/inner_kits/native_cpp/audio_source/src/daudio_ipc_callback.cpp b/interfaces/inner_kits/native_cpp/audio_source/src/daudio_ipc_callback.cpp index 8dd18475f0e8ca15a70303fa35b0fe8890a3d303..6cfdb76fabc818f398b8543c0cca0d57401a8a63 100644 --- a/interfaces/inner_kits/native_cpp/audio_source/src/daudio_ipc_callback.cpp +++ b/interfaces/inner_kits/native_cpp/audio_source/src/daudio_ipc_callback.cpp @@ -43,7 +43,7 @@ int32_t DAudioIpcCallback::OnNotifyRegResult(const std::string &devId, const std return DH_SUCCESS; } - return ERR_DH_AUDIO_SA_REGISTERCALLBACK_NOT_FOUND; + return ERR_DH_AUDIO_SA_CALLBACK_NOT_FOUND; } int32_t DAudioIpcCallback::OnNotifyUnregResult(const std::string &devId, const std::string &dhId, @@ -63,7 +63,7 @@ int32_t DAudioIpcCallback::OnNotifyUnregResult(const std::string &devId, const s unregisterCallbackMap_.erase(reqId); return DH_SUCCESS; } - return ERR_DH_AUDIO_SA_UNREGISTERCALLBACK_NOT_FOUND; + return ERR_DH_AUDIO_SA_CALLBACK_NOT_FOUND; } void DAudioIpcCallback::PushRegisterCallback(const std::string &reqId, 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 5a37c3b106199f7cf2b4ea06c445c7fbf62ba7f4..292128e78fd6fbae2d076a4339cd78c7c640c330 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 @@ -57,7 +57,7 @@ int32_t DAudioSourceHandler::InitSource(const std::string ¶ms) sptr samgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); if (samgr == nullptr) { DHLOGE("Failed to get system ability mgr."); - return ERR_DH_AUDIO_SA_GET_SAMGR_FAILED; + return ERR_DH_AUDIO_NULLPTR; } sptr loadCallback = new DAudioSourceLoadCallback(params); int32_t ret = samgr->LoadSystemAbility(DISTRIBUTED_HARDWARE_AUDIO_SOURCE_SA_ID, loadCallback); @@ -76,8 +76,8 @@ int32_t DAudioSourceHandler::InitSource(const std::string ¶ms) if (!waitStatus) { DHLOGE("Load audio SA timeout."); DAudioHisysevent::GetInstance().SysEventWriteFault(DAUDIO_INIT_FAIL, DISTRIBUTED_HARDWARE_AUDIO_SOURCE_SA_ID, - ERR_DH_AUDIO_SA_LOAD_TIMEOUT, "daudio source sa load timeout."); - return ERR_DH_AUDIO_SA_LOAD_TIMEOUT; + ERR_DH_AUDIO_SA_LOAD_FAILED, "daudio source sa load timeout."); + return ERR_DH_AUDIO_SA_LOAD_FAILED; } return DH_SUCCESS; } @@ -109,7 +109,7 @@ int32_t DAudioSourceHandler::RegisterDistributedHardware(const std::string &devI } if (dAudioIpcCallback_ == nullptr) { DHLOGE("Daudio ipc callback is null."); - return ERR_DH_AUDIO_SA_IPCCALLBACK_NOT_INIT; + return 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; @@ -132,7 +132,7 @@ int32_t DAudioSourceHandler::UnregisterDistributedHardware(const std::string &de } if (dAudioIpcCallback_ == nullptr) { DHLOGE("Daudio ipc callback is null."); - return ERR_DH_AUDIO_SA_IPCCALLBACK_NOT_INIT; + return 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; diff --git a/interfaces/inner_kits/native_cpp/test/unittest/BUILD.gn b/interfaces/inner_kits/native_cpp/test/unittest/BUILD.gn index cdb2083e89af42c8b5b9712f51468875988e1e5b..5a38bac4a76db8a2012fca293b739692e5c26df6 100644 --- a/interfaces/inner_kits/native_cpp/test/unittest/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/unittest/BUILD.gn @@ -30,7 +30,6 @@ group("unittest") { "${services_path}/audiomanager/test/unittest:daudio_manager_test", "${services_path}/audioprocessor/test/unittest:daudio_processor_test", "${services_path}/audiotransport/test/unittest:daudio_transport_test", - "${services_path}/common/taskProcessor/test/unittest:task_processor_test", "${services_path}/hdfaudioclient/test/unittest:audio_adapter_hdi_test", "${services_path}/softbusadapter/test/unittest:audio_soft_bus_adapter_test", ] diff --git a/interfaces/inner_kits/native_cpp/test/unittest/audiosourcetest/src/daudio_ipc_callback_test.cpp b/interfaces/inner_kits/native_cpp/test/unittest/audiosourcetest/src/daudio_ipc_callback_test.cpp index 5d5793c5a2ee606d62d9d35cfb08b839f8966100..27df7a7e8528ebeb9764d0ac44d184eeccb03bf0 100644 --- a/interfaces/inner_kits/native_cpp/test/unittest/audiosourcetest/src/daudio_ipc_callback_test.cpp +++ b/interfaces/inner_kits/native_cpp/test/unittest/audiosourcetest/src/daudio_ipc_callback_test.cpp @@ -70,7 +70,7 @@ HWTEST_F(DAudioIpcCallbackTest, OnNotifyRegResult_002, TestSize.Level1) int32_t status = 0; const std::string data = "data"; int32_t ret = dAudioIpcCallback_->OnNotifyRegResult(devId, dhId, reqId, status, data); - EXPECT_EQ(ERR_DH_AUDIO_SA_REGISTERCALLBACK_NOT_FOUND, ret); + EXPECT_EQ(ERR_DH_AUDIO_SA_CALLBACK_NOT_FOUND, ret); } /** @@ -126,7 +126,7 @@ HWTEST_F(DAudioIpcCallbackTest, OnNotifyUnregResult_002, TestSize.Level1) int32_t status = 0; const std::string data = "data"; int32_t ret = dAudioIpcCallback_->OnNotifyUnregResult(devId, dhId, reqId, status, data); - EXPECT_EQ(ERR_DH_AUDIO_SA_UNREGISTERCALLBACK_NOT_FOUND, ret); + EXPECT_EQ(ERR_DH_AUDIO_SA_CALLBACK_NOT_FOUND, ret); } /** diff --git a/interfaces/inner_kits/native_cpp/test/unittest/audiosourcetest/src/daudio_source_handler_test.cpp b/interfaces/inner_kits/native_cpp/test/unittest/audiosourcetest/src/daudio_source_handler_test.cpp index 6d93ec3cbbd10d98567ff582897c04b87b7e2b27..c284c3356d46d01479c8530a0ad24a1b086f5ab3 100644 --- a/interfaces/inner_kits/native_cpp/test/unittest/audiosourcetest/src/daudio_source_handler_test.cpp +++ b/interfaces/inner_kits/native_cpp/test/unittest/audiosourcetest/src/daudio_source_handler_test.cpp @@ -75,10 +75,10 @@ HWTEST_F(DAudioSourceHandlerTest, RegisterDistributedHardware_002, TestSize.Leve DAudioSourceHandler::GetInstance().dAudioIpcCallback_ = nullptr; DAudioSourceHandler::GetInstance().dAudioSourceProxy_ = new MockIDAudioSource(); int32_t ret = DAudioSourceHandler::GetInstance().RegisterDistributedHardware(devId, dhId, param, callback); - EXPECT_EQ(ERR_DH_AUDIO_SA_IPCCALLBACK_NOT_INIT, ret); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, ret); std::shared_ptr uncallback = std::make_shared(); ret = DAudioSourceHandler::GetInstance().UnregisterDistributedHardware(devId, dhId, uncallback); - EXPECT_EQ(ERR_DH_AUDIO_SA_IPCCALLBACK_NOT_INIT, ret); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, ret); } /** diff --git a/services/audioclient/micclient/src/dmic_client.cpp b/services/audioclient/micclient/src/dmic_client.cpp index a6d3c45d8915cfa1f4fda7f50c5ddcc1dca1d3af..330fb618cb4db6fc80d552c132546545780ad14c 100644 --- a/services/audioclient/micclient/src/dmic_client.cpp +++ b/services/audioclient/micclient/src/dmic_client.cpp @@ -68,7 +68,7 @@ int32_t DMicClient::InitSenderEngine(IAVEngineProvider *providerPtr) int32_t ret = micTrans_->InitEngine(providerPtr); if (ret != DH_SUCCESS) { DHLOGE("Mic client initialize av sender adapter failed."); - return ERR_DH_AUDIO_TRANS_NULL_VALUE; + return ERR_DH_AUDIO_NULLPTR; } return DH_SUCCESS; } @@ -108,13 +108,13 @@ int32_t DMicClient::OnStateChange(const AudioEventType type) } default: DHLOGE("Invalid parameter type: %d.", type); - return ERR_DH_AUDIO_CLIENT_STATE_IS_INVALID; + return ERR_DH_AUDIO_NOT_SUPPORT; } std::shared_ptr cbObj = eventCallback_.lock(); if (cbObj == nullptr) { DHLOGE("Event callback is nullptr."); - return ERR_DH_AUDIO_CLIENT_EVENT_CALLBACK_IS_NULL; + return ERR_DH_AUDIO_NULLPTR; } cbObj->NotifyEvent(event); return DH_SUCCESS; @@ -138,13 +138,13 @@ int32_t DMicClient::AudioFwkClientSetUp() audioCapturer_ = AudioStandard::AudioCapturer::Create(capturerOptions); if (audioCapturer_ == nullptr) { DHLOGE("Audio capturer create failed."); - return ERR_DH_AUDIO_CLIENT_CREATE_CAPTURER_FAILED; + return ERR_DH_AUDIO_CLIENT_CAPTURER_CREATE_FAILED; } if (audioParam_.captureOpts.capturerFlags == MMAP_MODE) { int32_t ret = audioCapturer_->SetCapturerReadCallback(shared_from_this()); if (ret != DH_SUCCESS) { DHLOGE("Client save read callback failed."); - return ERR_DH_AUDIO_CLIENT_CREATE_CAPTURER_FAILED; + return ERR_DH_AUDIO_CLIENT_CAPTURER_CREATE_FAILED; } } return TransSetUp(); @@ -230,7 +230,7 @@ int32_t DMicClient::StartCapture() } if (audioCapturer_ == nullptr) { DHLOGE("audio capturer is nullptr."); - return ERR_DH_AUDIO_CLIENT_CAPTURER_START_FAILED; + return ERR_DH_AUDIO_NULLPTR; } if (!audioCapturer_->Start()) { DHLOGE("Audio capturer start failed."); @@ -358,8 +358,8 @@ int32_t DMicClient::StopCapture() if (micTrans_ == nullptr) { DHLOGE("The capturer or mictrans is not instantiated."); DAudioHisysevent::GetInstance().SysEventWriteFault(DAUDIO_OPT_FAIL, - ERR_DH_AUDIO_CLIENT_CAPTURER_OR_MICTRANS_INSTANCE, "daudio capturer or mictrans is not instantiated."); - return ERR_DH_AUDIO_CLIENT_CAPTURER_OR_MICTRANS_INSTANCE; + ERR_DH_AUDIO_NULLPTR, "daudio capturer or mictrans is not instantiated."); + return ERR_DH_AUDIO_NULLPTR; } isBlocking_.store(false); diff --git a/services/audioclient/spkclient/src/dspeaker_client.cpp b/services/audioclient/spkclient/src/dspeaker_client.cpp index 3f82bd9d5aeca96f8f639684b0cc7d0730c612ce..c0d7064781f28eab6bff0864edf7338868b9b442 100644 --- a/services/audioclient/spkclient/src/dspeaker_client.cpp +++ b/services/audioclient/spkclient/src/dspeaker_client.cpp @@ -69,7 +69,7 @@ int32_t DSpeakerClient::InitReceiverEngine(IAVEngineProvider *providerPtr) int32_t ret = speakerTrans_->InitEngine(providerPtr); if (ret != DH_SUCCESS) { DHLOGE("Spk client initialize av receiver adapter failed."); - return ERR_DH_AUDIO_TRANS_NULL_VALUE; + return ERR_DH_AUDIO_NULLPTR; } return DH_SUCCESS; } @@ -98,7 +98,7 @@ int32_t DSpeakerClient::CreateAudioRenderer(const AudioParam ¶m) audioRenderer_ = AudioStandard::AudioRenderer::Create(rendererOptions); if (audioRenderer_ == nullptr) { DHLOGE("Audio renderer create failed."); - return ERR_DH_AUDIO_CLIENT_CREATE_RENDER_FAILED; + return ERR_DH_AUDIO_CLIENT_RENDER_CREATE_FAILED; } audioRenderer_ ->SetRendererCallback(shared_from_this()); if (audioParam_.renderOpts.renderFlags != MMAP_MODE) { @@ -107,7 +107,7 @@ int32_t DSpeakerClient::CreateAudioRenderer(const AudioParam ¶m) int32_t ret = audioRenderer_->SetRendererWriteCallback(shared_from_this()); if (ret != DH_SUCCESS) { DHLOGE("Client save write callback failed."); - return ERR_DH_AUDIO_CLIENT_CREATE_RENDER_FAILED; + return ERR_DH_AUDIO_CLIENT_RENDER_CREATE_FAILED; } return DH_SUCCESS; } @@ -248,9 +248,9 @@ int32_t DSpeakerClient::StopRender() } if (audioRenderer_ == nullptr) { DHLOGE("Audio renderer is nullptr."); - DAudioHisysevent::GetInstance().SysEventWriteFault(DAUDIO_OPT_FAIL, ERR_DH_AUDIO_CLIENT_RENDER_OR_TRANS_IS_NULL, + DAudioHisysevent::GetInstance().SysEventWriteFault(DAUDIO_OPT_FAIL, ERR_DH_AUDIO_NULLPTR, "daudio renderer is nullptr."); - return ERR_DH_AUDIO_CLIENT_RENDER_OR_TRANS_IS_NULL; + return ERR_DH_AUDIO_NULLPTR; } FlushJitterQueue(); @@ -350,7 +350,7 @@ int32_t DSpeakerClient::OnDecodeTransDataDone(const std::shared_ptr & int64_t startTime = GetNowTimeUs(); if (audioData == nullptr) { DHLOGE("The parameter is empty."); - return ERR_DH_AUDIO_CLIENT_PARAM_IS_NULL; + return ERR_DH_AUDIO_NULLPTR; } std::lock_guard lock(dataQueueMtx_); while (dataQueue_.size() > DATA_QUEUE_MAX_SIZE) { @@ -385,13 +385,13 @@ int32_t DSpeakerClient::OnStateChange(const AudioEventType type) } default: DHLOGE("Invalid parameter type: %d.", type); - return ERR_DH_AUDIO_CLIENT_STATE_IS_INVALID; + return ERR_DH_AUDIO_NOT_SUPPORT; } std::shared_ptr cbObj = eventCallback_.lock(); if (cbObj == nullptr) { DHLOGE("Event callback is nullptr."); - return ERR_DH_AUDIO_CLIENT_EVENT_CALLBACK_IS_NULL; + return ERR_DH_AUDIO_NULLPTR; } cbObj->NotifyEvent(event); return DH_SUCCESS; @@ -544,7 +544,7 @@ int32_t DSpeakerClient::SetAudioParameters(const AudioEvent &event) DHLOGD("Audio volume type, volumeType = %d.", volumeType); if (event.type != VOLUME_SET) { DHLOGE("Invalid parameter."); - return ERR_DH_AUDIO_CLIENT_INVALID_VOLUME_PARAMETER; + return ERR_DH_AUDIO_CLIENT_PARAM_ERROR; } int32_t audioVolumeLevel; @@ -583,7 +583,7 @@ int32_t DSpeakerClient::SetMute(const AudioEvent &event) DHLOGD("Audio volume type, volumeType = %d.", volumeType); if (event.type != VOLUME_MUTE_SET) { DHLOGE("Invalid parameter."); - return ERR_DH_AUDIO_CLIENT_INVALID_VOLUME_PARAMETER; + return ERR_DH_AUDIO_CLIENT_PARAM_ERROR; } ret = AudioStandard::AudioSystemManager::GetInstance()->SetMute(volumeType, muteStatus); if (ret != DH_SUCCESS) { diff --git a/services/audioclient/test/unittest/micclient/src/dmic_client_test.cpp b/services/audioclient/test/unittest/micclient/src/dmic_client_test.cpp index 6f76271cd25ff1dbd942278c3f159ea03bec83db..3ddbe269284df6b5a2e8730541b669ae9f1b8cdf 100644 --- a/services/audioclient/test/unittest/micclient/src/dmic_client_test.cpp +++ b/services/audioclient/test/unittest/micclient/src/dmic_client_test.cpp @@ -221,7 +221,7 @@ HWTEST_F(DMicClientTest, AudioFwkClientSetUp_001, TestSize.Level1) { audioParam_.captureOpts.capturerFlags = MMAP_MODE; int32_t actual = micClient_->AudioFwkClientSetUp(); - EXPECT_EQ(ERR_DH_AUDIO_CLIENT_CREATE_CAPTURER_FAILED, actual); + EXPECT_EQ(ERR_DH_AUDIO_CLIENT_CAPTURER_CREATE_FAILED, actual); audioParam_.captureOpts.capturerFlags = NORMAL_MODE; actual = micClient_->AudioFwkClientSetUp(); EXPECT_NE(DH_SUCCESS, actual); diff --git a/services/audioclient/test/unittest/spkclient/src/dspeaker_client_test.cpp b/services/audioclient/test/unittest/spkclient/src/dspeaker_client_test.cpp index 2be8ceee0c5d47a82fda92ba3099bc84e0c119ce..5bdcc4eefadaa61b4952d9ae7527c92ea5e6c6b4 100644 --- a/services/audioclient/test/unittest/spkclient/src/dspeaker_client_test.cpp +++ b/services/audioclient/test/unittest/spkclient/src/dspeaker_client_test.cpp @@ -88,7 +88,7 @@ HWTEST_F(DSpeakerClientTest, OnStateChange_001, TestSize.Level1) EXPECT_EQ(DH_SUCCESS, speakerClient_->OnStateChange(AudioEventType::DATA_OPENED)); EXPECT_EQ(DH_SUCCESS, speakerClient_->OnStateChange(AudioEventType::DATA_CLOSED)); EXPECT_NE(DH_SUCCESS, speakerClient_->OnStateChange(AudioEventType::SPEAKER_OPENED)); - EXPECT_EQ(ERR_DH_AUDIO_CLIENT_STATE_IS_INVALID, speakerClient_->OnStateChange(AudioEventType::EVENT_UNKNOWN)); + EXPECT_EQ(ERR_DH_AUDIO_NOT_SUPPORT, speakerClient_->OnStateChange(AudioEventType::EVENT_UNKNOWN)); } /** @@ -124,7 +124,7 @@ HWTEST_F(DSpeakerClientTest, StartRender001, TestSize.Level1) EXPECT_EQ(ERR_DH_AUDIO_SA_STATUS_ERR, speakerClient_->StartRender()); EXPECT_EQ(ERR_DH_AUDIO_SA_STATUS_ERR, speakerClient_->StopRender()); speakerClient_->isRenderReady_.store(true); - EXPECT_EQ(ERR_DH_AUDIO_CLIENT_RENDER_OR_TRANS_IS_NULL, speakerClient_->StopRender()); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, speakerClient_->StopRender()); speakerClient_->CreateAudioRenderer(audioParam_); EXPECT_EQ(ERR_DH_AUDIO_CLIENT_RENDER_STOP_FAILED, speakerClient_->StopRender()); } @@ -168,7 +168,7 @@ HWTEST_F(DSpeakerClientTest, StopRender001, TestSize.Level1) HWTEST_F(DSpeakerClientTest, OnDecodeTransDataDone001, TestSize.Level1) { std::shared_ptr audioData = nullptr; - EXPECT_EQ(ERR_DH_AUDIO_CLIENT_PARAM_IS_NULL, speakerClient_->OnDecodeTransDataDone(audioData)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, speakerClient_->OnDecodeTransDataDone(audioData)); for (size_t i = 0; i < 11; i++) { std::shared_ptr data = std::make_shared(4096); speakerClient_->dataQueue_.push(data); diff --git a/services/audiocontrol/controlsink/include/daudio_sink_dev_ctrl_manager.h b/services/audiocontrol/controlsink/include/daudio_sink_dev_ctrl_mgr.h similarity index 70% rename from services/audiocontrol/controlsink/include/daudio_sink_dev_ctrl_manager.h rename to services/audiocontrol/controlsink/include/daudio_sink_dev_ctrl_mgr.h index 71c9aae00f7e5f89cb6538c362da2343f2f231ef..5727469b86f31bb632861553f2cc0b194663b084 100644 --- a/services/audiocontrol/controlsink/include/daudio_sink_dev_ctrl_manager.h +++ b/services/audiocontrol/controlsink/include/daudio_sink_dev_ctrl_mgr.h @@ -21,30 +21,21 @@ #include #include "audio_event.h" -#include "iaudio_ctrl_transport.h" #include "iaudio_event_callback.h" namespace OHOS { namespace DistributedHardware { -class DAudioSinkDevCtrlMgr : public IAudioCtrlTransCallback, public std::enable_shared_from_this { +class DAudioSinkDevCtrlMgr { public: DAudioSinkDevCtrlMgr(const std::string &networkId, std::shared_ptr audioEventCallback); - ~DAudioSinkDevCtrlMgr() override; + ~DAudioSinkDevCtrlMgr(); - void OnStateChange(int32_t type) override; - void OnEventReceived(const AudioEvent &event) override; int32_t SetUp(); int32_t Start(); int32_t Stop(); int32_t Release(); bool IsOpened(); int32_t SendAudioEvent(const AudioEvent &event); - -private: - std::string devId_; - std::weak_ptr audioEventCallback_; - std::shared_ptr audioCtrlTrans_ = nullptr; - std::atomic isOpened_ = false; }; } // DistributedHardware } // OHOS diff --git a/services/audiocontrol/controlsink/src/daudio_sink_dev_ctrl_manager.cpp b/services/audiocontrol/controlsink/src/daudio_sink_dev_ctrl_manager.cpp index 5e62147210220cbd9ea9983dcf68d51a80bbf15b..b08677b34e784a42867a9e34b55477fde35c4c23 100644 --- a/services/audiocontrol/controlsink/src/daudio_sink_dev_ctrl_manager.cpp +++ b/services/audiocontrol/controlsink/src/daudio_sink_dev_ctrl_manager.cpp @@ -13,12 +13,11 @@ * limitations under the License. */ -#include "daudio_sink_dev_ctrl_manager.h" +#include "daudio_sink_dev_ctrl_mgr.h" #include "if_system_ability_manager.h" #include "iservice_registry.h" -#include "audio_ctrl_transport.h" #include "audio_param.h" #include "daudio_constants.h" #include "daudio_errorcode.h" @@ -32,7 +31,6 @@ namespace OHOS { namespace DistributedHardware { DAudioSinkDevCtrlMgr::DAudioSinkDevCtrlMgr(const std::string &devId, std::shared_ptr audioEventCallback) - : devId_(devId), audioEventCallback_(audioEventCallback) { DHLOGD("Control manager constructed."); } @@ -42,42 +40,9 @@ DAudioSinkDevCtrlMgr::~DAudioSinkDevCtrlMgr() DHLOGD("Control manager deconstructed."); } -void DAudioSinkDevCtrlMgr::OnStateChange(int32_t type) -{ - DHLOGD("Distributed audio sink device control manager state change, type: %d.", type); - switch (type) { - case AudioEventType::CTRL_OPENED: - isOpened_.store(true); - break; - case AudioEventType::CTRL_CLOSED: - isOpened_.store(false); - break; - default: - DHLOGE("Invalid parameter type, type: %d.", type); - return; - } - - auto callback = audioEventCallback_.lock(); - if (callback == nullptr) { - DHLOGE("Callback is nullptr."); - return; - } - AudioEvent event(static_cast(type), ""); - callback->NotifyEvent(event); -} - int32_t DAudioSinkDevCtrlMgr::SetUp() { DHLOGI("Set up sink device control manager."); - if (audioCtrlTrans_ == nullptr) { - audioCtrlTrans_ = std::make_shared(devId_); - } - - int32_t ret = audioCtrlTrans_->SetUp(shared_from_this()); - if (ret != DH_SUCCESS) { - DHLOGE("Ctrl trans setup failed, ret: %d.", ret); - return ret; - } return DH_SUCCESS; } @@ -90,63 +55,23 @@ int32_t DAudioSinkDevCtrlMgr::Start() int32_t DAudioSinkDevCtrlMgr::Stop() { DHLOGI("Stop sink device control manager."); - isOpened_.store(false); - if (audioCtrlTrans_ == nullptr) { - DHLOGD("Ctrl trans already stop."); - return DH_SUCCESS; - } - - int32_t ret = audioCtrlTrans_->Stop(); - if (ret != DH_SUCCESS) { - DHLOGE("Ctrl trans stop failed, ret: %d.", ret); - return ret; - } return DH_SUCCESS; } int32_t DAudioSinkDevCtrlMgr::Release() { DHLOGI("Release sink device control manager."); - if (audioCtrlTrans_ == nullptr) { - DHLOGD("Ctrl trans already release."); - return DH_SUCCESS; - } - int32_t ret = audioCtrlTrans_->Release(); - if (ret != DH_SUCCESS) { - DHLOGE("Ctrl trans release failed, ret: %d.", ret); - return ret; - } - audioCtrlTrans_ = nullptr; return DH_SUCCESS; } bool DAudioSinkDevCtrlMgr::IsOpened() { - return isOpened_.load(); -} - -void DAudioSinkDevCtrlMgr::OnEventReceived(const AudioEvent &event) -{ - DHLOGD("Received event type %d.", event.type); - auto callback = audioEventCallback_.lock(); - if (callback == nullptr) { - DHLOGE("Callback is nullptr."); - return; - } - callback->NotifyEvent(event); + return true; } int32_t DAudioSinkDevCtrlMgr::SendAudioEvent(const AudioEvent &event) { DHLOGD("Send audio event."); - if (audioCtrlTrans_ == nullptr) { - return ERR_DH_AUDIO_SA_SINK_CTRL_TRANS_NULL; - } - int32_t ret = audioCtrlTrans_->SendAudioEvent(event); - if (ret != DH_SUCCESS) { - DHLOGE("Audio control transfer sending audio event error,ret: %d.", ret); - return ret; - } return DH_SUCCESS; } } // namespace DistributedHardware diff --git a/services/audiocontrol/controlsource/include/daudio_source_dev_ctrl_manager.h b/services/audiocontrol/controlsource/include/daudio_source_dev_ctrl_mgr.h similarity index 64% rename from services/audiocontrol/controlsource/include/daudio_source_dev_ctrl_manager.h rename to services/audiocontrol/controlsource/include/daudio_source_dev_ctrl_mgr.h index 8ab5c0b2ff62a991b530d8495b63a1c1730c32ee..ff5ea9304dd4fbcb9c44adfe304c2eb6b45319a6 100644 --- a/services/audiocontrol/controlsource/include/daudio_source_dev_ctrl_manager.h +++ b/services/audiocontrol/controlsource/include/daudio_source_dev_ctrl_mgr.h @@ -1,55 +1,42 @@ -/* - * Copyright (c) 2022 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef OHOS_DAUDIO_SOURCE_DEV_CTRL_MANAGER_H -#define OHOS_DAUDIO_SOURCE_DEV_CTRL_MANAGER_H - -#include -#include -#include - -#include "audio_event.h" -#include "iaudio_ctrl_trans_callback.h" -#include "iaudio_event_callback.h" -#include "iaudio_ctrl_transport.h" - -namespace OHOS { -namespace DistributedHardware { -class DAudioSourceDevCtrlMgr : public IAudioCtrlTransCallback, - public std::enable_shared_from_this { -public: - DAudioSourceDevCtrlMgr(const std::string &networkId, std::shared_ptr audioEventCallback); - ~DAudioSourceDevCtrlMgr() override; - - void OnStateChange(int32_t type) override; - void OnEventReceived(const AudioEvent &event) override; - int32_t SetUp(); - int32_t Start(); - int32_t Stop(); - int32_t Release(); - bool IsOpened(); - int32_t SendAudioEvent(const AudioEvent &event); - -private: - std::string devId_; - std::weak_ptr audioEventCallback_; - std::shared_ptr audioCtrlTrans_ = nullptr; - std::atomic isOpened_ = false; - std::mutex channelWaitMutex_; - std::condition_variable channelWaitCond_; -}; -} // DistributedHardware -} // OHOS +/* + * Copyright (c) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OHOS_DAUDIO_SOURCE_DEV_CTRL_MANAGER_H +#define OHOS_DAUDIO_SOURCE_DEV_CTRL_MANAGER_H + +#include +#include +#include + +#include "audio_event.h" +#include "iaudio_event_callback.h" + +namespace OHOS { +namespace DistributedHardware { +class DAudioSourceDevCtrlMgr { +public: + DAudioSourceDevCtrlMgr(const std::string &networkId, std::shared_ptr audioEventCallback); + ~DAudioSourceDevCtrlMgr(); + + int32_t SetUp(); + int32_t Start(); + int32_t Stop(); + int32_t Release(); + bool IsOpened(); + int32_t SendAudioEvent(const AudioEvent &event); +}; +} // DistributedHardware +} // OHOS #endif // OHOS_DAUDIO_SOURCE_DEV_CTRL_MANAGER_H \ No newline at end of file diff --git a/services/audiocontrol/controlsource/src/daudio_source_dev_ctrl_manager.cpp b/services/audiocontrol/controlsource/src/daudio_source_dev_ctrl_manager.cpp index ac883fefdfb34202b3ed9b37a26d65d9e94e30c9..18174c5c54e986409b8121ec71faf7550f2d4ab3 100644 --- a/services/audiocontrol/controlsource/src/daudio_source_dev_ctrl_manager.cpp +++ b/services/audiocontrol/controlsource/src/daudio_source_dev_ctrl_manager.cpp @@ -13,9 +13,8 @@ * limitations under the License. */ -#include "daudio_source_dev_ctrl_manager.h" +#include "daudio_source_dev_ctrl_mgr.h" -#include "audio_ctrl_transport.h" #include "audio_param.h" #include "daudio_constants.h" #include "daudio_errorcode.h" @@ -29,7 +28,6 @@ namespace OHOS { namespace DistributedHardware { DAudioSourceDevCtrlMgr::DAudioSourceDevCtrlMgr(const std::string &devId, std::shared_ptr audioEventCallback) - : devId_(devId), audioEventCallback_(audioEventCallback) { DHLOGD("Control manager constructed."); } @@ -42,119 +40,35 @@ DAudioSourceDevCtrlMgr::~DAudioSourceDevCtrlMgr() int32_t DAudioSourceDevCtrlMgr::SetUp() { DHLOGI("Set up source device control manager."); - if (audioCtrlTrans_ == nullptr) { - audioCtrlTrans_ = std::make_shared(devId_); - } - int32_t ret = audioCtrlTrans_->SetUp(shared_from_this()); - if (ret != DH_SUCCESS) { - DHLOGE("Set up ctrl trans failed, ret: %d.", ret); - return ret; - } return DH_SUCCESS; } int32_t DAudioSourceDevCtrlMgr::Start() { DHLOGI("Start source device control manager."); - if (audioCtrlTrans_ == nullptr) { - DHLOGE("Audio ctrl trans is null, start failed"); - return ERR_DH_AUDIO_SA_CTRL_TRANS_NULL; - } - - int32_t ret = audioCtrlTrans_->Start(); - if (ret != DH_SUCCESS) { - DHLOGE("Audio ctrl trans start failed, ret:%d.", ret); - return ret; - } - - std::unique_lock lck(channelWaitMutex_); - auto status = channelWaitCond_.wait_for(lck, std::chrono::seconds(CHANNEL_WAIT_SECONDS), - [this]() { return isOpened_.load(); }); - if (!status) { - DHLOGE("Wait channel open timeout(%ds).", CHANNEL_WAIT_SECONDS); - return ERR_DH_AUDIO_SA_CTRL_CHANNEL_WAIT_TIMEOUT; - } - return DH_SUCCESS; } int32_t DAudioSourceDevCtrlMgr::Stop() { - isOpened_.store(false); - if (audioCtrlTrans_ == nullptr) { - DHLOGE("Audio ctrl trans is null, no need stop"); - return DH_SUCCESS; - } - - return audioCtrlTrans_->Stop(); + return DH_SUCCESS; } int32_t DAudioSourceDevCtrlMgr::Release() { DHLOGI("Release source device control manager."); - if (audioCtrlTrans_ == nullptr) { - DHLOGE("Audio ctrl trans is null, no need release."); - return DH_SUCCESS; - } - - int32_t ret = audioCtrlTrans_->Release(); - if (ret != DH_SUCCESS) { - DHLOGE("Release audio ctrl failed."); - return ret; - } - audioCtrlTrans_ = nullptr; return DH_SUCCESS; } bool DAudioSourceDevCtrlMgr::IsOpened() { - return isOpened_.load(); + return true; } int32_t DAudioSourceDevCtrlMgr::SendAudioEvent(const AudioEvent &event) { DHLOGD("Send audio event."); - if (audioCtrlTrans_ == nullptr) { - DHLOGE("Send audio event, Audio ctrl trans is null"); - return ERR_DH_AUDIO_SA_CTRL_TRANS_NULL; - } - return audioCtrlTrans_->SendAudioEvent(event); -} - -void DAudioSourceDevCtrlMgr::OnStateChange(int32_t type) -{ - DHLOGD("Daudio source control state change, type: %d.", type); - switch (type) { - case AudioEventType::CTRL_OPENED: - isOpened_.store(true); - channelWaitCond_.notify_one(); - break; - case AudioEventType::CTRL_CLOSED: - isOpened_.store(false); - break; - default: - DHLOGE("Invalid parameter type, type: %d.", type); - return; - } - - auto callback = audioEventCallback_.lock(); - if (callback == nullptr) { - DHLOGE("Callback is nullptr."); - return; - } - AudioEvent event(static_cast(type), ""); - callback->NotifyEvent(event); -} - -void DAudioSourceDevCtrlMgr::OnEventReceived(const AudioEvent &event) -{ - DHLOGD("Received event"); - auto callback = audioEventCallback_.lock(); - if (callback == nullptr) { - DHLOGE("Callback is nullptr."); - return; - } - callback->NotifyEvent(event); + return DH_SUCCESS; } } // namespace DistributedHardware } // namespace OHOS diff --git a/services/audiocontrol/test/unittest/audiocontrolutils/inlcude/audiocontrol_test_utils.h b/services/audiocontrol/test/unittest/audiocontrolutils/inlcude/audiocontrol_test_utils.h deleted file mode 100644 index 1e38995e00dbf2976be133b7601566c6160e0cdc..0000000000000000000000000000000000000000 --- a/services/audiocontrol/test/unittest/audiocontrolutils/inlcude/audiocontrol_test_utils.h +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright (c) 2022 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef OHOS_DAUDIO_SOURCE_CONTROL_TEST_UTILS_H -#define OHOS_DAUDIO_SOURCE_CONTROL_TEST_UTILS_H - -#include "audio_event.h" -#include "iaudio_event_callback.h" -#include "iaudio_ctrl_transport.h" - -namespace OHOS { -namespace DistributedHardware { -class MockIAudioEventCallback : public IAudioEventCallback { -public: - explicit MockIAudioEventCallback() - { - } - ~MockIAudioEventCallback() {} - - void NotifyEvent(const AudioEvent &event) - { - (void) event; - } -}; - -class MockIAudioCtrlTransport : public IAudioCtrlTransport { -public: - explicit MockIAudioCtrlTransport(std::string devId) : devId_(devId) {} - ~MockIAudioCtrlTransport() {} - - int32_t SetUp(const std::shared_ptr &callback) override - { - return 0; - } - - int32_t Release() override - { - return 0; - } - - int32_t Start() override - { - return 0; - } - - int32_t Stop() override - { - return 0; - } - - int32_t SendAudioEvent(const AudioEvent &event) override - { - (void) event; - return 0; - } - -private: - const std::string devId_; -}; -} // namespace DistributedHardware -} // namespace OHOS -#endif // OHOS_DAUDIO_SOURCE_CONTROL_TEST_UTILS_H diff --git a/services/audiocontrol/test/unittest/controlsink/BUILD.gn b/services/audiocontrol/test/unittest/controlsink/BUILD.gn index bdadf376055ce9c47b416a3454c55cabb8a7c047..d8f272d1e885b4317171434c55a41496966cd6f3 100644 --- a/services/audiocontrol/test/unittest/controlsink/BUILD.gn +++ b/services/audiocontrol/test/unittest/controlsink/BUILD.gn @@ -32,7 +32,6 @@ config("module_private_config") { "${audio_transport_path}/audioctrltransport/include", "${audio_transport_path}/audioctrltransport/interface", "${audio_control_path}/controlsink/include", - "${audio_control_path}/test/unittest/audiocontrolutils/inlcude", ] } diff --git a/services/audiocontrol/test/unittest/controlsink/include/daudio_sink_dev_ctrl_manager_test.h b/services/audiocontrol/test/unittest/controlsink/include/daudio_sink_dev_ctrl_manager_test.h index 6c88f23ca625b06c6387a89ade531fc23c4e47f7..8efbf70e8e1e250bdb59ce38ec7bb75eb65202b0 100644 --- a/services/audiocontrol/test/unittest/controlsink/include/daudio_sink_dev_ctrl_manager_test.h +++ b/services/audiocontrol/test/unittest/controlsink/include/daudio_sink_dev_ctrl_manager_test.h @@ -20,11 +20,10 @@ #include #include "audio_event.h" -#include "iaudio_ctrl_trans_callback.h" +#include "daudio_errorcode.h" #include "iaudio_event_callback.h" -#include "audio_ctrl_transport.h" #define private public -#include "daudio_sink_dev_ctrl_manager.h" +#include "daudio_sink_dev_ctrl_mgr.h" #undef private namespace OHOS { diff --git a/services/audiocontrol/test/unittest/controlsink/src/daudio_sink_dev_ctrl_manager_test.cpp b/services/audiocontrol/test/unittest/controlsink/src/daudio_sink_dev_ctrl_manager_test.cpp index 036d87393760de246a4d2b0d5d3bcb088c976227..4b064ee0070fa2ed473ee58e923db3836955d57f 100644 --- a/services/audiocontrol/test/unittest/controlsink/src/daudio_sink_dev_ctrl_manager_test.cpp +++ b/services/audiocontrol/test/unittest/controlsink/src/daudio_sink_dev_ctrl_manager_test.cpp @@ -14,10 +14,8 @@ */ #include "daudio_sink_dev_ctrl_manager_test.h" -#include "audiocontrol_test_utils.h" using namespace testing::ext; - namespace OHOS { namespace DistributedHardware { void DAudioSinkDevCtrlMgrTest::SetUpTestCase(void) {} @@ -45,11 +43,6 @@ void DAudioSinkDevCtrlMgrTest::TearDown(void) HWTEST_F(DAudioSinkDevCtrlMgrTest, SetUp_001, TestSize.Level1) { - int32_t type = static_cast(AudioEventType::CTRL_OPENED); - sinkDevCtrl_->OnStateChange(type); - - std::string devId = "devId"; - sinkDevCtrl_->audioCtrlTrans_ = std::make_shared(devId); EXPECT_EQ(DH_SUCCESS, sinkDevCtrl_->SetUp()); } @@ -61,8 +54,6 @@ HWTEST_F(DAudioSinkDevCtrlMgrTest, SetUp_001, TestSize.Level1) */ HWTEST_F(DAudioSinkDevCtrlMgrTest, Start_001, TestSize.Level1) { - std::string devId = "devId"; - sinkDevCtrl_->audioCtrlTrans_ = std::make_shared(devId); EXPECT_EQ(DH_SUCCESS, sinkDevCtrl_->Start()); } @@ -74,20 +65,6 @@ HWTEST_F(DAudioSinkDevCtrlMgrTest, Start_001, TestSize.Level1) */ HWTEST_F(DAudioSinkDevCtrlMgrTest, Stop_001, TestSize.Level1) { - sinkDevCtrl_->audioCtrlTrans_ = nullptr; - EXPECT_EQ(DH_SUCCESS, sinkDevCtrl_->Stop()); -} - -/** - * @tc.name: Stop_002 - * @tc.desc: Verify the Stop function. - * @tc.type: FUNC - * @tc.require: AR000H0E5F - */ -HWTEST_F(DAudioSinkDevCtrlMgrTest, Stop_002, TestSize.Level1) -{ - std::string devId = "devId"; - sinkDevCtrl_->audioCtrlTrans_ = std::make_shared(devId); EXPECT_EQ(DH_SUCCESS, sinkDevCtrl_->Stop()); } @@ -99,8 +76,6 @@ HWTEST_F(DAudioSinkDevCtrlMgrTest, Stop_002, TestSize.Level1) */ HWTEST_F(DAudioSinkDevCtrlMgrTest, Release_001, TestSize.Level1) { - std::string devId = "devId"; - sinkDevCtrl_->audioCtrlTrans_ = std::make_shared(devId); EXPECT_EQ(DH_SUCCESS, sinkDevCtrl_->Release()); } @@ -112,11 +87,6 @@ HWTEST_F(DAudioSinkDevCtrlMgrTest, Release_001, TestSize.Level1) */ HWTEST_F(DAudioSinkDevCtrlMgrTest, IsOpened_001, TestSize.Level1) { - AudioEvent event; - sinkDevCtrl_->audioEventCallback_ = std::make_shared(); - sinkDevCtrl_->OnEventReceived(event); - - sinkDevCtrl_->isOpened_ = true; EXPECT_EQ(true, sinkDevCtrl_->IsOpened()); } @@ -129,21 +99,6 @@ HWTEST_F(DAudioSinkDevCtrlMgrTest, IsOpened_001, TestSize.Level1) HWTEST_F(DAudioSinkDevCtrlMgrTest, SendAudioEvent_001, TestSize.Level1) { AudioEvent event; - sinkDevCtrl_->audioCtrlTrans_ = nullptr; - EXPECT_EQ(ERR_DH_AUDIO_SA_SINK_CTRL_TRANS_NULL, sinkDevCtrl_->SendAudioEvent(event)); -} - -/** - * @tc.name: SendAudioEvent_002 - * @tc.desc: Verify the SendAudioEvent function. - * @tc.type: FUNC - * @tc.require: AR000H0E5F - */ -HWTEST_F(DAudioSinkDevCtrlMgrTest, SendAudioEvent_002, TestSize.Level1) -{ - std::string devId = "devId"; - AudioEvent event; - sinkDevCtrl_->audioCtrlTrans_ = std::make_shared(devId); EXPECT_EQ(DH_SUCCESS, sinkDevCtrl_->SendAudioEvent(event)); } } // namespace DistributedHardware diff --git a/services/audiocontrol/test/unittest/controlsource/BUILD.gn b/services/audiocontrol/test/unittest/controlsource/BUILD.gn index 91ef7946ed089ec2b72ab406edd16ee8f4bd0230..71493d2bfadd7bfa9a43776d7f5eafdd2fb7cfa9 100644 --- a/services/audiocontrol/test/unittest/controlsource/BUILD.gn +++ b/services/audiocontrol/test/unittest/controlsource/BUILD.gn @@ -29,10 +29,7 @@ config("module_private_config") { "${services_path}/common/audioeventcallback", "${audio_transport_path}/interface", "${audio_transport_path}/audiochannel/interface", - "${audio_transport_path}/audioctrltransport/include", - "${audio_transport_path}/audioctrltransport/interface", "${audio_control_path}/controlsource/include", - "${audio_control_path}/test/unittest/audiocontrolutils/inlcude", ] } diff --git a/services/audiocontrol/test/unittest/controlsource/include/daudio_source_dev_ctrl_manager_test.h b/services/audiocontrol/test/unittest/controlsource/include/daudio_source_dev_ctrl_manager_test.h index 4460b1c2de1f49b58a5bc475d68f5fea5e756c77..50112f33afa228fc825717526816cbf81629df6a 100644 --- a/services/audiocontrol/test/unittest/controlsource/include/daudio_source_dev_ctrl_manager_test.h +++ b/services/audiocontrol/test/unittest/controlsource/include/daudio_source_dev_ctrl_manager_test.h @@ -21,13 +21,9 @@ #include "audio_event.h" #include "daudio_errorcode.h" -#include "iaudio_ctrl_trans_callback.h" #include "iaudio_event_callback.h" -#include "iaudio_ctrl_transport.h" -#include "audiocontrol_test_utils.h" -#include "audio_ctrl_transport.h" #define private public -#include "daudio_source_dev_ctrl_manager.h" +#include "daudio_source_dev_ctrl_mgr.h" #undef private namespace OHOS { diff --git a/services/audiocontrol/test/unittest/controlsource/src/daudio_source_dev_ctrl_manager_test.cpp b/services/audiocontrol/test/unittest/controlsource/src/daudio_source_dev_ctrl_manager_test.cpp index d8c8eba42fc8cd8eb5aa66263b63bd4e8aa354b9..a3a63c8611aa349ebe606466f601cd9222ffaae0 100644 --- a/services/audiocontrol/test/unittest/controlsource/src/daudio_source_dev_ctrl_manager_test.cpp +++ b/services/audiocontrol/test/unittest/controlsource/src/daudio_source_dev_ctrl_manager_test.cpp @@ -19,8 +19,6 @@ #include "nativetoken_kit.h" #include "token_setproc.h" -#include "audiocontrol_test_utils.h" - using namespace testing::ext; namespace OHOS { @@ -66,8 +64,6 @@ void DAudioSourceDevCtrlMgrTest::TearDown(void) */ HWTEST_F(DAudioSourceDevCtrlMgrTest, SetUp_001, TestSize.Level1) { - std::string devId = "devId"; - sourceDevCtrl_->audioCtrlTrans_ = std::make_shared(devId); EXPECT_EQ(DH_SUCCESS, sourceDevCtrl_->SetUp()); } @@ -79,21 +75,6 @@ HWTEST_F(DAudioSourceDevCtrlMgrTest, SetUp_001, TestSize.Level1) */ HWTEST_F(DAudioSourceDevCtrlMgrTest, Start_001, TestSize.Level1) { - sourceDevCtrl_->audioCtrlTrans_ = nullptr; - EXPECT_EQ(ERR_DH_AUDIO_SA_CTRL_TRANS_NULL, sourceDevCtrl_->Start()); -} - -/** - * @tc.name: Start_002 - * @tc.desc: Verify the Start function. - * @tc.type: FUNC - * @tc.require: AR000H0E5F - */ -HWTEST_F(DAudioSourceDevCtrlMgrTest, Start_002, TestSize.Level1) -{ - std::string devId = "devId"; - sourceDevCtrl_->isOpened_ = true; - sourceDevCtrl_->audioCtrlTrans_ = std::make_shared(devId); EXPECT_EQ(DH_SUCCESS, sourceDevCtrl_->Start()); } @@ -105,20 +86,6 @@ HWTEST_F(DAudioSourceDevCtrlMgrTest, Start_002, TestSize.Level1) */ HWTEST_F(DAudioSourceDevCtrlMgrTest, Stop_001, TestSize.Level1) { - sourceDevCtrl_->audioCtrlTrans_ = nullptr; - EXPECT_EQ(DH_SUCCESS, sourceDevCtrl_->Stop()); -} - -/** - * @tc.name: Stop_002 - * @tc.desc: Verify the Stop function. - * @tc.type: FUNC - * @tc.require: AR000H0E5F - */ -HWTEST_F(DAudioSourceDevCtrlMgrTest, Stop_002, TestSize.Level1) -{ - std::string devId = "devId"; - sourceDevCtrl_->audioCtrlTrans_ = std::make_shared(devId); EXPECT_EQ(DH_SUCCESS, sourceDevCtrl_->Stop()); } @@ -130,20 +97,6 @@ HWTEST_F(DAudioSourceDevCtrlMgrTest, Stop_002, TestSize.Level1) */ HWTEST_F(DAudioSourceDevCtrlMgrTest, Release_001, TestSize.Level1) { - sourceDevCtrl_->audioCtrlTrans_ = nullptr; - EXPECT_EQ(DH_SUCCESS, sourceDevCtrl_->Release()); -} - -/** - * @tc.name: Release_002 - * @tc.desc: Verify the Release function. - * @tc.type: FUNC - * @tc.require: AR000H0E5F - */ -HWTEST_F(DAudioSourceDevCtrlMgrTest, Release_002, TestSize.Level1) -{ - std::string devId = "devId"; - sourceDevCtrl_->audioCtrlTrans_ = std::make_shared(devId); EXPECT_EQ(DH_SUCCESS, sourceDevCtrl_->Release()); } @@ -155,13 +108,7 @@ HWTEST_F(DAudioSourceDevCtrlMgrTest, Release_002, TestSize.Level1) */ HWTEST_F(DAudioSourceDevCtrlMgrTest, IsOpened_001, TestSize.Level1) { - AudioEvent event; - sourceDevCtrl_->audioEventCallback_ = std::make_shared(); - sourceDevCtrl_->OnEventReceived(event); - - sourceDevCtrl_->isOpened_ = true; - bool actual = sourceDevCtrl_->IsOpened(); - EXPECT_EQ(true, actual); + EXPECT_EQ(true, sourceDevCtrl_->IsOpened()); } /** @@ -172,29 +119,7 @@ HWTEST_F(DAudioSourceDevCtrlMgrTest, IsOpened_001, TestSize.Level1) */ HWTEST_F(DAudioSourceDevCtrlMgrTest, SendAudioEvent_001, TestSize.Level1) { - int32_t type = static_cast(AudioEventType::CTRL_OPENED); - sourceDevCtrl_->OnStateChange(type); - - AudioEvent event; - sourceDevCtrl_->audioCtrlTrans_ = nullptr; - EXPECT_EQ(ERR_DH_AUDIO_SA_CTRL_TRANS_NULL, sourceDevCtrl_->SendAudioEvent(event)); -} - -/** - * @tc.name: SendAudioEvent_002 - * @tc.desc: Verify the SendAudioEvent function. - * @tc.type: FUNC - * @tc.require: AR000H0E5F - */ -HWTEST_F(DAudioSourceDevCtrlMgrTest, SendAudioEvent_002, TestSize.Level1) -{ - int32_t type = static_cast(AudioEventType::CTRL_OPENED); - sourceDevCtrl_->audioEventCallback_ = std::make_shared(); - sourceDevCtrl_->OnStateChange(type); - - std::string devId = "devId"; AudioEvent event; - sourceDevCtrl_->audioCtrlTrans_ = std::make_shared(devId); EXPECT_EQ(DH_SUCCESS, sourceDevCtrl_->SendAudioEvent(event)); } } // namespace DistributedHardware diff --git a/services/audiohdiproxy/src/daudio_hdi_handler.cpp b/services/audiohdiproxy/src/daudio_hdi_handler.cpp index 764d53a652a863b0f480aa951ccd35b115a07b57..5f3023c404e0606331fa838f362343dd3c0821a3 100644 --- a/services/audiohdiproxy/src/daudio_hdi_handler.cpp +++ b/services/audiohdiproxy/src/daudio_hdi_handler.cpp @@ -67,7 +67,7 @@ int32_t DAudioHdiHandler::InitHdiHandler() audioSrvHdf_ = IDAudioManager::Get(HDF_AUDIO_SERVICE_NAME.c_str(), false); if (audioSrvHdf_ == nullptr) { DHLOGE("Can not get hdf audio manager."); - return ERR_DH_AUDIO_HDI_PROXY_NOT_INIT; + return ERR_DH_AUDIO_NULLPTR; } remote_ = OHOS::HDI::hdi_objcast(audioSrvHdf_); @@ -99,7 +99,7 @@ int32_t DAudioHdiHandler::RegisterAudioDevice(const std::string &devId, const in 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_HDI_PROXY_NOT_INIT; + return ERR_DH_AUDIO_NULLPTR; } std::string searchKey; switch (GetDevTypeByDHId(dhId)) { @@ -112,7 +112,7 @@ int32_t DAudioHdiHandler::RegisterAudioDevice(const std::string &devId, const in case AUDIO_DEVICE_TYPE_UNKNOWN: default: DHLOGE("Unknown audio device."); - return ERR_DH_AUDIO_HDI_UNKNOWN_DEVTYPE; + return ERR_DH_AUDIO_NOT_SUPPORT; } { std::lock_guard devLck(devMapMtx_); @@ -145,7 +145,7 @@ int32_t DAudioHdiHandler::UnRegisterAudioDevice(const std::string &devId, const 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_HDI_PROXY_NOT_INIT; + return ERR_DH_AUDIO_NULLPTR; } int32_t res = audioSrvHdf_->UnRegisterAudioDevice(devId, dhId); @@ -159,7 +159,7 @@ int32_t DAudioHdiHandler::UnRegisterAudioDevice(const std::string &devId, const auto iter = mapAudioMgrDhIds_.find(devId); if (iter == mapAudioMgrDhIds_.end()) { DHLOGE("Can not find register devId. devId: %s", GetAnonyString(devId).c_str()); - return ERR_DH_AUDIO_HDI_CALLBACK_NOT_EXIST; + return ERR_DH_AUDIO_SA_CALLBACK_NOT_FOUND; } iter->second.erase(dhId); @@ -219,7 +219,7 @@ int32_t DAudioHdiHandler::NotifyEvent(const std::string &devId, const int32_t dh GetAnonyString(devId).c_str(), dhId, audioEvent.type, audioEvent.content.c_str()); if (audioSrvHdf_ == nullptr) { DHLOGE("Audio hdi proxy not init"); - return ERR_DH_AUDIO_HDI_PROXY_NOT_INIT; + return ERR_DH_AUDIO_NULLPTR; } DAudioEvent newEvent = {AUDIO_EVENT_UNKNOWN, audioEvent.content}; ProcessEventMsg(audioEvent, newEvent); diff --git a/services/audiohdiproxy/test/unittest/daudio_hdi_handler/src/daudio_hdi_handler_test.cpp b/services/audiohdiproxy/test/unittest/daudio_hdi_handler/src/daudio_hdi_handler_test.cpp index 75ede48bfbefd733c184a2f999807ea3244410f1..aaa392bb8301722bdaa157074497c8e2fef174fb 100644 --- a/services/audiohdiproxy/test/unittest/daudio_hdi_handler/src/daudio_hdi_handler_test.cpp +++ b/services/audiohdiproxy/test/unittest/daudio_hdi_handler/src/daudio_hdi_handler_test.cpp @@ -76,8 +76,9 @@ HWTEST_F(DAudioHdiHandlerTest, RegisterAudioDevice_002, TestSize.Level1) { EXPECT_EQ(HDF_SUCCESS, hdiHandler_->InitHdiHandler()); std::shared_ptr callbackObjParam = std::make_shared(); - EXPECT_EQ(HDF_SUCCESS, hdiHandler_->RegisterAudioDevice(devId_, dhId_, capability_, callbackObjParam)); - EXPECT_EQ(HDF_SUCCESS, hdiHandler_->UnRegisterAudioDevice(devId_, dhId_)); + EXPECT_EQ(ERR_DH_AUDIO_HDI_CALL_FAILED, + hdiHandler_->RegisterAudioDevice(devId_, dhId_, capability_, callbackObjParam)); + EXPECT_EQ(ERR_DH_AUDIO_HDI_CALL_FAILED, hdiHandler_->UnRegisterAudioDevice(devId_, dhId_)); } /** diff --git a/services/audiomanager/managersink/include/daudio_sink_dev.h b/services/audiomanager/managersink/include/daudio_sink_dev.h index bbb1d1ac27b37225a981ff3b3c4b1fd63e6ea682..fa5f34a0a7023aba9caf92fe088a9d23b1cb44d7 100644 --- a/services/audiomanager/managersink/include/daudio_sink_dev.h +++ b/services/audiomanager/managersink/include/daudio_sink_dev.h @@ -24,7 +24,7 @@ #include "event_handler.h" #include "nlohmann/json.hpp" -#include "daudio_sink_dev_ctrl_manager.h" +#include "daudio_sink_dev_ctrl_mgr.h" #include "dmic_client.h" #include "dspeaker_client.h" #include "iaudio_event_callback.h" @@ -59,8 +59,6 @@ public: int32_t InitAVTransEngines(const ChannelState channelState, IAVEngineProvider *providerPtr); private: - int32_t TaskOpenCtrlChannel(const std::string &args); - int32_t TaskCloseCtrlChannel(const std::string &args); int32_t TaskOpenDSpeaker(const std::string &args); int32_t TaskCloseDSpeaker(const std::string &args); int32_t TaskStartRender(const std::string &args); @@ -81,6 +79,7 @@ private: void JudgeDeviceStatus(); int32_t ParseDhidFromEvent(std::string args); + int32_t ConvertString2Int(std::string val); private: std::mutex rpcWaitMutex_; @@ -107,8 +106,6 @@ private: void ProcessEvent(const AppExecFwk::InnerEvent::Pointer &event) override; private: - void NotifyOpenCtrlChannel(const AppExecFwk::InnerEvent::Pointer &event); - void NotifyCloseCtrlChannel(const AppExecFwk::InnerEvent::Pointer &event); void NotifyCtrlOpened(const AppExecFwk::InnerEvent::Pointer &event); void NotifyCtrlClosed(const AppExecFwk::InnerEvent::Pointer &event); void NotifyOpenSpeaker(const AppExecFwk::InnerEvent::Pointer &event); diff --git a/services/audiomanager/managersink/src/daudio_sink_dev.cpp b/services/audiomanager/managersink/src/daudio_sink_dev.cpp index 051a92b03251e8599cbecc98da5714e3c1b1f4c0..4df290b7748b593c49d6879027cccdf5447c4d44 100644 --- a/services/audiomanager/managersink/src/daudio_sink_dev.cpp +++ b/services/audiomanager/managersink/src/daudio_sink_dev.cpp @@ -25,7 +25,6 @@ #include "daudio_log.h" #include "daudio_sink_manager.h" #include "daudio_util.h" -#include "task_impl.h" #undef DH_LOG_TAG #define DH_LOG_TAG "DAudioSinkDev" @@ -104,20 +103,6 @@ void DAudioSinkDev::NotifyEvent(const AudioEvent &audioEvent) } } -int32_t DAudioSinkDev::TaskOpenCtrlChannel(const std::string &args) -{ - DHLOGI("Open ctrl channel."); - DHLOGI("Open ctrl channel success, notify open ctrl result."); - return DH_SUCCESS; -} - -int32_t DAudioSinkDev::TaskCloseCtrlChannel(const std::string &args) -{ - (void)args; - DHLOGD("Close ctrl channel success."); - return DH_SUCCESS; -} - int32_t DAudioSinkDev::TaskOpenDSpeaker(const std::string &args) { DHLOGI("Open speaker device."); @@ -128,7 +113,11 @@ int32_t DAudioSinkDev::TaskOpenDSpeaker(const std::string &args) if (!JsonParamCheck(jParam, { KEY_DH_ID, KEY_AUDIO_PARAM })) { return ERR_DH_AUDIO_FAILED; } - int32_t dhId = std::stoi(std::string(jParam[KEY_DH_ID])); + int32_t dhId = ConvertString2Int(std::string(jParam[KEY_DH_ID])); + if (dhId == -1) { + DHLOGE("Parse dhId error."); + return ERR_DH_AUDIO_NULLPTR; + } std::shared_ptr speakerClient = nullptr; { std::lock_guard devLck(spkClientMutex_); @@ -149,8 +138,8 @@ int32_t DAudioSinkDev::TaskOpenDSpeaker(const std::string &args) ret = speakerClient->SetUp(audioParam); if (ret != DH_SUCCESS) { DHLOGE("Setup speaker failed, ret: %d.", ret); - NotifySourceDev(NOTIFY_OPEN_SPEAKER_RESULT, spkDhId_, ERR_DH_AUDIO_FAILED); - return ERR_DH_AUDIO_FAILED; + NotifySourceDev(NOTIFY_OPEN_SPEAKER_RESULT, spkDhId_, ret); + return ret; } NotifySourceDev(NOTIFY_OPEN_SPEAKER_RESULT, std::to_string(dhId), ret); @@ -208,7 +197,7 @@ int32_t DAudioSinkDev::ParseDhidFromEvent(std::string args) cJSON_Delete(jParam); return ERR_DH_AUDIO_FAILED; } - int32_t dhId = std::stoi(std::string(dhIdItem->valuestring)); + int32_t dhId = ConvertString2Int(std::string(dhIdItem->valuestring)); cJSON_Delete(jParam); DHLOGI("Parsed dhId is: %d.", dhId); return dhId; @@ -255,7 +244,11 @@ int32_t DAudioSinkDev::TaskOpenDMic(const std::string &args) DHLOGE("Get audio param from json failed, error code %d.", ret); return ret; } - int32_t dhId = std::stoi(std::string(jParam[KEY_DH_ID])); + int32_t dhId = ConvertString2Int(std::string(jParam[KEY_DH_ID])); + if (dhId == -1) { + DHLOGE("Parse dhId error."); + return ERR_DH_AUDIO_NULLPTR; + } std::shared_ptr micClient = nullptr; { std::lock_guard devLck(micClientMutex_); @@ -326,7 +319,7 @@ int32_t DAudioSinkDev::TaskSetParameter(const std::string &args) speakerClient = spkClientMap_[dhId]; } if (speakerClient == nullptr) { - return ERR_DH_AUDIO_SA_SPEAKER_CLIENT_NOT_INIT; + return ERR_DH_AUDIO_NULLPTR; } return speakerClient->SetAudioParameters(event); } @@ -466,6 +459,15 @@ void DAudioSinkDev::JudgeDeviceStatus() DAudioSinkManager::GetInstance().OnSinkDevReleased(devId_); } +int32_t DAudioSinkDev::ConvertString2Int(std::string val) +{ + if (!CheckIsNum(val)) { + DHLOGE("String is not number. str:%s.", val.c_str()); + return -1; + } + return std::stoi(val); +} + void DAudioSinkDev::NotifySourceDev(const AudioEventType type, const std::string dhId, const int32_t result) { std::random_device rd; @@ -481,10 +483,15 @@ void DAudioSinkDev::NotifySourceDev(const AudioEventType type, const std::string DHLOGE("In new engine mode, ctrl is not allowed."); return; } + int32_t dhIdInt = ConvertString2Int(dhId); + if (dhIdInt == -1) { + DHLOGE("Parse dhId error."); + return; + } std::shared_ptr speakerClient = nullptr; { std::lock_guard devLck(spkClientMutex_); - speakerClient = spkClientMap_[std::stoi(dhId)]; + speakerClient = spkClientMap_[dhIdInt]; } if (speakerClient != nullptr) { speakerClient->SendMessage(static_cast(type), jEvent.dump(), devId_); @@ -492,7 +499,7 @@ void DAudioSinkDev::NotifySourceDev(const AudioEventType type, const std::string std::shared_ptr micClient = nullptr; { std::lock_guard devLck(micClientMutex_); - micClient = micClientMap_[std::stoi(dhId)]; + micClient = micClientMap_[dhIdInt]; } if (micClient != nullptr) { micClient->SendMessage(static_cast(type), jEvent.dump(), devId_); @@ -527,8 +534,6 @@ DAudioSinkDev::SinkEventHandler::SinkEventHandler(const std::shared_ptr &dev) : AppExecFwk::EventHandler(runner), sinkDev_(dev) { DHLOGD("Event handler is constructing."); - mapEventFuncs_[static_cast(OPEN_CTRL)] = &DAudioSinkDev::SinkEventHandler::NotifyOpenCtrlChannel; - mapEventFuncs_[static_cast(CLOSE_CTRL)] = &DAudioSinkDev::SinkEventHandler::NotifyCloseCtrlChannel; mapEventFuncs_[static_cast(CTRL_OPENED)] = &DAudioSinkDev::SinkEventHandler::NotifyCtrlOpened; mapEventFuncs_[static_cast(CTRL_CLOSED)] = &DAudioSinkDev::SinkEventHandler::NotifyCtrlClosed; mapEventFuncs_[static_cast(OPEN_SPEAKER)] = &DAudioSinkDev::SinkEventHandler::NotifyOpenSpeaker; @@ -563,44 +568,6 @@ void DAudioSinkDev::SinkEventHandler::ProcessEvent(const AppExecFwk::InnerEvent: (this->*func)(event); } -void DAudioSinkDev::SinkEventHandler::NotifyOpenCtrlChannel(const AppExecFwk::InnerEvent::Pointer &event) -{ - DHLOGI("Notify open ctrl channel."); - std::string eventParam; - if (GetEventParam(event, eventParam) != DH_SUCCESS) { - DHLOGE("Failed to get event parameters."); - return; - } - auto sinkDevObj = sinkDev_.lock(); - if (sinkDevObj == nullptr) { - DHLOGE("Sink dev is invalid."); - return; - } - if (sinkDevObj->TaskOpenCtrlChannel(eventParam) != DH_SUCCESS) { - DHLOGE("Open ctrl channel failed."); - return; - } -} - -void DAudioSinkDev::SinkEventHandler::NotifyCloseCtrlChannel(const AppExecFwk::InnerEvent::Pointer &event) -{ - DHLOGI("Notify close ctrl channel."); - std::string eventParam; - if (GetEventParam(event, eventParam) != DH_SUCCESS) { - DHLOGE("Failed to get event parameters."); - return; - } - auto sinkDevObj = sinkDev_.lock(); - if (sinkDevObj == nullptr) { - DHLOGE("Sink dev is invalid."); - return; - } - if (sinkDevObj->TaskCloseCtrlChannel(eventParam) != DH_SUCCESS) { - DHLOGE("Close ctrl channel falied."); - return; - } -} - void DAudioSinkDev::SinkEventHandler::NotifyCtrlOpened(const AppExecFwk::InnerEvent::Pointer &event) { DHLOGI("Ctrl channel is opened."); @@ -620,10 +587,6 @@ void DAudioSinkDev::SinkEventHandler::NotifyCtrlClosed(const AppExecFwk::InnerEv DHLOGE("Sink dev is invalid."); return; } - if (sinkDevObj->TaskCloseCtrlChannel(eventParam) != DH_SUCCESS) { - DHLOGE("Close ctrl channel failed."); - return; - } if (sinkDevObj->TaskCloseDSpeaker(eventParam) != DH_SUCCESS) { DHLOGE("Close speaker failed."); return; diff --git a/services/audiomanager/managersink/src/daudio_sink_manager.cpp b/services/audiomanager/managersink/src/daudio_sink_manager.cpp index 87b79f774cfe082358138fc4f970a7214cd9a6aa..9fe44d4355599d92c1ab7694c6ae4cf1885c1f29 100644 --- a/services/audiomanager/managersink/src/daudio_sink_manager.cpp +++ b/services/audiomanager/managersink/src/daudio_sink_manager.cpp @@ -218,17 +218,17 @@ int32_t DAudioSinkManager::DAudioNotify(const std::string &devId, const std::str auto samgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); if (samgr == nullptr) { DHLOGE("Failed to get system ability mgr."); - return ERR_DH_AUDIO_SA_GET_SAMGR_FAILED; + return ERR_DH_AUDIO_NULLPTR; } auto remoteObject = samgr->GetSystemAbility(DISTRIBUTED_HARDWARE_AUDIO_SOURCE_SA_ID, devId); if (remoteObject == nullptr) { DHLOGE("remoteObject is null."); - return ERR_DH_AUDIO_SA_GET_REMOTE_SINK_FAILED; + return ERR_DH_AUDIO_NULLPTR; } sptr remoteSvrProxy = iface_cast(remoteObject); if (remoteSvrProxy == nullptr) { DHLOGE("Failed to get remote daudio sink SA."); - return ERR_DH_AUDIO_SA_GET_REMOTE_SINK_FAILED; + return ERR_DH_AUDIO_NULLPTR; } { std::lock_guard lck(remoteSvrMutex_); @@ -267,12 +267,12 @@ int32_t DAudioSinkManager::LoadAVReceiverEngineProvider() if ((LIB_LOAD_PATH.length() + RECEIVER_SO_NAME.length()) > PATH_MAX || realpath((LIB_LOAD_PATH + RECEIVER_SO_NAME).c_str(), path) == nullptr) { DHLOGE("File open failed"); - return ERR_DH_AUDIO_TRANS_NULL_VALUE; + return ERR_DH_AUDIO_NULLPTR; } pRHandler_ = dlopen(path, RTLD_LAZY | RTLD_NODELETE); if (pRHandler_ == nullptr) { DHLOGE("%s handler load failed, failed reason : %s", path, dlerror()); - return ERR_DH_AUDIO_TRANS_NULL_VALUE; + return ERR_DH_AUDIO_NULLPTR; } AVTransProviderClass getEngineFactoryFunc = (AVTransProviderClass)dlsym(pRHandler_, GET_RECEIVER_PROVIDER_FUNC.c_str()); @@ -280,7 +280,7 @@ int32_t DAudioSinkManager::LoadAVReceiverEngineProvider() DHLOGE("av transport engine factory function handler is null, failed reason : %s", dlerror()); dlclose(pRHandler_); pRHandler_ = nullptr; - return ERR_DH_AUDIO_TRANS_NULL_VALUE; + return ERR_DH_AUDIO_NULLPTR; } rcvProviderPtr_ = getEngineFactoryFunc(OWNER_NAME_D_SPEAKER); DHLOGE("LoadAVReceiverEngineProvider success."); @@ -304,12 +304,12 @@ int32_t DAudioSinkManager::LoadAVSenderEngineProvider() if ((LIB_LOAD_PATH.length() + SENDER_SO_NAME.length()) > PATH_MAX || realpath((LIB_LOAD_PATH + SENDER_SO_NAME).c_str(), path) == nullptr) { DHLOGE("File open failed"); - return ERR_DH_AUDIO_TRANS_NULL_VALUE; + return ERR_DH_AUDIO_NULLPTR; } pSHandler_ = dlopen(path, RTLD_LAZY | RTLD_NODELETE); if (pSHandler_ == nullptr) { DHLOGE("%s handler load failed, failed reason : %s", path, dlerror()); - return ERR_DH_AUDIO_TRANS_NULL_VALUE; + return ERR_DH_AUDIO_NULLPTR; } AVTransProviderClass getEngineFactoryFunc = (AVTransProviderClass)dlsym(pSHandler_, GET_SENDER_PROVIDER_FUNC.c_str()); @@ -317,7 +317,7 @@ int32_t DAudioSinkManager::LoadAVSenderEngineProvider() DHLOGE("av transport engine factory function handler is null, failed reason : %s", dlerror()); dlclose(pSHandler_); pSHandler_ = nullptr; - return ERR_DH_AUDIO_TRANS_NULL_VALUE; + return ERR_DH_AUDIO_NULLPTR; } sendProviderPtr_ = getEngineFactoryFunc(OWNER_NAME_D_MIC); return DH_SUCCESS; @@ -345,7 +345,7 @@ void DAudioSinkManager::SetChannelState(const std::string &content) int32_t EngineProviderListener::OnProviderEvent(const AVTransEvent &event) { - DHLOGI("On provider event :%d", event.type); + DHLOGI("On provider event :%d, eventContent: %s.", event.type, event.content.c_str()); if (event.type == EventType::EVENT_CHANNEL_OPENED) { DHLOGI("Received control channel opened event, create audio device for peerDevId=%s, content=%s.", GetAnonyString(event.peerDevId).c_str(), event.content.c_str()); diff --git a/services/audiomanager/managersource/include/daudio_source_dev.h b/services/audiomanager/managersource/include/daudio_source_dev.h index 77dd00ca8f2155321b7e09d29e2a4458ccfdca4d..e84aaf3eb2f81d1d5c185afe8b72eae8f365a21a 100644 --- a/services/audiomanager/managersource/include/daudio_source_dev.h +++ b/services/audiomanager/managersource/include/daudio_source_dev.h @@ -25,7 +25,7 @@ #include "audio_event.h" #include "daudio_io_dev.h" -#include "daudio_source_dev_ctrl_manager.h" +#include "daudio_source_dev_ctrl_mgr.h" #include "daudio_source_mgr_callback.h" #include "dmic_dev.h" #include "dspeaker_dev.h" @@ -62,8 +62,6 @@ private: int32_t TaskEnableDAudio(const std::string &args); int32_t TaskDisableDAudio(const std::string &args); - int32_t TaskOpenCtrlChannel(const std::string &args); - int32_t TaskCloseCtrlChannel(const std::string &args); int32_t TaskOpenDSpeaker(const std::string &args); int32_t OpenDSpeakerInner(std::shared_ptr &speaker, const int32_t dhId); int32_t TaskCloseDSpeaker(const std::string &args); @@ -91,8 +89,6 @@ private: int32_t HandleCloseDMic(const AudioEvent &event); int32_t HandleDMicOpened(const AudioEvent &event); int32_t HandleDMicClosed(const AudioEvent &event); - int32_t HandleOpenCtrlTrans(const AudioEvent &event); - int32_t HandleCloseCtrlTrans(const AudioEvent &event); int32_t HandleCtrlTransClosed(const AudioEvent &event); int32_t HandleNotifyRPC(const AudioEvent &event); int32_t WaitForRPC(const AudioEventType type); @@ -108,17 +104,14 @@ private: int32_t NotifySinkDev(const AudioEventType type, const json Param, const std::string dhId); int32_t NotifyHDF(const AudioEventType type, const std::string result, const int32_t dhId); - int32_t OpenCtrlTrans(const AudioEvent &event); - int32_t CloseCtrlTrans(const AudioEvent &event, bool isSpk); AudioEventType getEventTypeFromArgs(const std::string &args); void to_json(json &j, const AudioParam ¶m); int32_t SendAudioEventToRemote(const AudioEvent &event); - int32_t CloseSpkOld(const std::string &args); int32_t CloseSpkNew(const std::string &args); - int32_t CloseMicOld(const std::string &args); int32_t CloseMicNew(const std::string &args); std::shared_ptr FindIoDevImpl(std::string args); int32_t ParseDhidFromEvent(std::string args); + int32_t ConvertString2Int(std::string val); private: static constexpr uint8_t RPC_WAIT_SECONDS = 10; @@ -141,7 +134,7 @@ private: std::mutex rpcWaitMutex_; std::condition_variable rpcWaitCond_; std::atomic isRpcOpen_ = false; - bool rpcResult_ = false; + int32_t rpcResult_ = ERR_DH_AUDIO_FAILED; uint8_t rpcNotify_ = 0; std::atomic threadStatusFlag_ = false; @@ -159,8 +152,6 @@ private: void CloseDSpeakerCallback(const AppExecFwk::InnerEvent::Pointer &event); void OpenDMicCallback(const AppExecFwk::InnerEvent::Pointer &event); void CloseDMicCallback(const AppExecFwk::InnerEvent::Pointer &event); - void OpenCtrlCallback(const AppExecFwk::InnerEvent::Pointer &event); - void CloseCtrlCallback(const AppExecFwk::InnerEvent::Pointer &event); void SetVolumeCallback(const AppExecFwk::InnerEvent::Pointer &event); void ChangeVolumeCallback(const AppExecFwk::InnerEvent::Pointer &event); void ChangeFocusCallback(const AppExecFwk::InnerEvent::Pointer &event); diff --git a/services/audiomanager/managersource/src/daudio_source_dev.cpp b/services/audiomanager/managersource/src/daudio_source_dev.cpp index c06655ff71d439c8111597a82f9cfcb6ba32c9e3..66f0340eb1a434a5def7046d1a1818e8c77ea3f6 100644 --- a/services/audiomanager/managersource/src/daudio_source_dev.cpp +++ b/services/audiomanager/managersource/src/daudio_source_dev.cpp @@ -25,7 +25,6 @@ #include "daudio_log.h" #include "daudio_source_manager.h" #include "daudio_util.h" -#include "task_impl.h" #undef DH_LOG_TAG #define DH_LOG_TAG "DAudioSourceDev" @@ -33,8 +32,6 @@ namespace OHOS { namespace DistributedHardware { namespace { -constexpr uint32_t EVENT_OPEN_CTRL = 1; -constexpr uint32_t EVENT_CLOSE_CTRL = 2; constexpr uint32_t EVENT_OPEN_SPEAKER = 11; constexpr uint32_t EVENT_CLOSE_SPEAKER = 12; constexpr uint32_t EVENT_OPEN_MIC = 21; @@ -140,13 +137,13 @@ int32_t DAudioSourceDev::DisableDAudio(const std::string &dhId) return ERR_DH_AUDIO_NULLPTR; } - if (!CheckIsNum(dhId)) { - DHLOGE("Disable audio device dhId param error."); - return ERR_DH_AUDIO_SA_DISABLE_PARAM_INVALID; - } json jParamClose = { { KEY_DH_ID, dhId } }; AudioEvent event(AudioEventType::EVENT_UNKNOWN, jParamClose.dump()); - int32_t dhIdNum = std::stoi(dhId); + int32_t dhIdNum = ConvertString2Int(dhId); + if (dhIdNum == -1) { + DHLOGE("Parse dhId error."); + return ERR_DH_AUDIO_NOT_SUPPORT; + } switch (GetDevTypeByDHId(dhIdNum)) { case AUDIO_DEVICE_TYPE_SPEAKER: event.type = CLOSE_SPEAKER; @@ -157,7 +154,7 @@ int32_t DAudioSourceDev::DisableDAudio(const std::string &dhId) HandleCloseDMic(event); break; default: - DHLOGE("Unknown audio device."); + DHLOGE("Unknown audio device. dhId: %d.", dhIdNum); return ERR_DH_AUDIO_NOT_SUPPORT; } @@ -217,10 +214,7 @@ int32_t DAudioSourceDev::HandleOpenDSpeaker(const AudioEvent &event) DHLOGE("Event handler is null."); return ERR_DH_AUDIO_NULLPTR; } - int32_t ret = OpenCtrlTrans(event); - if (ret != DH_SUCCESS) { - return ret; - } + auto eventParam = std::make_shared(event); auto msgEvent = AppExecFwk::InnerEvent::Get(EVENT_OPEN_SPEAKER, eventParam, 0); if (!handler_->SendEvent(msgEvent, 0, AppExecFwk::EventQueue::Priority::IMMEDIATE)) { @@ -246,7 +240,7 @@ int32_t DAudioSourceDev::HandleCloseDSpeaker(const AudioEvent &event) return ERR_DH_AUDIO_FAILED; } DHLOGD("Closing DSpeaker event is sent successfully."); - return CloseCtrlTrans(event, true); + return DH_SUCCESS; } int32_t DAudioSourceDev::HandleDSpeakerOpened(const AudioEvent &event) @@ -294,10 +288,6 @@ int32_t DAudioSourceDev::HandleOpenDMic(const AudioEvent &event) DHLOGE("Event handler is null."); return ERR_DH_AUDIO_NULLPTR; } - int32_t ret = OpenCtrlTrans(event); - if (ret != DH_SUCCESS) { - return ret; - } auto eventParam = std::make_shared(event); auto msgEvent = AppExecFwk::InnerEvent::Get(EVENT_OPEN_MIC, eventParam, 0); @@ -324,7 +314,7 @@ int32_t DAudioSourceDev::HandleCloseDMic(const AudioEvent &event) return ERR_DH_AUDIO_FAILED; } DHLOGD("Closing DSpeaker event is sent successfully."); - return CloseCtrlTrans(event, false); + return DH_SUCCESS; } int32_t DAudioSourceDev::HandleDMicOpened(const AudioEvent &event) @@ -350,52 +340,6 @@ int32_t DAudioSourceDev::HandleDMicClosed(const AudioEvent &event) return mic->NotifyHdfAudioEvent(event, dhId); } -int32_t DAudioSourceDev::OpenCtrlTrans(const AudioEvent &event) -{ - return DH_SUCCESS; -} - -int32_t DAudioSourceDev::CloseCtrlTrans(const AudioEvent &event, bool isSpk) -{ - return DH_SUCCESS; -} - -int32_t DAudioSourceDev::HandleOpenCtrlTrans(const AudioEvent &event) -{ - DHLOGI("Open control trans."); - if (handler_ == nullptr) { - DHLOGE("Event handler is null."); - return ERR_DH_AUDIO_NULLPTR; - } - - auto eventParam = std::make_shared(event); - auto msgEvent = AppExecFwk::InnerEvent::Get(EVENT_OPEN_CTRL, eventParam, 0); - if (!handler_->SendEvent(msgEvent, 0, AppExecFwk::EventQueue::Priority::IMMEDIATE)) { - DHLOGE("Send event failed."); - return ERR_DH_AUDIO_FAILED; - } - DHLOGD("Opening ctrl trans channel event is sent successfully."); - return DH_SUCCESS; -} - -int32_t DAudioSourceDev::HandleCloseCtrlTrans(const AudioEvent &event) -{ - DHLOGI("Close control trans."); - if (handler_ == nullptr) { - DHLOGE("Event handler is null."); - return ERR_DH_AUDIO_NULLPTR; - } - - auto eventParam = std::make_shared(event); - auto msgEvent = AppExecFwk::InnerEvent::Get(EVENT_CLOSE_CTRL, eventParam, 0); - if (!handler_->SendEvent(msgEvent, 0, AppExecFwk::EventQueue::Priority::IMMEDIATE)) { - DHLOGE("Send event failed."); - return ERR_DH_AUDIO_FAILED; - } - DHLOGD("Close ctrl trans channel event is sent successfully."); - return DH_SUCCESS; -} - int32_t DAudioSourceDev::HandleCtrlTransClosed(const AudioEvent &event) { DHLOGI("Control trans closed."); @@ -413,7 +357,7 @@ int32_t DAudioSourceDev::HandleNotifyRPC(const AudioEvent &event) return ERR_DH_AUDIO_FAILED; } - rpcResult_ = (jParam[KEY_RESULT] == DH_SUCCESS) ? true : false; + rpcResult_ = jParam[KEY_RESULT]; DHLOGD("Notify RPC event: %d, result: %d.", event.type, rpcResult_); std::map::iterator iter = eventNotifyMap_.find(event.type); if (iter == eventNotifyMap_.end()) { @@ -611,14 +555,14 @@ int32_t DAudioSourceDev::WaitForRPC(const AudioEventType type) }); if (!status) { DHLOGE("RPC notify wait timeout(%ds).", RPC_WAIT_SECONDS); - return ERR_DH_AUDIO_SA_RPC_WAIT_TIMEOUT; + return ERR_DH_AUDIO_SA_WAIT_TIMEOUT; } - if (!rpcResult_) { + if (rpcResult_ != DH_SUCCESS) { DHLOGE("RPC notify Result Failed."); - return ERR_DH_AUDIO_FAILED; + return rpcResult_; } rpcNotify_ = 0; - rpcResult_ = false; + rpcResult_ = ERR_DH_AUDIO_FAILED; DHLOGD("Receive sink device notify type: %d.", type); return DH_SUCCESS; } @@ -632,17 +576,20 @@ int32_t DAudioSourceDev::TaskEnableDAudio(const std::string &args) json jParam = json::parse(args, nullptr, false); if (!JsonParamCheck(jParam, { KEY_DH_ID, KEY_ATTRS }) || !CheckIsNum((std::string)jParam[KEY_DH_ID])) { DHLOGE("The keys or values is invalid."); - return ERR_DH_AUDIO_SA_ENABLE_PARAM_INVALID; + return ERR_DH_AUDIO_SA_PARAM_INVALID; + } + int32_t dhId = ConvertString2Int(std::string(jParam[KEY_DH_ID])); + if (dhId == -1) { + DHLOGE("Parse dhId error."); + return ERR_DH_AUDIO_NOT_SUPPORT; } - int32_t dhId = std::stoi((std::string)jParam[KEY_DH_ID]); - switch (GetDevTypeByDHId(dhId)) { case AUDIO_DEVICE_TYPE_SPEAKER: return EnableDSpeaker(dhId, jParam[KEY_ATTRS]); case AUDIO_DEVICE_TYPE_MIC: return EnableDMic(dhId, jParam[KEY_ATTRS]); default: - DHLOGE("Unknown audio device."); + DHLOGE("Unknown audio device. dhId: %d.", dhId); return ERR_DH_AUDIO_NOT_SUPPORT; } } @@ -709,16 +656,20 @@ int32_t DAudioSourceDev::TaskDisableDAudio(const std::string &args) } json jParam = json::parse(args, nullptr, false); if (!JsonParamCheck(jParam, { KEY_DH_ID }) || !CheckIsNum((std::string)jParam[KEY_DH_ID])) { - return ERR_DH_AUDIO_SA_DISABLE_PARAM_INVALID; + return ERR_DH_AUDIO_SA_PARAM_INVALID; + } + int32_t dhId = ConvertString2Int(std::string(jParam[KEY_DH_ID])); + if (dhId == -1) { + DHLOGE("Parse dhId error."); + return ERR_DH_AUDIO_NOT_SUPPORT; } - int32_t dhId = std::stoi((std::string)jParam[KEY_DH_ID]); switch (GetDevTypeByDHId(dhId)) { case AUDIO_DEVICE_TYPE_SPEAKER: return DisableDSpeaker(dhId); case AUDIO_DEVICE_TYPE_MIC: return DisableDMic(dhId); default: - DHLOGE("Unknown audio device."); + DHLOGE("Unknown audio device. hdId: %d.", dhId); return ERR_DH_AUDIO_NOT_SUPPORT; } } @@ -778,36 +729,37 @@ void DAudioSourceDev::OnDisableTaskResult(int32_t resultCode, const std::string int32_t DAudioSourceDev::TaskOpenDSpeaker(const std::string &args) { DHLOGI("Task open speaker args: %s.", args.c_str()); - auto speaker = FindIoDevImpl(args); - if (speaker == nullptr) { - DHLOGE("The IO device is invaild."); - return ERR_DH_AUDIO_NULLPTR; - } if (args.length() > DAUDIO_MAX_JSON_LEN || args.empty()) { + DHLOGE("args length error. 0 or max."); return ERR_DH_AUDIO_SA_PARAM_INVALID; } - json jParam = json::parse(args, nullptr, false); - if (!JsonParamCheck(jParam, { KEY_DH_ID })) { + int32_t dhId = ParseDhidFromEvent(args); + if (dhId < 0) { + DHLOGE("Failed to parse dhardware id."); return ERR_DH_AUDIO_FAILED; } + auto speaker = FindIoDevImpl(args); + if (speaker == nullptr) { + DHLOGE("The IO device is invaild."); + NotifyHDF(NOTIFY_OPEN_SPEAKER_RESULT, HDF_EVENT_RESULT_FAILED, dhId); + return ERR_DH_AUDIO_NULLPTR; + } int32_t ret = speaker->InitSenderEngine(DAudioSourceManager::GetInstance().getSenderProvider()); if (ret != DH_SUCCESS) { DHLOGE("Speaker init sender Engine, error code %d.", ret); + NotifyHDF(NOTIFY_OPEN_SPEAKER_RESULT, HDF_EVENT_INIT_ENGINE_FAILED, dhId); return ret; } json jAudioParam; to_json(jAudioParam, speaker->GetAudioParam()); - ret = NotifySinkDev(OPEN_SPEAKER, jAudioParam, jParam[KEY_DH_ID]); + std::string dhIdString = std::to_string(dhId); + ret = NotifySinkDev(OPEN_SPEAKER, jAudioParam, dhIdString); if (ret != DH_SUCCESS) { DHLOGE("Notify sink open speaker failed, error code %d.", ret); + NotifyHDF(NOTIFY_OPEN_SPEAKER_RESULT, HDF_EVENT_NOTIFY_SINK_FAILED, dhId); return ret; } - int32_t dhId = ParseDhidFromEvent(args); - if (dhId < 0) { - DHLOGE("Failed to parse dhardware id."); - return ERR_DH_AUDIO_FAILED; - } ret = OpenDSpeakerInner(speaker, dhId); if (ret != DH_SUCCESS) { DHLOGE("Task Open DSpeaker Execute failed, error code %d.", ret); @@ -835,17 +787,27 @@ int32_t DAudioSourceDev::ParseDhidFromEvent(std::string args) cJSON_Delete(jParam); return ERR_DH_AUDIO_FAILED; } - int32_t dhId = std::stoi(std::string(dhIdItem->valuestring)); + int32_t dhId = ConvertString2Int(std::string(dhIdItem->valuestring)); cJSON_Delete(jParam); DHLOGI("Parsed dhId is: %d.", dhId); return dhId; } +int32_t DAudioSourceDev::ConvertString2Int(std::string val) +{ + if (!CheckIsNum(val)) { + DHLOGE("String is not number. str:%s.", val.c_str()); + return -1; + } + return std::stoi(val); +} + int32_t DAudioSourceDev::OpenDSpeakerInner(std::shared_ptr &speaker, const int32_t dhId) { int32_t ret = speaker->SetUp(); if (ret != DH_SUCCESS) { DHLOGE("Speaker setup failed, error code %d.", ret); + NotifyHDF(NOTIFY_OPEN_SPEAKER_RESULT, HDF_EVENT_TRANS_SETUP_FAILED, dhId); return ret; } ret = speaker->Start(); @@ -853,45 +815,13 @@ int32_t DAudioSourceDev::OpenDSpeakerInner(std::shared_ptr &speaker DHLOGE("Speaker start failed, error code %d.", ret); speaker->Stop(); speaker->Release(); + NotifyHDF(NOTIFY_OPEN_SPEAKER_RESULT, HDF_EVENT_TRANS_START_FAILED, dhId); return ret; } NotifyHDF(NOTIFY_OPEN_SPEAKER_RESULT, HDF_EVENT_RESULT_SUCCESS, dhId); return DH_SUCCESS; } -int32_t DAudioSourceDev::CloseSpkOld(const std::string &args) -{ - DHLOGI("Close speaker old"); - bool closeStatus = true; - auto speaker = FindIoDevImpl(args); - if (speaker == nullptr) { - DHLOGE("The IO device is invaild."); - return ERR_DH_AUDIO_NULLPTR; - } - int32_t ret = speaker->Stop(); - if (ret != DH_SUCCESS) { - DHLOGE("Speaker stop failed."); - closeStatus = false; - } - ret = speaker->Release(); - if (ret != DH_SUCCESS) { - DHLOGE("Speaker release failed."); - closeStatus = false; - } - if (!speaker->IsOpened()) { - json jAudioParam; - json jParam = json::parse(args, nullptr, false); - if (!JsonParamCheck(jParam, { KEY_DH_ID })) { - return ERR_DH_AUDIO_FAILED; - } - NotifySinkDev(CLOSE_SPEAKER, jAudioParam, jParam[KEY_DH_ID]); - } - if (!closeStatus) { - return ERR_DH_AUDIO_FAILED; - } - return DH_SUCCESS; -} - int32_t DAudioSourceDev::CloseSpkNew(const std::string &args) { DHLOGI("Close speaker new"); @@ -934,17 +864,19 @@ int32_t DAudioSourceDev::TaskCloseDSpeaker(const std::string &args) } auto speaker = FindIoDevImpl(args); if (speaker == nullptr) { - DHLOGD("Speaker already closed."); + DHLOGE("Speaker already closed."); NotifyHDF(NOTIFY_CLOSE_SPEAKER_RESULT, HDF_EVENT_RESULT_SUCCESS, dhId); return DH_SUCCESS; } if (args.length() > DAUDIO_MAX_JSON_LEN || args.empty()) { - DHLOGD("args length error."); + DHLOGE("args length error."); + NotifyHDF(NOTIFY_CLOSE_SPEAKER_RESULT, HDF_EVENT_RESULT_FAILED, dhId); return ERR_DH_AUDIO_SA_PARAM_INVALID; } int32_t ret = CloseSpkNew(args); if (ret != DH_SUCCESS) { - DHLOGE("Close spk in old mode failed."); + DHLOGE("Close spk failed."); + NotifyHDF(NOTIFY_CLOSE_SPEAKER_RESULT, HDF_EVENT_RESULT_FAILED, dhId); return ret; } NotifyHDF(NOTIFY_CLOSE_SPEAKER_RESULT, HDF_EVENT_RESULT_SUCCESS, dhId); @@ -954,35 +886,41 @@ int32_t DAudioSourceDev::TaskCloseDSpeaker(const std::string &args) int32_t DAudioSourceDev::TaskOpenDMic(const std::string &args) { DHLOGI("Task open mic, args: %s.", args.c_str()); + if (args.length() > DAUDIO_MAX_JSON_LEN || args.empty()) { + return ERR_DH_AUDIO_SA_PARAM_INVALID; + } + int32_t dhId = ParseDhidFromEvent(args); + if (dhId < 0) { + DHLOGE("Failed to parse dhardware id."); + return ERR_DH_AUDIO_FAILED; + } auto mic = FindIoDevImpl(args); if (mic == nullptr) { DHLOGE("Mic device not init"); - return ERR_DH_AUDIO_SA_MIC_DEVICE_NOT_INIT; + NotifyHDF(NOTIFY_OPEN_MIC_RESULT, HDF_EVENT_RESULT_FAILED, dhId); + return ERR_DH_AUDIO_NULLPTR; } int32_t ret = mic->InitReceiverEngine(DAudioSourceManager::GetInstance().getReceiverProvider()); if (ret != DH_SUCCESS) { DHLOGE("Init receiver engine failed."); + NotifyHDF(NOTIFY_OPEN_MIC_RESULT, HDF_EVENT_INIT_ENGINE_FAILED, dhId); return ret; } - if (args.length() > DAUDIO_MAX_JSON_LEN || args.empty()) { - return ERR_DH_AUDIO_SA_PARAM_INVALID; - } ret = mic->SetUp(); if (ret != DH_SUCCESS) { DHLOGE("Mic setup failed."); + NotifyHDF(NOTIFY_OPEN_MIC_RESULT, HDF_EVENT_TRANS_SETUP_FAILED, dhId); return ret; } json jAudioParam; - json jParam = json::parse(args, nullptr, false); - if (!JsonParamCheck(jParam, { KEY_DH_ID })) { - return ERR_DH_AUDIO_FAILED; - } to_json(jAudioParam, mic->GetAudioParam()); - ret = NotifySinkDev(OPEN_MIC, jAudioParam, jParam[KEY_DH_ID]); + std::string dhIdString = std::to_string(dhId); + ret = NotifySinkDev(OPEN_MIC, jAudioParam, dhIdString); if (ret != DH_SUCCESS) { DHLOGE("Notify sink open mic failed, error code %d.", ret); mic->Release(); + NotifyHDF(NOTIFY_OPEN_MIC_RESULT, HDF_EVENT_NOTIFY_SINK_FAILED, dhId); return ret; } @@ -991,43 +929,10 @@ int32_t DAudioSourceDev::TaskOpenDMic(const std::string &args) DHLOGE("Mic start failed, error code %d.", ret); mic->Stop(); mic->Release(); + NotifyHDF(NOTIFY_OPEN_MIC_RESULT, HDF_EVENT_TRANS_START_FAILED, dhId); return ret; } - NotifyHDF(NOTIFY_OPEN_MIC_RESULT, HDF_EVENT_RESULT_SUCCESS, std::stoi(std::string(jParam[KEY_DH_ID]))); - return DH_SUCCESS; -} - -int32_t DAudioSourceDev::CloseMicOld(const std::string &args) -{ - DHLOGI("Close mic old."); - auto mic = FindIoDevImpl(args); - if (mic == nullptr) { - DHLOGE("Mic device not init"); - return DH_SUCCESS; - } - bool closeStatus = true; - int32_t ret = mic->Stop(); - if (ret != DH_SUCCESS) { - DHLOGE("Mic stop failed, error code %d", ret); - closeStatus = false; - } - ret = mic->Release(); - if (ret != DH_SUCCESS) { - DHLOGE("Mic release failed, error code %d", ret); - closeStatus = false; - } - if (!mic->IsOpened()) { - json jAudioParam; - json jParam = json::parse(args, nullptr, false); - if (!JsonParamCheck(jParam, { KEY_DH_ID })) { - DHLOGE("Task close mic, json param check failed."); - return ERR_DH_AUDIO_FAILED; - } - NotifySinkDev(CLOSE_MIC, jAudioParam, jParam[KEY_DH_ID]); - } - if (!closeStatus) { - return ERR_DH_AUDIO_FAILED; - } + NotifyHDF(NOTIFY_OPEN_MIC_RESULT, HDF_EVENT_RESULT_SUCCESS, dhId); return DH_SUCCESS; } @@ -1067,6 +972,10 @@ int32_t DAudioSourceDev::CloseMicNew(const std::string &args) int32_t DAudioSourceDev::TaskCloseDMic(const std::string &args) { DHLOGI("Task close mic, args: %s.", args.c_str()); + if (args.length() > DAUDIO_MAX_JSON_LEN || args.empty()) { + DHLOGE("Args length err. 0 or max."); + return ERR_DH_AUDIO_SA_PARAM_INVALID; + } int32_t dhId = ParseDhidFromEvent(args); if (dhId < 0) { DHLOGE("Failed to parse dhardware id."); @@ -1078,32 +987,16 @@ int32_t DAudioSourceDev::TaskCloseDMic(const std::string &args) NotifyHDF(NOTIFY_CLOSE_MIC_RESULT, HDF_EVENT_RESULT_SUCCESS, dhId); return DH_SUCCESS; } - if (args.length() > DAUDIO_MAX_JSON_LEN || args.empty()) { - return ERR_DH_AUDIO_SA_PARAM_INVALID; - } int32_t ret = CloseMicNew(args); if (ret != DH_SUCCESS) { DHLOGE("Task close mic error."); + NotifyHDF(NOTIFY_CLOSE_MIC_RESULT, HDF_EVENT_RESULT_FAILED, dhId); return ret; } NotifyHDF(NOTIFY_CLOSE_MIC_RESULT, HDF_EVENT_RESULT_SUCCESS, dhId); return DH_SUCCESS; } -int32_t DAudioSourceDev::TaskOpenCtrlChannel(const std::string &args) -{ - DHLOGI("Task open ctrl channel, args: %s.", args.c_str()); - DHLOGI("Task open ctrl channel success."); - return DH_SUCCESS; -} - -int32_t DAudioSourceDev::TaskCloseCtrlChannel(const std::string &args) -{ - DHLOGI("Task close ctrl channel, args: %s.", args.c_str()); - DHLOGI("Close audio ctrl channel success."); - return DH_SUCCESS; -} - int32_t DAudioSourceDev::TaskSetVolume(const std::string &args) { DHLOGD("Task set volume, args: %s.", args.c_str()); @@ -1131,7 +1024,7 @@ int32_t DAudioSourceDev::TaskChangeVolume(const std::string &args) cJSON_Delete(jParam); return ERR_DH_AUDIO_FAILED; } - int32_t dhId = std::stoi(std::string(dhIdItem->valuestring)); + int32_t dhId = ConvertString2Int(std::string(dhIdItem->valuestring)); cJSON_Delete(jParam); return NotifyHDF(AudioEventType::VOLUME_CHANGE, args, dhId); } @@ -1167,7 +1060,7 @@ int32_t DAudioSourceDev::TaskChangeRenderState(const std::string &args) cJSON_Delete(jParam); return ERR_DH_AUDIO_FAILED; } - int32_t dhId = std::stoi(std::string(dhIdItem->valuestring)); + int32_t dhId = ConvertString2Int(std::string(dhIdItem->valuestring)); cJSON_Delete(jParam); return NotifyHDF(AudioEventType::AUDIO_RENDER_STATE_CHANGE, args, dhId); } @@ -1312,11 +1205,12 @@ int32_t DAudioSourceDev::NotifySinkDev(const AudioEventType type, const json Par DHLOGD("Notify sink dev, new engine, random task code:%s", std::to_string(randomTaskCode).c_str()); std::lock_guard devLck(ioDevMtx_); - if (deviceMap_.find(std::stoi(dhId)) == deviceMap_.end()) { - DHLOGE("speaker or mic dev is null."); + int32_t dhIdInt = ConvertString2Int(dhId); + if (deviceMap_.find(dhIdInt) == deviceMap_.end()) { + DHLOGE("speaker or mic dev is null. find index: %d.", dhIdInt); return ERR_DH_AUDIO_NULLPTR; } - auto ioDev = deviceMap_[std::stoi(dhId)]; + auto ioDev = deviceMap_[dhIdInt]; if (type == OPEN_CTRL || type == CLOSE_CTRL) { DHLOGE("In new engine mode, ctrl is not allowed."); return ERR_DH_AUDIO_NULLPTR; @@ -1334,7 +1228,7 @@ int32_t DAudioSourceDev::NotifyHDF(const AudioEventType type, const std::string DHLOGI("Notify HDF framework the result, event type: %d; result: %s.", type, result.c_str()); std::lock_guard devLck(ioDevMtx_); if (deviceMap_.find(dhId) == deviceMap_.end()) { - DHLOGE("Speaker or mic dev is null."); + DHLOGE("Speaker or mic dev is null. dhId: %d", dhId); return ERR_DH_AUDIO_NULLPTR; } auto ioDev = deviceMap_[dhId]; @@ -1386,8 +1280,6 @@ DAudioSourceDev::SourceEventHandler::SourceEventHandler(const std::shared_ptrTaskOpenCtrlChannel(eventParam) != DH_SUCCESS) { - DHLOGE("Open ctrl channel failed."); - return; - } - DHLOGI("Open ctrl channel successfully."); -} - -void DAudioSourceDev::SourceEventHandler::CloseCtrlCallback(const AppExecFwk::InnerEvent::Pointer &event) -{ - std::string eventParam; - if (GetEventParam(event, eventParam) != DH_SUCCESS) { - DHLOGE("Failed to get event parameters."); - return; - } - auto sourceDevObj = sourceDev_.lock(); - if (sourceDevObj == nullptr) { - DHLOGE("Source dev is invalid."); - return; - } - if (sourceDevObj->TaskCloseCtrlChannel(eventParam) != DH_SUCCESS) { - DHLOGE("Close ctrl channel failed."); - return; - } - DHLOGI("Close ctrl channel successfully."); -} - void DAudioSourceDev::SourceEventHandler::SetVolumeCallback(const AppExecFwk::InnerEvent::Pointer &event) { std::string eventParam; diff --git a/services/audiomanager/managersource/src/daudio_source_manager.cpp b/services/audiomanager/managersource/src/daudio_source_manager.cpp index a8e464b2316a4b1dbb50af36cacade67186a88ef..783130d38ae2b14b6af625707cd50a9f6e4f3070 100644 --- a/services/audiomanager/managersource/src/daudio_source_manager.cpp +++ b/services/audiomanager/managersource/src/daudio_source_manager.cpp @@ -233,17 +233,17 @@ int32_t DAudioSourceManager::DAudioNotify(const std::string &devId, const std::s auto samgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); if (samgr == nullptr) { DHLOGE("Failed to get system ability mgr."); - return ERR_DH_AUDIO_SA_GET_SAMGR_FAILED; + return ERR_DH_AUDIO_NULLPTR; } auto remoteObject = samgr->GetSystemAbility(DISTRIBUTED_HARDWARE_AUDIO_SINK_SA_ID, devId); if (remoteObject == nullptr) { DHLOGE("Object is null."); - return ERR_DH_AUDIO_SA_GET_REMOTE_SINK_FAILED; + return ERR_DH_AUDIO_NULLPTR; } sptr remoteSvrProxy = iface_cast(remoteObject); if (remoteSvrProxy == nullptr) { DHLOGE("Failed to get remote daudio sink SA."); - return ERR_DH_AUDIO_SA_GET_REMOTE_SINK_FAILED; + return ERR_DH_AUDIO_NULLPTR; } { std::lock_guard lck(remoteSvrMutex_); @@ -380,12 +380,12 @@ int32_t DAudioSourceManager::LoadAVSenderEngineProvider() if ((LIB_LOAD_PATH.length() + SENDER_SO_NAME.length()) > PATH_MAX || realpath((LIB_LOAD_PATH + SENDER_SO_NAME).c_str(), path) == nullptr) { DHLOGE("File open failed"); - return ERR_DH_AUDIO_TRANS_NULL_VALUE; + return ERR_DH_AUDIO_NULLPTR; } pSHandler_ = dlopen(path, RTLD_LAZY | RTLD_NODELETE); if (pSHandler_ == nullptr) { DHLOGE("%s handler load failed, failed reason : %s", path, dlerror()); - return ERR_DH_AUDIO_TRANS_NULL_VALUE; + return ERR_DH_AUDIO_NULLPTR; } AVTransProviderClass getEngineFactoryFunc = (AVTransProviderClass)dlsym(pSHandler_, GET_SENDER_PROVIDER_FUNC.c_str()); @@ -393,7 +393,7 @@ int32_t DAudioSourceManager::LoadAVSenderEngineProvider() DHLOGE("av transport engine factory function handler is null, failed reason : %s", dlerror()); dlclose(pSHandler_); pSHandler_ = nullptr; - return ERR_DH_AUDIO_TRANS_NULL_VALUE; + return ERR_DH_AUDIO_NULLPTR; } sendProviderPtr_ = getEngineFactoryFunc(OWNER_NAME_D_SPEAKER); DHLOGI("LoadAVSenderEngineProvider exit"); @@ -418,12 +418,12 @@ int32_t DAudioSourceManager::LoadAVReceiverEngineProvider() if ((LIB_LOAD_PATH.length() + RECEIVER_SO_NAME.length()) > PATH_MAX || realpath((LIB_LOAD_PATH + RECEIVER_SO_NAME).c_str(), path) == nullptr) { DHLOGE("File canonicalization failed"); - return ERR_DH_AUDIO_TRANS_NULL_VALUE; + return ERR_DH_AUDIO_NULLPTR; } pRHandler_ = dlopen(path, RTLD_LAZY | RTLD_NODELETE); if (pRHandler_ == nullptr) { DHLOGE("%s handler load failed, failed reason : %s", path, dlerror()); - return ERR_DH_AUDIO_TRANS_NULL_VALUE; + return ERR_DH_AUDIO_NULLPTR; } AVTransProviderClass getEngineFactoryFunc = (AVTransProviderClass)dlsym(pRHandler_, GET_RECEIVER_PROVIDER_FUNC.c_str()); @@ -431,7 +431,7 @@ int32_t DAudioSourceManager::LoadAVReceiverEngineProvider() DHLOGE("av transport engine factory function handler is null, failed reason : %s", dlerror()); dlclose(pRHandler_); pRHandler_ = nullptr; - return ERR_DH_AUDIO_TRANS_NULL_VALUE; + return ERR_DH_AUDIO_NULLPTR; } rcvProviderPtr_ = getEngineFactoryFunc(OWNER_NAME_D_MIC); DHLOGE("LoadAVReceiverEngineProvider success"); diff --git a/services/audiomanager/managersource/src/dmic_dev.cpp b/services/audiomanager/managersource/src/dmic_dev.cpp index 4cf7b15cc5296705db51eb97fb516f9927de5027..a673586a069d09a02a08dbf9a3c7f6181cb20104 100644 --- a/services/audiomanager/managersource/src/dmic_dev.cpp +++ b/services/audiomanager/managersource/src/dmic_dev.cpp @@ -73,12 +73,12 @@ int32_t DMicDev::InitReceiverEngine(IAVEngineProvider *providerPtr) int32_t ret = micTrans_->InitEngine(providerPtr); if (ret != DH_SUCCESS) { DHLOGE("Mic dev initialize av receiver adapter failed."); - return ERR_DH_AUDIO_TRANS_NULL_VALUE; + return ret; } ret = micTrans_->CreateCtrl(); if (ret != DH_SUCCESS) { DHLOGE("Create ctrl channel failed. micdev"); - return ERR_DH_AUDIO_TRANS_NULL_VALUE; + return ret; } return DH_SUCCESS; } @@ -123,7 +123,7 @@ int32_t DMicDev::OpenDevice(const std::string &devId, const int32_t dhId) std::shared_ptr cbObj = audioEventCallback_.lock(); if (cbObj == nullptr) { DHLOGE("Event callback is null"); - return ERR_DH_AUDIO_SA_MICCALLBACK_NULL; + return ERR_DH_AUDIO_NULLPTR; } json jParam = { { KEY_DH_ID, std::to_string(dhId) } }; AudioEvent event(AudioEventType::OPEN_MIC, jParam.dump()); @@ -139,7 +139,7 @@ int32_t DMicDev::CloseDevice(const std::string &devId, const int32_t dhId) std::shared_ptr cbObj = audioEventCallback_.lock(); if (cbObj == nullptr) { DHLOGE("Event callback is null"); - return ERR_DH_AUDIO_SA_MICCALLBACK_NULL; + return ERR_DH_AUDIO_NULLPTR; } json jParam = { { KEY_DH_ID, std::to_string(dhId) } }; AudioEvent event(AudioEventType::CLOSE_MIC, jParam.dump()); @@ -175,7 +175,7 @@ int32_t DMicDev::NotifyEvent(const std::string &devId, const int32_t dhId, const std::shared_ptr cbObj = audioEventCallback_.lock(); if (cbObj == nullptr) { DHLOGE("Event callback is null"); - return ERR_DH_AUDIO_SA_EVENT_CALLBACK_NULL; + return ERR_DH_AUDIO_NULLPTR; } switch (event.type) { case AudioEventType::AUDIO_START: @@ -215,7 +215,7 @@ int32_t DMicDev::Start() DHLOGI("Start mic device."); if (micTrans_ == nullptr) { DHLOGE("Mic trans is null."); - return ERR_DH_AUDIO_SA_MIC_TRANS_NULL; + return ERR_DH_AUDIO_NULLPTR; } int32_t ret = micTrans_->Start(); if (ret != DH_SUCCESS) { @@ -227,7 +227,7 @@ int32_t DMicDev::Start() [this]() { return isTransReady_.load(); }); if (!status) { DHLOGE("Wait channel open timeout(%ds).", CHANNEL_WAIT_SECONDS); - return ERR_DH_AUDIO_SA_MIC_CHANNEL_WAIT_TIMEOUT; + return ERR_DH_AUDIO_SA_WAIT_TIMEOUT; } isOpened_.store(true); return DH_SUCCESS; @@ -493,7 +493,7 @@ int32_t DMicDev::OnStateChange(const AudioEventType type) std::shared_ptr cbObj = audioEventCallback_.lock(); if (cbObj == nullptr) { DHLOGE("Event callback is null"); - return ERR_DH_AUDIO_SA_MICCALLBACK_NULL; + return ERR_DH_AUDIO_NULLPTR; } cbObj->NotifyEvent(event); return DH_SUCCESS; diff --git a/services/audiomanager/managersource/src/dspeaker_dev.cpp b/services/audiomanager/managersource/src/dspeaker_dev.cpp index 5cca4e9c2f305277990eeca086d809c0065ded62..de3d3d3728c225942f03e981337b4eaad3246db7 100644 --- a/services/audiomanager/managersource/src/dspeaker_dev.cpp +++ b/services/audiomanager/managersource/src/dspeaker_dev.cpp @@ -80,14 +80,13 @@ int32_t DSpeakerDev::InitSenderEngine(IAVEngineProvider *providerPtr) int32_t ret = speakerTrans_->InitEngine(providerPtr); if (ret != DH_SUCCESS) { DHLOGE("Speaker dev initialize av sender adapter failed."); - return ERR_DH_AUDIO_TRANS_NULL_VALUE; + return ret; } ret = speakerTrans_->CreateCtrl(); if (ret != DH_SUCCESS) { DHLOGE("Create ctrl channel failed."); - return ERR_DH_AUDIO_TRANS_NULL_VALUE; } - return DH_SUCCESS; + return ret; } void DSpeakerDev::OnEngineTransEvent(const AVTransEvent &event) @@ -118,7 +117,7 @@ int32_t DSpeakerDev::OpenDevice(const std::string &devId, const int32_t dhId) std::shared_ptr cbObj = audioEventCallback_.lock(); if (cbObj == nullptr) { DHLOGE("Event callback is null"); - return ERR_DH_AUDIO_SA_EVENT_CALLBACK_NULL; + return ERR_DH_AUDIO_NULLPTR; } json jParam = { { KEY_DH_ID, std::to_string(dhId) } }; @@ -135,7 +134,7 @@ int32_t DSpeakerDev::CloseDevice(const std::string &devId, const int32_t dhId) std::shared_ptr cbObj = audioEventCallback_.lock(); if (cbObj == nullptr) { DHLOGE("Event callback is null"); - return ERR_DH_AUDIO_SA_EVENT_CALLBACK_NULL; + return ERR_DH_AUDIO_NULLPTR; } json jParam = { { KEY_DH_ID, std::to_string(dhId) } }; @@ -173,7 +172,7 @@ int32_t DSpeakerDev::NotifyEvent(const std::string &devId, int32_t dhId, const A std::shared_ptr cbObj = audioEventCallback_.lock(); if (cbObj == nullptr) { DHLOGE("Event callback is null"); - return ERR_DH_AUDIO_SA_EVENT_CALLBACK_NULL; + return ERR_DH_AUDIO_NULLPTR; } AudioEvent audioEvent(event.type, event.content); cbObj->NotifyEvent(audioEvent); @@ -200,7 +199,7 @@ int32_t DSpeakerDev::Start() DHLOGI("Start speaker device."); if (speakerTrans_ == nullptr) { DHLOGE("Speaker trans is null."); - return ERR_DH_AUDIO_SA_SPEAKER_TRANS_NULL; + return ERR_DH_AUDIO_NULLPTR; } int32_t ret = speakerTrans_->Start(); @@ -213,7 +212,7 @@ int32_t DSpeakerDev::Start() [this]() { return isTransReady_.load(); }); if (!status) { DHLOGE("Wait channel open timeout(%ds).", CHANNEL_WAIT_SECONDS); - return ERR_DH_AUDIO_SA_SPEAKER_CHANNEL_WAIT_TIMEOUT; + return ERR_DH_AUDIO_SA_WAIT_TIMEOUT; } isOpened_.store(true); return DH_SUCCESS; @@ -264,7 +263,7 @@ int32_t DSpeakerDev::Pause() DHLOGI("Pause."); if (speakerTrans_ == nullptr) { DHLOGE("Speaker trans is null."); - return ERR_DH_AUDIO_SA_SPEAKER_TRANS_NULL; + return ERR_DH_AUDIO_NULLPTR; } int32_t ret = speakerTrans_->Pause(); @@ -281,7 +280,7 @@ int32_t DSpeakerDev::Restart() DHLOGI("Restart."); if (speakerTrans_ == nullptr) { DHLOGE("Speaker trans is null."); - return ERR_DH_AUDIO_SA_SPEAKER_TRANS_NULL; + return ERR_DH_AUDIO_NULLPTR; } int32_t ret = speakerTrans_->Restart(param_, param_); @@ -313,7 +312,7 @@ int32_t DSpeakerDev::WriteStreamData(const std::string &devId, const int32_t dhI int64_t startTime = GetNowTimeUs(); if (speakerTrans_ == nullptr) { DHLOGE("Write stream data, speaker trans is null."); - return ERR_DH_AUDIO_SA_SPEAKER_TRANS_NULL; + return ERR_DH_AUDIO_NULLPTR; } #ifdef DUMP_DSPEAKERDEV_FILE if (DaudioHidumper::GetInstance().QueryDumpDataFlag()) { @@ -492,7 +491,7 @@ int32_t DSpeakerDev::OnStateChange(const AudioEventType type) std::shared_ptr cbObj = audioEventCallback_.lock(); if (cbObj == nullptr) { DHLOGE("Event callback is null"); - return ERR_DH_AUDIO_SA_EVENT_CALLBACK_NULL; + return ERR_DH_AUDIO_NULLPTR; } cbObj->NotifyEvent(event); return DH_SUCCESS; diff --git a/services/audiomanager/servicesink/BUILD.gn b/services/audiomanager/servicesink/BUILD.gn index 35454d63dba73d2ba8efa84e54252aa96a072931..fb0be9a8ac8cf3326e0ecb230c3f9963aeb3b00c 100755 --- a/services/audiomanager/servicesink/BUILD.gn +++ b/services/audiomanager/servicesink/BUILD.gn @@ -50,7 +50,6 @@ ohos_shared_library("distributed_audio_sink") { "${services_path}/common/audioeventcallback", "${services_path}/common/audiodata/include", "${services_path}/common/audioparam", - "${services_path}/common/taskProcessor/include", "${softbusadapter_path}/include", ] @@ -84,7 +83,6 @@ ohos_shared_library("distributed_audio_sink") { } deps = [ - "${audio_transport_path}/audioctrltransport:distributed_audio_control", "${audio_transport_path}/decodetransport:distributed_audio_decode_transport", "${audio_transport_path}/encodetransport:distributed_audio_encode_transport", "${services_path}/common:distributed_audio_utils", diff --git a/services/audiomanager/servicesink/src/daudio_sink_service.cpp b/services/audiomanager/servicesink/src/daudio_sink_service.cpp index dac62574a1754de7985321eb99ae8a545b6ecb16..624ebe1bfc5acf5acab1e8c0d2b226fb47e95655 100644 --- a/services/audiomanager/servicesink/src/daudio_sink_service.cpp +++ b/services/audiomanager/servicesink/src/daudio_sink_service.cpp @@ -86,12 +86,12 @@ int32_t DAudioSinkService::ReleaseSink() auto systemAbilityMgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); if (systemAbilityMgr == nullptr) { DHLOGE("Failed to get systemabilitymanager."); - return ERR_DH_AUDIO_BAD_VALUE; + return 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); - return ERR_DH_AUDIO_BAD_VALUE; + return ERR_DH_AUDIO_SA_LOAD_FAILED; } DHLOGI("Sink systemabilitymgr unloadsystemability successfully!"); return DH_SUCCESS; diff --git a/services/audiomanager/servicesource/BUILD.gn b/services/audiomanager/servicesource/BUILD.gn index d0d776f5dad318ac52c9378866fa7570ed8c1a95..fa5840fdba62dd69d1ffb664abc0f53544ad5d3b 100755 --- a/services/audiomanager/servicesource/BUILD.gn +++ b/services/audiomanager/servicesource/BUILD.gn @@ -58,7 +58,6 @@ ohos_shared_library("distributed_audio_source") { "${services_path}/common/audiodata/include", "${services_path}/common/audioeventcallback", "${services_path}/common/audioparam", - "${services_path}/common/taskProcessor/include", "${services_path}/hdfaudioclient/include", "${services_path}/audiomanager/common/include", "${softbusadapter_path}/include", @@ -83,7 +82,6 @@ ohos_shared_library("distributed_audio_source") { ] deps = [ - "${audio_transport_path}/audioctrltransport:distributed_audio_control", "${audio_transport_path}/decodetransport:distributed_audio_decode_transport", "${audio_transport_path}/encodetransport:distributed_audio_encode_transport", "${distributedaudio_path}/audiohandler:distributed_audio_handler", diff --git a/services/audiomanager/servicesource/src/daudio_source_service.cpp b/services/audiomanager/servicesource/src/daudio_source_service.cpp index cb2ab16f0d5c735bce8eef4e27f1ecc44bdc8977..c620d1d873daf4320d0dc9090cd4ab14280c251a 100644 --- a/services/audiomanager/servicesource/src/daudio_source_service.cpp +++ b/services/audiomanager/servicesource/src/daudio_source_service.cpp @@ -86,12 +86,12 @@ int32_t DAudioSourceService::ReleaseSource() auto systemAbilityMgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); if (systemAbilityMgr == nullptr) { DHLOGE("Failed to get systemabilitymanager."); - return ERR_DH_AUDIO_BAD_VALUE; + return 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); - return ERR_DH_AUDIO_BAD_VALUE; + return ERR_DH_AUDIO_SA_LOAD_FAILED; } DHLOGI("Source systemabilitymgr unloadsystemability successfully!"); return DH_SUCCESS; @@ -120,7 +120,7 @@ int32_t DAudioSourceService::ConfigDistributedHardware(const std::string &devId, { DHLOGI("Config distributed audio device, devId: %s, dhId: %s.", GetAnonyString(devId).c_str(), dhId.c_str()); - return ERR_DH_AUDIO_SA_FUNCTION_NOT_IMPLEMENT; + return DH_SUCCESS; } void DAudioSourceService::DAudioNotify(const std::string &devId, const std::string &dhId, const int32_t eventType, diff --git a/services/audiomanager/servicesource/src/daudio_source_stub.cpp b/services/audiomanager/servicesource/src/daudio_source_stub.cpp index a9e0364c08805fa9bde9889e5303190fc32aedc6..44b8bee014a8584b93509c8fc6e6c6c02ecf62b4 100644 --- a/services/audiomanager/servicesource/src/daudio_source_stub.cpp +++ b/services/audiomanager/servicesource/src/daudio_source_stub.cpp @@ -86,7 +86,7 @@ int32_t DAudioSourceStub::InitSourceInner(MessageParcel &data, MessageParcel &re sptr remoteObject = data.ReadRemoteObject(); if (remoteObject == nullptr) { DHLOGE("Read param failed."); - return ERR_DH_AUDIO_SA_READ_PARAM_FAILED; + return ERR_DH_AUDIO_NULLPTR; } sptr dAudioIpcCallbackProxy(new DAudioIpcCallbackProxy(remoteObject)); diff --git a/services/audiomanager/test/unittest/managersink/BUILD.gn b/services/audiomanager/test/unittest/managersink/BUILD.gn index 6e4d28ec89e531416bf0445e32f332dda787c592..e68da596ddb70e1a9a4877fa2a348988e33053fa 100644 --- a/services/audiomanager/test/unittest/managersink/BUILD.gn +++ b/services/audiomanager/test/unittest/managersink/BUILD.gn @@ -59,7 +59,6 @@ config("module_private_config") { "${services_path}/common/audiodata/include", "${services_path}/common/audioeventcallback", "${services_path}/common/audioparam", - "${services_path}/common/taskProcessor/include", ] } diff --git a/services/audiomanager/test/unittest/managersink/src/daudio_sink_dev_test.cpp b/services/audiomanager/test/unittest/managersink/src/daudio_sink_dev_test.cpp index 720f05a57231d48a02695f868c8045874f29bdcf..d2ef5d506a900e1eda91e6ec69230f9d9c8e2548 100644 --- a/services/audiomanager/test/unittest/managersink/src/daudio_sink_dev_test.cpp +++ b/services/audiomanager/test/unittest/managersink/src/daudio_sink_dev_test.cpp @@ -66,66 +66,12 @@ HWTEST_F(DAudioSinkDevTest, InitAVTransEngines_001, TestSize.Level1) HWTEST_F(DAudioSinkDevTest, TaskPlayStatusChange_001, TestSize.Level1) { sinkDev_->speakerClient_ = nullptr; - EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sinkDev_->TaskPlayStatusChange("")); + EXPECT_EQ(ERR_DH_AUDIO_FAILED, sinkDev_->TaskPlayStatusChange("")); std::string devId = "devid"; int32_t dhId = 1; sinkDev_->speakerClient_ = std::make_shared(devId, dhId, sinkDev_); - EXPECT_EQ(DH_SUCCESS, sinkDev_->TaskPlayStatusChange(AUDIO_EVENT_PAUSE)); -} - -/** - * @tc.name: TaskOpenCtrlChannel_001 - * @tc.desc: Verify the TaskOpenCtrlChannel function. - * @tc.type: FUNC - * @tc.require: AR000H0E5F - */ -HWTEST_F(DAudioSinkDevTest, TaskOpenCtrlChannel_001, TestSize.Level1) -{ - std::string args; - EXPECT_EQ(DH_SUCCESS, sinkDev_->TaskOpenCtrlChannel(args)); -} - -/** - * @tc.name: TaskOpenCtrlChannel_002 - * @tc.desc: Verify the TaskOpenCtrlChannel function. - * @tc.type: FUNC - * @tc.require: AR000H0E5F - */ -HWTEST_F(DAudioSinkDevTest, TaskOpenCtrlChannel_002, TestSize.Level1) -{ - std::string args = "args"; - EXPECT_EQ(DH_SUCCESS, sinkDev_->TaskOpenCtrlChannel(args)); - EXPECT_EQ(DH_SUCCESS, sinkDev_->TaskOpenCtrlChannel(args)); -} - -/** - * @tc.name: TaskCloseCtrlChannel_001 - * @tc.desc: Verify the TaskCloseCtrlChannel function. - * @tc.type: FUNC - * @tc.require: AR000H0E5F - */ -HWTEST_F(DAudioSinkDevTest, TaskCloseCtrlChannel_001, TestSize.Level1) -{ - std::string args; - sinkDev_->audioCtrlMgr_ = nullptr; - EXPECT_EQ(DH_SUCCESS, sinkDev_->TaskCloseCtrlChannel(args)); -} - -/** - * @tc.name: TaskCloseCtrlChannel_002 - * @tc.desc: Verify the TaskCloseCtrlChannel function. - * @tc.type: FUNC - * @tc.require: AR000H0E5F - */ -HWTEST_F(DAudioSinkDevTest, TaskCloseCtrlChannel_002, TestSize.Level1) -{ - std::string args; - std::string devId = "devId"; - EXPECT_EQ(DH_SUCCESS, sinkDev_->TaskCloseCtrlChannel(args)); - EXPECT_EQ(DH_SUCCESS, sinkDev_->TaskCloseCtrlChannel(args)); - sinkDev_->audioCtrlMgr_ = std::make_shared(devId, sinkDev_); - EXPECT_EQ(DH_SUCCESS, sinkDev_->TaskCloseCtrlChannel(args)); + EXPECT_EQ(ERR_DH_AUDIO_FAILED, sinkDev_->TaskPlayStatusChange(AUDIO_EVENT_PAUSE)); } /** @@ -160,7 +106,7 @@ HWTEST_F(DAudioSinkDevTest, TaskOpenDSpeaker_002, TestSize.Level1) */ HWTEST_F(DAudioSinkDevTest, TaskCloseDSpeaker_001, TestSize.Level1) { - std::string args; + std::string args = "{\"dhId\":\"1\"}"; sinkDev_->speakerClient_ = nullptr; EXPECT_EQ(DH_SUCCESS, sinkDev_->TaskCloseDSpeaker(args)); } @@ -173,7 +119,7 @@ HWTEST_F(DAudioSinkDevTest, TaskCloseDSpeaker_001, TestSize.Level1) */ HWTEST_F(DAudioSinkDevTest, TaskCloseDSpeaker_002, TestSize.Level1) { - std::string args; + std::string args = "{\"dhId\":\"1\"}"; std::string devId = "devId"; int32_t dhId = 1; sinkDev_->speakerClient_ = std::make_shared(devId, dhId, sinkDev_); @@ -229,7 +175,7 @@ HWTEST_F(DAudioSinkDevTest, TaskOpenDMic_002, TestSize.Level1) */ HWTEST_F(DAudioSinkDevTest, TaskCloseDMic_001, TestSize.Level1) { - std::string args; + std::string args = "{\"dhId\":\"1\"}"; EXPECT_EQ(DH_SUCCESS, sinkDev_->TaskCloseDMic(args)); } @@ -241,7 +187,7 @@ HWTEST_F(DAudioSinkDevTest, TaskCloseDMic_001, TestSize.Level1) */ HWTEST_F(DAudioSinkDevTest, TaskCloseDMic_002, TestSize.Level1) { - std::string args; + std::string args = "{\"dhId\":\"123\"}"; std::string devId; int32_t dhId = 1 << 27 | 1 << 0; sinkDev_->micClient_ = std::make_shared(devId, dhId, sinkDev_); @@ -425,6 +371,7 @@ HWTEST_F(DAudioSinkDevTest, SendAudioEventToRemote_002, TestSize.Level1) std::string devId = "devId"; int32_t dhId = 1; AudioEvent event; + event.content = "{\"dhId\":\"123\"}"; sinkDev_->speakerClient_ = nullptr; EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sinkDev_->SendAudioEventToRemote(event)); sinkDev_->speakerClient_ = std::make_shared(devId, dhId, sinkDev_); diff --git a/services/audiomanager/test/unittest/managersink/src/daudio_sink_manager_test.cpp b/services/audiomanager/test/unittest/managersink/src/daudio_sink_manager_test.cpp index 3c9c4bf59916f4b98789b82a910fa958ad3d5a83..4903da7619128858bcfed1f47a80324d477feb8b 100644 --- a/services/audiomanager/test/unittest/managersink/src/daudio_sink_manager_test.cpp +++ b/services/audiomanager/test/unittest/managersink/src/daudio_sink_manager_test.cpp @@ -80,7 +80,7 @@ HWTEST_F(DAudioSinkManagerTest, DAudioNotify_001, TestSize.Level1) std::string dhId = "dhId"; const int32_t eventType = 1; const std::string eventContent = "eventContent"; - EXPECT_EQ(ERR_DH_AUDIO_SA_GET_REMOTE_SINK_FAILED, + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, daudioSinkManager.DAudioNotify(devId, dhId, eventType, eventContent)); } diff --git a/services/audiomanager/test/unittest/servicesink/BUILD.gn b/services/audiomanager/test/unittest/servicesink/BUILD.gn index 22218c4602454e062d270dc6810a94d484685c13..467ff1dfdcdf1b2469d990711158e5c975dd3a12 100644 --- a/services/audiomanager/test/unittest/servicesink/BUILD.gn +++ b/services/audiomanager/test/unittest/servicesink/BUILD.gn @@ -61,7 +61,6 @@ config("module_private_config") { "${services_path}/common/audiodata/include", "${services_path}/common/audioeventcallback", "${services_path}/common/audioparam", - "${services_path}/common/taskProcessor/include", ] } diff --git a/services/audiomanager/test/unittest/servicesink/src/daudio_sink_service_test.cpp b/services/audiomanager/test/unittest/servicesink/src/daudio_sink_service_test.cpp index 14dda1a54d5079cb267367745883e408eaf4ded0..ff31b03ff8ef110e1b677e99c1b5dc59e2eea253 100644 --- a/services/audiomanager/test/unittest/servicesink/src/daudio_sink_service_test.cpp +++ b/services/audiomanager/test/unittest/servicesink/src/daudio_sink_service_test.cpp @@ -75,7 +75,7 @@ HWTEST_F(DAudioSinkServiceTest, InitSink_001, TestSize.Level1) */ HWTEST_F(DAudioSinkServiceTest, ReleaseSink_001, TestSize.Level1) { - EXPECT_EQ(ERR_DH_AUDIO_BAD_VALUE, sinkSrv_->ReleaseSink()); + EXPECT_EQ(ERR_DH_AUDIO_SA_LOAD_FAILED, sinkSrv_->ReleaseSink()); } /** diff --git a/services/audiomanager/test/unittest/servicesource/BUILD.gn b/services/audiomanager/test/unittest/servicesource/BUILD.gn index 92f83870ff080375172ee494105738c015dee6cc..a451284deea3d0df7377e68fbc03c10f8c38126a 100644 --- a/services/audiomanager/test/unittest/servicesource/BUILD.gn +++ b/services/audiomanager/test/unittest/servicesource/BUILD.gn @@ -69,7 +69,6 @@ config("module_private_config") { "${services_path}/common/audiodata/include", "${services_path}/common/audioeventcallback", "${services_path}/common/audioparam", - "${services_path}/common/taskProcessor/include", "${services_path}/hdfaudioclient/include", "${softbusadapter_path}/include", ] diff --git a/services/audiomanager/test/unittest/servicesource/src/daudio_source_service_test.cpp b/services/audiomanager/test/unittest/servicesource/src/daudio_source_service_test.cpp index 87b427f5a7ad7c251445f3496e61b35467b5ca80..3a3b5a2279d611b7e88b31c7acacf36e1c9b6bd9 100644 --- a/services/audiomanager/test/unittest/servicesource/src/daudio_source_service_test.cpp +++ b/services/audiomanager/test/unittest/servicesource/src/daudio_source_service_test.cpp @@ -49,7 +49,7 @@ HWTEST_F(DAudioSourceServiceTest, OnStart_001, TestSize.Level1) { sourceSrv_->isServiceStarted_ = true; sourceSrv_->OnStart(); - EXPECT_EQ(ERR_DH_AUDIO_BAD_VALUE, sourceSrv_->ReleaseSource()); + EXPECT_EQ(ERR_DH_AUDIO_SA_LOAD_FAILED, sourceSrv_->ReleaseSource()); } /** @@ -74,7 +74,7 @@ HWTEST_F(DAudioSourceServiceTest, InitSource_001, TestSize.Level1) */ HWTEST_F(DAudioSourceServiceTest, ReleaseSource_001, TestSize.Level1) { - EXPECT_EQ(ERR_DH_AUDIO_BAD_VALUE, sourceSrv_->ReleaseSource()); + EXPECT_EQ(ERR_DH_AUDIO_SA_LOAD_FAILED, sourceSrv_->ReleaseSource()); } /** @@ -90,8 +90,7 @@ HWTEST_F(DAudioSourceServiceTest, ConfigDistributedHardware_001, TestSize.Level1 std::string key = "key"; std::string value = "1"; - EXPECT_EQ(ERR_DH_AUDIO_SA_FUNCTION_NOT_IMPLEMENT, - sourceSrv_->ConfigDistributedHardware(devId, dhId, key, value)); + EXPECT_EQ(DH_SUCCESS, sourceSrv_->ConfigDistributedHardware(devId, dhId, key, value)); } /** diff --git a/services/audiomanager/test/unittest/sourcedevice/BUILD.gn b/services/audiomanager/test/unittest/sourcedevice/BUILD.gn index 0caca862d8677f421588c5f5dfc5d66679dadf18..ca946248db604f1ed4ac30c99a06006e6da17d09 100644 --- a/services/audiomanager/test/unittest/sourcedevice/BUILD.gn +++ b/services/audiomanager/test/unittest/sourcedevice/BUILD.gn @@ -53,7 +53,6 @@ config("module_private_config") { "${services_path}/audiomanager/managersource/include", "${services_path}/audiomanager/test/unittest/audiomanagertestutils/include", "${services_path}/common/audioparam", - "${services_path}/common/taskProcessor/include", "${services_path}/common/audiodata/include", "${services_path}/common/audioeventcallback", "${services_path}/hdfaudioclient/include", diff --git a/services/audiomanager/test/unittest/sourcedevice/src/daudio_source_dev_test.cpp b/services/audiomanager/test/unittest/sourcedevice/src/daudio_source_dev_test.cpp index a4cd26206597331981c501531885527cd27f1b93..2a83ab6927757ae90d511247732f9db28e2faa4f 100644 --- a/services/audiomanager/test/unittest/sourcedevice/src/daudio_source_dev_test.cpp +++ b/services/audiomanager/test/unittest/sourcedevice/src/daudio_source_dev_test.cpp @@ -58,7 +58,7 @@ HWTEST_F(DAudioSourceDevTest, CreatTasks_001, TestSize.Level1) EXPECT_EQ(DH_SUCCESS, sourceDev_->AwakeAudioDev()); EXPECT_EQ(DH_SUCCESS, sourceDev_->EnableDAudio(DH_ID_SPK, ATTRS)); - AudioEvent event = AudioEvent(OPEN_SPEAKER, ""); + AudioEvent event = AudioEvent(OPEN_SPEAKER, "{\"dhId\":\"1\"}"); EXPECT_EQ(DH_SUCCESS, sourceDev_->HandleOpenDSpeaker(event)); event.type = SPEAKER_OPENED; EXPECT_EQ(DH_SUCCESS, sourceDev_->HandleDSpeakerOpened(event)); @@ -113,7 +113,7 @@ HWTEST_F(DAudioSourceDevTest, CreatTasks_002, TestSize.Level1) { EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->EnableDAudio(DH_ID_SPK, ATTRS)); - AudioEvent event = AudioEvent(OPEN_SPEAKER, ""); + AudioEvent event = AudioEvent(OPEN_SPEAKER, "{\"dhId\":\"1\"}"); EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->HandleOpenDSpeaker(event)); event.type = SPEAKER_OPENED; EXPECT_EQ(DH_SUCCESS, sourceDev_->HandleDSpeakerOpened(event)); @@ -162,7 +162,7 @@ HWTEST_F(DAudioSourceDevTest, CreatTasks_003, TestSize.Level1) EXPECT_EQ(DH_SUCCESS, sourceDev_->HandleOpenDSpeaker(event)); event.type = OPEN_MIC; - EXPECT_NE(ERR_DH_AUDIO_SA_OPEN_CTRL_FAILED, sourceDev_->HandleOpenDMic(event)); + EXPECT_EQ(DH_SUCCESS, sourceDev_->HandleOpenDMic(event)); } /** @@ -206,12 +206,12 @@ HWTEST_F(DAudioSourceDevTest, HandlePlayStatusChange_001, TestSize.Level1) HWTEST_F(DAudioSourceDevTest, WaitForRPC_001, TestSize.Level1) { AudioEventType type = NOTIFY_OPEN_SPEAKER_RESULT; - EXPECT_EQ(ERR_DH_AUDIO_SA_RPC_WAIT_TIMEOUT, sourceDev_->WaitForRPC(type)); + EXPECT_EQ(ERR_DH_AUDIO_SA_WAIT_TIMEOUT, sourceDev_->WaitForRPC(type)); type = CHANGE_PLAY_STATUS; - EXPECT_EQ(ERR_DH_AUDIO_SA_RPC_WAIT_TIMEOUT, sourceDev_->WaitForRPC(type)); + EXPECT_EQ(ERR_DH_AUDIO_SA_WAIT_TIMEOUT, sourceDev_->WaitForRPC(type)); - sourceDev_->rpcResult_ = false; + sourceDev_->rpcResult_ = ERR_DH_AUDIO_FAILED; type = NOTIFY_OPEN_SPEAKER_RESULT; sourceDev_->rpcNotify_ = sourceDev_->EVENT_NOTIFY_OPEN_SPK; EXPECT_EQ(ERR_DH_AUDIO_FAILED, sourceDev_->WaitForRPC(type)); @@ -225,32 +225,32 @@ HWTEST_F(DAudioSourceDevTest, WaitForRPC_001, TestSize.Level1) */ HWTEST_F(DAudioSourceDevTest, WaitForRPC_002, TestSize.Level1) { - sourceDev_->rpcResult_ = true; + sourceDev_->rpcResult_ = DH_SUCCESS; AudioEventType type = NOTIFY_OPEN_SPEAKER_RESULT; sourceDev_->rpcNotify_ = sourceDev_->EVENT_NOTIFY_OPEN_SPK; EXPECT_EQ(DH_SUCCESS, sourceDev_->WaitForRPC(type)); - sourceDev_->rpcResult_ = true; + sourceDev_->rpcResult_ = DH_SUCCESS; type = NOTIFY_CLOSE_SPEAKER_RESULT; sourceDev_->rpcNotify_ = sourceDev_->EVENT_NOTIFY_CLOSE_SPK; EXPECT_EQ(DH_SUCCESS, sourceDev_->WaitForRPC(type)); - sourceDev_->rpcResult_ = true; + sourceDev_->rpcResult_ = DH_SUCCESS; type = NOTIFY_OPEN_MIC_RESULT; sourceDev_->rpcNotify_ = sourceDev_->EVENT_NOTIFY_OPEN_MIC; EXPECT_EQ(DH_SUCCESS, sourceDev_->WaitForRPC(type)); - sourceDev_->rpcResult_ = true; + sourceDev_->rpcResult_ = DH_SUCCESS; type = NOTIFY_CLOSE_MIC_RESULT; sourceDev_->rpcNotify_ = sourceDev_->EVENT_NOTIFY_CLOSE_MIC; EXPECT_EQ(DH_SUCCESS, sourceDev_->WaitForRPC(type)); - sourceDev_->rpcResult_ = true; + sourceDev_->rpcResult_ = DH_SUCCESS; type = NOTIFY_OPEN_CTRL_RESULT; sourceDev_->rpcNotify_ = sourceDev_->EVENT_NOTIFY_OPEN_CTRL; EXPECT_EQ(DH_SUCCESS, sourceDev_->WaitForRPC(type)); - sourceDev_->rpcResult_ = true; + sourceDev_->rpcResult_ = DH_SUCCESS; type = NOTIFY_CLOSE_CTRL_RESULT; sourceDev_->rpcNotify_ = sourceDev_->EVENT_NOTIFY_CLOSE_CTRL; EXPECT_EQ(DH_SUCCESS, sourceDev_->WaitForRPC(type)); @@ -265,6 +265,7 @@ HWTEST_F(DAudioSourceDevTest, WaitForRPC_002, TestSize.Level1) HWTEST_F(DAudioSourceDevTest, HandleDMicClosed_001, TestSize.Level1) { AudioEvent event; + event.content = "{\"dhId\":\"1\"}"; EXPECT_EQ(DH_SUCCESS, sourceDev_->HandleDMicClosed(event)); sourceDev_->SleepAudioDev(); } @@ -278,74 +279,11 @@ HWTEST_F(DAudioSourceDevTest, HandleDMicClosed_001, TestSize.Level1) HWTEST_F(DAudioSourceDevTest, HandleDMicClosed_002, TestSize.Level1) { AudioEvent event; + event.content = "{\"dhId\":\"1\"}"; sourceDev_->mic_ = std::make_shared(DEV_ID, sourceDev_); EXPECT_EQ(DH_SUCCESS, sourceDev_->HandleDMicClosed(event)); } -/** - * @tc.name: OpenCtrlTrans_001 - * @tc.desc: Verify the OpenCtrlTrans function. - * @tc.type: FUNC - * @tc.require: AR000H0E5F - */ -HWTEST_F(DAudioSourceDevTest, OpenCtrlTrans_001, TestSize.Level1) -{ - AudioEvent event; - EXPECT_NE(ERR_DH_AUDIO_SA_OPEN_CTRL_FAILED, sourceDev_->OpenCtrlTrans(event)); - EXPECT_EQ(DH_SUCCESS, sourceDev_->OpenCtrlTrans(event)); - sourceDev_->audioCtrlMgr_ = std::make_shared(DEV_ID, sourceDev_); - sourceDev_->audioCtrlMgr_->isOpened_ = true; - EXPECT_EQ(DH_SUCCESS, sourceDev_->OpenCtrlTrans(event)); - - sourceDev_->audioCtrlMgr_->isOpened_ = false; - sourceDev_->AwakeAudioDev(); - EXPECT_EQ(DH_SUCCESS, sourceDev_->OpenCtrlTrans(event)); - sourceDev_->audioCtrlMgr_ = nullptr; -} - -/** - * @tc.name: CloseCtrlTrans_001 - * @tc.desc: Verify the CloseCtrlTrans function without task queue. - * @tc.type: FUNC - * @tc.require: AR000H0E5F - */ -HWTEST_F(DAudioSourceDevTest, CloseCtrlTrans_001, TestSize.Level1) -{ - AudioEvent event; - bool isSpk = false; - EXPECT_EQ(DH_SUCCESS, sourceDev_->CloseCtrlTrans(event, isSpk)); -} - -/** - * @tc.name: HandleOpenCtrlTrans_001 - * @tc.desc: Verify the HandleOpenCtrlTrans function. - * @tc.type: FUNC - * @tc.require: AR000H0E5F - */ -HWTEST_F(DAudioSourceDevTest, HandleOpenCtrlTrans_001, TestSize.Level1) -{ - AudioEvent event; - EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->HandleOpenCtrlTrans(event)); - - sourceDev_->AwakeAudioDev(); - EXPECT_EQ(DH_SUCCESS, sourceDev_->HandleOpenCtrlTrans(event)); -} - -/** - * @tc.name: HandleCloseCtrlTrans_001 - * @tc.desc: Verify the HandleCloseCtrlTrans function. - * @tc.type: FUNC - * @tc.require: AR000H0E5F - */ -HWTEST_F(DAudioSourceDevTest, HandleCloseCtrlTrans_001, TestSize.Level1) -{ - AudioEvent event; - EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->HandleCloseCtrlTrans(event)); - - sourceDev_->AwakeAudioDev(); - EXPECT_EQ(DH_SUCCESS, sourceDev_->HandleCloseCtrlTrans(event)); -} - /** * @tc.name: HandleCtrlTransClosed_001 * @tc.desc: Verify the HandleCtrlTransClosed function. @@ -491,10 +429,10 @@ HWTEST_F(DAudioSourceDevTest, TaskEnableDAudio_001, TestSize.Level1) EXPECT_EQ(ERR_DH_AUDIO_SA_PARAM_INVALID, sourceDev_->TaskEnableDAudio(tempLongStr)); json jParam = { { KEY_DEV_ID, DEV_ID }, { KEY_RESULT, "test_result" } }; - EXPECT_EQ(ERR_DH_AUDIO_SA_ENABLE_PARAM_INVALID, sourceDev_->TaskEnableDAudio(jParam.dump())); + EXPECT_EQ(ERR_DH_AUDIO_SA_PARAM_INVALID, sourceDev_->TaskEnableDAudio(jParam.dump())); jParam = { { KEY_DEV_ID, DEV_ID }, { KEY_DH_ID, "testDhId" }, { KEY_ATTRS, "" } }; - EXPECT_EQ(ERR_DH_AUDIO_SA_ENABLE_PARAM_INVALID, sourceDev_->TaskEnableDAudio(jParam.dump())); + EXPECT_EQ(ERR_DH_AUDIO_SA_PARAM_INVALID, sourceDev_->TaskEnableDAudio(jParam.dump())); jParam = { { KEY_DEV_ID, DEV_ID }, { KEY_DH_ID, DH_ID_UNKNOWN }, { KEY_ATTRS, "" } }; EXPECT_EQ(ERR_DH_AUDIO_NOT_SUPPORT, sourceDev_->TaskEnableDAudio(jParam.dump())); @@ -520,10 +458,10 @@ HWTEST_F(DAudioSourceDevTest, TaskDisableDAudio_001, TestSize.Level1) EXPECT_EQ(ERR_DH_AUDIO_SA_PARAM_INVALID, sourceDev_->TaskDisableDAudio(tempLongStr)); json jParam = { { KEY_DEV_ID, DEV_ID }, { KEY_RESULT, "test_result" } }; - EXPECT_EQ(ERR_DH_AUDIO_SA_DISABLE_PARAM_INVALID, sourceDev_->TaskDisableDAudio(jParam.dump())); + EXPECT_EQ(ERR_DH_AUDIO_SA_PARAM_INVALID, sourceDev_->TaskDisableDAudio(jParam.dump())); jParam = { { KEY_DEV_ID, DEV_ID }, { KEY_DH_ID, "testDhId" } }; - EXPECT_EQ(ERR_DH_AUDIO_SA_DISABLE_PARAM_INVALID, sourceDev_->TaskDisableDAudio(jParam.dump())); + EXPECT_EQ(ERR_DH_AUDIO_SA_PARAM_INVALID, sourceDev_->TaskDisableDAudio(jParam.dump())); jParam = { { KEY_DEV_ID, DEV_ID }, { KEY_DH_ID, DH_ID_UNKNOWN } }; EXPECT_EQ(ERR_DH_AUDIO_NOT_SUPPORT, sourceDev_->TaskDisableDAudio(jParam.dump())); @@ -631,7 +569,7 @@ HWTEST_F(DAudioSourceDevTest, EnableDMic_001, TestSize.Level1) HWTEST_F(DAudioSourceDevTest, DisableDSpeaker_001, TestSize.Level1) { int32_t dhId = 0; - EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->DisableDSpeaker(dhId)); + EXPECT_EQ(DH_SUCCESS, sourceDev_->DisableDSpeaker(dhId)); sourceDev_->speaker_ = std::make_shared(DEV_ID, sourceDev_); EXPECT_NE(DH_SUCCESS, sourceDev_->DisableDSpeaker(dhId)); @@ -647,7 +585,7 @@ HWTEST_F(DAudioSourceDevTest, DisableDSpeaker_001, TestSize.Level1) HWTEST_F(DAudioSourceDevTest, DisableDMic_001, TestSize.Level1) { int32_t dhId = 0; - EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->DisableDMic(dhId)); + EXPECT_EQ(DH_SUCCESS, sourceDev_->DisableDMic(dhId)); sourceDev_->mic_ = std::make_shared(DEV_ID, sourceDev_); EXPECT_NE(DH_SUCCESS, sourceDev_->DisableDMic(dhId)); @@ -662,7 +600,7 @@ HWTEST_F(DAudioSourceDevTest, DisableDMic_001, TestSize.Level1) */ HWTEST_F(DAudioSourceDevTest, TaskOpenDSpeaker_001, TestSize.Level1) { - EXPECT_EQ(ERR_DH_AUDIO_SA_SPEAKER_DEVICE_NOT_INIT, sourceDev_->TaskOpenDSpeaker("")); + EXPECT_EQ(ERR_DH_AUDIO_SA_PARAM_INVALID, sourceDev_->TaskOpenDSpeaker("")); sourceDev_->speaker_ = std::make_shared(DEV_ID, sourceDev_); EXPECT_EQ(ERR_DH_AUDIO_SA_PARAM_INVALID, sourceDev_->TaskOpenDSpeaker("")); @@ -674,12 +612,12 @@ HWTEST_F(DAudioSourceDevTest, TaskOpenDSpeaker_001, TestSize.Level1) json jParam_spk = { { KEY_DH_ID, DH_ID_SPK } }; sourceDev_->isRpcOpen_.store(false); - EXPECT_EQ(ERR_DH_AUDIO_TRANS_NULL_VALUE, sourceDev_->TaskOpenDSpeaker(jParam_spk.dump())); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->TaskOpenDSpeaker(jParam_spk.dump())); sourceDev_->isRpcOpen_.store(true); - EXPECT_EQ(ERR_DH_AUDIO_TRANS_NULL_VALUE, sourceDev_->TaskOpenDSpeaker(jParam_spk.dump())); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->TaskOpenDSpeaker(jParam_spk.dump())); - sourceDev_->rpcResult_ = true; + sourceDev_->rpcResult_ = DH_SUCCESS; sourceDev_->rpcNotify_ = sourceDev_->EVENT_NOTIFY_OPEN_SPK; EXPECT_NE(DH_SUCCESS, sourceDev_->TaskOpenDSpeaker(jParam_spk.dump())); } @@ -697,10 +635,10 @@ HWTEST_F(DAudioSourceDevTest, TaskCloseDSpeaker_001, TestSize.Level1) int32_t dhId = DEFAULT_RENDER_ID; auto speaker = std::make_shared(DEV_ID, sourceDev_); sourceDev_->deviceMap_[dhId] = speaker; - EXPECT_EQ(ERR_DH_AUDIO_SA_PARAM_INVALID, sourceDev_->TaskCloseDSpeaker("")); + EXPECT_EQ(ERR_DH_AUDIO_FAILED, sourceDev_->TaskCloseDSpeaker("")); std::string tempLongStr(DAUDIO_MAX_JSON_LEN + 1, 'a'); - EXPECT_EQ(ERR_DH_AUDIO_SA_PARAM_INVALID, sourceDev_->TaskCloseDSpeaker(tempLongStr)); + EXPECT_EQ(ERR_DH_AUDIO_FAILED, sourceDev_->TaskCloseDSpeaker(tempLongStr)); speaker->isOpened_ = true; EXPECT_EQ(ERR_DH_AUDIO_FAILED, sourceDev_->TaskCloseDSpeaker(ARGS)); @@ -737,22 +675,18 @@ HWTEST_F(DAudioSourceDevTest, TaskCloseDSpeaker_002, TestSize.Level1) */ HWTEST_F(DAudioSourceDevTest, TaskOpenDMic_001, TestSize.Level1) { - EXPECT_EQ(ERR_DH_AUDIO_SA_MIC_DEVICE_NOT_INIT, sourceDev_->TaskOpenDMic("")); + EXPECT_EQ(ERR_DH_AUDIO_SA_PARAM_INVALID, sourceDev_->TaskOpenDMic("")); auto mic = std::make_shared(DEV_ID, sourceDev_); int32_t dhId = DEFAULT_CAPTURE_ID; sourceDev_->deviceMap_[dhId] = mic; - EXPECT_EQ(ERR_DH_AUDIO_TRANS_NULL_VALUE, sourceDev_->TaskOpenDMic("")); - - EXPECT_EQ(ERR_DH_AUDIO_TRANS_NULL_VALUE, sourceDev_->TaskOpenDMic("")); + EXPECT_EQ(ERR_DH_AUDIO_SA_PARAM_INVALID, sourceDev_->TaskOpenDMic("")); std::string tempLongStr(DAUDIO_MAX_JSON_LEN + 1, 'a'); - EXPECT_EQ(ERR_DH_AUDIO_TRANS_NULL_VALUE, sourceDev_->TaskOpenDMic(tempLongStr)); - - EXPECT_EQ(ERR_DH_AUDIO_TRANS_NULL_VALUE, sourceDev_->TaskOpenDMic(ARGS)); + EXPECT_EQ(ERR_DH_AUDIO_SA_PARAM_INVALID, sourceDev_->TaskOpenDMic(tempLongStr)); json jParam_mic = { { KEY_DH_ID, DH_ID_MIC } }; - EXPECT_EQ(ERR_DH_AUDIO_TRANS_NULL_VALUE, sourceDev_->TaskOpenDMic(jParam_mic.dump())); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->TaskOpenDMic(jParam_mic.dump())); } /** @@ -763,7 +697,8 @@ HWTEST_F(DAudioSourceDevTest, TaskOpenDMic_001, TestSize.Level1) */ HWTEST_F(DAudioSourceDevTest, TaskCloseDMic_001, TestSize.Level1) { - EXPECT_EQ(DH_SUCCESS, sourceDev_->TaskCloseDMic(ARGS)); + std::string dhIdArgs = "{\"dhId\":\"1\"}"; + EXPECT_EQ(DH_SUCCESS, sourceDev_->TaskCloseDMic(dhIdArgs)); auto mic = std::make_shared(DEV_ID, sourceDev_); int32_t dhId = DEFAULT_CAPTURE_ID; @@ -801,63 +736,6 @@ HWTEST_F(DAudioSourceDevTest, TaskCloseDMic_002, TestSize.Level1) EXPECT_EQ(DH_SUCCESS, sourceDev_->TaskCloseDMic(jParam_mic.dump())); } -/** - * @tc.name: TaskOpenCtrlChannel_001 - * @tc.desc: Verify the TaskOpenCtrlChannel function. - * @tc.type: FUNC - * @tc.require: AR000H0E5F - */ -HWTEST_F(DAudioSourceDevTest, TaskOpenCtrlChannel_001, TestSize.Level1) -{ - EXPECT_EQ(DH_SUCCESS, sourceDev_->TaskOpenCtrlChannel("")); - - sourceDev_->audioCtrlMgr_ = std::make_shared(DEV_ID, sourceDev_); - EXPECT_EQ(DH_SUCCESS, sourceDev_->TaskOpenCtrlChannel("")); - - std::string tempLongStr(DAUDIO_MAX_JSON_LEN + 1, 'a'); - EXPECT_EQ(DH_SUCCESS, sourceDev_->TaskOpenCtrlChannel(tempLongStr)); - - EXPECT_EQ(DH_SUCCESS, sourceDev_->TaskOpenCtrlChannel(ARGS)); - - json jParam = { { KEY_DH_ID, DH_ID_SPK } }; - sourceDev_->isRpcOpen_.store(false); - EXPECT_EQ(DH_SUCCESS, sourceDev_->TaskOpenCtrlChannel(jParam.dump())); - - sourceDev_->isRpcOpen_.store(true); - EXPECT_EQ(DH_SUCCESS, sourceDev_->TaskOpenCtrlChannel(jParam.dump())); - - sourceDev_->rpcResult_ = true; - sourceDev_->rpcNotify_ = sourceDev_->EVENT_NOTIFY_OPEN_MIC; - jParam = { { KEY_DH_ID, DH_ID_SPK } }; - EXPECT_NE(DH_SUCCESS, sourceDev_->TaskOpenCtrlChannel(jParam.dump())); -} - -/** - * @tc.name: TaskCloseCtrlChannel_001 - * @tc.desc: Verify the TaskCloseCtrlChannel function. - * @tc.type: FUNC - * @tc.require: AR000H0E5F - */ -HWTEST_F(DAudioSourceDevTest, TaskCloseCtrlChannel_001, TestSize.Level1) -{ - EXPECT_EQ(DH_SUCCESS, sourceDev_->TaskCloseCtrlChannel(ARGS)); - sourceDev_->OnTaskResult(DH_SUCCESS, "", FUNC_NAME); -} - -/** - * @tc.name: TaskCloseCtrlChannel_002 - * @tc.desc: Verify the TaskCloseCtrlChannel function. - * @tc.type: FUNC - * @tc.require: AR000H0E5F - */ -HWTEST_F(DAudioSourceDevTest, TaskCloseCtrlChannel_002, TestSize.Level1) -{ - sourceDev_->audioCtrlMgr_ = std::make_shared(DEV_ID, sourceDev_); - EXPECT_EQ(DH_SUCCESS, sourceDev_->TaskCloseCtrlChannel(ARGS)); - - sourceDev_->OnTaskResult(DH_SUCCESS, "", FUNC_NAME); -} - /** * @tc.name: TaskSetVolume_001 * @tc.desc: Verify the TaskSetVolume function. @@ -866,7 +744,7 @@ HWTEST_F(DAudioSourceDevTest, TaskCloseCtrlChannel_002, TestSize.Level1) */ HWTEST_F(DAudioSourceDevTest, TaskSetVolume_001, TestSize.Level1) { - EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->TaskSetVolume(ARGS)); + EXPECT_EQ(ERR_DH_AUDIO_FAILED, sourceDev_->TaskSetVolume(ARGS)); } /** @@ -961,7 +839,7 @@ HWTEST_F(DAudioSourceDevTest, TaskSpkMmapStop_001, TestSize.Level1) EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->TaskSpkMmapStop(ARGS)); sourceDev_->speaker_ = std::make_shared(DEV_ID, nullptr); - EXPECT_EQ(DH_SUCCESS, sourceDev_->TaskSpkMmapStop(ARGS)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->TaskSpkMmapStop(ARGS)); } /** @@ -998,7 +876,7 @@ HWTEST_F(DAudioSourceDevTest, TaskMicMmapStop_001, TestSize.Level1) int32_t dhId = DEFAULT_CAPTURE_ID; sourceDev_->deviceMap_[dhId] = mic; - EXPECT_EQ(DH_SUCCESS, sourceDev_->TaskMicMmapStop(ARGS)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->TaskMicMmapStop(ARGS)); } @@ -1016,7 +894,7 @@ HWTEST_F(DAudioSourceDevTest, NotifyHDF_001, TestSize.Level1) EXPECT_NE(DH_SUCCESS, sourceDev_->NotifyHDF(type, result, dhId)); sourceDev_->mic_ = std::make_shared(DEV_ID, sourceDev_); - EXPECT_EQ(DH_SUCCESS, sourceDev_->NotifyHDF(type, result, dhId)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->NotifyHDF(type, result, dhId)); } /** @@ -1033,7 +911,7 @@ HWTEST_F(DAudioSourceDevTest, NotifyHDF_002, TestSize.Level1) EXPECT_NE(DH_SUCCESS, sourceDev_->NotifyHDF(type, result, dhId)); sourceDev_->speaker_ = std::make_shared(DEV_ID, sourceDev_); - EXPECT_EQ(DH_SUCCESS, sourceDev_->NotifyHDF(type, result, dhId)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->NotifyHDF(type, result, dhId)); } /** @@ -1047,7 +925,7 @@ HWTEST_F(DAudioSourceDevTest, NotifyHDF_003, TestSize.Level1) AudioEventType type = EVENT_UNKNOWN; std::string result = "result"; int32_t dhId = 1; - EXPECT_EQ(ERR_DH_AUDIO_FAILED, sourceDev_->NotifyHDF(type, result, dhId)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->NotifyHDF(type, result, dhId)); } /** @@ -1066,7 +944,7 @@ HWTEST_F(DAudioSourceDevTest, NotifySinkDev_001, TestSize.Level1) EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->NotifySinkDev(CLOSE_MIC, jAudioParam, DH_ID_SPK)); sourceDev_->mic_ = std::make_shared(DEV_ID, sourceDev_); sourceDev_->speaker_ = std::make_shared(DEV_ID, sourceDev_); - EXPECT_EQ(DH_SUCCESS, sourceDev_->NotifySinkDev(CLOSE_MIC, jAudioParam, DH_ID_SPK)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->NotifySinkDev(CLOSE_MIC, jAudioParam, DH_ID_SPK)); } /** diff --git a/services/audiomanager/test/unittest/sourcedevice/src/dmic_dev_test.cpp b/services/audiomanager/test/unittest/sourcedevice/src/dmic_dev_test.cpp index 30af534dc79cbbab864b82d4b79b0b3694f54c47..8748ab353f6fe81aac4455ec9263e88d2d2e5275 100644 --- a/services/audiomanager/test/unittest/sourcedevice/src/dmic_dev_test.cpp +++ b/services/audiomanager/test/unittest/sourcedevice/src/dmic_dev_test.cpp @@ -58,7 +58,7 @@ HWTEST_F(DMicDevTest, InitReceiverEngine_001, TestSize.Level1) size_t size = 4096; auto audioData = std::make_shared(size); mic_->OnEngineTransDataAvailable(audioData); - EXPECT_EQ(ERR_DH_AUDIO_TRANS_NULL_VALUE, mic_->InitReceiverEngine(providerPtr)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, mic_->InitReceiverEngine(providerPtr)); mic_->micTrans_ = std::make_shared(); EXPECT_EQ(DH_SUCCESS, mic_->InitReceiverEngine(providerPtr)); } @@ -71,11 +71,11 @@ HWTEST_F(DMicDevTest, InitReceiverEngine_001, TestSize.Level1) */ HWTEST_F(DMicDevTest, EnableDMic_001, TestSize.Level1) { - EXPECT_EQ(ERR_DH_AUDIO_FAILED, mic_->EnableDevice(DH_ID, CAP)); - EXPECT_EQ(ERR_DH_AUDIO_HDI_PROXY_NOT_INIT, mic_->EnableDevice(DH_ID, CAP)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, mic_->EnableDevice(DH_ID, CAP)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, mic_->EnableDevice(DH_ID, CAP)); mic_->enabledPorts_.insert(DH_ID_MIC); - EXPECT_EQ(ERR_DH_AUDIO_HDI_PROXY_NOT_INIT, mic_->EnableDevice(DH_ID_MIC, CAP)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, mic_->EnableDevice(DH_ID_MIC, CAP)); } /** @@ -87,12 +87,12 @@ HWTEST_F(DMicDevTest, EnableDMic_001, TestSize.Level1) HWTEST_F(DMicDevTest, DisableDMic_001, TestSize.Level1) { mic_->enabledPorts_.insert(DH_ID); - EXPECT_EQ(ERR_DH_AUDIO_HDI_PROXY_NOT_INIT, mic_->DisableDevice(DH_ID)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, mic_->DisableDevice(DH_ID)); - EXPECT_EQ(ERR_DH_AUDIO_FAILED, mic_->DisableDevice(DH_ID)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, mic_->DisableDevice(DH_ID)); mic_->curPort_ = DH_ID_MIC; - EXPECT_EQ(ERR_DH_AUDIO_FAILED, mic_->DisableDevice(DH_ID_MIC)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, mic_->DisableDevice(DH_ID_MIC)); EXPECT_FALSE(mic_->IsOpened()); } @@ -107,7 +107,7 @@ HWTEST_F(DMicDevTest, OpenDevice_001, TestSize.Level1) EXPECT_EQ(DH_SUCCESS, mic_->OpenDevice(DEV_ID, DH_ID)); eventCb_ = nullptr; - EXPECT_EQ(ERR_DH_AUDIO_SA_MICCALLBACK_NULL, mic_->OpenDevice(DEV_ID, DH_ID)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, mic_->OpenDevice(DEV_ID, DH_ID)); } /** @@ -121,7 +121,7 @@ HWTEST_F(DMicDevTest, CloseDevice_001, TestSize.Level1) EXPECT_EQ(DH_SUCCESS, mic_->CloseDevice(DEV_ID, DH_ID)); eventCb_ = nullptr; - EXPECT_EQ(ERR_DH_AUDIO_SA_MICCALLBACK_NULL, mic_->CloseDevice(DEV_ID, DH_ID)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, mic_->CloseDevice(DEV_ID, DH_ID)); } /** @@ -160,7 +160,7 @@ HWTEST_F(DMicDevTest, NotifyEvent_001, TestSize.Level1) EXPECT_EQ(DH_SUCCESS, mic_->NotifyEvent(DEV_ID, DH_ID, event)); eventCb_ = nullptr; - EXPECT_EQ(ERR_DH_AUDIO_SA_EVENT_CALLBACK_NULL, mic_->NotifyEvent(DEV_ID, DH_ID, event)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, mic_->NotifyEvent(DEV_ID, DH_ID, event)); } /** @@ -187,7 +187,7 @@ HWTEST_F(DMicDevTest, SetUp_001, TestSize.Level1) HWTEST_F(DMicDevTest, Start_001, TestSize.Level1) { mic_->micTrans_ = nullptr; - EXPECT_EQ(ERR_DH_AUDIO_SA_MIC_TRANS_NULL, mic_->Start()); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, mic_->Start()); mic_->micTrans_ = std::make_shared(DEV_ID); EXPECT_NE(DH_SUCCESS, mic_->Start()); @@ -213,7 +213,7 @@ HWTEST_F(DMicDevTest, Start_002, TestSize.Level1) mic_->micTrans_ = std::make_shared(); EXPECT_EQ(DH_SUCCESS, mic_->SetUp()); - EXPECT_EQ(ERR_DH_AUDIO_SA_MIC_CHANNEL_WAIT_TIMEOUT, mic_->Start()); + EXPECT_EQ(ERR_DH_AUDIO_SA_WAIT_TIMEOUT, mic_->Start()); EXPECT_FALSE(mic_->IsOpened()); mic_->isTransReady_.store(true); @@ -330,7 +330,7 @@ HWTEST_F(DMicDevTest, OnStateChange_001, TestSize.Level1) EXPECT_EQ(DH_SUCCESS, mic_->OnStateChange(event)); eventCb_ = nullptr; - EXPECT_EQ(ERR_DH_AUDIO_SA_MICCALLBACK_NULL, mic_->OnStateChange(event)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, mic_->OnStateChange(event)); } /** diff --git a/services/audiomanager/test/unittest/sourcedevice/src/dspeaker_dev_test.cpp b/services/audiomanager/test/unittest/sourcedevice/src/dspeaker_dev_test.cpp index 3e52a1cf317c0d55e86a5844dfbec1dd4f0150b9..e7e01e7695bd5d9094a9e81778b45f69445d2a31 100644 --- a/services/audiomanager/test/unittest/sourcedevice/src/dspeaker_dev_test.cpp +++ b/services/audiomanager/test/unittest/sourcedevice/src/dspeaker_dev_test.cpp @@ -55,7 +55,7 @@ HWTEST_F(DSpeakerDevTest, InitSenderEngine_001, TestSize.Level1) spk_->OnEngineTransEvent(event); std::shared_ptr message = nullptr; spk_->OnEngineTransMessage(message); - EXPECT_EQ(ERR_DH_AUDIO_TRANS_NULL_VALUE, spk_->InitSenderEngine(providerPtr)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, spk_->InitSenderEngine(providerPtr)); spk_->speakerTrans_ = std::make_shared(); EXPECT_EQ(DH_SUCCESS, spk_->InitSenderEngine(providerPtr)); } @@ -68,11 +68,11 @@ HWTEST_F(DSpeakerDevTest, InitSenderEngine_001, TestSize.Level1) */ HWTEST_F(DSpeakerDevTest, EnableDSpeaker_001, TestSize.Level1) { - EXPECT_EQ(ERR_DH_AUDIO_FAILED, spk_->EnableDevice(DH_ID, CAP)); - EXPECT_EQ(ERR_DH_AUDIO_HDI_PROXY_NOT_INIT, spk_->EnableDevice(DH_ID, CAP)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, spk_->EnableDevice(DH_ID, CAP)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, spk_->EnableDevice(DH_ID, CAP)); spk_->enabledPorts_.insert(DH_ID_SPK); - EXPECT_EQ(ERR_DH_AUDIO_HDI_PROXY_NOT_INIT, spk_->EnableDevice(DH_ID_SPK, CAP)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, spk_->EnableDevice(DH_ID_SPK, CAP)); } /** @@ -84,12 +84,12 @@ HWTEST_F(DSpeakerDevTest, EnableDSpeaker_001, TestSize.Level1) HWTEST_F(DSpeakerDevTest, DisableDSpeaker_001, TestSize.Level1) { spk_->enabledPorts_.insert(DH_ID); - EXPECT_EQ(ERR_DH_AUDIO_HDI_PROXY_NOT_INIT, spk_->DisableDevice(DH_ID)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, spk_->DisableDevice(DH_ID)); - EXPECT_EQ(ERR_DH_AUDIO_HDI_PROXY_NOT_INIT, spk_->DisableDevice(DH_ID)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, spk_->DisableDevice(DH_ID)); spk_->curPort_ = DH_ID_SPK; - EXPECT_EQ(ERR_DH_AUDIO_HDI_PROXY_NOT_INIT, spk_->DisableDevice(DH_ID_SPK)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, spk_->DisableDevice(DH_ID_SPK)); EXPECT_FALSE(spk_->IsOpened()); } @@ -104,7 +104,7 @@ HWTEST_F(DSpeakerDevTest, OpenDevice_001, TestSize.Level1) EXPECT_EQ(DH_SUCCESS, spk_->OpenDevice(DEV_ID, DH_ID)); eventCb_ = nullptr; - EXPECT_EQ(ERR_DH_AUDIO_SA_EVENT_CALLBACK_NULL, spk_->OpenDevice(DEV_ID, DH_ID)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, spk_->OpenDevice(DEV_ID, DH_ID)); } /** @@ -118,7 +118,7 @@ HWTEST_F(DSpeakerDevTest, CloseDevice_001, TestSize.Level1) EXPECT_EQ(DH_SUCCESS, spk_->CloseDevice(DEV_ID, DH_ID)); eventCb_ = nullptr; - EXPECT_EQ(ERR_DH_AUDIO_SA_EVENT_CALLBACK_NULL, spk_->CloseDevice(DEV_ID, DH_ID)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, spk_->CloseDevice(DEV_ID, DH_ID)); } /** @@ -157,7 +157,7 @@ HWTEST_F(DSpeakerDevTest, NotifyEvent_001, TestSize.Level1) EXPECT_EQ(DH_SUCCESS, spk_->NotifyEvent(DEV_ID, DH_ID, event)); eventCb_ = nullptr; - EXPECT_EQ(ERR_DH_AUDIO_SA_EVENT_CALLBACK_NULL, spk_->NotifyEvent(DEV_ID, DH_ID, event)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, spk_->NotifyEvent(DEV_ID, DH_ID, event)); } /** @@ -184,7 +184,7 @@ HWTEST_F(DSpeakerDevTest, SetUp_001, TestSize.Level1) HWTEST_F(DSpeakerDevTest, Start_001, TestSize.Level1) { spk_->speakerTrans_ = nullptr; - EXPECT_EQ(ERR_DH_AUDIO_SA_SPEAKER_TRANS_NULL, spk_->Start()); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, spk_->Start()); spk_->speakerTrans_ = std::make_shared(DEV_ID); EXPECT_NE(DH_SUCCESS, spk_->Start()); @@ -215,7 +215,7 @@ HWTEST_F(DSpeakerDevTest, Start_003, TestSize.Level1) { spk_->speakerTrans_ = std::make_shared(); EXPECT_EQ(DH_SUCCESS, spk_->SetUp()); - EXPECT_EQ(ERR_DH_AUDIO_SA_SPEAKER_CHANNEL_WAIT_TIMEOUT, spk_->Start()); + EXPECT_EQ(ERR_DH_AUDIO_SA_WAIT_TIMEOUT, spk_->Start()); spk_->isTransReady_.store(true); EXPECT_EQ(DH_SUCCESS, spk_->Start()); @@ -264,7 +264,7 @@ HWTEST_F(DSpeakerDevTest, Stop_002, TestSize.Level1) HWTEST_F(DSpeakerDevTest, Pause_001, TestSize.Level1) { spk_->speakerTrans_ = nullptr; - EXPECT_EQ(ERR_DH_AUDIO_SA_SPEAKER_TRANS_NULL, spk_->Pause()); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, spk_->Pause()); spk_->speakerTrans_ = std::make_shared(DEV_ID); EXPECT_NE(DH_SUCCESS, spk_->Pause()); @@ -282,7 +282,7 @@ HWTEST_F(DSpeakerDevTest, Pause_001, TestSize.Level1) HWTEST_F(DSpeakerDevTest, Restart_001, TestSize.Level1) { spk_->speakerTrans_ = nullptr; - EXPECT_EQ(ERR_DH_AUDIO_SA_SPEAKER_TRANS_NULL, spk_->Restart()); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, spk_->Restart()); const AudioParamHDF param = { .sampleRate = SAMPLE_RATE_8000, @@ -329,7 +329,7 @@ HWTEST_F(DSpeakerDevTest, WriteStreamData_001, TestSize.Level1) { const size_t capacity = 1; auto writeData = std::make_shared(capacity); - EXPECT_EQ(ERR_DH_AUDIO_SA_SPEAKER_TRANS_NULL, spk_->WriteStreamData(DEV_ID, DH_ID, writeData)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, spk_->WriteStreamData(DEV_ID, DH_ID, writeData)); std::shared_ptr readData = nullptr; EXPECT_EQ(DH_SUCCESS, spk_->ReadStreamData(DEV_ID, DH_ID, readData)); @@ -349,7 +349,7 @@ HWTEST_F(DSpeakerDevTest, WriteStreamData_002, TestSize.Level1) const size_t capacity = 1; auto writeData = std::make_shared(capacity); spk_->speakerTrans_ = std::make_shared(DEV_ID); - EXPECT_EQ(ERR_DH_AUDIO_TRANS_NULL_VALUE, spk_->WriteStreamData(DEV_ID, DH_ID, writeData)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, spk_->WriteStreamData(DEV_ID, DH_ID, writeData)); spk_->speakerTrans_ = std::make_shared(); EXPECT_EQ(DH_SUCCESS, spk_->WriteStreamData(DEV_ID, DH_ID, writeData)); @@ -390,7 +390,7 @@ HWTEST_F(DSpeakerDevTest, OnStateChange_001, TestSize.Level1) EXPECT_EQ(DH_SUCCESS, spk_->OnStateChange(event)); eventCb_ = nullptr; - EXPECT_EQ(ERR_DH_AUDIO_SA_EVENT_CALLBACK_NULL, spk_->OnStateChange(event)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, spk_->OnStateChange(event)); } /** diff --git a/services/audiomanager/test/unittest/sourcemanager/src/daudio_source_mgr_test.cpp b/services/audiomanager/test/unittest/sourcemanager/src/daudio_source_mgr_test.cpp index 6bc3da9c4be1f4818236e2681eea315f97e9ad44..9c2ea1389e0696689bb88c2124a1e74b0c841801 100644 --- a/services/audiomanager/test/unittest/sourcemanager/src/daudio_source_mgr_test.cpp +++ b/services/audiomanager/test/unittest/sourcemanager/src/daudio_source_mgr_test.cpp @@ -202,7 +202,7 @@ HWTEST_F(DAudioSourceMgrTest, HandleDAudioNotify_001, TestSize.Level1) */ HWTEST_F(DAudioSourceMgrTest, DAudioNotify_001, TestSize.Level1) { - EXPECT_EQ(ERR_DH_AUDIO_SA_GET_REMOTE_SINK_FAILED, + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceMgr.DAudioNotify(DEV_ID, DH_ID_SPK, OPEN_SPEAKER, "openspk")); } @@ -253,7 +253,8 @@ HWTEST_F(DAudioSourceMgrTest, OnDisableDAudio_001, TestSize.Level1) std::string reqId = GetRandomID(); EXPECT_EQ(DH_SUCCESS, sourceMgr.CreateAudioDevice(DEV_ID)); sourceMgr.audioDevMap_[DEV_ID].ports[DH_ID_SPK] = reqId; - EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceMgr.OnDisableDAudio(DEV_ID, DH_ID_SPK, ERR_DH_AUDIO_REPEAT_OPREATOR)); + int32_t ret = -40003; + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceMgr.OnDisableDAudio(DEV_ID, DH_ID_SPK, ret)); EXPECT_EQ(DH_SUCCESS, sourceMgr.UnInit()); } @@ -269,7 +270,8 @@ HWTEST_F(DAudioSourceMgrTest, OnDisableDAudio_003, TestSize.Level1) EXPECT_EQ(DH_SUCCESS, sourceMgr.CreateAudioDevice(DEV_ID)); sourceMgr.audioDevMap_[DEV_ID].ports[DH_ID_SPK] = reqId; sourceMgr.ipcCallback_ = ipcCallbackProxy_; - EXPECT_EQ(DH_SUCCESS, sourceMgr.OnDisableDAudio(DEV_ID, DH_ID_SPK, ERR_DH_AUDIO_REPEAT_OPREATOR)); + int32_t ret = -40003; + EXPECT_EQ(DH_SUCCESS, sourceMgr.OnDisableDAudio(DEV_ID, DH_ID_SPK, ret)); EXPECT_EQ(DH_SUCCESS, sourceMgr.UnInit()); } diff --git a/services/audiotransport/audiochannel/audioctrlchannel/src/audio_ctrl_channel.cpp b/services/audiotransport/audiochannel/audioctrlchannel/src/audio_ctrl_channel.cpp index 501576c6d93f6268b425a53a5dc68d28514c11e4..d80eb25ab6726a676fb5061e681d11a1e67760ac 100644 --- a/services/audiotransport/audiochannel/audioctrlchannel/src/audio_ctrl_channel.cpp +++ b/services/audiotransport/audiochannel/audioctrlchannel/src/audio_ctrl_channel.cpp @@ -31,9 +31,9 @@ int32_t AudioCtrlChannel::CreateSession(const std::shared_ptr(calloc((MSG_MAX_SIZE), sizeof(uint8_t))); - if (buf == nullptr) { - DHLOGE("Malloc memory failed."); - return ERR_DH_AUDIO_CTRL_CHANNEL_SEND_MSG_FAIL; - } - int32_t outLen = 0; - if (memcpy_s(buf, MSG_MAX_SIZE, reinterpret_cast(message.c_str()), message.size()) != EOK) { - DHLOGE("Copy audio event failed."); - free(buf); - return ERR_DH_AUDIO_CTRL_CHANNEL_SEND_MSG_FAIL; - } - outLen = static_cast(message.size()); - int32_t ret = SoftbusAdapter::GetInstance().SendSoftbusBytes(sessionId_, buf, outLen); - free(buf); - return ret; + return DH_SUCCESS; } void AudioCtrlChannel::OnSessionOpened(int32_t sessionId, int32_t result) @@ -257,7 +243,7 @@ int from_audioEventJson(const json &j, AudioEvent &audioEvent) { if (!JsonParamCheck(j, {KEY_TYPE, KEY_EVENT_CONTENT})) { DHLOGE("Json data is illegal."); - return ERR_DH_AUDIO_TRANS_NULL_VALUE; + return ERR_DH_AUDIO_NULLPTR; } j.at(KEY_TYPE).get_to(audioEvent.type); diff --git a/services/audiotransport/audiochannel/audiodatachannel/src/audio_data_channel.cpp b/services/audiotransport/audiochannel/audiodatachannel/src/audio_data_channel.cpp index 71c3b114e25d2852a9719aff5f987f62b5de2f2c..0d524d4bd52eed5840578176e9b8802e8624bb5d 100644 --- a/services/audiotransport/audiochannel/audiodatachannel/src/audio_data_channel.cpp +++ b/services/audiotransport/audiochannel/audiodatachannel/src/audio_data_channel.cpp @@ -30,7 +30,7 @@ int32_t AudioDataChannel::CreateSession(const std::shared_ptrOpenSession(); @@ -100,7 +100,7 @@ int32_t AudioCtrlTransport::SendAudioEvent(const AudioEvent &event) DHLOGI("Send audio event."); if (audioChannel_ == nullptr) { DHLOGE("Channel is null."); - return ERR_DH_AUDIO_TRANS_NULL_VALUE; + return ERR_DH_AUDIO_NULLPTR; } int32_t ret = audioChannel_->SendEvent(event); @@ -170,7 +170,7 @@ int32_t AudioCtrlTransport::RegisterChannelListener() DHLOGI("Register channel listener."); if (audioChannel_ == nullptr) { DHLOGE("Channel is null."); - return ERR_DH_AUDIO_TRANS_NULL_VALUE; + return ERR_DH_AUDIO_NULLPTR; } int32_t ret = audioChannel_->CreateSession(shared_from_this(), CTRL_SESSION_NAME); diff --git a/services/audiotransport/encodetransport/src/audio_encode_transport.cpp b/services/audiotransport/encodetransport/src/audio_encode_transport.cpp index f8eeb4328d1bce046f321cae870a7070208ad2a2..763b266eb664e203dbe9cab2eb9c9e624d1ecfaf 100644 --- a/services/audiotransport/encodetransport/src/audio_encode_transport.cpp +++ b/services/audiotransport/encodetransport/src/audio_encode_transport.cpp @@ -136,7 +136,7 @@ int32_t AudioEncodeTransport::FeedAudioData(std::shared_ptr &audioDat DHLOGI("Feed audio data."); if (!processor_) { DHLOGE("Processor is null, setup first."); - return ERR_DH_AUDIO_TRANS_NULL_VALUE; + return ERR_DH_AUDIO_NULLPTR; } int32_t ret = processor_->FeedAudioProcessor(audioData); diff --git a/services/audiotransport/receiverengine/src/av_receiver_engine_adapter.cpp b/services/audiotransport/receiverengine/src/av_receiver_engine_adapter.cpp index 035b3cf66fd29f9935d1b6591c8f75afc3bf120d..164c04d984a62b9f7bdf107b55ee66aaf0bd12e3 100644 --- a/services/audiotransport/receiverengine/src/av_receiver_engine_adapter.cpp +++ b/services/audiotransport/receiverengine/src/av_receiver_engine_adapter.cpp @@ -35,11 +35,11 @@ int32_t AVTransReceiverAdapter::Initialize(IAVEngineProvider *providerPtr, const return DH_SUCCESS; } if (providerPtr == nullptr) { - return ERR_DH_AV_TRANS_NULL_VALUE; + return ERR_DH_AUDIO_NULLPTR; } receiverEngine_ = providerPtr->CreateAVReceiverEngine(peerDevId); if (receiverEngine_ == nullptr) { - return ERR_DH_AV_TRANS_NULL_VALUE; + return ERR_DH_AUDIO_NULLPTR; } receiverEngine_->RegisterReceiverCallback(shared_from_this()); initialized_ = true; @@ -65,7 +65,7 @@ int32_t AVTransReceiverAdapter::Start() DHLOGI("Start enter"); if (receiverEngine_ == nullptr) { DHLOGE("Av transport receiver engine is null."); - return ERR_DH_AV_TRANS_NULL_VALUE; + return ERR_DH_AUDIO_NULLPTR; } return receiverEngine_->Start(); } @@ -74,14 +74,10 @@ int32_t AVTransReceiverAdapter::Stop() { DHLOGI("Stop!"); if (receiverEngine_ == nullptr) { - return ERR_DH_AV_TRANS_NULL_VALUE; - } - int32_t ret = receiverEngine_->Stop(); - if (ret != DH_SUCCESS) { - return ERR_DH_AV_TRANS_STOP_FAILED; + DHLOGE("Av transport receiver engine is null."); + return ERR_DH_AUDIO_NULLPTR; } - DHLOGI("Stop success!"); - return DH_SUCCESS; + return receiverEngine_->Stop(); } int32_t AVTransReceiverAdapter::SetParameter(const AVTransTag &tag, const std::string ¶m) @@ -89,14 +85,13 @@ int32_t AVTransReceiverAdapter::SetParameter(const AVTransTag &tag, const std::s DHLOGI("SetParameter!"); if (receiverEngine_ == nullptr) { DHLOGE("av transport receiver engine is null"); - return ERR_DH_AV_TRANS_NULL_VALUE; + 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 ERR_DH_AV_TRANS_SETUP_FAILED; } - return DH_SUCCESS; + return ret; } int32_t AVTransReceiverAdapter::CreateControlChannel(const std::string &peerDevId) @@ -109,7 +104,7 @@ int32_t AVTransReceiverAdapter::CreateControlChannel(const std::string &peerDevI if (receiverEngine_ == nullptr) { DHLOGE("Av transport receiver engine is null"); - return ERR_DH_AV_TRANS_NULL_VALUE; + return ERR_DH_AUDIO_NULLPTR; } std::vector dstDevIds = {peerDevId}; int32_t ret = receiverEngine_->CreateControlChannel(dstDevIds, @@ -130,12 +125,12 @@ int32_t AVTransReceiverAdapter::SendMessageToRemote(const std::shared_ptrSendMessage(message); if (ret != DH_SUCCESS) { DHLOGE("Send meassage to remote sender engine failed, ret: %d.", ret); - return ERR_DH_AV_TRANS_SEND_MSG_FAILED; + return ret; } return DH_SUCCESS; } @@ -143,7 +138,7 @@ int32_t AVTransReceiverAdapter::SendMessageToRemote(const std::shared_ptr &callback) { if (callback == nullptr) { - return ERR_DH_AUDIO_TRANS_NULL_VALUE; + return ERR_DH_AUDIO_NULLPTR; } adapterCallback_ = callback; return DH_SUCCESS; @@ -155,7 +150,7 @@ int32_t AVTransReceiverAdapter::WaitForChannelCreated() 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"); - return ERR_DH_AV_TRANS_TIMEOUT; + return ERR_DH_AUDIO_SA_WAIT_TIMEOUT; } if (!chnCreateSuccess_.load()) { DHLOGE("Create av transport receiver channel failed"); diff --git a/services/audiotransport/receiverengine/src/av_receiver_engine_transport.cpp b/services/audiotransport/receiverengine/src/av_receiver_engine_transport.cpp index 7dadaa254d60f9376f7ef7ff398496f112fbc016..3c5128038c8cc74b5876cad640a73339dc0a7d7a 100644 --- a/services/audiotransport/receiverengine/src/av_receiver_engine_transport.cpp +++ b/services/audiotransport/receiverengine/src/av_receiver_engine_transport.cpp @@ -35,7 +35,7 @@ int32_t AVTransReceiverTransport::InitEngine(IAVEngineProvider *providerPtr) int32_t ret = receiverAdapter_->Initialize(providerPtr, devId_); if (ret != DH_SUCCESS) { DHLOGE("initialize av receiver adapter failed."); - return ERR_DH_AUDIO_TRANS_NULL_VALUE; + return ret; } ret = receiverAdapter_->RegisterAdapterCallback(shared_from_this()); if (ret != DH_SUCCESS) { @@ -58,14 +58,13 @@ int32_t AVTransReceiverTransport::CreateCtrl() DHLOGI("Create ctrl enter."); if (receiverAdapter_ == nullptr) { DHLOGE("av transport receiver adapter is null"); - return ERR_DH_AUDIO_TRANS_NULL_VALUE; + return ERR_DH_AUDIO_NULLPTR; } int32_t ret = receiverAdapter_->CreateControlChannel(devId_); if (ret != DH_SUCCESS) { DHLOGE("create av receiver control channel failed."); - return ERR_DH_AUDIO_TRANS_NULL_VALUE; } - return DH_SUCCESS; + return ret; } int32_t AVTransReceiverTransport::Start() @@ -73,14 +72,13 @@ int32_t AVTransReceiverTransport::Start() DHLOGI("StartReceiverEngine enter."); if (receiverAdapter_ == nullptr) { DHLOGE("av transport receiver adapter is null"); - return ERR_DH_AUDIO_TRANS_NULL_VALUE; + return ERR_DH_AUDIO_NULLPTR; } int32_t ret = receiverAdapter_->Start(); if (ret != DH_SUCCESS) { DHLOGE("start av receiver engine failed"); - return ERR_DH_AUDIO_TRANS_NULL_VALUE; } - return DH_SUCCESS; + return ret; } int32_t AVTransReceiverTransport::Stop() @@ -88,14 +86,13 @@ int32_t AVTransReceiverTransport::Stop() DHLOGI("StopReceiverEngine enter."); if (receiverAdapter_ == nullptr) { DHLOGE("StopReceiverEngine adapter is null"); - return ERR_DH_AUDIO_TRANS_NULL_VALUE; + return ERR_DH_AUDIO_NULLPTR; } int32_t ret = receiverAdapter_->Stop(); if (ret != DH_SUCCESS) { DHLOGE("StopReceiveEngine error."); - return ERR_DH_AUDIO_TRANS_NULL_VALUE; } - return DH_SUCCESS; + return ret; } int32_t AVTransReceiverTransport::Release() @@ -103,14 +100,13 @@ int32_t AVTransReceiverTransport::Release() DHLOGI("ReleaseReceiverEngine enter."); if (receiverAdapter_ == nullptr) { DHLOGE("ReleaseReceiverEngine adapter is null"); - return ERR_DH_AUDIO_TRANS_NULL_VALUE; + return ERR_DH_AUDIO_NULLPTR; } int32_t ret = receiverAdapter_->Release(); if (ret != DH_SUCCESS) { DHLOGE("ReleaseReceiverEngine error."); - return ERR_DH_AUDIO_TRANS_NULL_VALUE; } - return DH_SUCCESS; + return ret; } int32_t AVTransReceiverTransport::Pause() @@ -147,15 +143,14 @@ int32_t AVTransReceiverTransport::SendMessage(uint32_t type, std::string content 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_TRANS_NULL_VALUE; + return 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 DH_SUCCESS; + return ret; } void AVTransReceiverTransport::OnEngineEvent(const AVTransEvent &event) diff --git a/services/audiotransport/senderengine/src/av_sender_engine_adapter.cpp b/services/audiotransport/senderengine/src/av_sender_engine_adapter.cpp index 514db33f96e39e3141d53eb92d5f8523a2728bb6..57ddbbe153becf3fb2ea638bb7b59e5595ae19fc 100644 --- a/services/audiotransport/senderengine/src/av_sender_engine_adapter.cpp +++ b/services/audiotransport/senderengine/src/av_sender_engine_adapter.cpp @@ -38,12 +38,12 @@ int32_t AVTransSenderAdapter::Initialize(IAVEngineProvider *providerPtr, const s } if (providerPtr == nullptr) { DHLOGE("Av Transport sender engine provider ptr is null"); - return ERR_DH_AV_TRANS_NULL_VALUE; + return ERR_DH_AUDIO_NULLPTR; } senderEngine_ = providerPtr->CreateAVSenderEngine(peerDevId); if (senderEngine_ == nullptr) { DHLOGE("Create av transport sender engine is null"); - return ERR_DH_AV_TRANS_NULL_VALUE; + return ERR_DH_AUDIO_NULLPTR; } senderEngine_->RegisterSenderCallback(shared_from_this()); initialized_ = true; @@ -70,7 +70,7 @@ int32_t AVTransSenderAdapter::Start() DHLOGI("Start!"); if (senderEngine_ == nullptr) { DHLOGE("Av transport sender engine is null"); - return ERR_DH_AV_TRANS_NULL_VALUE; + return ERR_DH_AUDIO_NULLPTR; } return senderEngine_->Start(); } @@ -80,15 +80,9 @@ int32_t AVTransSenderAdapter::Stop() DHLOGI("Stop"); if (senderEngine_ == nullptr) { DHLOGE("Av transport sender engine is null"); - return ERR_DH_AV_TRANS_NULL_VALUE; + return ERR_DH_AUDIO_NULLPTR; } - int32_t ret = senderEngine_->Stop(); - if (ret != DH_SUCCESS) { - DHLOGE("Stop av transport sender engine failed"); - return ERR_DH_AV_TRANS_STOP_FAILED; - } - DHLOGI("Stop Success"); - return DH_SUCCESS; + return senderEngine_->Stop(); } int32_t AVTransSenderAdapter::CreateControlChannel(const std::string &peerDevId) @@ -101,7 +95,7 @@ int32_t AVTransSenderAdapter::CreateControlChannel(const std::string &peerDevId) if (senderEngine_ == nullptr) { DHLOGE("Av transport sender engine is null"); - return ERR_DH_AV_TRANS_NULL_VALUE; + return ERR_DH_AUDIO_NULLPTR; } std::vector dstDevIds = {peerDevId}; int32_t ret = senderEngine_->CreateControlChannel(dstDevIds, @@ -123,21 +117,20 @@ int32_t AVTransSenderAdapter::SetParameter(const AVTransTag &tag, const std::str DHLOGI("SetParameter!"); if (senderEngine_ == nullptr) { DHLOGE("av transport sender engine is null"); - return ERR_DH_AV_TRANS_NULL_VALUE; + 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 ERR_DH_AV_TRANS_SETUP_FAILED; } - return DH_SUCCESS; + return ret; } int32_t AVTransSenderAdapter::PushData(std::shared_ptr &audioData) { if (senderEngine_ == nullptr) { DHLOGE("Av transport sender engine null"); - return ERR_DH_AV_TRANS_NULL_VALUE; + return ERR_DH_AUDIO_NULLPTR; } auto transBuffer = std::make_shared(MetaType::AUDIO); auto bufferData = transBuffer->CreateBufferData(audioData->Size()); @@ -146,7 +139,7 @@ int32_t AVTransSenderAdapter::PushData(std::shared_ptr &audioData) int32_t ret = senderEngine_->PushData(transBuffer); if (ret != DH_SUCCESS) { DHLOGE("Push data to av transport sender failed"); - return ERR_DH_AV_TRANS_FEED_DATA_FAILED; + return ret; } DHLOGI("Push data to av sender success. data size: %d.", audioData->Size()); return DH_SUCCESS; @@ -157,12 +150,12 @@ int32_t AVTransSenderAdapter::SendMessageToRemote(const std::shared_ptrSendMessage(message); if (ret != DH_SUCCESS) { DHLOGE("Send Message to remote receiver engine failed, ret: %d", ret); - return ERR_DH_AV_TRANS_SEND_MSG_FAILED; + return ret; } return DH_SUCCESS; } @@ -171,7 +164,7 @@ int32_t AVTransSenderAdapter::RegisterAdapterCallback(const std::shared_ptrInitialize(providerPtr, devId_); if (ret != DH_SUCCESS) { DHLOGE("initialize av sender adapter failed."); - return ERR_DH_AUDIO_TRANS_NULL_VALUE; + return ret; } DHLOGI("Init SenderEngine success"); ret = senderAdapter_->RegisterAdapterCallback(shared_from_this()); @@ -58,14 +58,13 @@ int32_t AVTransSenderTransport::Start() DHLOGI("StartSenderEngine enter."); if (senderAdapter_ == nullptr) { DHLOGE("av transport sender adapter is null"); - return ERR_DH_AUDIO_TRANS_NULL_VALUE; + return ERR_DH_AUDIO_NULLPTR; } int32_t ret = senderAdapter_->Start(); if (ret != DH_SUCCESS) { DHLOGE("start av sender engine failed"); - return ERR_DH_AUDIO_TRANS_NULL_VALUE; } - return DH_SUCCESS; + return ret; } int32_t AVTransSenderTransport::CreateCtrl() @@ -73,14 +72,13 @@ int32_t AVTransSenderTransport::CreateCtrl() DHLOGI("Create ctrl enter."); if (senderAdapter_ == nullptr) { DHLOGE("av transport sender adapter is null"); - return ERR_DH_AUDIO_TRANS_NULL_VALUE; + return ERR_DH_AUDIO_NULLPTR; } int32_t ret = senderAdapter_->CreateControlChannel(devId_); if (ret != DH_SUCCESS) { DHLOGE("create av sender control channel failed."); - return ERR_DH_AUDIO_TRANS_NULL_VALUE; } - return DH_SUCCESS; + return ret; } int32_t AVTransSenderTransport::Stop() @@ -88,14 +86,13 @@ int32_t AVTransSenderTransport::Stop() DHLOGI("StopSenderEngine enter."); if (senderAdapter_ == nullptr) { DHLOGE("av transport sender adapter is null"); - return ERR_DH_AUDIO_TRANS_NULL_VALUE; + return ERR_DH_AUDIO_NULLPTR; } int32_t ret = senderAdapter_->Stop(); if (ret != DH_SUCCESS) { DHLOGE("av transport sender adapter is null"); - return ERR_DH_AUDIO_TRANS_NULL_VALUE; } - return DH_SUCCESS; + return ret; } int32_t AVTransSenderTransport::Pause() @@ -125,28 +122,26 @@ int32_t AVTransSenderTransport::Release() DHLOGI("RelaseSenderEngine enter."); if (senderAdapter_ == nullptr) { DHLOGE("ReleaseSenderEngine sender adapter is null."); - return ERR_DH_AUDIO_TRANS_NULL_VALUE; + return ERR_DH_AUDIO_NULLPTR; } int32_t ret = senderAdapter_->Release(); if (ret != DH_SUCCESS) { DHLOGE("Release av sender engine failed."); - return ERR_DH_AUDIO_TRANS_NULL_VALUE; } - return DH_SUCCESS; + return ret; } int32_t AVTransSenderTransport::FeedAudioData(std::shared_ptr &audioData) { if (senderAdapter_ == nullptr) { DHLOGE("FeedAudioData sender adapter is null."); - return ERR_DH_AUDIO_TRANS_NULL_VALUE; + return ERR_DH_AUDIO_NULLPTR; } int32_t ret = senderAdapter_->PushData(audioData); if (ret != DH_SUCCESS) { DHLOGE("push data failed."); - return ERR_DH_AUDIO_TRANS_NULL_VALUE; } - return DH_SUCCESS; + return ret; } int32_t AVTransSenderTransport::SendMessage(uint32_t type, std::string content, std::string dstDevId) @@ -154,15 +149,14 @@ int32_t AVTransSenderTransport::SendMessage(uint32_t type, std::string content, 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_TRANS_NULL_VALUE; + return 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 DH_SUCCESS; + return ret; } void AVTransSenderTransport::OnEngineEvent(const AVTransEvent &event) diff --git a/services/audiotransport/test/unittest/audioctrlchannel/src/audio_ctrl_channel_test.cpp b/services/audiotransport/test/unittest/audioctrlchannel/src/audio_ctrl_channel_test.cpp index 5d6f27ae314a1e3e102815991baaa702f6e802fd..e3921eaadd4d32fd548f63b3f8d151e827068194 100644 --- a/services/audiotransport/test/unittest/audioctrlchannel/src/audio_ctrl_channel_test.cpp +++ b/services/audiotransport/test/unittest/audioctrlchannel/src/audio_ctrl_channel_test.cpp @@ -163,7 +163,7 @@ HWTEST_F(AudioCtrlChannelTest, SendMsg_001, TestSize.Level1) ctrlChannel_->OnStreamReceived(sessionId, datas, ext, streamFrameInfo); string message = "sendMsg"; - EXPECT_NE(ERR_DH_AUDIO_CTRL_CHANNEL_SEND_MSG_FAIL, ctrlChannel_->SendMsg(message)); + EXPECT_EQ(DH_SUCCESS, ctrlChannel_->SendMsg(message)); } /** diff --git a/services/audiotransport/test/unittest/audioctrltransport/src/audio_ctrl_transport_test.cpp b/services/audiotransport/test/unittest/audioctrltransport/src/audio_ctrl_transport_test.cpp index db02da256061c56b73bea9997cc76d33a6335f71..10cbf7157da713496e316117481444aff1114d36 100644 --- a/services/audiotransport/test/unittest/audioctrltransport/src/audio_ctrl_transport_test.cpp +++ b/services/audiotransport/test/unittest/audioctrltransport/src/audio_ctrl_transport_test.cpp @@ -89,7 +89,7 @@ HWTEST_F(AudioCtrlTransportTest, Release_002, TestSize.Level1) HWTEST_F(AudioCtrlTransportTest, Start_001, TestSize.Level1) { trans->OnSessionOpened(); - EXPECT_EQ(ERR_DH_AUDIO_TRANS_NULL_VALUE, trans->Start()); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, trans->Start()); } /** @@ -155,7 +155,7 @@ HWTEST_F(AudioCtrlTransportTest, SendAudioEvent_001, TestSize.Level1) HWTEST_F(AudioCtrlTransportTest, SendAudioEvent_002, TestSize.Level1) { AudioEvent event ; - EXPECT_EQ(ERR_DH_AUDIO_TRANS_NULL_VALUE, trans->SendAudioEvent(event)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, trans->SendAudioEvent(event)); } /** @@ -167,7 +167,7 @@ HWTEST_F(AudioCtrlTransportTest, SendAudioEvent_002, TestSize.Level1) HWTEST_F(AudioCtrlTransportTest, RegisterChannelListener_001, TestSize.Level1) { std::shared_ptr listener = nullptr; - EXPECT_EQ(ERR_DH_AUDIO_TRANS_NULL_VALUE, trans->RegisterChannelListener()); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, trans->RegisterChannelListener()); } /** diff --git a/services/audiotransport/test/unittest/audiodatachannel/src/audio_data_channel_test.cpp b/services/audiotransport/test/unittest/audiodatachannel/src/audio_data_channel_test.cpp index ee04f28db3677eac47e9a4af33f917d8ef89078e..582dafd6215c04ed14de72c6c9f44b6d7153d415 100644 --- a/services/audiotransport/test/unittest/audiodatachannel/src/audio_data_channel_test.cpp +++ b/services/audiotransport/test/unittest/audiodatachannel/src/audio_data_channel_test.cpp @@ -102,7 +102,7 @@ HWTEST_F(AudioDataChannelTest, SendData_001, TestSize.Level1) dataChannel_->OnSessionOpened(sessionId, result); std::shared_ptr data = nullptr; - EXPECT_EQ(ERR_DH_AUDIO_TRANS_NULL_VALUE, dataChannel_->SendData(data)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, dataChannel_->SendData(data)); } /** diff --git a/services/audiotransport/test/unittest/encodetransport/src/encode_transport_test.cpp b/services/audiotransport/test/unittest/encodetransport/src/encode_transport_test.cpp index 60383ba91a8a8c754bf37cf8b7c4af41fbb88f75..aef7fc8476a3600947a35797284eabde4fae2b50 100644 --- a/services/audiotransport/test/unittest/encodetransport/src/encode_transport_test.cpp +++ b/services/audiotransport/test/unittest/encodetransport/src/encode_transport_test.cpp @@ -194,7 +194,7 @@ HWTEST_F(EncodeTransportTest, encode_transport_test_004, TestSize.Level1) encodeTrans_->OnStateNotify(event); encodeTrans_->OnAudioDataDone(audioData); - EXPECT_EQ(ERR_DH_AUDIO_TRANS_NULL_VALUE, encodeTrans_->FeedAudioData(audioData)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, encodeTrans_->FeedAudioData(audioData)); } /** diff --git a/services/audiotransport/test/unittest/receiverengine/src/av_receiver_engine_adapter_test.cpp b/services/audiotransport/test/unittest/receiverengine/src/av_receiver_engine_adapter_test.cpp index c4593522359a2ecded636236c860c7bc6bfaab2f..a174dc0298f1099eaf9a2e0fb1f29f5f35c22e5e 100644 --- a/services/audiotransport/test/unittest/receiverengine/src/av_receiver_engine_adapter_test.cpp +++ b/services/audiotransport/test/unittest/receiverengine/src/av_receiver_engine_adapter_test.cpp @@ -48,7 +48,7 @@ HWTEST_F(AVReceiverEngineAdapterTest, Initialize_001, TestSize.Level1) { IAVEngineProvider *providerPtr = nullptr; std::string peerDevId = "peerDevId"; - EXPECT_EQ(ERR_DH_AV_TRANS_NULL_VALUE, receiverAdapter_->Initialize(providerPtr, peerDevId)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, receiverAdapter_->Initialize(providerPtr, peerDevId)); receiverAdapter_->initialized_ = true; EXPECT_EQ(DH_SUCCESS, receiverAdapter_->Initialize(providerPtr, peerDevId)); } @@ -76,8 +76,8 @@ HWTEST_F(AVReceiverEngineAdapterTest, Initialize_002, TestSize.Level1) */ HWTEST_F(AVReceiverEngineAdapterTest, Start_001, TestSize.Level1) { - EXPECT_EQ(ERR_DH_AV_TRANS_NULL_VALUE, receiverAdapter_->Start()); - EXPECT_EQ(ERR_DH_AV_TRANS_NULL_VALUE, receiverAdapter_->Stop()); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, receiverAdapter_->Start()); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, receiverAdapter_->Stop()); } /** @@ -89,7 +89,7 @@ HWTEST_F(AVReceiverEngineAdapterTest, Start_001, TestSize.Level1) HWTEST_F(AVReceiverEngineAdapterTest, SetParameter_001, TestSize.Level1) { std::string param = "param"; - EXPECT_EQ(ERR_DH_AV_TRANS_NULL_VALUE, receiverAdapter_->SetParameter(AVTransTag::AUDIO_SAMPLE_RATE, param)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, receiverAdapter_->SetParameter(AVTransTag::AUDIO_SAMPLE_RATE, param)); } /** @@ -114,7 +114,7 @@ HWTEST_F(AVReceiverEngineAdapterTest, SetParameter_002, TestSize.Level1) HWTEST_F(AVReceiverEngineAdapterTest, CreateControlChannel_001, TestSize.Level1) { std::string peerDevId = "peerDevId"; - EXPECT_EQ(ERR_DH_AV_TRANS_NULL_VALUE, receiverAdapter_->CreateControlChannel(peerDevId)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, receiverAdapter_->CreateControlChannel(peerDevId)); receiverAdapter_->chnCreateSuccess_ = true; EXPECT_EQ(DH_SUCCESS, receiverAdapter_->CreateControlChannel(peerDevId)); } @@ -128,7 +128,7 @@ HWTEST_F(AVReceiverEngineAdapterTest, CreateControlChannel_001, TestSize.Level1) HWTEST_F(AVReceiverEngineAdapterTest, CreateControlChannel_002, TestSize.Level1) { std::string peerDevId = "peerDevId"; - EXPECT_EQ(ERR_DH_AV_TRANS_NULL_VALUE, receiverAdapter_->CreateControlChannel(peerDevId)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, receiverAdapter_->CreateControlChannel(peerDevId)); receiverAdapter_->receiverEngine_ = std::make_shared(); EXPECT_EQ(ERR_DH_AV_TRANS_CREATE_CHANNEL_FAILED, receiverAdapter_->CreateControlChannel(peerDevId)); } @@ -145,7 +145,7 @@ HWTEST_F(AVReceiverEngineAdapterTest, SendMessageToRemote_001, TestSize.Level1) std::string content = "content"; std::string dstDevId = "dstDevId"; auto message = std::make_shared(type, content, dstDevId); - EXPECT_EQ(ERR_DH_AV_TRANS_NULL_VALUE, receiverAdapter_->SendMessageToRemote(message)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, receiverAdapter_->SendMessageToRemote(message)); receiverAdapter_->receiverEngine_ = std::make_shared(); EXPECT_EQ(DH_SUCCESS, receiverAdapter_->SendMessageToRemote(message)); } @@ -159,7 +159,7 @@ HWTEST_F(AVReceiverEngineAdapterTest, SendMessageToRemote_001, TestSize.Level1) HWTEST_F(AVReceiverEngineAdapterTest, RegisterAdapterCallback_001, TestSize.Level1) { std::shared_ptr callback = nullptr; - EXPECT_EQ(ERR_DH_AUDIO_TRANS_NULL_VALUE, receiverAdapter_->RegisterAdapterCallback(callback)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, receiverAdapter_->RegisterAdapterCallback(callback)); callback = std::make_shared(); EXPECT_EQ(DH_SUCCESS, receiverAdapter_->RegisterAdapterCallback(callback)); } diff --git a/services/audiotransport/test/unittest/receiverengine/src/av_receiver_engine_transport_test.cpp b/services/audiotransport/test/unittest/receiverengine/src/av_receiver_engine_transport_test.cpp index 0bd6f1611229e3ee74815ecd744dd3b8038a2d89..e6872444b2dd02eea95c3bcbe7c9a31597330222 100644 --- a/services/audiotransport/test/unittest/receiverengine/src/av_receiver_engine_transport_test.cpp +++ b/services/audiotransport/test/unittest/receiverengine/src/av_receiver_engine_transport_test.cpp @@ -65,7 +65,7 @@ HWTEST_F(AVReceiverEngineTransportTest, SetUp_001, TestSize.Level1) HWTEST_F(AVReceiverEngineTransportTest, InitEngine_001, TestSize.Level1) { IAVEngineProvider *providerPtr = nullptr; - EXPECT_EQ(ERR_DH_AUDIO_TRANS_NULL_VALUE, receiverTrans_->InitEngine(providerPtr)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, receiverTrans_->InitEngine(providerPtr)); EXPECT_EQ(DH_SUCCESS, receiverTrans_->Release()); } @@ -77,7 +77,7 @@ HWTEST_F(AVReceiverEngineTransportTest, InitEngine_001, TestSize.Level1) */ HWTEST_F(AVReceiverEngineTransportTest, CreateCtrl_001, TestSize.Level1) { - EXPECT_EQ(ERR_DH_AUDIO_TRANS_NULL_VALUE, receiverTrans_->CreateCtrl()); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, receiverTrans_->CreateCtrl()); receiverTrans_->receiverAdapter_ = std::make_shared(); receiverTrans_->receiverAdapter_->chnCreateSuccess_ = true; EXPECT_EQ(DH_SUCCESS, receiverTrans_->CreateCtrl()); @@ -91,9 +91,9 @@ HWTEST_F(AVReceiverEngineTransportTest, CreateCtrl_001, TestSize.Level1) */ HWTEST_F(AVReceiverEngineTransportTest, Start_001, TestSize.Level1) { - EXPECT_EQ(ERR_DH_AUDIO_TRANS_NULL_VALUE, receiverTrans_->Start()); - EXPECT_EQ(ERR_DH_AUDIO_TRANS_NULL_VALUE, receiverTrans_->Stop()); - EXPECT_EQ(ERR_DH_AUDIO_TRANS_NULL_VALUE, receiverTrans_->Release()); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, receiverTrans_->Start()); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, receiverTrans_->Stop()); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, receiverTrans_->Release()); receiverTrans_->receiverAdapter_ = std::make_shared(); receiverTrans_->receiverAdapter_->receiverEngine_ = std::make_shared(); EXPECT_EQ(DH_SUCCESS, receiverTrans_->Start()); @@ -147,7 +147,7 @@ HWTEST_F(AVReceiverEngineTransportTest, SendMessage_001, TestSize.Level1) uint32_t type = 0; std::string content = "content"; std::string dstDevId = "dstDevId"; - EXPECT_EQ(ERR_DH_AUDIO_TRANS_NULL_VALUE, receiverTrans_->SendMessage(type, content, dstDevId)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, receiverTrans_->SendMessage(type, content, dstDevId)); receiverTrans_->receiverAdapter_ = std::make_shared(); receiverTrans_->receiverAdapter_->receiverEngine_ = std::make_shared(); EXPECT_EQ(DH_SUCCESS, receiverTrans_->SendMessage(type, content, dstDevId)); diff --git a/services/audiotransport/test/unittest/senderengine/src/av_sender_engine_adapter_test.cpp b/services/audiotransport/test/unittest/senderengine/src/av_sender_engine_adapter_test.cpp index 8d67a2f21ad7c6ea0bfb9cd36559c14d6d44eebb..416a96423d7f0558692d8f7c4a99ceae25f2c22b 100644 --- a/services/audiotransport/test/unittest/senderengine/src/av_sender_engine_adapter_test.cpp +++ b/services/audiotransport/test/unittest/senderengine/src/av_sender_engine_adapter_test.cpp @@ -49,7 +49,7 @@ HWTEST_F(AVSenderEngineAdapterTest, Initialize_001, TestSize.Level1) { IAVEngineProvider *providerPtr = nullptr; std::string peerDevId = "peerDevId"; - EXPECT_EQ(ERR_DH_AV_TRANS_NULL_VALUE, senderAdapter_->Initialize(providerPtr, peerDevId)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, senderAdapter_->Initialize(providerPtr, peerDevId)); senderAdapter_->initialized_ = true; EXPECT_EQ(DH_SUCCESS, senderAdapter_->Initialize(providerPtr, peerDevId)); } @@ -77,8 +77,8 @@ HWTEST_F(AVSenderEngineAdapterTest, Initialize_002, TestSize.Level1) */ HWTEST_F(AVSenderEngineAdapterTest, Start_001, TestSize.Level1) { - EXPECT_EQ(ERR_DH_AV_TRANS_NULL_VALUE, senderAdapter_->Start()); - EXPECT_EQ(ERR_DH_AV_TRANS_NULL_VALUE, senderAdapter_->Stop()); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, senderAdapter_->Start()); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, senderAdapter_->Stop()); } /** @@ -90,7 +90,7 @@ HWTEST_F(AVSenderEngineAdapterTest, Start_001, TestSize.Level1) HWTEST_F(AVSenderEngineAdapterTest, SetParameter_001, TestSize.Level1) { std::string param = "param"; - EXPECT_EQ(ERR_DH_AV_TRANS_NULL_VALUE, senderAdapter_->SetParameter(AVTransTag::AUDIO_SAMPLE_RATE, param)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, senderAdapter_->SetParameter(AVTransTag::AUDIO_SAMPLE_RATE, param)); } /** @@ -116,7 +116,7 @@ HWTEST_F(AVSenderEngineAdapterTest, PushData_001, TestSize.Level1) { size_t bufLen = 4096; std::shared_ptr audioData = std::make_shared(bufLen); - EXPECT_EQ(ERR_DH_AV_TRANS_NULL_VALUE, senderAdapter_->PushData(audioData)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, senderAdapter_->PushData(audioData)); senderAdapter_->senderEngine_ = std::make_shared(); EXPECT_EQ(DH_SUCCESS, senderAdapter_->PushData(audioData)); } @@ -130,7 +130,7 @@ HWTEST_F(AVSenderEngineAdapterTest, PushData_001, TestSize.Level1) HWTEST_F(AVSenderEngineAdapterTest, CreateControlChannel_001, TestSize.Level1) { std::string peerDevId = "peerDevId"; - EXPECT_EQ(ERR_DH_AV_TRANS_NULL_VALUE, senderAdapter_->CreateControlChannel(peerDevId)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, senderAdapter_->CreateControlChannel(peerDevId)); senderAdapter_->chnCreateSuccess_ = true; EXPECT_EQ(DH_SUCCESS, senderAdapter_->CreateControlChannel(peerDevId)); } @@ -144,7 +144,7 @@ HWTEST_F(AVSenderEngineAdapterTest, CreateControlChannel_001, TestSize.Level1) HWTEST_F(AVSenderEngineAdapterTest, CreateControlChannel_002, TestSize.Level1) { std::string peerDevId = "peerDevId"; - EXPECT_EQ(ERR_DH_AV_TRANS_NULL_VALUE, senderAdapter_->CreateControlChannel(peerDevId)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, senderAdapter_->CreateControlChannel(peerDevId)); senderAdapter_->senderEngine_ = std::make_shared(); EXPECT_EQ(ERR_DH_AV_TRANS_CREATE_CHANNEL_FAILED, senderAdapter_->CreateControlChannel(peerDevId)); } @@ -161,7 +161,7 @@ HWTEST_F(AVSenderEngineAdapterTest, SendMessageToRemote_001, TestSize.Level1) std::string content = "content"; std::string dstDevId = "dstDevId"; auto message = std::make_shared(type, content, dstDevId); - EXPECT_EQ(ERR_DH_AV_TRANS_NULL_VALUE, senderAdapter_->SendMessageToRemote(message)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, senderAdapter_->SendMessageToRemote(message)); senderAdapter_->senderEngine_ = std::make_shared(); EXPECT_EQ(DH_SUCCESS, senderAdapter_->SendMessageToRemote(message)); } @@ -175,7 +175,7 @@ HWTEST_F(AVSenderEngineAdapterTest, SendMessageToRemote_001, TestSize.Level1) HWTEST_F(AVSenderEngineAdapterTest, RegisterAdapterCallback_001, TestSize.Level1) { std::shared_ptr callback = nullptr; - EXPECT_EQ(ERR_DH_AV_TRANS_NULL_VALUE, senderAdapter_->RegisterAdapterCallback(callback)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, senderAdapter_->RegisterAdapterCallback(callback)); callback = std::make_shared(); EXPECT_EQ(DH_SUCCESS, senderAdapter_->RegisterAdapterCallback(callback)); } diff --git a/services/audiotransport/test/unittest/senderengine/src/av_sender_engine_transport_test.cpp b/services/audiotransport/test/unittest/senderengine/src/av_sender_engine_transport_test.cpp index f2dca6fd4f531bb833f84449c2082f7f851b611d..486867b1f35e750d573031d527f86ac37863e172 100644 --- a/services/audiotransport/test/unittest/senderengine/src/av_sender_engine_transport_test.cpp +++ b/services/audiotransport/test/unittest/senderengine/src/av_sender_engine_transport_test.cpp @@ -65,7 +65,7 @@ HWTEST_F(AVSenderEngineTransportTest, SetUp_001, TestSize.Level1) HWTEST_F(AVSenderEngineTransportTest, InitEngine_001, TestSize.Level1) { IAVEngineProvider *providerPtr = nullptr; - EXPECT_EQ(ERR_DH_AUDIO_TRANS_NULL_VALUE, senderTrans_->InitEngine(providerPtr)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, senderTrans_->InitEngine(providerPtr)); EXPECT_EQ(DH_SUCCESS, senderTrans_->Release()); } @@ -77,7 +77,7 @@ HWTEST_F(AVSenderEngineTransportTest, InitEngine_001, TestSize.Level1) */ HWTEST_F(AVSenderEngineTransportTest, CreateCtrl_001, TestSize.Level1) { - EXPECT_EQ(ERR_DH_AUDIO_TRANS_NULL_VALUE, senderTrans_->CreateCtrl()); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, senderTrans_->CreateCtrl()); senderTrans_->senderAdapter_ = std::make_shared(); senderTrans_->senderAdapter_->chnCreateSuccess_ = true; EXPECT_EQ(DH_SUCCESS, senderTrans_->CreateCtrl()); @@ -91,9 +91,9 @@ HWTEST_F(AVSenderEngineTransportTest, CreateCtrl_001, TestSize.Level1) */ HWTEST_F(AVSenderEngineTransportTest, Start_001, TestSize.Level1) { - EXPECT_EQ(ERR_DH_AUDIO_TRANS_NULL_VALUE, senderTrans_->Start()); - EXPECT_EQ(ERR_DH_AUDIO_TRANS_NULL_VALUE, senderTrans_->Stop()); - EXPECT_EQ(ERR_DH_AUDIO_TRANS_NULL_VALUE, senderTrans_->Release()); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, senderTrans_->Start()); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, senderTrans_->Stop()); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, senderTrans_->Release()); senderTrans_->senderAdapter_ = std::make_shared(); senderTrans_->senderAdapter_->senderEngine_ = std::make_shared(); EXPECT_EQ(DH_SUCCESS, senderTrans_->Start()); @@ -149,7 +149,7 @@ HWTEST_F(AVSenderEngineTransportTest, SendMessage_001, TestSize.Level1) uint32_t type = 0; std::string content = "content"; std::string dstDevId = "dstDevId"; - EXPECT_EQ(ERR_DH_AUDIO_TRANS_NULL_VALUE, senderTrans_->SendMessage(type, content, dstDevId)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, senderTrans_->SendMessage(type, content, dstDevId)); senderTrans_->senderAdapter_ = std::make_shared(); senderTrans_->senderAdapter_->senderEngine_ = std::make_shared(); EXPECT_EQ(DH_SUCCESS, senderTrans_->SendMessage(type, content, dstDevId)); @@ -165,7 +165,7 @@ HWTEST_F(AVSenderEngineTransportTest, FeedAudioData_001, TestSize.Level1) { size_t bufLen = 4096; std::shared_ptr audioData = std::make_shared(bufLen); - EXPECT_EQ(ERR_DH_AUDIO_TRANS_NULL_VALUE, senderTrans_->FeedAudioData(audioData)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, senderTrans_->FeedAudioData(audioData)); senderTrans_->senderAdapter_ = std::make_shared(); senderTrans_->senderAdapter_->senderEngine_ = std::make_shared(); EXPECT_EQ(DH_SUCCESS, senderTrans_->FeedAudioData(audioData)); diff --git a/services/common/BUILD.gn b/services/common/BUILD.gn index 60385f42662b0447f418cd6ef5f3782da509c424..38d32314ae2303bd0c09e2476a1de34d4daef263 100644 --- a/services/common/BUILD.gn +++ b/services/common/BUILD.gn @@ -30,7 +30,6 @@ config("daudio_common_private_config") { include_dirs = [ "//third_party/json/include" ] include_dirs += [ - "taskProcessor/include", "${common_path}/include", "${common_path}/dfx_utils/include", ] @@ -48,8 +47,6 @@ ohos_shared_library("distributed_audio_utils") { "${common_path}/src/daudio_log.cpp", "${common_path}/src/daudio_util.cpp", "audiodata/src/audio_data.cpp", - "taskProcessor/src/task_impl.cpp", - "taskProcessor/src/task_queue.cpp", ] deps = [ "//third_party/cJSON:cjson" ] diff --git a/services/common/taskProcessor/include/task_impl.h b/services/common/taskProcessor/include/task_impl.h deleted file mode 100644 index e2cf9964706149c150f5199f0ad1aa165d178aa3..0000000000000000000000000000000000000000 --- a/services/common/taskProcessor/include/task_impl.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2022 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef OHOS_TASK_IMPL_H -#define OHOS_TASK_IMPL_H - -#include - -#include "task_impl_interface.h" - -namespace OHOS { -namespace DistributedHardware { -class TaskImpl : public TaskImplInterface { -public: - TaskImpl(std::function taskFunc, std::function taskCallback); - ~TaskImpl() override = default; - void Run() override; - -private: - std::function taskFunc_ = nullptr; - std::function taskCallback_ = nullptr; -}; - -template using TaskFunc = int32_t (T::*)(const std::string &); -template using TaskCallback = void (T::*)(int32_t, const std::string &, const std::string &); - -template -std::shared_ptr GenerateTask( - T *object, TaskFunc taskFunc, const std::string &args, const std::string &funcName, - TaskCallback taskCallback = [](int32_t ret, const std::string &result, const std::string &funcName) { - (void)ret; - (void)result; - (void)funcName; - }) -{ - auto task = std::make_shared(std::bind(taskFunc, object, args), - std::bind(taskCallback, object, std::placeholders::_1, args, funcName)); - return task; -} -} // DistributedHardware -} // OHOS -#endif // OHOS_TASK_IMPL_H diff --git a/services/common/taskProcessor/include/task_impl_interface.h b/services/common/taskProcessor/include/task_impl_interface.h deleted file mode 100644 index 577fd6814c77d6d8089b2ae5080ab83c43915c4c..0000000000000000000000000000000000000000 --- a/services/common/taskProcessor/include/task_impl_interface.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (c) 2022 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef OHOS_TASK_IMPL_INTERFACE_H -#define OHOS_TASK_IMPL_INTERFACE_H - -namespace OHOS { -namespace DistributedHardware { -class TaskImplInterface { -public: - TaskImplInterface() = default; - virtual ~TaskImplInterface() = default; - virtual void Run() = 0; -}; -} // DistributedHardware -} // OHOS -#endif // OHOS_TASK_IMPL_INTERFACE_H diff --git a/services/common/taskProcessor/include/task_queue.h b/services/common/taskProcessor/include/task_queue.h deleted file mode 100644 index e6d4bf984c1c2becefb7dcd82a3e9a864c715c61..0000000000000000000000000000000000000000 --- a/services/common/taskProcessor/include/task_queue.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2022-2023 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef OHOS_TASK_QUEUE_H -#define OHOS_TASK_QUEUE_H - -#include -#include -#include -#include - -#include "task_impl_interface.h" - -namespace OHOS { -namespace DistributedHardware { -class TaskQueue { -public: - explicit TaskQueue(uint32_t maxSize) : maxSize_(maxSize) {}; - ~TaskQueue() = default; - int32_t Produce(std::shared_ptr &task); - void Start(); - void Stop(); - -private: - void Consume(std::shared_ptr &task); - void Run(); - -private: - static constexpr uint8_t TASK_WAIT_TIME = 20; - static constexpr const char* MAIN_THREAD_LOOP = "mainThreadLoop"; - - std::mutex taskQueueMutex_; - std::condition_variable taskQueueCond_; - std::queue> taskQueue_; - bool taskQueueReady_ = false; - bool isQuitTaskQueue_ = false; - std::thread mainThreadLoop_; - uint32_t maxSize_; -}; -} // DistributedHardware -} // OHOS -#endif // OHOS_TASK_QUEUE_H diff --git a/services/common/taskProcessor/src/task_impl.cpp b/services/common/taskProcessor/src/task_impl.cpp deleted file mode 100644 index c0e72e13d43ea0639a19bc77afe014c601ee6718..0000000000000000000000000000000000000000 --- a/services/common/taskProcessor/src/task_impl.cpp +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (c) 2022 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "task_impl.h" - -#include "daudio_errorcode.h" -#include "daudio_log.h" - -namespace OHOS { -namespace DistributedHardware { -TaskImpl::TaskImpl(std::function taskFunc, std::function taskCallback) -{ - taskFunc_ = taskFunc; - taskCallback_ = taskCallback; -} - -void TaskImpl::Run() -{ - if (taskFunc_ == nullptr) { - return; - } - int32_t ret = taskFunc_(); - if (taskCallback_ != nullptr) { - taskCallback_(ret); - } -} -} // DistributedHardware -} // OHOS diff --git a/services/common/taskProcessor/src/task_queue.cpp b/services/common/taskProcessor/src/task_queue.cpp deleted file mode 100644 index 7725ed63fa29073453265bf1d2ce96d4661d6027..0000000000000000000000000000000000000000 --- a/services/common/taskProcessor/src/task_queue.cpp +++ /dev/null @@ -1,97 +0,0 @@ -/* - * Copyright (c) 2022-2023 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "task_queue.h" - -#include "daudio_errorcode.h" -#include "daudio_log.h" - -#undef DH_LOG_TAG -#define DH_LOG_TAG "TaskQueue" - -namespace OHOS { -namespace DistributedHardware { -void TaskQueue::Start() -{ - DHLOGI("Start task queue."); - taskQueueReady_ = true; - isQuitTaskQueue_ = false; - mainThreadLoop_ = std::thread(&TaskQueue::Run, this); - if (pthread_setname_np(mainThreadLoop_.native_handle(), MAIN_THREAD_LOOP) != DH_SUCCESS) { - DHLOGE("Main thread loop setname failed."); - } - while (!mainThreadLoop_.joinable()) { - } - DHLOGI("Start task queue success."); -} - -void TaskQueue::Stop() -{ - DHLOGI("Stop task queue."); - isQuitTaskQueue_ = true; - if (mainThreadLoop_.joinable()) { - mainThreadLoop_.join(); - } - DHLOGI("Stop task queue success."); -} - -void TaskQueue::Run() -{ - DHLOGI("Task queue running."); - while (taskQueueReady_) { - if (isQuitTaskQueue_ && taskQueue_.empty()) { - DHLOGI("Task queue quit."); - break; - } - std::shared_ptr task = nullptr; - { - std::unique_lock lck(taskQueueMutex_); - taskQueueCond_.wait_for(lck, std::chrono::milliseconds(TASK_WAIT_TIME), - [this]() { return !taskQueue_.empty(); }); - if (taskQueue_.empty()) { - continue; - } - Consume(task); - } - if (task == nullptr) { - continue; - } - task->Run(); - } -} - -void TaskQueue::Consume(std::shared_ptr &task) -{ - task = taskQueue_.front(); - taskQueue_.pop(); -} - -int32_t TaskQueue::Produce(std::shared_ptr &task) -{ - if (task == nullptr) { - DHLOGE("The parameter is empty."); - return ERR_DH_AUDIO_NULLPTR; - } - std::lock_guard lck(taskQueueMutex_); - if (taskQueue_.size() >= maxSize_) { - DHLOGD("task queue is full, size: %zu", taskQueue_.size()); - return ERR_DH_AUDIO_SA_TASKQUEUE_FULL; - } - taskQueue_.push(task); - taskQueueCond_.notify_one(); - return DH_SUCCESS; -} -} // DistributedHardware -} // OHOS diff --git a/services/common/taskProcessor/test/unittest/BUILD.gn b/services/common/taskProcessor/test/unittest/BUILD.gn deleted file mode 100644 index 26686b3495c5a49511ac12ae971691968b6e719b..0000000000000000000000000000000000000000 --- a/services/common/taskProcessor/test/unittest/BUILD.gn +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (c) 2022 Huawei Device Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import("//build/ohos.gni") -import("//build/ohos_var.gni") -import("../../../../../distributedaudio.gni") - -group("task_processor_test") { - testonly = true - deps = [ "${services_path}/common/taskProcessor/test/unittest/task_queue:task_queue_test" ] -} diff --git a/services/common/taskProcessor/test/unittest/task_queue/BUILD.gn b/services/common/taskProcessor/test/unittest/task_queue/BUILD.gn deleted file mode 100644 index c2049f5b8436d449c12a68c84d30bfe3ad085fd1..0000000000000000000000000000000000000000 --- a/services/common/taskProcessor/test/unittest/task_queue/BUILD.gn +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright (c) 2022 Huawei Device Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import("//build/ohos.gni") -import("//build/ohos_var.gni") -import("//build/test.gni") -import("../../../../../../distributedaudio.gni") - -module_out_path = "distributed_audio/services/common/taskProcessor/test" - -config("module_private_config") { - visibility = [ ":*" ] - - include_dirs = [ "//third_party/json/include" ] - - include_dirs += [ - "${common_path}/include", - "${services_path}/common/audiodata/include", - "${services_path}/common/audioparam", - "${services_path}/common/taskProcessor/test/unittest/task_queue/include", - "${services_path}/common/taskProcessor/include", - ] -} - -## UnitTest task_queue_test -ohos_unittest("TaskQueueTest") { - module_out_path = module_out_path - - sources = [ "${services_path}/common/taskProcessor/test/unittest/task_queue/src/task_queue_test.cpp" ] - - configs = [ ":module_private_config" ] - - deps = [ - "${services_path}/common:distributed_audio_utils", - "//third_party/googletest:gmock", - "//third_party/googletest:gtest_main", - ] -} - -group("task_queue_test") { - testonly = true - deps = [ ":TaskQueueTest" ] -} diff --git a/services/common/taskProcessor/test/unittest/task_queue/include/mock_task_impl.h b/services/common/taskProcessor/test/unittest/task_queue/include/mock_task_impl.h deleted file mode 100644 index 5a4b6bc27bbbcf1bf4f82bb627219521f629eeb6..0000000000000000000000000000000000000000 --- a/services/common/taskProcessor/test/unittest/task_queue/include/mock_task_impl.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2022 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef MOCK_TASK_IMPL_H -#define MOCK_TASK_IMPL_H - -#include "task_impl_interface.h" - -namespace OHOS { -namespace DistributedHardware { -class MockTaskImplInterface : public TaskImplInterface { -public: - MockTaskImplInterface() = default; - virtual ~MockTaskImplInterface() = default; - void Run() override - { - bool tmp = true; - (void)tmp; - } -}; -} // namespace DistributedHardware -} // namespace OHOS -#endif // OHOS_DAUDIO_TEST_UTILS_H \ No newline at end of file diff --git a/services/common/taskProcessor/test/unittest/task_queue/include/task_queue_test.h b/services/common/taskProcessor/test/unittest/task_queue/include/task_queue_test.h deleted file mode 100644 index 06d78e1e1e18edbbdd7151a3db6b3937d9bf90b5..0000000000000000000000000000000000000000 --- a/services/common/taskProcessor/test/unittest/task_queue/include/task_queue_test.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (c) 2022 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef TASK_QUEUE_TEST_H -#define TASK_QUEUE_TEST_H - -#include -#include - -#define private public -#include "task_queue.h" -#undef private - -namespace OHOS { -namespace DistributedHardware { -class TaskQueueTest : public testing::Test { -public: - static void SetUpTestCase(void); - static void TearDownTestCase(void); - void SetUp(); - void TearDown(); -}; -} // namespace DistributedHardware -} // namespace OHOS -#endif // OHOS_DMIC_CLIENT_TEST_H \ No newline at end of file diff --git a/services/common/taskProcessor/test/unittest/task_queue/src/task_queue_test.cpp b/services/common/taskProcessor/test/unittest/task_queue/src/task_queue_test.cpp deleted file mode 100644 index 6174f5f07ad91e2eb7802c50534c9dda7460afe8..0000000000000000000000000000000000000000 --- a/services/common/taskProcessor/test/unittest/task_queue/src/task_queue_test.cpp +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright (c) 2022 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "task_queue_test.h" - -#include "audio_event.h" -#include "daudio_errorcode.h" -#include "mock_task_impl.h" - -using namespace testing::ext; - -namespace OHOS { -namespace DistributedHardware { -void TaskQueueTest::SetUpTestCase(void) {} - -void TaskQueueTest::TearDownTestCase(void) {} - -void TaskQueueTest::SetUp() {} - -void TaskQueueTest::TearDown() {} - -/** - * @tc.name: Produce_001 - * @tc.desc: Verify the Produce function. - * @tc.type: FUNC - * @tc.require: AR000H0E6G - */ -HWTEST_F(TaskQueueTest, Produce_001, TestSize.Level1) -{ - uint32_t maxSize = 2; - TaskQueue taskQueueClass_(maxSize); - std::shared_ptr task = nullptr; - - EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, taskQueueClass_.Produce(task)); - taskQueueClass_.maxSize_ = 0; - EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, taskQueueClass_.Produce(task)); -} - -/** - * @tc.name: Produce_002 - * @tc.desc: Verify the Produce function. - * @tc.type: FUNC - * @tc.require: AR000H0E6G - */ -HWTEST_F(TaskQueueTest, Produce_002, TestSize.Level1) -{ - uint32_t maxSize = 2; - TaskQueue taskQueueClass_(maxSize); - std::shared_ptr task = std::make_shared(); - taskQueueClass_.Start(); - EXPECT_EQ(DH_SUCCESS, taskQueueClass_.Produce(task)); - taskQueueClass_.Stop(); - std::shared_ptr task2 = std::make_shared(); - EXPECT_EQ(DH_SUCCESS, taskQueueClass_.Produce(task)); -} -} // DistributedHardware -} // OHOS diff --git a/services/hdfaudioclient/src/daudio_adapter_internal.cpp b/services/hdfaudioclient/src/daudio_adapter_internal.cpp index 1258b84d23f0b47e221b162c1b4e56645cb546d7..7ce5bc0929b3c9ff2b75ce940077c6a7584554fc 100644 --- a/services/hdfaudioclient/src/daudio_adapter_internal.cpp +++ b/services/hdfaudioclient/src/daudio_adapter_internal.cpp @@ -41,7 +41,7 @@ static int32_t InitAllPortsInternal(struct AudioAdapter *adapter) AudioAdapterContext *context = reinterpret_cast(adapter); if (context->proxy_ == nullptr) { DHLOGE("The context or proxy for the context is nullptr."); - return ERR_DH_AUDIO_HDI_NULLPTR; + return ERR_DH_AUDIO_NULLPTR; } return context->proxy_->InitAllPorts(); } @@ -76,7 +76,7 @@ static int32_t CreateRenderInternal(struct AudioAdapter *adapter, const struct : AudioAdapterContext *context = reinterpret_cast(adapter); if (context->proxy_ == nullptr) { DHLOGE("The context or proxy for the context is nullptr."); - return ERR_DH_AUDIO_HDI_NULLPTR; + return ERR_DH_AUDIO_NULLPTR; } AudioDeviceDescriptor descHal = { .portId = desc->portId, @@ -117,7 +117,7 @@ static int32_t DestroyRenderInternal(struct AudioAdapter *adapter, struct AudioR 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_HDI_NULLPTR; + return ERR_DH_AUDIO_NULLPTR; } std::lock_guard lock(adapterContext->mtx_); @@ -146,7 +146,7 @@ static int32_t CreateCaptureInternal(struct AudioAdapter *adapter, const struct AudioAdapterContext *context = reinterpret_cast(adapter); if (context->proxy_ == nullptr) { DHLOGE("The context or proxy for the context is nullptr."); - return ERR_DH_AUDIO_HDI_NULLPTR; + return ERR_DH_AUDIO_NULLPTR; } AudioDeviceDescriptor descHal = { .portId = desc->portId, @@ -187,7 +187,7 @@ static int32_t DestroyCaptureInternal(struct AudioAdapter *adapter, struct Audio 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_HDI_NULLPTR; + return ERR_DH_AUDIO_NULLPTR; } std::lock_guard lock(adapterContext->mtx_); @@ -215,7 +215,7 @@ static int32_t GetPassthroughModeInternal(struct AudioAdapter *adapter, const st AudioAdapterContext *context = reinterpret_cast(adapter); if (context->proxy_ == nullptr) { DHLOGE("The context or proxy for the context is nullptr."); - return ERR_DH_AUDIO_HDI_NULLPTR; + return ERR_DH_AUDIO_NULLPTR; } AudioPort portHal = { .dir = static_cast(port->dir), @@ -269,7 +269,7 @@ static int32_t GetPortCapabilityInternal(struct AudioAdapter *adapter, const str AudioAdapterContext *context = reinterpret_cast(adapter); if (context->proxy_ == nullptr) { DHLOGE("The context or proxy for the context is nullptr."); - return ERR_DH_AUDIO_HDI_NULLPTR; + return ERR_DH_AUDIO_NULLPTR; } { std::lock_guard lock(context->mtx_); @@ -314,7 +314,7 @@ static int32_t ReleaseAudioRouteInternal(struct AudioAdapter *adapter, int32_t r AudioAdapterContext *context = reinterpret_cast(adapter); if (context->proxy_ == nullptr) { DHLOGE("The context or proxy for the context is nullptr."); - return ERR_DH_AUDIO_HDI_NULLPTR; + return ERR_DH_AUDIO_NULLPTR; } return context->proxy_->ReleaseAudioRoute(routeHandle); } @@ -330,7 +330,7 @@ static int32_t SetPassthroughModeInternal(struct AudioAdapter *adapter, const st AudioAdapterContext *context = reinterpret_cast(adapter); if (context->proxy_ == nullptr) { DHLOGE("The context or proxy for the context is nullptr."); - return ERR_DH_AUDIO_HDI_NULLPTR; + return ERR_DH_AUDIO_NULLPTR; } AudioPort portHal = { .dir = static_cast(port->dir), @@ -405,7 +405,7 @@ static int32_t UpdateAudioRouteInternal(struct AudioAdapter *adapter, const stru AudioAdapterContext *context = reinterpret_cast(adapter); if (context->proxy_ == nullptr) { DHLOGE("The context or proxy for the context is nullptr."); - return ERR_DH_AUDIO_HDI_NULLPTR; + return ERR_DH_AUDIO_NULLPTR; } int32_t ret = context->proxy_->UpdateAudioRoute(audioRoute, handle); *routeHandle = handle; @@ -423,7 +423,7 @@ static int32_t SetExtraParamsInternal(struct AudioAdapter *adapter, enum ::Audio AudioAdapterContext *context = reinterpret_cast(adapter); if (context->proxy_ == nullptr) { DHLOGE("The context or proxy for the context is nullptr."); - return ERR_DH_AUDIO_HDI_NULLPTR; + return ERR_DH_AUDIO_NULLPTR; } return context->proxy_->SetExtraParams(static_cast(key), std::string(condition), std::string(value)); @@ -440,7 +440,7 @@ static int32_t GetExtraParamsInternal(struct AudioAdapter *adapter, enum ::Audio AudioAdapterContext *context = reinterpret_cast(adapter); if (context->proxy_ == nullptr) { DHLOGE("The context or proxy for the context is nullptr."); - return ERR_DH_AUDIO_HDI_NULLPTR; + return ERR_DH_AUDIO_NULLPTR; } std::string valueHal; int32_t ret = @@ -467,7 +467,7 @@ static int32_t RegExtraParamObserverInternal(struct AudioAdapter *adapter, Param AudioAdapterContext *context = reinterpret_cast(adapter); if (context->proxy_ == nullptr) { DHLOGE("The context or proxy for the context is nullptr."); - return ERR_DH_AUDIO_HDI_NULLPTR; + return ERR_DH_AUDIO_NULLPTR; } std::lock_guard lock(context->mtx_); if (context->callbackInternal_ == nullptr || callback != context->callback_) { diff --git a/services/hdfaudioclient/src/daudio_capture_internal.cpp b/services/hdfaudioclient/src/daudio_capture_internal.cpp index 3aaafa638bf7d27719e7cd9f1e407160f12b5c57..8aedd4eb54ef1962b0aac5df7cf632934e8bac44 100644 --- a/services/hdfaudioclient/src/daudio_capture_internal.cpp +++ b/services/hdfaudioclient/src/daudio_capture_internal.cpp @@ -42,7 +42,7 @@ static int32_t GetCapturePositionInternal(struct AudioCapture *capture, uint64_t AudioCaptureContext *context = reinterpret_cast(capture); if (context->proxy_ == nullptr) { DHLOGE("The context or proxy for the context is nullptr."); - return ERR_DH_AUDIO_HDI_NULLPTR; + return ERR_DH_AUDIO_NULLPTR; } AudioTimeStamp timeHal; int32_t ret = context->proxy_->GetCapturePosition(*frames, timeHal); @@ -66,7 +66,7 @@ static int32_t CaptureFrameInternal(struct AudioCapture *capture, void *frame, u AudioCaptureContext *context = reinterpret_cast(capture); if (context->proxy_ == nullptr) { DHLOGE("The context or proxy for the context is nullptr."); - return ERR_DH_AUDIO_HDI_NULLPTR; + return ERR_DH_AUDIO_NULLPTR; } int8_t *uframe = reinterpret_cast(frame); std::vector frameHal; diff --git a/services/hdfaudioclient/src/daudio_render_internal.cpp b/services/hdfaudioclient/src/daudio_render_internal.cpp index a1a3238ad354f656ed883655042ae97dc81f2b71..bfbae3e9150ed52fa4dcda2d7f62637b24b5f068 100644 --- a/services/hdfaudioclient/src/daudio_render_internal.cpp +++ b/services/hdfaudioclient/src/daudio_render_internal.cpp @@ -40,7 +40,7 @@ static int32_t GetLatencyInternal(struct AudioRender *render, uint32_t *ms) AudioRenderContext *context = reinterpret_cast(render); if (context->proxy_ == nullptr) { DHLOGE("The context or proxy for the context is nullptr."); - return ERR_DH_AUDIO_HDI_NULLPTR; + return ERR_DH_AUDIO_NULLPTR; } return context->proxy_->GetLatency(*ms); } @@ -57,7 +57,7 @@ static int32_t RenderFrameInternal(struct AudioRender *render, const void *frame AudioRenderContext *context = reinterpret_cast(render); if (context->proxy_ == nullptr) { DHLOGE("The context or proxy for the context is nullptr."); - return ERR_DH_AUDIO_HDI_NULLPTR; + return ERR_DH_AUDIO_NULLPTR; } const uint8_t *uframe = reinterpret_cast(frame); std::vector frameHal(requestBytes); @@ -80,7 +80,7 @@ static int32_t GetRenderPositionInternal(struct AudioRender *render, uint64_t *f AudioRenderContext *context = reinterpret_cast(render); if (context->proxy_ == nullptr) { DHLOGE("The context or proxy for the context is nullptr."); - return ERR_DH_AUDIO_HDI_NULLPTR; + return ERR_DH_AUDIO_NULLPTR; } AudioTimeStamp timeHal; int32_t ret = context->proxy_->GetRenderPosition(*frames, timeHal); @@ -102,7 +102,7 @@ static int32_t SetRenderSpeedInternal(struct AudioRender *render, float speed) AudioRenderContext *context = reinterpret_cast(render); if (context->proxy_ == nullptr) { DHLOGE("The context or proxy for the context is nullptr."); - return ERR_DH_AUDIO_HDI_NULLPTR; + return ERR_DH_AUDIO_NULLPTR; } return context->proxy_->SetRenderSpeed(speed); } @@ -117,7 +117,7 @@ static int32_t GetRenderSpeedInternal(struct AudioRender *render, float *speed) AudioRenderContext *context = reinterpret_cast(render); if (context->proxy_ == nullptr) { DHLOGE("The context or proxy for the context is nullptr."); - return ERR_DH_AUDIO_HDI_NULLPTR; + return ERR_DH_AUDIO_NULLPTR; } return context->proxy_->GetRenderSpeed(*speed); } @@ -132,7 +132,7 @@ static int32_t SetChannelModeInternal(struct AudioRender *render, enum ::AudioCh AudioRenderContext *context = reinterpret_cast(render); if (context->proxy_ == nullptr) { DHLOGE("The context or proxy for the context is nullptr."); - return ERR_DH_AUDIO_HDI_NULLPTR; + return ERR_DH_AUDIO_NULLPTR; } return context->proxy_->SetChannelMode(static_cast(mode)); } @@ -147,7 +147,7 @@ static int32_t GetChannelModeInternal(struct AudioRender *render, enum ::AudioCh AudioRenderContext *context = reinterpret_cast(render); if (context->proxy_ == nullptr) { DHLOGE("The context or proxy for the context is nullptr."); - return ERR_DH_AUDIO_HDI_NULLPTR; + return ERR_DH_AUDIO_NULLPTR; } return context->proxy_->GetChannelMode(*(reinterpret_cast(mode))); } @@ -162,7 +162,7 @@ static int32_t RegCallbackInternal(struct AudioRender *render, ::RenderCallback AudioRenderContext *context = reinterpret_cast(render); if (context->proxy_ == nullptr) { DHLOGE("The context or proxy for the context is nullptr."); - return ERR_DH_AUDIO_HDI_NULLPTR; + return ERR_DH_AUDIO_NULLPTR; } std::lock_guard lock(context->mtx_); if (context->callbackInternal_ == nullptr || callback != context->callback_) { @@ -194,7 +194,7 @@ static int32_t DrainBufferInternal(struct AudioRender *render, enum ::AudioDrain AudioRenderContext *context = reinterpret_cast(render); if (context->proxy_ == nullptr) { DHLOGE("The context or proxy for the context is nullptr."); - return ERR_DH_AUDIO_HDI_NULLPTR; + return 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 703a47f59c611685ce04e1244b7fc74d6dbfe0ab..41781fe74884fb2b0be5f75f056ac532dfd8508d 100644 --- a/services/hdfaudioclient/src/distributed_audio_client.cpp +++ b/services/hdfaudioclient/src/distributed_audio_client.cpp @@ -38,7 +38,7 @@ static int32_t InitDescriptorPort(const AudioAdapterDescriptor &desc, ::AudioAda ::AudioPort *audioPorts = (::AudioPort *)malloc(desc.ports.size() * sizeof(AudioPort)); if (audioPorts == nullptr) { DHLOGE("Audio ports is nullptr."); - return ERR_DH_AUDIO_HDI_NULLPTR; + return ERR_DH_AUDIO_NULLPTR; } descInternal.ports = audioPorts; @@ -100,7 +100,7 @@ static int32_t InitAudioAdapterDescriptor(AudioManagerContext *context, char* adapterName = reinterpret_cast(calloc(desc.adapterName.length() + STR_TERM_LEN, sizeof(char))); if (adapterName == nullptr) { DHLOGE("Calloc failed."); - return ERR_DH_AUDIO_HDI_NULLPTR; + return 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."); @@ -139,7 +139,7 @@ static int32_t GetAllAdaptersInternal(struct AudioManager *manager, struct ::Aud std::vector descriptors; if (context->proxy_ == nullptr) { DHLOGE("The context or proxy for the context is nullptr."); - return ERR_DH_AUDIO_HDI_NULLPTR; + return ERR_DH_AUDIO_NULLPTR; } int32_t ret = context->proxy_->GetAllAdapters(descriptors); if (ret != DH_SUCCESS) { @@ -183,7 +183,7 @@ static int32_t LoadAdapterInternal(struct AudioManager *manager, const struct :: sptr adapterProxy = nullptr; if (context->proxy_ == nullptr) { DHLOGE("The context or proxy for the context is nullptr."); - return ERR_DH_AUDIO_HDI_NULLPTR; + return ERR_DH_AUDIO_NULLPTR; } int32_t ret = context->proxy_->LoadAdapter(descriptor, adapterProxy); if (ret != DH_SUCCESS) { diff --git a/services/hdfaudioclient/test/unittest/audio_adapter_internal/audio_adapter_internal_test.cpp b/services/hdfaudioclient/test/unittest/audio_adapter_internal/audio_adapter_internal_test.cpp index a0f22c09630935e49bd6c4da8d7778c29f3128fe..f510d6d4b1465ceacdc102f0d1a0a149576ccefe 100644 --- a/services/hdfaudioclient/test/unittest/audio_adapter_internal/audio_adapter_internal_test.cpp +++ b/services/hdfaudioclient/test/unittest/audio_adapter_internal/audio_adapter_internal_test.cpp @@ -74,7 +74,7 @@ HWTEST_F(AudioAdapterTest, InitAllPortsInternal_002, TestSize.Level1) { auto adapterContext = std::make_unique(); int32_t ret = adapterContext->instance_.InitAllPorts(&adapterContext->instance_); - EXPECT_EQ(ERR_DH_AUDIO_HDI_NULLPTR, ret); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, ret); } /** @@ -120,7 +120,7 @@ HWTEST_F(AudioAdapterTest, DestroyRenderInternal_002, TestSize.Level1) struct AudioRender *render = new AudioRender; auto adapterContext1 = std::make_unique(); int32_t ret = adapterContext1->instance_.DestroyRender(&adapterContext1->instance_, render); - EXPECT_EQ(ERR_DH_AUDIO_HDI_NULLPTR, ret); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, ret); auto adapterContext = std::make_unique(); adapterContext->proxy_ = new MockIAudioAdapter(); adapterContext->adapterName_ = "adapterName"; @@ -171,7 +171,7 @@ HWTEST_F(AudioAdapterTest, DestroyCaptureInternal_002, TestSize.Level1) struct AudioCapture *capture = new AudioCapture; auto adapterContext1 = std::make_unique(); int32_t ret = adapterContext1->instance_.DestroyCapture(&adapterContext1->instance_, capture); - EXPECT_EQ(ERR_DH_AUDIO_HDI_NULLPTR, ret); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, ret); auto adapterContext = std::make_unique(); adapterContext->proxy_ = new MockIAudioAdapter(); adapterContext->adapterName_ = "adapterName"; @@ -207,7 +207,7 @@ HWTEST_F(AudioAdapterTest, GetPassthroughModeInternal_002, TestSize.Level1) enum ::AudioPortPassthroughMode *mode = new ::AudioPortPassthroughMode; auto adapterContext1 = std::make_unique(); int32_t ret = adapterContext1->instance_.GetPassthroughMode(&adapterContext1->instance_, port, mode); - EXPECT_EQ(ERR_DH_AUDIO_HDI_NULLPTR, ret); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, ret); auto adapterContext = std::make_unique(); adapterContext->proxy_ = new MockIAudioAdapter(); port->dir = AudioPortDirection::PORT_OUT; @@ -245,7 +245,7 @@ HWTEST_F(AudioAdapterTest, ReleaseAudioRouteInternal_002, TestSize.Level1) int32_t routeHandle = 0; auto adapterContext1 = std::make_unique(); int32_t ret = adapterContext1->instance_.ReleaseAudioRoute(&adapterContext1->instance_, routeHandle); - EXPECT_EQ(ERR_DH_AUDIO_HDI_NULLPTR, ret); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, ret); auto adapterContext = std::make_unique(); adapterContext->proxy_ = new MockIAudioAdapter(); adapterContext->adapterName_ = "adapterName"; @@ -279,7 +279,7 @@ HWTEST_F(AudioAdapterTest, SetPassthroughModeInternal_002, TestSize.Level1) auto adapterContext1 = std::make_unique(); int32_t ret = adapterContext1->instance_.SetPassthroughMode(&adapterContext1->instance_, port, PORT_PASSTHROUGH_LPCM); - EXPECT_EQ(ERR_DH_AUDIO_HDI_NULLPTR, ret); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, ret); auto adapterContext = std::make_unique(); adapterContext->proxy_ = new MockIAudioAdapter(); port->dir = AudioPortDirection::PORT_OUT; @@ -331,7 +331,7 @@ HWTEST_F(AudioAdapterTest, UpdateAudioRouteInternal_002, TestSize.Level1) route->sinksNum = 0; int32_t *routeHandle = new int32_t(0); int32_t ret = adapterContext->instance_.UpdateAudioRoute(&adapterContext->instance_, route, routeHandle); - EXPECT_EQ(ERR_DH_AUDIO_HDI_NULLPTR, ret); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, ret); delete route; delete routeHandle; } @@ -367,7 +367,7 @@ HWTEST_F(AudioAdapterTest, SetExtraParamsInternal_002, TestSize.Level1) auto adapterContext1 = std::make_unique(); int32_t ret = adapterContext1->instance_.SetExtraParams(&adapterContext1->instance_, AUDIO_EXT_PARAM_KEY_NONE, condition, value); - EXPECT_EQ(ERR_DH_AUDIO_HDI_NULLPTR, ret); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, ret); auto adapterContext = std::make_unique(); adapterContext->proxy_ = new MockIAudioAdapter(); adapterContext->adapterName_ = "adapterName"; @@ -408,7 +408,7 @@ HWTEST_F(AudioAdapterTest, GetExtraParamsInternal_002, TestSize.Level1) auto adapterContext1 = std::make_unique(); int32_t ret = adapterContext1->instance_.GetExtraParams(&adapterContext1->instance_, AUDIO_EXT_PARAM_KEY_NONE, condition, value, length); - EXPECT_EQ(ERR_DH_AUDIO_HDI_NULLPTR, ret); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, ret); auto adapterContext = std::make_unique(); adapterContext->proxy_ = new MockIAudioAdapter(); adapterContext->adapterName_ = "adapterName"; @@ -436,16 +436,16 @@ HWTEST_F(AudioAdapterTest, UpdateAudioRouteInternal_003, TestSize.Level1) int32_t *routeHandle = new int32_t(0); int32_t ret = adapterContext->instance_.UpdateAudioRoute(&adapterContext->instance_, route, routeHandle); - EXPECT_EQ(ERR_DH_AUDIO_HDI_NULLPTR, ret); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, ret); node->type = static_cast(1); ret = adapterContext->instance_.UpdateAudioRoute(&adapterContext->instance_, route, routeHandle); - EXPECT_EQ(ERR_DH_AUDIO_HDI_NULLPTR, ret); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, ret); node->type = static_cast(2); ret = adapterContext->instance_.UpdateAudioRoute(&adapterContext->instance_, route, routeHandle); - EXPECT_EQ(ERR_DH_AUDIO_HDI_NULLPTR, ret); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, ret); node->type = static_cast(3); ret = adapterContext->instance_.UpdateAudioRoute(&adapterContext->instance_, route, routeHandle); - EXPECT_EQ(ERR_DH_AUDIO_HDI_NULLPTR, ret); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, ret); delete route; delete node; delete routeHandle; diff --git a/services/hdfaudioclient/test/unittest/audio_render_internal/audio_render_internal_test.cpp b/services/hdfaudioclient/test/unittest/audio_render_internal/audio_render_internal_test.cpp index 648f3f1511dce697d92f49ce845b855a33e764e0..c437e4f4d11ae904e6404595d157c0164d4da266 100644 --- a/services/hdfaudioclient/test/unittest/audio_render_internal/audio_render_internal_test.cpp +++ b/services/hdfaudioclient/test/unittest/audio_render_internal/audio_render_internal_test.cpp @@ -92,7 +92,7 @@ HWTEST_F(AudioRenderTest, RenderFrameInternal_002, TestSize.Level1) int32_t ret = renderContext.instance_.RenderFrame(render, frame, requestBytes, replyBytes); delete render; delete replyBytes; - EXPECT_EQ(ERR_DH_AUDIO_HDI_NULLPTR, ret); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, ret); } /** @@ -127,7 +127,7 @@ HWTEST_F(AudioRenderTest, GetRenderPositionInternal_002, TestSize.Level1) delete render; delete frames; delete time; - EXPECT_EQ(ERR_DH_AUDIO_HDI_NULLPTR, ret); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, ret); } /** @@ -158,7 +158,7 @@ HWTEST_F(AudioRenderTest, SetRenderSpeedInternal_002, TestSize.Level1) float speed = 0.0; int32_t ret = renderContext.instance_.SetRenderSpeed(render, speed); delete render; - EXPECT_EQ(ERR_DH_AUDIO_HDI_NULLPTR, ret); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, ret); } /** @@ -190,7 +190,7 @@ HWTEST_F(AudioRenderTest, GetRenderSpeedInternal_002, TestSize.Level1) int32_t ret = renderContext.instance_.GetRenderSpeed(render, speed); delete render; delete speed; - EXPECT_EQ(ERR_DH_AUDIO_HDI_NULLPTR, ret); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, ret); } /** @@ -219,7 +219,7 @@ HWTEST_F(AudioRenderTest, SetChannelModeInternal_002, TestSize.Level1) struct AudioRender *render = new AudioRender; int32_t ret = renderContext.instance_.SetChannelMode(render, AUDIO_CHANNEL_NORMAL); delete render; - EXPECT_EQ(ERR_DH_AUDIO_HDI_NULLPTR, ret); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, ret); } /** @@ -251,7 +251,7 @@ HWTEST_F(AudioRenderTest, GetChannelModeInternal_002, TestSize.Level1) int32_t ret = renderContext.instance_.GetChannelMode(render, mode); delete render; delete mode; - EXPECT_EQ(ERR_DH_AUDIO_HDI_NULLPTR, ret); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, ret); } /** @@ -299,7 +299,7 @@ HWTEST_F(AudioRenderTest, DrainBufferInternal_002, TestSize.Level1) int32_t ret = renderContext.instance_.DrainBuffer(render, type); delete render; delete type; - EXPECT_EQ(ERR_DH_AUDIO_HDI_NULLPTR, ret); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, ret); } } // DistributedHardware } // OHOS \ No newline at end of file diff --git a/services/softbusadapter/src/softbus_adapter.cpp b/services/softbusadapter/src/softbus_adapter.cpp index 3d15637008f0efe33072bcb358808915b0a12580..b947346cbb8b25a2eccb6340c6051843768f2fb5 100644 --- a/services/softbusadapter/src/softbus_adapter.cpp +++ b/services/softbusadapter/src/softbus_adapter.cpp @@ -142,7 +142,7 @@ int32_t SoftbusAdapter::OpenSoftbusSession(const std::string &localSessionName, int32_t sessionId = OpenSession(localSessionName.c_str(), peerSessionName.c_str(), peerDevId.c_str(), "0", &attr); if (sessionId < 0) { DHLOGE("Open softbus session failed sessionId: %d.", sessionId); - return ERR_DH_AUDIO_ADAPTER_OPEN_SESSION_FAIL; + return ERR_DH_AUDIO_FAILED; } DHLOGI("Open softbus session success."); return sessionId; @@ -175,7 +175,7 @@ int32_t SoftbusAdapter::SendSoftbusStream(int32_t sessionId, const std::shared_p DHLOGI("Send audio data, sessionId: %d.", sessionId); if (audioData == nullptr) { DHLOGE("Audio data is null."); - return ERR_DH_AUDIO_TRANS_NULL_VALUE; + return ERR_DH_AUDIO_NULLPTR; } std::lock_guard lck(dataQueueMtx_); while (audioDataQueue_.size() >= DATA_QUEUE_MAX_SIZE) { @@ -216,7 +216,7 @@ int32_t SoftbusAdapter::OnSoftbusSessionOpened(int32_t sessionId, int32_t result DHLOGI("On session opened, sessionId: %d, result: %d.", sessionId, result); if (result != SOFTBUS_OK) { DHLOGE("Session open failed."); - return ERR_DH_AUDIO_ADAPTER_OPEN_SESSION_FAIL; + return ERR_DH_AUDIO_FAILED; } auto &listener = GetSoftbusListenerByName(sessionId); if (!listener) { diff --git a/services/softbusadapter/test/unittest/src/softbus_adapter_test.cpp b/services/softbusadapter/test/unittest/src/softbus_adapter_test.cpp index 42205527e2d4c07050ef08af42e011abe0098f4f..cff9bd707bff8f54e38c2ea6ccb3b424658de087 100644 --- a/services/softbusadapter/test/unittest/src/softbus_adapter_test.cpp +++ b/services/softbusadapter/test/unittest/src/softbus_adapter_test.cpp @@ -72,7 +72,7 @@ HWTEST_F(SoftbusAdapterTest, OpenSoftbusSession_001, TestSize.Level1) std::string peerDevId; int32_t actual = softbusAdapter.OpenSoftbusSession(localSessionName, peerSessionName, peerDevId); - EXPECT_EQ(ERR_DH_AUDIO_ADAPTER_OPEN_SESSION_FAIL, actual); + EXPECT_EQ(ERR_DH_AUDIO_FAILED, actual); EXPECT_EQ(DH_SUCCESS, softbusAdapter.CloseSoftbusSession(actual)); } @@ -133,7 +133,7 @@ HWTEST_F(SoftbusAdapterTest, OnSoftbusSessionOpened_001, TestSize.Level1) int32_t sessionId = 1; int32_t result = -1; - EXPECT_EQ(ERR_DH_AUDIO_ADAPTER_OPEN_SESSION_FAIL, softbusAdapter.OnSoftbusSessionOpened(sessionId, result)); + EXPECT_EQ(ERR_DH_AUDIO_FAILED, softbusAdapter.OnSoftbusSessionOpened(sessionId, result)); } /**