mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-02-20 18:40:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

sbc: split btstack_sbc_bludroid.c into seperate encoder and decoder implementation

Browse Source
This commit is contained in:
Matthias Ringwald 2017-11-29 17:13:17 +01:00
parent 1fbd72c577
commit c37cd8f3d1
9 changed files with 170 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
example/Makefile.inc
View File

@ -83,10 +83,10 @@ include ${BTSTACK_ROOT}/3rd-party/bluedroid/encoder/Makefile.inc
SBC_DECODER += \
btstack_sbc_plc.c \
btstack_sbc_bludroid.c \
btstack_sbc_decoder_bluedroid.c \
SBC_ENCODER += \
btstack_sbc_bludroid.c \
btstack_sbc_encoder_bluedroid.c \
hfp_msbc.c \
CVSD_PLC = \

4
port/libusb/Makefile
View File

@ -22,8 +22,8 @@ CFLAGS += $(shell pkg-config libusb-1.0 --cflags)
LDFLAGS += $(shell pkg-config libusb-1.0 --libs)
# use pkg-config for portaudio
# CFLAGS += $(shell pkg-config portaudio-2.0 --cflags) -DHAVE_PORTAUDIO
# LDFLAGS += $(shell pkg-config portaudio-2.0 --libs)
CFLAGS += $(shell pkg-config portaudio-2.0 --cflags) -DHAVE_PORTAUDIO
LDFLAGS += $(shell pkg-config portaudio-2.0 --libs)
# hard coded flags for portaudio in /usr/local/lib
# CFLAGS += -I/usr/local/include -DHAVE_PORTAUDIO

4
port/max32630-fthr/example/template/Makefile
View File

@ -190,10 +190,10 @@ include ${BTSTACK_ROOT}/3rd-party/bluedroid/encoder/Makefile.inc
SBC_DECODER += \
btstack_sbc_plc.c \
btstack_sbc_bludroid.c \
btstack_sbc_decoder_bluedroid.c \
SBC_ENCODER += \
btstack_sbc_bludroid.c \
btstack_sbc_encoder_bluedroid.c \
hfp_msbc.c \
HXCMOD_PLAYER = \

120
src/classic/btstack_sbc_bludroid.c → src/classic/btstack_sbc_decoder_bluedroid.c
View File

