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

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

Add new sample rate BTAV_A2DP_CODEC_SAMPLE_RATE_24000 

am: f4291d7d

Change-Id: I0637185dd3175f307f50cca156d99d4543d8d97b
parents 2f12132e f4291d7d

system/audio_a2dp_hw/test/audio_a2dp_hw_test.cc

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

    case BTAV_A2DP_CODEC_SAMPLE_RATE_16000:

      return 16000;

    case BTAV_A2DP_CODEC_SAMPLE_RATE_24000:

      return 24000;

    case BTAV_A2DP_CODEC_SAMPLE_RATE_NONE:

      break;

  }

system/audio_hearing_aid_hw/test/audio_hearing_aid_hw_test.cc

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

    case BTAV_A2DP_CODEC_SAMPLE_RATE_16000:

      return 16000;

    case BTAV_A2DP_CODEC_SAMPLE_RATE_24000:

      return 24000;

    case BTAV_A2DP_CODEC_SAMPLE_RATE_NONE:

      break;

  }

system/include/hardware/bt_av.h

+5 −1
Original line number Diff line number Diff line
@@ -90,7 +90,8 @@ typedef enum { 
  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_16000 = 0x1 << 6

  BTAV_A2DP_CODEC_SAMPLE_RATE_16000 = 0x1 << 6,

  BTAV_A2DP_CODEC_SAMPLE_RATE_24000 = 0x1 << 7

} btav_a2dp_codec_sample_rate_t;



typedef enum {
@@ -182,6 +183,9 @@ typedef struct { 
    AppendCapability(sample_rate_str,

                     (sample_rate & BTAV_A2DP_CODEC_SAMPLE_RATE_16000),

                     "16000");

    AppendCapability(sample_rate_str,

                     (sample_rate & BTAV_A2DP_CODEC_SAMPLE_RATE_24000),

                     "24000");



    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
@@ -836,6 +836,7 @@ static bool select_audio_sample_rate( 
    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_24000:

    case BTAV_A2DP_CODEC_SAMPLE_RATE_NONE:

      break;

  }
@@ -1057,6 +1058,7 @@ bool A2dpCodecConfigAac::setCodecConfig(const uint8_t* p_peer_codec_info, 
    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_24000:

    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
@@ -991,6 +991,7 @@ static bool select_audio_sample_rate( 
    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_24000:

    case BTAV_A2DP_CODEC_SAMPLE_RATE_NONE:

      break;

  }
@@ -1177,6 +1178,7 @@ bool A2dpCodecConfigSbc::setCodecConfig(const uint8_t* p_peer_codec_info, 
    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_24000:

    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;