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

Commit 716335b2 authored by Pavlin Radoslavov's avatar Pavlin Radoslavov
Browse files

Integration of the aptX and aptX-HD codecs for A2DP source 

Each of the codecs can be used if the corresponding encoding
shared library is installed on the device:
 - aptX: libaptX.so
 - aptX-HD: libaptXHD.so

Test: A2DP streaming to aptX and aptX-HD headsets
Bug: 30958229
Change-Id: I1ca36da653721576f5a5b6bdac186b9ea2790c85
parent e2d64d8a

system/stack/Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -39,6 +39,10 @@ LOCAL_SRC_FILES := \ 
    ./a2dp/a2dp_sbc_encoder.cc \

    ./a2dp/a2dp_sbc_up_sample.cc \

    ./a2dp/a2dp_vendor.cc \

    ./a2dp/a2dp_vendor_aptx.cc \

    ./a2dp/a2dp_vendor_aptx_hd.cc \

    ./a2dp/a2dp_vendor_aptx_encoder.cc \

    ./a2dp/a2dp_vendor_aptx_hd_encoder.cc \

    ./avct/avct_api.cc \

    ./avct/avct_bcb_act.cc \

    ./avct/avct_ccb.cc \

system/stack/a2dp/a2dp_codec_config.cc

+8 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ 


#include "a2dp_sbc.h"

#include "a2dp_vendor.h"

#include "a2dp_vendor_aptx.h"

#include "a2dp_vendor_aptx_hd.h"

#include "osi/include/log.h"



/* The Media Type offset within the codec info byte array */
@@ -82,6 +84,12 @@ A2dpCodecConfig* A2dpCodecConfig::createCodec( 
    case BTAV_A2DP_CODEC_INDEX_SINK_SBC:

      codec_config = new A2dpCodecConfigSbcSink();

      break;

    case BTAV_A2DP_CODEC_INDEX_SOURCE_APTX:

      codec_config = new A2dpCodecConfigAptx();

      break;

    case BTAV_A2DP_CODEC_INDEX_SOURCE_APTX_HD:

      codec_config = new A2dpCodecConfigAptxHd();

      break;

    case BTAV_A2DP_CODEC_INDEX_MAX:

      break;

  }

system/stack/a2dp/a2dp_vendor.cc

+223 −39
Original line number Diff line number Diff line
@@ -21,13 +21,27 @@ 
#define LOG_TAG "a2dp_vendor"



#include "a2dp_vendor.h"

#include "a2dp_vendor_aptx.h"

#include "a2dp_vendor_aptx_hd.h"

#include "bt_target.h"

#include "osi/include/log.h"

#include "osi/include/osi.h"



