system/bt
| Revision | 78120a1a24c91c9d8cde7592f4d3bbfa9abe4b58 (tree) |
|---|---|
| Zeit | 2017-06-20 13:29:43 |
| Autor | Pavlin Radoslavov <pavlin@goog...> |
| Commiter | Pavlin Radoslavov |
Disable 48.0kHz sampling rate for AAC - update the unit test
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: I5a8b72e86fb1a2cbf92f85e7a6c340cee58dadb5
(cherry picked from commit 858b6a15f528468e2b1b497dba27337f40220f7b)
stack/test/stack_a2dp_test.cc (diff)| @@ -89,23 +89,21 @@ const uint8_t codec_info_aac[AVDT_CODEC_SIZE] = { | ||
| 89 | 89 | }; |
| 90 | 90 | |
| 91 | 91 | const uint8_t codec_info_aac_capability[AVDT_CODEC_SIZE] = { |
| 92 | - 8, // Length (A2DP_AAC_INFO_LEN) | |
| 93 | - 0, // Media Type: AVDT_MEDIA_TYPE_AUDIO | |
| 94 | - 2, // Media Codec Type: A2DP_MEDIA_CT_AAC | |
| 95 | - 0x80, // Object Type: A2DP_AAC_OBJECT_TYPE_MPEG2_LC | |
| 96 | - 0x01, // Sampling Frequency: A2DP_AAC_SAMPLING_FREQ_44100 | |
| 97 | - 0x80 | 0x04, // Sampling Frequency: | |
| 98 | - // A2DP_AAC_SAMPLING_FREQ_48000 | | |
| 99 | - // Channels: | |
| 100 | - // A2DP_AAC_CHANNEL_MODE_STEREO | |
| 101 | - 0x00 | 0x4, // Variable Bit Rate: | |
| 102 | - // A2DP_AAC_VARIABLE_BIT_RATE_DISABLED | |
| 103 | - // Bit Rate: 320000 = 0x4e200 | |
| 104 | - 0xe2, // Bit Rate: 320000 = 0x4e200 | |
| 105 | - 0x00, // Bit Rate: 320000 = 0x4e200 | |
| 106 | - 7, // Dummy | |
| 107 | - 8, // Dummy | |
| 108 | - 9 // Dummy | |
| 92 | + 8, // Length (A2DP_AAC_INFO_LEN) | |
| 93 | + 0, // Media Type: AVDT_MEDIA_TYPE_AUDIO | |
| 94 | + 2, // Media Codec Type: A2DP_MEDIA_CT_AAC | |
| 95 | + 0x80, // Object Type: A2DP_AAC_OBJECT_TYPE_MPEG2_LC | |
| 96 | + 0x01, // Sampling Frequency: A2DP_AAC_SAMPLING_FREQ_44100 | |
| 97 | + // TODO: AAC 48.0kHz sampling rate should be added back - see b/62301376 | |
| 98 | + 0x04, // Channels: A2DP_AAC_CHANNEL_MODE_STEREO | |
| 99 | + 0x00 | 0x4, // Variable Bit Rate: | |
| 100 | + // A2DP_AAC_VARIABLE_BIT_RATE_DISABLED | |
| 101 | + // Bit Rate: 320000 = 0x4e200 | |
| 102 | + 0xe2, // Bit Rate: 320000 = 0x4e200 | |
| 103 | + 0x00, // Bit Rate: 320000 = 0x4e200 | |
| 104 | + 7, // Dummy | |
| 105 | + 8, // Dummy | |
| 106 | + 9 // Dummy | |
| 109 | 107 | }; |
| 110 | 108 | |
| 111 | 109 | const uint8_t codec_info_aac_sink_capability[AVDT_CODEC_SIZE] = { |
Fork