mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-03-30 16:20:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

a2dp_sink_demo: add HAVE_BTSTACK_AUDIO_EFFECTIVE_SAMPLERATE

Browse Source
This commit is contained in:
Dirk Helbig 2023-01-31 14:38:20 +01:00 committed by Matthias Ringwald
parent bbbd19ba43
commit 555ade44f7
2 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
example/a2dp_sink_demo.c
View File

@ -68,7 +68,6 @@
#include <string.h>
#include "btstack.h"
#include "btstack_sample_rate_compensation.h"
#include "btstack_resample.h"
//#define AVRCP_BROWSING_ENABLED
@ -77,6 +76,10 @@
#include "btstack_stdin.h"
#endif
#ifdef HAVE_BTSTACK_AUDIO_EFFECTIVE_SAMPLERATE
#include "btstack_sample_rate_compensation.h"
#endif
#include "btstack_ring_buffer.h"
#ifdef HAVE_POSIX_FILE_IO
@ -317,8 +320,9 @@ static int a2dp_and_avrcp_setup(void){
return 0;
}
/* LISTING_END */
btstack_sample_rate_compensation_t sample_rate_adaption;
#ifdef HAVE_BTSTACK_AUDIO_EFFECTIVE_SAMPLERATE
btstack_sample_rate_compensation_t sample_rate_compensation;
#endif
static void playback_handler(int16_t * buffer, uint16_t num_audio_frames){
@ -391,9 +395,9 @@ static void handle_pcm_data(int16_t * data, int num_audio_frames, int num_channe
static int media_processing_init(media_codec_configuration_sbc_t * configuration){
if (media_initialized) return 0;
btstack_sample_rate_compensation_init( &sample_rate_adaption, btstack_run_loop_get_time_ms(), configuration->sampling_frequency, FLOAT_TO_Q15(1.f) );
#ifdef HAVE_BTSTACK_AUDIO_EFFECTIVE_SAMPLERATE
btstack_sample_rate_compensation_init( &sample_rate_compensation, btstack_run_loop_get_time_ms(), configuration->sampling_frequency, FLOAT_TO_Q15(1.f) );
#endif
btstack_sbc_decoder_init(&state, mode, handle_pcm_data, NULL);
#ifdef STORE_TO_WAV_FILE
@ -417,8 +421,9 @@ static int media_processing_init(media_codec_configuration_sbc_t * configuration
static void media_processing_start(void){
if (!media_initialized) return;
btstack_sample_rate_compensation_reset( &sample_rate_adaption, btstack_run_loop_get_time_ms() );
#ifdef HAVE_BTSTACK_AUDIO_EFFECTIVE_SAMPLERATE
btstack_sample_rate_compensation_reset( &sample_rate_compensation, btstack_run_loop_get_time_ms() );
#endif
// setup audio playback
const btstack_audio_sink_t * audio = btstack_audio_sink_get_instance();
if (audio){
@ -490,12 +495,6 @@ static void handle_l2cap_media_data_packet(uint8_t seid, uint8_t *packet, uint16
return;
}
// update sample rate compensation
if( audio_stream_started && (audio != NULL)) {
uint32_t resampling_factor = btstack_sample_rate_compensation_update( &sample_rate_adaption, btstack_run_loop_get_time_ms(), sbc_header.num_frames*128, audio->get_samplerate() );
btstack_resample_set_factor(&resample_instance, resampling_factor);
// printf("sbc buffer level : %d\n", btstack_ring_buffer_bytes_available(&sbc_frame_ring_buffer));
}
// store sbc frame size for buffer management
sbc_frame_size = (size-pos)/ sbc_header.num_frames;
@ -507,7 +506,14 @@ static void handle_l2cap_media_data_packet(uint8_t seid, uint8_t *packet, uint16
// decide on audio sync drift based on number of sbc frames in queue
int sbc_frames_in_buffer = btstack_ring_buffer_bytes_available(&sbc_frame_ring_buffer) / sbc_frame_size;
#if 0
#ifdef HAVE_BTSTACK_AUDIO_EFFECTIVE_SAMPLERATE
// update sample rate compensation
if( audio_stream_started && (audio != NULL)) {
uint32_t resampling_factor = btstack_sample_rate_compensation_update( &sample_rate_compensation, btstack_run_loop_get_time_ms(), sbc_header.num_frames*128, audio->get_samplerate() );
btstack_resample_set_factor(&resample_instance, resampling_factor);
// printf("sbc buffer level : %d\n", btstack_ring_buffer_bytes_available(&sbc_frame_ring_buffer));
}
#else
uint32_t resampling_factor;
// nominal factor (fixed-point 2^16) and compensation offset

3
port/libusb/btstack_config.h
View File

@ -13,6 +13,9 @@
#define HAVE_MALLOC
#define HAVE_POSIX_FILE_IO
#define HAVE_POSIX_TIME
#ifdef HAVE_PORTAUDIO
#define HAVE_BTSTACK_AUDIO_EFFECTIVE_SAMPLERATE
#endif
// BTstack features that can be enabled
#define ENABLE_ATT_DELAYED_RESPONSE