Commit 785db88b authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Moving limitation check after configuration has been parsed.

parent 1269d98b

apps/renderer.c

+19 −18
Original line number Diff line number Diff line
@@ -582,24 +582,6 @@ int main( 
        exit( -1 );

    }



#ifdef MASA_PREREND

    if ( args.outConfig.audioConfig == IVAS_REND_AUDIO_CONFIG_MASA1 || args.outConfig.audioConfig == IVAS_REND_AUDIO_CONFIG_MASA2 )

    {

        if ( args.inConfig.numMasaBuses == 0 )

        {

            fprintf( stderr, "\nInvalid configuration - Merging to MASA output requires MASA input and at least one another input to be present\n" );

            fprintf( stderr, "\nMASA input is missing\n" );

            exit( -1 );

        }



        if ( args.inConfig.numAudioObjects == 0 && args.inConfig.numMultiChannelBuses == 0 && args.inConfig.numAmbisonicsBuses == 0 )

        {

            fprintf( stderr, "\nInvalid configuration - Merging to MASA output requires MASA input and at least one another input to be present\n" );

            fprintf( stderr, "\nNo object, multi-channel, or Ambisonic input present.\n" );

            exit( -1 );

        }

    }

#endif

    positionProvider = IsmPositionProvider_open();



    convert_backslash( args.inputFilePath );
@@ -665,6 +647,25 @@ int main( 
        setupWithSingleFormatInput( args, audioFilePath, positionProvider, masaReaders );

    }



#ifdef MASA_PREREND

    if ( args.outConfig.audioConfig == IVAS_REND_AUDIO_CONFIG_MASA1 || args.outConfig.audioConfig == IVAS_REND_AUDIO_CONFIG_MASA2 )

    {

        if ( args.inConfig.numMasaBuses == 0 )

        {

            fprintf( stderr, "\nInvalid configuration - Merging to MASA output requires MASA input and at least one another input to be present\n" );

            fprintf( stderr, "\nMASA input is missing\n" );

            exit( -1 );

        }



        if ( args.inConfig.numAudioObjects == 0 && args.inConfig.numMultiChannelBuses == 0 && args.inConfig.numAmbisonicsBuses == 0 )

        {

            fprintf( stderr, "\nInvalid configuration - Merging to MASA output requires MASA input and at least one another input to be present\n" );

            fprintf( stderr, "\nNo object, multi-channel, or Ambisonic input present.\n" );

            exit( -1 );

        }

    }

#endif



    if ( AudioFileReader_open( &audioReader, audioFilePath ) != IVAS_ERR_OK )

    {

        fprintf( stderr, "Error opening file: %s\n", audioFilePath );