Merge "SpatialAudio: Remove codec interface from audio HAL. Codec switch logic will be inside Bluetooth"

This commit is contained in:
Chen Chen
2022-02-14 19:26:29 +00:00
committed by Gerrit Code Review
4 changed files with 0 additions and 24 deletions

View File

@@ -41,5 +41,4 @@ interface IBluetoothAudioPort {
void updateSourceMetadata(in android.hardware.audio.common.SourceMetadata sourceMetadata);
void updateSinkMetadata(in android.hardware.audio.common.SinkMetadata sinkMetadata);
void setLatencyMode(in android.hardware.bluetooth.audio.LatencyMode latencyMode);
void setCodecType(in android.hardware.bluetooth.audio.CodecType codecType);
}

View File

@@ -87,11 +87,4 @@ interface IBluetoothAudioPort {
* @param latencyMode latency mode from audio
*/
void setLatencyMode(in LatencyMode latencyMode);
/**
* Called when codec type is changed.
*
* @param codecType codec type from audio
*/
void setCodecType(in CodecType codecType);
}

View File

@@ -545,21 +545,6 @@ void BluetoothAudioSession::SetLatencyMode(LatencyMode latency_mode) {
}
}
void BluetoothAudioSession::SetCodecType(CodecType codec_type) {
std::lock_guard<std::recursive_mutex> guard(mutex_);
if (!IsSessionReady()) {
LOG(DEBUG) << __func__ << " - SessionType=" << toString(session_type_)
<< " has NO session";
return;
}
auto hal_retval = stack_iface_->setCodecType(codec_type);
if (!hal_retval.isOk()) {
LOG(WARNING) << __func__ << " - IBluetoothAudioPort SessionType="
<< toString(session_type_) << " failed";
}
}
bool BluetoothAudioSession::IsAidlAvailable() {
if (is_aidl_checked) return is_aidl_available;
is_aidl_available =

View File

@@ -182,7 +182,6 @@ class BluetoothAudioSession {
void UpdateSourceMetadata(const struct source_metadata& source_metadata);
void UpdateSinkMetadata(const struct sink_metadata& sink_metadata);
void SetLatencyMode(LatencyMode latency_mode);
void SetCodecType(CodecType codec_type);
// The control function writes stream to FMQ
size_t OutWritePcmData(const void* buffer, size_t bytes);