Commit 2a5ac5d6 authored by vaclav's avatar vaclav
Browse files

port FIX_911_REMOVE_CREND_DUPLICATION

parent 23f1ecad
Loading
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -198,6 +198,7 @@
#define SPLIT_REND_POSE_CORRECTION_UNUSED_BITS
#define ISAR_BITSTREAM_UPDATE_LC3PLUS                   /* FhG: Multiple improvements to the ISAR bitstream when LC3plus is used. See MR 1456 for details. */
#endif
#define FIX_911_REMOVE_CREND_DUPLICATION                /* VA: issue 911: resolve duplication of CRend binaural external renderer function */

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

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


#ifndef FIX_911_REMOVE_CREND_DUPLICATION
/*-----------------------------------------------------------------------------------------*
 * Function ivas_rend_crendProcess()
 *
@@ -1881,7 +1882,7 @@ ivas_error ivas_rend_crendProcess(
    pop_wmops();
    return IVAS_ERR_OK;
}

#endif

/*-----------------------------------------------------------------------------------------*
 * Function ivas_rend_crendProcessSubframe()
+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               */