Commit 7b4c1b09 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Encoder MSAN fixes

parent 8345b068

apps/encoder.c

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ 
 *------------------------------------------------------------------------------------------*/



#if !defined( DEBUGGING ) && !defined( WMOPS )

static

//static

#endif

    int32_t frame = 0; /* Counter of frames */

lib_enc/ext_sig_ana.c

+1 −1
Original line number Diff line number Diff line
@@ -471,7 +471,7 @@ void core_signal_analysis_high_bitrate( 
#else

#ifdef IVAS_FLOAT_FIXED_CONVERSIONS

            // q factor of spectrum

            Word16 q_factor_spectrum = Q_factor_arrL( hTcxEnc->spectrum[frameno], N_MAX ) - 1;

            Word16 q_factor_spectrum = Q_factor_arrL( hTcxEnc->spectrum[frameno], L_subframe ) - 1;



            /* conv params to fix */

            // -1 = -32768 , Q=15 , ltp_gain

lib_enc/init_enc.c

+6 −0
Original line number Diff line number Diff line
@@ -2275,11 +2275,17 @@ ivas_error init_encoder_ivas_fx( 


    st->currEnergyHF = 0;



#ifdef MSAN_FIX

    st->prevEnergyHF = 0;

#endif



    /* Initialize TCX */

#ifndef IVAS_FLOAT_FIXED

    IF( hTcxEnc != NULL )

    {

        st->preemph_fac = (Word16) floatToFixed( st->preemph_fac_flt, Q15 );

    }

#endif



    /* Initialize Signal Buffers */

    f2me_buf_16( st->buf_speech_enc_flt, st->buf_speech_enc, &st->exp_buf_speech_enc, st->L_frame );

lib_enc/ivas_masa_enc.c

+4 −0
Original line number Diff line number Diff line
@@ -1662,6 +1662,10 @@ ivas_error ivas_masa_enc_config_fx( 
    /* Setup importance weights for two-direction band selection. */

    IF( EQ_16( hMasa->config.numberOfDirections, 2 ) )

    {



#ifdef MSAN_FIX

        set32_fx( hMasa->data.importanceWeight_fx, 0 /*1.0f Q30*/, MASA_FREQUENCY_BANDS );

#endif

        set32_fx( hMasa->data.importanceWeight_fx, ONE_IN_Q30 /*1.0f Q30*/, hMasa->config.numCodingBands );



        IF( EQ_16( hMasa->config.numCodingBands, 5 ) )

lib_enc/ivas_mdct_core_enc.c

+10 −0
Original line number Diff line number Diff line
@@ -1639,6 +1639,16 @@ void ivas_mdct_core_whitening_enc( 
    Word16 q_fac;

    Word32 scf_fx[CPE_CHANNELS][NB_DIV][M];

    Word32 scf_q_fx[CPE_CHANNELS][NB_DIV][M];

#ifdef MSAN_FIX

    FOR( ch = 0; ch < CPE_CHANNELS; ch++ )

    {

        FOR( i = 0; i < NB_DIV; i++ )

        {

            set32_fx( scf_fx[ch][i], 0, M );

            set32_fx( scf_q_fx[ch][i], 0, M );

        }

    }

#endif

#endif

    float chE[2], chE_tot;

    int8_t sns_low_br_mode;