@ -35,11 +35,11 @@
*
*/
#define __BTSTACK_FILE__ "btstack_sbc_bludroid.c"
#define __BTSTACK_FILE__ "btstack_sbc_decoder_bluedroid.c"
// *****************************************************************************
//
// SBC decoder and encoder based on Bludroid library
// SBC decoder based on Bluedroid library
//
// *****************************************************************************
@ -55,7 +55,6 @@
#include "oi_codec_sbc.h"
#include "oi_assert.h"
#include "sbc_encoder.h"
#include "btstack.h"
#define mSBC_SYNCWORD 0xad
@ -63,8 +62,6 @@
#define SBC_MAX_CHANNELS 2
// #define LOG_FRAME_STATUS
// *****************************************************************************
// SBC decoder start
#define DECODER_DATA_SIZE (SBC_MAX_CHANNELS*SBC_MAX_BLOCKS*SBC_MAX_BANDS * 4 + SBC_CODEC_MIN_FILTER_BUFFERS*SBC_MAX_BANDS*SBC_MAX_CHANNELS * 2)
typedef struct {
@ -90,33 +87,6 @@ static int plc_enabled = 1;
static int corrupt_frame_period = -1;
// Testing - STOP
// SBC decoder end
// *****************************************************************************
// *****************************************************************************
// SBC encoder start
typedef struct {
SBC_ENC_PARAMS context;
int num_data_bytes;
uint8_t sbc_packet[1000];
} bludroid_encoder_state_t;
static btstack_sbc_encoder_state_t * sbc_encoder_state_singleton = NULL;
static bludroid_encoder_state_t bd_encoder_state;
// SBC encoder start
// *****************************************************************************
// *****************************************************************************
//
// SBC decoder based on Bludroid library
//
// *****************************************************************************
void btstack_sbc_decoder_test_disable_plc(void){
plc_enabled = 0;
}
@ -496,89 +466,3 @@ void btstack_sbc_decoder_process_data(btstack_sbc_decoder_state_t * state, int p
btstack_sbc_decoder_process_sbc_data(state, packet_status_flag, buffer, size);
}
}
// *****************************************************************************
//
// SBC encoder based on Bludroid library
//
// *****************************************************************************
void btstack_sbc_encoder_init(btstack_sbc_encoder_state_t * state, btstack_sbc_mode_t mode,
int blocks, int subbands, int allmethod, int sample_rate, int bitpool, int channel_mode){
if (sbc_encoder_state_singleton && sbc_encoder_state_singleton != state ){
log_error("SBC encoder: different sbc decoder state is allready registered");
}
sbc_encoder_state_singleton = state;
if (!sbc_encoder_state_singleton){
log_error("SBC encoder init: sbc state is NULL");
}
sbc_encoder_state_singleton->mode = mode;
switch (sbc_encoder_state_singleton->mode){
case SBC_MODE_STANDARD:
bd_encoder_state.context.s16NumOfBlocks = blocks;
bd_encoder_state.context.s16NumOfSubBands = subbands;
bd_encoder_state.context.s16AllocationMethod = allmethod;
bd_encoder_state.context.s16BitPool = bitpool;
bd_encoder_state.context.mSBCEnabled = 0;
bd_encoder_state.context.s16ChannelMode = channel_mode;
bd_encoder_state.context.s16NumOfChannels = 2;
if (bd_encoder_state.context.s16ChannelMode == SBC_MONO){
bd_encoder_state.context.s16NumOfChannels = 1;
}
switch(sample_rate){
case 16000: bd_encoder_state.context.s16SamplingFreq = SBC_sf16000; break;
case 32000: bd_encoder_state.context.s16SamplingFreq = SBC_sf32000; break;
case 44100: bd_encoder_state.context.s16SamplingFreq = SBC_sf44100; break;
case 48000: bd_encoder_state.context.s16SamplingFreq = SBC_sf48000; break;
default: bd_encoder_state.context.s16SamplingFreq = 0; break;
}
break;
case SBC_MODE_mSBC:
bd_encoder_state.context.s16NumOfBlocks = 15;
bd_encoder_state.context.s16NumOfSubBands = 8;
bd_encoder_state.context.s16AllocationMethod = SBC_LOUDNESS;
bd_encoder_state.context.s16BitPool = 26;
bd_encoder_state.context.s16ChannelMode = SBC_MONO;
bd_encoder_state.context.s16NumOfChannels = 1;
bd_encoder_state.context.mSBCEnabled = 1;
bd_encoder_state.context.s16SamplingFreq = SBC_sf16000;
break;
}
bd_encoder_state.context.pu8Packet = bd_encoder_state.sbc_packet;
sbc_encoder_state_singleton->encoder_state = &bd_encoder_state;
SBC_ENC_PARAMS * context = &((bludroid_encoder_state_t *)sbc_encoder_state_singleton->encoder_state)->context;
SBC_Encoder_Init(context);
}
void btstack_sbc_encoder_process_data(int16_t * input_buffer){
if (!sbc_encoder_state_singleton){
log_error("SBC encoder: sbc state is NULL, call btstack_sbc_encoder_init to initialize it");
}
SBC_ENC_PARAMS * context = &((bludroid_encoder_state_t *)sbc_encoder_state_singleton->encoder_state)->context;
context->ps16PcmBuffer = input_buffer;
if (context->mSBCEnabled){
context->pu8Packet[0] = 0xad;
}
SBC_Encoder(context);
}
int btstack_sbc_encoder_num_audio_frames(void){
SBC_ENC_PARAMS * context = &((bludroid_encoder_state_t *)sbc_encoder_state_singleton->encoder_state)->context;
return context->s16NumOfSubBands * context->s16NumOfBlocks;
}
uint8_t * btstack_sbc_encoder_sbc_buffer(void){
SBC_ENC_PARAMS * context = &((bludroid_encoder_state_t *)sbc_encoder_state_singleton->encoder_state)->context;
return context->pu8Packet;
}
uint16_t btstack_sbc_encoder_sbc_buffer_length(void){
SBC_ENC_PARAMS * context = &((bludroid_encoder_state_t *)sbc_encoder_state_singleton->encoder_state)->context;
return context->u16PacketLength;
}

