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

Float struct members cleanup, bug fixes

parent 253ade99

lib_com/deemph.c

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ void deemph_fx_32( 
    Word16 shift,    /*scaled output*/

    Word32 *signal,  /* i/o: signal            Qx*/

    const Word16 mu, /* i  : deemphasis factor Q15*/

    const int16_t L, /* i  : vector size         */

    const Word16 L,  /* i  : vector size         */

    Word32 *mem      /* i/o: memory (y[-1])    Qx+shift*/

)

{

lib_com/prot_fx.h

+1 −1
Original line number Diff line number Diff line
@@ -1578,7 +1578,7 @@ void deemph_fx_32( 
    Word16 shift,    /* i : scaled output      */

    Word32 *signal,  /* i/o: signal            */

    const Word16 mu, /* i  : deemphasis factor */

    const int16_t L, /* i  : vector size       */

    const Word16 L,  /* i  : vector size       */

    Word32 *mem      /* i/o: memory (y[-1])    */

);

































lib_enc/core_enc_init.c



+26
−7




























Original line number
Diff line number
Diff line








@@ -288,6 +288,14 @@ void init_coder_ace_plus_ivas_fx(













    set32_fx( st->mem_bpf_fx1, 0, 2 * L_FILT16k );















    set32_fx( st->mem_error_bpf_fx, 0, 2 * L_FILT16k );





























    IF( st->ini_frame == 0 )













    {













        st->Q_max_enc[0] = 15;













        move16();













        st->Q_max_enc[1] = 15;













        move16();













    }





























    IF( GE_32( st->total_brate, HQ_48k ) )















    {















        st->enablePlcWaveadjust = 1;










@@ -409,7 +417,8 @@ void init_coder_ace_plus(













        set_zero( st->hBWE_TD->cur_sub_Aq, M + 1 );















    }





























    st->currEnergyHF = 0;













    st->currEnergyHF_fx = 0;













    move32();































    /* Initialize LPC analysis/quantization */















    if ( st->sr_core <= INT_FS_16k && st->tcxonly == 0 )










@@ -539,6 +548,14 @@ void init_coder_ace_plus(













    set32_fx( st->mem_bpf_fx1, 0, 2 * L_FILT16k );















    set32_fx( st->mem_error_bpf_fx, 0, 2 * L_FILT16k );





























    IF( st->ini_frame == 0 )













    {













        st->Q_max_enc[0] = 15;













        move16();













        st->Q_max_enc[1] = 15;













        move16();













    }





























    IF( st->total_brate >= HQ_48k )















    {















        st->enablePlcWaveadjust = 1;










@@ -597,6 +614,9 @@ static void init_tcx_ivas_fx(













    /* Share the memories for 2xTCX10/4xTCX5 and for TCX20 */















    hTcxEnc->spectrum_fx[0] = hTcxEnc->spectrum_long_fx;















    hTcxEnc->spectrum_fx[1] = hTcxEnc->spectrum_long_fx + N_TCX10_MAX;













    st->hTcxEnc->spectrum_e[0] = st->hTcxEnc->spectrum_e[1] = 0;













    move16();













    move16();































    init_tcx_cfg_ivas_fx( st->hTcxCfg, total_brate, st->sr_core, st->input_Fs, st->L_frame, st->bwidth, hTcxEnc->L_frameTCX,















                          st->fscale, st->preemph_fac, st->tcxonly, st->rf_mode, st->igf,










@@ -703,17 +723,16 @@ static void init_tcx(













    TCX_ENC_HANDLE hTcxEnc = st->hTcxEnc;































    /* Share the memories for 2xTCX10/4xTCX5 and for TCX20 */













#if 1













    hTcxEnc->spectrum_fx[0] = hTcxEnc->spectrum_long_fx;













    hTcxEnc->spectrum_fx[1] = hTcxEnc->spectrum_long_fx + N_TCX10_MAX;













#endif





























    hTcxEnc->spectrum[0] = hTcxEnc->spectrum_long;















    hTcxEnc->spectrum[1] = hTcxEnc->spectrum_long + N_TCX10_MAX;





























#ifdef IVAS_FLOAT_FIXED















    hTcxEnc->spectrum_fx[0] = hTcxEnc->spectrum_long_fx;















    hTcxEnc->spectrum_fx[1] = hTcxEnc->spectrum_long_fx + N_TCX10_MAX;













    st->hTcxEnc->spectrum_e[0] = st->hTcxEnc->spectrum_e[1] = 0;













    move16();













    move16();













#endif













#ifdef IVAS_FLOAT_FIXED_CONVERSIONS















    st->preemph_fac_flt = fix16_to_float( st->preemph_fac, Q15 );















#endif

















































lib_enc/core_enc_reconf.c



+5
−1




























Original line number
Diff line number
Diff line








@@ -110,7 +110,11 @@ void core_coder_reconfig(













        st->acelpEnabled = ( st->restrictedMode & 1 ) == 1;















        st->tcx20Enabled = ( st->restrictedMode & 2 ) == 2;















    }













    st->prevEnergyHF = st->currEnergyHF = 65535.0f; /* prevent block switch */













    st->prevEnergyHF_fx = st->currEnergyHF_fx = 1073725440l /*65535.0f Q14*/; /* prevent block switch */













    st->currEnergyHF_e_fx = 17;













    move32();













    move32();













    move16();































    /* TCX-LTP */















    if ( st->hTcxEnc != NULL )

































lib_enc/core_enc_switch.c



+2
−1




























Original line number
Diff line number
Diff line








@@ -215,7 +215,8 @@ void core_coder_mode_switch_ivas_fx(













            set_zero( st->hBWE_TD->cur_sub_Aq, M + 1 );















        }





























        st->currEnergyHF = 0;













        st->currEnergyHF_fx = 0;













        move32();































        /* Initialize TCX */















        IF( hTcxEnc != NULL )