Commit ed133b42 authored by multrus's avatar multrus
Browse files

Merge branch '2075_ref_fltMr2227_renderer_metadatafiles' into 'ivas-float-update' 

Port Flt MR 2227 to ivas-float-update - IVAS_rend ignores missing ISM metadata files

See merge request !2331
parents a516f54e 3ba1ae34

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

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

#define FIX_1113_EXTREND_ISAR                           /* FhG: issue 1113: fix external renderer asserts for FOA/HOA2 and CLDFB config */

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



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