BT: Support LC3 over A2DP am: 1bc606fafe am: 68a0fff7a2

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

Change-Id: If030ab4055572e904890c9499173c5d2af6be3d2
This commit is contained in:
Josh Wu
2022-01-12 00:38:50 +00:00
committed by Automerger Merge Worker
12 changed files with 24 additions and 4 deletions

View File

@@ -35,6 +35,6 @@ package android.hardware.bluetooth.audio;
@VintfStability
union AudioCapabilities {
android.hardware.bluetooth.audio.PcmCapabilities pcmCapabilities;
android.hardware.bluetooth.audio.CodecCapabilities codecCapabilities;
android.hardware.bluetooth.audio.CodecCapabilities a2dpCapabilities;
android.hardware.bluetooth.audio.LeAudioCodecCapabilitiesSetting leAudioCapabilities;
}

View File

@@ -35,6 +35,6 @@ package android.hardware.bluetooth.audio;
@VintfStability
union AudioConfiguration {
android.hardware.bluetooth.audio.PcmConfiguration pcmConfig;
android.hardware.bluetooth.audio.CodecConfiguration codecConfig;
android.hardware.bluetooth.audio.CodecConfiguration a2dpConfig;
android.hardware.bluetooth.audio.LeAudioConfiguration leAudioConfig;
}

View File

@@ -42,5 +42,6 @@ parcelable CodecCapabilities {
android.hardware.bluetooth.audio.AacCapabilities aacCapabilities;
android.hardware.bluetooth.audio.LdacCapabilities ldacCapabilities;
android.hardware.bluetooth.audio.AptxCapabilities aptxCapabilities;
android.hardware.bluetooth.audio.Lc3Capabilities lc3Capabilities;
}
}

View File

@@ -45,5 +45,6 @@ parcelable CodecConfiguration {
android.hardware.bluetooth.audio.AacConfiguration aacConfig;
android.hardware.bluetooth.audio.LdacConfiguration ldacConfig;
android.hardware.bluetooth.audio.AptxConfiguration aptxConfig;
android.hardware.bluetooth.audio.Lc3Configuration lc3Config;
}
}

View File

@@ -39,4 +39,5 @@ parcelable Lc3Capabilities {
int[] frameDurationUs;
int[] octetsPerFrame;
byte[] blocksPerSdu;
android.hardware.bluetooth.audio.ChannelMode[] channelMode;
}

View File

@@ -39,4 +39,5 @@ parcelable Lc3Configuration {
int frameDurationUs;
int octetsPerFrame;
byte blocksPerSdu;
android.hardware.bluetooth.audio.ChannelMode channelMode;
}

View File

@@ -26,6 +26,6 @@ import android.hardware.bluetooth.audio.PcmCapabilities;
@VintfStability
union AudioCapabilities {
PcmCapabilities pcmCapabilities;
CodecCapabilities codecCapabilities;
CodecCapabilities a2dpCapabilities;
LeAudioCodecCapabilitiesSetting leAudioCapabilities;
}

View File

@@ -26,6 +26,6 @@ import android.hardware.bluetooth.audio.PcmConfiguration;
@VintfStability
union AudioConfiguration {
PcmConfiguration pcmConfig;
CodecConfiguration codecConfig;
CodecConfiguration a2dpConfig;
LeAudioConfiguration leAudioConfig;
}

View File

@@ -19,6 +19,7 @@ package android.hardware.bluetooth.audio;
import android.hardware.bluetooth.audio.AacCapabilities;
import android.hardware.bluetooth.audio.AptxCapabilities;
import android.hardware.bluetooth.audio.CodecType;
import android.hardware.bluetooth.audio.Lc3Capabilities;
import android.hardware.bluetooth.audio.LdacCapabilities;
import android.hardware.bluetooth.audio.SbcCapabilities;
@@ -34,6 +35,7 @@ parcelable CodecCapabilities {
AacCapabilities aacCapabilities;
LdacCapabilities ldacCapabilities;
AptxCapabilities aptxCapabilities;
Lc3Capabilities lc3Capabilities;
}
CodecType codecType;
Capabilities capabilities;

View File

@@ -19,6 +19,7 @@ package android.hardware.bluetooth.audio;
import android.hardware.bluetooth.audio.AacConfiguration;
import android.hardware.bluetooth.audio.AptxConfiguration;
import android.hardware.bluetooth.audio.CodecType;
import android.hardware.bluetooth.audio.Lc3Configuration;
import android.hardware.bluetooth.audio.LdacConfiguration;
import android.hardware.bluetooth.audio.SbcConfiguration;
@@ -34,6 +35,7 @@ parcelable CodecConfiguration {
AacConfiguration aacConfig;
LdacConfiguration ldacConfig;
AptxConfiguration aptxConfig;
Lc3Configuration lc3Config;
}
CodecType codecType;
/**

View File

@@ -16,6 +16,8 @@
package android.hardware.bluetooth.audio;
import android.hardware.bluetooth.audio.ChannelMode;
/**
* Used for Hardware Encoding/Decoding LC3 codec capabilities.
*/
@@ -41,4 +43,8 @@ parcelable Lc3Capabilities {
* Number of blocks of codec frames per single SDU (Service Data Unit)
*/
byte[] blocksPerSdu;
/*
* Channel mode used in A2DP special audio, ignored in standard LE Audio mode
*/
ChannelMode[] channelMode;
}

View File

@@ -16,6 +16,8 @@
package android.hardware.bluetooth.audio;
import android.hardware.bluetooth.audio.ChannelMode;
/**
* Used for Hardware Encoding/Decoding LC3 codec configuration.
*/
@@ -41,4 +43,8 @@ parcelable Lc3Configuration {
* Number of blocks of codec frames per single SDU (Service Data Unit)
*/
byte blocksPerSdu;
/*
* Channel mode used in A2DP special audio, ignored in standard LE Audio mode
*/
ChannelMode channelMode;
}