diff --git a/frameworks/native/audiodefinitions/include/audio_stream_descriptor.h b/frameworks/native/audiodefinitions/include/audio_stream_descriptor.h index b5e4499f5da9a68af97f6a03f67bfc02999c1fa7..050b0ca5455d7796fe92113220353e85e6124df0 100644 --- a/frameworks/native/audiodefinitions/include/audio_stream_descriptor.h +++ b/frameworks/native/audiodefinitions/include/audio_stream_descriptor.h @@ -210,6 +210,15 @@ public: return newDeviceDescs_[0]->getType(); } + bool IsA2dpOffloadStream() + { + std::lock_guard lock(lock_); + if (newDeviceDescs_.size() < 1 || newDeviceDescs_[0] == nullptr) { + return false; + } + return newDeviceDescs_[0]->IsA2dpOffload(); + } + void AddNewDevice(std::shared_ptr device) { if (device == nullptr) { diff --git a/frameworks/native/audiopolicy/include/audio_policy_manager.h b/frameworks/native/audiopolicy/include/audio_policy_manager.h index 04e63588365b51bfaddf96ef8a2d169a45ea32c3..d2a0a483b192ec455c932c60945ec1f75a427f43 100644 --- a/frameworks/native/audiopolicy/include/audio_policy_manager.h +++ b/frameworks/native/audiopolicy/include/audio_policy_manager.h @@ -92,7 +92,7 @@ public: float GetSingleStreamVolume(int32_t streamId); - AudioStreamInfo GetFastStreamInfo(); + AudioStreamInfo GetFastStreamInfo(uint32_t sessionId); int32_t SetStreamMute(AudioVolumeType volumeType, bool mute, bool isLegacy = false, const DeviceType &deviceType = DEVICE_TYPE_NONE); diff --git a/interfaces/inner_api/native/audiocommon/include/audio_device_descriptor.h b/interfaces/inner_api/native/audiocommon/include/audio_device_descriptor.h index ea9856ebd1e560a2854495cfa002cd000c7b9ef8..883b345570274044cd65e7402b7e64c3d9a343c4 100644 --- a/interfaces/inner_api/native/audiocommon/include/audio_device_descriptor.h +++ b/interfaces/inner_api/native/audiocommon/include/audio_device_descriptor.h @@ -106,6 +106,8 @@ public: bool IsDistributedSpeaker() const; + bool IsA2dpOffload() const; + bool IsSpeakerOrEarpiece() const; bool IsRemote() const; diff --git a/services/audio_policy/client/service/src/audio_policy_manager.cpp b/services/audio_policy/client/service/src/audio_policy_manager.cpp index 6d2fa2280ba6bf39b002a52e30acb9b779085e89..a539eb3390d8324cef72305a61bd5ae1991738f6 100644 --- a/services/audio_policy/client/service/src/audio_policy_manager.cpp +++ b/services/audio_policy/client/service/src/audio_policy_manager.cpp @@ -573,12 +573,12 @@ float AudioPolicyManager::GetLowPowerVolume(int32_t streamId) return outVolume; } -AudioStreamInfo AudioPolicyManager::GetFastStreamInfo() +AudioStreamInfo AudioPolicyManager::GetFastStreamInfo(uint32_t sessionId) { AudioStreamInfo streamInfo = {SAMPLE_RATE_48000, ENCODING_PCM, SAMPLE_S16LE, STEREO}; const sptr gsp = GetAudioPolicyManagerProxy(); CHECK_AND_RETURN_RET_LOG(gsp != nullptr, streamInfo, "audio policy manager proxy is NULL."); - gsp->GetFastStreamInfo(streamInfo); + gsp->GetFastStreamInfo(streamInfo, sessionId); return streamInfo; } diff --git a/services/audio_policy/idl/IAudioPolicy.idl b/services/audio_policy/idl/IAudioPolicy.idl index 3b8c4a798aacc135a3586dd2bc5cfbf5abde28cb..e20edc2aff1a69a66e9bc067b9203ac1911f936d 100644 --- a/services/audio_policy/idl/IAudioPolicy.idl +++ b/services/audio_policy/idl/IAudioPolicy.idl @@ -118,7 +118,7 @@ interface IAudioPolicy { void GetCurrentRendererChangeInfos([out] List> audioRendererChangeInfos); void GetCurrentCapturerChangeInfos([out] List> audioCapturerChangeInfos); void SetLowPowerVolume([in] int streamId, [in] float volume); - void GetFastStreamInfo([out] AudioStreamInfo streamInfo); + void GetFastStreamInfo([out] AudioStreamInfo streamInfo, [in] unsigned int sessionId); void GetLowPowerVolume([in] int streamId, [out] float retVolume); void UpdateStreamState([in] int clientUid, [in] int streamSetState, [in] int streamUsage); void GetSingleStreamVolume([in] int streamId, [out] float retVolume); diff --git a/services/audio_policy/server/domain/device/src/audio_device_descriptor.cpp b/services/audio_policy/server/domain/device/src/audio_device_descriptor.cpp index eb70f338c0a2199640c7c2725b3f5429e354ce2e..855c327bb8dd52e524376fa91ca61e54ea49728f 100644 --- a/services/audio_policy/server/domain/device/src/audio_device_descriptor.cpp +++ b/services/audio_policy/server/domain/device/src/audio_device_descriptor.cpp @@ -519,6 +519,12 @@ bool AudioDeviceDescriptor::IsDistributedSpeaker() const return deviceType_ == DEVICE_TYPE_SPEAKER && networkId_ != "LocalDevice"; } +bool AudioDeviceDescriptor::IsA2dpOffload() const +{ + return deviceType_ == DEVICE_TYPE_BLUETOOTH_A2DP && a2dpOffloadFlag_ == A2DP_OFFLOAD; +} + + bool AudioDeviceDescriptor::IsSpeakerOrEarpiece() const { return (networkId_ == LOCAL_NETWORK_ID && deviceType_ == DEVICE_TYPE_SPEAKER) || diff --git a/services/audio_policy/server/service/service_main/include/audio_core_service.h b/services/audio_policy/server/service/service_main/include/audio_core_service.h index 031b12a4d364ea769cd0122b1592630e860638e3..8d2ca114f57be9c750f0305cd1115d7e36517d39 100644 --- a/services/audio_policy/server/service/service_main/include/audio_core_service.h +++ b/services/audio_policy/server/service/service_main/include/audio_core_service.h @@ -319,6 +319,7 @@ private: void SetFirstScreenOn(); void FetchOutputDupDevice(std::string caller, uint32_t sessionId, std::shared_ptr &streamDesc); + bool IsA2dpOffloadStream(uint sessionId); private: static std::string GetEncryptAddr(const std::string &addr); int32_t FetchRendererPipesAndExecute(std::vector> &streamDescs, diff --git a/services/audio_policy/server/service/service_main/include/audio_policy_server.h b/services/audio_policy/server/service/service_main/include/audio_policy_server.h index 32313acdbb2b10d4a9adb1b47b93c79874f8bf37..cc8904e4c460cdfa291a60f9814349a31e9948a2 100644 --- a/services/audio_policy/server/service/service_main/include/audio_policy_server.h +++ b/services/audio_policy/server/service/service_main/include/audio_policy_server.h @@ -123,7 +123,7 @@ public: int32_t SetLowPowerVolume(int32_t streamId, float volume) override; - int32_t GetFastStreamInfo(AudioStreamInfo &streamInfo) override; + int32_t GetFastStreamInfo(AudioStreamInfo &streamInfo, uint32_t sessionId) override; int32_t GetLowPowerVolume(int32_t streamId, float &outVolume) override; diff --git a/services/audio_policy/server/service/service_main/include/audio_policy_service.h b/services/audio_policy/server/service/service_main/include/audio_policy_service.h index e200a40aeb7bed24253d0a4599dfe7d6f0a8381e..69e565b82d1a22ceb70a142ae2d0ca0253841cab 100644 --- a/services/audio_policy/server/service/service_main/include/audio_policy_service.h +++ b/services/audio_policy/server/service/service_main/include/audio_policy_service.h @@ -112,8 +112,6 @@ public: int32_t NotifyWakeUpCapturerRemoved(); - AudioStreamInfo GetFastStreamInfo(); - bool IsAbsVolumeSupported(); shared_ptr GetActiveOutputDeviceDescriptor(); diff --git a/services/audio_policy/server/service/service_main/src/audio_core_service.cpp b/services/audio_policy/server/service/service_main/src/audio_core_service.cpp index ddeb3bf03694c1c7e7a9d5d956346f65532b4564..97de135f515d048f445f4594f36013d0acb9bec9 100644 --- a/services/audio_policy/server/service/service_main/src/audio_core_service.cpp +++ b/services/audio_policy/server/service/service_main/src/audio_core_service.cpp @@ -1484,5 +1484,12 @@ void AudioCoreService::SetFirstScreenOn() { isFirstScreenOn_ = true; } + +bool AudioCoreService::IsA2dpOffloadStream(uint sessionId) +{ + auto streamDesc = pipeManager_->GetStreamDescById(sessionId); + CHECK_AND_RETURN_RET_LOG(streamDesc != nullptr, false, "can't find sessionId: %{public}d", sessionId); + return streamDesc->IsA2dpOffloadStream(); +} } // namespace AudioStandard } // namespace OHOS diff --git a/services/audio_policy/server/service/service_main/src/audio_policy_server.cpp b/services/audio_policy/server/service/service_main/src/audio_policy_server.cpp index f766ed1f7f5d743d795fefad78009c03abfea498..68f33c8bee16677e74ec867dc8f8edcf73c5ffec 100644 --- a/services/audio_policy/server/service/service_main/src/audio_policy_server.cpp +++ b/services/audio_policy/server/service/service_main/src/audio_policy_server.cpp @@ -1256,9 +1256,19 @@ int32_t AudioPolicyServer::SetLowPowerVolume(int32_t streamId, float volume) return streamCollector_.SetLowPowerVolume(streamId, volume); } -int32_t AudioPolicyServer::GetFastStreamInfo(AudioStreamInfo &streamInfo) +int32_t AudioPolicyServer::GetFastStreamInfo(AudioStreamInfo &streamInfo, uint32_t sessionId) { - streamInfo = audioPolicyService_.GetFastStreamInfo(); + streamInfo = {SAMPLE_RATE_48000, ENCODING_PCM, SAMPLE_S16LE, STEREO}; + streamInfo.format = audioConfigManager_.GetFastFormat(); + + // change to SAMPLE_S16LE for bluetooth + if (streamInfo.format == SAMPLE_S32LE) { + AUDIO_INFO_LOG("Before change fast format is %{public}d", streamInfo.format); + bool isA2dpOffload = coreService_->IsA2dpOffloadStream(sessionId); + DeviceType deviceType = audioActiveDevice_.GetCurrentOutputDeviceType(); + streamInfo.format = (deviceType == DEVICE_TYPE_BLUETOOTH_A2DP && !isA2dpOffload) ? SAMPLE_S16LE : SAMPLE_S32LE; + } + AUDIO_INFO_LOG("Fast format is %{public}d", streamInfo.format); return SUCCESS; } diff --git a/services/audio_policy/server/service/service_main/src/audio_policy_service.cpp b/services/audio_policy/server/service/service_main/src/audio_policy_service.cpp index 881a1aa0b2ae20baa9e940dcc708fb0c9db04920..6b594c1966ae74480361296923b67032a88c203e 100644 --- a/services/audio_policy/server/service/service_main/src/audio_policy_service.cpp +++ b/services/audio_policy/server/service/service_main/src/audio_policy_service.cpp @@ -270,20 +270,6 @@ int32_t AudioPolicyService::NotifyWakeUpCapturerRemoved() return SUCCESS; } -AudioStreamInfo AudioPolicyService::GetFastStreamInfo() -{ - AudioStreamInfo streamInfo = {SAMPLE_RATE_48000, ENCODING_PCM, SAMPLE_S16LE, STEREO}; - streamInfo.format = audioConfigManager_.GetFastFormat(); - - // change to SAMPLE_S16LE for bluetooth - if (streamInfo.format == SAMPLE_S32LE) { - DeviceType deviceType = audioActiveDevice_.GetCurrentOutputDeviceType(); - streamInfo.format = deviceType == DEVICE_TYPE_BLUETOOTH_A2DP ? SAMPLE_S16LE : SAMPLE_S32LE; - } - AUDIO_INFO_LOG("Fast format is %{public}d", streamInfo.format); - return streamInfo; -} - bool AudioPolicyService::IsAbsVolumeSupported() { return audioPolicyManager_.IsAbsVolumeScene(); diff --git a/services/audio_policy/server/service/service_main/test/unittest/audio_policy_server_unit_test/src/audio_policy_server_extended_test.cpp b/services/audio_policy/server/service/service_main/test/unittest/audio_policy_server_unit_test/src/audio_policy_server_extended_test.cpp index b495c672bf45938f97cc43cf391d30dd748f7c99..5311108847b410bcb52891343cb2dc83c3fe5f8c 100644 --- a/services/audio_policy/server/service/service_main/test/unittest/audio_policy_server_unit_test/src/audio_policy_server_extended_test.cpp +++ b/services/audio_policy/server/service/service_main/test/unittest/audio_policy_server_unit_test/src/audio_policy_server_extended_test.cpp @@ -372,5 +372,31 @@ HWTEST_F(AudioPolicyServerUnitTest, AudioPolicyServer_017, TestSize.Level4) audioPolicyServer_->audioPolicyServerHandler_.reset(); EXPECT_EQ(audioPolicyServer_->SetCallbackStreamUsageInfo(streamUsages), AUDIO_ERR); } + +/** +* @tc.name : Test AudioPolicyServer. +* @tc.number: GetFastStreamInfo_001 +* @tc.desc : Test AudioPolicyServer interfaces. +*/ +HWTEST_F(AudioPolicyServerUnitTest, GetFastStreamInfo_001, TestSize.Level1) +{ + AudioStreamInfo info; + audioPolicyServer_->audioConfigManager_.OnFastFormatParsed(AudioSampleFormat::SAMPLE_S32LE); + audioPolicyServer_->GetFastStreamInfo(info, 0); + ASSERT_EQ(AudioSampleFormat::SAMPLE_S32LE, info.format); +} + +/** +* @tc.name : Test AudioPolicyServer. +* @tc.number: GetFastStreamInfo_002 +* @tc.desc : Test AudioPolicyServer interfaces. +*/ +HWTEST_F(AudioPolicyServerUnitTest, GetFastStreamInfo_002, TestSize.Level1) +{ + AudioStreamInfo info; + audioPolicyServer_->audioConfigManager_.OnFastFormatParsed(AudioSampleFormat::SAMPLE_S32LE); + audioPolicyServer_->GetFastStreamInfo(info, 0); + ASSERT_NE(AudioSampleFormat::SAMPLE_S16LE, info.format); +} } // AudioStandard } // OHOS \ No newline at end of file diff --git a/services/audio_policy/server/service/service_main/test/unittest/audio_policy_service_unit_test/src/audio_policy_service_ext_unit_test.cpp b/services/audio_policy/server/service/service_main/test/unittest/audio_policy_service_unit_test/src/audio_policy_service_ext_unit_test.cpp index 47734a32e90636e07c8b373e231efc52a0093fe2..753b553b03684e792b57cfa14b40cf0b91621a6d 100644 --- a/services/audio_policy/server/service/service_main/test/unittest/audio_policy_service_unit_test/src/audio_policy_service_ext_unit_test.cpp +++ b/services/audio_policy/server/service/service_main/test/unittest/audio_policy_service_unit_test/src/audio_policy_service_ext_unit_test.cpp @@ -211,13 +211,19 @@ HWTEST_F(AudioPolicyServiceExtUnitTest, AudioPolicyServiceTest_006, TestSize.Lev /** * @tc.name : Test AudioPolicyService. -* @tc.number: AudioPolicyServiceTest_007 -* @tc.desc : Test GetFastStreamInfo interfaces. +* @tc.number: AudioPolicyServiceTest_07 +* @tc.desc : Test LoadModernOffloadCapSource interfaces. */ -HWTEST_F(AudioPolicyServiceExtUnitTest, AudioPolicyServiceTest_007, TestSize.Level1) +HWTEST_F(AudioPolicyServiceExtUnitTest, AudioPolicyServiceTest_07, TestSize.Level1) { - auto ret = AudioPolicyService::GetAudioPolicyService().GetFastStreamInfo(); - EXPECT_EQ(SAMPLE_RATE_48000, ret.samplingRate); + auto ret0 = AudioPolicyService::GetAudioPolicyService().LoadModernOffloadCapSource(); + EXPECT_EQ(SUCCESS, ret0); + + AudioIOHandle audioIOHandle = 1003; + AudioPolicyService::GetAudioPolicyService().audioIOHandleMap_.IOHandles_["offloadCapturerSource"] = audioIOHandle; + + auto ret1 = AudioPolicyService::GetAudioPolicyService().LoadModernOffloadCapSource(); + EXPECT_EQ(SUCCESS, ret1); } /** @@ -358,22 +364,5 @@ HWTEST_F(AudioPolicyServiceExtUnitTest, AudioPolicyServiceTest_016, TestSize.Lev auto ret = AudioPolicyService::GetAudioPolicyService().SetAudioEffectProperty(propertyArray); EXPECT_EQ(ERR_INVALID_PARAM, ret); } - -/** -* @tc.name : Test AudioPolicyService. -* @tc.number: AudioPolicyServiceTest_017 -* @tc.desc : Test LoadModernOffloadCapSource interfaces. -*/ -HWTEST_F(AudioPolicyServiceExtUnitTest, AudioPolicyServiceTest_017, TestSize.Level1) -{ - auto ret0 = AudioPolicyService::GetAudioPolicyService().LoadModernOffloadCapSource(); - EXPECT_EQ(SUCCESS, ret0); - - AudioIOHandle audioIOHandle = 1003; - AudioPolicyService::GetAudioPolicyService().audioIOHandleMap_.IOHandles_["offloadCapturerSource"] = audioIOHandle; - - auto ret1 = AudioPolicyService::GetAudioPolicyService().LoadModernOffloadCapSource(); - EXPECT_EQ(SUCCESS, ret1); -} } // namespace AudioStandard } // namespace OHOS \ No newline at end of file diff --git a/services/audio_policy/test/unittest/audio_policy_manager_unit_test/src/audio_policy_manager_unit_test.cpp b/services/audio_policy/test/unittest/audio_policy_manager_unit_test/src/audio_policy_manager_unit_test.cpp index cffbf5f4b411e6bb1232b28b2c55ab11f989e3fd..198c97daed0caf772b9f87198d415b34c11c1d64 100644 --- a/services/audio_policy/test/unittest/audio_policy_manager_unit_test/src/audio_policy_manager_unit_test.cpp +++ b/services/audio_policy/test/unittest/audio_policy_manager_unit_test/src/audio_policy_manager_unit_test.cpp @@ -419,7 +419,7 @@ HWTEST(AudioPolicyManager, GetFastStreamInfo_001, TestSize.Level2) { auto audioPolicyManager_ = std::make_shared(); - AudioStreamInfo streamInfo = audioPolicyManager_->GetFastStreamInfo(); + AudioStreamInfo streamInfo = audioPolicyManager_->GetFastStreamInfo(0); EXPECT_EQ(streamInfo.samplingRate, SAMPLE_RATE_48000); EXPECT_EQ(streamInfo.encoding, ENCODING_PCM); diff --git a/services/audio_policy/test/unittest/audio_policy_service_unit_test/src/audio_policy_service_extended_unit_test.cpp b/services/audio_policy/test/unittest/audio_policy_service_unit_test/src/audio_policy_service_extended_unit_test.cpp index 979e9feccd5b59457c068cc7a8e29e8a81940fe5..3a228a2c9bc9844717d2e489de27163e854f4a4b 100644 --- a/services/audio_policy/test/unittest/audio_policy_service_unit_test/src/audio_policy_service_extended_unit_test.cpp +++ b/services/audio_policy/test/unittest/audio_policy_service_unit_test/src/audio_policy_service_extended_unit_test.cpp @@ -479,35 +479,6 @@ HWTEST_F(AudioPolicyServiceExtendedUnitTest, GetDistributedRoutingRoleInfo_001, GetServerPtr()->audioPolicyService_.GetDistributedRoutingRoleInfo(); } -/** -* @tc.name : Test AudioPolicyService. -* @tc.number: GetFastStreamInfo_001 -* @tc.desc : Test AudioPolicyService interfaces. -*/ -HWTEST_F(AudioPolicyServiceExtendedUnitTest, GetFastStreamInfo_001, TestSize.Level1) -{ - AUDIO_INFO_LOG("AudioPolicyServiceExtendedUnitTest GetFastStreamInfo_001 start"); - ASSERT_NE(nullptr, GetServerPtr()); - GetPermission(); - GetServerPtr()->audioPolicyService_.audioConfigManager_.OnFastFormatParsed(AudioSampleFormat::SAMPLE_S32LE); - auto res = GetServerPtr()->audioPolicyService_.GetFastStreamInfo(); - ASSERT_EQ(AudioSampleFormat::SAMPLE_S32LE, res.format); -} - -/** -* @tc.name : Test AudioPolicyService. -* @tc.number: GetFastStreamInfo_002 -* @tc.desc : Test AudioPolicyService interfaces. -*/ -HWTEST_F(AudioPolicyServiceExtendedUnitTest, GetFastStreamInfo_002, TestSize.Level1) -{ - AUDIO_INFO_LOG("AudioPolicyServiceExtendedUnitTest GetFastStreamInfo_002 start"); - ASSERT_NE(nullptr, GetServerPtr()); - GetPermission(); - auto res = GetServerPtr()->audioPolicyService_.GetFastStreamInfo(); - ASSERT_NE(AudioSampleFormat::SAMPLE_S16LE, res.format); -} - /** * @tc.name : Test AudioPolicyService. * @tc.number: GetActiveOutputDeviceDescriptor_001 diff --git a/services/audio_service/client/src/audio_process_in_client.cpp b/services/audio_service/client/src/audio_process_in_client.cpp index b2729a36c7b00114fcb70ed722892efe2bf0b14c..b0863b93b84a7cc8ce7a73cabe8e3780754197d3 100644 --- a/services/audio_service/client/src/audio_process_in_client.cpp +++ b/services/audio_service/client/src/audio_process_in_client.cpp @@ -369,7 +369,7 @@ std::shared_ptr AudioProcessInClient::Create(const AudioPr bool ret = AudioProcessInClient::CheckIfSupport(config); CHECK_AND_RETURN_RET_LOG(config.audioMode != AUDIO_MODE_PLAYBACK || ret, nullptr, "CheckIfSupport failed!"); - AudioStreamInfo targetStreamInfo = AudioPolicyManager::GetInstance().GetFastStreamInfo(); + AudioStreamInfo targetStreamInfo = AudioPolicyManager::GetInstance().GetFastStreamInfo(config.originalSessionId); sptr gasp = AudioProcessInClientInner::GetAudioServerProxy(); CHECK_AND_RETURN_RET_LOG(gasp != nullptr, nullptr, "Create failed, can not get service."); AudioProcessConfig resetConfig = config; diff --git a/test/fuzztest/audiopolicymanager_fuzzer/audio_policy_manager_fuzzer.cpp b/test/fuzztest/audiopolicymanager_fuzzer/audio_policy_manager_fuzzer.cpp index c0bcd220bf55c6da14c4de6ef58db902ab8a4f10..a2c6cd927f4f3007caf61777ad2f24ffd939a6dc 100644 --- a/test/fuzztest/audiopolicymanager_fuzzer/audio_policy_manager_fuzzer.cpp +++ b/test/fuzztest/audiopolicymanager_fuzzer/audio_policy_manager_fuzzer.cpp @@ -184,6 +184,7 @@ void AudioPolicyManagerTwoFuzzTest() AudioCapturerInfo capturerInfo; int32_t clientId = GetData(); std::shared_ptr callback; + uint32_t sessionId = GetData(); AudioPolicyManager::GetInstance().GetSelfAppVolumeLevel(volumeLevel); AudioPolicyManager::GetInstance().GetAppVolumeLevel(appUid, volumeLevel); @@ -192,7 +193,7 @@ void AudioPolicyManagerTwoFuzzTest() AudioPolicyManager::GetInstance().GetStreamMute(volumeType); AudioPolicyManager::GetInstance().SetLowPowerVolume(streamId, volume); AudioPolicyManager::GetInstance().GetLowPowerVolume(streamId); - AudioPolicyManager::GetInstance().GetFastStreamInfo(); + AudioPolicyManager::GetInstance().GetFastStreamInfo(sessionId); AudioPolicyManager::GetInstance().GetSingleStreamVolume(streamId); AudioPolicyManager::GetInstance().IsStreamActive(volumeType); AudioPolicyManager::GetInstance().IsStreamActiveByStreamUsage(streamUsage); diff --git a/test/fuzztest/audiopolicyserver_fuzzer/audio_policy_server_fuzzer.cpp b/test/fuzztest/audiopolicyserver_fuzzer/audio_policy_server_fuzzer.cpp index 5deb9a9bc7e953746bd82a8747be68a489a61ff6..753f841613e3835383eb809bd51d24c7a9a1669a 100644 --- a/test/fuzztest/audiopolicyserver_fuzzer/audio_policy_server_fuzzer.cpp +++ b/test/fuzztest/audiopolicyserver_fuzzer/audio_policy_server_fuzzer.cpp @@ -437,7 +437,8 @@ void AudioPolicyServerGetFastStreamInfoFuzzTest() auto audioPolicyServer = GetServerPtr(); CHECK_AND_RETURN(audioPolicyServer != nullptr); AudioStreamInfo streamInfo; - audioPolicyServer->GetFastStreamInfo(streamInfo); + uint32_t sessionId = GetData(); + audioPolicyServer->GetFastStreamInfo(streamInfo, sessionId); } void AudioPolicyServerGetLowPowerVolumeFuzzTest() diff --git a/test/fuzztest/audiopolicyservice_fuzzer/audio_policy_service_fuzzer.cpp b/test/fuzztest/audiopolicyservice_fuzzer/audio_policy_service_fuzzer.cpp index 6fbac87bfaaee922019ab7c94b676f88a4aea492..a79bffbd36ac16bfaf6b9c100c0a2dd91d65589e 100644 --- a/test/fuzztest/audiopolicyservice_fuzzer/audio_policy_service_fuzzer.cpp +++ b/test/fuzztest/audiopolicyservice_fuzzer/audio_policy_service_fuzzer.cpp @@ -399,15 +399,6 @@ void AudioPolicyServiceNotifyWakeUpCapturerRemovedFuzztest(const uint8_t *rawDat GetServerPtr()->audioPolicyService_.NotifyWakeUpCapturerRemoved(); } -void AudioPolicyServiceGetFastStreamInfoFuzztest(const uint8_t *rawData, size_t size) -{ - if (rawData == nullptr || size < LIMITSIZE) { - return; - } - - GetServerPtr()->audioPolicyService_.GetFastStreamInfo(); -} - void AudioPolicyServiceIsAbsVolumeSupportedFuzztest(const uint8_t *rawData, size_t size) { if (rawData == nullptr || size < LIMITSIZE) { @@ -947,7 +938,6 @@ OHOS::AudioStandard::TestPtr g_testPtrs[] = { OHOS::AudioStandard::AudioPolicyServiceGetDistributedRoutingRoleInfoFuzztest, OHOS::AudioStandard::AudioPolicyServiceNotifyCapturerAddedFuzztest, OHOS::AudioStandard::AudioPolicyServiceNotifyWakeUpCapturerRemovedFuzztest, - OHOS::AudioStandard::AudioPolicyServiceGetFastStreamInfoFuzztest, OHOS::AudioStandard::AudioPolicyServiceIsAbsVolumeSupportedFuzztest, OHOS::AudioStandard::AudioPolicyServiceGetDevicesFuzztest, OHOS::AudioStandard::AudioPolicyServiceGetPreferredInputDeviceDescriptorsFuzztest,