Commit c9d095e4 authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_FIX_788_SBA_DTX_BR_SWITCHING

parent e0d59928

lib_com/ivas_prot.h

+0 −2
Original line number Diff line number Diff line
@@ -199,9 +199,7 @@ ivas_error pre_proc_front_ivas( 
    const int16_t force_front_vad,                              /* i  : flag to force VAD decision                 */

    const int16_t front_vad_dtx_flag,                           /* i  : front-VAD DTX flag to overwrite VAD decision*/

    const IVAS_FORMAT ivas_format,                              /* i  : IVAS format                                */

#ifdef NONBE_FIX_788_SBA_DTX_BR_SWITCHING

    const int16_t MCT_flag, /* i  : hMCT handle allocated (1) or not (0)    */

#endif

    const int32_t ivas_total_brate                              /* i  : IVAS total bitrate                         */

);

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -161,7 +161,6 @@ 
/* any switch which is non-be wrt selection floating point code */

/* all switches in this category should start with "NONBE_" */



#define NONBE_FIX_788_SBA_DTX_BR_SWITCHING                    /* VA: issue 787: fix Msan error in SBA BR switching with dtx in FOA encoding */

#define NONBE_FIX_856_TCX_LTP_SYNTH_FILTER                    /* FhG: issue 856: correct filtering length for tcx-ltp synth filtering*/

#define NONBE_UNIFIED_DECODING_PATHS                          /* FhG: unify decoding paths   */

#define NONBE_FIX_874_OMASA_BRSW_2TD                          /* Nokia: issue 874: Fixes the crashes with the long test vectors that prompted switching to TD*/

lib_enc/init_enc.c

+0 −2
Original line number Diff line number Diff line
@@ -100,9 +100,7 @@ ivas_error init_encoder( 
    st->low_rate_mode = 0;

    st->ini_frame = 0;

    st->inactive_coder_type_flag = 0;

#ifdef NONBE_FIX_788_SBA_DTX_BR_SWITCHING

    st->sba_br_sw_while_no_data = 0;

#endif



    st->coder_type_raw = VOICED;

    st->last_coder_type_raw = st->coder_type_raw;

lib_enc/ivas_core_pre_proc.c

+0 −2
Original line number Diff line number Diff line
@@ -283,9 +283,7 @@ ivas_error pre_proc_ivas( 
    }

    else if ( element_brate != last_element_brate )

    {

#ifdef NONBE_FIX_788_SBA_DTX_BR_SWITCHING

        if ( st->core_brate != FRAME_NO_DATA )

#endif

        {

            SetModeIndex( st, st->bits_frame_nominal * FRAMES_PER_SEC, element_mode, MCT_flag );

        }

lib_enc/ivas_core_pre_proc_front.c

+0 −8
Original line number Diff line number Diff line
@@ -108,9 +108,7 @@ ivas_error pre_proc_front_ivas( 
    const int16_t force_front_vad,                             /* i  : flag to force VAD decision               */

    const int16_t front_vad_dtx_flag,                          /* i  : front-VAD DTX flag to overwrite VAD decision*/

    const IVAS_FORMAT ivas_format,                             /* i  : IVAS format                              */

#ifdef NONBE_FIX_788_SBA_DTX_BR_SWITCHING

    const int16_t MCT_flag, /* i  : hMCT handle allocated (1) or not (0)    */

#endif

    const int32_t ivas_total_brate /* i  : IVAS total bitrate - for setting the DTX */

)

{
@@ -186,11 +184,7 @@ ivas_error pre_proc_front_ivas( 
        st = hSCE->hCoreCoder[n];

        signal_in = hSCE->hCoreCoder[n]->input;

        element_mode = IVAS_SCE;

#ifdef NONBE_FIX_788_SBA_DTX_BR_SWITCHING

        last_element_brate = hSCE->last_element_brate;

#else

        last_element_brate = hSCE->element_brate; /*  hack - the past parameter is not really needed */

#endif

        hStereoClassif = NULL;

        lr_vad_enabled = 0;

    }
@@ -787,7 +781,6 @@ ivas_error pre_proc_front_ivas( 
        /* SNR-based speech/music classification */

        if ( ( element_mode >= IVAS_CPE_DFT && element_brate >= IVAS_24k4 ) || ( element_mode == IVAS_SCE && element_brate >= SCE_SMC_THR ) )

        {

#ifdef NONBE_FIX_788_SBA_DTX_BR_SWITCHING

            if ( ivas_format == SBA_FORMAT && st->core_brate != FRAME_NO_DATA && st->last_core_brate == FRAME_NO_DATA && st->sba_br_sw_while_no_data )

            {

                SetModeIndex( st, st->bits_frame_nominal * FRAMES_PER_SEC, element_mode, MCT_flag );
@@ -797,7 +790,6 @@ ivas_error pre_proc_front_ivas( 
            {

                st->sba_br_sw_while_no_data = 1;

            }

#endif



            if ( flag_16k_smc )

            {