Commit 839c1555 authored by fotopoulou's avatar fotopoulou
Browse files

remove IGF_reconfig duplicate

parent 81461c62

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ 
#define NONBE_FIX_ISSUE_2206_AVOID_OVERFLOW_MSVQ_Interpol_Tran_fx /* FhG: Fix saturation crash in MSVQ_Interpol_Tran_fx() */

#define NONBE_FIX_ISSUE_2206_SWB_EXPERIMENT_FIX_2527    /* Fix crash from issue #2527 */

#define FIX_FLOAT_1539_G192_FORMAT_SWITCH               /* VA/Nokia: reintroduce format switching for g192 bitstreams */

#define FIX_2346_DUPLICATED_IGF_FUNCTIONS_3             /* FhG: part 3 of basop issue 2346: Remove duplicate reconfig function */



/* #################### End BE switches ################################## */

lib_com/prot_fx.h

+3 −0
Original line number Diff line number Diff line
@@ -10100,6 +10100,7 @@ Word16 is_EVS_bitrate( 
    Word16 *Opt_AMR_WB             /* i  : AMR-WB IO flag     */

);



#ifndef FIX_2346_DUPLICATED_IGF_FUNCTIONS_3

ivas_error IGF_Reconfig(

    IGF_ENC_INSTANCE_HANDLE *hIGFEnc, /* i/o: instance handle of IGF Encoder  */

    const Word16 igf,                 /* i  : IGF on/off                      */
@@ -10111,3 +10112,5 @@ ivas_error IGF_Reconfig( 
);



#endif



#endif

lib_enc/igf_enc_fx.c

+2 −1
Original line number Diff line number Diff line
@@ -3524,7 +3524,7 @@ void IGFSaveSpectrumForITF_ivas_fx( 
    return;

}





#ifndef FIX_2346_DUPLICATED_IGF_FUNCTIONS_3

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

 * IGF_Reconfig()

 *
@@ -3569,3 +3569,4 @@ ivas_error IGF_Reconfig( 


    return error;

}

#endif
 
 No newline at end of file

lib_enc/ivas_corecoder_enc_reconfig_fx.c

+8 −2
Original line number Diff line number Diff line
@@ -681,8 +681,11 @@ ivas_error ivas_corecoder_enc_reconfig_fx( 
                                                                             st_ivas->hCPE[0]->hCoreCoder[n]->bwidth,

                                                                             st_ivas->hCPE[0]->hCoreCoder[n]->rf_mode ); /* Q0 */

                    move16();



#ifndef FIX_2346_DUPLICATED_IGF_FUNCTIONS_3

                    IF( ( error = IGF_Reconfig( &st_ivas->hCPE[0]->hCoreCoder[n]->hIGFEnc, st_ivas->hCPE[0]->hCoreCoder[n]->igf, 1, st_ivas->hCPE[0]->element_brate, st_ivas->hCPE[0]->hCoreCoder[n]->bwidth, st_ivas->hCPE[0]->hCoreCoder[n]->element_mode, st_ivas->hCPE[0]->hCoreCoder[n]->rf_mode ) ) != IVAS_ERR_OK )

#else

                    IF( ( error = IGF_Reconfig_fx( &st_ivas->hCPE[0]->hCoreCoder[n]->hIGFEnc, st_ivas->hCPE[0]->hCoreCoder[n]->igf, 1, st_ivas->hCPE[0]->element_brate, st_ivas->hCPE[0]->hCoreCoder[n]->bwidth, st_ivas->hCPE[0]->hCoreCoder[n]->element_mode, st_ivas->hCPE[0]->hCoreCoder[n]->rf_mode ) ) != IVAS_ERR_OK )

#endif

                    {

                        return error;

                    }
@@ -744,8 +747,11 @@ ivas_error ivas_corecoder_enc_reconfig_fx( 
                                                                         st_ivas->hCPE[0]->hCoreCoder[n]->rf_mode ); /* Q0 */



                move16();



#ifndef FIX_2346_DUPLICATED_IGF_FUNCTIONS_3

                IF( ( error = IGF_Reconfig( &st_ivas->hCPE[0]->hCoreCoder[n]->hIGFEnc, st_ivas->hCPE[0]->hCoreCoder[n]->igf, 1, st_ivas->hCPE[0]->element_brate, st_ivas->hCPE[0]->hCoreCoder[n]->bwidth, st_ivas->hCPE[0]->hCoreCoder[n]->element_mode, st_ivas->hCPE[0]->hCoreCoder[n]->rf_mode ) ) != IVAS_ERR_OK )

#else

                IF( ( error = IGF_Reconfig_fx( &st_ivas->hCPE[0]->hCoreCoder[n]->hIGFEnc, st_ivas->hCPE[0]->hCoreCoder[n]->igf, 1, st_ivas->hCPE[0]->element_brate, st_ivas->hCPE[0]->hCoreCoder[n]->bwidth, st_ivas->hCPE[0]->hCoreCoder[n]->element_mode, st_ivas->hCPE[0]->hCoreCoder[n]->rf_mode ) ) != IVAS_ERR_OK )

#endif

                {

                    return error;

                }

lib_enc/ivas_mct_enc_fx.c

+4 −1
Original line number Diff line number Diff line
@@ -752,8 +752,11 @@ ivas_error mct_enc_reconfigure_fx( 
                    move16();

                    st->igf = getIgfPresent_fx( st->element_mode, L_mult0( st->bits_frame_nominal, FRAMES_PER_SEC ), st->bwidth, st->rf_mode );

                    move16();



#ifndef FIX_2346_DUPLICATED_IGF_FUNCTIONS_3

                    IF( ( error = IGF_Reconfig( &st->hIGFEnc, st->igf, 1, st_ivas->hCPE[cpe_id]->element_brate, st->bwidth, st->element_mode, st->rf_mode ) ) != IVAS_ERR_OK )

#else

                    IF( ( error = IGF_Reconfig_fx( &st->hIGFEnc, st->igf, 1, st_ivas->hCPE[cpe_id]->element_brate, st->bwidth, st->element_mode, st->rf_mode ) ) != IVAS_ERR_OK )

#endif

                    {

                        return error;

                    }