diff options
| author | Pali Rohár <pali.rohar@gmail.com> | 2018-12-23 11:40:14 +0100 |
|---|---|---|
| committer | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2018-12-28 15:09:41 -0300 |
| commit | 0934bdf8c193a8a8cef41ef39738cfccfc2a0aca (patch) | |
| tree | d19c84c3ac07b910b9cdf5c60edf4cb96a05fea2 | |
| parent | 19d0011c5a502675ba317e5c926017501b15361a (diff) | |
| download | bluez-0934bdf8c193a8a8cef41ef39738cfccfc2a0aca.tar.gz | |
a2dp-codecs: Add SBC prefix for MIN/MAX_BITPOOL constants
Those two constants are SBC codec specific.
| -rw-r--r-- | android/hal-audio-sbc.c | 12 | ||||
| -rw-r--r-- | profiles/audio/a2dp-codecs.h | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/android/hal-audio-sbc.c b/android/hal-audio-sbc.c index 9da9575f5..80e271ed6 100644 --- a/android/hal-audio-sbc.c +++ b/android/hal-audio-sbc.c @@ -91,8 +91,8 @@ static const a2dp_sbc_t sbc_presets[] = { SBC_ALLOCATION_LOUDNESS, .block_length = SBC_BLOCK_LENGTH_4 | SBC_BLOCK_LENGTH_8 | SBC_BLOCK_LENGTH_12 | SBC_BLOCK_LENGTH_16, - .min_bitpool = MIN_BITPOOL, - .max_bitpool = MAX_BITPOOL + .min_bitpool = SBC_MIN_BITPOOL, + .max_bitpool = SBC_MAX_BITPOOL }, { .frequency = SBC_SAMPLING_FREQ_44100, @@ -100,8 +100,8 @@ static const a2dp_sbc_t sbc_presets[] = { .subbands = SBC_SUBBANDS_8, .allocation_method = SBC_ALLOCATION_LOUDNESS, .block_length = SBC_BLOCK_LENGTH_16, - .min_bitpool = MIN_BITPOOL, - .max_bitpool = MAX_BITPOOL + .min_bitpool = SBC_MIN_BITPOOL, + .max_bitpool = SBC_MAX_BITPOOL }, { .frequency = SBC_SAMPLING_FREQ_48000, @@ -109,8 +109,8 @@ static const a2dp_sbc_t sbc_presets[] = { .subbands = SBC_SUBBANDS_8, .allocation_method = SBC_ALLOCATION_LOUDNESS, .block_length = SBC_BLOCK_LENGTH_16, - .min_bitpool = MIN_BITPOOL, - .max_bitpool = MAX_BITPOOL + .min_bitpool = SBC_MIN_BITPOOL, + .max_bitpool = SBC_MAX_BITPOOL }, }; diff --git a/profiles/audio/a2dp-codecs.h b/profiles/audio/a2dp-codecs.h index 4fb5c0cc9..205491939 100644 --- a/profiles/audio/a2dp-codecs.h +++ b/profiles/audio/a2dp-codecs.h @@ -49,8 +49,8 @@ #define SBC_ALLOCATION_SNR (1 << 1) #define SBC_ALLOCATION_LOUDNESS 1 -#define MAX_BITPOOL 64 -#define MIN_BITPOOL 2 +#define SBC_MAX_BITPOOL 64 +#define SBC_MIN_BITPOOL 2 #define MPEG_CHANNEL_MODE_MONO (1 << 3) #define MPEG_CHANNEL_MODE_DUAL_CHANNEL (1 << 2) |