Commit 18b54f17 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[fix] OMASA metadata files not consumed due to limit to RENDERER_MAX_ISM_INPUTS

parent aff7d366

apps/renderer.c

+24 −22
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ typedef struct 
    int32_t sampleRate;

    InputConfig inConfig;

    OutputConfig outConfig;

    char inMetadataFilePaths[RENDERER_MAX_ISM_INPUTS][RENDERER_MAX_CLI_ARG_LENGTH];

    char inMetadataFilePaths[RENDERER_MAX_ISM_INPUTS + RENDERER_MAX_MASA_INPUTS][RENDERER_MAX_CLI_ARG_LENGTH];

    int16_t numInMetadataFiles;

    char outMetadataFilePath[RENDERER_MAX_CLI_ARG_LENGTH];

    char headRotationFilePath[RENDERER_MAX_CLI_ARG_LENGTH];
@@ -238,7 +238,7 @@ static const CmdLnParser_Option cliOptions[] = { 
        .id = CmdLnOptionId_inputMetadata,

        .match = "input_metadata",

        .matchShort = "im",

        .description = "Space-separated list of path to metadata files for ISM or MASA inputs or BINAURAL_SPLIT_PCM input mode",

        .description = "Space-separated list of path to metadata files for ISM or MASA inputs or BINAURAL_SPLIT_PCM input mode. For OMASA, ISM files must be specified first.",

    },

    {

        .id = CmdLnOptionId_outputFile,
@@ -557,25 +557,7 @@ static void setupWithSingleFormatInput( 
    strncpy( audioFilePath, args.inputFilePath, FILENAME_MAX - 1 );



    /* Depending on input format, prepare metadata reading for ISM or MASA */

    if ( args.inConfig.numMasaBuses != 0 )

    {

        if ( args.inConfig.numMasaBuses != args.numInMetadataFiles )

        {

            fprintf( stderr, "Error: all MASA inputs must have a corresponding metadata file" );

            exit( -1 );

        }



        for ( int16_t i = 0; i < args.numInMetadataFiles; ++i )

        {

            masaReaders[i] = MasaFileReader_open( args.inMetadataFilePaths[i] );

            if ( masaReaders[i] == NULL )

            {

                fprintf( stderr, "Could not open MASA metadata file %s\n", args.inMetadataFilePaths[i] );

                exit( -1 );

            }

        }

    }

    else if ( args.inConfig.numAudioObjects != 0 )

    if ( args.inConfig.numAudioObjects != 0 )

    {

        positionProvider->numObjects = args.inConfig.numAudioObjects;

        for ( int16_t i = 0; i < positionProvider->numObjects; ++i )
@@ -598,6 +580,26 @@ static void setupWithSingleFormatInput( 
            }

        }

    }

    if ( args.inConfig.numMasaBuses != 0 )

    {

        if ( args.inConfig.numMasaBuses != ( args.numInMetadataFiles - args.inConfig.numAudioObjects ) )

        {

            fprintf( stderr, "Error: all MASA inputs must have a corresponding metadata file" );

            exit( -1 );

        }



        int16_t reader_idx = 0;

        for ( int16_t i = args.inConfig.numAudioObjects; i < args.numInMetadataFiles; ++i )

        {

            reader_idx = i - args.inConfig.numAudioObjects;

            masaReaders[reader_idx] = MasaFileReader_open( args.inMetadataFilePaths[i] );

            if ( masaReaders[reader_idx] == NULL )

            {

                fprintf( stderr, "Could not open MASA metadata file %s\n", args.inMetadataFilePaths[i] );

                exit( -1 );

            }

        }

    }



    return;

}
@@ -2616,7 +2618,7 @@ static void parseOption( 
            }

            break;

        case CmdLnOptionId_inputMetadata:

            assert( numOptionValues <= RENDERER_MAX_ISM_INPUTS );

            assert( numOptionValues <= RENDERER_MAX_ISM_INPUTS + RENDERER_MAX_MASA_INPUTS );

            for ( int16_t i = 0; i < numOptionValues; ++i )

            {

                strncpy( args->inMetadataFilePaths[i], optionValues[i], RENDERER_MAX_CLI_ARG_LENGTH - 1 );