tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Add a2dp vendor codec extension" am: 82d991db1e

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

Change-Id: I968ebef8f0d872c24601bfe916b1791d9dc8ed1c
This commit is contained in:
Treehugger Robot 2022-01-21 23:49:41 +00:00 committed by Automerger Merge Worker
commit 529c0812ae
5 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
bluetooth/audio/aidl/aidl_api/android.hardware.bluetooth.audio/current/android/hardware/bluetooth/audio/CodecCapabilities.aidl
View file

@ -37,11 +37,16 @@ parcelable CodecCapabilities {
android.hardware.bluetooth.audio.CodecType codecType;
android.hardware.bluetooth.audio.CodecCapabilities.Capabilities capabilities;
@VintfStability
parcelable VendorCapabilities {
ParcelableHolder extension;
}
@VintfStability
union Capabilities {
android.hardware.bluetooth.audio.SbcCapabilities sbcCapabilities;
android.hardware.bluetooth.audio.AacCapabilities aacCapabilities;
android.hardware.bluetooth.audio.LdacCapabilities ldacCapabilities;
android.hardware.bluetooth.audio.AptxCapabilities aptxCapabilities;
android.hardware.bluetooth.audio.Lc3Capabilities lc3Capabilities;
android.hardware.bluetooth.audio.CodecCapabilities.VendorCapabilities vendorCapabilities;
}
}

7
bluetooth/audio/aidl/aidl_api/android.hardware.bluetooth.audio/current/android/hardware/bluetooth/audio/CodecConfiguration.aidl
View file

@ -40,11 +40,18 @@ parcelable CodecConfiguration {
boolean isScmstEnabled;
android.hardware.bluetooth.audio.CodecConfiguration.CodecSpecific config;
@VintfStability
parcelable VendorConfiguration {
int vendorId;
char codecId;
ParcelableHolder codecConfig;
}
@VintfStability
union CodecSpecific {
android.hardware.bluetooth.audio.SbcConfiguration sbcConfig;
android.hardware.bluetooth.audio.AacConfiguration aacConfig;
android.hardware.bluetooth.audio.LdacConfiguration ldacConfig;
android.hardware.bluetooth.audio.AptxConfiguration aptxConfig;
android.hardware.bluetooth.audio.Lc3Configuration lc3Config;
android.hardware.bluetooth.audio.CodecConfiguration.VendorConfiguration vendorConfig;
}
}

5
bluetooth/audio/aidl/android/hardware/bluetooth/audio/CodecCapabilities.aidl
View file

@ -29,6 +29,10 @@ import android.hardware.bluetooth.audio.SbcCapabilities;
*/
@VintfStability
parcelable CodecCapabilities {
@VintfStability
parcelable VendorCapabilities {
ParcelableHolder extension;
}
@VintfStability
union Capabilities {
SbcCapabilities sbcCapabilities;
@ -36,6 +40,7 @@ parcelable CodecCapabilities {
LdacCapabilities ldacCapabilities;
AptxCapabilities aptxCapabilities;
Lc3Capabilities lc3Capabilities;
VendorCapabilities vendorCapabilities;
}
CodecType codecType;
Capabilities capabilities;

7
bluetooth/audio/aidl/android/hardware/bluetooth/audio/CodecConfiguration.aidl
View file

@ -29,6 +29,12 @@ import android.hardware.bluetooth.audio.SbcConfiguration;
*/
@VintfStability
parcelable CodecConfiguration {
@VintfStability
parcelable VendorConfiguration {
int vendorId;
char codecId;
ParcelableHolder codecConfig;
}
@VintfStability
union CodecSpecific {
SbcConfiguration sbcConfig;
@ -36,6 +42,7 @@ parcelable CodecConfiguration {
LdacConfiguration ldacConfig;
AptxConfiguration aptxConfig;
Lc3Configuration lc3Config;
VendorConfiguration vendorConfig;
}
CodecType codecType;
/**

1
bluetooth/audio/utils/aidl_session/BluetoothAudioCodecs.cpp
View file

@ -356,7 +356,6 @@ BluetoothAudioCodecs::GetA2dpOffloadCodecCapabilities(
break;
case CodecType::UNKNOWN:
case CodecType::VENDOR:
codec_capability = {};
break;
}
}