Commit d7cda0f7 authored by multrus's avatar multrus
Browse files

merge from ivas-float-update

parents 42ebf35c b82ec398

apps/renderer.c

+15 −0
Original line number Diff line number Diff line
@@ -568,12 +568,27 @@ static void setupWithSingleFormatInput( 
        positionProvider->numObjects = args.inConfig.numAudioObjects;

        for ( int16_t i = 0; i < positionProvider->numObjects; ++i )

        {

#ifdef FIX_1376_MISSING_ISM_METADATA

            /* Check if path to metadata file was given */

            if ( isEmptyString( args.inMetadataFilePaths[i] ) )

            {

                fprintf( stderr, "No metadata file was given for ISM input %d\n", i );

                exit( -1 );

            }



            /* It is allowed on CLI to have no metadata for an ISM input - skip opening if string contains "NULL" */

#else

            /* It is allowed on CLI to have no metadata for an ISM input - skip opening if string is empty or contains "NULL" */

#endif

            char charBuf[FILENAME_MAX];

            strncpy( charBuf, args.inMetadataFilePaths[i], min( FILENAME_MAX, RENDERER_MAX_CLI_ARG_LENGTH ) - 1 );

            charBuf[min( FILENAME_MAX, RENDERER_MAX_CLI_ARG_LENGTH ) - 1] = '\0';

            to_upper( charBuf );

#ifdef FIX_1376_MISSING_ISM_METADATA

            if ( strncmp( charBuf, "NULL", 4 ) == 0 )

#else

            if ( isEmptyString( args.inMetadataFilePaths[i] ) || strncmp( charBuf, "NULL", 4 ) == 0 )

#endif

            {

                continue;

            }

lib_com/options.h

+4 −0
Original line number Diff line number Diff line
@@ -196,6 +196,10 @@ 
#define FIX_1113_EXTREND_ISAR                           /* FhG: issue 1113: fix external renderer asserts for FOA/HOA2 and CLDFB config */

#define NONBE_1122_JBM_FIX_PLAYOUT_DELAY_IN_DTX         /* FhG: Avoid JBM ignoring safety margin and setting playout delay to 0 during DTX */

#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_938_COMPILER_WARNING                        /* FhG: Fix compiler warning in ivas_mdct_core_reconstruct() */

#define FIX_1376_MISSING_ISM_METADATA                   /* FhG: IVAS_rend: throw error if there exists an ISM input without a corresponding metadata file path */

#define FIX_1385_INIT_IGF_STOP_FREQ                     /* FhG: Initialize infoIGFStopFreq in init_igf_dec() */

#define FIX_1387_INIT_PRM_SQQ                           /* FhG: initialize pointer prm_sqQ, which might be uninitialized in case of bfi == 1 */



/* #################### End BASOP porting switches ############################ */

lib_dec/igf_dec.c

+3 −0
Original line number Diff line number Diff line
@@ -1592,6 +1592,9 @@ void init_igf_dec( 
    hIGFDec->flag_sparse = &hIGFDec->flag_sparseBuf[0];

    hIGFDec->infoTCXNoise = &hIGFDec->infoTCXNoiseBuf[0];

    hIGFDec->virtualSpec = &hIGFDec->virtualSpecBuf[0];

#ifdef FIX_1385_INIT_IGF_STOP_FREQ

    hIGFDec->infoIGFStopFreq = 0;

#endif



    return;

}

lib_dec/ivas_mdct_core_dec.c

+7 −0
Original line number Diff line number Diff line
@@ -532,6 +532,9 @@ void ivas_mdct_core_invQ( 
    set_s( total_nbbits, 0, CPE_CHANNELS );

    set_s( bitsRead, 0, CPE_CHANNELS );

    tmp_concealment_method = 0;

#ifdef FIX_1387_INIT_PRM_SQQ

    prm_sqQ = NULL; /* set prm_sqQ to NULL - in case of bfi == 1 it's not set or needed, but it triggers sanitizers */

#endif



    for ( ch = 0; ch < CPE_CHANNELS; ch++ )

    {
@@ -951,10 +954,14 @@ void ivas_mdct_core_reconstruct( 
        /* Postfiltering */

        post_decoder( st, synth_buf, pit_gain[ch], pitch[ch], x[ch][0], st->p_bpf_noise_buf );



#ifndef FIX_938_COMPILER_WARNING

        if ( signal_outFB[ch] )

        {

#endif

            mvr2r( synthFB, signal_outFB[ch], st->hTcxDec->L_frameTCX );

#ifndef FIX_938_COMPILER_WARNING

        }

#endif



#ifdef DEBUG_PLC_INFO

        {