Commit aad36a65 authored by emerit's avatar emerit
Browse files

Merge branch 'main' into... 

Merge branch 'main' into basop_2249_Memory_leak_in_SBA_to_BINAURAL_ROOM_REVERB_with_memory_instrumentation
parents 630123db 939356f1

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ 
#define FIX_2264_OUT_OF_BOUND_READING_IN_LOG2_NORM_LC   /* VA: Fix issue 2264 by adding a proper safeguard in log2 and by adding a missing normalization in swb_pre_proc_ivas_fx()*/

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

#define FIX_2254_IMPROV_PRECISION_OR_COMPLEXITY_NON_BE  /* VA: Precision improvement without increasing complexity, or complexity reduction that might be not BE on the LSB */

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

lib_dec/decision_matrix_dec_fx.c

+9 −0
Original line number Diff line number Diff line
@@ -76,10 +76,19 @@ void decision_matrix_dec_fx( 
                    move16();



                    tmp16 = get_next_indice_fx( st, 1 ); // Q0

#ifdef FIX_2252_TD_CNG_STARTS_SID

                    IF( EQ_16( tmp16, 1 ) )

#else

                    if ( EQ_16( tmp16, 1 ) )

#endif

                    {

                        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

+24 −0
Original line number Diff line number Diff line
@@ -91,12 +91,36 @@ 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;

        move16();

        st_fx->last_bwidth = NB;

        move16();

    }

    ELSE

    {

#if 0 // keep deactivated for the moment to keep BE

        st_fx->bwidth = WB;

        move16();

        st_fx->last_bwidth = WB;

#else

        st_fx->bwidth = NB;

        move16();

        st_fx->last_bwidth = NB;

#endif

        move16();

    }

#else

    st_fx->bwidth = NB;

    move16();

    st_fx->last_bwidth = NB;

    move16();

#endif

    st_fx->extl_brate = 0;

    move16();



    st_fx->coder_type = GENERIC; /* low-rate mode flag */

    move16();

    st_fx->last_coder_type = GENERIC;

lib_dec/ivas_decision_matrix_dec_fx.c

+5 −0
Original line number Diff line number Diff line
@@ -115,6 +115,11 @@ 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

            {