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

Resolve device hang on sample rate cange when both mixer cores are running and NUM_USB_CHAN_OUT = 0

Browse Source
This commit is contained in:
xross
2022-05-20 16:19:07 +01:00
committed by Ross Owen
parent d3fafdfbac
commit d5946b91a4
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib_xua/src/core/mixer/mixer.xc
View File

@@ -252,6 +252,9 @@ static inline void GetSamplesFromHost(chanend c)
#pragma unsafe arrays #pragma unsafe arrays
static inline void GiveSamplesToDevice(chanend c, xc_ptr ptr, xc_ptr multOut) static inline void GiveSamplesToDevice(chanend c, xc_ptr ptr, xc_ptr multOut)
{ {
#if(NUM_USB_CHAN_OUT == 0)
outuint(c, 0);
#else
{ {
#pragma loop unroll #pragma loop unroll
for (int i=0; i<NUM_USB_CHAN_OUT; i++) for (int i=0; i<NUM_USB_CHAN_OUT; i++)
@@ -297,6 +300,7 @@ static inline void GiveSamplesToDevice(chanend c, xc_ptr ptr, xc_ptr multOut)
#endif #endif
} }
} }
#endif
} }
#pragma unsafe arrays #pragma unsafe arrays
@@ -603,9 +607,6 @@ static void mixer1(chanend c_host, chanend c_mix_ctl, chanend c_mixer2)
} }
#else /* IF MAX_MIX_COUNT > 0 */ #else /* IF MAX_MIX_COUNT > 0 */
/* No mixes, this thread runs on its own doing just volume */ /* No mixes, this thread runs on its own doing just volume */
#if(NUM_USB_CHAN_OUT == 0)
outuint(c_mixer2, 0);
#endif
GiveSamplesToDevice(c_mixer2, samples_to_device_map, multOut); GiveSamplesToDevice(c_mixer2, samples_to_device_map, multOut);
GetSamplesFromDevice(c_mixer2); GetSamplesFromDevice(c_mixer2);
GetSamplesFromHost(c_host); GetSamplesFromHost(c_host);