Commit 57f7ea02 authored by vaclav's avatar vaclav
Browse files

- Merge remote-tracking branch 'remotes/origin/main' into... 

- Merge remote-tracking branch 'remotes/origin/main' into float-1487-clang18-msan-use-of-uninitialized-value-in-lib_dec-ivas_jbm_dec-c-145-28
parents 63ab0af5 a9612f73

Workspace_msvc/lib_isar.vcxproj

+0 −1
Original line number Diff line number Diff line
@@ -148,7 +148,6 @@ 
    <ClCompile Include="..\lib_isar\isar_lc3plus_enc.c" />

    <ClCompile Include="..\lib_isar\isar_lc3plus_payload.c" />

    <ClCompile Include="..\lib_isar\isar_MSPred.c" />

    <ClCompile Include="..\lib_isar\isar_NoiseGen.c" />

    <ClCompile Include="..\lib_isar\isar_PerceptualModel.c" />

    <ClCompile Include="..\lib_isar\isar_PredDecoder.c" />

    <ClCompile Include="..\lib_isar\isar_PredEncoder.c" />

Workspace_msvc/lib_isar.vcxproj.filters

+0 −3
Original line number Diff line number Diff line
@@ -24,9 +24,6 @@ 
    <ClCompile Include="..\lib_isar\isar_MSPred.c">

      <Filter>isar_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_isar\isar_NoiseGen.c">

      <Filter>isar_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_isar\isar_PerceptualModel.c">

      <Filter>isar_c</Filter>

    </ClCompile>

apps/decoder.c

+7 −0
Original line number Diff line number Diff line
@@ -487,6 +487,13 @@ int main( 
            fprintf( stderr, "\nConfigure failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );

            goto cleanup;

        }



#ifdef FIX_1449_RENDERER_FRAME_SIZE_UNCLEAR_IN_ISAR

        if ( !arg.renderConfigEnabled && ( arg.renderFramesize != asked_frame_size ) )

        {

            fprintf( stderr, "\nChanged render framesize, only 20ms are allowed for non-0dof split rendering!\n" );

        }

#endif

    }



    /*------------------------------------------------------------------------------------------*

lib_com/options.h

+6 −0
Original line number Diff line number Diff line
@@ -161,6 +161,7 @@ 


/*#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 FIX_1466_EXTREND                                /* FhG: issue 1466: enable rendering of mono/stereo to other formats in the external renderer */

#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 */
@@ -170,6 +171,10 @@ 
#define FIX_2274_OOB_INDEXING_IN_CORRMATRIX             /* FhG: fix OOB indexing complaint */

#define FIX_2278_OOB_INDEXING_IN_CLOSED_LOOP_PIT_SEARCH /* FhG: fix oob indexing USAN complaint */

#define FIX_2287_MCT_MDCT_STEREO_DATA_MALLOC_SIZE       /* FhG: correct allocation size for STEREO_MDCT_DEC_DATA struct */

#define FIX_2271_OOB_INDEXING_IN_PIT_OL2                /* VA: Fix for issue 2271, to silence clang18 */

#define FIX_2273_OOB_INDEXING_IN_PIT_FR4                /* VA: Fix to silence clang on ptr init */

#define FIX_1449_RENDERER_FRAME_SIZE_UNCLEAR_IN_ISAR    /* Dolby: Fix for issue 1449: renderer frame size unclear in ISAR */

#define FIX_1827_REMOVE_UNUSED_PSNOISEGEN_ISAR          /* Dolby: remove unused noise generator from ISAR */

#define FIX_1487_ACCESS_OF_UNINIT_VAL_FROM_ARR_ISM_DTX  /* FhG/VA: init nb_bits_metadata to zero */



/* #################### End BE switches ################################## */
@@ -182,6 +187,7 @@ 
#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 */

#define FIX_1381_BWD                                    /* VA: issue 1381: apply no hysteresis in BWD at higher bitrates also in mono MASA and OMASA */

#define FIX_2285_CODE_DECODER_INIT_BW                   /* VA: basop issue 2285: fix core-decoder initialization bandwidth */



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

lib_dec/init_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ ivas_error init_decoder( 
    }

    else

    {

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

#ifdef FIX_2285_CODE_DECODER_INIT_BW

        st->bwidth = WB;

        st->last_bwidth = WB;

#else