Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 21:37:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add le audio capabilities and audio config update supported in aidl am: 60b00151bd am: 914dc1db66 am: 91ea7b97d6

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1942861

Change-Id: I4def0480e3e88fd5dc79cf836202b7f150a4963e
This commit is contained in:
Alice Kuo
2022-01-12 00:06:15 +00:00
committed by Automerger Merge Worker
parent edcec15462 91ea7b97d6
commit 03f9bc5d04
12 changed files with 190 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bluetooth/audio/aidl/aidl_api/android.hardware.bluetooth.audio/current/android/hardware/bluetooth/audio/AudioCapabilities.aidl
View File

@@ -36,5 +36,5 @@ package android.hardware.bluetooth.audio;
union AudioCapabilities {
android.hardware.bluetooth.audio.PcmCapabilities pcmCapabilities;
android.hardware.bluetooth.audio.CodecCapabilities codecCapabilities;
android.hardware.bluetooth.audio.LeAudioCapabilities leAudioCapabilities;
android.hardware.bluetooth.audio.LeAudioCodecCapabilitiesSetting leAudioCapabilities;
}

50
bluetooth/audio/aidl/aidl_api/android.hardware.bluetooth.audio/current/android/hardware/bluetooth/audio/BroadcastCapability.aidl Normal file
View File

@@ -0,0 +1,50 @@
/*
* Copyright 2022 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.
*/
///////////////////////////////////////////////////////////////////////////////
// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. //
///////////////////////////////////////////////////////////////////////////////
// This file is a snapshot of an AIDL file. Do not edit it manually. There are
// two cases:
// 1). this is a frozen version file - do not edit this in any case.
// 2). this is a 'current' file. If you make a backwards compatible change to
// the interface (from the latest frozen version), the build system will
// prompt you to update this file with `m <name>-update-api`.
//
// You must not make a backward incompatible change to any AIDL file built
// with the aidl_interface module type with versions property set. The module
// type is used to build AIDL files in a way that they can be used across
// independently updatable components of the system. If a device is shipped
// with such a backward incompatible change, it has a high risk of breaking
// later when a module using the interface is updated, e.g., Mainline modules.
package android.hardware.bluetooth.audio;
@VintfStability
parcelable BroadcastCapability {
android.hardware.bluetooth.audio.CodecType codecType;
android.hardware.bluetooth.audio.AudioLocation supportedChannel;
int channelCountPerStream;
android.hardware.bluetooth.audio.BroadcastCapability.LeAudioCodecCapabilities leAudioCodecCapabilities;
@VintfStability
parcelable VendorCapabilities {
ParcelableHolder extension;
}
@VintfStability
union LeAudioCodecCapabilities {
@nullable android.hardware.bluetooth.audio.Lc3Capabilities[] lc3Capabilities;
@nullable android.hardware.bluetooth.audio.BroadcastCapability.VendorCapabilities[] vendorCapabillities;
}
}

2
bluetooth/audio/aidl/aidl_api/android.hardware.bluetooth.audio/current/android/hardware/bluetooth/audio/BroadcastConfiguration.aidl
View File

@@ -39,6 +39,6 @@ parcelable BroadcastConfiguration {
parcelable BroadcastStreamMap {
char streamHandle;
int audioChannelAllocation;
android.hardware.bluetooth.audio.LeAudioCodecConfiguration leAudioCondecConfig;
android.hardware.bluetooth.audio.LeAudioCodecConfiguration leAudioCodecConfig;
}
}

1
bluetooth/audio/aidl/aidl_api/android.hardware.bluetooth.audio/current/android/hardware/bluetooth/audio/IBluetoothAudioProvider.aidl
View File

@@ -38,4 +38,5 @@ interface IBluetoothAudioProvider {
android.hardware.common.fmq.MQDescriptor<byte,android.hardware.common.fmq.SynchronizedReadWrite> startSession(in android.hardware.bluetooth.audio.IBluetoothAudioPort hostIf, in android.hardware.bluetooth.audio.AudioConfiguration audioConfig);
void streamStarted(in android.hardware.bluetooth.audio.BluetoothAudioStatus status);
void streamSuspended(in android.hardware.bluetooth.audio.BluetoothAudioStatus status);
void updateAudioConfiguration(in android.hardware.bluetooth.audio.AudioConfiguration audioConfig);
}

