Merge branch 'main' into basop-2618-residual-plc-attenuation-ignores-q_fac-sqrt32-exponent (1e758ec4) · Commits · SA4 / Audio / IVAS BASOP

lib_com/options.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -90,6 +90,7 @@
		#define FIX_ISSUE_2613_WRONG_COMP_MACRO /* FhG: basop issue 2613: Inconsistent comparison macros in function tdm_SCh_LSF_intra_pred_fx*/
		#define FIX_ISSUE_2611_WRONG_COMMENT /* FhG: basop issue 2611: Wrong Q value comment in fucntion stereo_dft_sg_recovery_fx()*/
		#define FIX_BASOP_2550_TCX_ENC_MEM_UPDATE /* FhG: fix condition in tcx_encoder_memory_update__fx(), bring inline with float /
		#define FIX_BASOP_2620_ICBWE_GSMAPPING_DEAD_CLAMP /* FhG: remove dead (always-overwritten) gsMapping clamp in ic_bwe_enc_gsMapping_fx; float ref has no clamp */

		/* #################### End BE switches ################################## */

		@@ -99,6 +100,8 @@
		#define FIX_1576_LCLD_CRASH_DIFFERENT_CODEC_ISAR_FRAME_SIZE /* Dolby: float issue 1576: fix for crash in LCLD mode when codec frame size is less than isar frame size */
		#define FIX_BASOP_2442_MASA2TC_TO_MONO_AND_AMBI /* Nokia: BASOP issue 2442: Increase accuracy of computations and add additional gain clamp for low energy decorrelated signal rendering. */
		#define FIX_FMSW_DEC_EXT /* float issue 1566: fix EXT output in format switching */
		#define FIX_BASOP_2612_RESET_DECIM_MEM /* FhG: BASOP #2612: reset (zero) the 16k resampler memory of the secondary channel on DFT->TD stereo switch (otherwise -> fx overshoot) */
		#define FIX_BASOP_2621_STEREO_CNG_NOISY_SPEECH_QSHIFT /* FhG: BASOP #2621: stereo_dft_generate_comfort_noise_fx flag_noisy_speech: compare (lp_speech-lp_noise) Q23 diff against 28.0 in Q23 (was vs integer 28 with q_lp_noise=0) */
		#define FIX_ISSUE_2618_PLC_RES_ATT_SCALING /* FhG: BASOP #2618: residual PLC burst attenuation, apply divide/Sqrt32 exponent so fac tracks exponent correctly */

		/* ##################### End NON-BE switches ########################### */

lib_dec/fd_cng_dec_fx.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -2128,7 +2128,7 @@ void noisy_speech_detection_fx(
		logTotalNoise = Mpy_32_16_1( L_add( logTotalNoise, logTotalNoiseExp ), 24660 /0.75257498916 Q15/ ); /Q31 - logTotalNoiseExp/
		}

		hFdCngDec->lp_noise = L_add( Mpy_32_16_1( hFdCngDec->lp_noise, 32604 /0.995 Q15/ ), L_shr( Mpy_32_16_1( logTotalNoise, 20972 /0.64 Q15/ ), 7 ) ); /hFdCngDec->q_lp_noise/
		hFdCngDec->lp_noise = L_add( Mpy_32_16_1( hFdCngDec->lp_noise, 32604 /0.995 Q15/ ), L_shr( Mpy_32_16_1( logTotalNoise, 20972 /0.64 Q15/ ), 7 ) ); /Q23/
		move32();
		}
		ELSE
		@@ -2175,7 +2175,7 @@ void noisy_speech_detection_fx(
		}
		}

		hFdCngDec->lp_speech = L_add( Mpy_32_16_1( hFdCngDec->lp_speech, 32604 /0.995 Q15/ ), L_shr( Mpy_32_16_1( logEtot, 20972 /0.64 Q15/ ), 7 ) ); /hFdCngDec->q_lp_speech/
		hFdCngDec->lp_speech = L_add( Mpy_32_16_1( hFdCngDec->lp_speech, 32604 /0.995 Q15/ ), L_shr( Mpy_32_16_1( logEtot, 20972 /0.64 Q15/ ), 7 ) ); /Q23/
		move32();
		}

