diff options
| -rw-r--r-- | audio/pcm_bluetooth.c | 13 | ||||
| -rw-r--r-- | sbc/sbc.c | 28 | ||||
| -rw-r--r-- | sbc/sbc.h | 12 |
3 files changed, 22 insertions, 31 deletions
diff --git a/audio/pcm_bluetooth.c b/audio/pcm_bluetooth.c index f973e212f..00b950636 100644 --- a/audio/pcm_bluetooth.c +++ b/audio/pcm_bluetooth.c @@ -146,7 +146,7 @@ struct bluetooth_data { static int audioservice_send(int sk, const bt_audio_msg_header_t *msg); static int audioservice_expect(int sk, bt_audio_msg_header_t *outmsg, - int expected_type); + int expected_type); static int bluetooth_start(snd_pcm_ioplug_t *io) { @@ -522,7 +522,7 @@ static uint8_t default_bitpool(uint8_t freq, uint8_t mode) } static int bluetooth_a2dp_init(struct bluetooth_data *data, - snd_pcm_hw_params_t *params) + snd_pcm_hw_params_t *params) { struct bluetooth_alsa_config *cfg = &data->alsa_config; sbc_capabilities_t *cap = &data->a2dp.sbc_capabilities; @@ -958,8 +958,7 @@ done: static snd_pcm_sframes_t bluetooth_a2dp_read(snd_pcm_ioplug_t *io, const snd_pcm_channel_area_t *areas, - snd_pcm_uframes_t offset, - snd_pcm_uframes_t size) + snd_pcm_uframes_t offset, snd_pcm_uframes_t size) { snd_pcm_uframes_t ret = 0; return ret; @@ -1585,7 +1584,7 @@ static int audioservice_recv(int sk, bt_audio_msg_header_t *inmsg) } static int audioservice_expect(int sk, bt_audio_msg_header_t *rsp, - int expected_name) + int expected_name) { bt_audio_error_t *error; int err = audioservice_recv(sk, rsp); @@ -1641,8 +1640,8 @@ static int bluetooth_parse_capabilities(struct bluetooth_data *data, return 0; } -static int bluetooth_init(struct bluetooth_data *data, snd_pcm_stream_t stream, - snd_config_t *conf) +static int bluetooth_init(struct bluetooth_data *data, + snd_pcm_stream_t stream, snd_config_t *conf) { int sk, err; struct bluetooth_alsa_config *alsa_conf = &data->alsa_config; @@ -360,7 +360,7 @@ static void sbc_calculate_bits(const struct sbc_frame *frame, int (*bits)[8]) * -4 Bitpool value out of bounds */ static int sbc_unpack_frame(const uint8_t *data, struct sbc_frame *frame, - size_t len) + size_t len) { unsigned int consumed; /* Will copy the parts of the header that are relevant to crc @@ -522,7 +522,7 @@ static int sbc_unpack_frame(const uint8_t *data, struct sbc_frame *frame, } static void sbc_decoder_init(struct sbc_decoder_state *state, - const struct sbc_frame *frame) + const struct sbc_frame *frame) { int i, ch; @@ -623,7 +623,7 @@ static inline void sbc_synthesize_eight(struct sbc_decoder_state *state, } static int sbc_synthesize_audio(struct sbc_decoder_state *state, - struct sbc_frame *frame) + struct sbc_frame *frame) { int ch, blk; @@ -648,7 +648,7 @@ static int sbc_synthesize_audio(struct sbc_decoder_state *state, } static int sbc_analyze_audio(struct sbc_encoder_state *state, - struct sbc_frame *frame) + struct sbc_frame *frame) { int ch, blk; int16_t *x; @@ -732,9 +732,9 @@ static int sbc_analyze_audio(struct sbc_encoder_state *state, * -99 not implemented */ -static SBC_ALWAYS_INLINE int sbc_pack_frame_internal( - uint8_t *data, struct sbc_frame *frame, size_t len, - int frame_subbands, int frame_channels) +static SBC_ALWAYS_INLINE int sbc_pack_frame_internal(uint8_t *data, + struct sbc_frame *frame, size_t len, + int frame_subbands, int frame_channels) { /* Bitstream writer starts from the fourth byte */ uint8_t *data_ptr = data + 4; @@ -921,7 +921,7 @@ static int sbc_pack_frame(uint8_t *data, struct sbc_frame *frame, size_t len) } static void sbc_encoder_init(struct sbc_encoder_state *state, - const struct sbc_frame *frame) + const struct sbc_frame *frame) { memset(&state->X, 0, sizeof(state->X)); state->position = (SBC_X_BUFFER_SIZE - frame->subbands * 9) & ~7; @@ -978,10 +978,8 @@ ssize_t sbc_parse(sbc_t *sbc, const void *input, size_t input_len) return sbc_decode(sbc, input, input_len, NULL, 0, NULL); } -ssize_t sbc_decode(sbc_t *sbc, - const void *input, size_t input_len, - void *output, size_t output_len, - size_t *written) +ssize_t sbc_decode(sbc_t *sbc, const void *input, size_t input_len, + void *output, size_t output_len, size_t *written) { struct sbc_priv *priv; char *ptr; @@ -1046,10 +1044,8 @@ ssize_t sbc_decode(sbc_t *sbc, return framelen; } -ssize_t sbc_encode(sbc_t *sbc, - const void *input, size_t input_len, - void *output, size_t output_len, - size_t *written) +ssize_t sbc_encode(sbc_t *sbc, const void *input, size_t input_len, + void *output, size_t output_len, size_t *written) { struct sbc_priv *priv; int framelen, samples; @@ -86,16 +86,12 @@ int sbc_reinit(sbc_t *sbc, unsigned long flags); ssize_t sbc_parse(sbc_t *sbc, const void *input, size_t input_len); /* Decodes ONE input block into ONE output block */ -ssize_t sbc_decode(sbc_t *sbc, - const void *input, size_t input_len, - void *output, size_t output_len, - size_t *written); +ssize_t sbc_decode(sbc_t *sbc, const void *input, size_t input_len, + void *output, size_t output_len, size_t *written); /* Encodes ONE input block into ONE output block */ -ssize_t sbc_encode(sbc_t *sbc, - const void *input, size_t input_len, - void *output, size_t output_len, - size_t *written); +ssize_t sbc_encode(sbc_t *sbc, const void *input, size_t input_len, + void *output, size_t output_len, size_t *written); /* Returns the output block size in bytes */ size_t sbc_get_frame_length(sbc_t *sbc); |