Commit 469329b7 authored by sagnowski's avatar sagnowski
Browse files

Put all changes in one preprocessor switch

parent 9881d0fb

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -160,7 +160,6 @@ 


/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

#define TMP_FIX_1119_SPLIT_RENDERING_VOIP               /* FhG: Add error check for unsupported config: split rendering with VoIP mode */

#define ISSUE_1122_JBM_DO_NOT_HARDCODE_SAFETY_MARGIN    /* FhG: Use safety margin defined by user instead of a hard-coded value */



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

lib_dec/jbm_jb4sb.c

+0 −9
Original line number Diff line number Diff line
@@ -672,16 +672,7 @@ static void JB4_targetPlayoutDelay( 
    }



#ifdef NONBE_1122_JBM_FIX_PLAYOUT_DELAY_IN_DTX

#ifdef ISSUE_1122_JBM_DO_NOT_HARDCODE_SAFETY_MARGIN

    *targetDtx = JB4_MAX( *targetDtx, (uint32_t) h->safetyMargin );

#else

    if ( *targetDtx < 60 )

    {

        *targetDtx = 60;

    }

#endif

#endif

#ifdef ISSUE_1122_JBM_DO_NOT_HARDCODE_SAFETY_MARGIN

    *targetStartUp = JB4_MAX( *targetStartUp, (uint32_t) h->safetyMargin );

#else

    if ( *targetStartUp < 60 )