Commit 58dd67ea 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 c0b555c4 27e69c71

Workspace_msvc/lib_isar.vcxproj

+0 −1
Original line number Diff line number Diff line
@@ -133,7 +133,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" />

apps/decoder.c

+7 −0
Original line number Diff line number Diff line
@@ -452,6 +452,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
@@ -101,6 +101,9 @@ 
#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_1904_HARM_GSC_ENC                           /* VA: #1904 Harmonization of EVS and IVAS GSC code */

#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_1487_ACCESS_OF_UNINIT_VAL_FROM_ARR_ISM_DTX  /* FhG/VA: init nb_bits_metadata to zero */



/* #################### End BE switches ################################## */
@@ -115,7 +118,10 @@ 
#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 */

#define FIX_1466_EXTREND                                /* FhG: float issue 1466: enable rendering of mono/stereo to other formats in the external renderer */

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

#define FIX_1872_REMOVE_UNUSED_PSNOISEGEN_ISAR              /* Dolby: Remove unused psNoiseGen from ISAR */



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

lib_dec/init_dec_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ ivas_error init_decoder_fx( 
    }

    ELSE

    {

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

#ifdef FIX_2285_CODE_DECODER_INIT_BW

        st_fx->bwidth = WB;

        move16();

        st_fx->last_bwidth = WB;

lib_dec/ivas_output_config_fx.c

+18 −0
Original line number Diff line number Diff line
@@ -283,14 +283,22 @@ void ivas_renderer_select( 
     * Non-binaural rendering configurations

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



#ifdef FIX_1435_MOVE_STEREO_PANNING

    ELSE IF( EQ_32( st_ivas->ivas_format, MONO_FORMAT ) || EQ_32( st_ivas->ivas_format, STEREO_FORMAT ) )

#else

    ELSE IF( EQ_32( st_ivas->ivas_format, MONO_FORMAT ) )

#endif

    {

        test();

        test();

        test();

        test();

        test();

#ifdef FIX_1435_MOVE_STEREO_PANNING

        IF( EQ_32( st_ivas->ivas_format, MONO_FORMAT ) && EQ_32( output_config, IVAS_AUDIO_CONFIG_STEREO ) )

#else

        IF( EQ_32( output_config, IVAS_AUDIO_CONFIG_STEREO ) )

#endif

        {

            *renderer_type = RENDERER_NON_DIEGETIC_DOWNMIX;

            move16();
@@ -300,7 +308,16 @@ void ivas_renderer_select( 
            *renderer_type = RENDERER_MC;

            move16();

        }

#ifdef FIX_1435_MOVE_STEREO_PANNING

        ELSE IF( EQ_32( st_ivas->ivas_format, STEREO_FORMAT ) &&

                 ( EQ_32( output_config, IVAS_AUDIO_CONFIG_FOA ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_HOA2 ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_HOA3 ) ) )

        {

            *renderer_type = RENDERER_SBA_LINEAR_ENC;

            move16();

        }

#endif

    }

#ifndef FIX_1435_MOVE_STEREO_PANNING

    ELSE IF( EQ_32( st_ivas->ivas_format, STEREO_FORMAT ) )

    {

        test();
@@ -322,6 +339,7 @@ void ivas_renderer_select( 
            move16();

        }

    }

#endif

    ELSE IF( EQ_32( st_ivas->ivas_format, ISM_FORMAT ) )

    {

        test();