mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-03-01 01:13:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

portaudio: make num output buffers configurable

Browse Source
This commit is contained in:
Matthias Ringwald 2022-08-24 14:34:17 +02:00
parent efda67ebc9
commit ee37d7ff8b
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
platform/posix/btstack_audio_portaudio.c
View File

@ -79,10 +79,8 @@ static void (*playback_callback)(int16_t * buffer, uint16_t num_samples);
static void (*recording_callback)(const int16_t * buffer, uint16_t num_samples); static void (*recording_callback)(const int16_t * buffer, uint16_t num_samples);
// output buffer // output buffer
static int16_t output_buffer_a[NUM_FRAMES_PER_PA_BUFFER * 2]; // stereo static int16_t output_buffer_storage[NUM_OUTPUT_BUFFERS * NUM_FRAMES_PER_PA_BUFFER * 2]; // stereo
static int16_t output_buffer_b[NUM_FRAMES_PER_PA_BUFFER * 2]; // stereo static int16_t * output_buffers[NUM_OUTPUT_BUFFERS];
static int16_t output_buffer_c[NUM_FRAMES_PER_PA_BUFFER * 2]; // stereo
static int16_t * output_buffers[NUM_OUTPUT_BUFFERS] = { output_buffer_a, output_buffer_b, output_buffer_c};
static int output_buffer_to_play; static int output_buffer_to_play;
static int output_buffer_to_fill; static int output_buffer_to_fill;
@ -100,7 +98,7 @@ static btstack_timer_source_t driver_timer_source;
static int portaudio_callback_sink( const void * inputBuffer, static int portaudio_callback_sink( const void * inputBuffer,
void * outputBuffer, void * outputBuffer,
unsigned long samples_per_buffer, unsigned long frames_per_buffer,
const PaStreamCallbackTimeInfo * timeInfo, const PaStreamCallbackTimeInfo * timeInfo,
PaStreamCallbackFlags statusFlags, PaStreamCallbackFlags statusFlags,
void * userData ) { void * userData ) {
@ -110,13 +108,14 @@ static int portaudio_callback_sink( const void * inputBuffer
(void) timeInfo; /* Prevent unused variable warnings. */ (void) timeInfo; /* Prevent unused variable warnings. */
(void) statusFlags; (void) statusFlags;
(void) userData; (void) userData;
(void) samples_per_buffer; (void) frames_per_buffer;
(void) inputBuffer; (void) inputBuffer;
// simplified volume control // simplified volume control
uint16_t index; uint16_t index;
int16_t * from_buffer = output_buffers[output_buffer_to_play]; int16_t * from_buffer = output_buffers[output_buffer_to_play];
int16_t * to_buffer = (int16_t *) outputBuffer; int16_t * to_buffer = (int16_t *) outputBuffer;
btstack_assert(frames_per_buffer == NUM_FRAMES_PER_PA_BUFFER);
#if 0 #if 0
// up to 8 right shifts // up to 8 right shifts
@ -204,6 +203,11 @@ static int btstack_audio_portaudio_sink_init(
num_channels_sink = channels; num_channels_sink = channels;
num_bytes_per_sample_sink = 2 * channels; num_bytes_per_sample_sink = 2 * channels;
uint8_t i;
for (i=0;i<NUM_OUTPUT_BUFFERS;i++){
output_buffers[i] = &output_buffer_storage[i * NUM_FRAMES_PER_PA_BUFFER * 2];
}
if (!playback){ if (!playback){
log_error("No playback callback"); log_error("No playback callback");
return 1; return 1;
@ -339,11 +343,13 @@ static void btstack_audio_portaudio_sink_start_stream(void){
if (!playback_callback) return; if (!playback_callback) return;
// fill buffer once // fill buffers once
(*playback_callback)(output_buffer_a, NUM_FRAMES_PER_PA_BUFFER); uint8_t i;
(*playback_callback)(output_buffer_b, NUM_FRAMES_PER_PA_BUFFER); for (i=0;i<NUM_OUTPUT_BUFFERS-1;i++){
(*playback_callback)(&output_buffer_storage[i*NUM_FRAMES_PER_PA_BUFFER*2], NUM_FRAMES_PER_PA_BUFFER);
}
output_buffer_to_play = 0; output_buffer_to_play = 0;
output_buffer_to_fill = 2; output_buffer_to_fill = NUM_OUTPUT_BUFFERS-1;
/* -- start stream -- */ /* -- start stream -- */
PaError err = Pa_StartStream(stream_sink); PaError err = Pa_StartStream(stream_sink);