From: Pavlin Radoslavov <pavlin@google.com>
Date: Fri, 2 Jun 2017 17:45:43 +0000 (-0700)
Subject: Disable 48.0kHz sampling rate for AAC
X-Git-Tag: android-x86-9.0-r1~266^2^2^2~29^2~51
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3d268331ae32bd70f60984c9553db1c961073c42;p=android-x86%2Fsystem-bt.git

Disable 48.0kHz sampling rate for AAC

Some carkits have issues playing A2DP audio using AAC with 48.0kHz
sampling rate, while playing AAC with 44.1kHz sampling rate is fine.

Bug: 38443632
Bug: 62301376
Test: manual
Change-Id: I50de2db1d5386d41bfe361fbac99fc7ebbbd3640
---

diff --git a/stack/a2dp/a2dp_aac.cc b/stack/a2dp/a2dp_aac.cc
index 8fc803497..ce5431b3e 100644
--- a/stack/a2dp/a2dp_aac.cc
+++ b/stack/a2dp/a2dp_aac.cc
@@ -54,7 +54,8 @@ static const tA2DP_AAC_CIE a2dp_aac_caps = {
     // objectType
     A2DP_AAC_OBJECT_TYPE_MPEG2_LC,
     // sampleRate
-    (A2DP_AAC_SAMPLING_FREQ_44100 | A2DP_AAC_SAMPLING_FREQ_48000),
+    // TODO: AAC 48.0kHz sampling rate should be added back - see b/62301376
+    A2DP_AAC_SAMPLING_FREQ_44100,
     // channelMode
     A2DP_AAC_CHANNEL_MODE_STEREO,
     // variableBitRateSupport