From e994895c9ac7a857a6c34edd3a8dda9e182c052a Mon Sep 17 00:00:00 2001 From: Michael Banther Date: Tue, 25 Jun 2019 11:53:57 +0100 Subject: [PATCH 1/2] Changes to remove build warnings. Altered the braces in initialisation lists to match the underlying arrangement of nested lists. The defined type (typedef) of the array includes a list which the initialisation lists did not take into account. --- CHANGELOG.rst | 1 + .../src/multirate_hifi/asrc/src_mrhf_asrc.c | 72 ++++++++-------- .../src/multirate_hifi/ssrc/src_mrhf_ssrc.c | 85 +++++++++---------- 3 files changed, 79 insertions(+), 79 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 6116c1c8..fa25933d 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -6,6 +6,7 @@ lib_src change log * RESOLVED: correct compensation factor for voice upsampling * ADDED: test of voice unity gain + * CHANGED: initialisation lists to avoid warnings when building 1.1.0 ----- diff --git a/lib_src/src/multirate_hifi/asrc/src_mrhf_asrc.c b/lib_src/src/multirate_hifi/asrc/src_mrhf_asrc.c index f59ddb98..9be11c8f 100644 --- a/lib_src/src/multirate_hifi/asrc/src_mrhf_asrc.c +++ b/lib_src/src/multirate_hifi/asrc/src_mrhf_asrc.c @@ -119,57 +119,57 @@ ASRCFiltersIDs_t sASRCFiltersIDs[ASRC_N_FS][ASRC_N_FS] = / { { // Fsin = 44.1kHz // F1 F2 - {FILTER_DEFS_ASRC_FIR_UP_ID, FILTER_DEFS_ASRC_FIR_NONE_ID}, // Fsout = 44.1kHz - {FILTER_DEFS_ASRC_FIR_UP_ID, FILTER_DEFS_ASRC_FIR_NONE_ID}, // Fsout = 48kHz - {FILTER_DEFS_ASRC_FIR_UP_ID, FILTER_DEFS_ASRC_FIR_NONE_ID}, // Fsout = 88.2kHz - {FILTER_DEFS_ASRC_FIR_UP_ID, FILTER_DEFS_ASRC_FIR_NONE_ID}, // Fsout = 96kHz - {FILTER_DEFS_ASRC_FIR_UP_ID, FILTER_DEFS_ASRC_FIR_NONE_ID}, // Fsout = 176.4kHz - {FILTER_DEFS_ASRC_FIR_UP_ID, FILTER_DEFS_ASRC_FIR_NONE_ID} // Fsout = 192kHz + {{FILTER_DEFS_ASRC_FIR_UP_ID, FILTER_DEFS_ASRC_FIR_NONE_ID}}, // Fsout = 44.1kHz + {{FILTER_DEFS_ASRC_FIR_UP_ID, FILTER_DEFS_ASRC_FIR_NONE_ID}}, // Fsout = 48kHz + {{FILTER_DEFS_ASRC_FIR_UP_ID, FILTER_DEFS_ASRC_FIR_NONE_ID}}, // Fsout = 88.2kHz + {{FILTER_DEFS_ASRC_FIR_UP_ID, FILTER_DEFS_ASRC_FIR_NONE_ID}}, // Fsout = 96kHz + {{FILTER_DEFS_ASRC_FIR_UP_ID, FILTER_DEFS_ASRC_FIR_NONE_ID}}, // Fsout = 176.4kHz + {{FILTER_DEFS_ASRC_FIR_UP_ID, FILTER_DEFS_ASRC_FIR_NONE_ID}} // Fsout = 192kHz }, { // Fsin = 48kHz // F1 F2 - {FILTER_DEFS_ASRC_FIR_UP4844_ID, FILTER_DEFS_ASRC_FIR_NONE_ID}, // Fsout = 44.1kHz - {FILTER_DEFS_ASRC_FIR_UP_ID, FILTER_DEFS_ASRC_FIR_NONE_ID}, // Fsout = 48kHz - {FILTER_DEFS_ASRC_FIR_UP_ID, FILTER_DEFS_ASRC_FIR_NONE_ID}, // Fsout = 88.2kHz - {FILTER_DEFS_ASRC_FIR_UP_ID, FILTER_DEFS_ASRC_FIR_NONE_ID}, // Fsout = 96kHz - {FILTER_DEFS_ASRC_FIR_UP_ID, FILTER_DEFS_ASRC_FIR_NONE_ID}, // Fsout = 176.4kHz - {FILTER_DEFS_ASRC_FIR_UP_ID, FILTER_DEFS_ASRC_FIR_NONE_ID} // Fsout = 192kHz + {{FILTER_DEFS_ASRC_FIR_UP4844_ID, FILTER_DEFS_ASRC_FIR_NONE_ID}}, // Fsout = 44.1kHz + {{FILTER_DEFS_ASRC_FIR_UP_ID, FILTER_DEFS_ASRC_FIR_NONE_ID}}, // Fsout = 48kHz + {{FILTER_DEFS_ASRC_FIR_UP_ID, FILTER_DEFS_ASRC_FIR_NONE_ID}}, // Fsout = 88.2kHz + {{FILTER_DEFS_ASRC_FIR_UP_ID, FILTER_DEFS_ASRC_FIR_NONE_ID}}, // Fsout = 96kHz + {{FILTER_DEFS_ASRC_FIR_UP_ID, FILTER_DEFS_ASRC_FIR_NONE_ID}}, // Fsout = 176.4kHz + {{FILTER_DEFS_ASRC_FIR_UP_ID, FILTER_DEFS_ASRC_FIR_NONE_ID}} // Fsout = 192kHz }, { // Fsin = 88.2kHz // F1 F2 - {FILTER_DEFS_ASRC_FIR_BL_ID, FILTER_DEFS_ASRC_FIR_NONE_ID}, // Fsout = 44.1kHz - {FILTER_DEFS_ASRC_FIR_BL8848_ID, FILTER_DEFS_ASRC_FIR_NONE_ID}, // Fsout = 48kHz - {FILTER_DEFS_ASRC_FIR_UP_ID, FILTER_DEFS_ASRC_FIR_NONE_ID}, // Fsout = 88.2kHz - {FILTER_DEFS_ASRC_FIR_UP_ID, FILTER_DEFS_ASRC_FIR_NONE_ID}, // Fsout = 96kHz - {FILTER_DEFS_ASRC_FIR_UP_ID, FILTER_DEFS_ASRC_FIR_NONE_ID}, // Fsout = 176.4kHz - {FILTER_DEFS_ASRC_FIR_UP_ID, FILTER_DEFS_ASRC_FIR_NONE_ID} // Fsout = 192kHz + {{FILTER_DEFS_ASRC_FIR_BL_ID, FILTER_DEFS_ASRC_FIR_NONE_ID}}, // Fsout = 44.1kHz + {{FILTER_DEFS_ASRC_FIR_BL8848_ID, FILTER_DEFS_ASRC_FIR_NONE_ID}}, // Fsout = 48kHz + {{FILTER_DEFS_ASRC_FIR_UP_ID, FILTER_DEFS_ASRC_FIR_NONE_ID}}, // Fsout = 88.2kHz + {{FILTER_DEFS_ASRC_FIR_UP_ID, FILTER_DEFS_ASRC_FIR_NONE_ID}}, // Fsout = 96kHz + {{FILTER_DEFS_ASRC_FIR_UP_ID, FILTER_DEFS_ASRC_FIR_NONE_ID}}, // Fsout = 176.4kHz + {{FILTER_DEFS_ASRC_FIR_UP_ID, FILTER_DEFS_ASRC_FIR_NONE_ID}} // Fsout = 192kHz }, { // Fsin = 96kHz // F1 F2 - {FILTER_DEFS_ASRC_FIR_BL9644_ID, FILTER_DEFS_ASRC_FIR_NONE_ID}, // Fsout = 44.1kHz - {FILTER_DEFS_ASRC_FIR_BL_ID, FILTER_DEFS_ASRC_FIR_NONE_ID}, // Fsout = 48kHz - {FILTER_DEFS_ASRC_FIR_UP4844_ID, FILTER_DEFS_ASRC_FIR_NONE_ID}, // Fsout = 88.2kHz - {FILTER_DEFS_ASRC_FIR_UP_ID, FILTER_DEFS_ASRC_FIR_NONE_ID}, // Fsout = 96kHz - {FILTER_DEFS_ASRC_FIR_UP_ID, FILTER_DEFS_ASRC_FIR_NONE_ID}, // Fsout = 176.4kHz - {FILTER_DEFS_ASRC_FIR_UP_ID, FILTER_DEFS_ASRC_FIR_NONE_ID} // Fsout = 192kHz + {{FILTER_DEFS_ASRC_FIR_BL9644_ID, FILTER_DEFS_ASRC_FIR_NONE_ID}}, // Fsout = 44.1kHz + {{FILTER_DEFS_ASRC_FIR_BL_ID, FILTER_DEFS_ASRC_FIR_NONE_ID}}, // Fsout = 48kHz + {{FILTER_DEFS_ASRC_FIR_UP4844_ID, FILTER_DEFS_ASRC_FIR_NONE_ID}}, // Fsout = 88.2kHz + {{FILTER_DEFS_ASRC_FIR_UP_ID, FILTER_DEFS_ASRC_FIR_NONE_ID}}, // Fsout = 96kHz + {{FILTER_DEFS_ASRC_FIR_UP_ID, FILTER_DEFS_ASRC_FIR_NONE_ID}}, // Fsout = 176.4kHz + {{FILTER_DEFS_ASRC_FIR_UP_ID, FILTER_DEFS_ASRC_FIR_NONE_ID}} // Fsout = 192kHz }, { // Fsin = 176.4kHz // F1 F2 - {FILTER_DEFS_ASRC_FIR_DS_ID, FILTER_DEFS_ASRC_FIR_BL_ID}, // Fsout = 44.1kHz - {FILTER_DEFS_ASRC_FIR_DS_ID, FILTER_DEFS_ASRC_FIR_BL8848_ID}, // Fsout = 48kHz - {FITLER_DEFS_ASRC_FIR_BLF_ID, FILTER_DEFS_ASRC_FIR_NONE_ID,}, // Fsout = 88.2kHz - {FILTER_DEFS_ASRC_FIR_BL17696_ID, FILTER_DEFS_ASRC_FIR_NONE_ID}, // Fsout = 96kHz - {FILTER_DEFS_ASRC_FIR_UPF_ID, FILTER_DEFS_ASRC_FIR_NONE_ID}, // Fsout = 176.4kHz - {FILTER_DEFS_ASRC_FIR_UPF_ID, FILTER_DEFS_ASRC_FIR_NONE_ID} // Fsout = 192kHz + {{FILTER_DEFS_ASRC_FIR_DS_ID, FILTER_DEFS_ASRC_FIR_BL_ID}}, // Fsout = 44.1kHz + {{FILTER_DEFS_ASRC_FIR_DS_ID, FILTER_DEFS_ASRC_FIR_BL8848_ID}}, // Fsout = 48kHz + {{FITLER_DEFS_ASRC_FIR_BLF_ID, FILTER_DEFS_ASRC_FIR_NONE_ID,}}, // Fsout = 88.2kHz + {{FILTER_DEFS_ASRC_FIR_BL17696_ID, FILTER_DEFS_ASRC_FIR_NONE_ID}}, // Fsout = 96kHz + {{FILTER_DEFS_ASRC_FIR_UPF_ID, FILTER_DEFS_ASRC_FIR_NONE_ID}}, // Fsout = 176.4kHz + {{FILTER_DEFS_ASRC_FIR_UPF_ID, FILTER_DEFS_ASRC_FIR_NONE_ID}} // Fsout = 192kHz }, { // Fsin = 192kHz // F1 F2 - {FILTER_DEFS_ASRC_FIR_DS_ID, FILTER_DEFS_ASRC_FIR_BL9644_ID}, // Fsout = 44.1kHz - {FILTER_DEFS_ASRC_FIR_DS_ID, FILTER_DEFS_ASRC_FIR_BL_ID}, // Fsout = 48kHz - {FITLER_DEFS_ASRC_FIR_BL19288_ID, FILTER_DEFS_ASRC_FIR_NONE_ID}, // Fsout = 88.2kHz - {FITLER_DEFS_ASRC_FIR_BLF_ID, FILTER_DEFS_ASRC_FIR_NONE_ID}, // Fsout = 96kHz - {FILTER_DEFS_ASRC_FIR_UP192176_ID, FILTER_DEFS_ASRC_FIR_NONE_ID}, // Fsout = 176.4kHz - {FILTER_DEFS_ASRC_FIR_UPF_ID, FILTER_DEFS_ASRC_FIR_NONE_ID} // Fsout = 192kHz + {{FILTER_DEFS_ASRC_FIR_DS_ID, FILTER_DEFS_ASRC_FIR_BL9644_ID}}, // Fsout = 44.1kHz + {{FILTER_DEFS_ASRC_FIR_DS_ID, FILTER_DEFS_ASRC_FIR_BL_ID}}, // Fsout = 48kHz + {{FITLER_DEFS_ASRC_FIR_BL19288_ID, FILTER_DEFS_ASRC_FIR_NONE_ID}}, // Fsout = 88.2kHz + {{FITLER_DEFS_ASRC_FIR_BLF_ID, FILTER_DEFS_ASRC_FIR_NONE_ID}}, // Fsout = 96kHz + {{FILTER_DEFS_ASRC_FIR_UP192176_ID, FILTER_DEFS_ASRC_FIR_NONE_ID}}, // Fsout = 176.4kHz + {{FILTER_DEFS_ASRC_FIR_UPF_ID, FILTER_DEFS_ASRC_FIR_NONE_ID}} // Fsout = 192kHz } }; diff --git a/lib_src/src/multirate_hifi/ssrc/src_mrhf_ssrc.c b/lib_src/src/multirate_hifi/ssrc/src_mrhf_ssrc.c index 2f942015..d741235f 100644 --- a/lib_src/src/multirate_hifi/ssrc/src_mrhf_ssrc.c +++ b/lib_src/src/multirate_hifi/ssrc/src_mrhf_ssrc.c @@ -67,59 +67,58 @@ SSRCFiltersIDs_t sFiltersIDs[SSRC_N_FS][SSRC_N_FS] = // Filter configuration table [Fsin][Fsout] { { // Fsin = 44.1kHz - // F1 F2 F3 Phase step - {FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_PPFIR_NONE_ID, FILTER_DEFS_PPFIR_PHASE_STEP_0}, // Fsout = 44.1kHz - {FILTER_DEFS_SSRC_FIR_UP_ID, FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_PPFIR_HS320_ID, FILTER_DEFS_PPFIR_PHASE_STEP_294}, // Fsout = 48kHz - {FILTER_DEFS_SSRC_FIR_UP_ID, FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_PPFIR_NONE_ID, FILTER_DEFS_PPFIR_PHASE_STEP_0}, // Fsout = 88.2kHz - {FILTER_DEFS_SSRC_FIR_UP_ID, FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_PPFIR_HS320_ID, FILTER_DEFS_PPFIR_PHASE_STEP_147}, // Fsout = 96kHz - {FILTER_DEFS_SSRC_FIR_UP_ID, FILTER_DEFS_SSRC_FIR_OS_ID, FILTER_DEFS_PPFIR_NONE_ID, FILTER_DEFS_PPFIR_PHASE_STEP_0}, // Fsout = 176.4kHz - {FILTER_DEFS_SSRC_FIR_UP_ID, FILTER_DEFS_SSRC_FIR_OS_ID, FILTER_DEFS_PPFIR_HS320_ID, FILTER_DEFS_PPFIR_PHASE_STEP_147} // Fsout = 192kHz + // F1 F2 F3 Phase step + {{FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_PPFIR_NONE_ID}, FILTER_DEFS_PPFIR_PHASE_STEP_0}, // Fsout = 44.1kHz + {{FILTER_DEFS_SSRC_FIR_UP_ID, FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_PPFIR_HS320_ID}, FILTER_DEFS_PPFIR_PHASE_STEP_294}, // Fsout = 48kHz + {{FILTER_DEFS_SSRC_FIR_UP_ID, FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_PPFIR_NONE_ID}, FILTER_DEFS_PPFIR_PHASE_STEP_0}, // Fsout = 88.2kHz + {{FILTER_DEFS_SSRC_FIR_UP_ID, FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_PPFIR_HS320_ID}, FILTER_DEFS_PPFIR_PHASE_STEP_147}, // Fsout = 96kHz + {{FILTER_DEFS_SSRC_FIR_UP_ID, FILTER_DEFS_SSRC_FIR_OS_ID, FILTER_DEFS_PPFIR_NONE_ID}, FILTER_DEFS_PPFIR_PHASE_STEP_0}, // Fsout = 176.4kHz + {{FILTER_DEFS_SSRC_FIR_UP_ID, FILTER_DEFS_SSRC_FIR_OS_ID, FILTER_DEFS_PPFIR_HS320_ID}, FILTER_DEFS_PPFIR_PHASE_STEP_147} // Fsout = 192kHz }, { // Fsin = 48kHz - // F1 F2 F3 Phase step - {FILTER_DEFS_SSRC_FIR_UP4844_ID, FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_PPFIR_HS294_ID, FILTER_DEFS_PPFIR_PHASE_STEP_320}, // Fsout = 44.1kHz - {FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_PPFIR_NONE_ID, FILTER_DEFS_PPFIR_PHASE_STEP_0}, // Fsout = 48kHz - {FILTER_DEFS_SSRC_FIR_UP_ID, FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_PPFIR_HS294_ID, FILTER_DEFS_PPFIR_PHASE_STEP_160}, // Fsout = 88.2kHz - {FILTER_DEFS_SSRC_FIR_UP_ID, FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_PPFIR_NONE_ID, FILTER_DEFS_PPFIR_PHASE_STEP_0}, // Fsout = 96kHz - {FILTER_DEFS_SSRC_FIR_UP_ID, FILTER_DEFS_SSRC_FIR_OS_ID, FILTER_DEFS_PPFIR_HS294_ID, FILTER_DEFS_PPFIR_PHASE_STEP_160}, // Fsout = 176.4kHz - {FILTER_DEFS_SSRC_FIR_UP_ID, FILTER_DEFS_SSRC_FIR_OS_ID, FILTER_DEFS_PPFIR_NONE_ID, FILTER_DEFS_PPFIR_PHASE_STEP_0} // Fsout = 192kHz + // F1 F2 F3 Phase step + {{FILTER_DEFS_SSRC_FIR_UP4844_ID, FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_PPFIR_HS294_ID}, FILTER_DEFS_PPFIR_PHASE_STEP_320}, // Fsout = 44.1kHz + {{FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_PPFIR_NONE_ID}, FILTER_DEFS_PPFIR_PHASE_STEP_0}, // Fsout = 48kHz + {{FILTER_DEFS_SSRC_FIR_UP_ID, FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_PPFIR_HS294_ID}, FILTER_DEFS_PPFIR_PHASE_STEP_160}, // Fsout = 88.2kHz + {{FILTER_DEFS_SSRC_FIR_UP_ID, FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_PPFIR_NONE_ID}, FILTER_DEFS_PPFIR_PHASE_STEP_0}, // Fsout = 96kHz + {{FILTER_DEFS_SSRC_FIR_UP_ID, FILTER_DEFS_SSRC_FIR_OS_ID, FILTER_DEFS_PPFIR_HS294_ID}, FILTER_DEFS_PPFIR_PHASE_STEP_160}, // Fsout = 176.4kHz + {{FILTER_DEFS_SSRC_FIR_UP_ID, FILTER_DEFS_SSRC_FIR_OS_ID, FILTER_DEFS_PPFIR_NONE_ID}, FILTER_DEFS_PPFIR_PHASE_STEP_0} // Fsout = 192kHz }, { // Fsin = 88.2kHz - // F1 F2 F3 Phase step - {FILTER_DEFS_SSRC_FIR_BL_ID, FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_PPFIR_NONE_ID, FILTER_DEFS_PPFIR_PHASE_STEP_0}, // Fsout = 44.1kHz - {FILTER_DEFS_SSRC_FIR_BL8848_ID, FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_PPFIR_HS320_ID, FILTER_DEFS_PPFIR_PHASE_STEP_294}, // Fsout = 48kHz - {FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_PPFIR_NONE_ID, FILTER_DEFS_PPFIR_PHASE_STEP_0}, // Fsout = 88.2kHz - {FILTER_DEFS_SSRC_FIR_UP_ID, FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_PPFIR_HS320_ID, FILTER_DEFS_PPFIR_PHASE_STEP_294}, // Fsout = 96kHz - {FILTER_DEFS_SSRC_FIR_UP_ID, FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_PPFIR_NONE_ID, FILTER_DEFS_PPFIR_PHASE_STEP_0}, // Fsout = 176.4kHz - {FILTER_DEFS_SSRC_FIR_UP_ID, FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_PPFIR_HS320_ID, FILTER_DEFS_PPFIR_PHASE_STEP_147} // Fsout = 192kHz + // F1 F2 F3 Phase step + {{FILTER_DEFS_SSRC_FIR_BL_ID, FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_PPFIR_NONE_ID}, FILTER_DEFS_PPFIR_PHASE_STEP_0}, // Fsout = 44.1kHz + {{FILTER_DEFS_SSRC_FIR_BL8848_ID, FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_PPFIR_HS320_ID}, FILTER_DEFS_PPFIR_PHASE_STEP_294}, // Fsout = 48kHz + {{FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_PPFIR_NONE_ID}, FILTER_DEFS_PPFIR_PHASE_STEP_0}, // Fsout = 88.2kHz + {{FILTER_DEFS_SSRC_FIR_UP_ID, FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_PPFIR_HS320_ID}, FILTER_DEFS_PPFIR_PHASE_STEP_294}, // Fsout = 96kHz + {{FILTER_DEFS_SSRC_FIR_UP_ID, FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_PPFIR_NONE_ID}, FILTER_DEFS_PPFIR_PHASE_STEP_0}, // Fsout = 176.4kHz + {{FILTER_DEFS_SSRC_FIR_UP_ID, FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_PPFIR_HS320_ID}, FILTER_DEFS_PPFIR_PHASE_STEP_147} // Fsout = 192kHz }, { // Fsin = 96kHz - // F1 F2 F3 Phase step - {FILTER_DEFS_SSRC_FIR_BL9644_ID, FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_PPFIR_HS294_ID, FILTER_DEFS_PPFIR_PHASE_STEP_320}, // Fsout = 44.1kHz - {FILTER_DEFS_SSRC_FIR_BL_ID, FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_PPFIR_NONE_ID, FILTER_DEFS_PPFIR_PHASE_STEP_0}, // Fsout = 48kHz - {FILTER_DEFS_SSRC_FIR_UP4844_ID, FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_PPFIR_HS294_ID, FILTER_DEFS_PPFIR_PHASE_STEP_320}, // Fsout = 88.2kHz - {FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_PPFIR_NONE_ID, FILTER_DEFS_PPFIR_PHASE_STEP_0}, // Fsout = 96kHz - {FILTER_DEFS_SSRC_FIR_UP_ID, FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_PPFIR_HS294_ID, FILTER_DEFS_PPFIR_PHASE_STEP_160}, // Fsout = 176.4kHz - {FILTER_DEFS_SSRC_FIR_UP_ID, FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_PPFIR_NONE_ID, FILTER_DEFS_PPFIR_PHASE_STEP_0} // Fsout = 192kHz + // F1 F2 F3 Phase step + {{FILTER_DEFS_SSRC_FIR_BL9644_ID, FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_PPFIR_HS294_ID}, FILTER_DEFS_PPFIR_PHASE_STEP_320}, // Fsout = 44.1kHz + {{FILTER_DEFS_SSRC_FIR_BL_ID, FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_PPFIR_NONE_ID}, FILTER_DEFS_PPFIR_PHASE_STEP_0}, // Fsout = 48kHz + {{FILTER_DEFS_SSRC_FIR_UP4844_ID, FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_PPFIR_HS294_ID}, FILTER_DEFS_PPFIR_PHASE_STEP_320}, // Fsout = 88.2kHz + {{FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_PPFIR_NONE_ID}, FILTER_DEFS_PPFIR_PHASE_STEP_0}, // Fsout = 96kHz + {{FILTER_DEFS_SSRC_FIR_UP_ID, FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_PPFIR_HS294_ID}, FILTER_DEFS_PPFIR_PHASE_STEP_160}, // Fsout = 176.4kHz + {{FILTER_DEFS_SSRC_FIR_UP_ID, FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_PPFIR_NONE_ID}, FILTER_DEFS_PPFIR_PHASE_STEP_0} // Fsout = 192kHz }, { // Fsin = 176.4kHz - // F1 F2 F3 Phase step - {FILTER_DEFS_SSRC_FIR_DS_ID, FILTER_DEFS_SSRC_FIR_BL_ID, FILTER_DEFS_PPFIR_NONE_ID, FILTER_DEFS_PPFIR_PHASE_STEP_0}, // Fsout = 44.1kHz - {FILTER_DEFS_SSRC_FIR_DS_ID, FILTER_DEFS_SSRC_FIR_BL8848_ID, FILTER_DEFS_PPFIR_HS320_ID, FILTER_DEFS_PPFIR_PHASE_STEP_294}, // Fsout = 48kHz - {FILTER_DEFS_SSRC_FIR_BL_ID, FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_PPFIR_NONE_ID, FILTER_DEFS_PPFIR_PHASE_STEP_0}, // Fsout = 88.2kHz - {FILTER_DEFS_SSRC_FIR_BL17696_ID, FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_PPFIR_HS320_ID, FILTER_DEFS_PPFIR_PHASE_STEP_294}, // Fsout = 96kHz - {FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_PPFIR_NONE_ID, FILTER_DEFS_PPFIR_PHASE_STEP_0}, // Fsout = 176.4kHz - {FILTER_DEFS_SSRC_FIR_UPF_ID, FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_PPFIR_HS320_ID, FILTER_DEFS_PPFIR_PHASE_STEP_294} // Fsout = 192kHz + // F1 F2 F3 Phase step + {{FILTER_DEFS_SSRC_FIR_DS_ID, FILTER_DEFS_SSRC_FIR_BL_ID, FILTER_DEFS_PPFIR_NONE_ID}, FILTER_DEFS_PPFIR_PHASE_STEP_0}, // Fsout = 44.1kHz + {{FILTER_DEFS_SSRC_FIR_DS_ID, FILTER_DEFS_SSRC_FIR_BL8848_ID, FILTER_DEFS_PPFIR_HS320_ID}, FILTER_DEFS_PPFIR_PHASE_STEP_294}, // Fsout = 48kHz + {{FILTER_DEFS_SSRC_FIR_BL_ID, FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_PPFIR_NONE_ID}, FILTER_DEFS_PPFIR_PHASE_STEP_0}, // Fsout = 88.2kHz + {{FILTER_DEFS_SSRC_FIR_BL17696_ID, FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_PPFIR_HS320_ID}, FILTER_DEFS_PPFIR_PHASE_STEP_294}, // Fsout = 96kHz + {{FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_PPFIR_NONE_ID}, FILTER_DEFS_PPFIR_PHASE_STEP_0}, // Fsout = 176.4kHz + {{FILTER_DEFS_SSRC_FIR_UPF_ID, FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_PPFIR_HS320_ID}, FILTER_DEFS_PPFIR_PHASE_STEP_294} // Fsout = 192kHz }, { // Fsin = 192kHz - // F1 F2 F3 Phase step - {FILTER_DEFS_SSRC_FIR_DS_ID, FILTER_DEFS_SSRC_FIR_BL9644_ID, FILTER_DEFS_PPFIR_HS294_ID, FILTER_DEFS_PPFIR_PHASE_STEP_320}, // Fsout = 44.1kHz - {FILTER_DEFS_SSRC_FIR_DS_ID, FILTER_DEFS_SSRC_FIR_BL_ID, FILTER_DEFS_PPFIR_NONE_ID, FILTER_DEFS_PPFIR_PHASE_STEP_0}, // Fsout = 48kHz - {FITLER_DEFS_SSRC_FIR_BL19288_ID, FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_PPFIR_HS294_ID, FILTER_DEFS_PPFIR_PHASE_STEP_320}, // Fsout = 88.2kHz - - {FILTER_DEFS_SSRC_FIR_BL_ID, FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_PPFIR_NONE_ID, FILTER_DEFS_PPFIR_PHASE_STEP_0}, // Fsout = 96kHz - {FILTER_DEFS_SSRC_FIR_UP192176_ID, FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_PPFIR_HS294_ID, FILTER_DEFS_PPFIR_PHASE_STEP_320}, // Fsout = 176.4kHz - {FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_PPFIR_NONE_ID, FILTER_DEFS_PPFIR_PHASE_STEP_0} // Fsout = 192kHz + // F1 F2 F3 Phase step + {{FILTER_DEFS_SSRC_FIR_DS_ID, FILTER_DEFS_SSRC_FIR_BL9644_ID, FILTER_DEFS_PPFIR_HS294_ID}, FILTER_DEFS_PPFIR_PHASE_STEP_320}, // Fsout = 44.1kHz + {{FILTER_DEFS_SSRC_FIR_DS_ID, FILTER_DEFS_SSRC_FIR_BL_ID, FILTER_DEFS_PPFIR_NONE_ID}, FILTER_DEFS_PPFIR_PHASE_STEP_0}, // Fsout = 48kHz + {{FITLER_DEFS_SSRC_FIR_BL19288_ID, FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_PPFIR_HS294_ID}, FILTER_DEFS_PPFIR_PHASE_STEP_320}, // Fsout = 88.2kHz + {{FILTER_DEFS_SSRC_FIR_BL_ID, FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_PPFIR_NONE_ID}, FILTER_DEFS_PPFIR_PHASE_STEP_0}, // Fsout = 96kHz + {{FILTER_DEFS_SSRC_FIR_UP192176_ID, FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_PPFIR_HS294_ID}, FILTER_DEFS_PPFIR_PHASE_STEP_320}, // Fsout = 176.4kHz + {{FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_SSRC_FIR_NONE_ID, FILTER_DEFS_PPFIR_NONE_ID}, FILTER_DEFS_PPFIR_PHASE_STEP_0} // Fsout = 192kHz } }; From 32102301d1e0dd176baceae5f323f7349ed96317 Mon Sep 17 00:00:00 2001 From: Michael Banther Date: Tue, 25 Jun 2019 14:39:25 +0100 Subject: [PATCH 2/2] Corrected the change log entry to the correct version. --- CHANGELOG.rst | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index fa25933d..08fd38f1 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,12 +1,16 @@ lib_src change log ================== +1.1.2 +----- + + * CHANGED: initialisation lists to avoid warnings when building + 1.1.1 ----- * RESOLVED: correct compensation factor for voice upsampling * ADDED: test of voice unity gain - * CHANGED: initialisation lists to avoid warnings when building 1.1.0 -----