Commit 68091d96 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_SBA_DTX_DECODE_ERROR

parent 9c449287

lib_com/ivas_cnst.h

+0 −2
Original line number Diff line number Diff line
@@ -841,9 +841,7 @@ typedef enum { 
#define SBA_MIN_BRATE_HOA                       IVAS_256k

#define SBA_NHARM_HOA3                          16

#define SBA_T_DESIGN_11_SIZE                    70

#ifdef FIX_SBA_DTX_DECODE_ERROR

#define SBA_DTX_BITRATE_THRESHOLD               IVAS_80k

#endif



typedef enum 

{

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -145,7 +145,6 @@ 
/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

#define FIX_I1_113                                      /* under review : MCT bit distribution optimization for SBA high bitrates*/

#define PRINT_SBA_ORDER                                 /* Issue 179: print-out also the SBA order of IVAS SBA format to stdout */

#define FIX_SBA_DTX_DECODE_ERROR                        /* Issue 176: SBA decoder error with DTX at 80kbps SWB, Issue 21: SBA front-VAD threshold (203) */

#define FIX_124_DONT_ALLOC_PLCINFO_IN_IVAS              /* Issue 124: do not allocate unused plc struct in IVAS modes which is only used in EVS mono */

/*#define FIX_MCT_PLC_RECOVERY*/                            /* Issue 184: scale the old synthesis part correctly in the first good frame after lost frames in MCT modes - to be activated after previous switch is merged */

#define FIX_MSAN_ERROR_STEREO_RATE_SWITCHING            /* addresses Issue 177 */

lib_enc/ivas_front_vad.c

+0 −4
Original line number Diff line number Diff line
@@ -396,11 +396,7 @@ ivas_error front_vad_spar( 
    hFrontVad = hSpar->hFrontVad;

    st = hSpar->hCoreCoderVAD;



#ifdef FIX_SBA_DTX_DECODE_ERROR

    if ( hEncoderConfig->Opt_DTX_ON && hEncoderConfig->ivas_total_brate <= SBA_DTX_BITRATE_THRESHOLD )

#else

    if ( hEncoderConfig->Opt_DTX_ON && hEncoderConfig->ivas_total_brate <= IVAS_80k )

#endif

    {

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

         * Initialization

lib_enc/ivas_spar_encoder.c

+0 −5
Original line number Diff line number Diff line
@@ -315,13 +315,8 @@ ivas_error ivas_spar_enc( 


    *nb_bits_metadata = hMetaData->nb_bits_tot;



#ifdef FIX_SBA_DTX_DECODE_ERROR

    /* Force IVAS front pre-proc decision for higher bitrates */

    if ( hEncoderConfig->ivas_total_brate > SBA_DTX_BITRATE_THRESHOLD || hEncoderConfig->Opt_DTX_ON == 0 )

#else

    /* temp hack to not force IVAS front pre-proc decision for higher bitrates */

    if ( hEncoderConfig->ivas_total_brate > IVAS_64k || hEncoderConfig->Opt_DTX_ON == 0 )

#endif

    {

        st_ivas->hSpar->front_vad_flag = 0;

    }