Commit 0e880a07 authored by sagnowski's avatar sagnowski
Browse files

Wrap changes in preprocessor switch

parent 08124d95

apps/renderer.c

+12 −0
Original line number Diff line number Diff line
@@ -564,6 +564,7 @@ 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] ) )

            {
@@ -572,11 +573,18 @@ static void setupWithSingleFormatInput( 
            }



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

            }
@@ -2602,7 +2610,11 @@ static CmdlnArgs defaultArgs( 
    args.outConfig.outSetupCustom.num_lfe = 0;

    args.inConfig.ambisonicsBuses->audioConfig = IVAS_AUDIO_CONFIG_INVALID;



#ifdef FIX_1376_MISSING_ISM_METADATA

    for ( int32_t i = 0; i < RENDERER_MAX_ISM_INPUTS + RENDERER_MAX_MASA_INPUTS; ++i )

#else

    for ( int32_t i = 0; i < RENDERER_MAX_ISM_INPUTS; ++i )

#endif

    {

        clearString( args.inMetadataFilePaths[i] );

    }

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -165,6 +165,7 @@ 
#define TMP_FIX_1119_SPLIT_RENDERING_VOIP               /* FhG: Add error check for unsupported config: split rendering with VoIP mode */

#define FIX_1348_OVERFLOW                               /* FhG: fix BASOP overflow in hq_lr_dec(), brings floating-point code inline with FX */

#define FIX_1369_HQ_LR_OVERFLOW                         /* FhG: fix BASOP overflow in hq_lr_enc(), brings floating-point code inline with FX */

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



/* #################### End BE switches ################################## */