Commit 4d388188 authored by multrus's avatar multrus
Browse files

Merge branch '2073_ref_portFlpMr2030_JbmDtxInteraction' into 'ivas-float-update' 

[non-BE] Port Flp MR 2040 - "JBM and DTX interaction not as expected"

See merge request !2327
parents 7a2078e5 d7cda0f7

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -195,6 +195,8 @@ 
#define NONBE_1246_INF_COHERENCE_IN_HIGH_LEVEL_DTX      /* Ericsson: Issue 1246: High level input which triggers DTX can lead to numerical overflow in coherence calculation */

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

#define FIX_1113_EXTREND_ISAR                           /* FhG: issue 1113: fix external renderer asserts for FOA/HOA2 and CLDFB config */

#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_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */

#define FIX_938_COMPILER_WARNING                        /* FhG: Fix compiler warning in ivas_mdct_core_reconstruct() */

#define FIX_1376_MISSING_ISM_METADATA                   /* FhG: IVAS_rend: throw error if there exists an ISM input without a corresponding metadata file path */

#define FIX_1385_INIT_IGF_STOP_FREQ                     /* FhG: Initialize infoIGFStopFreq in init_igf_dec() */

lib_dec/jbm_jb4_jmf.c

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ int16_t JB4_JMF_PushPacket( 


    rtpTimeDiff = (int32_t) ( rtpTimeStamp - h->lastRtpTimeStamp );

    sysTimeDiff = sysTime - h->lastSysTime;

    offset = sysTime - rtpTimeStamp;

    offset = (int32_t) sysTime - (int32_t) rtpTimeStamp;



    /* get the delay (yes, signed!!!!) */

    delay = sysTimeDiff - rtpTimeDiff + h->lastDelay;

lib_dec/jbm_jb4sb.c

+24 −0
Original line number Diff line number Diff line
@@ -199,6 +199,9 @@ struct JB4 
    JB4_DATAUNIT_HANDLE freeMemorySlots[MAX_JBM_SLOTS];

    uint16_t nFreeMemorySlots;

    /*@} */

#ifdef NONBE_1122_KEEP_EVS_MODE_UNCHANGED

    bool evsMode;

#endif

}; /* JB4 */
@@ -293,6 +296,9 @@ ivas_error JB4_Create( 
        h->freeMemorySlots[iter] = &h->memorySlots[iter];

    }

    h->nFreeMemorySlots = MAX_JBM_SLOTS;

#ifdef NONBE_1122_KEEP_EVS_MODE_UNCHANGED

    h->evsMode = false;

#endif

    *ph = h;



    return IVAS_ERR_OK;
@@ -369,6 +375,12 @@ ivas_error JB4_Init( 
    return IVAS_ERR_OK;

}



#ifdef NONBE_1122_KEEP_EVS_MODE_UNCHANGED

void JB4_TMP_SetEvsCompatFlag( JB4_HANDLE h )

{

    h->evsMode = true;

}

#endif



/* Returns a memory slot to store a new data unit */

JB4_DATAUNIT_HANDLE JB4_AllocDataUnit(
@@ -671,10 +683,22 @@ static void JB4_targetPlayoutDelay( 
        *targetStartUp = ( *targetMin + *targetMax ) / 2;

    }



#ifdef NONBE_1122_JBM_FIX_PLAYOUT_DELAY_IN_DTX

#ifdef NONBE_1122_KEEP_EVS_MODE_UNCHANGED

    if ( !h->evsMode )

    {

#endif

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

#ifdef NONBE_1122_KEEP_EVS_MODE_UNCHANGED

    }

#endif

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

#else

    if ( *targetStartUp < 60 )

    {

        *targetStartUp = 60;

    }

#endif



    return;

}

lib_dec/jbm_jb4sb.h

+4 −0
Original line number Diff line number Diff line
@@ -86,6 +86,10 @@ void JB4_Destroy( JB4_HANDLE *ph ); 


ivas_error JB4_Init( JB4_HANDLE h, const int16_t safetyMargin );



#ifdef NONBE_1122_KEEP_EVS_MODE_UNCHANGED

void JB4_TMP_SetEvsCompatFlag( JB4_HANDLE h );

#endif



JB4_DATAUNIT_HANDLE JB4_AllocDataUnit( JB4_HANDLE h );



void JB4_FreeDataUnit( JB4_HANDLE h, JB4_DATAUNIT_HANDLE dataUnit );

lib_dec/lib_dec.c

+7 −0
Original line number Diff line number Diff line
@@ -784,6 +784,13 @@ ivas_error IVAS_DEC_EnableVoIP( 
        return IVAS_ERR_FAILED_ALLOC;

    }



#ifdef NONBE_1122_KEEP_EVS_MODE_UNCHANGED

    if ( hIvasDec->mode == IVAS_DEC_MODE_EVS )

    {

        JB4_TMP_SetEvsCompatFlag( hIvasDec->hVoIP->hJBM );

    }

#endif



    return IVAS_ERR_OK;

}