Commit 4761cfdb authored by vaclav's avatar vaclav
Browse files

VBR: change count_malloc() -> dynamic->malloc()

parent 976df6d8

lib_com/wi.c

+7 −7
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ ivas_error DTFS_new( 
    int16_t i;

    DTFS_STRUCTURE *dtfs = NULL;



    dtfs = (DTFS_STRUCTURE *) count_malloc( sizeof( DTFS_STRUCTURE ) );

    dtfs = (DTFS_STRUCTURE *) dynamic_malloc( sizeof( DTFS_STRUCTURE ) );



    if ( dtfs == NULL )

    {
@@ -1180,9 +1180,9 @@ static void DTFS_transform( 
    }

#endif



    count_free( tmp1_dtfs );

    count_free( tmp2_dtfs );

    count_free( tmp3_dtfs );

    dynamic_free( tmp1_dtfs );

    dynamic_free( tmp2_dtfs );

    dynamic_free( tmp3_dtfs );



    return;

}
@@ -3106,7 +3106,7 @@ ivas_error WIsyn( 


    error = IVAS_ERR_OK;



    if ( ( phase = (float *) count_malloc( N * sizeof( float ) ) ) == NULL )

    if ( ( phase = (float *) dynamic_malloc( N * sizeof( float ) ) ) == NULL )

    {

        return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for WI structure\n" ) );

    }
@@ -3233,8 +3233,8 @@ ivas_error WIsyn( 
    *ph_offset = (float) fmod( (double) ( tmp ), PI2 );

#endif



    count_free( phase );

    count_free( CURRCW_DTFS );

    dynamic_free( phase );

    dynamic_free( CURRCW_DTFS );



    return error;

}

lib_dec/dec_gen_voic.c

+2 −2
Original line number Diff line number Diff line
@@ -285,8 +285,8 @@ ivas_error decod_gen_voic( 
                }

            }



            count_free( PREVP );

            count_free( CURRP );

            dynamic_free( PREVP );

            dynamic_free( CURRP );

        }

    }

lib_dec/ppp_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ ivas_error ppp_quarter_decoder( 
    tmp = (float) get_next_indice( st, 3 );

    DTFS_phaseShift( CURRCW_Q_DTFS, (float) ( PI2 * ( tmp - 3 ) / CURRCW_Q_DTFS->lag ) );



    count_free( PREVDTFS );

    dynamic_free( PREVDTFS );



    return error;

}

lib_dec/voiced_dec.c

+3 −3
Original line number Diff line number Diff line
@@ -233,9 +233,9 @@ ivas_error ppp_voiced_decoder( 
    mvr2r( dtfs_temp->a, hSC_VBR->dtfs_dec_a, MAXLAG_WI );

    mvr2r( dtfs_temp->b, hSC_VBR->dtfs_dec_b, MAXLAG_WI );



    count_free( TMPDTFS );

    count_free( CURRP_Q_D );

    count_free( dtfs_temp );

    dynamic_free( TMPDTFS );

    dynamic_free( CURRP_Q_D );

    dynamic_free( dtfs_temp );



    return error;

}

lib_enc/ppp_enc.c

+2 −1
Original line number Diff line number Diff line
@@ -355,11 +355,12 @@ ivas_error ppp_quarter_encoder( 


    push_indice( hBstr, IND_GLOBAL_ALIGNMENT, (int16_t) ( tmp + 3 ), 3 );



    count_free( PREVDTFS );

    dynamic_free( PREVDTFS );



    return error;

}





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

 * set_ppp_mode()

 *