From d0aeeef0028f532adee69aacb6d8131adf0d0b5e Mon Sep 17 00:00:00 2001 From: hwwuhaobo Date: Thu, 6 Apr 2023 14:36:33 +0800 Subject: [PATCH 1/2] fix readme Signed-off-by: hwwuhaobo --- README_zh.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README_zh.md b/README_zh.md index c305ca6a..dc927f7a 100644 --- a/README_zh.md +++ b/README_zh.md @@ -18,7 +18,7 @@ **主控端分布式音频设备抽象(DAudioSourceDevice)**：被控端设备在主控端设备的抽象，实现被控端音频设备音量、焦点、媒体键事件的控制。当执行录音功能时，该模块接收从被控端设备传来的音频编码数据，完成解码操作后，将音频流送给主控端音频框架。当执行放音功能时，该模块接收主控端音频框架的音频流，并对其进行编码处理，将处理后的编码数据发送给被控端设备。 -**被控端分布式音频设备抽象(DAudioSinkDevice)**：主控端设备在被控端设备的代理，实现对主控端发送的音量、焦点、媒体键事件的响应和处理。当执行录音功能时，该模块接受本地采集音频流，进行编码处理后，将编码数据发送给主控端设备。当执行放音功能时，该模块接收从主控端设备传来的音频流数据，完成解码操作，送给本地音频框架进行播放。 +**被控端分布式音频设备抽象(DAudioSinkDevice)**：主控端设备在被控端设备的代理，实现对主控端发送的音量、焦点、媒体键事件的响应和处理。当执行录音功能时，该模块接收本地采集音频流，进行编码处理后，将编码数据发送给主控端设备。当执行放音功能时，该模块接收从主控端设备传来的音频流数据，完成解码操作，送给本地音频框架进行播放。 **分布式音频主控端控制模块(DAudioSourceCtrlMgr)**：负责响应被控端设备媒体键事件、主控端设备与被控端设备之间音量同步、响应被控端设备音频焦点状态等任务的处理。 -- Gitee From 31dcf2556273fb9d770864a5449d9431f446b661 Mon Sep 17 00:00:00 2001 From: hwwuhaobo Date: Tue, 18 Apr 2023 14:21:02 +0800 Subject: [PATCH 2/2] modify some codecheck & randomcode Signed-off-by: hwwuhaobo --- .../test/unittest/spkclient/src/dspeaker_client_test.cpp | 2 +- services/audiohdiproxy/include/idaudio_hdi_callback.h | 4 ++-- services/audiomanager/managersink/src/daudio_sink_dev.cpp | 2 +- .../audiomanager/managersink/src/daudio_sink_manager.cpp | 6 +++--- .../audiomanager/managersource/include/dspeaker_dev.h | 1 - .../audiomanager/managersource/src/daudio_source_dev.cpp | 2 +- .../managersource/src/daudio_source_manager.cpp | 7 ++++--- .../audioctrlchannel/src/audio_ctrl_channel_test.cpp | 2 +- .../src/audio_transport_pause_status_test.cpp | 8 ++++---- 9 files changed, 17 insertions(+), 17 deletions(-) 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 9b71312e..360a670d 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 2c7a70f8..23b257d8 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 294b550e..e2787d2b 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 1c50d32a..a7da4414 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 d5ced91b..5b2c009b 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 47397aa9..be4ef583 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 45b8dc49..de960d55 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 a80a315c..2f23f02a 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 f4671539..bd607d87 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"; -- Gitee