Commit c31707f7 authored by Marek Szczerba's avatar Marek Szczerba
Browse files

Merge branch 'main' into 1019-socket-interface-for-pose-and-audio

parents 3e05bec5 867217ee

lib_com/options.h

+1 −4
Original line number Diff line number Diff line
@@ -166,19 +166,16 @@ 


#define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR      /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */

#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */

#define FIX_BASOP_2201_HARMONIZE_HRTF_FILE_READER_CREND /* OR : Fix issue basop 2201 hrtf_file_reader crend differs between basop ivas-main and ivas-float-update */



/* #################### End BE switches ################################## */



/* #################### Start NON-BE switches ############################ */

/* any switch which is non-be wrt. TS 26.258 V3.0 */







#define FIX_1435_MOVE_STEREO_PANNING                    /* VA: issue 1435: do the EVS stereo panning in the renderer */

#define FIX_1454_FIX_STEREO_TO_FOA_JBM                  /* VA: issue 1454: fix buggy stereo to FOA in JBM */

#define FIX_1461_CNG_BW_SWITCHING                       /* Eri: issue 1461: Stereo parameters are not updated when SID/NODATA forces BW to stay the same */



#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_debug/wmc_auto.c

+4 −4
Original line number Diff line number Diff line
@@ -974,10 +974,10 @@ int push_stack( const char *filename, const char *fctname ) 


#if defined( __GNUC__ ) || defined( __clang__ )

    /* GCC/Clang: use builtin (works for many targets) */

    ptr_base_stack = __builtin_frame_address( 0 );

    ptr_current_stack = __builtin_frame_address( 0 );

#else

    int16_t something;

    ptr_base_stack = &something;

    ptr_current_stack = &something;

#endif



    (void) *filename; /* to avoid compilation warning */

lib_dec/decision_matrix_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -101,6 +101,10 @@ 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

lib_dec/init_dec.c

+18 −0
Original line number Diff line number Diff line
@@ -79,8 +79,26 @@ 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;

        st->last_bwidth = NB;

    }

    else

    {

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

        st->bwidth = WB;

        st->last_bwidth = WB;

#else

        st->bwidth = NB;

        st->last_bwidth = NB;

#endif

    }

#else

    st->bwidth = NB;

    st->last_bwidth = NB;

#endif

    st->extl_brate = 0;



    st->coder_type = GENERIC;

lib_dec/ivas_decision_matrix_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -95,6 +95,10 @@ 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

            {