This repository has been archived by the owner on Jul 15, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge "Fix the integration issue for HAL 2.2"
- Loading branch information
Showing
7 changed files
with
251 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -90,6 +90,7 @@ int main(int /* argc */, char* /* argv */ []) { | |
| }, | ||
| { | ||
| "Bluetooth Audio API", | ||
| "[email protected]::IBluetoothAudioProvidersFactory", | ||
| "[email protected]::IBluetoothAudioProvidersFactory", | ||
| "[email protected]::IBluetoothAudioProvidersFactory", | ||
| }, | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,7 +16,10 @@ | |
|
|
||
| package [email protected]; | ||
|
|
||
| import IBluetoothAudioProvider; | ||
| import @2.1::IBluetoothAudioProvidersFactory; | ||
| import @2.0::Status; | ||
| import @2.1::SessionType; | ||
|
|
||
| /** | ||
| * This factory allows a HAL implementation to be split into multiple | ||
|
|
@@ -30,4 +33,19 @@ import @2.1::IBluetoothAudioProvidersFactory; | |
| * for return value must be invoked synchronously before the API call returns. | ||
| */ | ||
| interface IBluetoothAudioProvidersFactory extends @2.1::IBluetoothAudioProvidersFactory { | ||
| /** | ||
| * Opens an audio provider for a session type. To close the provider, it is | ||
| * necessary to release references to the returned provider object. | ||
| * | ||
| * @param sessionType The session type (e.g. | ||
| * LE_AUDIO_SOFTWARE_ENCODING_DATAPATH). | ||
| * | ||
| * @return status One of the following | ||
| * SUCCESS if the Audio HAL successfully opens the provider with the | ||
| * given session type | ||
| * FAILURE if the Audio HAL cannot open the provider | ||
| * @return provider The provider of the specified session type | ||
| */ | ||
| openProvider_2_2(SessionType sessionType) | ||
| generates (Status status, IBluetoothAudioProvider provider); | ||
| }; | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
160 changes: 160 additions & 0 deletions
160
bluetooth/audio/utils/session/BluetoothAudioSessionControl_2_2.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,160 @@ | ||
| /* | ||
| * Copyright 2018 The Android Open Source Project | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| #pragma once | ||
|
|
||
| #include "BluetoothAudioSession_2_2.h" | ||
|
|
||
| namespace android { | ||
| namespace bluetooth { | ||
| namespace audio { | ||
|
|
||
| class BluetoothAudioSessionControl_2_2 { | ||
| using SessionType_2_1 = | ||
| ::android::hardware::bluetooth::audio::V2_1::SessionType; | ||
| using AudioConfiguration_2_2 = | ||
| ::android::hardware::bluetooth::audio::V2_2::AudioConfiguration; | ||
|
|
||
| public: | ||
| // The control API helps to check if session is ready or not | ||
| // @return: true if the Bluetooth stack has started th specified session | ||
| static bool IsSessionReady(const SessionType_2_1& session_type) { | ||
| std::shared_ptr<BluetoothAudioSession_2_2> session_ptr = | ||
| BluetoothAudioSessionInstance_2_2::GetSessionInstance(session_type); | ||
| if (session_ptr != nullptr) { | ||
| return session_ptr->IsSessionReady(); | ||
| } | ||
| return false; | ||
| } | ||
|
|
||
| // The control API helps the bluetooth_audio module to register | ||
| // PortStatusCallbacks | ||
| // @return: cookie - the assigned number to this bluetooth_audio output | ||
| static uint16_t RegisterControlResultCback( | ||
| const SessionType_2_1& session_type, const PortStatusCallbacks& cbacks) { | ||
| std::shared_ptr<BluetoothAudioSession_2_2> session_ptr = | ||
| BluetoothAudioSessionInstance_2_2::GetSessionInstance(session_type); | ||
| if (session_ptr != nullptr) { | ||
| return session_ptr->GetAudioSession()->RegisterStatusCback(cbacks); | ||
| } | ||
| return kObserversCookieUndefined; | ||
| } | ||
|
|
||
| // The control API helps the bluetooth_audio module to unregister | ||
| // PortStatusCallbacks | ||
| // @param: cookie - indicates which bluetooth_audio output is | ||
| static void UnregisterControlResultCback(const SessionType_2_1& session_type, | ||
| uint16_t cookie) { | ||
| std::shared_ptr<BluetoothAudioSession_2_2> session_ptr = | ||
| BluetoothAudioSessionInstance_2_2::GetSessionInstance(session_type); | ||
| if (session_ptr != nullptr) { | ||
| session_ptr->GetAudioSession()->UnregisterStatusCback(cookie); | ||
| } | ||
| } | ||
|
|
||
| // The control API for the bluetooth_audio module to get current | ||
| // AudioConfiguration | ||
| static const AudioConfiguration_2_2 GetAudioConfig( | ||
| const SessionType_2_1& session_type) { | ||
| std::shared_ptr<BluetoothAudioSession_2_2> session_ptr = | ||
| BluetoothAudioSessionInstance_2_2::GetSessionInstance(session_type); | ||
| if (session_ptr != nullptr) { | ||
| return session_ptr->GetAudioConfig(); | ||
| } else if (session_type == | ||
| SessionType_2_1::A2DP_HARDWARE_OFFLOAD_DATAPATH) { | ||
| return BluetoothAudioSession_2_2::kInvalidOffloadAudioConfiguration; | ||
| } else { | ||
| return BluetoothAudioSession_2_2::kInvalidSoftwareAudioConfiguration; | ||
| } | ||
| } | ||
|
|
||
| // Those control APIs for the bluetooth_audio module to start / suspend / stop | ||
| // stream, to check position, and to update metadata. | ||
| static bool StartStream(const SessionType_2_1& session_type) { | ||
| std::shared_ptr<BluetoothAudioSession_2_2> session_ptr = | ||
| BluetoothAudioSessionInstance_2_2::GetSessionInstance(session_type); | ||
| if (session_ptr != nullptr) { | ||
| return session_ptr->GetAudioSession()->StartStream(); | ||
| } | ||
| return false; | ||
| } | ||
|
|
||
| static bool SuspendStream(const SessionType_2_1& session_type) { | ||
| std::shared_ptr<BluetoothAudioSession_2_2> session_ptr = | ||
| BluetoothAudioSessionInstance_2_2::GetSessionInstance(session_type); | ||
| if (session_ptr != nullptr) { | ||
| return session_ptr->GetAudioSession()->SuspendStream(); | ||
| } | ||
| return false; | ||
| } | ||
|
|
||
| static void StopStream(const SessionType_2_1& session_type) { | ||
| std::shared_ptr<BluetoothAudioSession_2_2> session_ptr = | ||
| BluetoothAudioSessionInstance_2_2::GetSessionInstance(session_type); | ||
| if (session_ptr != nullptr) { | ||
| session_ptr->GetAudioSession()->StopStream(); | ||
| } | ||
| } | ||
|
|
||
| static bool GetPresentationPosition(const SessionType_2_1& session_type, | ||
| uint64_t* remote_delay_report_ns, | ||
| uint64_t* total_bytes_readed, | ||
| timespec* data_position) { | ||
| std::shared_ptr<BluetoothAudioSession_2_2> session_ptr = | ||
| BluetoothAudioSessionInstance_2_2::GetSessionInstance(session_type); | ||
| if (session_ptr != nullptr) { | ||
| return session_ptr->GetAudioSession()->GetPresentationPosition( | ||
| remote_delay_report_ns, total_bytes_readed, data_position); | ||
| } | ||
| return false; | ||
| } | ||
|
|
||
| static void UpdateTracksMetadata( | ||
| const SessionType_2_1& session_type, | ||
| const struct source_metadata* source_metadata) { | ||
| std::shared_ptr<BluetoothAudioSession_2_2> session_ptr = | ||
| BluetoothAudioSessionInstance_2_2::GetSessionInstance(session_type); | ||
| if (session_ptr != nullptr) { | ||
| session_ptr->GetAudioSession()->UpdateTracksMetadata(source_metadata); | ||
| } | ||
| } | ||
|
|
||
| // The control API writes stream to FMQ | ||
| static size_t OutWritePcmData(const SessionType_2_1& session_type, | ||
| const void* buffer, size_t bytes) { | ||
| std::shared_ptr<BluetoothAudioSession_2_2> session_ptr = | ||
| BluetoothAudioSessionInstance_2_2::GetSessionInstance(session_type); | ||
| if (session_ptr != nullptr) { | ||
| return session_ptr->GetAudioSession()->OutWritePcmData(buffer, bytes); | ||
| } | ||
| return 0; | ||
| } | ||
|
|
||
| // The control API reads stream from FMQ | ||
| static size_t InReadPcmData(const SessionType_2_1& session_type, void* buffer, | ||
| size_t bytes) { | ||
| std::shared_ptr<BluetoothAudioSession_2_2> session_ptr = | ||
| BluetoothAudioSessionInstance_2_2::GetSessionInstance(session_type); | ||
| if (session_ptr != nullptr) { | ||
| return session_ptr->GetAudioSession()->InReadPcmData(buffer, bytes); | ||
| } | ||
| return 0; | ||
| } | ||
| }; | ||
|
|
||
| } // namespace audio | ||
| } // namespace bluetooth | ||
| } // namespace android |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters