Commit 6759ab5b authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_299_ISM_BWS

parent 56246ac5

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -150,7 +150,6 @@ 


#define FIX_197_CREND_INTERFACE 

#define FIX_FOR_TEST                                    /* allows tests to pass using old TD binary file, to be removed after merge*/

#define FIX_299_ISM_BWS                                 /* VA: issue 299 - fix Band-width switching issues in ISM format */

#define FIX_309_PREMPH_MEM_SCE                          /* FhG: issue 309 - fix overwriting of mem_preemph_enc in ivas preprocessing for SCE and tcxonly modes*/



#define FIX_317                                         /* FhG: issue 317 - address sanitizer error in MDCT-Stereo PLC */

lib_dec/core_switching_dec.c

+0 −2
Original line number Diff line number Diff line
@@ -1029,9 +1029,7 @@ void bandwidth_switching_detect( 
        st->bws_cnt1 = 0;

    }

    else if ( st->total_brate > ACELP_9k60 && st->last_core_brate < ACELP_9k60 && st->bwidth == SWB && st->last_bwidth == WB

#ifdef FIX_299_ISM_BWS

              && st->last_low_rate_mode == 0

#endif

    )

    {

        st->bws_cnt1++;

lib_dec/init_dec.c

+0 −2
Original line number Diff line number Diff line
@@ -107,9 +107,7 @@ ivas_error init_decoder( 
    st->last_good = UNVOICED_CLAS;

    st->clas_dec = UNVOICED_CLAS;

    st->low_rate_mode = 0;

#ifdef FIX_299_ISM_BWS

    st->last_low_rate_mode = 0;

#endif



    st->lp_gainp = 0.0f;

    st->lp_gainc = 0.0f;

lib_dec/stat_dec.h

+0 −2
Original line number Diff line number Diff line
@@ -934,9 +934,7 @@ typedef struct Decoder_State 
    int16_t ini_frame;               /* initialization frames counter */

    int16_t prev_coder_type;         /* coding type of last frame */

    int16_t low_rate_mode;           /* low-rate mode flag */

#ifdef FIX_299_ISM_BWS

    int16_t last_low_rate_mode; /* previous frame low-rate mode flag */

#endif



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

     * ACELP core parameters