Merge "leaudio: Minor cleanup on stream reconfiguration" into main am: 192e0291db am: 88d66c1f60 (c522df42) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/le_audio/client.cc

+44 −28

Original line number	Diff line number	Diff line
		@@ -979,6 +979,15 @@ public:
		ContentControlIdKeeper::GetInstance()->SetCcid(AudioContexts(context_type), ccid);
		}

		void initReconfiguration(LeAudioDeviceGroup* group, LeAudioContextType previous_context_type) {
		log::debug(" group_id: {}, previous context_type {}", group->group_id_,
		ToString(previous_context_type));
		pre_configuration_context_type_ = previous_context_type;
		group->SetPendingConfiguration();
		groupStateMachine_->StopStream(group);
		stream_setup_start_timestamp_ = bluetooth::common::time_get_os_boottime_us();
		}

		void SetInCall(bool in_call) override {
		log::debug("in_call: {}", in_call);
		in_call_ = in_call;
		@@ -3005,9 +3014,7 @@ public:

		/* Reconfigure if newly connected member device cannot support
		* current codec configuration */
		group->SetPendingConfiguration();
		groupStateMachine_->StopStream(group);
		stream_setup_start_timestamp_ = bluetooth::common::time_get_os_boottime_us();
		initReconfiguration(group, configuration_context_type_);
		return;
		}
		}
		@@ -4350,13 +4357,17 @@ public:

		bool SetConfigurationAndStopStreamWhenNeeded(LeAudioDeviceGroup* group,
		LeAudioContextType new_context_type) {
		auto previous_context_type = configuration_context_type_;

		auto reconfig_result = UpdateConfigAndCheckIfReconfigurationIsNeeded(group, new_context_type);
		/* Even though the reconfiguration may not be needed, this has
		* to be set here as it might be the initial configuration.
		*/

		configuration_context_type_ = new_context_type;

		log::info("group_id {}, context type {} ({}), {}", group->group_id_, ToString(new_context_type),
		log::info("group_id {}, previous_context {} context type {} ({}), {}", group->group_id_,
		ToString(previous_context_type), ToString(new_context_type),
		ToHexString(new_context_type), ToString(reconfig_result));
		if (reconfig_result == AudioReconfigurationResult::RECONFIGURATION_NOT_NEEDED) {
		return false;
		@@ -4375,9 +4386,9 @@ public:
		alarm_cancel(suspend_timeout_);
		}

		/* Need to reconfigure stream */
		group->SetPendingConfiguration();
		groupStateMachine_->StopStream(group);
		/* Need to reconfigure stream. At this point pre_configuration_context_type shall be set */

		initReconfiguration(group, previous_context_type);
		SendAudioGroupCurrentCodecConfigChanged(group);
		return true;
		}
		@@ -5217,6 +5228,24 @@ public:
		SetAsymmetricBlePhy(group, false);
		}

		void reconfigurationComplete(void) {
		// Check which directions were suspended
		uint8_t previously_active_directions = 0;
		if (audio_sender_state_ >= AudioState::READY_TO_START) {
		previously_active_directions \|= bluetooth::le_audio::types::kLeAudioDirectionSink;
		}
		if (audio_receiver_state_ >= AudioState::READY_TO_START) {
		previously_active_directions \|= bluetooth::le_audio::types::kLeAudioDirectionSource;
		}

		/* We are done with reconfiguration.
		* Clean state and if Audio HAL is waiting, cancel the request
		* so Audio HAL can Resume again.
		*/
		CancelStreamingRequest();
		ReconfigurationComplete(previously_active_directions);
		}

		void OnStateMachineStatusReportCb(int group_id, GroupStreamStatus status) {
		log::info("status: {}, group_id: {}, audio_sender_state {}, audio_receiver_state {}",
		static_cast<int>(status), group_id, bluetooth::common::ToString(audio_sender_state_),
		@@ -5270,9 +5299,7 @@ public:
		"reconfigure to {}",
		ToString(group->GetConfigurationContextType()),
		ToString(configuration_context_type_));
		group->SetPendingConfiguration();
		groupStateMachine_->StopStream(group);
		stream_setup_start_timestamp_ = bluetooth::common::time_get_os_boottime_us();
		initReconfiguration(group, group->GetConfigurationContextType());
		return;
		}

		@@ -5300,23 +5327,9 @@ public:
		/** Stop Audio but don't release all the Audio resources */
		SuspendAudio();
		break;
		case GroupStreamStatus::CONFIGURED_BY_USER: {
		// Check which directions were suspended
		uint8_t previously_active_directions = 0;
		if (audio_sender_state_ >= AudioState::READY_TO_START) {
		previously_active_directions \|= bluetooth::le_audio::types::kLeAudioDirectionSink;
		}
		if (audio_receiver_state_ >= AudioState::READY_TO_START) {
		previously_active_directions \|= bluetooth::le_audio::types::kLeAudioDirectionSource;
		}

		/* We are done with reconfiguration.
		* Clean state and if Audio HAL is waiting, cancel the request
		* so Audio HAL can Resume again.
		*/
		CancelStreamingRequest();
		ReconfigurationComplete(previously_active_directions);
		} break;
		case GroupStreamStatus::CONFIGURED_BY_USER:
		reconfigurationComplete();
		break;
		case GroupStreamStatus::CONFIGURED_AUTONOMOUS:
		/* This state is notified only when
		* groups stays into CONFIGURED state after
		@@ -5354,12 +5367,14 @@ public:

		auto remote_contexts = DirectionalRealignMetadataAudioContexts(group, remote_direction);
		ApplyRemoteMetadataAudioContextPolicy(group, remote_contexts, remote_direction);
		if (GroupStream(group->group_id_, configuration_context_type_, remote_contexts)) {
		if ((configuration_context_type_ != pre_configuration_context_type_) &&
		GroupStream(group->group_id_, configuration_context_type_, remote_contexts)) {
		/* If configuration succeed wait for new status. */
		return;
		}
		log::info("Clear pending configuration flag for group {}", group->group_id_);
		group->ClearPendingConfiguration();
		reconfigurationComplete();
		} else {
		if (sink_monitor_mode_) {
		notifyAudioLocalSink(UnicastMonitorModeStatus::STREAMING_SUSPENDED);
		@@ -5435,6 +5450,7 @@ private:
		LeAudioDeviceGroups aseGroups_;
		LeAudioGroupStateMachine* groupStateMachine_;
		int active_group_id_;
		LeAudioContextType pre_configuration_context_type_;
		LeAudioContextType configuration_context_type_;
		static constexpr char kAllowMultipleContextsInMetadata[] =
		"persist.bluetooth.leaudio.allow.multiple.contexts";

system/bta/le_audio/device_groups.cc

+8 −1

Original line number	Diff line number	Diff line
		@@ -1770,12 +1770,19 @@ void LeAudioDeviceGroup::RemoveCisFromStreamIfNeeded(LeAudioDevice* leAudioDevic
		}

		bool LeAudioDeviceGroup::IsPendingConfiguration(void) const {
		log::verbose("group {}, is pending: {} ", group_id_, stream_conf.pending_configuration);
		return stream_conf.pending_configuration;
		}

		void LeAudioDeviceGroup::SetPendingConfiguration(void) { stream_conf.pending_configuration = true; }
		void LeAudioDeviceGroup::SetPendingConfiguration(void) {
		log::verbose("group {}, is pending from {} to true", group_id_,
		stream_conf.pending_configuration);
		stream_conf.pending_configuration = true;
		}

		void LeAudioDeviceGroup::ClearPendingConfiguration(void) {
		log::verbose("group {}, is pending from {} to false", group_id_,
		stream_conf.pending_configuration);
		stream_conf.pending_configuration = false;
		}