Commit 06ae4ffc authored by vaclav's avatar vaclav
Browse files

fix merge issue

parent 89f0daa8

apps/renderer.c

+5 −41
Original line number Diff line number Diff line
@@ -876,6 +876,11 @@ int main( 


    const int16_t frameSize_smpls = (int16_t) ( ( args.render_framesize ) * args.sampleRate * 5 / ( 1000 ) );



    if ( ( error = IVAS_REND_Open( &hIvasRend, args.sampleRate, args.outConfig.audioConfig, !isEmptyString( args.customHrtfFilePath ), args.nonDiegeticPan, args.nonDiegeticPanGain, (int16_t) args.render_framesize ) ) != IVAS_ERR_OK )

    {

        fprintf( stderr, "\nError opening renderer handle: %s\n", ivas_error_to_string( error ) );

        goto cleanup;

    }



    fprintf( stdout, "Input audio file:       %s\n", args.inputFilePath );

    fprintf( stdout, "Output audio file:      %s\n\n", args.outputFilePath );
@@ -1039,47 +1044,6 @@ int main( 
        hrtfFileReader_close( &hrtfFileReader );

    }



    fprintf( stdout, "Input audio file:       %s\n", args.inputFilePath );

    fprintf( stdout, "Output audio file:      %s\n\n", args.outputFilePath );



    if ( args.inConfig.numAudioObjects > 0 )

    {

        if ( args.inConfig.numAudioObjects == 1 )

        {

            IVAS_REND_PrintInputConfig( IVAS_AUDIO_CONFIG_ISM1 );

        }

        else if ( args.inConfig.numAudioObjects == 2 )

        {

            IVAS_REND_PrintInputConfig( IVAS_AUDIO_CONFIG_ISM2 );

        }

        else if ( args.inConfig.numAudioObjects == 3 )

        {

            IVAS_REND_PrintInputConfig( IVAS_AUDIO_CONFIG_ISM3 );

        }

        else if ( args.inConfig.numAudioObjects == 4 )

        {

            IVAS_REND_PrintInputConfig( IVAS_AUDIO_CONFIG_ISM4 );

        }

    }

    for ( i = 0; i < args.inConfig.numMultiChannelBuses; i++ )

    {

        IVAS_REND_PrintInputConfig( args.inConfig.multiChannelBuses[i].audioConfig );

    }

    for ( i = 0; i < args.inConfig.numMasaBuses; i++ )

    {

        IVAS_REND_PrintInputConfig( args.inConfig.masaBuses[i].audioConfig );

    }

    for ( i = 0; i < args.inConfig.numAmbisonicsBuses; i++ )

    {

        IVAS_REND_PrintInputConfig( args.inConfig.ambisonicsBuses[i].audioConfig );

    }



    if ( ( error = IVAS_REND_PrintConfig( hIvasRend ) ) != IVAS_ERR_OK )

    {

        fprintf( stderr, "\n IVAS_REND_PrintConfig failed: %s\n\n", ivas_error_to_string( error ) );

        goto cleanup;

    }



    /* === Configure === */

    if ( ( error = IVAS_REND_InitConfig( hIvasRend, args.outConfig.audioConfig ) ) != IVAS_ERR_OK )

    {