Commit f5ee3377 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_CLANG18_MSAN_IN_DEC_INIT_BY_MOVING_COMMON_INITS_TOGETHER

parent 3ed731f8

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -162,7 +162,6 @@ 
/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

#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_CLANG18_MSAN_IN_DEC_INIT_BY_MOVING_COMMON_INITS_TOGETHER /* FhG: fix CLANG18 MSAN error in decoder init */

#define FIX_1481_CLANG18_MSAN_INIT_LAST_ELEM_BRATE      /* FhG: initialize last_element_brate to avoid CLANG18 MSAN complaint */

#define FIX_1484_CLANG18_MSAN_INIT_ST_ELEM_BRATE        /* FhG: initialize st->element_brate per default */

#define FIX_1464_UBSAN_RC_CONTEXT_MAP                   /* FhG: BE UBSAN fix for float issue 1464 in the TCX range coder */

lib_dec/lib_dec.c

+0 −14
Original line number Diff line number Diff line
@@ -219,23 +219,15 @@ ivas_error IVAS_DEC_Open( 
    st_ivas->restartNeeded = 0;



    /* set high-level parameters */

#ifdef FIX_CLANG18_MSAN_IN_DEC_INIT_BY_MOVING_COMMON_INITS_TOGETHER



    st_ivas->codec_mode = 0; /* unknown before first frame */

    st_ivas->transport_config = IVAS_AUDIO_CONFIG_INVALID;

    st_ivas->intern_config = IVAS_AUDIO_CONFIG_INVALID;

    st_ivas->writeFECoffset = 0;

    st_ivas->sba_analysis_order = 0; /* not really used in EVS mode, but initialize here to fix MSAN complaint */

#endif



    if ( mode == IVAS_DEC_MODE_EVS )

    {

#ifndef FIX_CLANG18_MSAN_IN_DEC_INIT_BY_MOVING_COMMON_INITS_TOGETHER

        st_ivas->codec_mode = 0; /* unknown before first frame */

        st_ivas->transport_config = IVAS_AUDIO_CONFIG_INVALID;

        st_ivas->intern_config = IVAS_AUDIO_CONFIG_INVALID;

        st_ivas->writeFECoffset = 0;

#endif

        st_ivas->element_mode_init = EVS_MONO;

        st_ivas->ivas_format = MONO_FORMAT;

        hIvasDec->hasDecodedFirstGoodFrame = true; /* Functionality to suppress output for initial lost frames is disabled in EVS operation */
@@ -244,12 +236,6 @@ ivas_error IVAS_DEC_Open( 
    }

    else if ( mode == IVAS_DEC_MODE_IVAS )

    {

#ifndef FIX_CLANG18_MSAN_IN_DEC_INIT_BY_MOVING_COMMON_INITS_TOGETHER

        st_ivas->codec_mode = 0; /* unknown before first frame */

        st_ivas->transport_config = IVAS_AUDIO_CONFIG_INVALID;

        st_ivas->intern_config = IVAS_AUDIO_CONFIG_INVALID;

        st_ivas->writeFECoffset = 0;

#endif

        st_ivas->element_mode_init = -1;

        st_ivas->ivas_format = UNDEFINED_FORMAT;

        st_ivas->renderer_type = RENDERER_DISABLE;