Commit 260458b7 authored by vaclav's avatar vaclav
Browse files

fix

parent 2137b4e7
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@
#define FIX_2015_PREMPH_SAT_ALT_PART2                   /* VA: Add missing scaling factor to be passed to AVQ_cod() */
#define FIX_2253_CORRECT_GSC_MINIMUM_PIT_SEARCH         /* VA: Fix Issue 2253 where the encoder and decoder could get out of sync */
#define NONBE_FIX_1967_SBA_DECODER_MONO_OUT_BIG_DIFFERENCES /* Dolby: Fix basop issue 1967 */
#define FIX_2252_TD_CNG_STARTS_SID                      /* VA: issues 2251 and 2252: Resolve "MSAN with bitstream that starts with an SID" */
#define FIX_2252_LP_CNG_STARTS_SID                      /* VA: issues 2251 and 2252: fix LP CNG uninitialized value in bitstream that starts with an SID */

/* ##################### End NON-BE switches ########################### */

+2 −3
Original line number Diff line number Diff line
@@ -84,11 +84,10 @@ void decision_matrix_dec_fx(
                    {
                        st->L_frame = L_FRAME16k;
                        move16();
#ifdef FIX_2252_TD_CNG_STARTS_SID
#ifdef FIX_2252_LP_CNG_STARTS_SID
                        st->nb_subfr = NB_SUBFR16k;
                        move16();
                        st->bwidth = WB;
                        move16();
                        st->bwidth = s_max( st->bwidth, WB );
#endif
                    }
                }
+6 −6
Original line number Diff line number Diff line
@@ -91,20 +91,20 @@ ivas_error init_decoder_fx(
    move16();
    st_fx->ini_frame = 0;
    move16();
#ifdef FIX_2252_TD_CNG_STARTS_SID
    IF( st->element_mode == EVS_MONO )
#ifdef FIX_2252_LP_CNG_STARTS_SID
    IF( st_fx->element_mode == EVS_MONO )
    {
        st->bwidth = NB;
        st_fx->bwidth = NB;
        move16();
        st->last_bwidth = NB;
        st_fx->last_bwidth = NB;
        move16();
    }
    ELSE
    {
        st_fx->bwidth = WB;
        move16();
        st_fx->last_bwidth = WB;
        move16();
        // st_fx->last_bwidth = WB; // TBV
        // move16();
    }
#else
    st_fx->bwidth = NB;
+2 −3
Original line number Diff line number Diff line
@@ -115,11 +115,10 @@ void ivas_decision_matrix_dec_fx(
            {
                st->L_frame = L_FRAME16k;
                move16();
#ifdef FIX_2252_TD_CNG_STARTS_SID
#ifdef FIX_2252_LP_CNG_STARTS_SID
                st->nb_subfr = NB_SUBFR16k;
                move16();
                st->bwidth = WB;
                move16();
                st->bwidth = s_max( st->bwidth, WB );
#endif
            }
            ELSE