Commit d276e07f 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-1478-clang18-msan-use-of-uninitialized-value-in-lib_com-gs_noisefill-c-271-13
parents 5e68081b 0b14a5fe

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/ifft_rel.c

+6 −1
Original line number Diff line number Diff line
@@ -130,7 +130,12 @@ void ifft_rel( 
            id = 4 * id;

        }

        step = N_MAX_FFT / n2;



#ifdef FIX_2268_OOB_INDEXING_IN_IFFT

        if ( n8 < 2 )

        {

            continue;

        }

#endif

        s = sincos_t_ext + step;

        c = s + N_MAX_FFT / 4;

        s3 = sincos_t_ext + 3 * step;

lib_com/ivas_cnst.h

+5 −5
Original line number Diff line number Diff line
@@ -167,11 +167,11 @@ typedef enum 
#define IVAS_NUM_SUPPORTED_FS                   3                           /* number of supported sampling-rates in IVAS */



#define CLDFB_SLOT_NS                           1250000L                    /* 1.25ms: CLDFB slot length */

#define MAX_JBM_SUBFRAMES_5MS                   8

#define DEFAULT_JBM_SUBFRAMES_5MS               4

#define JBM_CLDFB_SLOTS_IN_SUBFRAME             4

#define MAX_JBM_CLDFB_TIMESLOTS                 32

#define DEFAULT_JBM_CLDFB_TIMESLOTS             16

#define DEFAULT_JBM_SUBFRAMES_5MS               4                           /* == IVAS_MAX_PARAM_SPATIAL_SUBFRAMES */

#define MAX_JBM_SUBFRAMES_5MS                   ( DEFAULT_JBM_SUBFRAMES_5MS * 2 )

#define JBM_CLDFB_SLOTS_IN_SUBFRAME             4                           /* == IVAS_MAX_PARAM_SPATIAL_SUBFRAMES */

#define DEFAULT_JBM_CLDFB_TIMESLOTS             CLDFB_NO_COL_MAX

#define MAX_JBM_CLDFB_TIMESLOTS                 ( DEFAULT_JBM_CLDFB_TIMESLOTS * 2 )

#define MAX_JBM_L_FRAME48k                      ( IVAS_MAX_FRAME_SIZE * 2 ) /* 1920:  max. time-scaled frame buffer length (per channel) in samples */

#define MAX_JBM_L_FRAME_NS                      40000000L                   /* 40 ms: time-scaled frame size in ns, proportional to MAX_JBM_L_FRAME48k  */

#define MAX_SPAR_INTERNAL_CHANNELS              IVAS_SPAR_MAX_CH