40
bluetooth/audio/aidl/aidl_api/android.hardware.bluetooth.audio/current/android/hardware/bluetooth/audio/LeAudioCodecCapabilitiesSetting.aidl Normal file
View File

@@ -0,0 +1,40 @@
/*
* Copyright 2022 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.
*/
///////////////////////////////////////////////////////////////////////////////
// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. //
///////////////////////////////////////////////////////////////////////////////
// This file is a snapshot of an AIDL file. Do not edit it manually. There are
// two cases:
// 1). this is a frozen version file - do not edit this in any case.
// 2). this is a 'current' file. If you make a backwards compatible change to
// the interface (from the latest frozen version), the build system will
// prompt you to update this file with `m <name>-update-api`.
//
// You must not make a backward incompatible change to any AIDL file built
// with the aidl_interface module type with versions property set. The module
// type is used to build AIDL files in a way that they can be used across
// independently updatable components of the system. If a device is shipped
// with such a backward incompatible change, it has a high risk of breaking
// later when a module using the interface is updated, e.g., Mainline modules.
package android.hardware.bluetooth.audio;
@VintfStability
parcelable LeAudioCodecCapabilitiesSetting {
android.hardware.bluetooth.audio.UnicastCapability unicastEncodeCapability;
android.hardware.bluetooth.audio.UnicastCapability unicastDecodeCapability;
android.hardware.bluetooth.audio.BroadcastCapability broadcastCapability;
}

10
bluetooth/audio/aidl/aidl_api/android.hardware.bluetooth.audio/current/android/hardware/bluetooth/audio/LeAudioCapabilities.aidl → bluetooth/audio/aidl/aidl_api/android.hardware.bluetooth.audio/current/android/hardware/bluetooth/audio/UnicastCapability.aidl
View File