lib_dec/ivas_stereo_cng_dec_fx.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -772,8 +772,10 @@ static void stereo_dft_generate_comfort_noise_fx(
		}
		ELSE IF( ( chan == 0 ) )
		{
		#ifndef FIX_BASOP_2621_STEREO_CNG_NOISY_SPEECH_QSHIFT
		Word16 q_lp_noise = 0; // st->hFdCngDec->q_lp_noise; // to be populated appropriately.
		move16();
		#endif
		Word32 log_lp_noise = L_add( L_shl( lp_noise_e, Q25 ), BASOP_Util_Log2( L_add( lp_noise, DELTA_FX ) ) ); /* Q25 */
		// log10(x) is computed as log2(x) * log10(2)
		// log_lp_noise at this stage is in Q25. where as the structure value is in Q23
		@@ -783,7 +785,11 @@ static void stereo_dft_generate_comfort_noise_fx(
		move32();
		st->lp_noise = st->hFdCngDec->lp_noise; /* Q23 */
		move32();
		#ifdef FIX_BASOP_2621_STEREO_CNG_NOISY_SPEECH_QSHIFT
		st->hFdCngDec->hFdCngCom->flag_noisy_speech = extract_l( LT_32( L_sub( st->hFdCngDec->lp_speech, st->hFdCngDec->lp_noise ), 234881024 /* 28.0f in Q23 / ) ); / Q0 */
		#else
		st->hFdCngDec->hFdCngCom->flag_noisy_speech = extract_l( LT_32( L_shr( L_sub( st->hFdCngDec->lp_speech, st->hFdCngDec->lp_noise ), q_lp_noise ), 28 ) ); /* Q0 */
		#endif
		move16();
		st->hFdCngDec->hFdCngCom->likelihood_noisy_speech = add( mult_r( 32440 /* 0.99 in Q15 */, st->hFdCngDec->hFdCngCom->likelihood_noisy_speech ),
		mult_r( 328 /* 0.01 in Q15 /, st->hFdCngDec->hFdCngCom->flag_noisy_speech ) ); / Q15 */

lib_dec/stat_dec.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -137,10 +137,14 @@ typedef struct

		Word16 flag_dtx_mode;
		Word32 lp_speech; /* format: Q9.23 */
		#ifndef FIX_BASOP_2621_STEREO_CNG_NOISY_SPEECH_QSHIFT
		Word16 q_lp_speech;
		#endif

		Word32 lp_noise; /* format: Q9.23 */
		#ifndef FIX_BASOP_2621_STEREO_CNG_NOISY_SPEECH_QSHIFT
		Word16 q_lp_noise;
		#endif

		Word16 msPeriodogBuf[MSBUFLEN * NPART_SHAPING];

lib_enc/ivas_stereo_icbwe_enc_fx.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -373,6 +373,7 @@ static Word16 ic_bwe_enc_gsMapping_fx(
		/* quantize the IC-BWE GS mapping*/
		IF( EQ_16( element_mode, IVAS_CPE_TD ) )
		{
		#ifndef FIX_BASOP_2620_ICBWE_GSMAPPING_DEAD_CLAMP
		IF( LT_32( temp2_fx32, -( 2 << 25 ) ) )
		{
		temp2_fx = -( 2 << 12 ); // Q12
		@@ -383,6 +384,7 @@ static Word16 ic_bwe_enc_gsMapping_fx(
		temp2_fx = 1 << 12; // Q12
		move16();
		}
		#endif

		temp2_fx = extract_h( L_shl_sat( temp2_fx32, Q3 ) ); // Q12
		gsMapping_fx16 = 0;
		@@ -391,6 +393,7 @@ static Word16 ic_bwe_enc_gsMapping_fx(
		}
		ELSE
		{
		#ifndef FIX_BASOP_2620_ICBWE_GSMAPPING_DEAD_CLAMP
		IF( LT_32( temp2_fx32, -( 5 << 25 ) ) )
		{
		temp2_fx = -( 5 << 12 ); // Q12
		@@ -401,6 +404,7 @@ static Word16 ic_bwe_enc_gsMapping_fx(
		temp2_fx = 1 << 12; // Q12
		move16();
		}
		#endif

		temp2_fx = extract_h( L_shl_sat( temp2_fx32, Q3 ) ); // Q12
		gsMapping_fx16 = 0;