Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2db12e52 authored by Bao Do's avatar Bao Do Committed by Gerrit Code Review
Browse files

Merge changes from topic "leaudio_audio_location_int" into main 

* changes:
  Add test cases for BluetoothLeAudioCodecsProviderTest for audioLocationInt parsing
  Populate `audioLocation` from XML file for LE Audio codec provider
  Add integer `audioLocation` to better support different LE Audio audio location configurations
parents f53a9810 35426be9

bluetooth/audio/aidl/aidl_api/android.hardware.bluetooth.audio/current/android/hardware/bluetooth/audio/BroadcastCapability.aidl

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ parcelable BroadcastCapability { 
  android.hardware.bluetooth.audio.AudioLocation supportedChannel;

  int channelCountPerStream;

  android.hardware.bluetooth.audio.BroadcastCapability.LeAudioCodecCapabilities leAudioCodecCapabilities;

  @nullable android.hardware.bluetooth.audio.CodecSpecificConfigurationLtv.AudioChannelAllocation audioLocation;

  @VintfStability

  parcelable VendorCapabilities {

    ParcelableHolder extension;

bluetooth/audio/aidl/aidl_api/android.hardware.bluetooth.audio/current/android/hardware/bluetooth/audio/CodecSpecificConfigurationLtv.aidl

+1 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ union CodecSpecificConfigurationLtv { 
    const int FRONT_RIGHT_WIDE = 0x02000000;

    const int LEFT_SURROUND = 0x04000000;

    const int RIGHT_SURROUND = 0x08000000;

    const int MONO = 0x00000000;

  }

  parcelable OctetsPerCodecFrame {

    int value;

bluetooth/audio/aidl/aidl_api/android.hardware.bluetooth.audio/current/android/hardware/bluetooth/audio/UnicastCapability.aidl

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ parcelable UnicastCapability { 
  int deviceCount;

  int channelCountPerDevice;

  android.hardware.bluetooth.audio.UnicastCapability.LeAudioCodecCapabilities leAudioCodecCapabilities;

  @nullable android.hardware.bluetooth.audio.CodecSpecificConfigurationLtv.AudioChannelAllocation audioLocation;

  @VintfStability

  parcelable VendorCapabilities {

    ParcelableHolder extension;

bluetooth/audio/aidl/android/hardware/bluetooth/audio/BroadcastCapability.aidl

+4 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.hardware.bluetooth.audio;



import android.hardware.bluetooth.audio.AudioLocation;

import android.hardware.bluetooth.audio.CodecSpecificConfigurationLtv.AudioChannelAllocation;

import android.hardware.bluetooth.audio.CodecType;

import android.hardware.bluetooth.audio.Lc3Capabilities;
@@ -35,8 +36,11 @@ parcelable BroadcastCapability { 
        @nullable VendorCapabilities[] vendorCapabillities;

    }

    CodecType codecType;

    // @deprecated use audioLocation if present.

    AudioLocation supportedChannel;

    // Supported channel count for each stream

    int channelCountPerStream;

    LeAudioCodecCapabilities leAudioCodecCapabilities;

    // The new audio location type, replacing supportedChannel

    @nullable AudioChannelAllocation audioLocation;

}

bluetooth/audio/aidl/android/hardware/bluetooth/audio/CodecSpecificConfigurationLtv.aidl

+2 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ union CodecSpecificConfigurationLtv { 
    }



    parcelable AudioChannelAllocation {

        // @deprecated use MONO instead.

        const int NOT_ALLOWED = 0x00000000;

        const int FRONT_LEFT = 0x00000001;

        const int FRONT_RIGHT = 0x00000002;
@@ -76,6 +77,7 @@ union CodecSpecificConfigurationLtv { 
        const int FRONT_RIGHT_WIDE = 0x02000000;

        const int LEFT_SURROUND = 0x04000000;

        const int RIGHT_SURROUND = 0x08000000;

        const int MONO = 0x00000000;



        // Bit mask of Audio Locations

        int bitmask;