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

Merge branch 'enc_stat_struct_duplicate_members_remove' into 'main' 

Remove redundant members pitch_fx and pstreaklen_fx from encoder state structure

See merge request !457
parents 99425116 ad02ddd1

lib_com/lsf_tools_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -2865,7 +2865,7 @@ void lsf_syn_mem_backup_fx( 
    move16();

    *streaklimit = st_fx->streaklimit_fx;

    move16();

    *pstreaklen = st_fx->pstreaklen_fx;

    *pstreaklen = st_fx->pstreaklen;

    move16();



    FOR( i = 0; i < L_FFT; i++ )
@@ -3005,7 +3005,7 @@ void lsf_syn_mem_restore_fx( 
    move16();

    st_fx->streaklimit_fx = streaklimit;

    move16();

    st_fx->pstreaklen_fx = pstreaklen;

    st_fx->pstreaklen = pstreaklen;

    move16();



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

lib_enc/acelp_core_enc_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -527,7 +527,7 @@ ivas_error acelp_core_enc_fx( 


        IF( EQ_16( st_fx->coder_type, TRANSITION ) )

        {

            tc_classif_enc_fx( Q_new, st_fx->L_frame, &tc_subfr_fx, &position, attack_flag, st_fx->pitch_fx[0], res_fx );

            tc_classif_enc_fx( Q_new, st_fx->L_frame, &tc_subfr_fx, &position, attack_flag, st_fx->pitch[0], res_fx );



            config_acelp1( ENC, st_fx->total_brate, st_fx->core_brate, st_fx->core, st_fx->extl, st_fx->extl_brate, st_fx->L_frame,

                           -1, &( st_fx->acelp_cfg ), hBstr->nb_bits_tot, st_fx->coder_type, tc_subfr_fx, 1, NULL, unbits_fx, st_fx->element_mode, &uc_two_stage_flag,

lib_enc/acelp_core_switch_enc_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -62,9 +62,9 @@ void acelp_core_switch_enc_fx( 


    Copy( st_fx->old_Aq_12_8_fx, Aq, M + 1 );

    Copy( st_fx->old_Aq_12_8_fx, Aq + ( M + 1 ), M + 1 );

    T_op[0] = st_fx->pitch_fx[0];

    T_op[0] = st_fx->pitch[0];

    move16();

    T_op[1] = st_fx->pitch_fx[1];

    T_op[1] = st_fx->pitch[1];

    move16();



    /*----------------------------------------------------------------*

lib_enc/amr_wb_enc_fx.c

+3 −3
Original line number Diff line number Diff line
@@ -399,7 +399,7 @@ void amr_wb_enc_fx( 
        /* reset the OL pitch tracker memories during inactive frames */

        pitch_ol_init_fx( &st->old_thres_fx, &st->old_pitch, &st->delta_pit, &st->old_corr_fx );

    }

    old_pitch1 = st->pitch_fx[1];

    old_pitch1 = st->pitch[1];

    move16();

    analy_lp_AMR_WB_fx( inp, &ener, A, epsP_h, epsP_l, isp_new, st->lsp_old1_fx,

                        isf_new, st->old_pitch_la, st->old_voicing_la, Q_new, Q_r );
@@ -421,8 +421,8 @@ void amr_wb_enc_fx( 
        shift = -1;

        move16();

    }

    pitch_ol_fx( st->pitch_fx, st->voicing_fx, &st->old_pitch, &st->old_corr_fx, corr_shift, &st->old_thres_fx, &st->delta_pit, st->old_wsp2_fx, wsp, st->mem_decim2_fx, relE, 0, st->bwidth, st->Opt_SC_VBR );

    st->old_pitch_la = st->pitch_fx[2];

    pitch_ol_fx( st->pitch, st->voicing_fx, &st->old_pitch, &st->old_corr_fx, corr_shift, &st->old_thres_fx, &st->delta_pit, st->old_wsp2_fx, wsp, st->mem_decim2_fx, relE, 0, st->bwidth, st->Opt_SC_VBR );

    st->old_pitch_la = st->pitch[2];

    move16();

    st->old_voicing_la = st->voicing_fx[2];

    move16();

lib_enc/cod_ace_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ Word16 coder_acelp_fx( /* o : SEGSNR for CL decision * 
        {

            /* Adaptive Codebook (GC and VC) */



            Mode2_pit_encode_fx( acelp_cfg->ltp_mode, i_subfr, &prm, &exc[i_subfr], st->pitch_fx, &T0_min, &T0_min_frac, &T0_max, &T0_max_frac,

            Mode2_pit_encode_fx( acelp_cfg->ltp_mode, i_subfr, &prm, &exc[i_subfr], st->pitch, &T0_min, &T0_min_frac, &T0_max, &T0_max_frac,

                                 &T0, &T0_frac, &T0_res, h1, xn, st->pit_min, st->pit_fr1, st->pit_fr1b, st->pit_fr2, st->pit_max, st->pit_res_max );



            E_ACELP_adaptive_codebook( exc, T0, T0_frac, T0_res, st->pit_res_max, acelp_cfg->ltf_mode, i_subfr, L_SUBFR, L_frame, h1, clip_gain, xn,