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

Commit 4e49d269 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11444858 from 53d58a2c to 24Q2-release 

Change-Id: I2b4d8d3aa3a612211994485b0699c235843a6de7
parents fffb5670 53d58a2c

audio/aidl/default/apex/com.android.hardware.audio/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ apex { 
        "libpreprocessingaidl",

        "libpresetreverbsw",

        "libreverbaidl",

        "libspatializersw",

        "libvirtualizersw",

        "libvisualizeraidl",

        "libvolumesw",

audio/aidl/default/spatializer/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -35,6 +35,6 @@ cc_library_shared { 
    ],

    relative_install_path: "soundfx",

    visibility: [

        "//hardware/interfaces/audio/aidl/default",

        "//hardware/interfaces/audio/aidl/default:__subpackages__",

    ],

}

audio/aidl/default/spatializer/SpatializerSw.cpp

+2 −0
Original line number Diff line number Diff line
@@ -108,6 +108,8 @@ ndk::ScopedAStatus SpatializerSw::setParameterSpecific(const Parameter::Specific 


ndk::ScopedAStatus SpatializerSw::getParameterSpecific(const Parameter::Id& id,

                                                       Parameter::Specific* specific) {

    RETURN_IF(!mContext, EX_NULL_POINTER, "nullContext");



    auto tag = id.getTag();

    RETURN_IF(Parameter::Id::spatializerTag != tag, EX_ILLEGAL_ARGUMENT, "wrongIdTag");

    auto spatializerId = id.get<Parameter::Id::spatializerTag>();

bluetooth/audio/aidl/default/A2dpOffloadAudioProvider.cpp

+12 −0
Original line number Diff line number Diff line
@@ -120,6 +120,12 @@ ndk::ScopedAStatus A2dpOffloadAudioProvider::onSessionReady( 
ndk::ScopedAStatus A2dpOffloadAudioProvider::parseA2dpConfiguration(

    const CodecId& codec_id, const std::vector<uint8_t>& configuration,

    CodecParameters* codec_parameters, A2dpStatus* _aidl_return) {

  if (!kEnableA2dpCodecExtensibility) {

    // parseA2dpConfiguration must not be implemented if A2dp codec

    // extensibility is not supported.

    return ndk::ScopedAStatus::fromStatus(STATUS_UNKNOWN_TRANSACTION);

  }



  auto codec = codec_factory_.GetCodec(codec_id);

  if (!codec) {

    LOG(INFO) << __func__ << " - SessionType=" << toString(session_type_)
@@ -136,6 +142,12 @@ ndk::ScopedAStatus A2dpOffloadAudioProvider::getA2dpConfiguration( 
    const std::vector<A2dpRemoteCapabilities>& remote_a2dp_capabilities,

    const A2dpConfigurationHint& hint,

    std::optional<audio::A2dpConfiguration>* _aidl_return) {

  if (!kEnableA2dpCodecExtensibility) {

    // getA2dpConfiguration must not be implemented if A2dp codec

    // extensibility is not supported.

    return ndk::ScopedAStatus::fromStatus(STATUS_UNKNOWN_TRANSACTION);

  }



  *_aidl_return = std::nullopt;

  A2dpConfiguration avdtp_configuration;

bluetooth/audio/aidl/default/BluetoothAudioProvider.h

+17 −0
Original line number Diff line number Diff line
@@ -35,6 +35,23 @@ namespace hardware { 
namespace bluetooth {

namespace audio {



/// Enable flag for the reference implementation for A2dp Codec

/// Extensibility.

///

/// A2dp Codec extensibility cannot be enabled until the following

/// requirements are fulfilled.

///

///  1. The Bluetooth controller must support the HCI Requirements

///     v1.04 or later, and must support the vendor HCI command

///     A2DP Offload Start (v2), A2DP Offload Stop (v2) as indicated

///     by the field a2dp_offload_v2 of the vendor capabilities.

///

///  2. The implementation of the provider must be completed with

///     DSP configuration for streaming.

enum : bool {

  kEnableA2dpCodecExtensibility = false,

};



class BluetoothAudioProvider : public BnBluetoothAudioProvider {

 public:

  BluetoothAudioProvider();