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

Merge pull request #277 from danielpieczko/fix/decouple_buffer_size

Browse Source 
Fix insufficient buffering in decouple
This commit is contained in:
Ross Owen
2022-08-19 09:11:26 +01:00
committed by GitHub
parent 598acc629d 5d331e7f27
commit 3336aa344d
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.rst
View File

@@ -11,6 +11,7 @@ lib_xua Change Log
* FIXED: Incorrect conditional compilation of HID report code * FIXED: Incorrect conditional compilation of HID report code
* FIXED: Input/output descriptors written when input/output not enabled. * FIXED: Input/output descriptors written when input/output not enabled.
(Audio class 1.0 mode using XUA_USB_DESCRIPTOR_OVERWRITE_RATE_RES) (Audio class 1.0 mode using XUA_USB_DESCRIPTOR_OVERWRITE_RATE_RES)
* FIXED: Insufficient buffering of input packets
* Changes to dependencies: * Changes to dependencies:

14
lib_xua/src/core/buffer/decouple/decouple.xc
View File

@@ -41,7 +41,7 @@
/*** BUFFER SIZES ***/ /*** BUFFER SIZES ***/
#define BUFFER_PACKET_COUNT 3 /* How many packets too allow for in buffer - minimum is 3! */ #define BUFFER_PACKET_COUNT 4 /* How many packets too allow for in buffer - minimum is 4 */
#define BUFF_SIZE_OUT_HS MAX_DEVICE_AUD_PACKET_SIZE_OUT_HS * BUFFER_PACKET_COUNT #define BUFF_SIZE_OUT_HS MAX_DEVICE_AUD_PACKET_SIZE_OUT_HS * BUFFER_PACKET_COUNT
#define BUFF_SIZE_OUT_FS MAX_DEVICE_AUD_PACKET_SIZE_OUT_FS * BUFFER_PACKET_COUNT #define BUFF_SIZE_OUT_FS MAX_DEVICE_AUD_PACKET_SIZE_OUT_FS * BUFFER_PACKET_COUNT
@@ -95,7 +95,7 @@ int buffer_aud_ctl_chan = 0;
unsigned g_aud_from_host_flag = 0; unsigned g_aud_from_host_flag = 0;
unsigned g_aud_from_host_info; unsigned g_aud_from_host_info;
unsigned g_freqChange_flag = 0; unsigned g_freqChange_flag = 0;
unsigned g_freqChange_sampFreq; unsigned g_freqChange_sampFreq = DEFAULT_FREQ;
/* Global vars for sharing stream format change between buffer and decouple (save a channel) */ /* Global vars for sharing stream format change between buffer and decouple (save a channel) */
unsigned g_formatChange_SubSlot; unsigned g_formatChange_SubSlot;
@@ -520,7 +520,13 @@ __builtin_unreachable();
/* In pipe has filled its buffer - we need to overflow /* In pipe has filled its buffer - we need to overflow
* Accept the packet, and throw away the oldest in the buffer */ * Accept the packet, and throw away the oldest in the buffer */
/* Keep throwing away packets until buffer is at a nice level.. */ unsigned sampFreq;
GET_SHARED_GLOBAL(sampFreq, g_freqChange_sampFreq);
int min, mid, max;
GetADCCounts(sampFreq, min, mid, max);
unsigned max_pkt_size = ((max * g_curSubSlot_In * g_numUsbChan_In + 3) & ~0x3) + 4;
/* Keep throwing away packets until buffer contains two packets */
do do
{ {
unsigned rdPtr; unsigned rdPtr;
@@ -544,7 +550,7 @@ __builtin_unreachable();
space_left += datalength; space_left += datalength;
SET_SHARED_GLOBAL(g_aud_to_host_rdptr, rdPtr); SET_SHARED_GLOBAL(g_aud_to_host_rdptr, rdPtr);
} while(space_left < (BUFF_SIZE_IN/2)); } while(space_left < (BUFF_SIZE_IN - 2 * max_pkt_size));
} }
sampsToWrite = totalSampsToWrite; sampsToWrite = totalSampsToWrite;