Commit c577e846 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'fhg/port-fix-for-igf-initialization-error-printout' into 'main' 

port fix for igf initialization error printout to main

See merge request !2468
parents 3fe45f3a ea019a88

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -117,6 +117,7 @@ 
#define FIX_RENDERER_STACK                              /* VA: issue 1322: reduction of renderers' buffers size */

#define FIX_1370_EXTERNAL_ORIENTATION_CHECK             /* Nokia: add sanity check for Euler angles for external orientations */

#define NONBE_FIX_1197_OMASA_META_BUFFER                /* Nokia: OMASA ISM_MASA_MODE_PARAM_ONE_OBJ history zero in rateswitching - port 251 */

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



// object-editing feature porting

#define TMP_FIX_SPLIT_REND                              // temporary fix to split-rendering (it follows the later state of the framework but it is needed now because of current test-conditions)

lib_enc/ivas_cpe_enc_fx.c

+5 −0
Original line number Diff line number Diff line
@@ -1039,7 +1039,12 @@ ivas_error ivas_cpe_enc_fx( 
                bw = sts[n]->bwidth;

            }

            igf = getIgfPresent_fx( sts[n]->element_mode, L_mult0( sts[n]->bits_frame_nominal, FRAMES_PER_SEC ), bw, sts[n]->rf_mode ); /* Q0 */

#ifdef FIX_1413_IGF_INIT_PRINTOUT

            IF( ( error = IGF_Reconfig_fx( &sts[n]->hIGFEnc, igf, 0, L_mult0( 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_fx( &sts[n]->hIGFEnc, igf, 0, L_mult0( sts[n]->bits_frame_nominal, FRAMES_PER_SEC ), max_bwidth, sts[n]->element_mode, sts[n]->rf_mode ) ) != IVAS_ERR_OK )

#endif



            {

                return error;

            }