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

adding variable reference freqency support. Currently only 48kHz work

Browse Source
This commit is contained in:
Keith Au
2020-01-16 15:05:41 +08:00
parent 1ef566a570
commit 2f4da7f262
3 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib_xua/api/xua_conf_default.h
View File

@@ -233,6 +233,13 @@
#define DEFAULT_AUDOUT_FREQ (48000) #define DEFAULT_AUDOUT_FREQ (48000)
#endif #endif
/**
* @brief Default Reference input sampling frequency
*/
#ifndef DEFAULT_AUDIN_FREQ
#define DEFAULT_AUDIN_FREQ (48000)
#endif
/* Audio Class Defines */ /* Audio Class Defines */
/** /**

8
lib_xua/src/core/endpoint0/xua_ep0_descriptors.h
View File

@@ -2600,6 +2600,13 @@ unsigned char cfgDesc_Audio1[] =
FS_STREAM_FORMAT_OUTPUT_1_SUBSLOT_BYTES, /* subFrameSize */ FS_STREAM_FORMAT_OUTPUT_1_SUBSLOT_BYTES, /* subFrameSize */
FS_STREAM_FORMAT_OUTPUT_1_RESOLUTION_BITS, /* bitResolution */ FS_STREAM_FORMAT_OUTPUT_1_RESOLUTION_BITS, /* bitResolution */
#ifdef USB_CMD_CFG_SAMP_FREQ
USB_OUT_SAMP_FREQ_NUM,
CHARIFY_SR(USB_OUT_SAMP_FREQ_0),
CHARIFY_SR(USB_OUT_SAMP_FREQ_1),
CHARIFY_SR(USB_OUT_SAMP_FREQ_2),
#else
num_freqs_a1, /* SamFreqType - sample freq count */ num_freqs_a1, /* SamFreqType - sample freq count */
/* Windows enum issue with <= two sample rates work around */ /* Windows enum issue with <= two sample rates work around */
@@ -2652,6 +2659,7 @@ unsigned char cfgDesc_Audio1[] =
#if (MIN_FREQ <= 96000) && (MAX_FREQ_FS >= 96000) #if (MIN_FREQ <= 96000) && (MAX_FREQ_FS >= 96000)
0x00, 0x77, 0x01, /* sampleFreq - 96KHz */ 0x00, 0x77, 0x01, /* sampleFreq - 96KHz */
#endif #endif
#endif //USB_CMD_CFG_SAMP_FREQ
/* Standard AS Isochronous Audio Data Endpoint Descriptor 4.6.1.1 */ /* Standard AS Isochronous Audio Data Endpoint Descriptor 4.6.1.1 */
0x09, 0x09,

4
lib_xua/src/core/endpoint0/xua_ep0_uacreqs.xc
View File

@@ -55,12 +55,14 @@ extern unsigned char mixSel[MAX_MIX_COUNT][MIX_INPUTS];
#ifdef USB_CMD_CFG_SAMP_FREQ #ifdef USB_CMD_CFG_SAMP_FREQ
extern unsigned int g_curAudOut_SamFreq; extern unsigned int g_curAudOut_SamFreq;
extern unsigned int g_curAudIn_SamFreq;
#endif #endif
/* Global var for current frequency, set to default freq */ /* Global var for current frequency, set to default freq */
#ifdef USB_CMD_CFG_SAMP_FREQ #ifdef USB_CMD_CFG_SAMP_FREQ
#define g_curUSBin_SamFreq g_curAudOut_SamFreq #define g_curUSBin_SamFreq g_curAudOut_SamFreq
unsigned int g_curUSBout_SamFreq = DEFAULT_FREQ; #define g_curUSBout_SamFreq g_curAudIn_SamFreq
unsigned int g_curSamFreq = DEFAULT_FREQ; // should no longer be used unsigned int g_curSamFreq = DEFAULT_FREQ; // should no longer be used
#else #else
unsigned int g_curUSBin_SamFreq = DEFAULT_FREQ; unsigned int g_curUSBin_SamFreq = DEFAULT_FREQ;