From 970eb75e885aad51e011cd9809d8552f67413f1d Mon Sep 17 00:00:00 2001 From: kw Date: Mon, 18 Aug 2025 10:53:12 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=B4=E6=92=AD=E5=8F=8C=E5=93=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: kw --- .../ipc_proxy/include/audio_server_proxy.h | 3 +- .../ipc_proxy/src/audio_server_proxy.cpp | 5 ++- .../idl/IStandardAudioService.idl | 2 +- .../libaudio_process_service.versionscript | 4 +- .../server/include/audio_server.h | 2 +- .../server/include/audio_service.h | 4 +- .../server/include/hpae_adapter_manager.h | 3 +- .../server/include/i_stream_manager.h | 6 ++- .../server/include/pa_adapter_manager.h | 3 +- .../server/include/pro_audio_stream_manager.h | 3 +- .../server/include/renderer_in_server.h | 4 +- .../audio_service/server/src/audio_server.cpp | 6 +-- .../server/src/audio_service.cpp | 8 ++-- .../server/src/hpae_adapter_manager.cpp | 4 +- .../server/src/pa_adapter_manager.cpp | 3 +- .../server/src/pro_audio_stream_manager.cpp | 3 +- .../server/src/renderer_in_server.cpp | 9 ++-- .../test/unittest/audio_service_unit_test.cpp | 16 +++---- .../renderer_in_server_third_unit_test.cpp | 12 +++--- .../src/renderer_in_server_unit_test.cpp | 42 +++++++++---------- .../audio_server_more_fuzzer.cpp | 4 +- .../audio_service_fuzzer.cpp | 4 +- ...udio_service_server_src_enhance_fuzzer.cpp | 2 +- 23 files changed, 83 insertions(+), 69 deletions(-) diff --git a/services/audio_policy/server/infra/ipc_proxy/include/audio_server_proxy.h b/services/audio_policy/server/infra/ipc_proxy/include/audio_server_proxy.h index 9e55b51714..adc119bb64 100644 --- a/services/audio_policy/server/infra/ipc_proxy/include/audio_server_proxy.h +++ b/services/audio_policy/server/infra/ipc_proxy/include/audio_server_proxy.h @@ -54,7 +54,8 @@ public: bool GetEffectOffloadEnabledProxy(); int32_t UpdateActiveDevicesRouteProxy(std::vector> &activeDevices, BluetoothOffloadState state, const std::string &deviceName = ""); - int32_t UpdateDualToneStateProxy(const bool &enable, const int32_t &sessionId); + int32_t UpdateDualToneStateProxy(const bool &enable, const int32_t &sessionId, + const std::string &dupSinkName = "Speaker"); void UpdateSessionConnectionStateProxy(const int32_t &sessionID, const int32_t &state); int32_t CheckRemoteDeviceStateProxy(std::string networkId, DeviceRole deviceRole, bool isStartDevice); void SetAudioParameterProxy(const std::string &key, const std::string &value); diff --git a/services/audio_policy/server/infra/ipc_proxy/src/audio_server_proxy.cpp b/services/audio_policy/server/infra/ipc_proxy/src/audio_server_proxy.cpp index 26e34ac9ac..806c82237d 100644 --- a/services/audio_policy/server/infra/ipc_proxy/src/audio_server_proxy.cpp +++ b/services/audio_policy/server/infra/ipc_proxy/src/audio_server_proxy.cpp @@ -149,12 +149,13 @@ void AudioServerProxy::SetDmDeviceTypeProxy(uint16_t dmDeviceType, DeviceType de IPCSkeleton::SetCallingIdentity(identity); } -int32_t AudioServerProxy::UpdateDualToneStateProxy(const bool &enable, const int32_t &sessionId) +int32_t AudioServerProxy::UpdateDualToneStateProxy(const bool &enable, const int32_t &sessionId, + const std::string &dupSinkName) { const sptr gsp = GetAudioServerProxy(); CHECK_AND_RETURN_RET_LOG(gsp != nullptr, ERR_OPERATION_FAILED, "Service proxy unavailable"); std::string identity = IPCSkeleton::ResetCallingIdentity(); - int32_t ret = gsp->UpdateDualToneState(enable, sessionId); + int32_t ret = gsp->UpdateDualToneState(enable, sessionId, dupSinkName); IPCSkeleton::SetCallingIdentity(identity); return ret; } diff --git a/services/audio_service/idl/IStandardAudioService.idl b/services/audio_service/idl/IStandardAudioService.idl index a63f46cd97..f7a209b482 100644 --- a/services/audio_service/idl/IStandardAudioService.idl +++ b/services/audio_service/idl/IStandardAudioService.idl @@ -43,7 +43,7 @@ interface IStandardAudioService { void SetAudioScene([in] int audioScene, [in] int a2dpOffloadFlag, [in] boolean scoExcludeFlag); void UpdateActiveDeviceRoute([in] int type, [in] int flag, [in] int a2dpOffloadFlag); void UpdateActiveDevicesRoute([in] List activeDevices, [in] int a2dpOffloadFlag, [in] String deviceName); - void UpdateDualToneState([in] boolean enable, [in] int sessionId); + void UpdateDualToneState([in] boolean enable, [in] int sessionId, [in] String dupSinkName); void GetTransactionId([in] int deviceType, [in] int deviceRole, [out] unsigned long transactionId); void SetParameterCallback([in] IRemoteObject object); void GetAudioParameter([in] String networkId, [in] int key, [in] String condition, [out] String value); diff --git a/services/audio_service/libaudio_process_service.versionscript b/services/audio_service/libaudio_process_service.versionscript index 056d705215..184587e4fa 100644 --- a/services/audio_service/libaudio_process_service.versionscript +++ b/services/audio_service/libaudio_process_service.versionscript @@ -15,8 +15,8 @@ global: *GetInstance*; *GetRecorderManager*; - *EnableDualToneList*; - *DisableDualToneList*; + *EnableDualStream*; + *DisableDualStream*; *GetAndSaveClientType*; *IsExceedingMaxStreamCntPerUid*; *ConfigPolicyProvider*; diff --git a/services/audio_service/server/include/audio_server.h b/services/audio_service/server/include/audio_server.h index 70a022a370..234c946f1c 100644 --- a/services/audio_service/server/include/audio_server.h +++ b/services/audio_service/server/include/audio_server.h @@ -109,7 +109,7 @@ public: int32_t UpdateActiveDevicesRoute(const std::vector &activeDevices, int32_t a2dpOffloadFlag, const std::string &deviceName) override; int32_t SetDmDeviceType(uint16_t dmDeviceType, int32_t deviceType) override; - int32_t UpdateDualToneState(bool enable, int32_t sessionId) override; + int32_t UpdateDualToneState(bool enable, int32_t sessionId, const std::string &dupSinkName) override; int32_t SetAudioMonoState(bool audioMono) override; int32_t SetAudioBalanceValue(float audioBalance) override; int32_t SuspendRenderSink(const std::string &sinkName) override; diff --git a/services/audio_service/server/include/audio_service.h b/services/audio_service/server/include/audio_service.h index 06d170252b..27ebda845c 100644 --- a/services/audio_service/server/include/audio_service.h +++ b/services/audio_service/server/include/audio_service.h @@ -104,8 +104,8 @@ public: void RemoveRenderer(uint32_t sessionId, bool isSwitchStream = false); void RemoveCapturer(uint32_t sessionId, bool isSwitchStream = false); - int32_t EnableDualToneList(uint32_t sessionId); - int32_t DisableDualToneList(uint32_t sessionId); + int32_t EnableDualStream(const uint32_t sessionId, const std::string &dupSinkName); + int32_t DisableDualStream(const uint32_t sessionId); int32_t SetOffloadMode(uint32_t sessionId, int32_t state, bool isAppBack); int32_t UnsetOffloadMode(uint32_t sessionId); void UpdateAudioSinkState(uint32_t sinkId, bool started); diff --git a/services/audio_service/server/include/hpae_adapter_manager.h b/services/audio_service/server/include/hpae_adapter_manager.h index 558977a29a..9e83ac0ab2 100644 --- a/services/audio_service/server/include/hpae_adapter_manager.h +++ b/services/audio_service/server/include/hpae_adapter_manager.h @@ -31,7 +31,8 @@ class HpaeAdapterManager : public IStreamManager { public: HpaeAdapterManager(ManagerType type); - int32_t CreateRender(AudioProcessConfig processConfig, std::shared_ptr &stream) override; + int32_t CreateRender(AudioProcessConfig processConfig, std::shared_ptr &stream, + std::optional originDeviceName = std::nullopt) override; int32_t ReleaseRender(uint32_t streamIndex_) override; int32_t StartRender(uint32_t streamIndex) override; int32_t StartRenderWithSyncId(uint32_t streamIndex, const int32_t &syncId) override; diff --git a/services/audio_service/server/include/i_stream_manager.h b/services/audio_service/server/include/i_stream_manager.h index b438e16b1b..955f81fc1e 100644 --- a/services/audio_service/server/include/i_stream_manager.h +++ b/services/audio_service/server/include/i_stream_manager.h @@ -16,6 +16,9 @@ #ifndef I_STREAM_MANAGER_H #define I_STREAM_MANAGER_H +#include +#include + #include "i_renderer_stream.h" #include "i_capturer_stream.h" @@ -40,7 +43,8 @@ public: static IStreamManager &GetDupPlaybackManager(); static IStreamManager &GetDualPlaybackManager(); - virtual int32_t CreateRender(AudioProcessConfig processConfig, std::shared_ptr &stream) = 0; + virtual int32_t CreateRender(AudioProcessConfig processConfig, std::shared_ptr &stream, + std::optional originDeviceName = std::nullopt) = 0; virtual int32_t ReleaseRender(uint32_t streamIndex_) = 0; virtual int32_t StartRender(uint32_t streamIndex) = 0; virtual int32_t StartRenderWithSyncId(uint32_t streamIndex, const int32_t &syncId) diff --git a/services/audio_service/server/include/pa_adapter_manager.h b/services/audio_service/server/include/pa_adapter_manager.h index fe3c93d973..13027bfa25 100644 --- a/services/audio_service/server/include/pa_adapter_manager.h +++ b/services/audio_service/server/include/pa_adapter_manager.h @@ -66,7 +66,8 @@ class PaAdapterManager : public IStreamManager { public: PaAdapterManager(ManagerType type); - int32_t CreateRender(AudioProcessConfig processConfig, std::shared_ptr &stream) override; + int32_t CreateRender(AudioProcessConfig processConfig, std::shared_ptr &stream, + std::optional originDeviceName = std::nullopt) override; int32_t ReleaseRender(uint32_t streamIndex_) override; int32_t StartRender(uint32_t streamIndex) override; int32_t StopRender(uint32_t streamIndex) override; diff --git a/services/audio_service/server/include/pro_audio_stream_manager.h b/services/audio_service/server/include/pro_audio_stream_manager.h index 1c91ba32d7..b87b70f540 100644 --- a/services/audio_service/server/include/pro_audio_stream_manager.h +++ b/services/audio_service/server/include/pro_audio_stream_manager.h @@ -26,7 +26,8 @@ class ProAudioStreamManager : public IStreamManager { public: explicit ProAudioStreamManager(ManagerType type); virtual ~ProAudioStreamManager(); - int32_t CreateRender(AudioProcessConfig processConfig, std::shared_ptr &stream) override; + int32_t CreateRender(AudioProcessConfig processConfig, std::shared_ptr &stream, + std::optional originDeviceName = std::nullopt) override; int32_t StartRender(uint32_t streamIndex) override; int32_t StopRender(uint32_t streamIndex) override; int32_t ReleaseRender(uint32_t streamIndex) override; diff --git a/services/audio_service/server/include/renderer_in_server.h b/services/audio_service/server/include/renderer_in_server.h index 83cdfd36bb..027fcdac37 100644 --- a/services/audio_service/server/include/renderer_in_server.h +++ b/services/audio_service/server/include/renderer_in_server.h @@ -119,9 +119,9 @@ public: std::unique_ptr& GetDupRingBuffer(); // for dual tone - int32_t EnableDualTone(); + int32_t EnableDualTone(const std::string &dupSinkName); int32_t DisableDualTone(); - int32_t InitDualToneStream(); + int32_t InitDualToneStream(const std::string &dupSinkName); void GetEAC3ControlParam(); int32_t GetStreamManagerType() const noexcept; diff --git a/services/audio_service/server/src/audio_server.cpp b/services/audio_service/server/src/audio_server.cpp index 12c41ac0cf..72378952a2 100644 --- a/services/audio_service/server/src/audio_server.cpp +++ b/services/audio_service/server/src/audio_server.cpp @@ -2591,15 +2591,15 @@ int32_t AudioServer::UpdateLatencyTimestamp(const std::string ×tamp, bool i } // LCOV_EXCL_START -int32_t AudioServer::UpdateDualToneState(bool enable, int32_t sessionId) +int32_t AudioServer::UpdateDualToneState(bool enable, int32_t sessionId, const std::string &dupSinkName) { int32_t callingUid = IPCSkeleton::GetCallingUid(); CHECK_AND_RETURN_RET_LOG(PermissionUtil::VerifyIsAudio(), ERR_NOT_SUPPORTED, "refused for %{public}d", callingUid); if (enable) { - return AudioService::GetInstance()->EnableDualToneList(static_cast(sessionId)); + return AudioService::GetInstance()->EnableDualStream(static_cast(sessionId), dupSinkName); } else { - return AudioService::GetInstance()->DisableDualToneList(static_cast(sessionId)); + return AudioService::GetInstance()->DisableDualStream(static_cast(sessionId)); } } // LCOV_EXCL_STOP diff --git a/services/audio_service/server/src/audio_service.cpp b/services/audio_service/server/src/audio_service.cpp index 6fd8534d54..a0e311d313 100644 --- a/services/audio_service/server/src/audio_service.cpp +++ b/services/audio_service/server/src/audio_service.cpp @@ -885,10 +885,10 @@ int32_t AudioService::OnUpdateInnerCapList(int32_t innerCapId) } #endif -int32_t AudioService::EnableDualToneList(uint32_t sessionId) +int32_t AudioService::EnableDualStream(const uint32_t sessionId, const std::string &dupSinkName) { workingDualToneId_ = sessionId; - AUDIO_INFO_LOG("EnableDualToneList sessionId is %{public}d", sessionId); + AUDIO_INFO_LOG("sessionId is %{public}d", sessionId); std::unique_lock lock(rendererMapMutex_); for (auto it = allRendererMap_.begin(); it != allRendererMap_.end(); it++) { std::shared_ptr renderer = it->second.lock(); @@ -897,14 +897,14 @@ int32_t AudioService::EnableDualToneList(uint32_t sessionId) continue; } if (ShouldBeDualTone(renderer->processConfig_)) { - renderer->EnableDualTone(); + renderer->EnableDualTone(dupSinkName); filteredDualToneRendererMap_.push_back(renderer); } } return SUCCESS; } -int32_t AudioService::DisableDualToneList(uint32_t sessionId) +int32_t AudioService::DisableDualStream(const uint32_t sessionId) { AUDIO_INFO_LOG("disable dual tone, sessionId is %{public}d", sessionId); std::unique_lock lock(rendererMapMutex_); diff --git a/services/audio_service/server/src/hpae_adapter_manager.cpp b/services/audio_service/server/src/hpae_adapter_manager.cpp index caf5d2db59..7a6749be5e 100644 --- a/services/audio_service/server/src/hpae_adapter_manager.cpp +++ b/services/audio_service/server/src/hpae_adapter_manager.cpp @@ -39,7 +39,8 @@ HpaeAdapterManager::HpaeAdapterManager(ManagerType type) managerType_ = type; } -int32_t HpaeAdapterManager::CreateRender(AudioProcessConfig processConfig, std::shared_ptr &stream) +int32_t HpaeAdapterManager::CreateRender(AudioProcessConfig processConfig, std::shared_ptr &stream, + std::optional originDeviceName) { AUDIO_DEBUG_LOG("Create renderer start"); uint32_t sessionId = 0; @@ -60,6 +61,7 @@ int32_t HpaeAdapterManager::CreateRender(AudioProcessConfig processConfig, std:: AUDIO_INFO_LOG("sink name is null"); deviceName = "Speaker"; } + deviceName = originDeviceName.has_value() ? std::string(originDeviceName.value()) : deviceName; // HpaeAdapterManager is solely responsible for creating paStream objects std::shared_ptr rendererStream = CreateRendererStream(processConfig, deviceName); CHECK_AND_RETURN_RET_LOG(rendererStream != nullptr, ERR_DEVICE_INIT, "Failed to init pa stream!"); diff --git a/services/audio_service/server/src/pa_adapter_manager.cpp b/services/audio_service/server/src/pa_adapter_manager.cpp index b12d911a87..a6e4c45640 100644 --- a/services/audio_service/server/src/pa_adapter_manager.cpp +++ b/services/audio_service/server/src/pa_adapter_manager.cpp @@ -91,7 +91,8 @@ PaAdapterManager::PaAdapterManager(ManagerType type) managerType_ = type; } -int32_t PaAdapterManager::CreateRender(AudioProcessConfig processConfig, std::shared_ptr &stream) +int32_t PaAdapterManager::CreateRender(AudioProcessConfig processConfig, std::shared_ptr &stream, + std::optional originDeviceName) { AUDIO_DEBUG_LOG("Create renderer start"); int32_t ret = InitPaContext(); diff --git a/services/audio_service/server/src/pro_audio_stream_manager.cpp b/services/audio_service/server/src/pro_audio_stream_manager.cpp index bae03d837a..7fc09b7481 100644 --- a/services/audio_service/server/src/pro_audio_stream_manager.cpp +++ b/services/audio_service/server/src/pro_audio_stream_manager.cpp @@ -49,7 +49,8 @@ ProAudioStreamManager::~ProAudioStreamManager() AUDIO_DEBUG_LOG("~ProAudioStreamManager"); } -int32_t ProAudioStreamManager::CreateRender(AudioProcessConfig processConfig, std::shared_ptr &stream) +int32_t ProAudioStreamManager::CreateRender(AudioProcessConfig processConfig, std::shared_ptr &stream, + std::optional originDeviceName) { Trace trace("ProAudioStreamManager::CreateRender"); AUDIO_DEBUG_LOG("Create renderer start,manager type:%{public}d", managerType_); diff --git a/services/audio_service/server/src/renderer_in_server.cpp b/services/audio_service/server/src/renderer_in_server.cpp index f3ba295541..5a6282dbae 100644 --- a/services/audio_service/server/src/renderer_in_server.cpp +++ b/services/audio_service/server/src/renderer_in_server.cpp @@ -1573,13 +1573,13 @@ int32_t RendererInServer::InitDupStreamVolume(uint32_t dupStreamIndex) return SUCCESS; } -int32_t RendererInServer::EnableDualTone() +int32_t RendererInServer::EnableDualTone(const std::string &dupSinkName) { if (isDualToneEnabled_) { AUDIO_INFO_LOG("DualTone is already enabled"); return SUCCESS; } - int32_t ret = InitDualToneStream(); + int32_t ret = InitDualToneStream(dupSinkName); CHECK_AND_RETURN_RET_LOG(ret == SUCCESS, ERR_OPERATION_FAILED, "Init dual tone stream failed"); return SUCCESS; } @@ -1601,12 +1601,13 @@ int32_t RendererInServer::DisableDualTone() return ERROR; } -int32_t RendererInServer::InitDualToneStream() +int32_t RendererInServer::InitDualToneStream(const std::string &dupSinkName) { { std::lock_guard lock(dualToneMutex_); - int32_t ret = IStreamManager::GetDualPlaybackManager().CreateRender(processConfig_, dualToneStream_); + int32_t ret = IStreamManager::GetDualPlaybackManager().CreateRender(processConfig_, dualToneStream_, + dupSinkName); CHECK_AND_RETURN_RET_LOG(ret == SUCCESS && dualToneStream_ != nullptr, ERR_OPERATION_FAILED, "Failed: %{public}d", ret); dualToneStreamIndex_ = dualToneStream_->GetStreamIndex(); diff --git a/services/audio_service/test/unittest/audio_service_unit_test.cpp b/services/audio_service/test/unittest/audio_service_unit_test.cpp index 7f41d9b0f6..337e5c7b63 100644 --- a/services/audio_service/test/unittest/audio_service_unit_test.cpp +++ b/services/audio_service/test/unittest/audio_service_unit_test.cpp @@ -566,9 +566,9 @@ HWTEST(AudioServiceUnitTest, AudioServiceOnInitInnerCapList_001, TestSize.Level1 EXPECT_EQ(0, floatRet); floatRet = AudioService::GetInstance()->GetMaxAmplitude(false); EXPECT_EQ(0, floatRet); - int32_t ret = AudioService::GetInstance()->EnableDualToneList(MAX_STREAMID - 1); + int32_t ret = AudioService::GetInstance()->EnableDualStream(MAX_STREAMID - 1, "Speaker"); EXPECT_EQ(SUCCESS, ret); - ret = AudioService::GetInstance()->DisableDualToneList(MAX_STREAMID - 1); + ret = AudioService::GetInstance()->DisableDualStream(MAX_STREAMID - 1); EXPECT_EQ(SUCCESS, ret); AudioService::GetInstance()->ResetAudioEndpoint(); ret = AudioService::GetInstance()->OnProcessRelease(audioProcess, false); @@ -1411,18 +1411,18 @@ HWTEST(AudioServiceUnitTest, OnUpdateInnerCapList_001, TestSize.Level1) } /** - * @tc.name : Test EnableDualToneList API + * @tc.name : Test EnableDualStream API * @tc.type : FUNC - * @tc.number: EnableDualToneList_001 - * @tc.desc : Test EnableDualToneList interface. + * @tc.number: EnableDualStream_001 + * @tc.desc : Test EnableDualStream interface. */ -HWTEST(AudioServiceUnitTest, EnableDualToneList_001, TestSize.Level1) +HWTEST(AudioServiceUnitTest, EnableDualStream_001, TestSize.Level1) { AudioService *audioService = AudioService::GetInstance(); std::shared_ptr renderer = nullptr; int32_t sessionId = 1; audioService->allRendererMap_.insert(std::make_pair(sessionId, renderer)); - int32_t ret = audioService->EnableDualToneList(sessionId); + int32_t ret = audioService->EnableDualStream(sessionId, "Speaker"); EXPECT_EQ(ret, SUCCESS); } /** @@ -1437,7 +1437,7 @@ HWTEST(AudioServiceUnitTest, DisableDualToneList_001, TestSize.Level1) std::shared_ptr renderer = nullptr; audioService->filteredDualToneRendererMap_.push_back(renderer); int32_t sessionId = 1; - int32_t ret = audioService->DisableDualToneList(sessionId); + int32_t ret = audioService->DisableDualStream(sessionId); EXPECT_EQ(ret, SUCCESS); } /** diff --git a/services/audio_service/test/unittest/renderer_in_server_unit_test/src/renderer_in_server_third_unit_test.cpp b/services/audio_service/test/unittest/renderer_in_server_unit_test/src/renderer_in_server_third_unit_test.cpp index 0994f6396c..f456c705f5 100644 --- a/services/audio_service/test/unittest/renderer_in_server_unit_test/src/renderer_in_server_third_unit_test.cpp +++ b/services/audio_service/test/unittest/renderer_in_server_unit_test/src/renderer_in_server_third_unit_test.cpp @@ -286,7 +286,7 @@ HWTEST_F(RendererInServerThirdUnitTest, RendererInServerInitDualToneStream_001, rendererInServer->status_ = I_STATUS_STARTED; rendererInServer->Init(); - int32_t ret = rendererInServer->InitDualToneStream(); + int32_t ret = rendererInServer->InitDualToneStream("Speaker"); EXPECT_EQ(SUCCESS, ret); } @@ -304,7 +304,7 @@ HWTEST_F(RendererInServerThirdUnitTest, RendererInServerInitDualToneStream_002, rendererInServer->status_ = I_STATUS_STARTED; rendererInServer->dualToneStream_ = nullptr; rendererInServer->Init(); - int32_t ret = rendererInServer->InitDualToneStream(); + int32_t ret = rendererInServer->InitDualToneStream("Speaker"); EXPECT_EQ(SUCCESS, ret); } @@ -1567,7 +1567,7 @@ HWTEST_F(RendererInServerThirdUnitTest, RendererInServerStop_001, TestSize.Level int32_t ret = rendererInServer->Init(); rendererInServer->standByEnable_ = true; rendererInServer->InitDupStream(1); - rendererInServer->InitDualToneStream(); + rendererInServer->InitDualToneStream("Speaker"); rendererInServer->playerDfx_ = 0; ret = rendererInServer->Stop(); @@ -1588,7 +1588,7 @@ HWTEST_F(RendererInServerThirdUnitTest, RendererInServerStop_002, TestSize.Level int32_t ret = rendererInServer->Init(); rendererInServer->standByEnable_ = true; rendererInServer->InitDupStream(1); - rendererInServer->InitDualToneStream(); + rendererInServer->InitDualToneStream("Speaker"); rendererInServer->managerType_ = DIRECT_PLAYBACK; ret = rendererInServer->Stop(); @@ -1609,7 +1609,7 @@ HWTEST_F(RendererInServerThirdUnitTest, RendererInServerStop_003, TestSize.Level int32_t ret = rendererInServer->Init(); rendererInServer->standByEnable_ = true; rendererInServer->InitDupStream(1); - rendererInServer->InitDualToneStream(); + rendererInServer->InitDualToneStream("Speaker"); rendererInServer->managerType_ = EAC3_PLAYBACK; ret = rendererInServer->Stop(); @@ -1630,7 +1630,7 @@ HWTEST_F(RendererInServerThirdUnitTest, RendererInServerStop_004, TestSize.Level int32_t ret = rendererInServer->Init(); rendererInServer->standByEnable_ = true; rendererInServer->InitDupStream(1); - rendererInServer->InitDualToneStream(); + rendererInServer->InitDualToneStream("Speaker"); rendererInServer->managerType_ = RECORDER; ret = rendererInServer->Stop(); diff --git a/services/audio_service/test/unittest/renderer_in_server_unit_test/src/renderer_in_server_unit_test.cpp b/services/audio_service/test/unittest/renderer_in_server_unit_test/src/renderer_in_server_unit_test.cpp index 43e78bbdf9..b18e6ab789 100755 --- a/services/audio_service/test/unittest/renderer_in_server_unit_test/src/renderer_in_server_unit_test.cpp +++ b/services/audio_service/test/unittest/renderer_in_server_unit_test/src/renderer_in_server_unit_test.cpp @@ -842,7 +842,7 @@ HWTEST_F(RendererInServerUnitTest, RendererInServerWriteData_005, TestSize.Level rendererInServer->audioServerBuffer_->basicBufferInfo_->totalSizeInFrame = 16; rendererInServer->spanSizeInFrame_ = 4; ret = rendererInServer->InitDupStream(1); - ret = rendererInServer->InitDualToneStream(); + ret = rendererInServer->InitDualToneStream("Speaker"); ret = rendererInServer->WriteData(); EXPECT_EQ(SUCCESS, ret); @@ -869,7 +869,7 @@ HWTEST_F(RendererInServerUnitTest, RendererInServerWriteData_006, TestSize.Level rendererInServer->audioServerBuffer_->basicBufferInfo_->totalSizeInFrame = 16; rendererInServer->spanSizeInFrame_ = 4; ret = rendererInServer->InitDupStream(1); - ret = rendererInServer->InitDualToneStream(); + ret = rendererInServer->InitDualToneStream("Speaker"); if (rendererInServer->captureInfos_.count(1)) { rendererInServer->captureInfos_[1].dupStream = nullptr; rendererInServer->captureInfos_.erase(1); @@ -980,7 +980,7 @@ HWTEST_F(RendererInServerUnitTest, RendererInServerStart_001, TestSize.Level1) int32_t ret = rendererInServer->Init(); ret = rendererInServer->InitDupStream(1); - ret = rendererInServer->InitDualToneStream(); + ret = rendererInServer->InitDualToneStream("Speaker"); rendererInServer->OnStatusUpdate(OPERATION_RELEASED); ret = rendererInServer->Start(); @@ -1071,7 +1071,7 @@ HWTEST_F(RendererInServerUnitTest, RendererInServerStart_005, TestSize.Level1) int32_t ret = rendererInServer->Init(); ret = rendererInServer->InitDupStream(1); - ret = rendererInServer->InitDualToneStream(); + ret = rendererInServer->InitDualToneStream("Speaker"); if (rendererInServer->captureInfos_.count(1)) { rendererInServer->captureInfos_[1].dupStream = nullptr; rendererInServer->captureInfos_.erase(1); @@ -1232,7 +1232,7 @@ HWTEST_F(RendererInServerUnitTest, RendererInServerPause_003, TestSize.Level1) int32_t ret = rendererInServer->Init(); ret = rendererInServer->InitDupStream(1); - ret = rendererInServer->InitDualToneStream(); + ret = rendererInServer->InitDualToneStream("Speaker"); rendererInServer->OnStatusUpdate(OPERATION_STARTED); ret = rendererInServer->Pause(); @@ -1256,7 +1256,7 @@ HWTEST_F(RendererInServerUnitTest, RendererInServerPause_004, TestSize.Level1) int32_t ret = rendererInServer->Init(); ret = rendererInServer->InitDupStream(1); - ret = rendererInServer->InitDualToneStream(); + ret = rendererInServer->InitDualToneStream("Speaker"); if (rendererInServer->captureInfos_.count(1)) { rendererInServer->captureInfos_[1].dupStream = nullptr; rendererInServer->captureInfos_.erase(1); @@ -1391,7 +1391,7 @@ HWTEST_F(RendererInServerUnitTest, RendererInServerFlush_005, TestSize.Level1) int32_t ret = rendererInServer->Init(); ret = rendererInServer->InitDupStream(1); - ret = rendererInServer->InitDualToneStream(); + ret = rendererInServer->InitDualToneStream("Speaker"); rendererInServer->OnStatusUpdate(OPERATION_STARTED); ret = rendererInServer->Flush(); @@ -1415,7 +1415,7 @@ HWTEST_F(RendererInServerUnitTest, RendererInServerFlush_006, TestSize.Level1) int32_t ret = rendererInServer->Init(); ret = rendererInServer->InitDupStream(1); - ret = rendererInServer->InitDualToneStream(); + ret = rendererInServer->InitDualToneStream("Speaker"); if (rendererInServer->captureInfos_.count(1)) { rendererInServer->captureInfos_[1].dupStream = nullptr; rendererInServer->captureInfos_.erase(1); @@ -1553,7 +1553,7 @@ HWTEST_F(RendererInServerUnitTest, RendererInServerDrain_003, TestSize.Level1) int32_t ret = rendererInServer->Init(); ret = rendererInServer->InitDupStream(1); - ret = rendererInServer->InitDualToneStream(); + ret = rendererInServer->InitDualToneStream("Speaker"); rendererInServer->OnStatusUpdate(OPERATION_STARTED); bool stopFlag = true; @@ -1578,7 +1578,7 @@ HWTEST_F(RendererInServerUnitTest, RendererInServerDrain_004, TestSize.Level1) int32_t ret = rendererInServer->Init(); ret = rendererInServer->InitDupStream(1); - ret = rendererInServer->InitDualToneStream(); + ret = rendererInServer->InitDualToneStream("Speaker"); if (rendererInServer->captureInfos_.count(1)) { rendererInServer->captureInfos_[1].dupStream = nullptr; rendererInServer->captureInfos_.erase(1); @@ -1662,7 +1662,7 @@ HWTEST_F(RendererInServerUnitTest, RendererInServerStop_003, TestSize.Level1) rendererInServer->Init(); rendererInServer->standByEnable_ = true; rendererInServer->InitDupStream(1); - rendererInServer->InitDualToneStream(); + rendererInServer->InitDualToneStream("Speaker"); int32_t ret = rendererInServer->Stop(); EXPECT_EQ(SUCCESS, ret); @@ -2190,7 +2190,7 @@ HWTEST_F(RendererInServerUnitTest, RendererInServerEnableDualTone_001, TestSize. { EXPECT_NE(nullptr, rendererInServer); - int32_t ret = rendererInServer->EnableDualTone(); + int32_t ret = rendererInServer->EnableDualTone("Speaker"); EXPECT_EQ(SUCCESS, ret); } @@ -2205,8 +2205,8 @@ HWTEST_F(RendererInServerUnitTest, RendererInServerEnableDualTone_002, TestSize. { EXPECT_NE(nullptr, rendererInServer); - rendererInServer->InitDualToneStream(); - int32_t ret = rendererInServer->EnableDualTone(); + rendererInServer->InitDualToneStream("Speaker"); + int32_t ret = rendererInServer->EnableDualTone("Speaker"); EXPECT_EQ(SUCCESS, ret); } @@ -2236,7 +2236,7 @@ HWTEST_F(RendererInServerUnitTest, RendererInServerDisableDualTone_002, TestSize { EXPECT_NE(nullptr, rendererInServer); - rendererInServer->InitDualToneStream(); + rendererInServer->InitDualToneStream("Speaker"); int32_t ret = rendererInServer->DisableDualTone(); EXPECT_EQ(ERROR, ret); @@ -2261,7 +2261,7 @@ HWTEST_F(RendererInServerUnitTest, RendererInServerInitDualToneStream_001, TestS EXPECT_NE(nullptr, tempRendererInServer); tempRendererInServer->dualToneStream_ = nullptr; - int32_t ret = tempRendererInServer->InitDualToneStream(); + int32_t ret = tempRendererInServer->InitDualToneStream("Speaker"); EXPECT_EQ(SUCCESS, ret); } @@ -2278,7 +2278,7 @@ HWTEST_F(RendererInServerUnitTest, RendererInServerInitDualToneStream_002, TestS rendererInServer->status_ = I_STATUS_STARTED; rendererInServer->Init(); - int32_t ret = rendererInServer->InitDualToneStream(); + int32_t ret = rendererInServer->InitDualToneStream("Speaker"); EXPECT_EQ(SUCCESS, ret); } @@ -2348,7 +2348,7 @@ HWTEST_F(RendererInServerUnitTest, RendererInServerSetOffloadMode_002, TestSize. tempRendererInServer->managerType_ = DIRECT_PLAYBACK; tempRendererInServer->Init(); tempRendererInServer->InitDupStream(1); - tempRendererInServer->InitDualToneStream(); + tempRendererInServer->InitDualToneStream("Speaker"); int32_t ret = tempRendererInServer->SetOffloadMode(TEST_STATE, TEST_ISAPPBACK); EXPECT_EQ(SUCCESS, ret); @@ -2376,7 +2376,7 @@ HWTEST_F(RendererInServerUnitTest, RendererInServerSetOffloadMode_003, TestSize. tempRendererInServer->managerType_ = DIRECT_PLAYBACK; tempRendererInServer->Init(); tempRendererInServer->InitDupStream(1); - tempRendererInServer->InitDualToneStream(); + tempRendererInServer->InitDualToneStream("Speaker"); if (rendererInServer->captureInfos_.count(1)) { rendererInServer->captureInfos_[1].dupStream = nullptr; rendererInServer->captureInfos_.erase(1); @@ -2435,7 +2435,7 @@ HWTEST_F(RendererInServerUnitTest, RendererInServerUnsetOffloadMode_002, TestSiz tempRendererInServer->managerType_ = DIRECT_PLAYBACK; tempRendererInServer->Init(); tempRendererInServer->InitDupStream(1); - tempRendererInServer->InitDualToneStream(); + tempRendererInServer->InitDualToneStream("Speaker"); int32_t ret = tempRendererInServer->UnsetOffloadMode(); EXPECT_EQ(SUCCESS, ret); @@ -2463,7 +2463,7 @@ HWTEST_F(RendererInServerUnitTest, RendererInServerUnsetOffloadMode_003, TestSiz tempRendererInServer->managerType_ = DIRECT_PLAYBACK; tempRendererInServer->Init(); tempRendererInServer->InitDupStream(1); - tempRendererInServer->InitDualToneStream(); + tempRendererInServer->InitDualToneStream("Speaker"); if (rendererInServer->captureInfos_.count(1)) { rendererInServer->captureInfos_[1].dupStream = nullptr; rendererInServer->captureInfos_.erase(1); diff --git a/test/fuzztest/audioservermore_fuzzer/audio_server_more_fuzzer.cpp b/test/fuzztest/audioservermore_fuzzer/audio_server_more_fuzzer.cpp index 06e2a7fecd..a7d0867b10 100644 --- a/test/fuzztest/audioservermore_fuzzer/audio_server_more_fuzzer.cpp +++ b/test/fuzztest/audioservermore_fuzzer/audio_server_more_fuzzer.cpp @@ -502,9 +502,9 @@ void AudioRendererInServerTestSecond(std::shared_ptr renderer) renderer->EnableInnerCap(1); renderer->DisableInnerCap(1); renderer->InitDupStream(1); - renderer->EnableDualTone(); + renderer->EnableDualTone("Speaker"); renderer->DisableDualTone(); - renderer->InitDualToneStream(); + renderer->InitDualToneStream("Speaker"); renderer->GetStreamManagerType(); renderer->SetSilentModeAndMixWithOthers(isAppBack); renderer->SetClientVolume(); diff --git a/test/fuzztest/audioservice_fuzzer/audio_service_fuzzer.cpp b/test/fuzztest/audioservice_fuzzer/audio_service_fuzzer.cpp index 8650556cc0..91efa12dd4 100644 --- a/test/fuzztest/audioservice_fuzzer/audio_service_fuzzer.cpp +++ b/test/fuzztest/audioservice_fuzzer/audio_service_fuzzer.cpp @@ -695,7 +695,7 @@ void AudioServiceEnableDualToneListFuzzTest() int32_t sessionId = GetData(); audioService->allRendererMap_.clear(); audioService->allRendererMap_.insert(std::make_pair(sessionId, renderer)); - audioService->EnableDualToneList(sessionId); + audioService->EnableDualStream(sessionId, "Speaker"); } void AudioServiceDisableDualToneListFuzzTest() @@ -719,7 +719,7 @@ void AudioServiceDisableDualToneListFuzzTest() audioService->filteredDualToneRendererMap_.clear(); audioService->filteredDualToneRendererMap_.push_back(renderer); int32_t sessionId = GetData(); - audioService->DisableDualToneList(sessionId); + audioService->DisableDualStream(sessionId); } void AudioServiceNotifyStreamVolumeChangedFuzzTest() diff --git a/test/fuzztest/audioserviceserversrcenhance_fuzzer/audio_service_server_src_enhance_fuzzer.cpp b/test/fuzztest/audioserviceserversrcenhance_fuzzer/audio_service_server_src_enhance_fuzzer.cpp index 5ece7d5066..757087bb82 100644 --- a/test/fuzztest/audioserviceserversrcenhance_fuzzer/audio_service_server_src_enhance_fuzzer.cpp +++ b/test/fuzztest/audioserviceserversrcenhance_fuzzer/audio_service_server_src_enhance_fuzzer.cpp @@ -107,7 +107,7 @@ void AudioServiceMoreFuzzTest() AudioPlaybackCaptureConfig newConfig; audioServicePtr->UpdateMuteControlSet(sessionId, true); audioServicePtr->UpdateMuteControlSet(sessionId, false); - audioServicePtr->EnableDualToneList(sessionId); + audioServicePtr->EnableDualStream(sessionId, "Speaker"); audioServicePtr->OnCapturerFilterChange(sessionId, newConfig, 1); audioServicePtr->OnCapturerFilterRemove(sessionId, 1); -- Gitee