Commit 3ddc2ac4 authored by Manuel Jander's avatar Manuel Jander
Browse files

Improve accuracy of smoothed_psd_fx[]. Fix issues if difference between... 

Improve accuracy of smoothed_psd_fx[]. Fix issues if difference between smoothed_psd_exp and cngNoiseLevelExp is 24 or larger.
parent b341fc82

lib_dec/ivas_stereo_cng_dec_fx.c

+34 −27
Original line number Diff line number Diff line
@@ -118,7 +118,11 @@ static void stereo_dft_generate_comfort_noise_fx( 
    Word16 trigo_step;

    Word32 tmp32_1, tmp32_2;

    Word16 q_div, q_sqrt1, q_sqrt2, q_sqrt, sqrt_res;

#ifdef NONBE_FIX_2575

    Word16 q_shift;

#else

    Word16 q_shift, q_shift_1, q_shift_2, min_q;

#endif

    Word16 tmp16, tmp_p, tmp_s;

    hFdCngCom = st->hFdCngDec->hFdCngCom;
@@ -795,25 +799,9 @@ static void stereo_dft_generate_comfort_noise_fx( 
    {

        /* update smoothed periodogram used by stereo CNA in SID and NO_DATA frames from cngNoiseLevel_flt */

#ifdef NONBE_FIX_2575



        /* Normalize smoothed_psd_fx and cngNoiseLevel to avoid its exponents running away. */

        q_shift_1 = L_norm_arr( st->hFdCngDec->smoothed_psd_fx, L_FRAME16k );

        q_shift_2 = L_norm_arr( hFdCngCom->cngNoiseLevel, FFTCLDFBLEN );



        scale_sig32( st->hFdCngDec->smoothed_psd_fx, L_FRAME16k, q_shift_1 ); /* Q31 - st->hFdCngDec->smoothed_psd_exp */

        st->hFdCngDec->smoothed_psd_exp = sub( st->hFdCngDec->smoothed_psd_exp, q_shift_1 );

        Word16 smoothed_psd_exp[L_FRAME16k], smoothed_psd_exp_max = MIN_16;

        move16();

        scale_sig32( hFdCngCom->cngNoiseLevel, FFTCLDFBLEN, q_shift_2 ); /* Q31 - hFdCngCom->cngNoiseLevelExp */

        hFdCngCom->cngNoiseLevelExp = sub( hFdCngCom->cngNoiseLevelExp, q_shift_2 );

        move16();



        /* Determine appropiate exponent for the resulting smoothed_psd_fx  */

        min_q = sub( s_min( sub( Q31, st->hFdCngDec->smoothed_psd_exp ), sub( Q31, hFdCngCom->cngNoiseLevelExp ) ), 1 /* Guard bit */ );

        q_shift_1 = sub( sub( Q31, hFdCngCom->cngNoiseLevelExp ), min_q );

        q_shift_2 = sub( sub( Q31, st->hFdCngDec->smoothed_psd_exp ), min_q );



        st->hFdCngDec->smoothed_psd_exp = sub( Q31, min_q );

        move16();

#else

        q_shift_1 = L_norm_arr( st->hFdCngDec->smoothed_psd_fx, L_FRAME16k );

        q_shift_2 = L_norm_arr( hFdCngCom->cngNoiseLevel, FFTCLDFBLEN );
@@ -831,15 +819,16 @@ static void stereo_dft_generate_comfort_noise_fx( 
        FOR( i = hFdCngCom->startBand; i < hFdCngCom->stopFFTbin; i++ )

        {

#ifdef NONBE_FIX_2575

            Word32 ftmp2;

            ftmp2 = L_shr( st->hFdCngDec->smoothed_psd_fx[i], q_shift_2 ); // min_q

#endif

#ifdef NONBE_FIX_2575

            ftmp = L_shr( hFdCngCom->cngNoiseLevel[i - hFdCngCom->startBand], q_shift_1 ); // min_q

            Word16 ftmp_exp;



            ftmp = hFdCngCom->cngNoiseLevel[i - hFdCngCom->startBand];

            move32();

            ftmp_exp = hFdCngCom->cngNoiseLevelExp;

            move16();

#else

            ftmp = hFdCngCom->cngNoiseLevel[i - hFdCngCom->startBand];

#endif

            move32();

#endif

            IF( !st->hFdCngDec->first_cna_noise_updated )

            {

                /* very first update */
@@ -853,20 +842,27 @@ static void stereo_dft_generate_comfort_noise_fx( 


                test();

#ifdef NONBE_FIX_2575

                IF( ( st->hFdCngDec->smoothed_psd_fx[i] > 0 ) && EQ_16( BASOP_Util_Cmp_Mant32Exp( Mpy_32_16_1( hFdCngCom->cngNoiseLevel[i - hFdCngCom->startBand], (Word16) 0x3333 ), hFdCngCom->cngNoiseLevelExp, st->hFdCngDec->smoothed_psd_fx[i], st->hFdCngDec->smoothed_psd_exp ), 1 ) )

                IF( ( st->hFdCngDec->smoothed_psd_fx[i] > 0 ) && EQ_16( BASOP_Util_Cmp_Mant32Exp( Mpy_32_16_1( ftmp, (Word16) 0x3333 ), ftmp_exp, st->hFdCngDec->smoothed_psd_fx[i], st->hFdCngDec->smoothed_psd_exp ), 1 ) )

#else

                IF( ( st->hFdCngDec->smoothed_psd_fx[i] > 0 ) && GT_32( Mpy_32_16_1( ftmp, (Word16) 0x3333 ), st->hFdCngDec->smoothed_psd_fx[i] ) )

#endif

                {

                    /* prevent abrupt upward update steps */

#ifdef NONBE_FIX_2575

                    ftmp = L_add( L_shl( ftmp2, 1 ), L_shr( ftmp2, 1 ) ); /* st->hFdCngDec->smoothed_psd_exp */

                    ftmp = L_add( L_shr( st->hFdCngDec->smoothed_psd_fx[i], 2 - 1 ), L_shr( st->hFdCngDec->smoothed_psd_fx[i], 2 + 1 ) ); /* ftmp_exp */

                    move16();

                    ftmp_exp = add( st->hFdCngDec->smoothed_psd_exp, 2 );

                    move16();

#else

                    ftmp = L_add( L_shl( st->hFdCngDec->smoothed_psd_fx[i], 1 ), L_shr( st->hFdCngDec->smoothed_psd_fx[i], 1 ) ); /* st->hFdCngDec->smoothed_psd_exp */

#endif

                    move16();

#endif

                }

#ifdef NONBE_FIX_2575

                ELSE IF( EQ_16( BASOP_Util_Cmp_Mant32Exp( ftmp, ftmp_exp, st->hFdCngDec->smoothed_psd_fx[i], st->hFdCngDec->smoothed_psd_exp ), 1 ) )

#else

                ELSE IF( LT_32( ftmp, st->hFdCngDec->smoothed_psd_fx[i] ) )

#endif

                {

                    /* faster downward updates */

                    alpha = (Word16) ( 0x599A );
@@ -876,13 +872,24 @@ static void stereo_dft_generate_comfort_noise_fx( 


            /* smoothing */

#ifdef NONBE_FIX_2575

            st->hFdCngDec->smoothed_psd_fx[i] = L_add( Mpy_32_16_1( ftmp2, alpha ), Mpy_32_16_1( ftmp, sub( MAX_16, alpha ) ) ); /* st->hFdCngDec->smoothed_psd_exp */

            st->hFdCngDec->smoothed_psd_fx[i] = BASOP_Util_Add_Mant32Exp( Mpy_32_16_1( st->hFdCngDec->smoothed_psd_fx[i], alpha ), st->hFdCngDec->smoothed_psd_exp, Mpy_32_16_1( ftmp, sub( MAX_16, alpha ) ), ftmp_exp, &smoothed_psd_exp[i] ); /* smoothed_psd_exp[i] */

            smoothed_psd_exp_max = s_max( smoothed_psd_exp_max, smoothed_psd_exp[i] );

#else

            st->hFdCngDec->smoothed_psd_fx[i] = L_add( Mpy_32_16_1( st->hFdCngDec->smoothed_psd_fx[i], alpha ), Mpy_32_16_1( ftmp, sub( MAX_16, alpha ) ) ); /* st->hFdCngDec->smoothed_psd_exp */

#endif

            move32();

        }



#ifdef NONBE_FIX_2575

        /* Find common exponent for smoothed_psd_fx[] */

        FOR( i = hFdCngCom->startBand; i < hFdCngCom->stopFFTbin; i++ )

        {

            st->hFdCngDec->smoothed_psd_fx[i] = L_shr( st->hFdCngDec->smoothed_psd_fx[i], sub( smoothed_psd_exp_max, smoothed_psd_exp[i] ) );

        }

        st->hFdCngDec->smoothed_psd_exp = smoothed_psd_exp_max;

        move16();

#endif



        /* update msNoiseEst in SID and NO_DATA frames */

        bandcombinepow( &st->hFdCngDec->smoothed_psd_fx[hFdCngCom->startBand], st->hFdCngDec->smoothed_psd_exp, sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand ), st->hFdCngDec->part_shaping, st->hFdCngDec->nFFTpart_shaping, st->hFdCngDec->psize_inv_shaping, st->hFdCngDec->msNoiseEst, &st->hFdCngDec->msNoiseEst_exp );