Commit dd577b6b authored by vaclav's avatar vaclav
Browse files

accept NONBE_1122_JBM_FIX_PLAYOUT_DELAY_IN_DTX,... 

accept NONBE_1122_JBM_FIX_PLAYOUT_DELAY_IN_DTX, NONBE_1296_TDREND_ITD_OUT_OF_BOUNDS_ACCESS, NONBE_1303_GRANULARITY_OSBA_REND
parent 959e3ae1

lib_com/options.h

+1 −3
Original line number Diff line number Diff line
@@ -171,13 +171,11 @@ 


#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_1293_CRASH_FIRST_FRAME_LOST               /* VA: issue 1293: fix G.192 decoder crash when first frame is lost */

#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 NONBE_1296_TDREND_ITD_OUT_OF_BOUNDS_ACCESS      /* Eri: issue 1296: ITD resampling can occasionally read out of bounds, especially when the requested subframes are short (1.25 ms). Seen for headtracking+JBM. */

#define NONBE_1303_GRANULARITY_OSBA_REND                /* VA: issue 1303: Correctly set the granularity in OSBA, Disc mode, and BINAURAL_ROOM_REVERB output */

#define NONBE_1118_EVS_LR_HQ_BITERROR                   /* VA: issue 1118: fix EVS decoder crash in LR-HQ in case of bit errors */

#define NONBE_1303_REND_GRANULARITY                     /* VA: issue 1303: Renderer granularity revision */





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



/* ################## End DEVELOPMENT switches ######################### */

lib_dec/ivas_sba_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -184,11 +184,7 @@ ivas_error ivas_sba_dec_reconfigure( 
        }

        else

        {

#ifdef NONBE_1303_GRANULARITY_OSBA_REND

            if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL || st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB || st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )

#else

            if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL || st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )

#endif

            {

                renderer_type_new = RENDERER_BINAURAL_FASTCONV;

            }

lib_dec/jbm_jb4sb.c

+0 −7
Original line number Diff line number Diff line
@@ -683,7 +683,6 @@ 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 )

    {
@@ -693,12 +692,6 @@ static void JB4_targetPlayoutDelay( 
    }

#endif

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

#else

    if ( *targetStartUp < 60 )

    {

        *targetStartUp = 60;

    }

#endif



    return;

}

lib_rend/ivas_objectRenderer_sfx.c

+2 −9
Original line number Diff line number Diff line
@@ -39,11 +39,6 @@ 
#include "wmc_auto.h"





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

 * Local constants

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





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

 * Local function prototypes

 *---------------------------------------------------------------------*/
@@ -56,6 +51,7 @@ static void sincResample( const float *input, float *output, const int16_t lengt 
 *

 * Apply ITD by delaying late channel

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



void TDREND_Apply_ITD(

    float *input,        /* i  : Input subframe to be time adjusted    */

    float *out_left,     /* o  : Output left channel with ITD applied  */
@@ -163,6 +159,7 @@ void TDREND_Apply_ITD( 
 * The sinc resampling reads SFX_SPAT_BIN_SINC_M (5) samples outside of

 * the target frame.

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



static void sincResample(

    const float *input,      /*i  : Input signal  */

    float *output,           /*o  : Output signal */
@@ -188,7 +185,6 @@ static void sincResample( 
        return;

    }





    /* Compute fractional time step */

    t_step = (float) ( length_in ) / (float) ( length_out );

    t_frac = 0;
@@ -216,9 +212,6 @@ static void sincResample( 
            p_forward++;

            p_backward--;

        }

#ifndef NONBE_1296_TDREND_ITD_OUT_OF_BOUNDS_ACCESS

        tmp += ( *p_forward ) * ( *p_sinc_forward ); /* Integer index always rounded down --> 4 steps backward, 5 steps forward */

#endif



        output[i] = tmp;