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

Commit 82d991db authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Add a2dp vendor codec extension"

parents c96879a0 ce87f918

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

+5 −0
Original line number Diff line number Diff line
@@ -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;

  }

}

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

+7 −0
Original line number Diff line number Diff line
@@ -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;

  }

}

bluetooth/audio/aidl/android/hardware/bluetooth/audio/CodecCapabilities.aidl

+5 −0
Original line number Diff line number Diff line
@@ -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;

bluetooth/audio/aidl/android/hardware/bluetooth/audio/CodecConfiguration.aidl

+7 −0
Original line number Diff line number Diff line
@@ -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;

    /**

bluetooth/audio/utils/aidl_session/BluetoothAudioCodecs.cpp

+0 −1
Original line number Diff line number Diff line
@@ -356,7 +356,6 @@ BluetoothAudioCodecs::GetA2dpOffloadCodecCapabilities( 
        break;

      case CodecType::UNKNOWN:

      case CodecType::VENDOR:

        codec_capability = {};

        break;

    }

  }