Commit 7f002eed authored by Mohammadreza Naghibzadeh's avatar Mohammadreza Naghibzadeh
Browse files

Compare (lp_speech-lp_noise) with 28.0 in Q23 and remove local q_lp_noise.

parent 849129d3

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ 
#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_2621_STEREO_CNG_NOISY_SPEECH_QSHIFT   /* FhG: BASOP #2621: stereo_dft_generate_comfort_noise_fx: initialize q_lp_noise=23 so (lp_speech-lp_noise) Q23 diff is shifted to Q0(dB) before <28 compare */

#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) */



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

lib_dec/ivas_stereo_cng_dec_fx.c

+6 −4
Original line number Diff line number Diff line
@@ -772,12 +772,10 @@ static void stereo_dft_generate_comfort_noise_fx( 
    }

    ELSE IF( ( chan == 0 ) )

    {

#ifdef FIX_BASOP_2621_STEREO_CNG_NOISY_SPEECH_QSHIFT

        Word16 q_lp_noise = 23; /* lp_speech/lp_noise are Q23 */

#else

#ifndef FIX_BASOP_2621_STEREO_CNG_NOISY_SPEECH_QSHIFT

        Word16 q_lp_noise = 0; // st->hFdCngDec->q_lp_noise; // to be populated appropriately.

#endif

        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
@@ -787,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 */