diff --git a/lib_com/options.h b/lib_com/options.h index 1d498d32d22e67e3ae3c85b8cce3ec589fba08fd..050f0ef4d77a249c5b70f8bf3f0b4e5fe0f1f2c5 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -94,6 +94,7 @@ #define FIX_FLOAT_1539_G192_FORMAT_SWITCH /* VA/Nokia: reintroduce format switching for g192 bitstreams */ #define HARMONIZE_2595_reconfig_decoder_LPD /* FhG: Harmonize reconfig_decoder_LPD with its ivas derivate */ #define HARMONIZE_2596_SetModeIndex /* FhG: Harmonize SetModeIndex with its ivas derivate */ +#define FIX_2346_DUPLICATED_IGF_FUNCTIONS_3 /* FhG: part 3 of basop issue 2346: Remove duplicate reconfig function */ /* #################### End BE switches ################################## */ diff --git a/lib_com/prot_fx.h b/lib_com/prot_fx.h index 056cba33b9d37452d383c03c0f6d70182e65eb40..2c8523da1e728a7e7ecba4444311a00bf9db1c05 100644 --- a/lib_com/prot_fx.h +++ b/lib_com/prot_fx.h @@ -10114,6 +10114,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 */ @@ -10125,3 +10126,5 @@ ivas_error IGF_Reconfig( ); #endif + +#endif diff --git a/lib_enc/igf_enc_fx.c b/lib_enc/igf_enc_fx.c index 27c3a7f2fc2e4bc34f27d5dc3e3fa9f733b531bd..39cf655d3a23b0ae5cf39d66d2a33c49d66d474d 100644 --- a/lib_enc/igf_enc_fx.c +++ b/lib_enc/igf_enc_fx.c @@ -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 diff --git a/lib_enc/ivas_corecoder_enc_reconfig_fx.c b/lib_enc/ivas_corecoder_enc_reconfig_fx.c index 9c845eb400fa2b3c81e21df8ec80810198f2917a..945af196a7c2656d272adebe9fb03cb5cb9a63a7 100644 --- a/lib_enc/ivas_corecoder_enc_reconfig_fx.c +++ b/lib_enc/ivas_corecoder_enc_reconfig_fx.c @@ -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; } diff --git a/lib_enc/ivas_mct_enc_fx.c b/lib_enc/ivas_mct_enc_fx.c index 81a8f7942605fbabbe6aa7370ecee204587ed483..adc64d70cdd3d4260f10f53b06305e121c9556fe 100644 --- a/lib_enc/ivas_mct_enc_fx.c +++ b/lib_enc/ivas_mct_enc_fx.c @@ -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; }