Commit cc06931e authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_2252_LP_CNG_STARTS_SID

parent 37254efa
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -175,7 +175,6 @@
/* #################### Start NON-BE switches ############################ */
/* any switch which is non-be wrt. TS 26.258 V3.0 */

#define FIX_2252_LP_CNG_STARTS_SID                      /* VA: issues 2251 and 2252: fix LP CNG uninitialized value in bitstream that starts with an SID */
#define FIX_1381_BWD                                    /* VA: issue 1381: apply no hysteresis in BWD at higher bitrates also in mono MASA and OMASA */
#define FIX_2285_CODE_DECODER_INIT_BW                   /* VA: basop issue 2285: fix core-decoder initialization bandwidth */

+0 −2
Original line number Diff line number Diff line
@@ -101,10 +101,8 @@ void decision_matrix_dec(
                    if ( get_next_indice( st, 1 ) == 1 )
                    {
                        st->L_frame = L_FRAME16k;
#ifdef FIX_2252_LP_CNG_STARTS_SID
                        st->nb_subfr = NB_SUBFR16k;
                        st->bwidth = max( st->bwidth, WB );
#endif
                    }
                }
                else
+0 −5
Original line number Diff line number Diff line
@@ -79,7 +79,6 @@ ivas_error init_decoder(
    st->last_total_brate_ber = -1;
    st->core_brate = ACELP_8k00;
    st->ini_frame = 0;
#ifdef FIX_2252_LP_CNG_STARTS_SID
    if ( st->element_mode == EVS_MONO )
    {
        st->bwidth = NB;
@@ -95,10 +94,6 @@ ivas_error init_decoder(
        st->last_bwidth = NB;
#endif
    }
#else
    st->bwidth = NB;
    st->last_bwidth = NB;
#endif
    st->extl_brate = 0;

    st->coder_type = GENERIC;
+0 −2
Original line number Diff line number Diff line
@@ -95,10 +95,8 @@ void ivas_decision_matrix_dec(
            if ( get_next_indice( st, 1 ) )
            {
                st->L_frame = L_FRAME16k;
#ifdef FIX_2252_LP_CNG_STARTS_SID
                st->nb_subfr = NB_SUBFR16k;
                st->bwidth = max( st->bwidth, WB );
#endif
            }
            else
            {