From fd7a9847733932d20282d3cd7c7177469935d2e8 Mon Sep 17 00:00:00 2001 From: Jakub Pawlowski Date: Wed, 28 Feb 2018 18:40:33 -0800 Subject: [PATCH] Add new sample rate BTAV_A2DP_CODEC_SAMPLE_RATE_16000 Test: compilation Bug: 69623109 Change-Id: Ib7c94c538d8636719658814d2a73bc997ab6dddc --- audio_a2dp_hw/test/audio_a2dp_hw_test.cc | 2 ++ include/hardware/bt_av.h | 6 +++++- stack/a2dp/a2dp_aac.cc | 2 ++ stack/a2dp/a2dp_sbc.cc | 2 ++ stack/a2dp/a2dp_vendor_aptx.cc | 2 ++ stack/a2dp/a2dp_vendor_aptx_hd.cc | 2 ++ stack/a2dp/a2dp_vendor_ldac.cc | 2 ++ 7 files changed, 17 insertions(+), 1 deletion(-) diff --git a/audio_a2dp_hw/test/audio_a2dp_hw_test.cc b/audio_a2dp_hw/test/audio_a2dp_hw_test.cc index 53faa6a92..f09ca2d3b 100644 --- a/audio_a2dp_hw/test/audio_a2dp_hw_test.cc +++ b/audio_a2dp_hw/test/audio_a2dp_hw_test.cc @@ -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; } diff --git a/include/hardware/bt_av.h b/include/hardware/bt_av.h index 3ef4c2cd5..be35f6a7c 100644 --- a/include/hardware/bt_av.h +++ b/include/hardware/bt_av.h @@ -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, diff --git a/stack/a2dp/a2dp_aac.cc b/stack/a2dp/a2dp_aac.cc index 93307c8f6..088578976 100644 --- a/stack/a2dp/a2dp_aac.cc +++ b/stack/a2dp/a2dp_aac.cc @@ -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; diff --git a/stack/a2dp/a2dp_sbc.cc b/stack/a2dp/a2dp_sbc.cc index 400d6d955..8cff5bf7d 100644 --- a/stack/a2dp/a2dp_sbc.cc +++ b/stack/a2dp/a2dp_sbc.cc @@ -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; diff --git a/stack/a2dp/a2dp_vendor_aptx.cc b/stack/a2dp/a2dp_vendor_aptx.cc index cf136e3fa..c2c76acec 100644 --- a/stack/a2dp/a2dp_vendor_aptx.cc +++ b/stack/a2dp/a2dp_vendor_aptx.cc @@ -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; diff --git a/stack/a2dp/a2dp_vendor_aptx_hd.cc b/stack/a2dp/a2dp_vendor_aptx_hd.cc index 907712c70..fe6ce5ce7 100644 --- a/stack/a2dp/a2dp_vendor_aptx_hd.cc +++ b/stack/a2dp/a2dp_vendor_aptx_hd.cc @@ -506,6 +506,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; } @@ -659,6 +660,7 @@ bool A2dpCodecConfigAptxHd::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; diff --git a/stack/a2dp/a2dp_vendor_ldac.cc b/stack/a2dp/a2dp_vendor_ldac.cc index 7f76e1f7a..1ce1593ed 100644 --- a/stack/a2dp/a2dp_vendor_ldac.cc +++ b/stack/a2dp/a2dp_vendor_ldac.cc @@ -654,6 +654,7 @@ static bool select_audio_sample_rate( return true; } break; + case BTAV_A2DP_CODEC_SAMPLE_RATE_16000: case BTAV_A2DP_CODEC_SAMPLE_RATE_NONE: break; } @@ -875,6 +876,7 @@ bool A2dpCodecConfigLdac::setCodecConfig(const uint8_t* p_peer_codec_info, codec_capability_.sample_rate = codec_user_config_.sample_rate; codec_config_.sample_rate = codec_user_config_.sample_rate; } + 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; -- 2.11.0