154
src/classic/btstack_sbc_encoder_bluedroid.c Normal file
View File

@ -0,0 +1,154 @@
/*
* Copyright (C) 2014 BlueKitchen GmbH
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. Neither the name of the copyright holders nor the names of
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
* 4. Any redistribution, use, or modification is done solely for
* personal benefit and not for any commercial purpose or for
* monetary gain.
*
* THIS SOFTWARE IS PROVIDED BY BLUEKITCHEN GMBH AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL MATTHIAS
* RINGWALD OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
* THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* Please inquire about commercial licensing options at
* contact@bluekitchen-gmbh.com
*
*/
#define __BTSTACK_FILE__ "btstack_sbc_bludroid.c"
// *****************************************************************************
//
// SBC encoder based on Bluedroid library
//
// *****************************************************************************
#include "btstack_config.h"
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "btstack_sbc.h"
#include "btstack_sbc_plc.h"
#include "sbc_encoder.h"
#include "btstack.h"
#define mSBC_SYNCWORD 0xad
#define SBC_SYNCWORD 0x9c
#define SBC_MAX_CHANNELS 2
// #define LOG_FRAME_STATUS
typedef struct {
SBC_ENC_PARAMS context;
int num_data_bytes;
uint8_t sbc_packet[1000];
} bludroid_encoder_state_t;
static btstack_sbc_encoder_state_t * sbc_encoder_state_singleton = NULL;
static bludroid_encoder_state_t bd_encoder_state;
void btstack_sbc_encoder_init(btstack_sbc_encoder_state_t * state, btstack_sbc_mode_t mode,
int blocks, int subbands, int allmethod, int sample_rate, int bitpool, int channel_mode){
if (sbc_encoder_state_singleton && sbc_encoder_state_singleton != state ){
log_error("SBC encoder: different sbc decoder state is allready registered");
}
sbc_encoder_state_singleton = state;
if (!sbc_encoder_state_singleton){
log_error("SBC encoder init: sbc state is NULL");
}
sbc_encoder_state_singleton->mode = mode;
switch (sbc_encoder_state_singleton->mode){
case SBC_MODE_STANDARD:
bd_encoder_state.context.s16NumOfBlocks = blocks;
bd_encoder_state.context.s16NumOfSubBands = subbands;
bd_encoder_state.context.s16AllocationMethod = allmethod;
bd_encoder_state.context.s16BitPool = bitpool;
bd_encoder_state.context.mSBCEnabled = 0;
bd_encoder_state.context.s16ChannelMode = channel_mode;
bd_encoder_state.context.s16NumOfChannels = 2;
if (bd_encoder_state.context.s16ChannelMode == SBC_MONO){
bd_encoder_state.context.s16NumOfChannels = 1;
}
switch(sample_rate){
case 16000: bd_encoder_state.context.s16SamplingFreq = SBC_sf16000; break;
case 32000: bd_encoder_state.context.s16SamplingFreq = SBC_sf32000; break;
case 44100: bd_encoder_state.context.s16SamplingFreq = SBC_sf44100; break;
case 48000: bd_encoder_state.context.s16SamplingFreq = SBC_sf48000; break;
default: bd_encoder_state.context.s16SamplingFreq = 0; break;
}
break;
case SBC_MODE_mSBC:
bd_encoder_state.context.s16NumOfBlocks = 15;
bd_encoder_state.context.s16NumOfSubBands = 8;
bd_encoder_state.context.s16AllocationMethod = SBC_LOUDNESS;
bd_encoder_state.context.s16BitPool = 26;
bd_encoder_state.context.s16ChannelMode = SBC_MONO;
bd_encoder_state.context.s16NumOfChannels = 1;
bd_encoder_state.context.mSBCEnabled = 1;
bd_encoder_state.context.s16SamplingFreq = SBC_sf16000;
break;
}
bd_encoder_state.context.pu8Packet = bd_encoder_state.sbc_packet;
sbc_encoder_state_singleton->encoder_state = &bd_encoder_state;
SBC_ENC_PARAMS * context = &((bludroid_encoder_state_t *)sbc_encoder_state_singleton->encoder_state)->context;
SBC_Encoder_Init(context);
}
void btstack_sbc_encoder_process_data(int16_t * input_buffer){
if (!sbc_encoder_state_singleton){
log_error("SBC encoder: sbc state is NULL, call btstack_sbc_encoder_init to initialize it");
}
SBC_ENC_PARAMS * context = &((bludroid_encoder_state_t *)sbc_encoder_state_singleton->encoder_state)->context;
context->ps16PcmBuffer = input_buffer;
if (context->mSBCEnabled){
context->pu8Packet[0] = 0xad;
}
SBC_Encoder(context);
}
int btstack_sbc_encoder_num_audio_frames(void){
SBC_ENC_PARAMS * context = &((bludroid_encoder_state_t *)sbc_encoder_state_singleton->encoder_state)->context;
return context->s16NumOfSubBands * context->s16NumOfBlocks;
}
uint8_t * btstack_sbc_encoder_sbc_buffer(void){
SBC_ENC_PARAMS * context = &((bludroid_encoder_state_t *)sbc_encoder_state_singleton->encoder_state)->context;
return context->pu8Packet;
}
uint16_t btstack_sbc_encoder_sbc_buffer_length(void){
SBC_ENC_PARAMS * context = &((bludroid_encoder_state_t *)sbc_encoder_state_singleton->encoder_state)->context;
return context->u16PacketLength;
}

