laiyp/lib_xua
1
0
Fork 0
forked from PAWPAW-Mirror/lib_xua
Code Pull Requests Activity

Audio sample buffers now magic value of 32. Was NUM_USB_CHAN_OUT/IN which causes issues if USB chan count < audio IF count.

Browse Source
This commit is contained in:
Ross Owen
2016-04-21 18:40:37 +01:00
parent f3819eeee3
commit aee3851f4c
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
module_usb_audio/audio_io/audio_io.xc
View File

@@ -36,18 +36,17 @@
#include "xua_dsp.h" #include "xua_dsp.h"
#endif #endif
static unsigned samplesOut[NUM_USB_CHAN_OUT]; /* TODO 32 is max expected channels */
static unsigned samplesOut[32];
/* Two buffers for ADC data to allow for DAC and ADC ports being offset */ /* Two buffers for ADC data to allow for DAC and ADC ports being offset */
static unsigned samplesIn[2][NUM_USB_CHAN_IN]; static unsigned samplesIn[2][32];
#if (DSD_CHANS_DAC != 0) #if (DSD_CHANS_DAC != 0)
extern buffered out port:32 p_dsd_dac[DSD_CHANS_DAC]; extern buffered out port:32 p_dsd_dac[DSD_CHANS_DAC];
extern buffered out port:32 p_dsd_clk; extern buffered out port:32 p_dsd_clk;
#endif #endif
unsigned g_adcVal = 0;
#ifdef XTA_TIMING_AUDIO #ifdef XTA_TIMING_AUDIO
#pragma xta command "add exclusion received_command" #pragma xta command "add exclusion received_command"
#pragma xta command "analyse path i2s_output_l i2s_output_r" #pragma xta command "analyse path i2s_output_l i2s_output_r"
@@ -280,7 +279,7 @@ static inline unsigned DoSampleTransfer(chanend c_out, const int readBuffNo, con
#pragma loop unroll #pragma loop unroll
for(int i = 0; i < NUM_USB_CHAN_IN; i++) for(int i = 0; i < NUM_USB_CHAN_IN; i++)
{ {
outuint(c_out, samplesIn[readBuffNo][i]); outuint(c_out, samplesIn[readBuffNo][i]);
} }
#endif #endif
} }
@@ -423,7 +422,7 @@ static inline void InitPorts(unsigned divide)
} }
/* I2S delivery thread */ /* I2S delivery thread */
#pragma unsafe arrays //#pragma unsafe arrays
unsigned static deliver(chanend c_out, chanend ?c_spd_out, unsigned static deliver(chanend c_out, chanend ?c_spd_out,
#ifdef ADAT_TX #ifdef ADAT_TX
chanend c_adat_out, chanend c_adat_out,