Merge "bluetooth/audio: Apply android.hardware.bluetooth.audio-update-api" into main

This commit is contained in:
Henri Chataing
2023-12-02 20:35:04 +00:00
committed by Gerrit Code Review
12 changed files with 56 additions and 56 deletions

View File

@@ -34,8 +34,8 @@
package android.hardware.bluetooth.audio;
@Backing(type="byte") @VintfStability
enum AacObjectType {
MPEG2_LC = 0,
MPEG4_LC = 1,
MPEG4_LTP = 2,
MPEG4_SCALABLE = 3,
MPEG2_LC,
MPEG4_LC,
MPEG4_LTP,
MPEG4_SCALABLE,
}

View File

@@ -38,5 +38,5 @@ enum AptxAdaptiveChannelMode {
MONO = 1,
DUAL_MONO = 2,
TWS_STEREO = 4,
UNKNOWN = 255,
UNKNOWN = 0xFF,
}

View File

@@ -34,6 +34,6 @@
package android.hardware.bluetooth.audio;
@Backing(type="int") @VintfStability
enum AptxAdaptiveInputMode {
STEREO = 0,
DUAL_MONO = 1,
STEREO = 0x00,
DUAL_MONO = 0x01,
}

View File

@@ -34,8 +34,8 @@
package android.hardware.bluetooth.audio;
@Backing(type="int") @VintfStability
enum AptxMode {
UNKNOWN = 0,
HIGH_QUALITY = 4096,
LOW_LATENCY = 8192,
ULTRA_LOW_LATENCY = 16384,
UNKNOWN = 0x00,
HIGH_QUALITY = 0x1000,
LOW_LATENCY = 0x2000,
ULTRA_LOW_LATENCY = 0x4000,
}

View File

@@ -35,6 +35,6 @@ package android.hardware.bluetooth.audio;
@Backing(type="int") @VintfStability
enum AudioLocation {
UNKNOWN = 1,
FRONT_LEFT = 2,
FRONT_RIGHT = 4,
FRONT_LEFT = (1 << 1) /* 2 */,
FRONT_RIGHT = (1 << 2) /* 4 */,
}

View File

@@ -34,8 +34,8 @@
package android.hardware.bluetooth.audio;
@Backing(type="byte") @VintfStability
enum ChannelMode {
UNKNOWN = 0,
MONO = 1,
STEREO = 2,
DUALMONO = 3,
UNKNOWN,
MONO,
STEREO,
DUALMONO,
}

View File

@@ -34,16 +34,16 @@
package android.hardware.bluetooth.audio;
@Backing(type="int") @VintfStability
enum CodecType {
UNKNOWN = 0,
SBC = 1,
AAC = 2,
APTX = 3,
APTX_HD = 4,
LDAC = 5,
LC3 = 6,
VENDOR = 7,
APTX_ADAPTIVE = 8,
OPUS = 9,
APTX_ADAPTIVE_LE = 10,
APTX_ADAPTIVE_LEX = 11,
UNKNOWN,
SBC,
AAC,
APTX,
APTX_HD,
LDAC,
LC3,
VENDOR,
APTX_ADAPTIVE,
OPUS,
APTX_ADAPTIVE_LE,
APTX_ADAPTIVE_LEX,
}

View File

@@ -34,8 +34,8 @@
package android.hardware.bluetooth.audio;
@Backing(type="byte") @VintfStability
enum LdacChannelMode {
UNKNOWN = 0,
STEREO = 1,
DUAL = 2,
MONO = 3,
UNKNOWN,
STEREO,
DUAL,
MONO,
}

View File

@@ -34,8 +34,8 @@
package android.hardware.bluetooth.audio;
@Backing(type="byte") @VintfStability
enum LdacQualityIndex {
HIGH = 0,
MID = 1,
LOW = 2,
ABR = 3,
HIGH,
MID,
LOW,
ABR,
}

View File

@@ -34,6 +34,6 @@
package android.hardware.bluetooth.audio;
@Backing(type="byte") @VintfStability
enum SbcAllocMethod {
ALLOC_MD_S = 0,
ALLOC_MD_L = 1,
ALLOC_MD_S,
ALLOC_MD_L,
}

View File

@@ -34,9 +34,9 @@
package android.hardware.bluetooth.audio;
@Backing(type="byte") @VintfStability
enum SbcChannelMode {
UNKNOWN = 0,
JOINT_STEREO = 1,
STEREO = 2,
DUAL = 3,
MONO = 4,
UNKNOWN,
JOINT_STEREO,
STEREO,
DUAL,
MONO,
}

View File

@@ -34,16 +34,16 @@
package android.hardware.bluetooth.audio;
@Backing(type="byte") @VintfStability
enum SessionType {
UNKNOWN = 0,
A2DP_SOFTWARE_ENCODING_DATAPATH = 1,
A2DP_HARDWARE_OFFLOAD_ENCODING_DATAPATH = 2,
HEARING_AID_SOFTWARE_ENCODING_DATAPATH = 3,
LE_AUDIO_SOFTWARE_ENCODING_DATAPATH = 4,
LE_AUDIO_SOFTWARE_DECODING_DATAPATH = 5,
LE_AUDIO_HARDWARE_OFFLOAD_ENCODING_DATAPATH = 6,
LE_AUDIO_HARDWARE_OFFLOAD_DECODING_DATAPATH = 7,
LE_AUDIO_BROADCAST_SOFTWARE_ENCODING_DATAPATH = 8,
LE_AUDIO_BROADCAST_HARDWARE_OFFLOAD_ENCODING_DATAPATH = 9,
A2DP_SOFTWARE_DECODING_DATAPATH = 10,
A2DP_HARDWARE_OFFLOAD_DECODING_DATAPATH = 11,
UNKNOWN,
A2DP_SOFTWARE_ENCODING_DATAPATH,
A2DP_HARDWARE_OFFLOAD_ENCODING_DATAPATH,
HEARING_AID_SOFTWARE_ENCODING_DATAPATH,
LE_AUDIO_SOFTWARE_ENCODING_DATAPATH,
LE_AUDIO_SOFTWARE_DECODING_DATAPATH,
LE_AUDIO_HARDWARE_OFFLOAD_ENCODING_DATAPATH,
LE_AUDIO_HARDWARE_OFFLOAD_DECODING_DATAPATH,
LE_AUDIO_BROADCAST_SOFTWARE_ENCODING_DATAPATH,
LE_AUDIO_BROADCAST_HARDWARE_OFFLOAD_ENCODING_DATAPATH,
A2DP_SOFTWARE_DECODING_DATAPATH,
A2DP_HARDWARE_OFFLOAD_DECODING_DATAPATH,
}