| commit | 9c2200bd71aaa0ff2011d3f4583c23de83eee40e | [log] [tgz] |
|---|---|---|
| author | Chen Chen <cncn@google.com> | Mon Feb 14 20:23:05 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Feb 14 20:23:05 2022 +0000 |
| tree | 1eebd4085619c8989bfce0ad8d0e491bfdddf40a | |
| parent | e18ab24d7aecc74715594d7f3dfaaf56cd3e0b0c [diff] | |
| parent | d32943e46c028dab82f00003866eff1300cec553 [diff] |
Merge "SpatialAudio: Remove codec interface from audio HAL. Codec switch logic will be inside Bluetooth" am: 585dc0b0b2 am: d32943e46c Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1982798 Change-Id: I62a9011e1c767b0979927c74b5e3d58fea675737
diff --git a/bluetooth/audio/aidl/aidl_api/android.hardware.bluetooth.audio/current/android/hardware/bluetooth/audio/IBluetoothAudioPort.aidl b/bluetooth/audio/aidl/aidl_api/android.hardware.bluetooth.audio/current/android/hardware/bluetooth/audio/IBluetoothAudioPort.aidl index cc3c641..0033fee 100644 --- a/bluetooth/audio/aidl/aidl_api/android.hardware.bluetooth.audio/current/android/hardware/bluetooth/audio/IBluetoothAudioPort.aidl +++ b/bluetooth/audio/aidl/aidl_api/android.hardware.bluetooth.audio/current/android/hardware/bluetooth/audio/IBluetoothAudioPort.aidl
@@ -41,5 +41,4 @@ 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); }
diff --git a/bluetooth/audio/aidl/android/hardware/bluetooth/audio/IBluetoothAudioPort.aidl b/bluetooth/audio/aidl/android/hardware/bluetooth/audio/IBluetoothAudioPort.aidl index 81c2ce2..9f8007b 100644 --- a/bluetooth/audio/aidl/android/hardware/bluetooth/audio/IBluetoothAudioPort.aidl +++ b/bluetooth/audio/aidl/android/hardware/bluetooth/audio/IBluetoothAudioPort.aidl
@@ -87,11 +87,4 @@ * @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); }
diff --git a/bluetooth/audio/utils/aidl_session/BluetoothAudioSession.cpp b/bluetooth/audio/utils/aidl_session/BluetoothAudioSession.cpp index b90a656..7187828 100644 --- a/bluetooth/audio/utils/aidl_session/BluetoothAudioSession.cpp +++ b/bluetooth/audio/utils/aidl_session/BluetoothAudioSession.cpp
@@ -545,21 +545,6 @@ } } -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 =
diff --git a/bluetooth/audio/utils/aidl_session/BluetoothAudioSession.h b/bluetooth/audio/utils/aidl_session/BluetoothAudioSession.h index 7725331..6e390cc 100644 --- a/bluetooth/audio/utils/aidl_session/BluetoothAudioSession.h +++ b/bluetooth/audio/utils/aidl_session/BluetoothAudioSession.h
@@ -182,7 +182,6 @@ 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);