Commit d7bfe621 authored by Jan Brouwer's avatar Jan Brouwer
Browse files

Merge branch '109-harmonize-head-and-orientation-tracking' of... 

Merge branch '109-harmonize-head-and-orientation-tracking' of https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec into 109-harmonize-head-and-orientation-tracking
parents da2ee7f1 a35e872e

apps/decoder.c

+2 −6
Original line number Diff line number Diff line
@@ -1614,9 +1614,7 @@ static ivas_error decodeG192( 
        }

#ifdef WMOPS

        update_wmops();

#ifdef MEM_COUNT_DETAILS

        export_mem( "mem_analysis.csv" );

#endif

        update_mem();

#endif

    }
@@ -2087,9 +2085,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
@@ -1073,9 +1073,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/options.h

+2 −1
Original line number Diff line number Diff line
@@ -151,9 +151,10 @@ 
#define HRTF_BINARY_FILE                                /* HRTF filters' binary file used for binaural rendering. */



#define FIX_197_CREND_INTERFACE 

#define FIX_FOR_TEST                                    /* allows tests to pass using old TD binary file, to be removed after merge*/

#define FIX_301_PLC                                     /* FhG: issue 301 - fix bug of missing update of overlap buffer for DFT-stereo PLC*/

#define FIX_337_TDREND_INTP                             /* Issue 337: TD renderer interpolation threshold set too low */



#define FIX_310_TD_REND_DELAY                           /* Adding HRTF delay being read from ROM/Binary file, fix rounding for delay compensation in renderer */



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

/* clang-format on */