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

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

Merge "stack/a2dp: Remove unused function A2DP_IsSinkCodecValid" into main

parents 7734c155 863179ca

system/stack/a2dp/a2dp_codec_config.cc

+0 −19
Original line number Diff line number Diff line
@@ -1072,25 +1072,6 @@ bool A2DP_IsSourceCodecValid(const uint8_t* p_codec_info) { 
  return false;

}



bool A2DP_IsSinkCodecValid(const uint8_t* p_codec_info) {

  tA2DP_CODEC_TYPE codec_type = A2DP_GetCodecType(p_codec_info);



  switch (codec_type) {

    case A2DP_MEDIA_CT_SBC:

      return A2DP_IsCodecValidSbc(p_codec_info);

#if !defined(EXCLUDE_NONSTANDARD_CODECS)

    case A2DP_MEDIA_CT_AAC:

      return A2DP_IsCodecValidAac(p_codec_info);

    case A2DP_MEDIA_CT_NON_A2DP:

      return A2DP_IsVendorSinkCodecValid(p_codec_info);

#endif

    default:

      break;

  }



  return false;

}



bool A2DP_IsPeerSourceCodecValid(const uint8_t* p_codec_info) {

  tA2DP_CODEC_TYPE codec_type = A2DP_GetCodecType(p_codec_info);

system/stack/a2dp/a2dp_vendor.cc

+0 −20
Original line number Diff line number Diff line
@@ -60,26 +60,6 @@ bool A2DP_IsVendorSourceCodecValid(const uint8_t* p_codec_info) { 
  return false;

}



bool A2DP_IsVendorSinkCodecValid(const uint8_t* p_codec_info) {

  uint32_t vendor_id = A2DP_VendorCodecGetVendorId(p_codec_info);

  uint16_t codec_id = A2DP_VendorCodecGetCodecId(p_codec_info);



  // Add checks based on <vendor_id, codec_id>

  // NOTE: Should be done only for local Sink codecs.



  // Check for LDAC

  if (vendor_id == A2DP_LDAC_VENDOR_ID && codec_id == A2DP_LDAC_CODEC_ID) {

    return A2DP_IsCodecValidLdac(p_codec_info);

  }



  // Check for Opus

  if (vendor_id == A2DP_OPUS_VENDOR_ID && codec_id == A2DP_OPUS_CODEC_ID) {

    return A2DP_IsCodecValidOpus(p_codec_info);

  }



  return false;

}



bool A2DP_IsVendorPeerSourceCodecValid(const uint8_t* p_codec_info) {

  uint32_t vendor_id = A2DP_VendorCodecGetVendorId(p_codec_info);

  uint16_t codec_id = A2DP_VendorCodecGetCodecId(p_codec_info);

system/stack/include/a2dp_codec_api.h

+0 −6
Original line number Diff line number Diff line
@@ -571,12 +571,6 @@ tA2DP_CODEC_TYPE A2DP_GetCodecType(const uint8_t* p_codec_info); 
// otherwise false.

bool A2DP_IsSourceCodecValid(const uint8_t* p_codec_info);



// Checks whether the codec capabilities contain a valid A2DP Sink codec.

// NOTE: only codecs that are implemented are considered valid.

// Returns true if |p_codec_info| contains information about a valid codec,

// otherwise false.

bool A2DP_IsSinkCodecValid(const uint8_t* p_codec_info);



// Checks whether the codec capabilities contain a valid peer A2DP Source

// codec.

// NOTE: only codecs that are implemented are considered valid.

system/stack/include/a2dp_vendor.h

+0 −7
Original line number Diff line number Diff line
@@ -54,13 +54,6 @@ typedef enum { 
// vendor-specific codec, otherwise false.

bool A2DP_IsVendorSourceCodecValid(const uint8_t* p_codec_info);



// Checks whether the codec capabilities contain a valid A2DP vendor-specific

// Sink codec.

// NOTE: only codecs that are implemented are considered valid.

// Returns true if |p_codec_info| contains information about a valid

// vendor-specific codec, otherwise false.

bool A2DP_IsVendorSinkCodecValid(const uint8_t* p_codec_info);



// Checks whether the codec capabilities contain a valid peer A2DP

// vendor-specific Source codec.

// NOTE: only codecs that are implemented are considered valid.

system/stack/test/fuzzers/a2dp/codec/a2dpCodecInfoFuzzFunctions.h

+0 −5
Original line number Diff line number Diff line
@@ -65,11 +65,6 @@ std::vector<std::function<void(FuzzedDataProvider*, uint8_t*)>> a2dp_codec_info_ 
          A2DP_IsSourceCodecValid(codec_info);

        },



        // A2DP_IsSinkCodecValid

        [](FuzzedDataProvider* fdp, uint8_t* codec_info) -> void {

          A2DP_IsSinkCodecValid(codec_info);

        },



        // A2DP_IsPeerSourceCodecValid

        [](FuzzedDataProvider* fdp, uint8_t* codec_info) -> void {

          A2DP_IsPeerSourceCodecValid(codec_info);