example/sco_demo_util: use new sbc encoder api

This commit is contained in:
Matthias Ringwald 2023-11-17 12:20:00 +01:00
parent 37abe28001
commit e1d1fb6000

View File

@ -48,9 +48,9 @@
#include "btstack_audio.h"
#include "btstack_debug.h"
#include "btstack_ring_buffer.h"
#include "classic/btstack_sbc_bluedroid.h"
#include "classic/btstack_cvsd_plc.h"
#include "classic/btstack_sbc.h"
#include "classic/btstack_sbc_bluedroid.h"
#include "classic/hfp.h"
#include "classic/hfp_codec.h"
@ -75,7 +75,7 @@
#define SCO_DEMO_MODE_MODPLAYER 2
// SCO demo configuration
#define SCO_DEMO_MODE SCO_DEMO_MODE_MICROPHONE
#define SCO_DEMO_MODE SCO_DEMO_MODE_SINE
// number of sco packets until 'report' on console
#define SCO_REPORT_PERIOD 100
@ -143,9 +143,10 @@ static int count_received = 0;
static btstack_cvsd_plc_state_t cvsd_plc_state;
#ifdef ENABLE_HFP_WIDE_BAND_SPEECH
static btstack_sbc_encoder_state_t msbc_encoder_state;
static const btstack_sbc_decoder_t * sbc_decoder_instance;
static btstack_sbc_decoder_bluedroid_t sbc_decoder_context;
static const btstack_sbc_encoder_t * sbc_encoder_instance;
static btstack_sbc_encoder_bluedroid_t sbc_encoder_context;
#endif
#ifdef ENABLE_HFP_SUPER_WIDE_BAND_SPEECH
@ -456,7 +457,8 @@ static void sco_demo_msbc_init(void){
printf("SCO Demo: Init mSBC\n");
sbc_decoder_instance = btstack_sbc_decoder_bluedroid_init_instance(&sbc_decoder_context);
sbc_decoder_instance->configure(&sbc_decoder_context, SBC_MODE_mSBC, &handle_pcm_data, NULL);
hfp_codec_init_msbc(&hfp_codec, &msbc_encoder_state);
sbc_encoder_instance = btstack_sbc_encoder_bluedroid_init_instance(&sbc_encoder_context);
hfp_codec_init_msbc_with_codec(&hfp_codec, sbc_encoder_instance, &sbc_encoder_context);
}
static void sco_demo_msbc_receive(const uint8_t * packet, uint16_t size){
@ -519,7 +521,7 @@ static void sco_demo_lc3swb_init(void){
printf("SCO Demo: Init LC3-SWB\n");
hfp_codec.lc3_encoder_context = &lc3_encoder_context;
const btstack_lc3_encoder_t * lc3_encoder = btstack_lc3_encoder_google_init_instance((btstack_lc3_encoder_google_t *) hfp_codec.lc3_encoder_context);
const btstack_lc3_encoder_t * lc3_encoder = btstack_lc3_encoder_google_init_instance( &lc3_encoder_context);
hfp_codec_init_lc3_swb(&hfp_codec, lc3_encoder, &lc3_encoder_context);
// init lc3 decoder