From 4831b6ac72a3a75d132ab7bcaae97fe967b739d9 Mon Sep 17 00:00:00 2001 From: Alice Kuo Date: Tue, 28 Dec 2021 11:12:16 +0800 Subject: [PATCH] Cleanup: remove LE audio hardware offload supported by openProvider_2_1 LE audio hardware offload would be supported after the temporal bluetooth.audio@2.2 or bluetooth.audio aidl version. The workable audio configuration and capabilities format do not exist in bluetooth.audio@2.1. Remove the support in the 2.1 HAL default implementation. Bug: 197296692 Bug: 150670922 Test: make build Change-Id: I6ff3f6ada43474cadb026bf8b58d64adaf5ea477 --- .../2.1/default/BluetoothAudioProvidersFactory.cpp | 10 ---------- .../audio/2.1/default/BluetoothAudioProvidersFactory.h | 2 -- .../2.2/default/BluetoothAudioProvidersFactory.cpp | 6 ------ 3 files changed, 18 deletions(-) diff --git a/bluetooth/audio/2.1/default/BluetoothAudioProvidersFactory.cpp b/bluetooth/audio/2.1/default/BluetoothAudioProvidersFactory.cpp index d7d5476fbf..6e8c1d78a0 100644 --- a/bluetooth/audio/2.1/default/BluetoothAudioProvidersFactory.cpp +++ b/bluetooth/audio/2.1/default/BluetoothAudioProvidersFactory.cpp @@ -41,12 +41,8 @@ HearingAidAudioProvider BluetoothAudioProvidersFactory::hearing_aid_provider_instance_; LeAudioOutputAudioProvider BluetoothAudioProvidersFactory::leaudio_output_provider_instance_; -LeAudioOffloadOutputAudioProvider - BluetoothAudioProvidersFactory::leaudio_offload_output_provider_instance_; LeAudioInputAudioProvider BluetoothAudioProvidersFactory::leaudio_input_provider_instance_; -LeAudioOffloadInputAudioProvider - BluetoothAudioProvidersFactory::leaudio_offload_input_provider_instance_; Return BluetoothAudioProvidersFactory::openProvider( const V2_0::SessionType sessionType, openProvider_cb _hidl_cb) { @@ -94,15 +90,9 @@ Return BluetoothAudioProvidersFactory::openProvider_2_1( case SessionType::LE_AUDIO_SOFTWARE_ENCODING_DATAPATH: provider = &leaudio_output_provider_instance_; break; - case SessionType::LE_AUDIO_HARDWARE_OFFLOAD_ENCODING_DATAPATH: - provider = &leaudio_offload_output_provider_instance_; - break; case SessionType::LE_AUDIO_SOFTWARE_DECODED_DATAPATH: provider = &leaudio_input_provider_instance_; break; - case SessionType::LE_AUDIO_HARDWARE_OFFLOAD_DECODING_DATAPATH: - provider = &leaudio_offload_input_provider_instance_; - break; default: status = BluetoothAudioStatus::FAILURE; } diff --git a/bluetooth/audio/2.1/default/BluetoothAudioProvidersFactory.h b/bluetooth/audio/2.1/default/BluetoothAudioProvidersFactory.h index f8f557e8c7..714d738af4 100644 --- a/bluetooth/audio/2.1/default/BluetoothAudioProvidersFactory.h +++ b/bluetooth/audio/2.1/default/BluetoothAudioProvidersFactory.h @@ -56,8 +56,6 @@ class BluetoothAudioProvidersFactory : public IBluetoothAudioProvidersFactory { static HearingAidAudioProvider hearing_aid_provider_instance_; static LeAudioOutputAudioProvider leaudio_output_provider_instance_; static LeAudioInputAudioProvider leaudio_input_provider_instance_; - static LeAudioOffloadOutputAudioProvider leaudio_offload_output_provider_instance_; - static LeAudioOffloadInputAudioProvider leaudio_offload_input_provider_instance_; }; extern "C" IBluetoothAudioProvidersFactory* diff --git a/bluetooth/audio/2.2/default/BluetoothAudioProvidersFactory.cpp b/bluetooth/audio/2.2/default/BluetoothAudioProvidersFactory.cpp index 51ee422845..8b430d7a28 100644 --- a/bluetooth/audio/2.2/default/BluetoothAudioProvidersFactory.cpp +++ b/bluetooth/audio/2.2/default/BluetoothAudioProvidersFactory.cpp @@ -98,15 +98,9 @@ Return BluetoothAudioProvidersFactory::openProvider_2_1( case V2_1::SessionType::LE_AUDIO_SOFTWARE_ENCODING_DATAPATH: provider = &leaudio_output_provider_instance_; break; - case V2_1::SessionType::LE_AUDIO_HARDWARE_OFFLOAD_ENCODING_DATAPATH: - provider = &leaudio_offload_output_provider_instance_; - break; case V2_1::SessionType::LE_AUDIO_SOFTWARE_DECODED_DATAPATH: provider = &leaudio_input_provider_instance_; break; - case V2_1::SessionType::LE_AUDIO_HARDWARE_OFFLOAD_DECODING_DATAPATH: - provider = &leaudio_offload_input_provider_instance_; - break; default: status = BluetoothAudioStatus::FAILURE; }