Merge "LeAudio: Reduce number of reconfigurations" into tm-qpr-dev (72aa2c77) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/le_audio/client.cc

+35 −0

Original line number	Diff line number	Diff line
		@@ -280,6 +280,19 @@ class LeAudioClientImpl : public LeAudioClient {
		return;
		}

		/* For sonification events we don't really need to reconfigure to HQ
		* configuration, but if the previous configuration was for HQ Media,
		* we might want to go back to that scenario.
		*/

		if ((configuration_context_type_ != LeAudioContextType::MEDIA) &&
		(configuration_context_type_ != LeAudioContextType::GAME)) {
		LOG_INFO(
		"Keeping the old configuration as no HQ Media playback is needed "
		"right now.");
		return;
		}

		/* Test the existing metadata against the recent availability */
		metadata_context_types_.sink &= group->GetAvailableContexts();
		if (metadata_context_types_.sink.none()) {
		@@ -3655,6 +3668,28 @@ class LeAudioClientImpl : public LeAudioClient {
		auto new_configuration_context =
		ChooseConfigurationContextType(new_metadata_context_types_);

		/* For the following contexts we don't actually need HQ audio:
		* LeAudioContextType::NOTIFICATIONS
		* LeAudioContextType::SOUNDEFFECTS
		* LeAudioContextType::INSTRUCTIONAL
		* LeAudioContextType::ALERTS
		* LeAudioContextType::EMERGENCYALARM
		* So do not reconfigure if the remote sink is already available at any
		* quality and these are the only contributors to the current audio stream.
		*/
		auto no_reconfigure_contexts =
		LeAudioContextType::NOTIFICATIONS \| LeAudioContextType::SOUNDEFFECTS \|
		LeAudioContextType::INSTRUCTIONAL \| LeAudioContextType::ALERTS \|
		LeAudioContextType::EMERGENCYALARM;
		if ((new_metadata_context_types_ & ~no_reconfigure_contexts).none() &&
		IsDirectionAvailableForCurrentConfiguration(
		group, le_audio::types::kLeAudioDirectionSink)) {
		LOG_INFO(
		"There is no need to reconfigure for the sonification events. Keep "
		"the configuration unchanged.");
		new_configuration_context = configuration_context_type_;
		}

		LOG_DEBUG("new_configuration_context= %s",
		ToString(new_configuration_context).c_str());
		ReconfigureOrUpdateMetadata(group, new_configuration_context,

system/bta/le_audio/le_audio_client_test.cc

+21 −9

Original line number	Diff line number	Diff line
		@@ -3440,10 +3440,12 @@ TEST_F(UnicastTest, TwoEarbudsStreamingContextSwitchNoReconfigure) {
		LeAudioClient::Get()->GroupSetActive(group_id);
		Mock::VerifyAndClearExpectations(&mock_le_audio_source_hal_client_);

		// Start streaming with reconfiguration from default media stream setup
		// Start streaming with new metadata, but use the existing configuration
		EXPECT_CALL(
		mock_state_machine_,
		StartStream(_, le_audio::types::LeAudioContextType::NOTIFICATIONS, _, _))
		StartStream(
		_, types::LeAudioContextType::MEDIA,
		types::AudioContexts(types::LeAudioContextType::NOTIFICATIONS), _))
		.Times(1);

		StartStreaming(AUDIO_USAGE_NOTIFICATION, AUDIO_CONTENT_TYPE_UNKNOWN,
		@@ -3453,37 +3455,47 @@ TEST_F(UnicastTest, TwoEarbudsStreamingContextSwitchNoReconfigure) {
		Mock::VerifyAndClearExpectations(&mock_le_audio_source_hal_client_);
		SyncOnMainLoop();

		// Do a content switch to ALERTS
		// Do a metadata content switch to ALERTS but stay on MEDIA configuration
		EXPECT_CALL(*mock_le_audio_source_hal_client_, OnDestroyed()).Times(0);
		EXPECT_CALL(*mock_le_audio_source_hal_client_, Stop).Times(0);
		EXPECT_CALL(*mock_le_audio_source_hal_client_, Start).Times(0);
		EXPECT_CALL(mock_state_machine_,
		StartStream(_, le_audio::types::LeAudioContextType::ALERTS, _, _))
		EXPECT_CALL(
		mock_state_machine_,
		StartStream(
		_, le_audio::types::LeAudioContextType::MEDIA,
		types::AudioContexts(le_audio::types::LeAudioContextType::ALERTS), _))
		.Times(1);
		UpdateMetadata(AUDIO_USAGE_ALARM, AUDIO_CONTENT_TYPE_UNKNOWN);
		Mock::VerifyAndClearExpectations(&mock_audio_hal_client_callbacks_);
		Mock::VerifyAndClearExpectations(&mock_le_audio_source_hal_client_);

		// Do a content switch to EMERGENCY
		// Do a metadata content switch to EMERGENCY but stay on MEDIA configuration
		EXPECT_CALL(*mock_le_audio_source_hal_client_, OnDestroyed()).Times(0);
		EXPECT_CALL(*mock_le_audio_source_hal_client_, Stop).Times(0);
		EXPECT_CALL(*mock_le_audio_source_hal_client_, Start).Times(0);

		EXPECT_CALL(
		mock_state_machine_,
		StartStream(_, le_audio::types::LeAudioContextType::EMERGENCYALARM, _, _))
		StartStream(_, le_audio::types::LeAudioContextType::MEDIA,
		types::AudioContexts(
		le_audio::types::LeAudioContextType::EMERGENCYALARM),
		_))
		.Times(1);
		UpdateMetadata(AUDIO_USAGE_EMERGENCY, AUDIO_CONTENT_TYPE_UNKNOWN);
		Mock::VerifyAndClearExpectations(&mock_audio_hal_client_callbacks_);
		Mock::VerifyAndClearExpectations(&mock_le_audio_source_hal_client_);

		// Do a content switch to INSTRUCTIONAL
		// Do a metadata content switch to INSTRUCTIONAL but stay on MEDIA
		// configuration
		EXPECT_CALL(*mock_le_audio_source_hal_client_, OnDestroyed()).Times(0);
		EXPECT_CALL(*mock_le_audio_source_hal_client_, Stop).Times(0);
		EXPECT_CALL(*mock_le_audio_source_hal_client_, Start).Times(0);
		EXPECT_CALL(
		mock_state_machine_,
		StartStream(_, le_audio::types::LeAudioContextType::INSTRUCTIONAL, _, _))
		StartStream(_, le_audio::types::LeAudioContextType::MEDIA,
		types::AudioContexts(
		le_audio::types::LeAudioContextType::INSTRUCTIONAL),
		_))
		.Times(1);
		UpdateMetadata(AUDIO_USAGE_ASSISTANCE_NAVIGATION_GUIDANCE,
		AUDIO_CONTENT_TYPE_UNKNOWN);

system/bta/le_audio/le_audio_utils.cc

+2 −0

Original line number	Diff line number	Diff line
		@@ -61,6 +61,8 @@ LeAudioContextType AudioContentToLeAudioContext(
		return LeAudioContextType::EMERGENCYALARM;
		case AUDIO_USAGE_ASSISTANCE_NAVIGATION_GUIDANCE:
		return LeAudioContextType::INSTRUCTIONAL;
		case AUDIO_USAGE_ASSISTANCE_SONIFICATION:
		return LeAudioContextType::SOUNDEFFECTS;
		default:
		break;
		}