Commit b09433b9 authored by norvell's avatar norvell
Browse files

Merge branch 'main' into 335-coverage-analysis-done-using-forced-encoder-and-decoder-modes

parents e422eb45 8e34c2c3

apps/decoder.c

+9 −6
Original line number Diff line number Diff line
@@ -538,6 +538,13 @@ cleanup: 
        IVAS_DEC_HRTF_HANDLE hHrtfTD;

        IVAS_DEC_GetHrtfHandle( hIvasDec, &hHrtfTD );

        dealloc_HRTF_binary( hHrtfTD );

#ifdef HRTF_BINARY_FILE

#ifdef FIX_MEMORY_COUNTING_HRTF_BINARY_FILE

        IVAS_DEC_HRTF_CREND_HANDLE hSetOfHRTF;

        IVAS_DEC_GetHrtfCRendHandle( hIvasDec, &hSetOfHRTF );

        destroy_SetOfHRTF( hSetOfHRTF );

#endif

#endif

    }

    IVAS_DEC_Close( &hIvasDec );

    CustomLsReader_close( &hLsCustomReader );
@@ -1505,9 +1512,7 @@ static ivas_error decodeG192( 
        }

#ifdef WMOPS

        update_wmops();

#ifdef MEM_COUNT_DETAILS

        export_mem( "mem_analysis.csv" );

#endif

        update_mem();

#endif

    }
@@ -1978,9 +1983,7 @@ static ivas_error decodeVoIP( 


#ifdef WMOPS

        update_wmops();

#ifdef MEM_COUNT_DETAILS

        export_mem( "mem_analysis.csv" );

#endif

        update_mem();

#endif

    }

apps/encoder.c

+1 −3
Original line number Diff line number Diff line
@@ -717,9 +717,7 @@ int main( 


#ifdef WMOPS

        update_wmops();

#ifdef MEM_COUNT_DETAILS

        export_mem( "mem_analysis.csv" );

#endif

        update_mem();

#endif

    }

apps/renderer.c

+1 −3
Original line number Diff line number Diff line
@@ -999,9 +999,7 @@ int main( 


#ifdef WMOPS

        update_wmops();

#ifdef MEM_COUNT_DETAILS

        export_mem( "mem_analysis.csv" );

#endif

        update_mem();

#endif

    }

lib_com/ivas_cnst.h

+6 −0
Original line number Diff line number Diff line
@@ -1409,10 +1409,16 @@ typedef enum 
#define SFX_SPAT_BIN_NUM_SUBSAMPLES             64

#define ITD_MEM_LEN                             (MAX_ITD + SFX_SPAT_BIN_SINC_M)

#define L_SUBFRAME5MS_48k                       (L_FRAME48k/4)

#ifdef FIX_337_TDREND_INTP

#define MAX_ANGULAR_STEP                        (1.0f)

#else

#define MAX_ANGULAR_STEP                        (15.0f)

#endif

#define MAX_ANGULAR_STEP_INV                    ( 1.0f / MAX_ANGULAR_STEP )

#define MAX_INTERPOLATION_STEPS                 12

#ifndef FIX_310_TD_REND_DELAY

#define BINAURAL_TD_LATENCY_S                   0.0f                        /* ITD fix removes TD renderer delay -- should be cleaned out */

#endif



/* ----- Enums - TD Renderer ----- */

lib_com/ivas_prot.h

+5 −0
Original line number Diff line number Diff line
@@ -4089,6 +4089,9 @@ ivas_error ivas_spar_md_dec_open( 
    const DECODER_CONFIG_HANDLE hDecoderConfig,                 /* i  : configuration structure                 */

    const int16_t num_channels,                                 /* i  : number of internal channels             */

	const int16_t sba_order                                     /* i  : SBA order                               */

#ifdef SBA_BR_SWITCHING_RECONFIG

    ,const int16_t sid_format

#endif

);



void ivas_spar_md_dec_close(
@@ -5384,9 +5387,11 @@ ivas_error ivas_crend_init_from_hrtf_handle( 
	HRTFS_HANDLE hrtf);

#endif



#ifndef FIX_MEMORY_COUNTING_HRTF_BINARY_FILE

ivas_error destroy_SetOfHRTF(

	HRTFS_CREND_HANDLE hSetOfHRTF    /* i/o: Set of HRTF CRend handle              */

);

#endif



#endif