Commit d8377e9c authored by malenov's avatar malenov
Browse files

cleanup NONBE_1211_DTX_BR_SWITCHING

parent 7cf5cace

lib_com/ivas_prot.h

+0 −2
Original line number Diff line number Diff line
@@ -200,9 +200,7 @@ ivas_error pre_proc_front_ivas( 
    const int16_t front_vad_dtx_flag,                           /* i  : front-VAD DTX flag to overwrite VAD decision*/

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

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

#ifdef NONBE_1211_DTX_BR_SWITCHING

    const int32_t last_ivas_total_brate,                        /* i  : last IVAS total bitrate                    */

#endif

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

#ifdef DEBUG_MODE_INFO

	, const int16_t ch_idx

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -171,7 +171,6 @@ 
#define NONBE_FIX_1213_SBA_DET_MAT_INV_3BY3             /*Dolby: issue 1213: fix for inverse of det < 0*/

#define NONBE_FIX_1204_MDCT_STEREO_NOISE_EST_SCALING    /* FhG: fixes for decoder-side noise level estimation in MDCT-Stereo to prevent noise bursts in stereo switching */



#define NONBE_1211_DTX_BR_SWITCHING                     /* VA: port float issue 1211: fix crash in MASA DTX bitrate switching */

#define NONBE_FIX_1189_GSC_IVAS_OMASA                   /* VA: Fix for issue 1189: Bitstream desynchornization due to reading/writing of the GSC_IVAS_mode parameter */

#define NONBE_FIX_1087_OOB_SBA_DTX_RS                   /* VA: issue 1087: Extend the length of the buffer for MCT decoding to avoid out-of-bound writing in SBA SID bitrate switching decoding */

#define FIX_920_IGF_INIT_ERROR                          /* FhG: issue 920: fix bitrate mismatch in initial IGF config to avoid error message in same cases */

lib_com/prot.h

+0 −2
Original line number Diff line number Diff line
@@ -3908,9 +3908,7 @@ void td_cng_enc_init( 


void dtx(

    Encoder_State *st, /* i/o: encoder state structure                     */

#ifdef NONBE_1211_DTX_BR_SWITCHING

    const int32_t last_ivas_total_brate, /* i  : last IVAS total bitrate                     */

#endif

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

    const int16_t vad,              /* i  : VAD flag for DTX                            */

    const float speech[]            /* i  : Pointer to the speech frame                 */

lib_enc/amr_wb_enc.c

+0 −4
Original line number Diff line number Diff line
@@ -311,11 +311,7 @@ void amr_wb_enc( 
        st->fd_cng_reset_flag = 0;

    }



#ifdef NONBE_1211_DTX_BR_SWITCHING

    dtx( st, -1, -1, vad_flag_dtx, inp );

#else

    dtx( st, -1, vad_flag_dtx, inp );

#endif



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

     * Noise energy down-ward update and total noise energy estimation

lib_enc/dtx.c

+0 −16
Original line number Diff line number Diff line
@@ -84,9 +84,7 @@ static void update_SID_cnt( DTX_ENC_HANDLE hDtxEnc, const int32_t core_brate, co 


void dtx(

    Encoder_State *st, /* i/o: encoder state structure            */

#ifdef NONBE_1211_DTX_BR_SWITCHING

    const int32_t last_ivas_total_brate, /* i  : last IVAS total bitrate            */

#endif

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

    const int16_t vad,              /* i  : VAD flag for DTX                   */

    const float speech[]            /* i  : Pointer to the speech frame        */
@@ -95,7 +93,6 @@ void dtx( 
    float alpha;

    DTX_ENC_HANDLE hDtxEnc = st->hDtxEnc;

    int16_t last_br_cng_flag, last_br_flag, br_dtx_flag;

#ifdef NONBE_1211_DTX_BR_SWITCHING

    int32_t total_brate_ref;

#ifdef NONBE_FIX_1277_EVS_DTX_HIGH_RATE_THRESHOLD

    int16_t dtx_thr;
@@ -108,15 +105,11 @@ void dtx( 
#endif



    total_brate_ref = st->total_brate;

#endif



    if ( st->dtx_sce_sba != 0 )

    {

        last_br_cng_flag = 1;

        last_br_flag = 1;

#ifndef NONBE_1211_DTX_BR_SWITCHING

        br_dtx_flag = 1;

#endif

    }

    else

    {
@@ -125,17 +118,12 @@ void dtx( 
#else

        last_br_cng_flag = st->last_total_brate_cng <= MAX_BRATE_DTX_EVS || st->lp_noise < 15 || ( st->element_mode == IVAS_SCE && st->last_total_brate_cng <= MAX_BRATE_DTX_IVAS );

#endif

#ifdef NONBE_1211_DTX_BR_SWITCHING

        last_br_flag = ( st->element_mode == EVS_MONO && st->last_total_brate <= MAX_BRATE_DTX_EVS ) ||

                       ( st->element_mode != EVS_MONO && last_ivas_total_brate <= MAX_BRATE_DTX_IVAS ) ||

#ifdef NONBE_FIX_1277_EVS_DTX_HIGH_RATE_THRESHOLD

                       st->lp_noise < dtx_thr;

#else

                       st->lp_noise < 15;

#endif

#else

        last_br_flag = st->last_total_brate <= MAX_BRATE_DTX_EVS || st->lp_noise < 15 || ( st->element_mode == IVAS_SCE && st->last_total_brate <= MAX_BRATE_DTX_IVAS );

        br_dtx_flag = 0;

#endif

    }
@@ -210,9 +198,7 @@ void dtx( 
     * Select SID or FRAME_NO_DATA frame if DTX is enabled

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



#ifdef NONBE_1211_DTX_BR_SWITCHING

    br_dtx_flag = 1;

#endif

    if ( st->dtx_sce_sba == 0 )

    {

        br_dtx_flag = ( st->element_mode == EVS_MONO && st->total_brate <= MAX_BRATE_DTX_EVS ) ||
@@ -305,12 +291,10 @@ void dtx( 
            reset_indices_enc( st->hBstr, st->hBstr->nb_ind_tot );

        }

    }

#ifdef NONBE_1211_DTX_BR_SWITCHING

    else if ( st->element_mode != EVS_MONO )

    {

        st->total_brate = total_brate_ref;

    }

#endif



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

     * Reset counters when in active frame (neither SID nor FRAME_NO_DATA frame)