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

Commit 0a1f4964 authored by Chen Chen's avatar Chen Chen Committed by Automerger Merge Worker
Browse files

Merge "Spatial Audio: Add setLatencyMode and setCodecType API with empty... 

Merge "Spatial Audio: Add setLatencyMode and setCodecType API with empty implementation" am: 8553416a am: 5e4820e2

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/1975992

Change-Id: If290357c8fcb2f117020f59a7b8066e5df527951
parents 6c2aad83 5e4820e2

system/audio_hal_interface/aidl/audio_aidl_interfaces.h

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ 
#include <aidl/android/hardware/bluetooth/audio/IBluetoothAudioPort.h>

#include <aidl/android/hardware/bluetooth/audio/IBluetoothAudioProvider.h>

#include <aidl/android/hardware/bluetooth/audio/IBluetoothAudioProviderFactory.h>

#include <aidl/android/hardware/bluetooth/audio/LatencyMode.h>

#include <aidl/android/hardware/bluetooth/audio/Lc3Capabilities.h>

#include <aidl/android/hardware/bluetooth/audio/Lc3Configuration.h>

#include <aidl/android/hardware/bluetooth/audio/LdacCapabilities.h>

system/audio_hal_interface/aidl/bluetooth_audio_port_impl.cc

+10 −0
Original line number Diff line number Diff line
@@ -132,6 +132,16 @@ ndk::ScopedAStatus BluetoothAudioPortImpl::updateSinkMetadata( 
  return ndk::ScopedAStatus::ok();

}



ndk::ScopedAStatus BluetoothAudioPortImpl::setLatencyMode(

    LatencyMode latency_mode) {

  return ndk::ScopedAStatus::ok();

}



ndk::ScopedAStatus BluetoothAudioPortImpl::setCodecType(

    CodecType codec_type) {

  return ndk::ScopedAStatus::ok();

}



PresentationPosition::TimeSpec BluetoothAudioPortImpl::timespec_convert_to_hal(

    const timespec& ts) {

  return {.tvSec = static_cast<int64_t>(ts.tv_sec),

system/audio_hal_interface/aidl/bluetooth_audio_port_impl.h

+6 −0
Original line number Diff line number Diff line
@@ -26,7 +26,9 @@ namespace aidl { 
using ::aidl::android::hardware::audio::common::SinkMetadata;

using ::aidl::android::hardware::audio::common::SourceMetadata;

using ::aidl::android::hardware::bluetooth::audio::BnBluetoothAudioPort;

using ::aidl::android::hardware::bluetooth::audio::CodecType;

using ::aidl::android::hardware::bluetooth::audio::IBluetoothAudioProvider;

using ::aidl::android::hardware::bluetooth::audio::LatencyMode;

using ::aidl::android::hardware::bluetooth::audio::PresentationPosition;



class BluetoothAudioPortImpl : public BnBluetoothAudioPort {
@@ -50,6 +52,10 @@ class BluetoothAudioPortImpl : public BnBluetoothAudioPort { 
  ndk::ScopedAStatus updateSinkMetadata(

      const SinkMetadata& sink_metadata) override;



  ndk::ScopedAStatus setLatencyMode(LatencyMode latency_mode) override;



  ndk::ScopedAStatus setCodecType(CodecType codec_type) override;



 protected:

  virtual ~BluetoothAudioPortImpl();

system/audio_hal_interface/aidl/transport_instance.h

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ namespace audio { 
namespace aidl {



using ::aidl::android::hardware::bluetooth::audio::AudioConfiguration;

using ::aidl::android::hardware::bluetooth::audio::LatencyMode;

using ::aidl::android::hardware::bluetooth::audio::SessionType;



/***