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

Commit 330e486c authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by android-build-merger
Browse files

Merge "Add new sample rate BTAV_A2DP_CODEC_SAMPLE_RATE_16000" 

am: 5417bc16

Change-Id: Ib80ac8807087f9521e8ae50e42bfee41f0fca75e
parents 8ddac4d3 5417bc16

system/audio_a2dp_hw/test/audio_a2dp_hw_test.cc

+2 −0
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ static uint32_t codec_sample_rate2value( 
      return 176400;

    case BTAV_A2DP_CODEC_SAMPLE_RATE_192000:

      return 192000;

    case BTAV_A2DP_CODEC_SAMPLE_RATE_16000:

      return 16000;

    case BTAV_A2DP_CODEC_SAMPLE_RATE_NONE:

      break;

  }

system/include/hardware/bt_av.h

+5 −1
Original line number Diff line number Diff line
@@ -89,7 +89,8 @@ typedef enum { 
  BTAV_A2DP_CODEC_SAMPLE_RATE_88200 = 0x1 << 2,

  BTAV_A2DP_CODEC_SAMPLE_RATE_96000 = 0x1 << 3,

  BTAV_A2DP_CODEC_SAMPLE_RATE_176400 = 0x1 << 4,

  BTAV_A2DP_CODEC_SAMPLE_RATE_192000 = 0x1 << 5

  BTAV_A2DP_CODEC_SAMPLE_RATE_192000 = 0x1 << 5,

  BTAV_A2DP_CODEC_SAMPLE_RATE_16000 = 0x1 << 6

} btav_a2dp_codec_sample_rate_t;



typedef enum {
@@ -178,6 +179,9 @@ typedef struct { 
    AppendCapability(sample_rate_str,

                     (sample_rate & BTAV_A2DP_CODEC_SAMPLE_RATE_192000),

                     "192000");

    AppendCapability(sample_rate_str,

                     (sample_rate & BTAV_A2DP_CODEC_SAMPLE_RATE_16000),

                     "16000");



    std::string bits_per_sample_str;

    AppendCapability(bits_per_sample_str,

system/stack/a2dp/a2dp_aac.cc

+2 −0
Original line number Diff line number Diff line
@@ -835,6 +835,7 @@ static bool select_audio_sample_rate( 
      break;

    case BTAV_A2DP_CODEC_SAMPLE_RATE_176400:

    case BTAV_A2DP_CODEC_SAMPLE_RATE_192000:

    case BTAV_A2DP_CODEC_SAMPLE_RATE_16000:

    case BTAV_A2DP_CODEC_SAMPLE_RATE_NONE:

      break;

  }
@@ -1055,6 +1056,7 @@ bool A2dpCodecConfigAac::setCodecConfig(const uint8_t* p_peer_codec_info, 
      break;

    case BTAV_A2DP_CODEC_SAMPLE_RATE_176400:

    case BTAV_A2DP_CODEC_SAMPLE_RATE_192000:

    case BTAV_A2DP_CODEC_SAMPLE_RATE_16000:

    case BTAV_A2DP_CODEC_SAMPLE_RATE_NONE:

      codec_capability_.sample_rate = BTAV_A2DP_CODEC_SAMPLE_RATE_NONE;

      codec_config_.sample_rate = BTAV_A2DP_CODEC_SAMPLE_RATE_NONE;

system/stack/a2dp/a2dp_sbc.cc

+2 −0
Original line number Diff line number Diff line
@@ -990,6 +990,7 @@ static bool select_audio_sample_rate( 
    case BTAV_A2DP_CODEC_SAMPLE_RATE_96000:

    case BTAV_A2DP_CODEC_SAMPLE_RATE_176400:

    case BTAV_A2DP_CODEC_SAMPLE_RATE_192000:

    case BTAV_A2DP_CODEC_SAMPLE_RATE_16000:

    case BTAV_A2DP_CODEC_SAMPLE_RATE_NONE:

      break;

  }
@@ -1175,6 +1176,7 @@ bool A2dpCodecConfigSbc::setCodecConfig(const uint8_t* p_peer_codec_info, 
    case BTAV_A2DP_CODEC_SAMPLE_RATE_96000:

    case BTAV_A2DP_CODEC_SAMPLE_RATE_176400:

    case BTAV_A2DP_CODEC_SAMPLE_RATE_192000:

    case BTAV_A2DP_CODEC_SAMPLE_RATE_16000:

    case BTAV_A2DP_CODEC_SAMPLE_RATE_NONE:

      codec_capability_.sample_rate = BTAV_A2DP_CODEC_SAMPLE_RATE_NONE;

      codec_config_.sample_rate = BTAV_A2DP_CODEC_SAMPLE_RATE_NONE;

system/stack/a2dp/a2dp_vendor_aptx.cc

+2 −0
Original line number Diff line number Diff line
@@ -489,6 +489,7 @@ static bool select_audio_sample_rate( 
    case BTAV_A2DP_CODEC_SAMPLE_RATE_96000:

    case BTAV_A2DP_CODEC_SAMPLE_RATE_176400:

    case BTAV_A2DP_CODEC_SAMPLE_RATE_192000:

    case BTAV_A2DP_CODEC_SAMPLE_RATE_16000:

    case BTAV_A2DP_CODEC_SAMPLE_RATE_NONE:

      break;

  }
@@ -642,6 +643,7 @@ bool A2dpCodecConfigAptx::setCodecConfig(const uint8_t* p_peer_codec_info, 
    case BTAV_A2DP_CODEC_SAMPLE_RATE_96000:

    case BTAV_A2DP_CODEC_SAMPLE_RATE_176400:

    case BTAV_A2DP_CODEC_SAMPLE_RATE_192000:

    case BTAV_A2DP_CODEC_SAMPLE_RATE_16000:

    case BTAV_A2DP_CODEC_SAMPLE_RATE_NONE:

      codec_capability_.sample_rate = BTAV_A2DP_CODEC_SAMPLE_RATE_NONE;

      codec_config_.sample_rate = BTAV_A2DP_CODEC_SAMPLE_RATE_NONE;