From e6d01185bccdb61403f7c1398490df5178b502d9 Mon Sep 17 00:00:00 2001 From: mol666 Date: Wed, 10 Sep 2025 16:26:11 +0800 Subject: [PATCH 1/3] adjust customSampleRate order in AudioStreamParams for UT IAudioStreamUnitTest Signed-off-by: mol666 --- .../inner_api/native/audiocommon/include/audio_stream_info.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interfaces/inner_api/native/audiocommon/include/audio_stream_info.h b/interfaces/inner_api/native/audiocommon/include/audio_stream_info.h index 708fe12de3..bb5a938ff1 100644 --- a/interfaces/inner_api/native/audiocommon/include/audio_stream_info.h +++ b/interfaces/inner_api/native/audiocommon/include/audio_stream_info.h @@ -264,13 +264,13 @@ enum AudioPreloadType { struct AudioStreamParams { uint32_t samplingRate = 0; - // Add customSampleRate - uint32_t customSampleRate = 0; uint8_t encoding = 0; uint8_t format = 0; uint8_t channels = 0; uint64_t channelLayout = 0ULL; uint32_t originalSessionId = 0; + // Add customSampleRate + uint32_t customSampleRate = 0; }; // sampling rate -- Gitee From e1c8a7f66dee66e544f12084a73745620777aa93 Mon Sep 17 00:00:00 2001 From: mol666 Date: Wed, 10 Sep 2025 16:55:22 +0800 Subject: [PATCH 2/3] fix resampler inrate update Signed-off-by: mol666 --- .../audio_engine/node/src/hpae_audio_format_converter_node.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/audio_engine/node/src/hpae_audio_format_converter_node.cpp b/services/audio_engine/node/src/hpae_audio_format_converter_node.cpp index 1b14461153..dfb89bf73b 100644 --- a/services/audio_engine/node/src/hpae_audio_format_converter_node.cpp +++ b/services/audio_engine/node/src/hpae_audio_format_converter_node.cpp @@ -219,7 +219,7 @@ bool HpaeAudioFormatConverterNode::CheckUpdateOutInfo() if (resampler_->GetOutRate() != sampleRate) { HILOG_COMM_INFO("NodeId: %{public}d, update output sample rate: %{public}d -> %{public}d", GetNodeId(), resampler_->GetOutRate(), sampleRate); - resampler_->UpdateRates(preNodeInfo_.samplingRate, sampleRate); + resampler_->UpdateRates(resampler_->GetInRate(), sampleRate); } HpaeNodeInfo nodeInfo = GetNodeInfo(); -- Gitee From 653c536da4c7d6aa572fdcc2d3bbf9d5097fbc96 Mon Sep 17 00:00:00 2001 From: mol666 Date: Wed, 10 Sep 2025 16:57:37 +0800 Subject: [PATCH 3/3] adjust customSampleRate order in AudioStreamParams for UT IAudioStreamUnitTest Signed-off-by: mol666 --- .../audio_engine/node/src/hpae_audio_format_converter_node.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/audio_engine/node/src/hpae_audio_format_converter_node.cpp b/services/audio_engine/node/src/hpae_audio_format_converter_node.cpp index dfb89bf73b..1b14461153 100644 --- a/services/audio_engine/node/src/hpae_audio_format_converter_node.cpp +++ b/services/audio_engine/node/src/hpae_audio_format_converter_node.cpp @@ -219,7 +219,7 @@ bool HpaeAudioFormatConverterNode::CheckUpdateOutInfo() if (resampler_->GetOutRate() != sampleRate) { HILOG_COMM_INFO("NodeId: %{public}d, update output sample rate: %{public}d -> %{public}d", GetNodeId(), resampler_->GetOutRate(), sampleRate); - resampler_->UpdateRates(resampler_->GetInRate(), sampleRate); + resampler_->UpdateRates(preNodeInfo_.samplingRate, sampleRate); } HpaeNodeInfo nodeInfo = GetNodeInfo(); -- Gitee