Commit 6d658482 authored by vaillancour's avatar vaillancour
Browse files

fix linux build by removing unused parameter

parent 102e729f

lib_com/prot_fx.h

+2 −0
Original line number Diff line number Diff line
@@ -7610,8 +7610,10 @@ void FEC_clas_estim_fx( 
    /* i/o: long-term total energy variation               */ /*A*/

    Word16 *amr_io_class,

    /* i/o: classification for AMR-WB IO mode       */ /*A*/

#ifndef FIX_871_REMOVE_UNNECESSARY_CONDITION

    const Word32 bitrate,

    /* i  : Decoded bitrate                         */ /*A*/

#endif

    Word16 Q_syn,                                      /* i  : Synthesis scaling                       */

    Word16 *class_para,

    /* o  : classification para. fmerit1            */ /*A*/

lib_dec/FEC_clas_estim_fx.c

+2 −0
Original line number Diff line number Diff line
@@ -72,8 +72,10 @@ void FEC_clas_estim_fx( 
    /* i/o: long-term total energy variation        */ /*A*/

    Word16 *amr_io_class,

    /* i/o: classification for AMR-WB IO mode       */ /*A*/

#ifndef FIX_871_REMOVE_UNNECESSARY_CONDITION

    const Word32 bitrate,

    /* i  : Decoded bitrate                         */ /*A*/

#endif

    Word16 Q_syn,                                      /* i  : Synthesis scaling                       */

    Word16 *class_para,

    /* o  : classification para. fmerit1            */ /*A*/

lib_dec/acelp_core_dec_fx.c

+8 −1
Original line number Diff line number Diff line
@@ -1126,12 +1126,19 @@ ivas_error acelp_core_dec_fx( 
             * FEC - Estimate the classification information

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



#ifndef FIX_871_REMOVE_UNNECESSARY_CONDITION

            FEC_clas_estim_fx( st_fx, st_fx->Opt_AMR_WB, st_fx->L_frame, &st_fx->clas_dec, st_fx->coder_type, pitch_buf_fx,

                               syn_fx, &st_fx->lp_ener_FER_fx, &st_fx->decision_hyst,

                               NULL, NULL, NULL, NULL, 0, NULL, st_fx->core_brate, st_fx->Q_syn, temp_buf_fx,

                               st_fx->mem_syn_clas_estim_fx, &st_fx->classifier_Q_mem_syn,

                               0, 0, 0, st_fx->last_core_brate, st_fx->acelp_cfg.FEC_mode );



#else

            FEC_clas_estim_fx( st_fx, st_fx->Opt_AMR_WB, st_fx->L_frame, &st_fx->clas_dec, st_fx->coder_type, pitch_buf_fx,

                               syn_fx, &st_fx->lp_ener_FER_fx, &st_fx->decision_hyst,

                               NULL, NULL, NULL, NULL, 0, NULL, st_fx->Q_syn, temp_buf_fx,

                               st_fx->mem_syn_clas_estim_fx, &st_fx->classifier_Q_mem_syn,

                               0, 0, 0, st_fx->last_core_brate, st_fx->acelp_cfg.FEC_mode );

#endif

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

             * FEC - Estimate pitch

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

lib_dec/acelp_core_dec_ivas_fx.c

+8 −0
Original line number Diff line number Diff line
@@ -1227,11 +1227,19 @@ ivas_error acelp_core_dec_ivas_fx( 
             * FEC - Estimate the classification information

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



#ifndef FIX_871_REMOVE_UNNECESSARY_CONDITION

            FEC_clas_estim_fx( st, st->Opt_AMR_WB, st->L_frame, &st->clas_dec, st->coder_type, pitch_buf_fx,

                               psyn_fx, &st->lp_ener_FER_fx, &st->decision_hyst,

                               NULL, NULL, NULL, NULL, 0, NULL, st->core_brate, st->Q_syn, temp_buf_fx,

                               st->mem_syn_clas_estim_fx, &st->classifier_Q_mem_syn,

                               0, 0, 0, st->last_core_brate, st->acelp_cfg.FEC_mode );

#else

            FEC_clas_estim_fx( st, st->Opt_AMR_WB, st->L_frame, &st->clas_dec, st->coder_type, pitch_buf_fx,

                               psyn_fx, &st->lp_ener_FER_fx, &st->decision_hyst,

                               NULL, NULL, NULL, NULL, 0, NULL, st->Q_syn, temp_buf_fx,

                               st->mem_syn_clas_estim_fx, &st->classifier_Q_mem_syn,

                               0, 0, 0, st->last_core_brate, st->acelp_cfg.FEC_mode );

#endif     

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

             * FEC - Estimate pitch

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

lib_dec/amr_wb_dec_fx.c

+8 −1
Original line number Diff line number Diff line
@@ -546,12 +546,19 @@ ivas_error amr_wb_dec_fx( 
             * FEC - Estimate the classification information

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



#ifndef FIX_871_REMOVE_UNNECESSARY_CONDITION

            FEC_clas_estim_fx( st_fx, 1, L_FRAME, &st_fx->clas_dec, st_fx->coder_type, pitch_buf_fx,

                               syn_fx, &st_fx->lp_ener_FER_fx,

                               &st_fx->decision_hyst, &st_fx->hAmrwb_IO->UV_cnt_fx, &st_fx->hAmrwb_IO->LT_UV_cnt_fx, &st_fx->hAmrwb_IO->Last_ener_fx, &locattack, st_fx->hAmrwb_IO->lt_diff_etot_fx,

                               &amr_io_class, st_fx->core_brate, st_fx->Q_syn, &class_para_fx, st_fx->mem_syn_clas_estim_fx, &st_fx->classifier_Q_mem_syn,

                               0, 0, 0, st_fx->last_core_brate, -1 );



#else

            FEC_clas_estim_fx( st_fx, 1, L_FRAME, &st_fx->clas_dec, st_fx->coder_type, pitch_buf_fx,

                               syn_fx, &st_fx->lp_ener_FER_fx,

                               &st_fx->decision_hyst, &st_fx->hAmrwb_IO->UV_cnt_fx, &st_fx->hAmrwb_IO->LT_UV_cnt_fx, &st_fx->hAmrwb_IO->Last_ener_fx, &locattack, st_fx->hAmrwb_IO->lt_diff_etot_fx,

                               &amr_io_class, st_fx->Q_syn, &class_para_fx, st_fx->mem_syn_clas_estim_fx, &st_fx->classifier_Q_mem_syn,

                               0, 0, 0, st_fx->last_core_brate, -1 );

#endif

            /* update past excitation signals for LD music post-filter */

            Copy( hMusicPF->dct_post_old_exc_fx + L_FRAME, hMusicPF->dct_post_old_exc_fx, DCT_L_POST - L_FRAME - OFFSET2 );

            Copy( exc2_fx, hMusicPF->dct_post_old_exc_fx + ( DCT_L_POST - L_FRAME - OFFSET2 ), L_FRAME );