Commit a0815ac7 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'main' into... 

Merge branch 'main' into 154-filter-output-of-sanitizer-tests-such-that-only-failing-conditions-are-stored
parents 31fac147 36a71ff2

ci/run_scheduled_sanitizer_test.py

+5 −0
Original line number Diff line number Diff line
@@ -60,6 +60,11 @@ def get_modes(in_format: str) -> list: 
        in_format = "MC_" + in_format + "_b"

        mode_list = [m for m in mode_list if in_format in m]



    # TODO: remove once #185 is fixed

    # temporarily skip 24.4kbps SBA bitrate

    if in_format == "SBA":

        mode_list = [m for m in mode_list if not "b24_4" in m]



    return mode_list

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -153,6 +153,7 @@ 
#define SBA_BR_SWITCHING                                /* Issue 114: Changes for sba bit rate switching*/

#define FIX_AGC_WINFUNC_MEMORY                          /* Issue 62: lower agc_com.winFunc memory consumption */

#define REMOVE_SID_HARM_LEFTOVERS                       /* Issue 192: remove leftovers from the SID bitrate harmonization */

#define FIX_MCT_UNINIT_MEM                              /* Issue 166: Reading of uninitialized memory in TCX range coder */

lib_enc/ivas_mdct_core_enc.c

+8 −0
Original line number Diff line number Diff line
@@ -881,7 +881,11 @@ void ivas_mdct_core_whitening_enc( 
        {

            chE_tot = sum_f( chE, NB_DIV );



#ifdef FIX_MCT_UNINIT_MEM

            if ( chE_tot < SILENT_CHANNEL_THRES && nSubframes == 1 )

#else

            if ( chE_tot < SILENT_CHANNEL_THRES )

#endif

            {

                st->mct_chan_mode = MCT_CHAN_MODE_IGNORE;

                st->bits_frame_channel = 0;
@@ -1055,7 +1059,11 @@ void ivas_mdct_core_whitening_enc( 
        {

            st->side_bits_frame_channel = 0;

            /*dummy initialization to prevent range coder crashing in case all channels are silent and bits are distributed to channel 0 */

#ifdef FIX_MCT_UNINIT_MEM

            *p_param[ch] = 1 + NOISE_FILL_RANGES + LTPSIZE + tnsSize[ch][0] + NPRM_CTX_HM;

#else

            *p_param[ch] = 9;

#endif

            continue;

        }