Commit cbb76218 authored by malenov's avatar malenov
Browse files

implement calls to export_mem() in encoder/decoder/renderer

parent 9036bf0d

apps/decoder.c

+3 −0
Original line number Diff line number Diff line
@@ -1434,6 +1434,9 @@ static ivas_error decodeG192( 
        }

#ifdef WMOPS

        update_wmops();

#ifdef MEM_COUNT_DETAILS

        export_mem( "mem_analysis.csv" );

#endif

#endif

    }

apps/encoder.c

+3 −0
Original line number Diff line number Diff line
@@ -716,6 +716,9 @@ int main( 


#ifdef WMOPS

        update_wmops();

#ifdef MEM_COUNT_DETAILS

        export_mem( "mem_analysis.csv" );

#endif

#endif

    }

apps/renderer.c

+17 −14
Original line number Diff line number Diff line
@@ -781,10 +781,10 @@ int main( 


    inBufferSize = frameSize_smpls * totalNumInChannels;

    outBufferSize = frameSize_smpls * numOutChannels;

    inpInt16Buffer = malloc( inBufferSize * sizeof( int16_t ) );

    inFloatBuffer = malloc( inBufferSize * sizeof( float ) );

    outInt16Buffer = malloc( outBufferSize * sizeof( int16_t ) );

    outFloatBuffer = malloc( outBufferSize * sizeof( float ) );

    inpInt16Buffer = malloc_( inBufferSize * sizeof( int16_t ) );

    inFloatBuffer = malloc_( inBufferSize * sizeof( float ) );

    outInt16Buffer = malloc_( outBufferSize * sizeof( int16_t ) );

    outFloatBuffer = malloc_( outBufferSize * sizeof( float ) );



    inBuffer.config.numSamplesPerChannel = (int16_t) frameSize_smpls;

    inBuffer.config.numChannels = (int16_t) totalNumInChannels;
@@ -1000,6 +1000,9 @@ int main( 


#ifdef WMOPS

        update_wmops();

#ifdef MEM_COUNT_DETAILS

        export_mem( "mem_analysis.csv" );

#endif

#endif

    }
@@ -1031,10 +1034,10 @@ int main( 
#endif



    /* === Close === */

    free( inpInt16Buffer );

    free( inFloatBuffer );

    free( outInt16Buffer );

    free( outFloatBuffer );

    free_( inpInt16Buffer );

    free_( inFloatBuffer );

    free_( outInt16Buffer );

    free_( outFloatBuffer );

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

    {

        MasaFileReader_close( &masaReaders[i] );
@@ -1578,7 +1581,7 @@ IsmPositionProvider *IsmPositionProvider_open( 
    IsmPositionProvider *ipp;

    uint16_t i;



    ipp = (IsmPositionProvider *) malloc( sizeof( IsmPositionProvider ) );

    ipp = (IsmPositionProvider *) malloc_( sizeof( IsmPositionProvider ) );

    ipp->frameCounter = 0;

    ipp->numObjects = 0;
@@ -1695,16 +1698,16 @@ void IsmPositionProvider_close( IsmPositionProvider *positionProvider ) 


        if ( positionProvider->positions[i] != NULL )

        {

            free( positionProvider->positions[i] );

            free_( positionProvider->positions[i] );

        }



        if ( positionProvider->positionDurations[i] != NULL )

        {

            free( positionProvider->positionDurations[i] );

            free_( positionProvider->positionDurations[i] );

        }

    }



    free( positionProvider );

    free_( positionProvider );



    return;

}
@@ -1953,8 +1956,8 @@ static void parseIsm( 
    if ( parseUint32( line, &numberOfObjectPositionsToRead ) == 0 )

    {

        positionProvider->numPositions[idx] = numberOfObjectPositionsToRead;

        positionProvider->positions[idx] = malloc( numberOfObjectPositionsToRead * sizeof( IVAS_REND_AudioObjectPosition ) );

        positionProvider->positionDurations[idx] = malloc( numberOfObjectPositionsToRead * sizeof( uint16_t ) );

        positionProvider->positions[idx] = malloc_( numberOfObjectPositionsToRead * sizeof( IVAS_REND_AudioObjectPosition ) );

        positionProvider->positionDurations[idx] = malloc_( numberOfObjectPositionsToRead * sizeof( uint16_t ) );



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

        {

lib_debug/wmc_auto.c

+1 −1
Original line number Diff line number Diff line
@@ -1245,7 +1245,7 @@ static void subst(char* s, char from, char to) 
 * Print detailed (per-item) information about heap memory usage

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



static void mem_count_summary()

static void mem_count_summary(void)

{

    int i, j, flag_intra_frame_memory;

    size_t length;