@@ -33,12 +33,12 @@
package android.hardware.bluetooth.audio;
@VintfStability
parcelable LeAudioCapabilities {
android.hardware.bluetooth.audio.LeAudioMode mode;
parcelable UnicastCapability {
android.hardware.bluetooth.audio.CodecType codecType;
android.hardware.bluetooth.audio.AudioLocation supportedChannel;
int supportedChannelCount;
android.hardware.bluetooth.audio.LeAudioCapabilities.LeAudioCodecCapabilities leAudioCodecCapabilities;
int deviceCount;
int channelCountPerDevice;
android.hardware.bluetooth.audio.UnicastCapability.LeAudioCodecCapabilities leAudioCodecCapabilities;
@VintfStability
parcelable VendorCapabilities {
ParcelableHolder extension;
@@ -46,6 +46,6 @@ parcelable LeAudioCapabilities {
@VintfStability
union LeAudioCodecCapabilities {
android.hardware.bluetooth.audio.Lc3Capabilities lc3Capabilities;
android.hardware.bluetooth.audio.LeAudioCapabilities.VendorCapabilities vendorCapabillities;
android.hardware.bluetooth.audio.UnicastCapability.VendorCapabilities vendorCapabillities;
}
}

4
bluetooth/audio/aidl/android/hardware/bluetooth/audio/AudioCapabilities.aidl
View File

@@ -17,7 +17,7 @@
package android.hardware.bluetooth.audio;
import android.hardware.bluetooth.audio.CodecCapabilities;
import android.hardware.bluetooth.audio.LeAudioCapabilities;
import android.hardware.bluetooth.audio.LeAudioCodecCapabilitiesSetting;
import android.hardware.bluetooth.audio.PcmCapabilities;
/**
@@ -27,5 +27,5 @@ import android.hardware.bluetooth.audio.PcmCapabilities;
union AudioCapabilities {
PcmCapabilities pcmCapabilities;
CodecCapabilities codecCapabilities;
LeAudioCapabilities leAudioCapabilities;
LeAudioCodecCapabilitiesSetting leAudioCapabilities;
}

43
bluetooth/audio/aidl/android/hardware/bluetooth/audio/BroadcastCapability.aidl Normal file
View File

@@ -0,0 +1,43 @@
/*
* Copyright 2022 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.
*/
package android.hardware.bluetooth.audio;
import android.hardware.bluetooth.audio.AudioLocation;
import android.hardware.bluetooth.audio.CodecType;
import android.hardware.bluetooth.audio.Lc3Capabilities;
import android.hardware.bluetooth.audio.LeAudioMode;
/**
* Used to specify the le audio broadcast codec capabilities for hardware offload.
*/
@VintfStability
parcelable BroadcastCapability {
@VintfStability
parcelable VendorCapabilities {
ParcelableHolder extension;
}
@VintfStability
union LeAudioCodecCapabilities {
@nullable Lc3Capabilities[] lc3Capabilities;
@nullable VendorCapabilities[] vendorCapabillities;
}
CodecType codecType;
AudioLocation supportedChannel;
// Supported channel count for each stream
int channelCountPerStream;
LeAudioCodecCapabilities leAudioCodecCapabilities;
}

2
bluetooth/audio/aidl/android/hardware/bluetooth/audio/BroadcastConfiguration.aidl
View File

@@ -33,7 +33,7 @@ parcelable BroadcastConfiguration {
* least significant bit to the most significant bit.
*/
int audioChannelAllocation;
LeAudioCodecConfiguration leAudioCondecConfig;
LeAudioCodecConfiguration leAudioCodecConfig;
}
BroadcastStreamMap[] streamMap;
}

10
bluetooth/audio/aidl/android/hardware/bluetooth/audio/IBluetoothAudioProvider.aidl
View File

@@ -72,4 +72,14 @@ interface IBluetoothAudioProvider {
* @param status true for SUCCESS or false for FAILURE
*/
void streamSuspended(in BluetoothAudioStatus status);
/**
* Called when the audio configuration of the stream has been changed.
*
* @param audioConfig The audio configuration negotiated with the remote
* device. The PCM parameters are set if software based encoding,
* otherwise the correct codec configuration is used for hardware
* encoding.
*/
void updateAudioConfiguration(in AudioConfiguration audioConfig);
}

30
bluetooth/audio/aidl/android/hardware/bluetooth/audio/LeAudioCodecCapabilitiesSetting.aidl Normal file
View File

@@ -0,0 +1,30 @@
/*
* Copyright 2022 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.
*/
package android.hardware.bluetooth.audio;
import android.hardware.bluetooth.audio.BroadcastCapability;
import android.hardware.bluetooth.audio.UnicastCapability;
/**
* Used to specify the le audio capabilities for unicast and broadcast hardware offload.
*/
@VintfStability
parcelable LeAudioCodecCapabilitiesSetting {
UnicastCapability unicastEncodeCapability;
UnicastCapability unicastDecodeCapability;
BroadcastCapability broadcastCapability;
}

14
bluetooth/audio/aidl/android/hardware/bluetooth/audio/LeAudioCapabilities.aidl → bluetooth/audio/aidl/android/hardware/bluetooth/audio/UnicastCapability.aidl
View File

@@ -22,10 +22,10 @@ import android.hardware.bluetooth.audio.Lc3Capabilities;
import android.hardware.bluetooth.audio.LeAudioMode;
/**
* Used to specify the capabilities of the LC3 codecs supported by Hardware Encoding.
* Used to specify the le audio unicast codec capabilities for hardware offload.
*/
@VintfStability
parcelable LeAudioCapabilities {
parcelable UnicastCapability {
@VintfStability
parcelable VendorCapabilities {
ParcelableHolder extension;
@@ -35,13 +35,11 @@ parcelable LeAudioCapabilities {
Lc3Capabilities lc3Capabilities;
VendorCapabilities vendorCapabillities;
}
LeAudioMode mode;
CodecType codecType;
/*
* This is bitfield, if bit N is set, HW Offloader supports N+1 channels at the same time.
* Example: 0x27 = 0b00100111: One, two, three or six channels supported.
*/
AudioLocation supportedChannel;
int supportedChannelCount;
// The number of connected device
int deviceCount;
// Supported channel count for each device
int channelCountPerDevice;
LeAudioCodecCapabilities leAudioCodecCapabilities;
}