commit cda874fab03f78efebddb8fb81f9ea7aeee87eb2
author Chris Elliott <chriselliott@google.com> Wed Dec 02 13:37:04 2015 -0800
committer Chris Elliott <chriselliott@google.com> Wed Dec 02 13:37:04 2015 -0800
tree a2e77f21f2dff9bc983829b20d230b2588e39203
parent 3e1fc82009b434a496f920a29023426e4d16fd4f

DO NOT MERGE Final Revert "Make A2DP Offload max bitpool configurable by device."

This reverts commit 49b5e6f5dfdddd0f875d120f5aebc39d7d9415a5.

include/bt_vendor_brcm_a2dp.h

diff --git a/include/bt_vendor_brcm_a2dp.h b/include/bt_vendor_brcm_a2dp.h
index 5df91a8..9601111 100644
--- a/include/bt_vendor_brcm_a2dp.h
+++ b/include/bt_vendor_brcm_a2dp.h
@@ -81,11 +81,6 @@
 #define BRCM_A2DP_OFFLOAD_SRC_SF  AUDIO_ROUTE_SF_48K
 #endif
 
-#ifndef BRCM_A2DP_OFFLOAD_MAX_BITPOOL
-/* High quality setting @ 44.1 kHz */
-#define BRCM_A2DP_OFFLOAD_MAX_BITPOOL 53
-#endif
-
 #ifndef BRCM_A2DP_OFFLOAD_PCM_PIN_FCN
 #define BRCM_A2DP_OFFLOAD_PCM_PIN_FCN PCM_PIN_FCN_I2S_SLAVE
 #endif

src/bt_vendor_brcm_a2dp.c

diff --git a/src/bt_vendor_brcm_a2dp.c b/src/bt_vendor_brcm_a2dp.c
index b5df5fb..0526196 100644
--- a/src/bt_vendor_brcm_a2dp.c
+++ b/src/bt_vendor_brcm_a2dp.c
@@ -258,9 +258,8 @@
             parsed_info->block_length  = *codec_info & A2D_SBC_IE_BLOCKS_MSK;
             parsed_info->num_subbands  = *codec_info & A2D_SBC_IE_SUBBAND_MSK;
             parsed_info->alloc_method  = *codec_info & A2D_SBC_IE_ALLOC_MD_MSK;
-            codec_info += 2; /* MAX Bitpool */
-            parsed_info->bitpool_size  = (*codec_info > BRCM_A2DP_OFFLOAD_MAX_BITPOOL) ?
-                                         BRCM_A2DP_OFFLOAD_MAX_BITPOOL : (*codec_info);
+            codec_info += 2;
+            parsed_info->bitpool_size  = *codec_info; // MAX BITPOOL //
 
             if(MULTI_BIT_SET(parsed_info->sampling_freq))
                 status = A2D_BAD_SAMP_FREQ;