Commit e80bc1d7 authored by vaclav's avatar vaclav
Browse files

Merge branch '1357_ref_PortFlpMR1258' into 'float-pc' 

Port float MR1258 to BASOP FLP ref

See merge request !1244
parents 2ab06e2f 5bb44f9e

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -204,6 +204,7 @@ 
#define NONBE_FIX_931_IGF_STEREO_DEC_NOISE	                  /* FhG: issue #931: fix noise substitution in the stereo IGF decoder      */

#define FIX_CRASH_LONG_BRIR                             /* Orange : Fix crash when long BRIR is set */

#define NONBE_FIX_943_RECONFIG_IGF_AFTER_SETTING_BW           /* FhG: issue 943: fix crash in BW switchin from WB in MDCT-Stereo core encoder */

#define FIX_911_REMOVE_CREND_DUPLICATION                /* VA: issue 911: resolve duplication of CRend binaural external renderer function */



/* #################### End BASOP porting switches ############################ */

lib_rend/ivas_crend.c

+2 −1
Original line number Diff line number Diff line
@@ -1772,6 +1772,7 @@ static ivas_error ivas_rend_crendConvolver( 
}





#ifndef FIX_911_REMOVE_CREND_DUPLICATION

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

 * Function ivas_rend_crendProcess()

 *
@@ -1913,7 +1914,7 @@ ivas_error ivas_rend_crendProcess( 
    pop_wmops();

    return IVAS_ERR_OK;

}



#endif



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

 * Function ivas_rend_crendProcessSubframe()

lib_rend/ivas_prot_rend.h

+3 −1
Original line number Diff line number Diff line
@@ -887,6 +887,8 @@ ivas_error ivas_rend_initCrendWrapper( 
#endif

);





#ifndef FIX_911_REMOVE_CREND_DUPLICATION

ivas_error ivas_rend_crendProcess(

    const CREND_WRAPPER *pCrend,

    const AUDIO_CONFIG inConfig,
@@ -904,7 +906,7 @@ ivas_error ivas_rend_crendProcess( 
    const int16_t num_subframes                                 /* i  : number of subframes to render */

#endif

);



#endif

ivas_error ivas_rend_crendProcessSubframe(

    const CREND_WRAPPER *pCrend,                                /* i/o: Crend wrapper handle                    */

    const AUDIO_CONFIG inConfig,                                /* i  : input audio configuration               */