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

Revert "Merge add_i2s_out_ds3 into master"

Browse Source 
a58b8c3bb9
This commit is contained in:
Sam Chesney
2017-01-19 17:46:40 +00:00
parent a58b8c3bb9
commit 04a6a7a370
2 changed files with 19 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
module_usb_audio/audio_io/audio_io.xc
View File

@@ -58,27 +58,16 @@ static unsigned samplesIn[2][MAX(NUM_USB_CHAN_IN, IN_CHAN_COUNT)];
#endif
static int inDownsamplingCounter = 0;
static int outDownsamplingCounter = 0;
#if (I2S_DOWNSAMPLE_FACTOR_IN > 1) || (I2S_DOWNSAMPLE_FACTOR_OUT > 1)
#if (I2S_DOWNSAMPLE_FACTOR_IN > 1)
#include "src.h"
static union ds3Data
{
long long doubleWordAlignmentEnsured;
/* delay lines = [Number of I2S channels][Number of samples/phases][Taps per phase] */
#if (I2S_DOWNSAMPLE_FACTOR_IN > 1)
/* [Number of I2S channels][Number of samples/phases][Taps per phase] */
int32_t inputDelayLine[I2S_DOWNSAMPLE_CHANS_IN][I2S_DOWNSAMPLE_FACTOR_IN][24];
#endif // (I2S_DOWNSAMPLE_FACTOR_IN > 1)
#if (I2S_DOWNSAMPLE_FACTOR_OUT > 1)
int32_t outputDelayLine[I2S_DOWNSAMPLE_CHANS_OUT][I2S_DOWNSAMPLE_FACTOR_OUT][24];
#endif // (I2S_DOWNSAMPLE_FACTOR_OUT > 1)
} ds3Data;
#if (I2S_DOWNSAMPLE_FACTOR_IN > 1)
static int64_t inputDs3Sum[I2S_DOWNSAMPLE_CHANS_IN];
#endif // (I2S_DOWNSAMPLE_FACTOR_IN > 1)
#if (I2S_DOWNSAMPLE_FACTOR_OUT > 1)
static int64_t outputDs3Sum[I2S_DOWNSAMPLE_CHANS_OUT];
#endif // (I2S_DOWNSAMPLE_FACTOR_OUT > 1)
#endif // (I2S_DOWNSAMPLE_FACTOR_IN > 1) || (I2S_DOWNSAMPLE_FACTOR_OUT > 1)
#if (DSD_CHANS_DAC != 0)
extern buffered out port:32 p_dsd_dac[DSD_CHANS_DAC];
@@ -734,22 +723,20 @@ unsigned static deliver(chanend c_out, chanend ?c_spd_out,
#pragma xta endpoint "i2s_output_l"
#if (I2S_CHANS_DAC != 0) && (NUM_USB_CHAN_OUT != 0)
if ((I2S_DOWNSAMPLE_FACTOR_OUT - 1) == outDownsamplingCounter)
{
index = 0;
index = 0;
#pragma loop unroll
/* Output "even" channel to DAC (i.e. left) */
for(int i = 0; i < I2S_CHANS_DAC; i+=I2S_CHANS_PER_FRAME)
{
p_i2s_dac[index++] <: bitrev(samplesOut[frameCount +i]);
}
/* Output "even" channel to DAC (i.e. left) */
for(int i = 0; i < I2S_CHANS_DAC; i+=I2S_CHANS_PER_FRAME)
{
p_i2s_dac[index++] <: bitrev(samplesOut[frameCount +i]);
}
#endif
#ifndef CODEC_MASTER
/* Clock out the LR Clock, the DAC data and Clock in the next sample into ADC */
doI2SClocks(divide);
/* Clock out the LR Clock, the DAC data and Clock in the next sample into ADC */
doI2SClocks(divide);
#endif
}
#ifdef ADAT_TX
TransferAdatTxSamples(c_adat_out, samplesOut, adatSmuxMode, 1);
#endif
@@ -870,24 +857,19 @@ unsigned static deliver(chanend c_out, chanend ?c_spd_out,
index = 0;
#pragma xta endpoint "i2s_output_r"
#if (I2S_CHANS_DAC != 0) && (NUM_USB_CHAN_OUT != 0)
if ((I2S_DOWNSAMPLE_FACTOR_OUT - 1) == outDownsamplingCounter)
{
/* Output "odd" channel to DAC (i.e. right) */
/* Output "odd" channel to DAC (i.e. right) */
#pragma loop unroll
for(int i = 1; i < I2S_CHANS_DAC; i+=I2S_CHANS_PER_FRAME)
{
p_i2s_dac[index++] <: bitrev(samplesOut[frameCount + i]);
}
for(int i = 1; i < I2S_CHANS_DAC; i+=I2S_CHANS_PER_FRAME)
{
p_i2s_dac[index++] <: bitrev(samplesOut[frameCount + i]);
}
#endif
#ifndef CODEC_MASTER
doI2SClocks(divide);
doI2SClocks(divide);
#endif
}
else
{
++outDownsamplingCounter;
}
} // !dsdMode
#if (DSD_CHANS_DAC != 0) && (NUM_USB_CHAN_OUT > 0)

20
module_usb_audio/devicedefines.h
View File

@@ -134,19 +134,6 @@
#endif
#endif
/**
* @brief Output I2S (host to device) channels can be downsampled by a factor of 3.
*
* Default: 1 i.e. downsampling is disabled.
*/
#ifndef I2S_DOWNSAMPLE_FACTOR_OUT
#define I2S_DOWNSAMPLE_FACTOR_OUT (1)
#else
#if (I2S_DOWNSAMPLE_FACTOR_OUT != 3) && (I2S_DOWNSAMPLE_FACTOR_OUT != 1)
#error Unsupported I2S output downsampling configuration
#endif
#endif
/**
* @brief Only downsample one channel per input I2S frame.
*
@@ -170,13 +157,6 @@
#define I2S_DOWNSAMPLE_CHANS_IN I2S_CHANS_ADC
#endif
/**
* @brief Number of output (host to device) I2S channels to downsample.
*
* Default: The number of I2S output channels.
*/
#define I2S_DOWNSAMPLE_CHANS_OUT I2S_CHANS_ADC
/**
* @brief Max supported sample frequency for device (Hz). Default: 192000
*/