mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-04-24 06:02:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

sbc: prefix with btstack

Browse Source
This commit is contained in:
Milanka Ringwald 2016-07-27 10:27:58 +02:00
parent 2afeea7f2e
commit e7a4112819
8 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/classic/btstack_sbc.h
View File

@ -48,7 +48,7 @@
typedef enum{ typedef enum{
SBC_MODE_STANDARD, SBC_MODE_STANDARD,
SBC_MODE_mSBC SBC_MODE_mSBC
} sbc_mode_t; } btstack_sbc_mode_t;
#if defined __cplusplus #if defined __cplusplus
} }

14
src/classic/btstack_sbc_decoder.h
View File

@ -36,12 +36,12 @@
*/ */
/* /*
* sbc_decoder.h * btstack_sbc_decoder.h
* *
*/ */
#ifndef __SBC_DECODER_H #ifndef __BTSTACK_SBC_DECODER_H
#define __SBC_DECODER_H #define __BTSTACK_SBC_DECODER_H
#include <stdint.h> #include <stdint.h>
#include "btstack_sbc.h" #include "btstack_sbc.h"
@ -56,8 +56,8 @@ typedef struct {
void (*handle_pcm_data)(int16_t * data, int num_samples, int num_channels, int sample_rate, void * context); void (*handle_pcm_data)(int16_t * data, int num_samples, int num_channels, int sample_rate, void * context);
// private // private
void * decoder_state; void * decoder_state;
sbc_plc_state_t plc_state; btstack_sbc_plc_state_t plc_state;
sbc_mode_t mode; btstack_sbc_mode_t mode;
// summary of processed good, bad and zero frames // summary of processed good, bad and zero frames
int good_frames_nr; int good_frames_nr;
@ -75,7 +75,7 @@ typedef struct {
* @param context provided in callback * @param context provided in callback
*/ */
void btstack_sbc_decoder_init(btstack_sbc_decoder_state_t * state, sbc_mode_t mode, void (*callback)(int16_t * data, int num_samples, int num_channels, int sample_rate, void * context), void * context); void btstack_sbc_decoder_init(btstack_sbc_decoder_state_t * state, btstack_sbc_mode_t mode, void (*callback)(int16_t * data, int num_samples, int num_channels, int sample_rate, void * context), void * context);
/** /**
* @brief Process received SCO data * @brief Process received SCO data
@ -111,4 +111,4 @@ void btstack_sbc_decoder_test_simulate_corrupt_frames(int period);
} }
#endif #endif
#endif // __SBC_DECODER_H #endif // __BTSTACK_SBC_DECODER_H

12
src/classic/btstack_sbc_decoder_bludroid.c
View File

@ -112,7 +112,7 @@ static int find_sequence_of_zeros(const OI_BYTE *frame_data, OI_UINT32 frame_byt
return 0; return 0;
} }
static int find_h2_syncword(const OI_BYTE *frame_data, OI_UINT32 frame_bytes, sbc_mode_t mode){ static int find_h2_syncword(const OI_BYTE *frame_data, OI_UINT32 frame_bytes, btstack_sbc_mode_t mode){
if (mode != SBC_MODE_mSBC) return -1; if (mode != SBC_MODE_mSBC) return -1;
int syncword = mSBC_SYNCWORD; int syncword = mSBC_SYNCWORD;
uint8_t h2_first_byte = 0; uint8_t h2_first_byte = 0;
@ -159,7 +159,7 @@ void OI_AssertFail(char* file, int line, char* reason){
printf("AssertFail file %s, line %d, reason %s\n", file, line, reason); printf("AssertFail file %s, line %d, reason %s\n", file, line, reason);
} }
void btstack_sbc_decoder_init(btstack_sbc_decoder_state_t * state, sbc_mode_t mode, void (*callback)(int16_t * data, int num_samples, int num_channels, int sample_rate, void * context), void * context){ void btstack_sbc_decoder_init(btstack_sbc_decoder_state_t * state, btstack_sbc_mode_t mode, void (*callback)(int16_t * data, int num_samples, int num_channels, int sample_rate, void * context), void * context){
if (sbc_state_singelton && sbc_state_singelton != state ){ if (sbc_state_singelton && sbc_state_singelton != state ){
log_error("SBC decoder: different sbc decoder state is allready registered"); log_error("SBC decoder: different sbc decoder state is allready registered");
} }
@ -194,7 +194,7 @@ void btstack_sbc_decoder_init(btstack_sbc_decoder_state_t * state, sbc_mode_t mo
state->mode = mode; state->mode = mode;
state->context = context; state->context = context;
state->decoder_state = &bd_state; state->decoder_state = &bd_state;
sbc_plc_init(&state->plc_state); btstack_sbc_plc_init(&state->plc_state);
} }
static void append_received_sbc_data(bludroid_decoder_state_t * state, uint8_t * buffer, int size){ static void append_received_sbc_data(bludroid_decoder_state_t * state, uint8_t * buffer, int size){
@ -292,7 +292,7 @@ void btstack_sbc_decoder_process_data(btstack_sbc_decoder_state_t * state, int p
bd_decoder_state->sync_word_found = 0; bd_decoder_state->sync_word_found = 0;
} }
sbc_plc_good_frame(&state->plc_state, bd_decoder_state->pcm_plc_data, bd_decoder_state->pcm_data); btstack_sbc_plc_good_frame(&state->plc_state, bd_decoder_state->pcm_plc_data, bd_decoder_state->pcm_data);
state->handle_pcm_data(bd_decoder_state->pcm_data, state->handle_pcm_data(bd_decoder_state->pcm_data,
btstack_sbc_decoder_num_samples_per_frame(state), btstack_sbc_decoder_num_samples_per_frame(state),
btstack_sbc_decoder_num_channels(state), btstack_sbc_decoder_num_channels(state),
@ -336,7 +336,7 @@ void btstack_sbc_decoder_process_data(btstack_sbc_decoder_state_t * state, int p
#endif #endif
if (!plc_enabled) break; if (!plc_enabled) break;
frame_data = sbc_plc_zero_signal_frame(); frame_data = btstack_sbc_plc_zero_signal_frame();
OI_UINT32 bytes_in_frame_buffer = msbc_frame_size; OI_UINT32 bytes_in_frame_buffer = msbc_frame_size;
status = OI_CODEC_SBC_DecodeFrame(&(bd_decoder_state->decoder_context), status = OI_CODEC_SBC_DecodeFrame(&(bd_decoder_state->decoder_context),
@ -347,7 +347,7 @@ void btstack_sbc_decoder_process_data(btstack_sbc_decoder_state_t * state, int p
// printf("after bad frame, new status: %d, bytes in frame %d\n", status, bytes_in_frame_buffer); // printf("after bad frame, new status: %d, bytes in frame %d\n", status, bytes_in_frame_buffer);
if (status != 0) exit(10); if (status != 0) exit(10);
sbc_plc_bad_frame(&state->plc_state, bd_decoder_state->pcm_plc_data, bd_decoder_state->pcm_data); btstack_sbc_plc_bad_frame(&state->plc_state, bd_decoder_state->pcm_plc_data, bd_decoder_state->pcm_data);
state->handle_pcm_data(bd_decoder_state->pcm_data, state->handle_pcm_data(bd_decoder_state->pcm_data,
btstack_sbc_decoder_num_samples_per_frame(state), btstack_sbc_decoder_num_samples_per_frame(state),
btstack_sbc_decoder_num_channels(state), btstack_sbc_decoder_num_channels(state),

4
src/classic/btstack_sbc_encoder.h
View File

@ -53,10 +53,10 @@ extern "C" {
typedef struct { typedef struct {
// private // private
void * encoder_state; void * encoder_state;
sbc_mode_t mode; btstack_sbc_mode_t mode;
} btstack_sbc_encoder_state_t; } btstack_sbc_encoder_state_t;
void btstack_sbc_encoder_init(btstack_sbc_encoder_state_t * state, sbc_mode_t mode, 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 blocks, int subbands, int allmethod, int sample_rate, int bitpool);
void btstack_sbc_encoder_process_data(int16_t * input_buffer); void btstack_sbc_encoder_process_data(int16_t * input_buffer);

2
src/classic/btstack_sbc_encoder_bludroid.c
View File

@ -110,7 +110,7 @@ uint16_t btstack_sbc_encoder_sbc_buffer_length(void){
} }
void btstack_sbc_encoder_init(btstack_sbc_encoder_state_t * state, sbc_mode_t mode, 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 blocks, int subbands, int allmethod, int sample_rate, int bitpool){
if (sbc_state_singelton && sbc_state_singelton != state ){ if (sbc_state_singelton && sbc_state_singelton != state ){

10
src/classic/btstack_sbc_plc.c
View File

@ -36,7 +36,7 @@
*/ */
/* /*
* sbc_plc.c * btstack_sbc_plc.c
* *
*/ */
@ -67,11 +67,11 @@ static float CrossCorrelation(int16_t *x, int16_t *y);
static int PatternMatch(int16_t *y); static int PatternMatch(int16_t *y);
static float AmplitudeMatch(int16_t *y, int16_t bestmatch); static float AmplitudeMatch(int16_t *y, int16_t bestmatch);
uint8_t * sbc_plc_zero_signal_frame(void){ uint8_t * btstack_sbc_plc_zero_signal_frame(void){
return (uint8_t *)&indices0; return (uint8_t *)&indices0;
} }
void sbc_plc_init(sbc_plc_state_t *plc_state){ void btstack_sbc_plc_init(btstack_sbc_plc_state_t *plc_state){
int i; int i;
plc_state->nbf=0; plc_state->nbf=0;
plc_state->bestlag=0; plc_state->bestlag=0;
@ -81,7 +81,7 @@ void sbc_plc_init(sbc_plc_state_t *plc_state){
} }
void sbc_plc_bad_frame(sbc_plc_state_t *plc_state, int16_t *ZIRbuf, int16_t *out){ void btstack_sbc_plc_bad_frame(btstack_sbc_plc_state_t *plc_state, int16_t *ZIRbuf, int16_t *out){
int i; int i;
float val; float val;
float sf; float sf;
@ -133,7 +133,7 @@ void sbc_plc_bad_frame(sbc_plc_state_t *plc_state, int16_t *ZIRbuf, int16_t *out
} }
void sbc_plc_good_frame(sbc_plc_state_t *plc_state, int16_t *in, int16_t *out){ void btstack_sbc_plc_good_frame(btstack_sbc_plc_state_t *plc_state, int16_t *in, int16_t *out){
int i; int i;
i=0; i=0;
if (plc_state->nbf>0){ if (plc_state->nbf>0){

20
src/classic/btstack_sbc_plc.h
View File

@ -36,12 +36,12 @@
*/ */
/* /*
* sbc_plc.h * btstack_sbc_plc.h
* *
*/ */
#ifndef __SBC_PLC_H #ifndef __BTSTACK_SBC_PLC_H
#define __SBC_PLC_H #define __BTSTACK_SBC_PLC_H
#include <stdint.h> #include <stdint.h>
@ -61,15 +61,15 @@ typedef struct sbc_plc_state {
int16_t hist[LHIST+FS+SBCRT+OLAL]; int16_t hist[LHIST+FS+SBCRT+OLAL];
int16_t bestlag; int16_t bestlag;
int nbf; int nbf;
} sbc_plc_state_t; } btstack_sbc_plc_state_t;
void btstack_sbc_plc_init(btstack_sbc_plc_state_t *plc_state);
void btstack_sbc_plc_bad_frame(btstack_sbc_plc_state_t *plc_state, int16_t *ZIRbuf, int16_t *out);
void btstack_sbc_plc_good_frame(btstack_sbc_plc_state_t *plc_state, int16_t *in, int16_t *out);
uint8_t * btstack_sbc_plc_zero_signal_frame(void);
#if defined __cplusplus #if defined __cplusplus
} }
#endif #endif
void sbc_plc_init(sbc_plc_state_t *plc_state); #endif // __BTSTACK_SBC_PLC_H
void sbc_plc_bad_frame(sbc_plc_state_t *plc_state, int16_t *ZIRbuf, int16_t *out);
void sbc_plc_good_frame(sbc_plc_state_t *plc_state, int16_t *in, int16_t *out);
uint8_t * sbc_plc_zero_signal_frame(void);
#endif // __SBC_PLC_H

2
test/sbc/sbc_decoder_test.c
View File

@ -141,7 +141,7 @@ int main (int argc, const char * argv[]){
return -1; return -1;
} }
sbc_mode_t mode = SBC_MODE_STANDARD; btstack_sbc_mode_t mode = SBC_MODE_STANDARD;
const char * filename = argv[1]; const char * filename = argv[1];