From 83d86e885f890dd36c7c6fc117a3fa74f5260bcf Mon Sep 17 00:00:00 2001 From: Ross Owen Date: Tue, 20 Jun 2023 19:36:26 +0100 Subject: [PATCH 1/3] Respect I2S_CHANS_PER_FRAME when calculating bit-clock rates --- lib_xua/src/core/audiohub/xua_audiohub.xc | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/lib_xua/src/core/audiohub/xua_audiohub.xc b/lib_xua/src/core/audiohub/xua_audiohub.xc index e50cee24..19eca759 100755 --- a/lib_xua/src/core/audiohub/xua_audiohub.xc +++ b/lib_xua/src/core/audiohub/xua_audiohub.xc @@ -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 * e.g. 11.289600 / (176400 * 64) = 1 */ { - unsigned numBits = XUA_I2S_N_BITS * 2; - - if(XUA_PCM_FORMAT == XUA_PCM_FORMAT_TDM) - { - /* TDM has 8 channels */ - numBits *= 4; - } + unsigned numBits = XUA_I2S_N_BITS * I2S_CHANS_PER_FRAME; #if (DSD_CHANS_DAC > 0) if(dsdMode == DSD_MODE_DOP) From fa8329edaaa827b1ad8d822e45a0482a44dceb86 Mon Sep 17 00:00:00 2001 From: Ross Owen Date: Tue, 20 Jun 2023 20:04:17 +0100 Subject: [PATCH 2/3] Changelog update --- CHANGELOG.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 8ece9372..9e4581c8 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,11 @@ lib_xua Change Log ================== +UNRELEASED +---------- + + * FIXED: Respect I2S_CHANS_PER_FRAME when calculating bit-clock rates + 3.5.0 ----- From aaaf1e96529f5072b7cd397eec1f9aef76e9a28c Mon Sep 17 00:00:00 2001 From: Ross Owen Date: Wed, 21 Jun 2023 12:11:56 +0100 Subject: [PATCH 3/3] Version bump 3.5.0 -> 3.5.1 --- CHANGELOG.rst | 4 ++-- lib_xua/module_build_info | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 9e4581c8..db938372 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,8 +1,8 @@ lib_xua Change Log ================== -UNRELEASED ----------- +3.5.1 +----- * FIXED: Respect I2S_CHANS_PER_FRAME when calculating bit-clock rates diff --git a/lib_xua/module_build_info b/lib_xua/module_build_info index 3e24d952..c327e5c2 100644 --- a/lib_xua/module_build_info +++ b/lib_xua/module_build_info @@ -1,4 +1,4 @@ -VERSION = 3.5.0 +VERSION = 3.5.1 DEBUG ?= 0