From 225c13a2291e0de43e85b5cea10fa07f45e7a9a0 Mon Sep 17 00:00:00 2001 From: vaclav Date: Thu, 22 Jun 2023 19:56:02 +0200 Subject: [PATCH 1/3] experimental change for issue 579; under ISM_FB_16k4 --- lib_com/ivas_cnst.h | 4 ++++ lib_com/options.h | 2 ++ 2 files changed, 6 insertions(+) diff --git a/lib_com/ivas_cnst.h b/lib_com/ivas_cnst.h index c43692ea91..660ba5cd3c 100755 --- a/lib_com/ivas_cnst.h +++ b/lib_com/ivas_cnst.h @@ -309,8 +309,12 @@ typedef enum #define MIN_BRATE_SWB_STEREO IVAS_13k2 /* min. stereo bitrate where SWB is supported */ #define MIN_BRATE_FB_STEREO IVAS_32k /* min. SCE and stereo bitrate where FB is supported */ #ifdef ISM_FB +#ifdef ISM_FB_16k4 +#define MIN_BRATE_FB_ISM 16000 /* min. SCE bitrate where FB is supported in ISM format */ +#else #define MIN_BRATE_FB_ISM 24000 /* min. SCE bitrate where FB is supported in ISM format */ #endif +#endif #define MIN_TDM_BRATE_WB_TBE_1k05 12000 /* min. per channel bitrate where WB TBE @1.05 kbps is supported (0.35kbs at lower bitrates) */ #define MIN_BRATE_WB_TBE_1k05 9650 /* min. per channel bitrate where WB TBE @1.05 kbps is supported (0.35kbs at lower bitrates) */ diff --git a/lib_com/options.h b/lib_com/options.h index 44ebea5128..b841fda968 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -159,6 +159,8 @@ #define FIX_TCX_LOWRATE_LIMITATION /* VA: issue 577: TCX bitrate limitation only when DEBUGGING is active */ +#define ISM_FB_16k4 // VA: experimental change for issue 579 + /* ################## End DEVELOPMENT switches ######################### */ /* clang-format on */ -- GitLab From 6ca77538f0ddfdc93d3c2fca59b75bb1eb20d684 Mon Sep 17 00:00:00 2001 From: vaclav Date: Fri, 23 Jun 2023 10:06:51 +0200 Subject: [PATCH 2/3] fix GSC decoder, under ISM_FB_16k4 --- lib_dec/gs_dec.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib_dec/gs_dec.c b/lib_dec/gs_dec.c index ff684b47d3..1244f97793 100644 --- a/lib_dec/gs_dec.c +++ b/lib_dec/gs_dec.c @@ -104,7 +104,11 @@ void decod_audio( } /* safety check in case of bit errors */ +#ifdef ISM_FB_16k4 + if ( st->GSC_noisy_speech && st->bwidth < SWB && st->GSC_IVAS_mode == 0 ) +#else if ( st->GSC_noisy_speech && st->bwidth != SWB && st->GSC_IVAS_mode == 0 ) +#endif { st->BER_detect = 1; st->GSC_noisy_speech = 0; -- GitLab From 39515000707679f654721b0215ea8cb2e4b9b8a1 Mon Sep 17 00:00:00 2001 From: Vladimir Malenovsky Date: Mon, 26 Jun 2023 12:28:33 +0200 Subject: [PATCH 3/3] change BW from SWB to FB in NxISM conditions to match the EVS codec --- lib_com/options.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib_com/options.h b/lib_com/options.h index 21b8e7ca99..41e6477c6b 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -158,9 +158,7 @@ #define FIX_UNCLR_ISSUE /* VoiceAge: issue 574: Fix UNCLR mis-classifications in noisy speech stereo */ #define FIX_TCX_LOWRATE_LIMITATION /* VA: issue 577: TCX bitrate limitation only when DEBUGGING is active */ #define FIX_575_LOW_OVERLAP_PLC_RECOVERY /* FhG: Issue 575 fix for PLC and transistion to TCX5*/ - - -#define ISM_FB_16k4 // VA: experimental change for issue 579 +#define ISM_FB_16k4 /* VA: Issue: 579: change BW from SWB to FB in NxISM conditions to match the EVS codec */ /* ################## End DEVELOPMENT switches ######################### */ /* clang-format on */ -- GitLab