Commit 38561e92 authored by malenov's avatar malenov
Browse files

remove macro BITSTREAM_INDICES_MEMORY

parent f2fe22b1

.gitignore

+0 −22
Original line number Diff line number Diff line
@@ -72,25 +72,3 @@ Externals/ 


# coan output files that are created when cleaning out switches

coan_out_*
 
/ci/complexity_measurements/__zaloha

/COMPLEXITY

/scripts/ivas_pytests/tests/unit_tests/crend/tv

/scripts/wmops

/scripts/__zaloha

/tv

/scripts/td_object_renderer/object_renderer_standalone

/scripts/ivas_pytests/tests/unit_tests/crend

/scripts/config/short_test.prm

/NTT_critical_data.pwv

/IvasBuilder.txt

/ind_list.pwv

/I18-comments.c

/build.txt

/__zaloha

/Workspace_msvc/decoder.args.json

/Workspace_msvc/encoder.args.json

/Workspace_msvc/lib_dec.args.json

/scripts/Vlad_mergeNewsletters.py

/scripts/Vlad_extract_max_num_ind.py

/scripts/max_num_indices.xlsx

/res

lib_com/options.h

+8 −8
Original line number Diff line number Diff line
@@ -50,16 +50,12 @@ 
#ifndef RELEASE

#define DEBUGGING                               /* Activate debugging part of the code */

#endif

#define WMOPS                               /* Activate complexity and memory counters */

/*#define WMOPS*/                               /* Activate complexity and memory counters */

/*#define WMOPS_PER_FRAME*/                     /* Output per-frame complexity (writes one float value per frame to the file "wmops_analysis") */

/*#define WMOPS_DETAIL*/                        /* Output detailed complexity printout for every function. Increases runtime overhead */

/*#define WMOPS_WC_FRAME_ANALYSIS*/             /* Output detailed complexity analysis for the worst-case frame */

/*#define MEM_COUNT_DETAILS*/                   /* Output detailed memory analysis for the worst-case frame (writes to the file "mem_analysis.csv") */



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

#define IND_LIST_DYN                            /* dynamic allocation of ind_list based on transport channels */

/*#define DEBUG_IND_LIST*/



#ifdef DEBUGGING



/*#define DEBUG_MODE_INFO*/                     /* output most important parameters to the subdirectory "res/" */
@@ -136,6 +132,7 @@ 
/* ################# Start DEVELOPMENT switches ######################## */



#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 LSF_RE_USE_SECONDARY_CHANNEL                    /* TD stereo Secondary channel LSF Q improvement */

#ifdef LSF_RE_USE_SECONDARY_CHANNEL
@@ -144,10 +141,12 @@ 
#define DISABLE_ADAP_RES_COD_TMP                        /* temporary fix for IVAS-403, disables adaptive residual coding */

/*#define ITD_WINNER_GAIN_MODIFY */                     /* ITD optimization - WORK IN PROGRESS */

/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */



#define SBA_BR_SWITCHING_CLEAN_UP                       /*Issue 114: Clean up changes for the SBA reconfiguation functions*/

#define LOW_RATE_TRANS_CORE_CODER                       /* Eri: Activate low-rate-encoding-of-transients contribution for core coder, affects MC, MASA and SBA */

#define FIX_197_CREND_INTERFACE

#define FIX_329_ENABLE_TD_RENDERER_REVERB_MC            /* Eri: Enable reverb for TD renderer for 5.1 and 7.1 with headtracking enabled for IVAS_dec */

#define FIX_330_ENABLE_TD_RENDERER_REVERB_REND          /* Eri: Enable reverb for TD renderer for ISM, 5.1 and 7.1 with headtracking enabled for IVAS_rend */



#define FIX_347_DTX_CRASH                               /* FhG: Fix crash that can happen with DTX */

#define DISABLE_RES_CHANNELS_MCT                        /* decode only W and residual for Y when outputting to stereo */

#define FIX_107_5MS_SUBFRAME_RENDERING
@@ -165,9 +164,10 @@ 


#define BINAURALIZATION_DELAY_REPORT                    /* VA: Issue 255 - Changes the way the decoder delay is reported */

#define FIX_351_HRTF_COMMAND                            /* VA: Issue 354 - improve "-hrtf" command-line option */



#define FIX_94_VERIFY_WAV_NUM_CHANNELS                  /* FhG: Issue 94 - Check if number of channels in input wav file matches encoder/renderer configuration */

#define ISM_HIGHEST_BITRATE                             /* VA: Issue 284: Update highest bitrate limit in ISM format */

#define TUNE_360_OBJECT_WITH_NOISE                      /* VA: issue 360: consider objects being speech+noise for active speech coding */

#define FIX_350_MASA_DELAY_COMP                         /* Nokia: Issue 350: MASA audio/meta delay compensation */



/* ################## End DEVELOPMENT switches ######################### */

/* clang-format on */

lib_enc/lib_enc.c

+0 −13
Original line number Diff line number Diff line
@@ -116,13 +116,7 @@ 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;

    }
@@ -230,14 +224,7 @@ 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;