Commit 9881d0fb authored by sagnowski's avatar sagnowski
Browse files

Avoid JBM ignoring safety margin and setting playout delay to 0 during DTX

parent 7dc55586

lib_com/options.h

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


/*#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 ################################## */
@@ -173,7 +174,7 @@ 
#define NONBE_1279_COUNTER_OVERFLOW                     /* VA: issue 1279: Avoid possible overflow of counter st->Nb_ACELP_frames */

#define NONBE_1244_FIX_SWB_BWE_MEMORY                   /* VA: issue 1244: fix to SWB BWE memory in case of switching from FB coding - pending a review by Huawei */ 

#define NONBE_FIX_1277_EVS_DTX_HIGH_RATE_THRESHOLD      /* VA/Eri: issue 1277: Fix Mismatch in DTX high-rate threshold between EVS float and BASOP */



#define NONBE_1122_JBM_FIX_PLAYOUT_DELAY_IN_DTX         /* FhG: Avoid JBM ignoring safety margin and setting playout delay to 0 during DTX */



#define NONBE_1231_BASOP_819_THRESHOLD_MASA2TOTAL        /* Nokia: add fix for precision limitation in comparison with masa2total energy ratio threshold to be aligned with BASOP*/

/* ##################### End NON-BE switches ########################### */

lib_dec/jbm_jb4sb.c

+14 −0
Original line number Diff line number Diff line
@@ -671,10 +671,24 @@ static void JB4_targetPlayoutDelay( 
        *targetStartUp = ( *targetMin + *targetMax ) / 2;

    }



#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 )

    {

        *targetStartUp = 60;

    }

#endif



    return;

}