bool A2DP_IsVendorSourceCodecValid(UNUSED_ATTR const uint8_t* p_codec_info) {

  // uint32_t vendor_id = A2DP_VendorCodecGetVendorId(p_codec_info);

  // uint16_t codec_id = A2DP_VendorCodecGetCodecId(p_codec_info);

bool A2DP_IsVendorSourceCodecValid(const uint8_t* p_codec_info) {

  uint32_t vendor_id = A2DP_VendorCodecGetVendorId(p_codec_info);

  uint16_t codec_id = A2DP_VendorCodecGetCodecId(p_codec_info);



  // Check for aptX

  if (vendor_id == A2DP_APTX_VENDOR_ID &&

      codec_id == A2DP_APTX_CODEC_ID_BLUETOOTH) {

    return A2DP_IsVendorSourceCodecValidAptx(p_codec_info);

  }



  // Check for aptX-HD

  if (vendor_id == A2DP_APTX_HD_VENDOR_ID &&

      codec_id == A2DP_APTX_HD_CODEC_ID_BLUETOOTH) {

    return A2DP_IsVendorSourceCodecValidAptxHd(p_codec_info);

  }



  // Add checks based on <vendor_id, codec_id>
@@ -55,9 +69,21 @@ bool A2DP_IsVendorPeerSourceCodecValid( 
  return false;

}



bool A2DP_IsVendorPeerSinkCodecValid(UNUSED_ATTR const uint8_t* p_codec_info) {

  // uint32_t vendor_id = A2DP_VendorCodecGetVendorId(p_codec_info);

  // uint16_t codec_id = A2DP_VendorCodecGetCodecId(p_codec_info);

bool A2DP_IsVendorPeerSinkCodecValid(const uint8_t* p_codec_info) {

  uint32_t vendor_id = A2DP_VendorCodecGetVendorId(p_codec_info);

  uint16_t codec_id = A2DP_VendorCodecGetCodecId(p_codec_info);



  // Check for aptX

  if (vendor_id == A2DP_APTX_VENDOR_ID &&

      codec_id == A2DP_APTX_CODEC_ID_BLUETOOTH) {

    return A2DP_IsVendorPeerSinkCodecValidAptx(p_codec_info);

  }



  // Check for aptX-HD

  if (vendor_id == A2DP_APTX_HD_VENDOR_ID &&

      codec_id == A2DP_APTX_HD_CODEC_ID_BLUETOOTH) {

    return A2DP_IsVendorPeerSinkCodecValidAptxHd(p_codec_info);

  }



  // Add checks based on <vendor_id, codec_id>
@@ -114,10 +140,24 @@ uint16_t A2DP_VendorCodecGetCodecId(const uint8_t* p_codec_info) { 
  return codec_id;

}



bool A2DP_VendorUsesRtpHeader(UNUSED_ATTR bool content_protection_enabled,

                              UNUSED_ATTR const uint8_t* p_codec_info) {

  // uint32_t vendor_id = A2DP_VendorCodecGetVendorId(p_codec_info);

  // uint16_t codec_id = A2DP_VendorCodecGetCodecId(p_codec_info);

bool A2DP_VendorUsesRtpHeader(bool content_protection_enabled,

                              const uint8_t* p_codec_info) {

  uint32_t vendor_id = A2DP_VendorCodecGetVendorId(p_codec_info);

  uint16_t codec_id = A2DP_VendorCodecGetCodecId(p_codec_info);



  // Check for aptX

  if (vendor_id == A2DP_APTX_VENDOR_ID &&

      codec_id == A2DP_APTX_CODEC_ID_BLUETOOTH) {

    return A2DP_VendorUsesRtpHeaderAptx(content_protection_enabled,

                                        p_codec_info);

  }



  // Check for aptX-HD

  if (vendor_id == A2DP_APTX_HD_VENDOR_ID &&

      codec_id == A2DP_APTX_HD_CODEC_ID_BLUETOOTH) {

    return A2DP_VendorUsesRtpHeaderAptxHd(content_protection_enabled,

                                          p_codec_info);

  }



  // Add checks based on <content_protection_enabled, vendor_id, codec_id>
@@ -125,8 +165,20 @@ bool A2DP_VendorUsesRtpHeader(UNUSED_ATTR bool content_protection_enabled, 
}



const char* A2DP_VendorCodecName(UNUSED_ATTR const uint8_t* p_codec_info) {

  // uint32_t vendor_id = A2DP_VendorCodecGetVendorId(p_src_config);

  // uint16_t codec_id = A2DP_VendorCodecGetCodecId(p_src_config);

  uint32_t vendor_id = A2DP_VendorCodecGetVendorId(p_codec_info);

  uint16_t codec_id = A2DP_VendorCodecGetCodecId(p_codec_info);



  // Check for aptX

  if (vendor_id == A2DP_APTX_VENDOR_ID &&

      codec_id == A2DP_APTX_CODEC_ID_BLUETOOTH) {

    return A2DP_VendorCodecNameAptx(p_codec_info);

  }



  // Check for aptX-HD

  if (vendor_id == A2DP_APTX_HD_VENDOR_ID &&

      codec_id == A2DP_APTX_HD_CODEC_ID_BLUETOOTH) {

    return A2DP_VendorCodecNameAptxHd(p_codec_info);

  }



  // Add checks based on <vendor_id, codec_id>
@@ -148,10 +200,24 @@ bool A2DP_VendorCodecTypeEquals(const uint8_t* p_codec_info_a, 
  uint32_t vendor_id_b = A2DP_VendorCodecGetVendorId(p_codec_info_b);

  uint16_t codec_id_b = A2DP_VendorCodecGetCodecId(p_codec_info_b);



  if (vendor_id_a != vendor_id_b || codec_id_a != codec_id_b) return false;



  // Check for aptX

  if (vendor_id_a == A2DP_APTX_VENDOR_ID &&

      codec_id_a == A2DP_APTX_CODEC_ID_BLUETOOTH) {

    return A2DP_VendorCodecTypeEqualsAptx(p_codec_info_a, p_codec_info_b);

  }



  // Check for aptX-HD

  if (vendor_id_a == A2DP_APTX_HD_VENDOR_ID &&

      codec_id_a == A2DP_APTX_HD_CODEC_ID_BLUETOOTH) {

    return A2DP_VendorCodecTypeEqualsAptxHd(p_codec_info_a, p_codec_info_b);

  }



  // OPTIONAL: Add extra vendor-specific checks based on the

  // vendor-specific data stored in "p_codec_info_a" and "p_codec_info_b".



  return (vendor_id_a == vendor_id_b) && (codec_id_a == codec_id_b);

  return true;

}



bool A2DP_VendorCodecEquals(const uint8_t* p_codec_info_a,
@@ -171,33 +237,81 @@ bool A2DP_VendorCodecEquals(const uint8_t* p_codec_info_a, 


  if ((vendor_id_a != vendor_id_b) || (codec_id_a != codec_id_b)) return false;



  // Check for aptX

  if (vendor_id_a == A2DP_APTX_VENDOR_ID &&

      codec_id_a == A2DP_APTX_CODEC_ID_BLUETOOTH) {

    return A2DP_VendorCodecEqualsAptx(p_codec_info_a, p_codec_info_b);

  }



  // Check for aptX-HD

  if (vendor_id_a == A2DP_APTX_HD_VENDOR_ID &&

      codec_id_a == A2DP_APTX_HD_CODEC_ID_BLUETOOTH) {

    return A2DP_VendorCodecEqualsAptxHd(p_codec_info_a, p_codec_info_b);

  }



  // Add extra vendor-specific checks based on the

  // vendor-specific data stored in "p_codec_info_a" and "p_codec_info_b".



  return false;

}



int A2DP_VendorGetTrackSampleRate(UNUSED_ATTR const uint8_t* p_codec_info) {

  // uint32_t vendor_id = A2DP_VendorCodecGetVendorId(p_codec_info);

  // uint16_t codec_id = A2DP_VendorCodecGetCodecId(p_codec_info);

int A2DP_VendorGetTrackSampleRate(const uint8_t* p_codec_info) {

  uint32_t vendor_id = A2DP_VendorCodecGetVendorId(p_codec_info);

  uint16_t codec_id = A2DP_VendorCodecGetCodecId(p_codec_info);



  // Check for aptX

  if (vendor_id == A2DP_APTX_VENDOR_ID &&

      codec_id == A2DP_APTX_CODEC_ID_BLUETOOTH) {

    return A2DP_VendorGetTrackSampleRateAptx(p_codec_info);

  }



  // Check for aptX-HD

  if (vendor_id == A2DP_APTX_HD_VENDOR_ID &&

      codec_id == A2DP_APTX_HD_CODEC_ID_BLUETOOTH) {

    return A2DP_VendorGetTrackSampleRateAptxHd(p_codec_info);

  }



  // Add checks based on <vendor_id, codec_id>



  return -1;

}



int A2DP_VendorGetTrackBitsPerSample(UNUSED_ATTR const uint8_t* p_codec_info) {

  // uint32_t vendor_id = A2DP_VendorCodecGetVendorId(p_codec_info);

  // uint16_t codec_id = A2DP_VendorCodecGetCodecId(p_codec_info);

int A2DP_VendorGetTrackBitsPerSample(const uint8_t* p_codec_info) {

  uint32_t vendor_id = A2DP_VendorCodecGetVendorId(p_codec_info);

  uint16_t codec_id = A2DP_VendorCodecGetCodecId(p_codec_info);



  // Check for aptX

  if (vendor_id == A2DP_APTX_VENDOR_ID &&

      codec_id == A2DP_APTX_CODEC_ID_BLUETOOTH) {

    return A2DP_VendorGetTrackBitsPerSampleAptx(p_codec_info);

  }



  // Check for aptX-HD

  if (vendor_id == A2DP_APTX_HD_VENDOR_ID &&

      codec_id == A2DP_APTX_HD_CODEC_ID_BLUETOOTH) {

    return A2DP_VendorGetTrackBitsPerSampleAptxHd(p_codec_info);

  }



  // Add checks based on <vendor_id, codec_id>



  return -1;

}



int A2DP_VendorGetTrackChannelCount(UNUSED_ATTR const uint8_t* p_codec_info) {

  // uint32_t vendor_id = A2DP_VendorCodecGetVendorId(p_codec_info);

  // uint16_t codec_id = A2DP_VendorCodecGetCodecId(p_codec_info);

int A2DP_VendorGetTrackChannelCount(const uint8_t* p_codec_info) {

  uint32_t vendor_id = A2DP_VendorCodecGetVendorId(p_codec_info);

  uint16_t codec_id = A2DP_VendorCodecGetCodecId(p_codec_info);



  // Check for aptX

  if (vendor_id == A2DP_APTX_VENDOR_ID &&

      codec_id == A2DP_APTX_CODEC_ID_BLUETOOTH) {

    return A2DP_VendorGetTrackChannelCountAptx(p_codec_info);

  }



  // Check for aptX-HD

  if (vendor_id == A2DP_APTX_HD_VENDOR_ID &&

      codec_id == A2DP_APTX_HD_CODEC_ID_BLUETOOTH) {

    return A2DP_VendorGetTrackChannelCountAptxHd(p_codec_info);

  }



  // Add checks based on <vendor_id, codec_id>
@@ -227,22 +341,48 @@ int A2DP_VendorGetSinkFramesCountToProcess( 
  return -1;

}



bool A2DP_VendorGetPacketTimestamp(UNUSED_ATTR const uint8_t* p_codec_info,

                                   UNUSED_ATTR const uint8_t* p_data,

                                   UNUSED_ATTR uint32_t* p_timestamp) {

  // uint32_t vendor_id = A2DP_VendorCodecGetVendorId(p_codec_info);

  // uint16_t codec_id = A2DP_VendorCodecGetCodecId(p_codec_info);

bool A2DP_VendorGetPacketTimestamp(const uint8_t* p_codec_info,

                                   const uint8_t* p_data,

                                   uint32_t* p_timestamp) {

  uint32_t vendor_id = A2DP_VendorCodecGetVendorId(p_codec_info);

  uint16_t codec_id = A2DP_VendorCodecGetCodecId(p_codec_info);



  // Check for aptX

  if (vendor_id == A2DP_APTX_VENDOR_ID &&

      codec_id == A2DP_APTX_CODEC_ID_BLUETOOTH) {

    return A2DP_VendorGetPacketTimestampAptx(p_codec_info, p_data, p_timestamp);

  }



  // Check for aptX-HD

  if (vendor_id == A2DP_APTX_HD_VENDOR_ID &&

      codec_id == A2DP_APTX_HD_CODEC_ID_BLUETOOTH) {

    return A2DP_VendorGetPacketTimestampAptxHd(p_codec_info, p_data,

                                               p_timestamp);

  }



  // Add checks based on <vendor_id, codec_id>



  return false;

}



bool A2DP_VendorBuildCodecHeader(UNUSED_ATTR const uint8_t* p_codec_info,

                                 UNUSED_ATTR BT_HDR* p_buf,

                                 UNUSED_ATTR uint16_t frames_per_packet) {

  // uint32_t vendor_id = A2DP_VendorCodecGetVendorId(p_codec_info);

  // uint16_t codec_id = A2DP_VendorCodecGetCodecId(p_codec_info);

bool A2DP_VendorBuildCodecHeader(const uint8_t* p_codec_info, BT_HDR* p_buf,

                                 uint16_t frames_per_packet) {

  uint32_t vendor_id = A2DP_VendorCodecGetVendorId(p_codec_info);

  uint16_t codec_id = A2DP_VendorCodecGetCodecId(p_codec_info);



  // Check for aptX

  if (vendor_id == A2DP_APTX_VENDOR_ID &&

      codec_id == A2DP_APTX_CODEC_ID_BLUETOOTH) {

    return A2DP_VendorBuildCodecHeaderAptx(p_codec_info, p_buf,

                                           frames_per_packet);

  }



  // Check for aptX-HD

  if (vendor_id == A2DP_APTX_HD_VENDOR_ID &&

      codec_id == A2DP_APTX_HD_CODEC_ID_BLUETOOTH) {

    return A2DP_VendorBuildCodecHeaderAptxHd(p_codec_info, p_buf,

                                             frames_per_packet);

  }



  // Add checks based on <vendor_id, codec_id>
@@ -251,8 +391,20 @@ bool A2DP_VendorBuildCodecHeader(UNUSED_ATTR const uint8_t* p_codec_info, 


const tA2DP_ENCODER_INTERFACE* A2DP_VendorGetEncoderInterface(

    const uint8_t* p_codec_info) {

  // uint32_t vendor_id = A2DP_VendorCodecGetVendorId(p_codec_info);

  // uint16_t codec_id = A2DP_VendorCodecGetCodecId(p_codec_info);

  uint32_t vendor_id = A2DP_VendorCodecGetVendorId(p_codec_info);

  uint16_t codec_id = A2DP_VendorCodecGetCodecId(p_codec_info);



  // Check for aptX

  if (vendor_id == A2DP_APTX_VENDOR_ID &&

      codec_id == A2DP_APTX_CODEC_ID_BLUETOOTH) {

    return A2DP_VendorGetEncoderInterfaceAptx(p_codec_info);

  }



  // Check for aptX-HD

  if (vendor_id == A2DP_APTX_HD_VENDOR_ID &&

      codec_id == A2DP_APTX_HD_CODEC_ID_BLUETOOTH) {

    return A2DP_VendorGetEncoderInterfaceAptxHd(p_codec_info);

  }



  // Add checks based on <vendor_id, codec_id>
@@ -260,8 +412,20 @@ const tA2DP_ENCODER_INTERFACE* A2DP_VendorGetEncoderInterface( 
}



bool A2DP_VendorAdjustCodec(uint8_t* p_codec_info) {

  // uint32_t vendor_id = A2DP_VendorCodecGetVendorId(p_codec_info);

  // uint16_t codec_id = A2DP_VendorCodecGetCodecId(p_codec_info);

  uint32_t vendor_id = A2DP_VendorCodecGetVendorId(p_codec_info);

  uint16_t codec_id = A2DP_VendorCodecGetCodecId(p_codec_info);



  // Check for aptX

  if (vendor_id == A2DP_APTX_VENDOR_ID &&

      codec_id == A2DP_APTX_CODEC_ID_BLUETOOTH) {

    return A2DP_VendorAdjustCodecAptx(p_codec_info);

  }



  // Check for aptX-HD

  if (vendor_id == A2DP_APTX_HD_VENDOR_ID &&

      codec_id == A2DP_APTX_HD_CODEC_ID_BLUETOOTH) {

    return A2DP_VendorAdjustCodecAptxHd(p_codec_info);

  }



  // Add checks based on <vendor_id, codec_id>
@@ -269,9 +433,21 @@ bool A2DP_VendorAdjustCodec(uint8_t* p_codec_info) { 
}



btav_a2dp_codec_index_t A2DP_VendorSourceCodecIndex(

    UNUSED_ATTR const uint8_t* p_codec_info) {

  // uint32_t vendor_id = A2DP_VendorCodecGetVendorId(p_codec_info);

  // uint16_t codec_id = A2DP_VendorCodecGetCodecId(p_codec_info);

    const uint8_t* p_codec_info) {

  uint32_t vendor_id = A2DP_VendorCodecGetVendorId(p_codec_info);

  uint16_t codec_id = A2DP_VendorCodecGetCodecId(p_codec_info);



  // Check for aptX

  if (vendor_id == A2DP_APTX_VENDOR_ID &&

      codec_id == A2DP_APTX_CODEC_ID_BLUETOOTH) {

    return A2DP_VendorSourceCodecIndexAptx(p_codec_info);

  }



  // Check for aptX-HD

  if (vendor_id == A2DP_APTX_HD_VENDOR_ID &&

      codec_id == A2DP_APTX_HD_CODEC_ID_BLUETOOTH) {

    return A2DP_VendorSourceCodecIndexAptxHd(p_codec_info);

  }



  // Add checks based on <vendor_id, codec_id>
@@ -284,6 +460,10 @@ const char* A2DP_VendorCodecIndexStr(btav_a2dp_codec_index_t codec_index) { 
    case BTAV_A2DP_CODEC_INDEX_SOURCE_SBC:

    case BTAV_A2DP_CODEC_INDEX_SINK_SBC:

      break;  // This is not a vendor-specific codec

    case BTAV_A2DP_CODEC_INDEX_SOURCE_APTX:

      return A2DP_VendorCodecIndexStrAptx();

    case BTAV_A2DP_CODEC_INDEX_SOURCE_APTX_HD:

      return A2DP_VendorCodecIndexStrAptxHd();

    // Add a switch statement for each vendor-specific codec

    case BTAV_A2DP_CODEC_INDEX_MAX:

      break;
@@ -299,6 +479,10 @@ bool A2DP_VendorInitCodecConfig(btav_a2dp_codec_index_t codec_index, 
    case BTAV_A2DP_CODEC_INDEX_SOURCE_SBC:

    case BTAV_A2DP_CODEC_INDEX_SINK_SBC:

      break;  // This is not a vendor-specific codec

    case BTAV_A2DP_CODEC_INDEX_SOURCE_APTX:

      return A2DP_VendorInitCodecConfigAptx(p_cfg);

    case BTAV_A2DP_CODEC_INDEX_SOURCE_APTX_HD:

      return A2DP_VendorInitCodecConfigAptxHd(p_cfg);

    // Add a switch statement for each vendor-specific codec

    case BTAV_A2DP_CODEC_INDEX_MAX:

      break;

system/stack/a2dp/a2dp_vendor_aptx.cc

0 → 100644
+843 −0

File added.

Preview size limit exceeded, changes collapsed.

system/stack/a2dp/a2dp_vendor_aptx_encoder.cc

0 → 100644
+581 −0

File added.

Preview size limit exceeded, changes collapsed.