forked from PAWPAW-Mirror/lib_xua
Merge
This commit is contained in:
@@ -700,27 +700,29 @@ unsigned static deliver(chanend c_out, chanend ?c_spd_out,
|
||||
#endif // I2S_MODE_TDM
|
||||
#endif // CODEC_MASTER
|
||||
|
||||
/* Note the use of readBuffNo changes based on frameCount */
|
||||
samplesIn[buffIndex][((frameCount-2)&(I2S_CHANS_PER_FRAME-1))+i] = bitrev(sample); // channels 0, 2, 4.. on each line.
|
||||
sample = bitrev(sample);
|
||||
int chanIndex = ((frameCount-2)&(I2S_CHANS_PER_FRAME-1))+i; // channels 0, 2, 4.. on each line.
|
||||
#if (USB_TO_AUD_RATIO > 1)
|
||||
if ((USB_TO_AUD_RATIO - 1) == usbToAudioRatioCounter)
|
||||
{
|
||||
samplesIn[readBuffNo][((frameCount-2)&(I2S_CHANS_PER_FRAME-1))] =
|
||||
samplesIn[buffIndex][chanIndex] =
|
||||
src_ds3_voice_add_final_sample(
|
||||
i2sInDs3Sum[((frameCount-2)&(I2S_CHANS_PER_FRAME-1))+i],
|
||||
i2sInDs3.delayLine[((frameCount-2)&(I2S_CHANS_PER_FRAME-1))+i][usbToAudioRatioCounter],
|
||||
i2sInDs3Sum[chanIndex],
|
||||
i2sInDs3.delayLine[chanIndex][usbToAudioRatioCounter],
|
||||
src_ff3v_fir_coefs[usbToAudioRatioCounter],
|
||||
samplesIn[readBuffNo][((frameCount-2)&(I2S_CHANS_PER_FRAME-1))]);
|
||||
sample);
|
||||
}
|
||||
else
|
||||
{
|
||||
i2sInDs3Sum[((frameCount-2)&(I2S_CHANS_PER_FRAME-1))+i] =
|
||||
i2sInDs3Sum[chanIndex] =
|
||||
src_ds3_voice_add_sample(
|
||||
i2sInDs3Sum[((frameCount-2)&(I2S_CHANS_PER_FRAME-1))+i],
|
||||
i2sInDs3.delayLine[((frameCount-2)&(I2S_CHANS_PER_FRAME-1))+i][usbToAudioRatioCounter],
|
||||
src_ff3v_fir_coefs[usbToAudioRatioCounter],
|
||||
samplesIn[readBuffNo][((frameCount-2)&(I2S_CHANS_PER_FRAME-1))]);
|
||||
i2sInDs3Sum[chanIndex],
|
||||
i2sInDs3.delayLine[chanIndex][usbToAudioRatioCounter],
|
||||
src_ff3v_fir_coefs[usbToAudioRatioCounter],
|
||||
sample);
|
||||
}
|
||||
#else
|
||||
samplesIn[buffIndex][chanIndex] = sample;
|
||||
#endif /* (USB_TO_AUD_RATIO > 1) */
|
||||
}
|
||||
#endif
|
||||
@@ -850,28 +852,30 @@ unsigned static deliver(chanend c_out, chanend ?c_spd_out,
|
||||
#endif // I2S_MODE_TDM
|
||||
#endif // CODEC_MASTER
|
||||
|
||||
samplesIn[buffIndex][((frameCount-1)&(I2S_CHANS_PER_FRAME-1))+i] = bitrev(sample); // channels 1, 3, 5.. on each line.
|
||||
#if ((USB_TO_AUD_RATIO > 1) && !I2S_DOWNSAMPLE_MONO_IN)
|
||||
sample = bitrev(sample);
|
||||
int chanIndex = ((frameCount-1)&(I2S_CHANS_PER_FRAME-1))+i; // channels 1, 3, 5.. on each line.
|
||||
#if (USB_TO_AUD_RATIO > 1)
|
||||
if ((USB_TO_AUD_RATIO - 1) == usbToAudioRatioCounter)
|
||||
{
|
||||
samplesIn[buffIndex][((frameCount-1)&(I2S_CHANS_PER_FRAME-1))+i] =
|
||||
samplesIn[buffIndex][chanIndex] =
|
||||
src_ds3_voice_add_final_sample(
|
||||
i2sInDs3Sum[((frameCount-1)&(I2S_CHANS_PER_FRAME-1))+i],
|
||||
i2sInDs3.delayLine[((frameCount-1)&(I2S_CHANS_PER_FRAME-1))+i][usbToAudioRatioCounter],
|
||||
i2sInDs3Sum[chanIndex],
|
||||
i2sInDs3.delayLine[chanIndex][usbToAudioRatioCounter],
|
||||
src_ff3v_fir_coefs[usbToAudioRatioCounter],
|
||||
samplesIn[readBuffNo][((frameCount-1)&(I2S_CHANS_PER_FRAME-1))+i]);
|
||||
sample);
|
||||
}
|
||||
else
|
||||
{
|
||||
i2sInDs3Sum[((frameCount-2)&(I2S_CHANS_PER_FRAME-1))+i] =
|
||||
i2sInDs3Sum[chanIndex] =
|
||||
src_ds3_voice_add_sample(
|
||||
i2sInDs3Sum[((frameCount-1)&(I2S_CHANS_PER_FRAME-1))+i],
|
||||
i2sInDs3.delayLine[((frameCount-1)&(I2S_CHANS_PER_FRAME-1))+i][usbToAudioRatioCounter],
|
||||
src_ff3v_fir_coefs[usbToAudioRatioCounter],
|
||||
samplesIn[readBuffNo][((frameCount-1)&(I2S_CHANS_PER_FRAME-1))+i]);
|
||||
i2sInDs3Sum[chanIndex],
|
||||
i2sInDs3.delayLine[chanIndex][usbToAudioRatioCounter],
|
||||
src_ff3v_fir_coefs[usbToAudioRatioCounter],
|
||||
sample);
|
||||
}
|
||||
#endif /* ((USB_TO_AUD_RATIO > 1) && !I2S_DOWNSAMPLE_MONO_IN) */
|
||||
|
||||
#else
|
||||
samplesIn[buffIndex][chanIndex] = sample;
|
||||
#endif /* (USB_TO_AUD_RATIO > 1) */
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user