Commit c77993ed authored Jun 27, 2023 by Marek Szczerba

Merge branch '571-reverb-not-activated-for-discrete-and-parametric-ism' into...

Merge branch '571-reverb-not-activated-for-discrete-and-parametric-ism' into 571-reverb-not-activated-for-discrete-and-parametric-ism-draft

parents 9c109359 28e1baf1

lib_com/ivas_cnst.h

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -309,8 +309,12 @@ typedef enum
	#define MIN_BRATE_SWB_STEREO IVAS_13k2 /* min. stereo bitrate where SWB is supported */		#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 */		#define MIN_BRATE_FB_STEREO IVAS_32k /* min. SCE and stereo bitrate where FB is supported */
	#ifdef ISM_FB		#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 */		#define MIN_BRATE_FB_ISM 24000 /* min. SCE bitrate where FB is supported in ISM format */
	#endif		#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_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) */		#define MIN_BRATE_WB_TBE_1k05 9650 /* min. per channel bitrate where WB TBE @1.05 kbps is supported (0.35kbs at lower bitrates) */

lib_com/options.h

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -159,8 +159,10 @@
	#define FIX_UNCLR_ISSUE /* VoiceAge: issue 574: Fix UNCLR mis-classifications in noisy speech stereo */		#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_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 FIX_575_LOW_OVERLAP_PLC_RECOVERY /* FhG: Issue 575 fix for PLC and transistion to TCX5*/
			#define ISM_FB_16k4 /* VA: Issue: 579: change BW from SWB to FB in NxISM conditions to match the EVS codec */
	#define FIX_580_PARAMMC_ENER_BURSTS /* FhG: issue 580: energy bursts due to ILD holding when energy relations change too much */		#define FIX_580_PARAMMC_ENER_BURSTS /* FhG: issue 580: energy bursts due to ILD holding when energy relations change too much */


	/* ################## End DEVELOPMENT switches ######################### */		/* ################## End DEVELOPMENT switches ######################### */
	/* clang-format on */		/* clang-format on */

lib_dec/gs_dec.c

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -104,7 +104,11 @@ void decod_audio(
	}		}

	/* safety check in case of bit errors */		/* 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 )		if ( st->GSC_noisy_speech && st->bwidth != SWB && st->GSC_IVAS_mode == 0 )
			#endif
	{		{
	st->BER_detect = 1;		st->BER_detect = 1;
	st->GSC_noisy_speech = 0;		st->GSC_noisy_speech = 0;