Commit 9ddacaa8 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

Merge branch '1413-igf-initialization-error' into 'main' 

Resolve "IGF initialization error"

See merge request !2292
parents 4d899468 d85d3c5f

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ 
/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

#define FIX_1119_SPLIT_RENDERING_VOIP                   /* FhG: Add split rendering support to decoder in VoIP mode */

#define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR      /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */



#define FIX_1413_IGF_INIT_PRINTOUT                      /* FhG: use correct variable for IGF initiliazation */



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

lib_enc/ivas_cpe_enc.c

+4 −0
Original line number Diff line number Diff line
@@ -559,7 +559,11 @@ ivas_error ivas_cpe_enc( 


            bw = ( hCPE->element_mode == IVAS_CPE_MDCT ) ? sts[n]->bwidth : max_bwidth;

            igf = getIgfPresent( sts[n]->element_mode, sts[n]->bits_frame_nominal * FRAMES_PER_SEC, bw, sts[n]->rf_mode );

#ifdef FIX_1413_IGF_INIT_PRINTOUT

            if ( ( error = IGF_Reconfig( &sts[n]->hIGFEnc, igf, 0, sts[n]->bits_frame_nominal * FRAMES_PER_SEC, bw, sts[n]->element_mode, sts[n]->rf_mode ) ) != IVAS_ERR_OK )

#else

            if ( ( error = IGF_Reconfig( &sts[n]->hIGFEnc, igf, 0, sts[n]->bits_frame_nominal * FRAMES_PER_SEC, max_bwidth, sts[n]->element_mode, sts[n]->rf_mode ) ) != IVAS_ERR_OK )

#endif

            {

                return error;

            }