Commit 1d1fe057 authored by vaclav's avatar vaclav
Browse files

Add MD output file names printout for JBM

parent 6049f22a

apps/decoder.c

+23 −7
Original line number Diff line number Diff line
@@ -2694,14 +2694,14 @@ static ivas_error decodeG192( 
        {

            for ( i = 0; i < numObj; i++ )

            {

                fprintf( stdout, "\nOutput metadata file:   %s", IsmFileWriter_getFilePath( ismWriters[i] ) );

                fprintf( stdout, "\nOutput ISM metadata file:   %s", IsmFileWriter_getFilePath( ismWriters[i] ) );

            }

            fprintf( stdout, "\n" );

        }



        if ( bsFormat == IVAS_DEC_BS_MASA || bsFormat == IVAS_DEC_BS_MASA_ISM )

        {

            fprintf( stdout, "\nOutput metadata file:   %s\n", MasaFileWriter_getFilePath( masaWriter ) );

            fprintf( stdout, "\nOutput MASA metadata file:   %s\n", MasaFileWriter_getFilePath( masaWriter ) );

        }

    }
@@ -2906,7 +2906,7 @@ static ivas_error decodeVoIP( 
    int16_t delayNumSamples_orig[3]; /* stores: overall delay, dec+rend delay, and binauralization delay */

    int16_t delayNumSamples = -1;

    int32_t delayTimeScale = -1;



    int16_t i;

    FILE *f_rtpstream = NULL;

    EVS_RTPDUMP_DEPACKER rtpdumpDepacker;

    EVS_RTPDUMP_DEPACKER_ERROR rtpdumpDepackerError = EVS_RTPDUMP_DEPACKER_NO_ERROR;
@@ -2918,7 +2918,7 @@ static ivas_error decodeVoIP( 
    IVAS_DEC_BS_FORMAT bsFormat = IVAS_DEC_BS_UNKOWN;

    IsmFileWriter *ismWriters[IVAS_MAX_NUM_OBJECTS];



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

    for ( i = 0; i < IVAS_MAX_NUM_OBJECTS; ++i )

    {

        ismWriters[i] = NULL;

    }
@@ -3197,8 +3197,6 @@ static ivas_error decodeVoIP( 
            /* Write ISM metadata to external file(s) */

            if ( decodedGoodFrame && arg.outputConfig == AUDIO_CONFIG_EXTERNAL )

            {

                int16_t i;



                if ( bsFormat == IVAS_DEC_BS_OBJ || bsFormat == IVAS_DEC_BS_MASA_ISM || bsFormat == IVAS_DEC_BS_SBA_ISM )

                {

                    if ( ( error = IVAS_DEC_GetNumObjects( hIvasDec, &numObj ) ) != IVAS_ERR_OK )
@@ -3283,6 +3281,24 @@ static ivas_error decodeVoIP( 
        }

    }



    /* Print output metadata file name(s) */

    if ( arg.outputConfig == AUDIO_CONFIG_EXTERNAL )

    {

        if ( bsFormat == IVAS_DEC_BS_OBJ || bsFormat == IVAS_DEC_BS_MASA_ISM || bsFormat == IVAS_DEC_BS_SBA_ISM )

        {

            for ( i = 0; i < numObj; i++ )

            {

                fprintf( stdout, "\nOutput ISM metadata file:   %s", IsmFileWriter_getFilePath( ismWriters[i] ) );

            }

            fprintf( stdout, "\n" );

        }



        if ( bsFormat == IVAS_DEC_BS_MASA || bsFormat == IVAS_DEC_BS_MASA_ISM )

        {

            fprintf( stdout, "\nOutput MASA metadata file:   %s\n", MasaFileWriter_getFilePath( masaWriter ) );

        }

    }



    /*------------------------------------------------------------------------------------------*

     * Close files and deallocate resources

     *------------------------------------------------------------------------------------------*/
@@ -3298,7 +3314,7 @@ cleanup: 
    JbmTraceFileWriter_close( &jbmTraceWriter );

#endif

    MasaFileWriter_close( &masaWriter );

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

    for ( i = 0; i < IVAS_MAX_NUM_OBJECTS; i++ )

    {

        IsmFileWriter_close( &ismWriters[i] );

    }