4
test/avdtp/Makefile
View File

@ -63,10 +63,10 @@ LDFLAGS += $(shell pkg-config portaudio-2.0 --libs)
SBC_DECODER += \
${BTSTACK_ROOT}/src/classic/btstack_sbc_plc.c \
${BTSTACK_ROOT}/src/classic/btstack_sbc_bludroid.c \
${BTSTACK_ROOT}/src/classic/btstack_sbc_decoder_bluedroid.c \
SBC_ENCODER += \
${BTSTACK_ROOT}/src/classic/btstack_sbc_bludroid.c \
${BTSTACK_ROOT}/src/classic/btstack_sbc_encoder_bluedroid.c \
${BTSTACK_ROOT}/src/classic/hfp_msbc.c \
AVDTP += \

4
test/avrcp/Makefile
View File

@ -58,10 +58,10 @@ LDFLAGS += $(shell pkg-config portaudio-2.0 --libs)
SBC_DECODER += \
${BTSTACK_ROOT}/src/classic/btstack_sbc_plc.c \
${BTSTACK_ROOT}/src/classic/btstack_sbc_bludroid.c \
${BTSTACK_ROOT}/src/classic/btstack_sbc_decoder_bluedroid.c \
SBC_ENCODER += \
${BTSTACK_ROOT}/src/classic/btstack_sbc_bludroid.c \
${BTSTACK_ROOT}/src/classic/btstack_sbc_encoder_bluedroid.c \
${BTSTACK_ROOT}/src/classic/hfp_msbc.c \
AVRCP += \

4
test/pts/Makefile
View File

@ -31,10 +31,10 @@ COMMON += \
SBC_DECODER += \
${BTSTACK_ROOT}/src/classic/btstack_sbc_plc.c \
${BTSTACK_ROOT}/src/classic/btstack_sbc_bludroid.c \
${BTSTACK_ROOT}/src/classic/btstack_sbc_decoder_bluedroid.c \
SBC_ENCODER += \
${BTSTACK_ROOT}/src/classic/btstack_sbc_bludroid.c \
${BTSTACK_ROOT}/src/classic/btstack_sbc_encoder_bluedroid.c \
${BTSTACK_ROOT}/src/classic/hfp_msbc.c \
AVDTP += \

4
test/sbc/Makefile
View File

@ -9,10 +9,10 @@ include ${SBC_ENCODER_ROOT}/Makefile.inc
SBC_DECODER += \
${BTSTACK_ROOT}/src/classic/btstack_sbc_plc.c \
${BTSTACK_ROOT}/src/classic/btstack_sbc_bludroid.c \
${BTSTACK_ROOT}/src/classic/btstack_sbc_decoder_bluedroid.c \
SBC_ENCODER += \
${BTSTACK_ROOT}/src/classic/btstack_sbc_bludroid.c \
${BTSTACK_ROOT}/src/classic/btstack_sbc_encoder_bluedroid.c \
${BTSTACK_ROOT}/src/classic/hfp_msbc.c \
SBC_DECODER_OBJ = $(SBC_DECODER:.c=.o)