Merge "Add support for HFP_SOFTWARE_DATAPATH session type" into main (4cdccd0b) · Commits · e / os / android_hardware_interfaces

bluetooth/audio/utils/aidl_session/BluetoothAudioSession.cpp

+20 −2

Original line number	Original line	Diff line number	Diff line
	@@ -145,6 +145,13 @@ void BluetoothAudioSession::ReportAudioConfigChanged(
	<< toString(session_type_);		<< toString(session_type_);
	return;		return;
	}		}
			} else if (session_type_ == SessionType::HFP_SOFTWARE_DECODING_DATAPATH \|\|
			session_type_ == SessionType::HFP_SOFTWARE_ENCODING_DATAPATH) {
			if (audio_config.getTag() != AudioConfiguration::pcmConfig) {
			LOG(ERROR) << __func__ << " invalid audio config type for SessionType ="
			<< toString(session_type_);
			return;
			}
	} else {		} else {
	LOG(ERROR) << __func__ << " invalid SessionType ="		LOG(ERROR) << __func__ << " invalid SessionType ="
	<< toString(session_type_);		<< toString(session_type_);
	@@ -166,6 +173,13 @@ void BluetoothAudioSession::ReportAudioConfigChanged(
	<< toString(session_type_);		<< toString(session_type_);
	return;		return;
	}		}
			} else if (session_type_ == SessionType::HFP_SOFTWARE_DECODING_DATAPATH \|\|
			session_type_ == SessionType::HFP_SOFTWARE_ENCODING_DATAPATH) {
			if (audio_config.getTag() != AudioConfiguration::pcmConfig) {
			LOG(ERROR) << __func__ << " invalid audio config type for SessionType ="
			<< toString(session_type_);
			return;
			}
	} else {		} else {
	LOG(ERROR) << __func__		LOG(ERROR) << __func__
	<< " invalid SessionType =" << toString(session_type_);		<< " invalid SessionType =" << toString(session_type_);
	@@ -604,7 +618,9 @@ bool BluetoothAudioSession::UpdateSourceMetadata(
	if (session_type_ == SessionType::A2DP_SOFTWARE_ENCODING_DATAPATH \|\|		if (session_type_ == SessionType::A2DP_SOFTWARE_ENCODING_DATAPATH \|\|
	session_type_ == SessionType::A2DP_HARDWARE_OFFLOAD_ENCODING_DATAPATH \|\|		session_type_ == SessionType::A2DP_HARDWARE_OFFLOAD_ENCODING_DATAPATH \|\|
	session_type_ == SessionType::A2DP_SOFTWARE_DECODING_DATAPATH \|\|		session_type_ == SessionType::A2DP_SOFTWARE_DECODING_DATAPATH \|\|
	session_type_ == SessionType::A2DP_HARDWARE_OFFLOAD_DECODING_DATAPATH) {		session_type_ == SessionType::A2DP_HARDWARE_OFFLOAD_DECODING_DATAPATH \|\|
			session_type_ == SessionType::HFP_SOFTWARE_ENCODING_DATAPATH \|\|
			session_type_ == SessionType::HFP_SOFTWARE_DECODING_DATAPATH) {
	return false;		return false;
	}		}

	@@ -629,7 +645,9 @@ bool BluetoothAudioSession::UpdateSinkMetadata(
	if (session_type_ == SessionType::A2DP_SOFTWARE_ENCODING_DATAPATH \|\|		if (session_type_ == SessionType::A2DP_SOFTWARE_ENCODING_DATAPATH \|\|
	session_type_ == SessionType::A2DP_HARDWARE_OFFLOAD_ENCODING_DATAPATH \|\|		session_type_ == SessionType::A2DP_HARDWARE_OFFLOAD_ENCODING_DATAPATH \|\|
	session_type_ == SessionType::A2DP_SOFTWARE_DECODING_DATAPATH \|\|		session_type_ == SessionType::A2DP_SOFTWARE_DECODING_DATAPATH \|\|
	session_type_ == SessionType::A2DP_HARDWARE_OFFLOAD_DECODING_DATAPATH) {		session_type_ == SessionType::A2DP_HARDWARE_OFFLOAD_DECODING_DATAPATH \|\|
			session_type_ == SessionType::HFP_SOFTWARE_ENCODING_DATAPATH \|\|
			session_type_ == SessionType::HFP_SOFTWARE_DECODING_DATAPATH) {
	return false;		return false;
	}		}