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

Call DS3 functions on incoming I2S samples

Browse Source 
Downsampling is enabled only when I2S_DOWNSAMPLE_FACTOR is defined as>
1 (must be 3).
This commit is contained in:
Sam Chesney
2016-12-06 14:30:15 +00:00
parent 6ab9bef80c
commit c5eb740637
1 changed files with 90 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
module_usb_audio/audio_io/audio_io.xc
View File

@@ -12,6 +12,8 @@
#include <xs1.h> #include <xs1.h>
#include <xclib.h> #include <xclib.h>
#include <xs1_su.h> #include <xs1_su.h>
#include <string.h>
#include "xassert.h"
#include "devicedefines.h" #include "devicedefines.h"
@@ -35,6 +37,14 @@
#define I2S_DOWNSAMPLE_FACTOR (1) #define I2S_DOWNSAMPLE_FACTOR (1)
#endif #endif
#if (I2S_DOWNSAMPLE_FACTOR != 1) && (I2S_DOWNSAMPLE_FACTOR != 3)
#error "Unsupported I2S downsampling configuration"
#endif
#if (I2S_DOWNSAMPLE_FACTOR > 1) && (I2S_CHANS_DAC > 2)
#error "I2S downsampling only supports stereo I2S"
#endif
#if (NUM_USB_CHAN_IN && (NUM_USB_CHAN_IN < (I2S_CHANS_ADC + NUM_PDM_MICS))) #if (NUM_USB_CHAN_IN && (NUM_USB_CHAN_IN < (I2S_CHANS_ADC + NUM_PDM_MICS)))
#error "Not enough USB input channels to support number of I2S and PDM inputs" #error "Not enough USB input channels to support number of I2S and PDM inputs"
#endif #endif
@@ -50,6 +60,15 @@ static unsigned samplesOut[32];
static unsigned samplesIn[2][I2S_DOWNSAMPLE_FACTOR][32]; static unsigned samplesIn[2][I2S_DOWNSAMPLE_FACTOR][32];
static int downsamplingCounter = 0; static int downsamplingCounter = 0;
#if (I2S_DOWNSAMPLE_FACTOR > 1)
#include "src.h"
/* [Number of I2S channels][Number of samples/phases][Taps per phase] */
static union ds3Data
{
long long doubleWordAlignmentEnsured;
int32_t delayLine[PDM_MIC_INDEX][I2S_DOWNSAMPLE_FACTOR][24];
} ds3Data;
#endif
#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];
@@ -280,8 +299,6 @@ static inline unsigned DoSampleTransfer(chanend c_out, const int readBuffNo, con
#else #else
inuint(c_out); inuint(c_out);
#endif #endif
// TODO: run ds3 here
// Pass samplesIn[readBuffNo][0,I2S_DOWNSAMPLE_FACTOR][i]) to ds3()
UserBufferManagement(samplesOut, samplesIn[readBuffNo][downsamplingCounter], i_audMan); UserBufferManagement(samplesOut, samplesIn[readBuffNo][downsamplingCounter], i_audMan);
#if NUM_USB_CHAN_IN > 0 #if NUM_USB_CHAN_IN > 0
@@ -486,6 +503,11 @@ unsigned static deliver(chanend c_out, chanend ?c_spd_out,
} }
#endif #endif
#if (I2S_DOWNSAMPLE_FACTOR > 1)
const int ds3DelayLine_zero = {0};
memcpy(&ds3Data.delayLine, &ds3DelayLine_zero, sizeof ds3DelayLine_zero);
#endif
unsigned command = DoSampleTransfer(c_out, readBuffNo, underflowWord, i_audMan); unsigned command = DoSampleTransfer(c_out, readBuffNo, underflowWord, i_audMan);
#ifdef ADAT_TX #ifdef ADAT_TX
@@ -635,6 +657,39 @@ unsigned static deliver(chanend c_out, chanend ?c_spd_out,
/* Note the use of readBuffNo changes based on frameCount */ /* Note the use of readBuffNo changes based on frameCount */
samplesIn[buffIndex][downsamplingCounter][((frameCount-2)&(I2S_CHANS_PER_FRAME-1))+i] = bitrev(sample); // channels 0, 2, 4.. on each line. samplesIn[buffIndex][downsamplingCounter][((frameCount-2)&(I2S_CHANS_PER_FRAME-1))+i] = bitrev(sample); // channels 0, 2, 4.. on each line.
} }
#if (I2S_DOWNSAMPLE_FACTOR > 1)
switch (downsamplingCounter)
{
case 0:
samplesIn[readBuffNo][2][((frameCount-2)&(I2S_CHANS_PER_FRAME-1))] = 0;
samplesIn[readBuffNo][downsamplingCounter][((frameCount-2)&(I2S_CHANS_PER_FRAME-1))] =
src_ds3_voice_add_sample(
samplesIn[readBuffNo][2][((frameCount-2)&(I2S_CHANS_PER_FRAME-1))],
ds3Data.delayLine[0][downsamplingCounter],
src_ds3_voice_coefs[downsamplingCounter],
samplesIn[readBuffNo][downsamplingCounter][((frameCount-2)&(I2S_CHANS_PER_FRAME-1))]);
break;
case 1:
samplesIn[readBuffNo][downsamplingCounter][((frameCount-2)&(I2S_CHANS_PER_FRAME-1))] =
src_ds3_voice_add_sample(
samplesIn[readBuffNo][0][((frameCount-2)&(I2S_CHANS_PER_FRAME-1))],
ds3Data.delayLine[0][downsamplingCounter],
src_ds3_voice_coefs[downsamplingCounter],
samplesIn[readBuffNo][downsamplingCounter][((frameCount-2)&(I2S_CHANS_PER_FRAME-1))]);
break;
case 2:
samplesIn[readBuffNo][downsamplingCounter][((frameCount-2)&(I2S_CHANS_PER_FRAME-1))] =
src_ds3_voice_add_final_sample(
samplesIn[readBuffNo][1][((frameCount-2)&(I2S_CHANS_PER_FRAME-1))],
ds3Data.delayLine[0][downsamplingCounter],
src_ds3_voice_coefs[downsamplingCounter],
samplesIn[readBuffNo][downsamplingCounter][((frameCount-2)&(I2S_CHANS_PER_FRAME-1))]);
break;
default:
unreachable("downsamplingCounter out of range");
break;
}
#endif // (I2S_DOWNSAMPLE_FACTOR > 1)
#endif #endif
@@ -736,6 +791,39 @@ unsigned static deliver(chanend c_out, chanend ?c_spd_out,
samplesIn[buffIndex][downsamplingCounter][((frameCount-1)&(I2S_CHANS_PER_FRAME-1))+i] = bitrev(sample); // channels 1, 3, 5.. on each line. samplesIn[buffIndex][downsamplingCounter][((frameCount-1)&(I2S_CHANS_PER_FRAME-1))+i] = bitrev(sample); // channels 1, 3, 5.. on each line.
} }
#if (I2S_DOWNSAMPLE_FACTOR > 1)
switch (downsamplingCounter)
{
case 0:
samplesIn[readBuffNo][2][((frameCount-2)&(I2S_CHANS_PER_FRAME-1))] = 0;
samplesIn[buffIndex][downsamplingCounter][((frameCount-1)&(I2S_CHANS_PER_FRAME-1))] =
src_ds3_voice_add_sample(
samplesIn[readBuffNo][2][((frameCount-2)&(I2S_CHANS_PER_FRAME-1))],
ds3Data.delayLine[1][downsamplingCounter],
src_ds3_voice_coefs[downsamplingCounter],
samplesIn[buffIndex][downsamplingCounter][((frameCount-1)&(I2S_CHANS_PER_FRAME-1))]);
break;
case 1:
samplesIn[buffIndex][downsamplingCounter][((frameCount-1)&(I2S_CHANS_PER_FRAME-1))] =
src_ds3_voice_add_sample(
samplesIn[readBuffNo][0][((frameCount-2)&(I2S_CHANS_PER_FRAME-1))],
ds3Data.delayLine[1][downsamplingCounter],
src_ds3_voice_coefs[downsamplingCounter],
samplesIn[buffIndex][downsamplingCounter][((frameCount-1)&(I2S_CHANS_PER_FRAME-1))]);
break;
case 2:
samplesIn[buffIndex][downsamplingCounter][((frameCount-1)&(I2S_CHANS_PER_FRAME-1))] =
src_ds3_voice_add_final_sample(
samplesIn[readBuffNo][1][((frameCount-2)&(I2S_CHANS_PER_FRAME-1))],
ds3Data.delayLine[1][downsamplingCounter],
src_ds3_voice_coefs[downsamplingCounter],
samplesIn[buffIndex][downsamplingCounter][((frameCount-1)&(I2S_CHANS_PER_FRAME-1))]);
break;
default:
unreachable("downsamplingCounter out of range");
break;
}
#endif // (I2S_DOWNSAMPLE_FACTOR > 1)
#endif #endif
#ifndef CODEC_MASTER #ifndef CODEC_MASTER