diff options
| author | Alice Kuo <aliceypkuo@google.com> | 2022-03-30 00:05:53 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-30 00:05:53 +0000 |
| commit | 67fa92a1e596b848f18a05edde4feaba0dc49deb (patch) | |
| tree | 732cce8469b62c723ab97c73ef109c802c2744b7 /bluetooth/audio/aidl/default/BluetoothAudioProviderFactory.cpp | |
| parent | 0d0dc1e23bbfb9d4e4ff4d41cb995e4e1fe59e23 (diff) | |
| parent | 0dac5667f56d63dae0a0f428ca666b18d4f14017 (diff) | |
Merge "Add A2dp decode software and offload session type" am: 0dac5667f5
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2046263
Change-Id: I1a18b01b94e683bfcd9c7ecb8722804dcf9a2ad4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'bluetooth/audio/aidl/default/BluetoothAudioProviderFactory.cpp')
| -rw-r--r-- | bluetooth/audio/aidl/default/BluetoothAudioProviderFactory.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/bluetooth/audio/aidl/default/BluetoothAudioProviderFactory.cpp b/bluetooth/audio/aidl/default/BluetoothAudioProviderFactory.cpp index 1e1680a4fd..91731d4160 100644 --- a/bluetooth/audio/aidl/default/BluetoothAudioProviderFactory.cpp +++ b/bluetooth/audio/aidl/default/BluetoothAudioProviderFactory.cpp @@ -44,10 +44,10 @@ ndk::ScopedAStatus BluetoothAudioProviderFactory::openProvider( switch (session_type) { case SessionType::A2DP_SOFTWARE_ENCODING_DATAPATH: - provider = ndk::SharedRefBase::make<A2dpSoftwareAudioProvider>(); + provider = ndk::SharedRefBase::make<A2dpSoftwareEncodingAudioProvider>(); break; case SessionType::A2DP_HARDWARE_OFFLOAD_ENCODING_DATAPATH: - provider = ndk::SharedRefBase::make<A2dpOffloadAudioProvider>(); + provider = ndk::SharedRefBase::make<A2dpOffloadEncodingAudioProvider>(); break; case SessionType::HEARING_AID_SOFTWARE_ENCODING_DATAPATH: provider = ndk::SharedRefBase::make<HearingAidAudioProvider>(); @@ -72,6 +72,12 @@ ndk::ScopedAStatus BluetoothAudioProviderFactory::openProvider( provider = ndk::SharedRefBase::make<LeAudioOffloadBroadcastAudioProvider>(); break; + case SessionType::A2DP_SOFTWARE_DECODING_DATAPATH: + provider = ndk::SharedRefBase::make<A2dpSoftwareDecodingAudioProvider>(); + break; + case SessionType::A2DP_HARDWARE_OFFLOAD_DECODING_DATAPATH: + provider = ndk::SharedRefBase::make<A2dpOffloadDecodingAudioProvider>(); + break; default: provider = nullptr; break; @@ -90,7 +96,8 @@ ndk::ScopedAStatus BluetoothAudioProviderFactory::openProvider( ndk::ScopedAStatus BluetoothAudioProviderFactory::getProviderCapabilities( const SessionType session_type, std::vector<AudioCapabilities>* _aidl_return) { - if (session_type == SessionType::A2DP_HARDWARE_OFFLOAD_ENCODING_DATAPATH) { + if (session_type == SessionType::A2DP_HARDWARE_OFFLOAD_ENCODING_DATAPATH || + session_type == SessionType::A2DP_HARDWARE_OFFLOAD_DECODING_DATAPATH) { auto codec_capabilities = BluetoothAudioCodecs::GetA2dpOffloadCodecCapabilities(session_type); _aidl_return->resize(codec_capabilities.size()); |