From 15a5b4e41d015f4f437216a1623f20fcae09eac3 Mon Sep 17 00:00:00 2001 From: ruiyangsun Date: Fri, 5 Sep 2025 15:12:41 +0800 Subject: [PATCH 01/11] use correct streamClass Signed-off-by: ruiyangsun --- frameworks/native/audiorenderer/src/audio_renderer.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/frameworks/native/audiorenderer/src/audio_renderer.cpp b/frameworks/native/audiorenderer/src/audio_renderer.cpp index 94735bd518..f5c425c548 100644 --- a/frameworks/native/audiorenderer/src/audio_renderer.cpp +++ b/frameworks/native/audiorenderer/src/audio_renderer.cpp @@ -2269,6 +2269,7 @@ bool AudioRendererPrivate::GenerateNewStream(IAudioStream::StreamClass targetCla bool switchResult = false; std::shared_ptr oldAudioStream = nullptr; // create new IAudioStream + SetClientInfo(flag, streamClass); std::shared_ptr newAudioStream = IAudioStream::GetPlaybackStream(targetClass, switchInfo.params, switchInfo.eStreamType, appInfo_.appUid); CHECK_AND_RETURN_RET_LOG(newAudioStream != nullptr, false, "SetParams GetPlayBackStream failed."); -- Gitee From 985af0e7bcebe6b717ccd4c5de6cddf02c471a42 Mon Sep 17 00:00:00 2001 From: ruiyangsun Date: Fri, 5 Sep 2025 15:22:03 +0800 Subject: [PATCH 02/11] use correct streamClass Signed-off-by: ruiyangsun --- frameworks/native/audiocapturer/src/audio_capturer.cpp | 1 + frameworks/native/audiorenderer/src/audio_renderer.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/frameworks/native/audiocapturer/src/audio_capturer.cpp b/frameworks/native/audiocapturer/src/audio_capturer.cpp index 435b1e6b6f..a9c2b9fae3 100644 --- a/frameworks/native/audiocapturer/src/audio_capturer.cpp +++ b/frameworks/native/audiocapturer/src/audio_capturer.cpp @@ -1533,6 +1533,7 @@ bool AudioCapturerPrivate::GenerateNewStream(IAudioStream::StreamClass targetCla bool switchResult = false; std::shared_ptr oldAudioStream = nullptr; + SetClientInfo(restoreInfo.routeFlag, targetClass); std::shared_ptr newAudioStream = IAudioStream::GetRecordStream(targetClass, switchInfo.params, switchInfo.eStreamType, appInfo_.appUid); CHECK_AND_RETURN_RET_LOG(newAudioStream != nullptr, false, "GetRecordStream failed."); diff --git a/frameworks/native/audiorenderer/src/audio_renderer.cpp b/frameworks/native/audiorenderer/src/audio_renderer.cpp index f5c425c548..082891405f 100644 --- a/frameworks/native/audiorenderer/src/audio_renderer.cpp +++ b/frameworks/native/audiorenderer/src/audio_renderer.cpp @@ -2269,7 +2269,7 @@ bool AudioRendererPrivate::GenerateNewStream(IAudioStream::StreamClass targetCla bool switchResult = false; std::shared_ptr oldAudioStream = nullptr; // create new IAudioStream - SetClientInfo(flag, streamClass); + SetClientInfo(restoreInfo.routeFlag, targetClass); std::shared_ptr newAudioStream = IAudioStream::GetPlaybackStream(targetClass, switchInfo.params, switchInfo.eStreamType, appInfo_.appUid); CHECK_AND_RETURN_RET_LOG(newAudioStream != nullptr, false, "SetParams GetPlayBackStream failed."); -- Gitee From 72bbe0a33d01931cc979211f6abad381db53b0a9 Mon Sep 17 00:00:00 2001 From: ruiyangsun Date: Fri, 5 Sep 2025 16:57:12 +0800 Subject: [PATCH 03/11] fix bug Signed-off-by: ruiyangsun --- frameworks/native/audiocapturer/src/audio_capturer.cpp | 2 +- frameworks/native/audiorenderer/src/audio_renderer.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frameworks/native/audiocapturer/src/audio_capturer.cpp b/frameworks/native/audiocapturer/src/audio_capturer.cpp index a9c2b9fae3..71973284fc 100644 --- a/frameworks/native/audiocapturer/src/audio_capturer.cpp +++ b/frameworks/native/audiocapturer/src/audio_capturer.cpp @@ -1533,7 +1533,7 @@ bool AudioCapturerPrivate::GenerateNewStream(IAudioStream::StreamClass targetCla bool switchResult = false; std::shared_ptr oldAudioStream = nullptr; - SetClientInfo(restoreInfo.routeFlag, targetClass); + SetClientInfo(flag, targetClass); std::shared_ptr newAudioStream = IAudioStream::GetRecordStream(targetClass, switchInfo.params, switchInfo.eStreamType, appInfo_.appUid); CHECK_AND_RETURN_RET_LOG(newAudioStream != nullptr, false, "GetRecordStream failed."); diff --git a/frameworks/native/audiorenderer/src/audio_renderer.cpp b/frameworks/native/audiorenderer/src/audio_renderer.cpp index 082891405f..7a639abecb 100644 --- a/frameworks/native/audiorenderer/src/audio_renderer.cpp +++ b/frameworks/native/audiorenderer/src/audio_renderer.cpp @@ -2269,7 +2269,7 @@ bool AudioRendererPrivate::GenerateNewStream(IAudioStream::StreamClass targetCla bool switchResult = false; std::shared_ptr oldAudioStream = nullptr; // create new IAudioStream - SetClientInfo(restoreInfo.routeFlag, targetClass); + SetClientInfo(flag, targetClass); std::shared_ptr newAudioStream = IAudioStream::GetPlaybackStream(targetClass, switchInfo.params, switchInfo.eStreamType, appInfo_.appUid); CHECK_AND_RETURN_RET_LOG(newAudioStream != nullptr, false, "SetParams GetPlayBackStream failed."); -- Gitee From 59220caec2404fc83d893c38a78362b23e00bec2 Mon Sep 17 00:00:00 2001 From: ruiyangsun Date: Sat, 6 Sep 2025 09:55:50 +0800 Subject: [PATCH 04/11] clean code Signed-off-by: ruiyangsun --- .../include/audio_capturer_private.h | 2 +- .../audiocapturer/src/audio_capturer.cpp | 22 +++++++++------- .../audio_capturer_extra_plus_unit_test.cpp | 6 ++--- .../include/audio_renderer_private.h | 2 +- .../audiorenderer/src/audio_renderer.cpp | 19 ++++++-------- .../src/audio_renderer_setter_unit_test.cpp | 26 +++++++++---------- 6 files changed, 37 insertions(+), 40 deletions(-) diff --git a/frameworks/native/audiocapturer/include/audio_capturer_private.h b/frameworks/native/audiocapturer/include/audio_capturer_private.h index 8fb3aac934..02e0a053fa 100644 --- a/frameworks/native/audiocapturer/include/audio_capturer_private.h +++ b/frameworks/native/audiocapturer/include/audio_capturer_private.h @@ -138,7 +138,7 @@ private: int32_t CheckAndStopAudioCapturer(std::string callingFunc); int32_t InitAudioInterruptCallback(); std::shared_ptr ConvertToStreamDescriptor(const AudioStreamParams &audioStreamParams); - void SetClientInfo(uint32_t flag, IAudioStream::StreamClass &streamClass); + IAudioStream::StreamClass UpdateCapturerInfoByAudioFlag(uint32_t flag); int32_t InitInputDeviceChangeCallback(); int32_t SetSwitchInfo(IAudioStream::SwitchInfo info, std::shared_ptr audioStream); void InitSwitchInfo(IAudioStream::StreamClass targetClass, IAudioStream::SwitchInfo &info); diff --git a/frameworks/native/audiocapturer/src/audio_capturer.cpp b/frameworks/native/audiocapturer/src/audio_capturer.cpp index 71973284fc..73ff7e50a9 100644 --- a/frameworks/native/audiocapturer/src/audio_capturer.cpp +++ b/frameworks/native/audiocapturer/src/audio_capturer.cpp @@ -310,7 +310,7 @@ int32_t AudioCapturerPrivate::SetParams(const AudioCapturerParams params) AUDIO_INFO_LOG("StreamClientState for Capturer::CreateClient. id %{public}u, flag :%{public}u", audioStreamParams.originalSessionId, flag); - SetClientInfo(flag, streamClass); + streamClass = UpdateCapturerInfoByAudioFlag(flag); // check AudioStreamParams for fast stream if (audioStream_ == nullptr) { audioStream_ = IAudioStream::GetRecordStream(streamClass, audioStreamParams, audioStreamType_, @@ -377,24 +377,27 @@ std::shared_ptr AudioCapturerPrivate::ConvertToStreamDesc return streamDesc; } -void AudioCapturerPrivate::SetClientInfo(uint32_t flag, IAudioStream::StreamClass &streamClass) +IAudioStream::StreamClass AudioCapturerPrivate::UpdateCapturerInfoByAudioFlag(uint32_t flag) { + IAudioStream::StreamClass ret = IAudioStream::StreamClass::PA_STREAM; if (flag & AUDIO_INPUT_FLAG_FAST) { if (flag & AUDIO_INPUT_FLAG_VOIP) { - streamClass = IAudioStream::StreamClass::VOIP_STREAM; capturerInfo_.originalFlag = AUDIO_FLAG_VOIP_FAST; capturerInfo_.capturerFlags = AUDIO_FLAG_VOIP_FAST; capturerInfo_.pipeType = PIPE_TYPE_CALL_IN; + ret = IAudioStream::StreamClass::VOIP_STREAM; } else { - streamClass = IAudioStream::StreamClass::FAST_STREAM; capturerInfo_.capturerFlags = AUDIO_FLAG_MMAP; capturerInfo_.pipeType = PIPE_TYPE_LOWLATENCY_IN; + ret = IAudioStream::StreamClass::FAST_STREAM; } } else { - streamClass = IAudioStream::StreamClass::PA_STREAM; - capturerInfo_.capturerFlags = AUDIO_FLAG_NORMAL; - capturerInfo_.pipeType = PIPE_TYPE_NORMAL_IN; + capturerInfo_.capturerFlags = AUDIO_FLAG_NORMAL; + capturerInfo_.pipeType = PIPE_TYPE_NORMAL_IN; } + AUDIO_INFO_LOG("Route flag: %{public}u, streamClass: %{public}d, capturerFlags: %{public}d, pipeType: %{public}d", + flag, streamClass, capturerInfo_.capturerFlags, capturerInfo_.pipeType); + return ret; } int32_t AudioCapturerPrivate::InitInputDeviceChangeCallback() @@ -710,8 +713,7 @@ int32_t AudioCapturerPrivate::CheckAndRestoreAudioCapturer(std::string callingFu // Get restore info and target stream class for switching. RestoreInfo restoreInfo; audioStream_->GetRestoreInfo(restoreInfo); - IAudioStream::StreamClass targetClass = IAudioStream::StreamClass::PA_STREAM; - SetClientInfo(restoreInfo.routeFlag, targetClass); + IAudioStream::StreamClass targetClass = UpdateCapturerInfoByAudioFlag(restoreInfo.routeFlag); if (restoreStatus == NEED_RESTORE_TO_NORMAL) { restoreInfo.targetStreamFlag = AUDIO_FLAG_FORCED_NORMAL; } @@ -1533,7 +1535,7 @@ bool AudioCapturerPrivate::GenerateNewStream(IAudioStream::StreamClass targetCla bool switchResult = false; std::shared_ptr oldAudioStream = nullptr; - SetClientInfo(flag, targetClass); + targetClass = UpdateCapturerInfoByAudioFlag(flag); std::shared_ptr newAudioStream = IAudioStream::GetRecordStream(targetClass, switchInfo.params, switchInfo.eStreamType, appInfo_.appUid); CHECK_AND_RETURN_RET_LOG(newAudioStream != nullptr, false, "GetRecordStream failed."); diff --git a/frameworks/native/audiocapturer/test/unittest/capturer_test/src/audio_capturer_extra_plus_unit_test.cpp b/frameworks/native/audiocapturer/test/unittest/capturer_test/src/audio_capturer_extra_plus_unit_test.cpp index 19bbdd4c2b..a7fdb6cf4d 100644 --- a/frameworks/native/audiocapturer/test/unittest/capturer_test/src/audio_capturer_extra_plus_unit_test.cpp +++ b/frameworks/native/audiocapturer/test/unittest/capturer_test/src/audio_capturer_extra_plus_unit_test.cpp @@ -522,7 +522,7 @@ HWTEST(AudioCapturerUnitTest, AudioCapturerPrivate_024, TestSize.Level1) * @tc.name : Test AudioCapturerPrivate API * @tc.type : FUNC * @tc.number: AudioCapturerPrivate_025 - * @tc.desc : Test AudioCapturerPrivate::SetClientInfo + * @tc.desc : Test AudioCapturerPrivate::UpdateCapturerInfoByAudioFlag */ HWTEST(AudioCapturerUnitTest, AudioCapturerPrivate_025, TestSize.Level1) { @@ -531,9 +531,7 @@ HWTEST(AudioCapturerUnitTest, AudioCapturerPrivate_025, TestSize.Level1) ASSERT_NE(capturer, nullptr); uint32_t flag = 0x6000; - IAudioStream::StreamClass streamClass = IAudioStream::StreamClass::PA_STREAM; - - capturer->SetClientInfo(flag, streamClass); + IAudioStream::StreamClass streamClass = capturer->UpdateCapturerInfoByAudioFlag(flag); EXPECT_EQ(capturer->capturerInfo_.pipeType, PIPE_TYPE_CALL_IN); } diff --git a/frameworks/native/audiorenderer/include/audio_renderer_private.h b/frameworks/native/audiorenderer/include/audio_renderer_private.h index a3d8fc717a..f0f55b4804 100644 --- a/frameworks/native/audiorenderer/include/audio_renderer_private.h +++ b/frameworks/native/audiorenderer/include/audio_renderer_private.h @@ -201,7 +201,7 @@ private: std::shared_ptr ConvertToStreamDescriptor(const AudioStreamParams &audioStreamParams); std::shared_ptr GetStreamDescBySwitchInfo( const IAudioStream::SwitchInfo &switchInfo, const RestoreInfo &restoreInfo); - void SetClientInfo(uint32_t flag, IAudioStream::StreamClass &streamClass); + IAudioStream::StreamClass UpdateRendererInfoByAudioFlag(uint32_t flag); int32_t InitAudioInterruptCallback(bool isRestoreAudio = false); int32_t InitOutputDeviceChangeCallback(); void InitAudioRouteCallback(); diff --git a/frameworks/native/audiorenderer/src/audio_renderer.cpp b/frameworks/native/audiorenderer/src/audio_renderer.cpp index 7a639abecb..e02766ed06 100644 --- a/frameworks/native/audiorenderer/src/audio_renderer.cpp +++ b/frameworks/native/audiorenderer/src/audio_renderer.cpp @@ -709,7 +709,7 @@ int32_t AudioRendererPrivate::PrepareAudioStream(AudioStreamParams &audioStreamP HILOG_COMM_INFO("StreamClientState for Renderer::CreateClient. id %{public}u, flag: %{public}u", audioStreamParams.originalSessionId, flag); - SetClientInfo(flag, streamClass); + streamClass = UpdateRendererInfoByAudioFlag(flag); if (audioStream_ == nullptr) { audioStream_ = IAudioStream::GetPlaybackStream(streamClass, audioStreamParams, audioStreamType, @@ -742,45 +742,42 @@ std::shared_ptr AudioRendererPrivate::ConvertToStreamDesc return streamDesc; } -void AudioRendererPrivate::SetClientInfo(uint32_t flag, IAudioStream::StreamClass &streamClass) +IAudioStream::StreamClass AudioRendererPrivate::UpdateRendererInfoByAudioFlag(uint32_t flag) { + IAudioStream::StreamClass ret = IAudioStream::StreamClass::PA_STREAM; if (flag & AUDIO_OUTPUT_FLAG_FAST) { if (flag & AUDIO_OUTPUT_FLAG_VOIP) { - streamClass = IAudioStream::StreamClass::VOIP_STREAM; rendererInfo_.originalFlag = AUDIO_FLAG_VOIP_FAST; rendererInfo_.rendererFlags = AUDIO_FLAG_VOIP_FAST; rendererInfo_.pipeType = PIPE_TYPE_LOWLATENCY_OUT; + ret = IAudioStream::StreamClass::VOIP_STREAM; } else { - streamClass = IAudioStream::StreamClass::FAST_STREAM; rendererInfo_.rendererFlags = AUDIO_FLAG_VOIP_FAST; rendererInfo_.pipeType = PIPE_TYPE_LOWLATENCY_OUT; + ret = IAudioStream::StreamClass::FAST_STREAM; } } else if (flag & AUDIO_OUTPUT_FLAG_DIRECT) { if (flag & AUDIO_OUTPUT_FLAG_VOIP) { - streamClass = IAudioStream::StreamClass::PA_STREAM; rendererInfo_.originalFlag = AUDIO_FLAG_VOIP_DIRECT; rendererInfo_.rendererFlags = AUDIO_FLAG_VOIP_DIRECT; rendererInfo_.pipeType = PIPE_TYPE_CALL_OUT; } else { - streamClass = IAudioStream::StreamClass::PA_STREAM; rendererInfo_.rendererFlags = AUDIO_FLAG_DIRECT; rendererInfo_.pipeType = PIPE_TYPE_DIRECT_OUT; } } else if (flag & AUDIO_OUTPUT_FLAG_LOWPOWER) { - streamClass = IAudioStream::StreamClass::PA_STREAM; rendererInfo_.rendererFlags = AUDIO_FLAG_NORMAL; rendererInfo_.pipeType = PIPE_TYPE_OFFLOAD; } else if (flag & AUDIO_OUTPUT_FLAG_MULTICHANNEL) { - streamClass = IAudioStream::StreamClass::PA_STREAM; rendererInfo_.rendererFlags = AUDIO_FLAG_NORMAL; rendererInfo_.pipeType = PIPE_TYPE_MULTICHANNEL; } else { - streamClass = IAudioStream::StreamClass::PA_STREAM; rendererInfo_.rendererFlags = AUDIO_FLAG_NORMAL; rendererInfo_.pipeType = PIPE_TYPE_NORMAL_OUT; } AUDIO_INFO_LOG("Route flag: %{public}u, streamClass: %{public}d, rendererFlag: %{public}d, pipeType: %{public}d", flag, streamClass, rendererInfo_.rendererFlags, rendererInfo_.pipeType); + return ret; } int32_t AudioRendererPrivate::GetParams(AudioRendererParams ¶ms) const @@ -1013,7 +1010,7 @@ int32_t AudioRendererPrivate::CheckAndRestoreAudioRenderer(std::string callingFu // Get restore info and target stream class for switching. audioStream_->GetRestoreInfo(restoreInfo); - SetClientInfo(restoreInfo.routeFlag, targetClass); + targetClass = UpdateRendererInfoByAudioFlag(restoreInfo.routeFlag); if (restoreStatus == NEED_RESTORE_TO_NORMAL) { restoreInfo.targetStreamFlag = AUDIO_FLAG_FORCED_NORMAL; } @@ -2269,7 +2266,7 @@ bool AudioRendererPrivate::GenerateNewStream(IAudioStream::StreamClass targetCla bool switchResult = false; std::shared_ptr oldAudioStream = nullptr; // create new IAudioStream - SetClientInfo(flag, targetClass); + targetClass = UpdateRendererInfoByAudioFlag(flag); std::shared_ptr newAudioStream = IAudioStream::GetPlaybackStream(targetClass, switchInfo.params, switchInfo.eStreamType, appInfo_.appUid); CHECK_AND_RETURN_RET_LOG(newAudioStream != nullptr, false, "SetParams GetPlayBackStream failed."); diff --git a/frameworks/native/audiorenderer/test/unittest/renderer_test/src/audio_renderer_setter_unit_test.cpp b/frameworks/native/audiorenderer/test/unittest/renderer_test/src/audio_renderer_setter_unit_test.cpp index 0a096315a9..ddf22a0a27 100644 --- a/frameworks/native/audiorenderer/test/unittest/renderer_test/src/audio_renderer_setter_unit_test.cpp +++ b/frameworks/native/audiorenderer/test/unittest/renderer_test/src/audio_renderer_setter_unit_test.cpp @@ -1705,10 +1705,10 @@ HWTEST(AudioRendererUnitTest, SetAudioPrivacyType_001, TestSize.Level1) /** * @tc.name : Test AudioRendererPrivate - * @tc.number: SetClientInfo_001 - * @tc.desc : Test SetClientInfo API + * @tc.number: UpdateRendererInfoByAudioFlag_001 + * @tc.desc : Test UpdateRendererInfoByAudioFlag API */ -HWTEST(AudioRendererUnitTest, SetClientInfo_001, TestSize.Level1) +HWTEST(AudioRendererUnitTest, UpdateRendererInfoByAudioFlag_001, TestSize.Level1) { AppInfo appInfo = {}; std::shared_ptr audioRendererPrivate = @@ -1716,23 +1716,23 @@ HWTEST(AudioRendererUnitTest, SetClientInfo_001, TestSize.Level1) uint32_t flag = AUDIO_OUTPUT_FLAG_FAST; IAudioStream::StreamClass streamClass; - audioRendererPrivate->SetClientInfo(flag, streamClass); + streamClass = audioRendererPrivate->UpdateRendererInfoByAudioFlag(flag, streamClass); EXPECT_EQ(streamClass, IAudioStream::StreamClass::FAST_STREAM); flag = AUDIO_OUTPUT_FLAG_FAST | AUDIO_OUTPUT_FLAG_VOIP; - audioRendererPrivate->SetClientInfo(flag, streamClass); + streamClass = audioRendererPrivate->UpdateRendererInfoByAudioFlag(flag, streamClass); EXPECT_EQ(streamClass, IAudioStream::StreamClass::VOIP_STREAM); flag = AUDIO_OUTPUT_FLAG_DIRECT; - audioRendererPrivate->SetClientInfo(flag, streamClass); + streamClass = audioRendererPrivate->UpdateRendererInfoByAudioFlag(flag, streamClass); EXPECT_EQ(streamClass, IAudioStream::StreamClass::PA_STREAM); flag = AUDIO_OUTPUT_FLAG_MULTICHANNEL; - audioRendererPrivate->SetClientInfo(flag, streamClass); + streamClass = audioRendererPrivate->UpdateRendererInfoByAudioFlag(flag, streamClass); EXPECT_EQ(streamClass, IAudioStream::StreamClass::PA_STREAM); flag = AUDIO_FLAG_NONE; - audioRendererPrivate->SetClientInfo(flag, streamClass); + streamClass = audioRendererPrivate->UpdateRendererInfoByAudioFlag(flag, streamClass); EXPECT_EQ(streamClass, IAudioStream::StreamClass::PA_STREAM); } @@ -2437,10 +2437,10 @@ HWTEST(AudioRendererUnitTest, Audio_Renderer_SwitchToTargetStream_002, TestSize. /** * @tc.name : Test AudioRendererPrivate - * @tc.number: SetClientInfo_002 - * @tc.desc : Test SetClientInfo API + * @tc.number: UpdateRendererInfoByAudioFlag_002 + * @tc.desc : Test UpdateRendererInfoByAudioFlag API */ -HWTEST(AudioRendererUnitTest, SetClientInfo_002, TestSize.Level1) +HWTEST(AudioRendererUnitTest, UpdateRendererInfoByAudioFlag_002, TestSize.Level1) { AppInfo appInfo = {}; std::shared_ptr audioRendererPrivate = @@ -2448,11 +2448,11 @@ HWTEST(AudioRendererUnitTest, SetClientInfo_002, TestSize.Level1) uint32_t flag = AUDIO_OUTPUT_FLAG_DIRECT; IAudioStream::StreamClass streamClass; - audioRendererPrivate->SetClientInfo(flag, streamClass); + streamClass = audioRendererPrivate->UpdateRendererInfoByAudioFlag(flag); EXPECT_EQ(streamClass, IAudioStream::StreamClass::PA_STREAM); flag = AUDIO_OUTPUT_FLAG_DIRECT | AUDIO_OUTPUT_FLAG_VOIP; - audioRendererPrivate->SetClientInfo(flag, streamClass); + streamClass = audioRendererPrivate->UpdateRendererInfoByAudioFlag(flag); EXPECT_EQ(streamClass, IAudioStream::StreamClass::PA_STREAM); } } // namespace AudioStandard -- Gitee From 8cb459f1850b09c5a5ff844f43ba87c3f7b2af4f Mon Sep 17 00:00:00 2001 From: ruiyangsun Date: Sat, 6 Sep 2025 10:15:09 +0800 Subject: [PATCH 05/11] fix build bug Signed-off-by: ruiyangsun --- .../include/audio_capturer_private.h | 2 +- .../audiocapturer/src/audio_capturer.cpp | 8 +++--- .../audio_capturer_extra_plus_unit_test.cpp | 4 +-- .../include/audio_renderer_private.h | 2 +- .../audiorenderer/src/audio_renderer.cpp | 8 +++--- .../src/audio_renderer_setter_unit_test.cpp | 26 +++++++++---------- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/frameworks/native/audiocapturer/include/audio_capturer_private.h b/frameworks/native/audiocapturer/include/audio_capturer_private.h index 02e0a053fa..ec24c85071 100644 --- a/frameworks/native/audiocapturer/include/audio_capturer_private.h +++ b/frameworks/native/audiocapturer/include/audio_capturer_private.h @@ -138,7 +138,7 @@ private: int32_t CheckAndStopAudioCapturer(std::string callingFunc); int32_t InitAudioInterruptCallback(); std::shared_ptr ConvertToStreamDescriptor(const AudioStreamParams &audioStreamParams); - IAudioStream::StreamClass UpdateCapturerInfoByAudioFlag(uint32_t flag); + IAudioStream::StreamClass UpdateCapturerInfoByRouteFlag(uint32_t flag); int32_t InitInputDeviceChangeCallback(); int32_t SetSwitchInfo(IAudioStream::SwitchInfo info, std::shared_ptr audioStream); void InitSwitchInfo(IAudioStream::StreamClass targetClass, IAudioStream::SwitchInfo &info); diff --git a/frameworks/native/audiocapturer/src/audio_capturer.cpp b/frameworks/native/audiocapturer/src/audio_capturer.cpp index 73ff7e50a9..dc31cf5399 100644 --- a/frameworks/native/audiocapturer/src/audio_capturer.cpp +++ b/frameworks/native/audiocapturer/src/audio_capturer.cpp @@ -310,7 +310,7 @@ int32_t AudioCapturerPrivate::SetParams(const AudioCapturerParams params) AUDIO_INFO_LOG("StreamClientState for Capturer::CreateClient. id %{public}u, flag :%{public}u", audioStreamParams.originalSessionId, flag); - streamClass = UpdateCapturerInfoByAudioFlag(flag); + streamClass = UpdateCapturerInfoByRouteFlag(flag); // check AudioStreamParams for fast stream if (audioStream_ == nullptr) { audioStream_ = IAudioStream::GetRecordStream(streamClass, audioStreamParams, audioStreamType_, @@ -377,7 +377,7 @@ std::shared_ptr AudioCapturerPrivate::ConvertToStreamDesc return streamDesc; } -IAudioStream::StreamClass AudioCapturerPrivate::UpdateCapturerInfoByAudioFlag(uint32_t flag) +IAudioStream::StreamClass AudioCapturerPrivate::UpdateCapturerInfoByRouteFlag(uint32_t flag) { IAudioStream::StreamClass ret = IAudioStream::StreamClass::PA_STREAM; if (flag & AUDIO_INPUT_FLAG_FAST) { @@ -713,7 +713,7 @@ int32_t AudioCapturerPrivate::CheckAndRestoreAudioCapturer(std::string callingFu // Get restore info and target stream class for switching. RestoreInfo restoreInfo; audioStream_->GetRestoreInfo(restoreInfo); - IAudioStream::StreamClass targetClass = UpdateCapturerInfoByAudioFlag(restoreInfo.routeFlag); + IAudioStream::StreamClass targetClass = UpdateCapturerInfoByRouteFlag(restoreInfo.routeFlag); if (restoreStatus == NEED_RESTORE_TO_NORMAL) { restoreInfo.targetStreamFlag = AUDIO_FLAG_FORCED_NORMAL; } @@ -1535,7 +1535,7 @@ bool AudioCapturerPrivate::GenerateNewStream(IAudioStream::StreamClass targetCla bool switchResult = false; std::shared_ptr oldAudioStream = nullptr; - targetClass = UpdateCapturerInfoByAudioFlag(flag); + targetClass = UpdateCapturerInfoByRouteFlag(flag); std::shared_ptr newAudioStream = IAudioStream::GetRecordStream(targetClass, switchInfo.params, switchInfo.eStreamType, appInfo_.appUid); CHECK_AND_RETURN_RET_LOG(newAudioStream != nullptr, false, "GetRecordStream failed."); diff --git a/frameworks/native/audiocapturer/test/unittest/capturer_test/src/audio_capturer_extra_plus_unit_test.cpp b/frameworks/native/audiocapturer/test/unittest/capturer_test/src/audio_capturer_extra_plus_unit_test.cpp index a7fdb6cf4d..3d4a7a3acd 100644 --- a/frameworks/native/audiocapturer/test/unittest/capturer_test/src/audio_capturer_extra_plus_unit_test.cpp +++ b/frameworks/native/audiocapturer/test/unittest/capturer_test/src/audio_capturer_extra_plus_unit_test.cpp @@ -522,7 +522,7 @@ HWTEST(AudioCapturerUnitTest, AudioCapturerPrivate_024, TestSize.Level1) * @tc.name : Test AudioCapturerPrivate API * @tc.type : FUNC * @tc.number: AudioCapturerPrivate_025 - * @tc.desc : Test AudioCapturerPrivate::UpdateCapturerInfoByAudioFlag + * @tc.desc : Test AudioCapturerPrivate::UpdateCapturerInfoByRouteFlag */ HWTEST(AudioCapturerUnitTest, AudioCapturerPrivate_025, TestSize.Level1) { @@ -531,7 +531,7 @@ HWTEST(AudioCapturerUnitTest, AudioCapturerPrivate_025, TestSize.Level1) ASSERT_NE(capturer, nullptr); uint32_t flag = 0x6000; - IAudioStream::StreamClass streamClass = capturer->UpdateCapturerInfoByAudioFlag(flag); + IAudioStream::StreamClass streamClass = capturer->UpdateCapturerInfoByRouteFlag(flag); EXPECT_EQ(capturer->capturerInfo_.pipeType, PIPE_TYPE_CALL_IN); } diff --git a/frameworks/native/audiorenderer/include/audio_renderer_private.h b/frameworks/native/audiorenderer/include/audio_renderer_private.h index f0f55b4804..a9daf8f61d 100644 --- a/frameworks/native/audiorenderer/include/audio_renderer_private.h +++ b/frameworks/native/audiorenderer/include/audio_renderer_private.h @@ -201,7 +201,7 @@ private: std::shared_ptr ConvertToStreamDescriptor(const AudioStreamParams &audioStreamParams); std::shared_ptr GetStreamDescBySwitchInfo( const IAudioStream::SwitchInfo &switchInfo, const RestoreInfo &restoreInfo); - IAudioStream::StreamClass UpdateRendererInfoByAudioFlag(uint32_t flag); + IAudioStream::StreamClass UpdateRendererInfoByRouteFlag(uint32_t flag); int32_t InitAudioInterruptCallback(bool isRestoreAudio = false); int32_t InitOutputDeviceChangeCallback(); void InitAudioRouteCallback(); diff --git a/frameworks/native/audiorenderer/src/audio_renderer.cpp b/frameworks/native/audiorenderer/src/audio_renderer.cpp index e02766ed06..14be71a425 100644 --- a/frameworks/native/audiorenderer/src/audio_renderer.cpp +++ b/frameworks/native/audiorenderer/src/audio_renderer.cpp @@ -709,7 +709,7 @@ int32_t AudioRendererPrivate::PrepareAudioStream(AudioStreamParams &audioStreamP HILOG_COMM_INFO("StreamClientState for Renderer::CreateClient. id %{public}u, flag: %{public}u", audioStreamParams.originalSessionId, flag); - streamClass = UpdateRendererInfoByAudioFlag(flag); + streamClass = UpdateRendererInfoByRouteFlag(flag); if (audioStream_ == nullptr) { audioStream_ = IAudioStream::GetPlaybackStream(streamClass, audioStreamParams, audioStreamType, @@ -742,7 +742,7 @@ std::shared_ptr AudioRendererPrivate::ConvertToStreamDesc return streamDesc; } -IAudioStream::StreamClass AudioRendererPrivate::UpdateRendererInfoByAudioFlag(uint32_t flag) +IAudioStream::StreamClass AudioRendererPrivate::UpdateRendererInfoByRouteFlag(uint32_t flag) { IAudioStream::StreamClass ret = IAudioStream::StreamClass::PA_STREAM; if (flag & AUDIO_OUTPUT_FLAG_FAST) { @@ -1010,7 +1010,7 @@ int32_t AudioRendererPrivate::CheckAndRestoreAudioRenderer(std::string callingFu // Get restore info and target stream class for switching. audioStream_->GetRestoreInfo(restoreInfo); - targetClass = UpdateRendererInfoByAudioFlag(restoreInfo.routeFlag); + targetClass = UpdateRendererInfoByRouteFlag(restoreInfo.routeFlag); if (restoreStatus == NEED_RESTORE_TO_NORMAL) { restoreInfo.targetStreamFlag = AUDIO_FLAG_FORCED_NORMAL; } @@ -2266,7 +2266,7 @@ bool AudioRendererPrivate::GenerateNewStream(IAudioStream::StreamClass targetCla bool switchResult = false; std::shared_ptr oldAudioStream = nullptr; // create new IAudioStream - targetClass = UpdateRendererInfoByAudioFlag(flag); + targetClass = UpdateRendererInfoByRouteFlag(flag); std::shared_ptr newAudioStream = IAudioStream::GetPlaybackStream(targetClass, switchInfo.params, switchInfo.eStreamType, appInfo_.appUid); CHECK_AND_RETURN_RET_LOG(newAudioStream != nullptr, false, "SetParams GetPlayBackStream failed."); diff --git a/frameworks/native/audiorenderer/test/unittest/renderer_test/src/audio_renderer_setter_unit_test.cpp b/frameworks/native/audiorenderer/test/unittest/renderer_test/src/audio_renderer_setter_unit_test.cpp index ddf22a0a27..d3c9504599 100644 --- a/frameworks/native/audiorenderer/test/unittest/renderer_test/src/audio_renderer_setter_unit_test.cpp +++ b/frameworks/native/audiorenderer/test/unittest/renderer_test/src/audio_renderer_setter_unit_test.cpp @@ -1705,10 +1705,10 @@ HWTEST(AudioRendererUnitTest, SetAudioPrivacyType_001, TestSize.Level1) /** * @tc.name : Test AudioRendererPrivate - * @tc.number: UpdateRendererInfoByAudioFlag_001 - * @tc.desc : Test UpdateRendererInfoByAudioFlag API + * @tc.number: UpdateRendererInfoByRouteFlag_001 + * @tc.desc : Test UpdateRendererInfoByRouteFlag API */ -HWTEST(AudioRendererUnitTest, UpdateRendererInfoByAudioFlag_001, TestSize.Level1) +HWTEST(AudioRendererUnitTest, UpdateRendererInfoByRouteFlag_001, TestSize.Level1) { AppInfo appInfo = {}; std::shared_ptr audioRendererPrivate = @@ -1716,23 +1716,23 @@ HWTEST(AudioRendererUnitTest, UpdateRendererInfoByAudioFlag_001, TestSize.Level1 uint32_t flag = AUDIO_OUTPUT_FLAG_FAST; IAudioStream::StreamClass streamClass; - streamClass = audioRendererPrivate->UpdateRendererInfoByAudioFlag(flag, streamClass); + streamClass = audioRendererPrivate->UpdateRendererInfoByRouteFlag(flag); EXPECT_EQ(streamClass, IAudioStream::StreamClass::FAST_STREAM); flag = AUDIO_OUTPUT_FLAG_FAST | AUDIO_OUTPUT_FLAG_VOIP; - streamClass = audioRendererPrivate->UpdateRendererInfoByAudioFlag(flag, streamClass); + streamClass = audioRendererPrivate->UpdateRendererInfoByRouteFlag(flag); EXPECT_EQ(streamClass, IAudioStream::StreamClass::VOIP_STREAM); flag = AUDIO_OUTPUT_FLAG_DIRECT; - streamClass = audioRendererPrivate->UpdateRendererInfoByAudioFlag(flag, streamClass); + streamClass = audioRendererPrivate->UpdateRendererInfoByRouteFlag(flag); EXPECT_EQ(streamClass, IAudioStream::StreamClass::PA_STREAM); flag = AUDIO_OUTPUT_FLAG_MULTICHANNEL; - streamClass = audioRendererPrivate->UpdateRendererInfoByAudioFlag(flag, streamClass); + streamClass = audioRendererPrivate->UpdateRendererInfoByRouteFlag(flag); EXPECT_EQ(streamClass, IAudioStream::StreamClass::PA_STREAM); flag = AUDIO_FLAG_NONE; - streamClass = audioRendererPrivate->UpdateRendererInfoByAudioFlag(flag, streamClass); + streamClass = audioRendererPrivate->UpdateRendererInfoByRouteFlag(flag); EXPECT_EQ(streamClass, IAudioStream::StreamClass::PA_STREAM); } @@ -2437,10 +2437,10 @@ HWTEST(AudioRendererUnitTest, Audio_Renderer_SwitchToTargetStream_002, TestSize. /** * @tc.name : Test AudioRendererPrivate - * @tc.number: UpdateRendererInfoByAudioFlag_002 - * @tc.desc : Test UpdateRendererInfoByAudioFlag API + * @tc.number: UpdateRendererInfoByRouteFlag_002 + * @tc.desc : Test UpdateRendererInfoByRouteFlag API */ -HWTEST(AudioRendererUnitTest, UpdateRendererInfoByAudioFlag_002, TestSize.Level1) +HWTEST(AudioRendererUnitTest, UpdateRendererInfoByRouteFlag_002, TestSize.Level1) { AppInfo appInfo = {}; std::shared_ptr audioRendererPrivate = @@ -2448,11 +2448,11 @@ HWTEST(AudioRendererUnitTest, UpdateRendererInfoByAudioFlag_002, TestSize.Level1 uint32_t flag = AUDIO_OUTPUT_FLAG_DIRECT; IAudioStream::StreamClass streamClass; - streamClass = audioRendererPrivate->UpdateRendererInfoByAudioFlag(flag); + streamClass = audioRendererPrivate->UpdateRendererInfoByRouteFlag(flag); EXPECT_EQ(streamClass, IAudioStream::StreamClass::PA_STREAM); flag = AUDIO_OUTPUT_FLAG_DIRECT | AUDIO_OUTPUT_FLAG_VOIP; - streamClass = audioRendererPrivate->UpdateRendererInfoByAudioFlag(flag); + streamClass = audioRendererPrivate->UpdateRendererInfoByRouteFlag(flag); EXPECT_EQ(streamClass, IAudioStream::StreamClass::PA_STREAM); } } // namespace AudioStandard -- Gitee From 2037ccaf681bf4fed429f283da19d81fd8ce7be5 Mon Sep 17 00:00:00 2001 From: ruiyangsun Date: Sat, 6 Sep 2025 11:15:58 +0800 Subject: [PATCH 06/11] fix build bug Signed-off-by: ruiyangsun --- frameworks/native/audiocapturer/src/audio_capturer.cpp | 5 ++--- frameworks/native/audiorenderer/src/audio_renderer.cpp | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/frameworks/native/audiocapturer/src/audio_capturer.cpp b/frameworks/native/audiocapturer/src/audio_capturer.cpp index dc31cf5399..ed05743161 100644 --- a/frameworks/native/audiocapturer/src/audio_capturer.cpp +++ b/frameworks/native/audiocapturer/src/audio_capturer.cpp @@ -396,7 +396,7 @@ IAudioStream::StreamClass AudioCapturerPrivate::UpdateCapturerInfoByRouteFlag(ui capturerInfo_.pipeType = PIPE_TYPE_NORMAL_IN; } AUDIO_INFO_LOG("Route flag: %{public}u, streamClass: %{public}d, capturerFlags: %{public}d, pipeType: %{public}d", - flag, streamClass, capturerInfo_.capturerFlags, capturerInfo_.pipeType); + flag, ret, capturerInfo_.capturerFlags, capturerInfo_.pipeType); return ret; } @@ -1534,7 +1534,6 @@ bool AudioCapturerPrivate::GenerateNewStream(IAudioStream::StreamClass targetCla CHECK_AND_RETURN_RET_LOG(ret == SUCCESS, false, "CreateCapturerClient failed"); bool switchResult = false; - std::shared_ptr oldAudioStream = nullptr; targetClass = UpdateCapturerInfoByRouteFlag(flag); std::shared_ptr newAudioStream = IAudioStream::GetRecordStream(targetClass, switchInfo.params, switchInfo.eStreamType, appInfo_.appUid); @@ -1562,7 +1561,7 @@ bool AudioCapturerPrivate::GenerateNewStream(IAudioStream::StreamClass targetCla CHECK_AND_RETURN_RET_LOG(initResult == SUCCESS, false, "Init ipc strean failed"); } - oldAudioStream = audioStream_; + std::shared_ptr oldAudioStream = audioStream_; // Operation of replace audioStream_ must be performed before StartAudioStream. // Otherwise GetBufferDesc will return the buffer pointer of oldStream (causing Use-After-Free). audioStream_ = newAudioStream; diff --git a/frameworks/native/audiorenderer/src/audio_renderer.cpp b/frameworks/native/audiorenderer/src/audio_renderer.cpp index 14be71a425..4dde1b9672 100644 --- a/frameworks/native/audiorenderer/src/audio_renderer.cpp +++ b/frameworks/native/audiorenderer/src/audio_renderer.cpp @@ -776,7 +776,7 @@ IAudioStream::StreamClass AudioRendererPrivate::UpdateRendererInfoByRouteFlag(ui rendererInfo_.pipeType = PIPE_TYPE_NORMAL_OUT; } AUDIO_INFO_LOG("Route flag: %{public}u, streamClass: %{public}d, rendererFlag: %{public}d, pipeType: %{public}d", - flag, streamClass, rendererInfo_.rendererFlags, rendererInfo_.pipeType); + flag, ret, rendererInfo_.rendererFlags, rendererInfo_.pipeType); return ret; } @@ -2264,7 +2264,6 @@ bool AudioRendererPrivate::GenerateNewStream(IAudioStream::StreamClass targetCla CHECK_AND_RETURN_RET_LOG(ret == SUCCESS, false, "CreateRendererClient failed"); bool switchResult = false; - std::shared_ptr oldAudioStream = nullptr; // create new IAudioStream targetClass = UpdateRendererInfoByRouteFlag(flag); std::shared_ptr newAudioStream = IAudioStream::GetPlaybackStream(targetClass, switchInfo.params, @@ -2299,7 +2298,7 @@ bool AudioRendererPrivate::GenerateNewStream(IAudioStream::StreamClass targetCla switchResult = SetSwitchInfo(switchInfo, newAudioStream); CHECK_AND_RETURN_RET_LOG(switchResult, false, "Init ipc stream failed"); } - oldAudioStream = audioStream_; + std::shared_ptr oldAudioStream = audioStream_; // Update audioStream_ to newAudioStream in both AudioRendererPrivate and AudioInterruptCallbackImpl. // Operation of replace audioStream_ must be performed before StartAudioStream. // Otherwise GetBufferDesc will return the buffer pointer of oldStream (causing Use-After-Free). -- Gitee From 34981ea83d66b9f5ce950cf8a91831515fe28465 Mon Sep 17 00:00:00 2001 From: ruiyangsun Date: Sat, 6 Sep 2025 14:16:08 +0800 Subject: [PATCH 07/11] fix build bug Signed-off-by: ruiyangsun --- .../capturer_test/src/audio_capturer_extra_plus_unit_test.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frameworks/native/audiocapturer/test/unittest/capturer_test/src/audio_capturer_extra_plus_unit_test.cpp b/frameworks/native/audiocapturer/test/unittest/capturer_test/src/audio_capturer_extra_plus_unit_test.cpp index 3d4a7a3acd..5c412762fb 100644 --- a/frameworks/native/audiocapturer/test/unittest/capturer_test/src/audio_capturer_extra_plus_unit_test.cpp +++ b/frameworks/native/audiocapturer/test/unittest/capturer_test/src/audio_capturer_extra_plus_unit_test.cpp @@ -532,7 +532,8 @@ HWTEST(AudioCapturerUnitTest, AudioCapturerPrivate_025, TestSize.Level1) uint32_t flag = 0x6000; IAudioStream::StreamClass streamClass = capturer->UpdateCapturerInfoByRouteFlag(flag); - EXPECT_EQ(capturer->capturerInfo_.pipeType, PIPE_TYPE_CALL_IN); + EXPECT_EQ(streamClass, IAudioStream::StreamClass::VOIP_STREAM); + } /** -- Gitee From c96f3204e80f8bdbf16f483feff98fa7851aff2e Mon Sep 17 00:00:00 2001 From: ruiyangsun Date: Sat, 6 Sep 2025 14:50:52 +0800 Subject: [PATCH 08/11] fix build bug Signed-off-by: ruiyangsun --- .../capturer_test/src/audio_capturer_extra_plus_unit_test.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/frameworks/native/audiocapturer/test/unittest/capturer_test/src/audio_capturer_extra_plus_unit_test.cpp b/frameworks/native/audiocapturer/test/unittest/capturer_test/src/audio_capturer_extra_plus_unit_test.cpp index 5c412762fb..8ab91a4b48 100644 --- a/frameworks/native/audiocapturer/test/unittest/capturer_test/src/audio_capturer_extra_plus_unit_test.cpp +++ b/frameworks/native/audiocapturer/test/unittest/capturer_test/src/audio_capturer_extra_plus_unit_test.cpp @@ -533,7 +533,6 @@ HWTEST(AudioCapturerUnitTest, AudioCapturerPrivate_025, TestSize.Level1) uint32_t flag = 0x6000; IAudioStream::StreamClass streamClass = capturer->UpdateCapturerInfoByRouteFlag(flag); EXPECT_EQ(streamClass, IAudioStream::StreamClass::VOIP_STREAM); - } /** -- Gitee From 7625c0628da6f18d141438bf7228ec9d9ec1f519 Mon Sep 17 00:00:00 2001 From: ruiyangsun Date: Sat, 6 Sep 2025 15:55:56 +0800 Subject: [PATCH 09/11] fix build bug Signed-off-by: ruiyangsun --- .../include/audio_capturer_private.h | 2 +- .../audiocapturer/src/audio_capturer.cpp | 8 +++--- .../audio_capturer_extra_plus_unit_test.cpp | 4 +-- .../include/audio_renderer_private.h | 2 +- .../audiorenderer/src/audio_renderer.cpp | 8 +++--- .../src/audio_renderer_setter_unit_test.cpp | 26 +++++++++---------- .../client/capturer_in_client_unit_test.cpp | 1 + 7 files changed, 26 insertions(+), 25 deletions(-) diff --git a/frameworks/native/audiocapturer/include/audio_capturer_private.h b/frameworks/native/audiocapturer/include/audio_capturer_private.h index ec24c85071..6daeb44834 100644 --- a/frameworks/native/audiocapturer/include/audio_capturer_private.h +++ b/frameworks/native/audiocapturer/include/audio_capturer_private.h @@ -138,7 +138,7 @@ private: int32_t CheckAndStopAudioCapturer(std::string callingFunc); int32_t InitAudioInterruptCallback(); std::shared_ptr ConvertToStreamDescriptor(const AudioStreamParams &audioStreamParams); - IAudioStream::StreamClass UpdateCapturerInfoByRouteFlag(uint32_t flag); + IAudioStream::StreamClass UpdateCapturerInfoAndGenerateStreamClass(uint32_t flag); int32_t InitInputDeviceChangeCallback(); int32_t SetSwitchInfo(IAudioStream::SwitchInfo info, std::shared_ptr audioStream); void InitSwitchInfo(IAudioStream::StreamClass targetClass, IAudioStream::SwitchInfo &info); diff --git a/frameworks/native/audiocapturer/src/audio_capturer.cpp b/frameworks/native/audiocapturer/src/audio_capturer.cpp index ed05743161..6e41d51d5a 100644 --- a/frameworks/native/audiocapturer/src/audio_capturer.cpp +++ b/frameworks/native/audiocapturer/src/audio_capturer.cpp @@ -310,7 +310,7 @@ int32_t AudioCapturerPrivate::SetParams(const AudioCapturerParams params) AUDIO_INFO_LOG("StreamClientState for Capturer::CreateClient. id %{public}u, flag :%{public}u", audioStreamParams.originalSessionId, flag); - streamClass = UpdateCapturerInfoByRouteFlag(flag); + streamClass = UpdateCapturerInfoAndGenerateStreamClass(flag); // check AudioStreamParams for fast stream if (audioStream_ == nullptr) { audioStream_ = IAudioStream::GetRecordStream(streamClass, audioStreamParams, audioStreamType_, @@ -377,7 +377,7 @@ std::shared_ptr AudioCapturerPrivate::ConvertToStreamDesc return streamDesc; } -IAudioStream::StreamClass AudioCapturerPrivate::UpdateCapturerInfoByRouteFlag(uint32_t flag) +IAudioStream::StreamClass AudioCapturerPrivate::UpdateCapturerInfoAndGenerateStreamClass(uint32_t flag) { IAudioStream::StreamClass ret = IAudioStream::StreamClass::PA_STREAM; if (flag & AUDIO_INPUT_FLAG_FAST) { @@ -713,7 +713,7 @@ int32_t AudioCapturerPrivate::CheckAndRestoreAudioCapturer(std::string callingFu // Get restore info and target stream class for switching. RestoreInfo restoreInfo; audioStream_->GetRestoreInfo(restoreInfo); - IAudioStream::StreamClass targetClass = UpdateCapturerInfoByRouteFlag(restoreInfo.routeFlag); + IAudioStream::StreamClass targetClass = UpdateCapturerInfoAndGenerateStreamClass(restoreInfo.routeFlag); if (restoreStatus == NEED_RESTORE_TO_NORMAL) { restoreInfo.targetStreamFlag = AUDIO_FLAG_FORCED_NORMAL; } @@ -1534,7 +1534,7 @@ bool AudioCapturerPrivate::GenerateNewStream(IAudioStream::StreamClass targetCla CHECK_AND_RETURN_RET_LOG(ret == SUCCESS, false, "CreateCapturerClient failed"); bool switchResult = false; - targetClass = UpdateCapturerInfoByRouteFlag(flag); + targetClass = UpdateCapturerInfoAndGenerateStreamClass(flag); std::shared_ptr newAudioStream = IAudioStream::GetRecordStream(targetClass, switchInfo.params, switchInfo.eStreamType, appInfo_.appUid); CHECK_AND_RETURN_RET_LOG(newAudioStream != nullptr, false, "GetRecordStream failed."); diff --git a/frameworks/native/audiocapturer/test/unittest/capturer_test/src/audio_capturer_extra_plus_unit_test.cpp b/frameworks/native/audiocapturer/test/unittest/capturer_test/src/audio_capturer_extra_plus_unit_test.cpp index 8ab91a4b48..ab436ee3e5 100644 --- a/frameworks/native/audiocapturer/test/unittest/capturer_test/src/audio_capturer_extra_plus_unit_test.cpp +++ b/frameworks/native/audiocapturer/test/unittest/capturer_test/src/audio_capturer_extra_plus_unit_test.cpp @@ -522,7 +522,7 @@ HWTEST(AudioCapturerUnitTest, AudioCapturerPrivate_024, TestSize.Level1) * @tc.name : Test AudioCapturerPrivate API * @tc.type : FUNC * @tc.number: AudioCapturerPrivate_025 - * @tc.desc : Test AudioCapturerPrivate::UpdateCapturerInfoByRouteFlag + * @tc.desc : Test AudioCapturerPrivate::UpdateCapturerInfoAndGenerateStreamClass */ HWTEST(AudioCapturerUnitTest, AudioCapturerPrivate_025, TestSize.Level1) { @@ -531,7 +531,7 @@ HWTEST(AudioCapturerUnitTest, AudioCapturerPrivate_025, TestSize.Level1) ASSERT_NE(capturer, nullptr); uint32_t flag = 0x6000; - IAudioStream::StreamClass streamClass = capturer->UpdateCapturerInfoByRouteFlag(flag); + IAudioStream::StreamClass streamClass = capturer->UpdateCapturerInfoAndGenerateStreamClass(flag); EXPECT_EQ(streamClass, IAudioStream::StreamClass::VOIP_STREAM); } diff --git a/frameworks/native/audiorenderer/include/audio_renderer_private.h b/frameworks/native/audiorenderer/include/audio_renderer_private.h index a9daf8f61d..10c5259373 100644 --- a/frameworks/native/audiorenderer/include/audio_renderer_private.h +++ b/frameworks/native/audiorenderer/include/audio_renderer_private.h @@ -201,7 +201,7 @@ private: std::shared_ptr ConvertToStreamDescriptor(const AudioStreamParams &audioStreamParams); std::shared_ptr GetStreamDescBySwitchInfo( const IAudioStream::SwitchInfo &switchInfo, const RestoreInfo &restoreInfo); - IAudioStream::StreamClass UpdateRendererInfoByRouteFlag(uint32_t flag); + IAudioStream::StreamClass UpdateRendererInfoAndGenerateStreamClass(uint32_t flag); int32_t InitAudioInterruptCallback(bool isRestoreAudio = false); int32_t InitOutputDeviceChangeCallback(); void InitAudioRouteCallback(); diff --git a/frameworks/native/audiorenderer/src/audio_renderer.cpp b/frameworks/native/audiorenderer/src/audio_renderer.cpp index 4dde1b9672..b621fb54d5 100644 --- a/frameworks/native/audiorenderer/src/audio_renderer.cpp +++ b/frameworks/native/audiorenderer/src/audio_renderer.cpp @@ -709,7 +709,7 @@ int32_t AudioRendererPrivate::PrepareAudioStream(AudioStreamParams &audioStreamP HILOG_COMM_INFO("StreamClientState for Renderer::CreateClient. id %{public}u, flag: %{public}u", audioStreamParams.originalSessionId, flag); - streamClass = UpdateRendererInfoByRouteFlag(flag); + streamClass = UpdateRendererInfoAndGenerateStreamClass(flag); if (audioStream_ == nullptr) { audioStream_ = IAudioStream::GetPlaybackStream(streamClass, audioStreamParams, audioStreamType, @@ -742,7 +742,7 @@ std::shared_ptr AudioRendererPrivate::ConvertToStreamDesc return streamDesc; } -IAudioStream::StreamClass AudioRendererPrivate::UpdateRendererInfoByRouteFlag(uint32_t flag) +IAudioStream::StreamClass AudioRendererPrivate::UpdateRendererInfoAndGenerateStreamClass(uint32_t flag) { IAudioStream::StreamClass ret = IAudioStream::StreamClass::PA_STREAM; if (flag & AUDIO_OUTPUT_FLAG_FAST) { @@ -1010,7 +1010,7 @@ int32_t AudioRendererPrivate::CheckAndRestoreAudioRenderer(std::string callingFu // Get restore info and target stream class for switching. audioStream_->GetRestoreInfo(restoreInfo); - targetClass = UpdateRendererInfoByRouteFlag(restoreInfo.routeFlag); + targetClass = UpdateRendererInfoAndGenerateStreamClass(restoreInfo.routeFlag); if (restoreStatus == NEED_RESTORE_TO_NORMAL) { restoreInfo.targetStreamFlag = AUDIO_FLAG_FORCED_NORMAL; } @@ -2265,7 +2265,7 @@ bool AudioRendererPrivate::GenerateNewStream(IAudioStream::StreamClass targetCla bool switchResult = false; // create new IAudioStream - targetClass = UpdateRendererInfoByRouteFlag(flag); + targetClass = UpdateRendererInfoAndGenerateStreamClass(flag); std::shared_ptr newAudioStream = IAudioStream::GetPlaybackStream(targetClass, switchInfo.params, switchInfo.eStreamType, appInfo_.appUid); CHECK_AND_RETURN_RET_LOG(newAudioStream != nullptr, false, "SetParams GetPlayBackStream failed."); diff --git a/frameworks/native/audiorenderer/test/unittest/renderer_test/src/audio_renderer_setter_unit_test.cpp b/frameworks/native/audiorenderer/test/unittest/renderer_test/src/audio_renderer_setter_unit_test.cpp index d3c9504599..b73405e9f2 100644 --- a/frameworks/native/audiorenderer/test/unittest/renderer_test/src/audio_renderer_setter_unit_test.cpp +++ b/frameworks/native/audiorenderer/test/unittest/renderer_test/src/audio_renderer_setter_unit_test.cpp @@ -1705,10 +1705,10 @@ HWTEST(AudioRendererUnitTest, SetAudioPrivacyType_001, TestSize.Level1) /** * @tc.name : Test AudioRendererPrivate - * @tc.number: UpdateRendererInfoByRouteFlag_001 - * @tc.desc : Test UpdateRendererInfoByRouteFlag API + * @tc.number: UpdateRendererInfoAndGenerateStreamClass_001 + * @tc.desc : Test UpdateRendererInfoAndGenerateStreamClass API */ -HWTEST(AudioRendererUnitTest, UpdateRendererInfoByRouteFlag_001, TestSize.Level1) +HWTEST(AudioRendererUnitTest, UpdateRendererInfoAndGenerateStreamClass_001, TestSize.Level1) { AppInfo appInfo = {}; std::shared_ptr audioRendererPrivate = @@ -1716,23 +1716,23 @@ HWTEST(AudioRendererUnitTest, UpdateRendererInfoByRouteFlag_001, TestSize.Level1 uint32_t flag = AUDIO_OUTPUT_FLAG_FAST; IAudioStream::StreamClass streamClass; - streamClass = audioRendererPrivate->UpdateRendererInfoByRouteFlag(flag); + streamClass = audioRendererPrivate->UpdateRendererInfoAndGenerateStreamClass(flag); EXPECT_EQ(streamClass, IAudioStream::StreamClass::FAST_STREAM); flag = AUDIO_OUTPUT_FLAG_FAST | AUDIO_OUTPUT_FLAG_VOIP; - streamClass = audioRendererPrivate->UpdateRendererInfoByRouteFlag(flag); + streamClass = audioRendererPrivate->UpdateRendererInfoAndGenerateStreamClass(flag); EXPECT_EQ(streamClass, IAudioStream::StreamClass::VOIP_STREAM); flag = AUDIO_OUTPUT_FLAG_DIRECT; - streamClass = audioRendererPrivate->UpdateRendererInfoByRouteFlag(flag); + streamClass = audioRendererPrivate->UpdateRendererInfoAndGenerateStreamClass(flag); EXPECT_EQ(streamClass, IAudioStream::StreamClass::PA_STREAM); flag = AUDIO_OUTPUT_FLAG_MULTICHANNEL; - streamClass = audioRendererPrivate->UpdateRendererInfoByRouteFlag(flag); + streamClass = audioRendererPrivate->UpdateRendererInfoAndGenerateStreamClass(flag); EXPECT_EQ(streamClass, IAudioStream::StreamClass::PA_STREAM); flag = AUDIO_FLAG_NONE; - streamClass = audioRendererPrivate->UpdateRendererInfoByRouteFlag(flag); + streamClass = audioRendererPrivate->UpdateRendererInfoAndGenerateStreamClass(flag); EXPECT_EQ(streamClass, IAudioStream::StreamClass::PA_STREAM); } @@ -2437,10 +2437,10 @@ HWTEST(AudioRendererUnitTest, Audio_Renderer_SwitchToTargetStream_002, TestSize. /** * @tc.name : Test AudioRendererPrivate - * @tc.number: UpdateRendererInfoByRouteFlag_002 - * @tc.desc : Test UpdateRendererInfoByRouteFlag API + * @tc.number: UpdateRendererInfoAndGenerateStreamClass_002 + * @tc.desc : Test UpdateRendererInfoAndGenerateStreamClass API */ -HWTEST(AudioRendererUnitTest, UpdateRendererInfoByRouteFlag_002, TestSize.Level1) +HWTEST(AudioRendererUnitTest, UpdateRendererInfoAndGenerateStreamClass_002, TestSize.Level1) { AppInfo appInfo = {}; std::shared_ptr audioRendererPrivate = @@ -2448,11 +2448,11 @@ HWTEST(AudioRendererUnitTest, UpdateRendererInfoByRouteFlag_002, TestSize.Level1 uint32_t flag = AUDIO_OUTPUT_FLAG_DIRECT; IAudioStream::StreamClass streamClass; - streamClass = audioRendererPrivate->UpdateRendererInfoByRouteFlag(flag); + streamClass = audioRendererPrivate->UpdateRendererInfoAndGenerateStreamClass(flag); EXPECT_EQ(streamClass, IAudioStream::StreamClass::PA_STREAM); flag = AUDIO_OUTPUT_FLAG_DIRECT | AUDIO_OUTPUT_FLAG_VOIP; - streamClass = audioRendererPrivate->UpdateRendererInfoByRouteFlag(flag); + streamClass = audioRendererPrivate->UpdateRendererInfoAndGenerateStreamClass(flag); EXPECT_EQ(streamClass, IAudioStream::StreamClass::PA_STREAM); } } // namespace AudioStandard diff --git a/services/audio_service/test/unittest/client/capturer_in_client_unit_test.cpp b/services/audio_service/test/unittest/client/capturer_in_client_unit_test.cpp index 2bfdd3cf01..b68a61ad20 100644 --- a/services/audio_service/test/unittest/client/capturer_in_client_unit_test.cpp +++ b/services/audio_service/test/unittest/client/capturer_in_client_unit_test.cpp @@ -251,6 +251,7 @@ void Init(std::shared_ptr capturerInClientInner) size_t size = 8 * 1024; capturerInClientInner->clientSpanSizeInByte_ = size; capturerInClientInner->ringCache_ = std::make_unique(size); + capturerInClientInner->clientBuffer_ = OHAudioBuffer::CreateFromLocal(VALUE_FIF, VALUE_FIVE, VALUE_FOUR); } /** -- Gitee From 00eccaf55a8586cec28ad836d5c2b94bc3e7eec1 Mon Sep 17 00:00:00 2001 From: ruiyangsun Date: Sat, 6 Sep 2025 16:04:04 +0800 Subject: [PATCH 10/11] fix build bug Signed-off-by: ruiyangsun --- .../include/audio_capturer_private.h | 2 +- .../audiocapturer/src/audio_capturer.cpp | 8 +++--- .../audio_capturer_extra_plus_unit_test.cpp | 4 +-- .../include/audio_renderer_private.h | 2 +- .../audiorenderer/src/audio_renderer.cpp | 8 +++--- .../src/audio_renderer_setter_unit_test.cpp | 26 +++++++++---------- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/frameworks/native/audiocapturer/include/audio_capturer_private.h b/frameworks/native/audiocapturer/include/audio_capturer_private.h index 6daeb44834..ce3b532401 100644 --- a/frameworks/native/audiocapturer/include/audio_capturer_private.h +++ b/frameworks/native/audiocapturer/include/audio_capturer_private.h @@ -138,7 +138,7 @@ private: int32_t CheckAndStopAudioCapturer(std::string callingFunc); int32_t InitAudioInterruptCallback(); std::shared_ptr ConvertToStreamDescriptor(const AudioStreamParams &audioStreamParams); - IAudioStream::StreamClass UpdateCapturerInfoAndGenerateStreamClass(uint32_t flag); + IAudioStream::StreamClass DecideStreamClassAndUpdateCapturerInfo(uint32_t flag); int32_t InitInputDeviceChangeCallback(); int32_t SetSwitchInfo(IAudioStream::SwitchInfo info, std::shared_ptr audioStream); void InitSwitchInfo(IAudioStream::StreamClass targetClass, IAudioStream::SwitchInfo &info); diff --git a/frameworks/native/audiocapturer/src/audio_capturer.cpp b/frameworks/native/audiocapturer/src/audio_capturer.cpp index 6e41d51d5a..43b64def71 100644 --- a/frameworks/native/audiocapturer/src/audio_capturer.cpp +++ b/frameworks/native/audiocapturer/src/audio_capturer.cpp @@ -310,7 +310,7 @@ int32_t AudioCapturerPrivate::SetParams(const AudioCapturerParams params) AUDIO_INFO_LOG("StreamClientState for Capturer::CreateClient. id %{public}u, flag :%{public}u", audioStreamParams.originalSessionId, flag); - streamClass = UpdateCapturerInfoAndGenerateStreamClass(flag); + streamClass = DecideStreamClassAndUpdateCapturerInfo(flag); // check AudioStreamParams for fast stream if (audioStream_ == nullptr) { audioStream_ = IAudioStream::GetRecordStream(streamClass, audioStreamParams, audioStreamType_, @@ -377,7 +377,7 @@ std::shared_ptr AudioCapturerPrivate::ConvertToStreamDesc return streamDesc; } -IAudioStream::StreamClass AudioCapturerPrivate::UpdateCapturerInfoAndGenerateStreamClass(uint32_t flag) +IAudioStream::StreamClass AudioCapturerPrivate::DecideStreamClassAndUpdateCapturerInfo(uint32_t flag) { IAudioStream::StreamClass ret = IAudioStream::StreamClass::PA_STREAM; if (flag & AUDIO_INPUT_FLAG_FAST) { @@ -713,7 +713,7 @@ int32_t AudioCapturerPrivate::CheckAndRestoreAudioCapturer(std::string callingFu // Get restore info and target stream class for switching. RestoreInfo restoreInfo; audioStream_->GetRestoreInfo(restoreInfo); - IAudioStream::StreamClass targetClass = UpdateCapturerInfoAndGenerateStreamClass(restoreInfo.routeFlag); + IAudioStream::StreamClass targetClass = DecideStreamClassAndUpdateCapturerInfo(restoreInfo.routeFlag); if (restoreStatus == NEED_RESTORE_TO_NORMAL) { restoreInfo.targetStreamFlag = AUDIO_FLAG_FORCED_NORMAL; } @@ -1534,7 +1534,7 @@ bool AudioCapturerPrivate::GenerateNewStream(IAudioStream::StreamClass targetCla CHECK_AND_RETURN_RET_LOG(ret == SUCCESS, false, "CreateCapturerClient failed"); bool switchResult = false; - targetClass = UpdateCapturerInfoAndGenerateStreamClass(flag); + targetClass = DecideStreamClassAndUpdateCapturerInfo(flag); std::shared_ptr newAudioStream = IAudioStream::GetRecordStream(targetClass, switchInfo.params, switchInfo.eStreamType, appInfo_.appUid); CHECK_AND_RETURN_RET_LOG(newAudioStream != nullptr, false, "GetRecordStream failed."); diff --git a/frameworks/native/audiocapturer/test/unittest/capturer_test/src/audio_capturer_extra_plus_unit_test.cpp b/frameworks/native/audiocapturer/test/unittest/capturer_test/src/audio_capturer_extra_plus_unit_test.cpp index ab436ee3e5..b0762efb66 100644 --- a/frameworks/native/audiocapturer/test/unittest/capturer_test/src/audio_capturer_extra_plus_unit_test.cpp +++ b/frameworks/native/audiocapturer/test/unittest/capturer_test/src/audio_capturer_extra_plus_unit_test.cpp @@ -522,7 +522,7 @@ HWTEST(AudioCapturerUnitTest, AudioCapturerPrivate_024, TestSize.Level1) * @tc.name : Test AudioCapturerPrivate API * @tc.type : FUNC * @tc.number: AudioCapturerPrivate_025 - * @tc.desc : Test AudioCapturerPrivate::UpdateCapturerInfoAndGenerateStreamClass + * @tc.desc : Test AudioCapturerPrivate::DecideStreamClassAndUpdateCapturerInfo */ HWTEST(AudioCapturerUnitTest, AudioCapturerPrivate_025, TestSize.Level1) { @@ -531,7 +531,7 @@ HWTEST(AudioCapturerUnitTest, AudioCapturerPrivate_025, TestSize.Level1) ASSERT_NE(capturer, nullptr); uint32_t flag = 0x6000; - IAudioStream::StreamClass streamClass = capturer->UpdateCapturerInfoAndGenerateStreamClass(flag); + IAudioStream::StreamClass streamClass = capturer->DecideStreamClassAndUpdateCapturerInfo(flag); EXPECT_EQ(streamClass, IAudioStream::StreamClass::VOIP_STREAM); } diff --git a/frameworks/native/audiorenderer/include/audio_renderer_private.h b/frameworks/native/audiorenderer/include/audio_renderer_private.h index 10c5259373..9cc46ce6d7 100644 --- a/frameworks/native/audiorenderer/include/audio_renderer_private.h +++ b/frameworks/native/audiorenderer/include/audio_renderer_private.h @@ -201,7 +201,7 @@ private: std::shared_ptr ConvertToStreamDescriptor(const AudioStreamParams &audioStreamParams); std::shared_ptr GetStreamDescBySwitchInfo( const IAudioStream::SwitchInfo &switchInfo, const RestoreInfo &restoreInfo); - IAudioStream::StreamClass UpdateRendererInfoAndGenerateStreamClass(uint32_t flag); + IAudioStream::StreamClass DecideStreamClassUpdateRendererInfo(uint32_t flag); int32_t InitAudioInterruptCallback(bool isRestoreAudio = false); int32_t InitOutputDeviceChangeCallback(); void InitAudioRouteCallback(); diff --git a/frameworks/native/audiorenderer/src/audio_renderer.cpp b/frameworks/native/audiorenderer/src/audio_renderer.cpp index b621fb54d5..997a6272ad 100644 --- a/frameworks/native/audiorenderer/src/audio_renderer.cpp +++ b/frameworks/native/audiorenderer/src/audio_renderer.cpp @@ -709,7 +709,7 @@ int32_t AudioRendererPrivate::PrepareAudioStream(AudioStreamParams &audioStreamP HILOG_COMM_INFO("StreamClientState for Renderer::CreateClient. id %{public}u, flag: %{public}u", audioStreamParams.originalSessionId, flag); - streamClass = UpdateRendererInfoAndGenerateStreamClass(flag); + streamClass = DecideStreamClassUpdateRendererInfo(flag); if (audioStream_ == nullptr) { audioStream_ = IAudioStream::GetPlaybackStream(streamClass, audioStreamParams, audioStreamType, @@ -742,7 +742,7 @@ std::shared_ptr AudioRendererPrivate::ConvertToStreamDesc return streamDesc; } -IAudioStream::StreamClass AudioRendererPrivate::UpdateRendererInfoAndGenerateStreamClass(uint32_t flag) +IAudioStream::StreamClass AudioRendererPrivate::DecideStreamClassUpdateRendererInfo(uint32_t flag) { IAudioStream::StreamClass ret = IAudioStream::StreamClass::PA_STREAM; if (flag & AUDIO_OUTPUT_FLAG_FAST) { @@ -1010,7 +1010,7 @@ int32_t AudioRendererPrivate::CheckAndRestoreAudioRenderer(std::string callingFu // Get restore info and target stream class for switching. audioStream_->GetRestoreInfo(restoreInfo); - targetClass = UpdateRendererInfoAndGenerateStreamClass(restoreInfo.routeFlag); + targetClass = DecideStreamClassUpdateRendererInfo(restoreInfo.routeFlag); if (restoreStatus == NEED_RESTORE_TO_NORMAL) { restoreInfo.targetStreamFlag = AUDIO_FLAG_FORCED_NORMAL; } @@ -2265,7 +2265,7 @@ bool AudioRendererPrivate::GenerateNewStream(IAudioStream::StreamClass targetCla bool switchResult = false; // create new IAudioStream - targetClass = UpdateRendererInfoAndGenerateStreamClass(flag); + targetClass = DecideStreamClassUpdateRendererInfo(flag); std::shared_ptr newAudioStream = IAudioStream::GetPlaybackStream(targetClass, switchInfo.params, switchInfo.eStreamType, appInfo_.appUid); CHECK_AND_RETURN_RET_LOG(newAudioStream != nullptr, false, "SetParams GetPlayBackStream failed."); diff --git a/frameworks/native/audiorenderer/test/unittest/renderer_test/src/audio_renderer_setter_unit_test.cpp b/frameworks/native/audiorenderer/test/unittest/renderer_test/src/audio_renderer_setter_unit_test.cpp index b73405e9f2..43244f765c 100644 --- a/frameworks/native/audiorenderer/test/unittest/renderer_test/src/audio_renderer_setter_unit_test.cpp +++ b/frameworks/native/audiorenderer/test/unittest/renderer_test/src/audio_renderer_setter_unit_test.cpp @@ -1705,10 +1705,10 @@ HWTEST(AudioRendererUnitTest, SetAudioPrivacyType_001, TestSize.Level1) /** * @tc.name : Test AudioRendererPrivate - * @tc.number: UpdateRendererInfoAndGenerateStreamClass_001 - * @tc.desc : Test UpdateRendererInfoAndGenerateStreamClass API + * @tc.number: DecideStreamClassUpdateRendererInfo_001 + * @tc.desc : Test DecideStreamClassUpdateRendererInfo API */ -HWTEST(AudioRendererUnitTest, UpdateRendererInfoAndGenerateStreamClass_001, TestSize.Level1) +HWTEST(AudioRendererUnitTest, DecideStreamClassUpdateRendererInfo_001, TestSize.Level1) { AppInfo appInfo = {}; std::shared_ptr audioRendererPrivate = @@ -1716,23 +1716,23 @@ HWTEST(AudioRendererUnitTest, UpdateRendererInfoAndGenerateStreamClass_001, Test uint32_t flag = AUDIO_OUTPUT_FLAG_FAST; IAudioStream::StreamClass streamClass; - streamClass = audioRendererPrivate->UpdateRendererInfoAndGenerateStreamClass(flag); + streamClass = audioRendererPrivate->DecideStreamClassUpdateRendererInfo(flag); EXPECT_EQ(streamClass, IAudioStream::StreamClass::FAST_STREAM); flag = AUDIO_OUTPUT_FLAG_FAST | AUDIO_OUTPUT_FLAG_VOIP; - streamClass = audioRendererPrivate->UpdateRendererInfoAndGenerateStreamClass(flag); + streamClass = audioRendererPrivate->DecideStreamClassUpdateRendererInfo(flag); EXPECT_EQ(streamClass, IAudioStream::StreamClass::VOIP_STREAM); flag = AUDIO_OUTPUT_FLAG_DIRECT; - streamClass = audioRendererPrivate->UpdateRendererInfoAndGenerateStreamClass(flag); + streamClass = audioRendererPrivate->DecideStreamClassUpdateRendererInfo(flag); EXPECT_EQ(streamClass, IAudioStream::StreamClass::PA_STREAM); flag = AUDIO_OUTPUT_FLAG_MULTICHANNEL; - streamClass = audioRendererPrivate->UpdateRendererInfoAndGenerateStreamClass(flag); + streamClass = audioRendererPrivate->DecideStreamClassUpdateRendererInfo(flag); EXPECT_EQ(streamClass, IAudioStream::StreamClass::PA_STREAM); flag = AUDIO_FLAG_NONE; - streamClass = audioRendererPrivate->UpdateRendererInfoAndGenerateStreamClass(flag); + streamClass = audioRendererPrivate->DecideStreamClassUpdateRendererInfo(flag); EXPECT_EQ(streamClass, IAudioStream::StreamClass::PA_STREAM); } @@ -2437,10 +2437,10 @@ HWTEST(AudioRendererUnitTest, Audio_Renderer_SwitchToTargetStream_002, TestSize. /** * @tc.name : Test AudioRendererPrivate - * @tc.number: UpdateRendererInfoAndGenerateStreamClass_002 - * @tc.desc : Test UpdateRendererInfoAndGenerateStreamClass API + * @tc.number: DecideStreamClassUpdateRendererInfo_002 + * @tc.desc : Test DecideStreamClassUpdateRendererInfo API */ -HWTEST(AudioRendererUnitTest, UpdateRendererInfoAndGenerateStreamClass_002, TestSize.Level1) +HWTEST(AudioRendererUnitTest, DecideStreamClassUpdateRendererInfo_002, TestSize.Level1) { AppInfo appInfo = {}; std::shared_ptr audioRendererPrivate = @@ -2448,11 +2448,11 @@ HWTEST(AudioRendererUnitTest, UpdateRendererInfoAndGenerateStreamClass_002, Test uint32_t flag = AUDIO_OUTPUT_FLAG_DIRECT; IAudioStream::StreamClass streamClass; - streamClass = audioRendererPrivate->UpdateRendererInfoAndGenerateStreamClass(flag); + streamClass = audioRendererPrivate->DecideStreamClassUpdateRendererInfo(flag); EXPECT_EQ(streamClass, IAudioStream::StreamClass::PA_STREAM); flag = AUDIO_OUTPUT_FLAG_DIRECT | AUDIO_OUTPUT_FLAG_VOIP; - streamClass = audioRendererPrivate->UpdateRendererInfoAndGenerateStreamClass(flag); + streamClass = audioRendererPrivate->DecideStreamClassUpdateRendererInfo(flag); EXPECT_EQ(streamClass, IAudioStream::StreamClass::PA_STREAM); } } // namespace AudioStandard -- Gitee From b3dcf948d36779520ea96fec8277aee8e0f8286c Mon Sep 17 00:00:00 2001 From: ruiyangsun Date: Sat, 6 Sep 2025 16:07:47 +0800 Subject: [PATCH 11/11] fix build bug Signed-off-by: ruiyangsun --- .../include/audio_renderer_private.h | 2 +- .../audiorenderer/src/audio_renderer.cpp | 8 +++--- .../src/audio_renderer_setter_unit_test.cpp | 26 +++++++++---------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/frameworks/native/audiorenderer/include/audio_renderer_private.h b/frameworks/native/audiorenderer/include/audio_renderer_private.h index 9cc46ce6d7..377d34f750 100644 --- a/frameworks/native/audiorenderer/include/audio_renderer_private.h +++ b/frameworks/native/audiorenderer/include/audio_renderer_private.h @@ -201,7 +201,7 @@ private: std::shared_ptr ConvertToStreamDescriptor(const AudioStreamParams &audioStreamParams); std::shared_ptr GetStreamDescBySwitchInfo( const IAudioStream::SwitchInfo &switchInfo, const RestoreInfo &restoreInfo); - IAudioStream::StreamClass DecideStreamClassUpdateRendererInfo(uint32_t flag); + IAudioStream::StreamClass DecideStreamClassAndUpdateRendererInfo(uint32_t flag); int32_t InitAudioInterruptCallback(bool isRestoreAudio = false); int32_t InitOutputDeviceChangeCallback(); void InitAudioRouteCallback(); diff --git a/frameworks/native/audiorenderer/src/audio_renderer.cpp b/frameworks/native/audiorenderer/src/audio_renderer.cpp index 997a6272ad..5fa3ccce3a 100644 --- a/frameworks/native/audiorenderer/src/audio_renderer.cpp +++ b/frameworks/native/audiorenderer/src/audio_renderer.cpp @@ -709,7 +709,7 @@ int32_t AudioRendererPrivate::PrepareAudioStream(AudioStreamParams &audioStreamP HILOG_COMM_INFO("StreamClientState for Renderer::CreateClient. id %{public}u, flag: %{public}u", audioStreamParams.originalSessionId, flag); - streamClass = DecideStreamClassUpdateRendererInfo(flag); + streamClass = DecideStreamClassAndUpdateRendererInfo(flag); if (audioStream_ == nullptr) { audioStream_ = IAudioStream::GetPlaybackStream(streamClass, audioStreamParams, audioStreamType, @@ -742,7 +742,7 @@ std::shared_ptr AudioRendererPrivate::ConvertToStreamDesc return streamDesc; } -IAudioStream::StreamClass AudioRendererPrivate::DecideStreamClassUpdateRendererInfo(uint32_t flag) +IAudioStream::StreamClass AudioRendererPrivate::DecideStreamClassAndUpdateRendererInfo(uint32_t flag) { IAudioStream::StreamClass ret = IAudioStream::StreamClass::PA_STREAM; if (flag & AUDIO_OUTPUT_FLAG_FAST) { @@ -1010,7 +1010,7 @@ int32_t AudioRendererPrivate::CheckAndRestoreAudioRenderer(std::string callingFu // Get restore info and target stream class for switching. audioStream_->GetRestoreInfo(restoreInfo); - targetClass = DecideStreamClassUpdateRendererInfo(restoreInfo.routeFlag); + targetClass = DecideStreamClassAndUpdateRendererInfo(restoreInfo.routeFlag); if (restoreStatus == NEED_RESTORE_TO_NORMAL) { restoreInfo.targetStreamFlag = AUDIO_FLAG_FORCED_NORMAL; } @@ -2265,7 +2265,7 @@ bool AudioRendererPrivate::GenerateNewStream(IAudioStream::StreamClass targetCla bool switchResult = false; // create new IAudioStream - targetClass = DecideStreamClassUpdateRendererInfo(flag); + targetClass = DecideStreamClassAndUpdateRendererInfo(flag); std::shared_ptr newAudioStream = IAudioStream::GetPlaybackStream(targetClass, switchInfo.params, switchInfo.eStreamType, appInfo_.appUid); CHECK_AND_RETURN_RET_LOG(newAudioStream != nullptr, false, "SetParams GetPlayBackStream failed."); diff --git a/frameworks/native/audiorenderer/test/unittest/renderer_test/src/audio_renderer_setter_unit_test.cpp b/frameworks/native/audiorenderer/test/unittest/renderer_test/src/audio_renderer_setter_unit_test.cpp index 43244f765c..28924a8fce 100644 --- a/frameworks/native/audiorenderer/test/unittest/renderer_test/src/audio_renderer_setter_unit_test.cpp +++ b/frameworks/native/audiorenderer/test/unittest/renderer_test/src/audio_renderer_setter_unit_test.cpp @@ -1705,10 +1705,10 @@ HWTEST(AudioRendererUnitTest, SetAudioPrivacyType_001, TestSize.Level1) /** * @tc.name : Test AudioRendererPrivate - * @tc.number: DecideStreamClassUpdateRendererInfo_001 - * @tc.desc : Test DecideStreamClassUpdateRendererInfo API + * @tc.number: DecideStreamClassAndUpdateRendererInfo_001 + * @tc.desc : Test DecideStreamClassAndUpdateRendererInfo API */ -HWTEST(AudioRendererUnitTest, DecideStreamClassUpdateRendererInfo_001, TestSize.Level1) +HWTEST(AudioRendererUnitTest, DecideStreamClassAndUpdateRendererInfo_001, TestSize.Level1) { AppInfo appInfo = {}; std::shared_ptr audioRendererPrivate = @@ -1716,23 +1716,23 @@ HWTEST(AudioRendererUnitTest, DecideStreamClassUpdateRendererInfo_001, TestSize. uint32_t flag = AUDIO_OUTPUT_FLAG_FAST; IAudioStream::StreamClass streamClass; - streamClass = audioRendererPrivate->DecideStreamClassUpdateRendererInfo(flag); + streamClass = audioRendererPrivate->DecideStreamClassAndUpdateRendererInfo(flag); EXPECT_EQ(streamClass, IAudioStream::StreamClass::FAST_STREAM); flag = AUDIO_OUTPUT_FLAG_FAST | AUDIO_OUTPUT_FLAG_VOIP; - streamClass = audioRendererPrivate->DecideStreamClassUpdateRendererInfo(flag); + streamClass = audioRendererPrivate->DecideStreamClassAndUpdateRendererInfo(flag); EXPECT_EQ(streamClass, IAudioStream::StreamClass::VOIP_STREAM); flag = AUDIO_OUTPUT_FLAG_DIRECT; - streamClass = audioRendererPrivate->DecideStreamClassUpdateRendererInfo(flag); + streamClass = audioRendererPrivate->DecideStreamClassAndUpdateRendererInfo(flag); EXPECT_EQ(streamClass, IAudioStream::StreamClass::PA_STREAM); flag = AUDIO_OUTPUT_FLAG_MULTICHANNEL; - streamClass = audioRendererPrivate->DecideStreamClassUpdateRendererInfo(flag); + streamClass = audioRendererPrivate->DecideStreamClassAndUpdateRendererInfo(flag); EXPECT_EQ(streamClass, IAudioStream::StreamClass::PA_STREAM); flag = AUDIO_FLAG_NONE; - streamClass = audioRendererPrivate->DecideStreamClassUpdateRendererInfo(flag); + streamClass = audioRendererPrivate->DecideStreamClassAndUpdateRendererInfo(flag); EXPECT_EQ(streamClass, IAudioStream::StreamClass::PA_STREAM); } @@ -2437,10 +2437,10 @@ HWTEST(AudioRendererUnitTest, Audio_Renderer_SwitchToTargetStream_002, TestSize. /** * @tc.name : Test AudioRendererPrivate - * @tc.number: DecideStreamClassUpdateRendererInfo_002 - * @tc.desc : Test DecideStreamClassUpdateRendererInfo API + * @tc.number: DecideStreamClassAndUpdateRendererInfo_002 + * @tc.desc : Test DecideStreamClassAndUpdateRendererInfo API */ -HWTEST(AudioRendererUnitTest, DecideStreamClassUpdateRendererInfo_002, TestSize.Level1) +HWTEST(AudioRendererUnitTest, DecideStreamClassAndUpdateRendererInfo_002, TestSize.Level1) { AppInfo appInfo = {}; std::shared_ptr audioRendererPrivate = @@ -2448,11 +2448,11 @@ HWTEST(AudioRendererUnitTest, DecideStreamClassUpdateRendererInfo_002, TestSize. uint32_t flag = AUDIO_OUTPUT_FLAG_DIRECT; IAudioStream::StreamClass streamClass; - streamClass = audioRendererPrivate->DecideStreamClassUpdateRendererInfo(flag); + streamClass = audioRendererPrivate->DecideStreamClassAndUpdateRendererInfo(flag); EXPECT_EQ(streamClass, IAudioStream::StreamClass::PA_STREAM); flag = AUDIO_OUTPUT_FLAG_DIRECT | AUDIO_OUTPUT_FLAG_VOIP; - streamClass = audioRendererPrivate->DecideStreamClassUpdateRendererInfo(flag); + streamClass = audioRendererPrivate->DecideStreamClassAndUpdateRendererInfo(flag); EXPECT_EQ(streamClass, IAudioStream::StreamClass::PA_STREAM); } } // namespace AudioStandard -- Gitee