Commit e9117df7 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch 'ltv_crash_fixes_1' into 'main' 

Acelp core, ivas_core_enc cleanup, ltv crash fixes [allow regression]

See merge request !805
parents 55a766f7 9c1a3784

lib_com/ivas_prot_fx.h

+0 −1
Original line number Diff line number Diff line
@@ -2990,7 +2990,6 @@ Word16 ivas_acelp_tcx20_switching_fx( 
    Word16 stab_fac,     /* i  : LP filter stability                     */

    Word32 *res_cod_SNR_M,

    Word16 *res_cod_SNR_M_e,

    Word16 *tcx_mdct_window_fx,

    const Word16 flag_16k_smc /* i  : flag to indicate if the OL SMC is run at 16 kHz */

);

lib_com/swb_tbe_com_fx.c

+2 −3
Original line number Diff line number Diff line
@@ -3727,12 +3727,11 @@ void GenShapedSHBExcitation_ivas_fx( 
            Word16 nbSubFr, lSubFr;

            Word16 tempQ15;

            Word32 tempQ31;

            /*nbSubFr = ( bitrate < ACELP_24k40 )? NB_SUBFR : NB_SUBFR16k;*/

            nbSubFr = NB_SUBFR16k;

            lSubFr = ( L_FRAME16k / NB_SUBFR16k );

            move16();

            move16();

            IF( LT_32( bitrate, ACELP_24k40 ) )

            IF( LT_32( extl_brate, SWB_TBE_2k8 ) )

            {

                nbSubFr = NB_SUBFR;

                move16();
@@ -3744,7 +3743,7 @@ void GenShapedSHBExcitation_ivas_fx( 
            FOR( i = 0; i < nbSubFr; i++ )

            {

                test();

                IF( EQ_16( coder_type, VOICED ) && ( LT_32( bitrate, ACELP_24k40 ) ) )

                IF( EQ_16( coder_type, VOICED ) && ( LT_32( extl_brate, SWB_TBE_2k8 ) ) )

                {

                    exp = 0;

                    move16();

lib_com/tns_base.c

+1 −1
Original line number Diff line number Diff line
@@ -329,7 +329,7 @@ void InitTnsConfiguration_ivas_fx( 


    FOR( iFilter = 0; iFilter < pTnsConfig->nMaxFilters; iFilter++ )

    {

        assert( pTnsConfig->pTnsParameters[iFilter].startLineFrequency < 0.5f * nSampleRate );

        assert( pTnsConfig->pTnsParameters[iFilter].startLineFrequency < nSampleRate / 2 );

        assert( nSampleRate <= 96000 );

        move16();

        startLineFilter[iFilter] = divide3232( L_mult0( frameLength, pTnsConfig->pTnsParameters[iFilter].startLineFrequency ), L_shl( nSampleRate, 14 ) ); /*Q0*/

lib_dec/bass_psfilter_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -609,7 +609,7 @@ void bass_psfilter_fx( 
            }

            exp2 = sub( exp, exp2 ); /* exponent num - exponent denom */

            /* gain = corr / ener */

            gain = div_s( round_fx( L_shl( Ltmp, exp ) ), tmp2 );

            gain = div_s( round_fx_sat( L_shl( Ltmp, exp ) ), tmp2 );

            if ( Lcorr < 0 )

            {

                gain = sub( 0, gain );

lib_enc/acelp_core_enc.c

+89 −187

File changed.

Preview size limit exceeded, changes collapsed.