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

portaudio: handle different number of channels for sink/source

Browse Source
This commit is contained in:
Matthias Ringwald 2019-02-27 12:48:24 +01:00
parent 6a4fc70825
commit bcd517299d
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
platform/posix/btstack_audio_portaudio.c
View File

@ -56,7 +56,8 @@
// config // config
static int num_channels; static int num_channels;
static int num_bytes_per_sample; static int num_bytes_per_sample_sink;
static int num_bytes_per_sample_source;
// portaudio // portaudio
static int portaudio_initialized; static int portaudio_initialized;
@ -110,7 +111,7 @@ static int portaudio_callback_sink( const void * inputBuffer
(void) inputBuffer; (void) inputBuffer;
// fill from one of our buffers // fill from one of our buffers
memcpy(outputBuffer, output_buffers[output_buffer_to_play], NUM_FRAMES_PER_PA_BUFFER * num_bytes_per_sample); memcpy(outputBuffer, output_buffers[output_buffer_to_play], NUM_FRAMES_PER_PA_BUFFER * num_bytes_per_sample_sink);
// next // next
output_buffer_to_play = (output_buffer_to_play + 1 ) % NUM_OUTPUT_BUFFERS; output_buffer_to_play = (output_buffer_to_play + 1 ) % NUM_OUTPUT_BUFFERS;
@ -134,7 +135,7 @@ static int portaudio_callback_source( const void * inputBuff
(void) outputBuffer; (void) outputBuffer;
// store in one of our buffers // store in one of our buffers
memcpy(input_buffers[input_buffer_to_fill], inputBuffer, NUM_FRAMES_PER_PA_BUFFER * num_bytes_per_sample); memcpy(input_buffers[input_buffer_to_fill], inputBuffer, NUM_FRAMES_PER_PA_BUFFER * num_bytes_per_sample_source);
// next // next
input_buffer_to_fill = (input_buffer_to_fill + 1 ) % NUM_INPUT_BUFFERS; input_buffer_to_fill = (input_buffer_to_fill + 1 ) % NUM_INPUT_BUFFERS;
@ -181,7 +182,7 @@ static int btstack_audio_portaudio_sink_init(
PaError err; PaError err;
num_channels = channels; num_channels = channels;
num_bytes_per_sample = 2 * channels; num_bytes_per_sample_sink = 2 * channels;
if (!playback){ if (!playback){
log_error("No playback callback"); log_error("No playback callback");
@ -245,7 +246,7 @@ static int btstack_audio_portaudio_source_init(
PaError err; PaError err;
num_channels = channels; num_channels = channels;
num_bytes_per_sample = 2 * channels; num_bytes_per_sample_source = 2 * channels;
if (!recording){ if (!recording){
log_error("No recording callback"); log_error("No recording callback");