Merge "Fix regression for the frame duration conf missing" into tm-qpr-dev (16d5eda3) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/le_audio/state_machine.cc

+22 −0

Original line number	Diff line number	Diff line
		@@ -922,6 +922,17 @@ class LeAudioGroupStateMachineImpl : public LeAudioGroupStateMachine {
		*ase->codec_config.codec_frames_blocks_per_sdu);
		}

		if (stream_conf->sink_frame_duration_us == 0) {
		stream_conf->sink_frame_duration_us =
		ase->codec_config.GetFrameDurationUs();
		} else {
		ASSERT_LOG(stream_conf->sink_frame_duration_us ==
		ase->codec_config.GetFrameDurationUs(),
		"frame_duration_us: %d!=%d",
		stream_conf->sink_frame_duration_us,
		ase->codec_config.GetFrameDurationUs());
		}

		LOG_INFO(
		" Added Sink Stream Configuration. CIS Connection Handle: %d"
		", Audio Channel Allocation: %d"
		@@ -981,6 +992,17 @@ class LeAudioGroupStateMachineImpl : public LeAudioGroupStateMachine {
		*ase->codec_config.codec_frames_blocks_per_sdu);
		}

		if (stream_conf->source_frame_duration_us == 0) {
		stream_conf->source_frame_duration_us =
		ase->codec_config.GetFrameDurationUs();
		} else {
		ASSERT_LOG(stream_conf->source_frame_duration_us ==
		ase->codec_config.GetFrameDurationUs(),
		"frame_duration_us: %d!=%d",
		stream_conf->source_frame_duration_us,
		ase->codec_config.GetFrameDurationUs());
		}

		LOG_INFO(
		" Added Source Stream Configuration. CIS Connection Handle: %d"
		", Audio Channel Allocation: %d"