Commit d8e92426 authored by malenov's avatar malenov
Browse files

cleanup: bring back the default macro BITSTREAM_INDICES_MEMORY

parent 262bc04e

lib_com/options.h

+5 −1
Original line number Diff line number Diff line
@@ -133,7 +133,11 @@ 


#define BASOP_NOGLOB                                    /* Disable global symbols in BASOPs, Overflow/Carry in BASOPs disabled, additional BASOPs in case of Overflow */

#define IND_LIST_DYN                                    /* VA: Issue 18: Dynamic allocation of ind_list[] and ind_list_metadata[] based on # of transport channels */

//#define DEBUG_IND_LIST

/*#define DEBUG_IND_LIST*/



#ifndef IND_LIST_DYN

#define BITSTREAM_INDICES_MEMORY                        /* Don't count memory for bitstream Indice at the encoder - it is a temporary solution for development only */

#endif



#define LSF_RE_USE_SECONDARY_CHANNEL                    /* TD stereo Secondary channel LSF Q improvement */

#ifdef LSF_RE_USE_SECONDARY_CHANNEL

lib_enc/lib_enc.c

+12 −0
Original line number Diff line number Diff line
@@ -125,7 +125,13 @@ ivas_error IVAS_ENC_Open( 
     * Allocate and initialize IVAS application encoder handle

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



#ifdef BITSTREAM_INDICES_MEMORY

#define WMC_TOOL_SKIP

    if ( ( *phIvasEnc = (IVAS_ENC_HANDLE) malloc( sizeof( struct IVAS_ENC ) ) ) == NULL )

#undef WMC_TOOL_SKIP

#else

    if ( ( *phIvasEnc = (IVAS_ENC_HANDLE) malloc( sizeof( struct IVAS_ENC ) ) ) == NULL )

#endif

    {

        return IVAS_ERR_FAILED_ALLOC;

    }
@@ -238,7 +244,13 @@ void IVAS_ENC_Close( 


    ( *phIvasEnc )->st_ivas = NULL;



#ifdef BITSTREAM_INDICES_MEMORY

#define WMC_TOOL_SKIP

    free( *phIvasEnc );

#undef WMC_TOOL_SKIP

#else

    free( *phIvasEnc );

#endif



    *phIvasEnc = NULL;

    phIvasEnc = NULL;