Commit a74cea30 authored by malenov's avatar malenov
Browse files

replace count_malloc() by malloc()

parent c709140d

lib_com/cldfb_evs.c

+6 −6
Original line number Diff line number Diff line
@@ -1003,7 +1003,7 @@ ivas_error openCldfb( 
{

    HANDLE_CLDFB_FILTER_BANK hs;



    hs = (HANDLE_CLDFB_FILTER_BANK) count_malloc( sizeof( CLDFB_FILTER_BANK ) );

    hs = (HANDLE_CLDFB_FILTER_BANK) malloc( sizeof( CLDFB_FILTER_BANK ) );

    if ( hs == NULL )

    {

        return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Cannot allocate memory for CLDFB" );
@@ -1017,11 +1017,11 @@ ivas_error openCldfb( 


    IF( type == CLDFB_ANALYSIS )

    {

        hs->FilterStates = (Word16 *) count_malloc( STATE_BUFFER_SIZE * maxCldfbBands * sizeof( Word16 ) );

        hs->FilterStates = (Word16 *) malloc( STATE_BUFFER_SIZE * maxCldfbBands * sizeof( Word16 ) );

    }

    ELSE

    {

        hs->FilterStates = (Word16 *) count_malloc( 2 * STATE_BUFFER_SIZE * maxCldfbBands * sizeof( Word16 ) );

        hs->FilterStates = (Word16 *) malloc( 2 * STATE_BUFFER_SIZE * maxCldfbBands * sizeof( Word16 ) );

    }

    if ( hs->FilterStates == NULL )

    {
@@ -1480,9 +1480,9 @@ void deleteCldfb( HANDLE_CLDFB_FILTER_BANK *h_cldfb ) /* i: cldfb handle */ 
    {

        IF( ( *h_cldfb )->FilterStates != NULL )

        {

            count_free( ( *h_cldfb )->FilterStates );

            free( ( *h_cldfb )->FilterStates );

        }

        count_free( *h_cldfb );

        free( *h_cldfb );

    }

    *h_cldfb = NULL;

}
@@ -1671,7 +1671,7 @@ void cldfb_restore_memory( HANDLE_CLDFB_FILTER_BANK hs ) /* i/o: cldfb handle */ 
    }



    hs->memory_length = 0;

    count_free( hs->memory );

    free( hs->memory );

    hs->memory = NULL;



    return;

lib_com/fd_cng_com_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ ivas_error createFdCngCom( 
    HANDLE_FD_CNG_COM hs;



    /* Allocate memory */

    hs = (HANDLE_FD_CNG_COM) count_malloc( sizeof( FD_CNG_COM ) );

    hs = (HANDLE_FD_CNG_COM) malloc( sizeof( FD_CNG_COM ) );



    if ( hs == NULL )

    {
@@ -287,7 +287,7 @@ void deleteFdCngCom( HANDLE_FD_CNG_COM *hFdCngCom ) /* i/o: Contains the variabl 
    move16();

    IF( hsCom != NULL )

    {

        count_free( hsCom );

        free( hsCom );

        *hFdCngCom = NULL;

        move16();

    }

lib_com/prot_fx.h

+0 −14
Original line number Diff line number Diff line
@@ -36,20 +36,6 @@ 
 * Prototypes of RAM counting tool macros

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



#ifdef RAM_COUNTING_TOOL

#define count_malloc( n1 )     MALLOC_FCT_CALL( n1 )

#define count_calloc( n1, n2 ) CALLOC_FCT_CALL( n1, n2 )

#define count_free( ptr )      FREE_FCT_CALL( ptr )

#else

#define count_malloc( n1 )     malloc( n1 )

#define count_calloc( n1, n2 ) calloc( n1, n2 )

#define count_free( ptr )      free( ptr )

#endif



#define dynamic_malloc( n1 )     malloc( n1 )

#define dynamic_calloc( n1, n2 ) calloc( n1, n2 )

#define dynamic_free( n1 )       free( n1 )



#define mvr2r_Word32( x, y, n ) Copy32( x, y, n )

#define mvr2r_Word16( x, y, n ) Copy( x, y, n )

lib_com/wi_fx.c

+3 −3
Original line number Diff line number Diff line
@@ -1258,9 +1258,9 @@ static void DTFS_transform_fx( 
    }





    count_free( tmp1_dtfs_fx );

    count_free( tmp2_dtfs_fx );

    count_free( tmp3_dtfs_fx );

    free( tmp1_dtfs_fx );

    free( tmp2_dtfs_fx );

    free( tmp3_dtfs_fx );

    return;

}

/*===================================================================*/

lib_dec/dec_gen_voic_fx.c

+4 −4
Original line number Diff line number Diff line
@@ -486,8 +486,8 @@ ivas_error decod_gen_voic_fx( 
                interp_code_4over2_fx( exc_fx + i_subfr_fx, bwe_exc_fx + shl( i_subfr_fx, 1 ), L_SUBFR );

            }



            count_free( PREVP );

            count_free( CURRP );

            free( PREVP );

            free( CURRP );

        }

    }
@@ -985,8 +985,8 @@ ivas_error decod_gen_voic_ivas_fx( 
                interp_code_4over2_fx( exc_fx + i_subfr_fx, bwe_exc_fx + ( i_subfr_fx * 2 ), L_SUBFR );

            }



            count_free( PREVP );

            count_free( CURRP );

            free( PREVP );

            free( CURRP );

        }

    }