Commit 583b832e authored by fotopoulou's avatar fotopoulou
Browse files

harmonize remaining duplicates

parent 6dd82350

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             /* Harmonize duplicate IGF functions (getCrest, getSFM, Reconfig) */



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

lib_com/prot_fx.h

+12 −9
Original line number Diff line number Diff line
@@ -9602,6 +9602,7 @@ Word16 msvq_stage1_dct_recalc_candidates_fdcng_wb_fx( 
    Word16 *dist_ptr_e                /* i/o: exp for updated  MSE vector for stage1 */

);



#ifdef FIX_2346_DUPLICATED_IGF_FUNCTIONS_3

ivas_error IGF_Reconfig_fx(

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

    const Word16 igf,                 /* i  : IGF on/off                      */
@@ -9611,6 +9612,17 @@ ivas_error IGF_Reconfig_fx( 
    const Word16 element_mode,        /* i  : IVAS element mode               */

    const Word16 rf_mode              /* i  : flag to signal the RF mode      */

);

#else

ivas_error IGF_Reconfig(

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

    const Word16 igf,                 /* i  : IGF on/off                      */

    const Word16 reset,               /* i  : reset flag                      */

    const Word32 brate,               /* i  : bitrate for configuration       */

    const Word16 bwidth,              /* i  : signal bandwidth                */

    const Word16 element_mode,        /* i  : IVAS element mode               */

    const Word16 rf_mode              /* i  : flag to signal the RF mode      */

);

#endif



void residu_ivas_fx(

    const Word16 *a, /* i  : LP filter coefficients           Q31-a_exp*/
@@ -10100,14 +10112,5 @@ Word16 is_EVS_bitrate( 
    Word16 *Opt_AMR_WB             /* i  : AMR-WB IO flag     */

);



ivas_error IGF_Reconfig(

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

    const Word16 igf,                 /* i  : IGF on/off                      */

    const Word16 reset,               /* i  : reset flag                      */

    const Word32 brate,               /* i  : bitrate for configuration       */

    const Word16 bwidth,              /* i  : signal bandwidth                */

    const Word16 element_mode,        /* i  : IVAS element mode               */

    const Word16 rf_mode              /* i  : flag to signal the RF mode      */

);



#endif

lib_enc/igf_enc_fx.c

+377 −218

File changed.

Preview size limit exceeded, changes collapsed.

lib_enc/ivas_corecoder_enc_reconfig_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -682,7 +682,7 @@ ivas_error ivas_corecoder_enc_reconfig_fx( 
                                                                             st_ivas->hCPE[0]->hCoreCoder[n]->rf_mode ); /* Q0 */

                    move16();



                    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 )

                    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 )

                    {

                        return error;

                    }
@@ -745,7 +745,7 @@ ivas_error ivas_corecoder_enc_reconfig_fx( 


                move16();



                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 )

                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 )

                {

                    return error;

                }

lib_enc/ivas_mct_enc_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -753,7 +753,7 @@ ivas_error mct_enc_reconfigure_fx( 
                    st->igf = getIgfPresent_fx( st->element_mode, L_mult0( st->bits_frame_nominal, FRAMES_PER_SEC ), st->bwidth, st->rf_mode );

                    move16();



                    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 )

                    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 )

                    {

                        return error;

                    }