Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 359bf320 authored by Chen Chen's avatar Chen Chen
Browse files

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

Bug: 214615268
Test: Build
Tag: #feature
Change-Id: Ic2a997614e16abfd745c80dc87ecf5d340497691
parent 8b389e11

bluetooth/audio/aidl/aidl_api/android.hardware.bluetooth.audio/current/android/hardware/bluetooth/audio/IBluetoothAudioPort.aidl

+0 −1
Original line number Diff line number Diff line
@@ -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);

}

bluetooth/audio/aidl/android/hardware/bluetooth/audio/IBluetoothAudioPort.aidl

+0 −7
Original line number Diff line number Diff line
@@ -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);

}

bluetooth/audio/utils/aidl_session/BluetoothAudioSession.cpp

+0 −15
Original line number Diff line number Diff line
@@ -523,21 +523,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 =

bluetooth/audio/utils/aidl_session/BluetoothAudioSession.h

+0 −1
Original line number Diff line number Diff line
@@ -166,7 +166,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);