Merge pull request #337 from xross/develop

Respect I2S_CHANS_PER_FRAME when calculating bit-clock rates
This commit is contained in:
Ross Owen
2023-06-21 10:06:57 +01:00
committed by GitHub
2 changed files with 6 additions and 7 deletions

View File

@@ -1,6 +1,11 @@
lib_xua Change Log lib_xua Change Log
================== ==================
UNRELEASED
----------
* FIXED: Respect I2S_CHANS_PER_FRAME when calculating bit-clock rates
3.5.0 3.5.0
----- -----

View File

@@ -715,13 +715,7 @@ void XUA_AudioHub(chanend ?c_aud, clock ?clk_audio_mclk, clock ?clk_audio_bclk,
/* Calculate master clock to bit clock (or DSD clock) divide for current sample freq /* Calculate master clock to bit clock (or DSD clock) divide for current sample freq
* e.g. 11.289600 / (176400 * 64) = 1 */ * e.g. 11.289600 / (176400 * 64) = 1 */
{ {
unsigned numBits = XUA_I2S_N_BITS * 2; unsigned numBits = XUA_I2S_N_BITS * I2S_CHANS_PER_FRAME;
if(XUA_PCM_FORMAT == XUA_PCM_FORMAT_TDM)
{
/* TDM has 8 channels */
numBits *= 4;
}
#if (DSD_CHANS_DAC > 0) #if (DSD_CHANS_DAC > 0)
if(dsdMode == DSD_MODE_DOP) if(dsdMode == DSD_MODE_DOP)