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

Commit 5153b3f9 authored May 04, 2017 by Treehugger Robot Committed by Gerrit Code Review May 04, 2017

Merge "Remove 96.0 and 88.2 kHz sample rate from A2DP AAC capability"

parents 41c815ad e107473a

system/stack/a2dp/a2dp_aac.cc

+1 −2

Original line number	Diff line number	Diff line
		@@ -54,8 +54,7 @@ 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 \|
		A2DP_AAC_SAMPLING_FREQ_88200 \| A2DP_AAC_SAMPLING_FREQ_96000),
		(A2DP_AAC_SAMPLING_FREQ_44100 \| A2DP_AAC_SAMPLING_FREQ_48000),
		// channelMode
		A2DP_AAC_CHANNEL_MODE_STEREO,
		// variableBitRateSupport

system/stack/test/stack_a2dp_test.cc

+17 −19

Original line number	Diff line number	Diff line
		@@ -94,10 +94,8 @@ const uint8_t codec_info_aac_capability[AVDT_CODEC_SIZE] = {
		2, // Media Codec Type: A2DP_MEDIA_CT_AAC
		0x80, // Object Type: A2DP_AAC_OBJECT_TYPE_MPEG2_LC
		0x01, // Sampling Frequency: A2DP_AAC_SAMPLING_FREQ_44100
		0x80 \| 0x20 \| 0x10 \| 0x04, // Sampling Frequency:
		0x80 \| 0x04, // Sampling Frequency:
		// A2DP_AAC_SAMPLING_FREQ_48000 \|
		// A2DP_AAC_SAMPLING_FREQ_88200 \|
		// A2DP_AAC_SAMPLING_FREQ_96000 \|
		// Channels:
		// A2DP_AAC_CHANNEL_MODE_STEREO
		0x00 \| 0x4, // Variable Bit Rate: