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 9b71312ec89bc9dcaf074e56bed741f6cb559062..360a670d993909a31a3f22d7b9e9df1fd9f7269e 100644 --- a/services/audioclient/test/unittest/spkclient/src/dspeaker_client_test.cpp +++ b/services/audioclient/test/unittest/spkclient/src/dspeaker_client_test.cpp @@ -107,7 +107,7 @@ HWTEST_F(DSpeakerClientTest, StopRender001, TestSize.Level1) speakerClient_->PlayStatusChange(args); speakerClient_->SetAudioParameters(event); speakerClient_->SetMute(event); - for (size_t i =0; i<10; i++) { + for (size_t i = 0; i < 10; i++) { std::shared_ptr data = std::make_shared(4096); speakerClient_->dataQueue_.push(data); } diff --git a/services/audiohdiproxy/include/idaudio_hdi_callback.h b/services/audiohdiproxy/include/idaudio_hdi_callback.h index 2c7a70f891dab1a431bfc769ca74caa162c13262..23b257d8de7e5b498712473c4f30ae2dc2504c79 100644 --- a/services/audiohdiproxy/include/idaudio_hdi_callback.h +++ b/services/audiohdiproxy/include/idaudio_hdi_callback.h @@ -30,9 +30,9 @@ public: virtual int32_t CloseDevice(const std::string &devId, const int32_t dhId) = 0; - virtual int32_t SetParameters(const std::string &devId, const int32_t dhId, const AudioParamHDF& param) = 0; + virtual int32_t SetParameters(const std::string &devId, const int32_t dhId, const AudioParamHDF ¶m) = 0; - virtual int32_t NotifyEvent(const std::string &devId, const int32_t dhId, const AudioEvent& event) = 0; + virtual int32_t NotifyEvent(const std::string &devId, const int32_t dhId, const AudioEvent &event) = 0; virtual int32_t WriteStreamData(const std::string &devId, const int32_t dhId, std::shared_ptr &data) = 0; diff --git a/services/audiomanager/managersink/src/daudio_sink_dev.cpp b/services/audiomanager/managersink/src/daudio_sink_dev.cpp index 294b550e804a395f27ba32bcd425c60ba4d2f032..e2787d2bdeaa4e8924189fb1bde77528c327878d 100644 --- a/services/audiomanager/managersink/src/daudio_sink_dev.cpp +++ b/services/audiomanager/managersink/src/daudio_sink_dev.cpp @@ -614,7 +614,7 @@ void DAudioSinkDev::NotifySourceDev(const AudioEventType type, const std::string jEvent[KEY_EVENT_TYPE] = type; jEvent[KEY_RANDOM_TASK_CODE] = std::to_string(randomTaskCode); - DHLOGI("notify source dev, random task code: %d", randomTaskCode); + DHLOGI("notify source dev, random task code: %s", std::to_string(randomTaskCode).c_str()); DAudioSinkManager::GetInstance().DAudioNotify(devId_, dhId, type, jEvent.dump()); } diff --git a/services/audiomanager/managersink/src/daudio_sink_manager.cpp b/services/audiomanager/managersink/src/daudio_sink_manager.cpp index 1c50d32a326fdfa2402aaf08fc233db49e19e645..a7da4414e8a797cff65ba4ca1e5e785248153b24 100644 --- a/services/audiomanager/managersink/src/daudio_sink_manager.cpp +++ b/services/audiomanager/managersink/src/daudio_sink_manager.cpp @@ -97,9 +97,9 @@ int32_t DAudioSinkManager::HandleDAudioNotify(const std::string &devId, const st } json jParam = json::parse(eventContent, nullptr, false); - if (JsonParamCheck(jParam, { KEY_RANDOM_TASK_CODE }) && CheckIsNum((std::string)jParam[KEY_RANDOM_TASK_CODE])) { - int32_t randomCode = std::stoi((std::string)jParam[KEY_RANDOM_TASK_CODE]); - DHLOGI("Receive audio notify from source, random task code: %d", randomCode); + if (JsonParamCheck(jParam, { KEY_RANDOM_TASK_CODE })) { + DHLOGI("Receive audio notify from source, random task code: %s", + ((std::string)jParam[KEY_RANDOM_TASK_CODE]).c_str()); } std::lock_guard lock(devMapMutex_); diff --git a/services/audiomanager/managersource/include/dspeaker_dev.h b/services/audiomanager/managersource/include/dspeaker_dev.h index d5ced91bd4a25b5237659d9d1a1f5b060ae768a3..5b2c009bd6b550fd0096ea8fb18b86b1a5515ef8 100644 --- a/services/audiomanager/managersource/include/dspeaker_dev.h +++ b/services/audiomanager/managersource/include/dspeaker_dev.h @@ -22,7 +22,6 @@ #include "nlohmann/json.hpp" #include "audio_param.h" -#include "ashmem.h" #include "idaudio_hdi_callback.h" #include "daudio_hdi_handler.h" #include "iaudio_data_transport.h" diff --git a/services/audiomanager/managersource/src/daudio_source_dev.cpp b/services/audiomanager/managersource/src/daudio_source_dev.cpp index 47397aa92fe6c9563543d451a84ebbed976bfcc0..be4ef583d1c8ba1570a733c57cd367b5c44bb352 100644 --- a/services/audiomanager/managersource/src/daudio_source_dev.cpp +++ b/services/audiomanager/managersource/src/daudio_source_dev.cpp @@ -824,7 +824,7 @@ int32_t DAudioSourceDev::NotifySinkDev(const AudioEventType type, const json Par { KEY_EVENT_TYPE, type }, { KEY_AUDIO_PARAM, Param }, { KEY_RANDOM_TASK_CODE, std::to_string(randomTaskCode) } }; - DHLOGI("Notify sin dev, random task code: %d", randomTaskCode); + DHLOGI("Notify sink dev, random task code: %s", std::to_string(randomTaskCode).c_str()); DAudioSourceManager::GetInstance().DAudioNotify(devId_, dhId, type, jParam.dump()); return WaitForRPC(static_cast(static_cast(type) + eventOffset)); } diff --git a/services/audiomanager/managersource/src/daudio_source_manager.cpp b/services/audiomanager/managersource/src/daudio_source_manager.cpp index 45b8dc49f0c07479aa6e5cc004e02aec81702470..de960d552703e26cbfc300e0c8d35a2b3297626e 100644 --- a/services/audiomanager/managersource/src/daudio_source_manager.cpp +++ b/services/audiomanager/managersource/src/daudio_source_manager.cpp @@ -133,10 +133,11 @@ int32_t DAudioSourceManager::HandleDAudioNotify(const std::string &devId, const } json jParam = json::parse(eventContent, nullptr, false); - if (JsonParamCheck(jParam, { KEY_RANDOM_TASK_CODE }) && CheckIsNum((std::string)jParam[KEY_RANDOM_TASK_CODE])) { - int32_t randomCode = std::stoi((std::string)jParam[KEY_RANDOM_TASK_CODE]); - DHLOGI("Handle distributed audio notify from sink, random task code: %d", randomCode); + if (JsonParamCheck(jParam, { KEY_RANDOM_TASK_CODE })) { + DHLOGI("Receive audio notify from sink, random task code: %s", + ((std::string)jParam[KEY_RANDOM_TASK_CODE]).c_str()); } + std::lock_guard lock(devMapMtx_); auto dev = audioDevMap_.find(devId); if (dev == audioDevMap_.end()) { 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 a80a315c715240826dec35758d8a894886ff75fe..2f23f02ae3a6a5a4a22f9e45e77465f95e2bfae5 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 @@ -156,7 +156,7 @@ HWTEST_F(AudioCtrlChannelTest, SendMsg_001, TestSize.Level1) StreamFrameInfo *streamFrameInfo; ctrlChannel_->OnStreamReceived(sessionId, datas, ext, streamFrameInfo); - string message = "sendMag"; + string message = "sendMsg"; EXPECT_NE(ERR_DH_AUDIO_CTRL_CHANNEL_SEND_MSG_FAIL, ctrlChannel_->SendMsg(message)); } } // namespace DistributedHardware diff --git a/services/audiotransport/test/unittest/audiotransportstatus/src/audio_transport_pause_status_test.cpp b/services/audiotransport/test/unittest/audiotransportstatus/src/audio_transport_pause_status_test.cpp index f4671539b04b54b0d4180be26db0abb36093da89..bd607d87a4656b18e04e24ad6824e04c3c069be9 100644 --- a/services/audiotransport/test/unittest/audiotransportstatus/src/audio_transport_pause_status_test.cpp +++ b/services/audiotransport/test/unittest/audiotransportstatus/src/audio_transport_pause_status_test.cpp @@ -108,12 +108,12 @@ HWTEST_F(AudioTransportPauseStatusTest, transport_pause_test_004, TestSize.Level }, { SOURCE_TYPE_INVALID, - NORMAL_MODE, + NORMAL_MODE }, { CONTENT_TYPE_UNKNOWN, STREAM_USAGE_UNKNOWN, - NORMAL_MODE, + NORMAL_MODE } }; AudioParam testRemoteParaEnc = { @@ -125,12 +125,12 @@ HWTEST_F(AudioTransportPauseStatusTest, transport_pause_test_004, TestSize.Level }, { SOURCE_TYPE_INVALID, - NORMAL_MODE, + NORMAL_MODE }, { CONTENT_TYPE_UNKNOWN, STREAM_USAGE_UNKNOWN, - NORMAL_MODE, + NORMAL_MODE } }; std::string peerDevId = "peerDevId";