Commit 9c8929f9 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_2252_LP_CNG_STARTS_SID

parent b7780192

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -104,7 +104,6 @@ 
/* any switch which is non-be wrt. TS 26.251 V3.0 */



#define FIX_2250_LARGE_DIFFERENCES_BETWEEN_BASOP_AND_FLOAT  /* Dolby: Issue 2250:  random vector generation in GenShapedSHBExcitation() */

#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 */

#define FIX_2306_MISSING_UPDATE_LOWRATE_PITCH_GAIN      /* Dolby: Fix missing update of low-rate pitch gain in the S/M classifier */

lib_dec/decision_matrix_dec_fx.c

+0 −2
Original line number Diff line number Diff line
@@ -84,11 +84,9 @@ void decision_matrix_dec_fx( 
                    {

                        st->L_frame = L_FRAME16k;

                        move16();

#ifdef FIX_2252_LP_CNG_STARTS_SID

                        st->nb_subfr = NB_SUBFR16k;

                        move16();

                        st->bwidth = s_max( st->bwidth, WB );

#endif

                    }

                }

                ELSE

lib_dec/init_dec_fx.c

+0 −7
Original line number Diff line number Diff line
@@ -91,7 +91,6 @@ ivas_error init_decoder_fx( 
    move16();

    st_fx->ini_frame = 0;

    move16();

#ifdef FIX_2252_LP_CNG_STARTS_SID

    IF( st_fx->element_mode == EVS_MONO )

    {

        st_fx->bwidth = NB;
@@ -112,12 +111,6 @@ ivas_error init_decoder_fx( 
#endif

        move16();

    }

#else

    st_fx->bwidth = NB;

    move16();

    st_fx->last_bwidth = NB;

    move16();

#endif

    st_fx->extl_brate = 0;

    move16();

lib_dec/ivas_decision_matrix_dec_fx.c

+0 −2
Original line number Diff line number Diff line
@@ -115,11 +115,9 @@ void ivas_decision_matrix_dec_fx( 
            {

                st->L_frame = L_FRAME16k;

                move16();

#ifdef FIX_2252_LP_CNG_STARTS_SID

                st->nb_subfr = NB_SUBFR16k;

                move16();

                st->bwidth = s_max( st->bwidth, WB );

#endif

            }

            ELSE

            {