Commit 664d2a4e authored by emerit's avatar emerit
Browse files

Merge branch... 

Merge branch 'asan_error_omasa_to_binaural_with_hrtf_load_and_bitrate_switching' of https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec into asan_error_omasa_to_binaural_with_hrtf_load_and_bitrate_switching
parents 7f863ead e37f697c

lib_com/options.h

+4 −1
Original line number Diff line number Diff line
@@ -156,7 +156,10 @@ 
/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

/*#define SPLIT_REND_WITH_HEAD_ROT  */                  /* Dlb,FhG: Split Rendering contributions 21 and 35 */



#define FIX_1033_MEMORY_LEAK_OMASA                      /* Nokia / Orange: issue 1033: Memory leak in OMASA to BINAURAL with HRTF with bitrate switching */

#define FIX_1024_REMOVE_PARAMMC_MIXING_MAT              /* VA: issue 1024: remove unused function ivas_param_mc_get_mono_stereo_mixing_matrices() */

#define FIX_1023_REMOVE_PARAMMC_DEC                     /* VA: issue 1023: remove unused function ivas_param_mc_dec() */

#define FIX_1022_REMOVE_PARAMISM_DEC                    /* VA: issue 1022: remove unused function ivas_param_ism_dec() */

#define FIX_1033_MEMORY_LEAK_OMASA                      /* Nokia / Orange: issue #1033: Memory leak in OMASA to BINAURAL with HRTF with bitrate switching */



/* #################### End BE switches ################################## */

lib_debug/wmc_auto.c

+1 −0
Original line number Diff line number Diff line
@@ -2169,3 +2169,4 @@ void Reset_BASOP_WMOPS_counter( void ) 
#endif

lib_debug/wmc_auto.h

+69 −61
Original line number Diff line number Diff line
@@ -613,14 +613,6 @@ extern int cntr_push_pop; 


#endif



/* mac & msu (Non Instrumented Versions) */

#ifndef mac

#define mac( a, b, c ) ( ( a ) + ( b ) * ( c ) )

#endif

#ifndef mac

#define msu( a, b, c ) ( ( a ) - ( b ) * ( c ) )

#endif



#ifndef WMOPS

/* DESACTIVATE the Counting Mechanism */

#define OP_COUNT_( op, n )
@@ -691,61 +683,76 @@ static int wmc_flag_ = 0; 
/* Math Operations */

#define abs_    OP_COUNT_WRAPPER1_( ABS_( 1 ), abs )

#define fabs_   OP_COUNT_WRAPPER1_( ABS_( 1 ), fabs )

#define fabsf_  OP_COUNT_WRAPPER1_( ABS_( 1 ), fabsf )

#define labs_   OP_COUNT_WRAPPER1_( ABS_( 1 ), labs )

#define floor_  OP_COUNT_WRAPPER1_( MISC_( 1 ), floor )

#define floorf_ OP_COUNT_WRAPPER1_( MISC_( 1 ), floorf )

#define sqrt_   OP_COUNT_WRAPPER1_( SQRT_( 1 ), sqrt )

#define sqrtf_  OP_COUNT_WRAPPER1_( SQRT_( 1 ), sqrtf )

#define pow_    OP_COUNT_WRAPPER1_( POWER_( 1 ), pow )

#define powf_   OP_COUNT_WRAPPER1_( POWER_( 1 ), powf )

#define exp_    OP_COUNT_WRAPPER1_( POWER_( 1 ), exp )

#define expf_   OP_COUNT_WRAPPER1_( POWER_( 1 ), expf )

#define log_    OP_COUNT_WRAPPER1_( LOG_( 1 ), log )

#define logf_   OP_COUNT_WRAPPER1_( LOG_( 1 ), logf )

#define log10_  OP_COUNT_WRAPPER1_( LOG_( 1 ), log10 )

#define log10f_ OP_COUNT_WRAPPER1_( LOG_( 1 ), log10f )

#define cos_    OP_COUNT_WRAPPER1_( TRANS_( 1 ), cos )

#define cosf_   OP_COUNT_WRAPPER1_( TRANS_( 1 ), cosf )

#define sin_    OP_COUNT_WRAPPER1_( TRANS_( 1 ), sin )

#define sinf_   OP_COUNT_WRAPPER1_( TRANS_( 1 ), sinf )

#define tan_    OP_COUNT_WRAPPER1_( TRANS_( 1 ), tan )

#define tanf_   OP_COUNT_WRAPPER1_( TRANS_( 1 ), tanf )

#define acos_   OP_COUNT_WRAPPER1_( TRANS_( 1 ), acos )

#define acosf_  OP_COUNT_WRAPPER1_( TRANS_( 1 ), acosf )

#define asin_   OP_COUNT_WRAPPER1_( TRANS_( 1 ), asin )

#define asinf_  OP_COUNT_WRAPPER1_( TRANS_( 1 ), asinf )

#define atan_   OP_COUNT_WRAPPER1_( TRANS_( 1 ), atan )

#define atanf_  OP_COUNT_WRAPPER1_( TRANS_( 1 ), atanf )

#define atan2_  OP_COUNT_WRAPPER1_( TRANS_( 1 ), atan2 )

#define atan2f_ OP_COUNT_WRAPPER1_( TRANS_( 1 ), atan2f )

#define cosh_   OP_COUNT_WRAPPER1_( TRANS_( 1 ), cosh )

#define coshf_  OP_COUNT_WRAPPER1_( TRANS_( 1 ), coshf )

#define sinh_   OP_COUNT_WRAPPER1_( TRANS_( 1 ), sinh )

#define sinhf_  OP_COUNT_WRAPPER1_( TRANS_( 1 ), sinhf )

#define tanh_   OP_COUNT_WRAPPER1_( TRANS_( 1 ), tanh )

#define tanhf_  OP_COUNT_WRAPPER1_( TRANS_( 1 ), tanhf )

#define fmod_   OP_COUNT_WRAPPER1_( DIV_( 1 ), fmod )

/* these macros use any local macros already defined */

/* min/max and their Variants */

#define fmodf_  OP_COUNT_WRAPPER1_( DIV_( 1 ), fmodf )

#define frexp_  OP_COUNT_WRAPPER1_( MISC_( 2 ), frexp )

#define frexpf_ OP_COUNT_WRAPPER1_( MISC_( 2 ), frexpf )



/* the macros below are instrumented versions of user-defined macros that might be used in the source code 

/* representing some well-known and recognized mathematical operations (that are not defined in math.h) */

/* Note: the 'wmc_flag_=wmc_flag_' is used to avoid warning: left-hand operand of comma expression has no effect with gcc */



#define min_( a, b )     OP_COUNT_WRAPPER1_( MISC_( 1 ), min( ( a ), ( b ) ) )

#define max_( a, b )     OP_COUNT_WRAPPER1_( MISC_( 1 ), max( ( a ), ( b ) ) )

#define MIN_( a, b )     OP_COUNT_WRAPPER1_( MISC_( 1 ), MIN( ( a ), ( b ) ) )

#define MAX_( a, b )     OP_COUNT_WRAPPER1_( MISC_( 1 ), MAX( ( a ), ( b ) ) )

#define Min_( a, b )     OP_COUNT_WRAPPER1_( MISC_( 1 ), Min( ( a ), ( b ) ) )

#define Max_( a, b )     OP_COUNT_WRAPPER1_( MISC_( 1 ), Max( ( a ), ( b ) ) )

/* Square and its Variants */

#define sqr_( x )        OP_COUNT_WRAPPER1_( MULT_( 1 ), sqr( ( x ) ) )

#define Sqr_( x )        OP_COUNT_WRAPPER1_( MULT_( 1 ), Sqr( ( x ) ) )

#define SQR_( x )        OP_COUNT_WRAPPER1_( MULT_( 1 ), SQR( ( x ) ) )

#define square_( x )     OP_COUNT_WRAPPER1_( MULT_( 1 ), square( ( x ) ) )

#define Square_( x )     OP_COUNT_WRAPPER1_( MULT_( 1 ), Square( ( x ) ) )

#define SQUARE_( x )     OP_COUNT_WRAPPER1_( MULT_( 1 ), SQUARE( ( x ) ) )

/* Sign and its Variants */

#define sign_( x )       OP_COUNT_WRAPPER1_( MOVE_( 1 ), sign( ( x ) ) )

#define Sign_( x )       OP_COUNT_WRAPPER1_( MOVE_( 1 ), Sign( ( x ) ) )

#define SIGN_( x )       OP_COUNT_WRAPPER1_( MOVE_( 1 ), SIGN( ( x ) ) )

/* Square Root and its Variants */

#define sqrtf_( x ) OP_COUNT_WRAPPER1_( SQRT_( 1 ), sqrtf( ( x ) ) )

/* Invert Square Root and its Variants */

#define inv_sqrt_( x )   OP_COUNT_WRAPPER1_( SQRT_( 1 ), inv_sqrt( ( x ) ) )

/* Others */

#define inv_sqrtf_( x )  OP_COUNT_WRAPPER1_( SQRT_( 1 ), inv_sqrtf( ( x ) ) )

#define log_base_2_( x ) OP_COUNT_WRAPPER1_( ( LOG_( 1 ), MULT_( 1 ) ), log_base_2( ( x ) ) )

#define log2_( x   )     OP_COUNT_WRAPPER1_( ( LOG_( 1 ), MULT_( 1 ) ), log2( ( x ) ) )

#define log2f_( x   )    OP_COUNT_WRAPPER1_( ( LOG_( 1 ), MULT_( 1 ) ), log2f( ( x ) ) )

#define log2_f_( x )     OP_COUNT_WRAPPER1_( ( LOG_( 1 ), MULT_( 1 ) ), log2_f( ( x ) ) )

/* The 'wmc_flag_=wmc_flag_' is Used to Avoid: "warning: left-hand operand of comma expression has no effect"

   with Cygwin gcc Compiler */

#define _round_( x )     OP_COUNT_WRAPPER1_( wmc_flag_ = wmc_flag_, _round( ( x ) ) )

#define round_( x )      OP_COUNT_WRAPPER1_( wmc_flag_ = wmc_flag_, round( ( x ) ) )

#define round_f_( x )    OP_COUNT_WRAPPER1_( wmc_flag_ = wmc_flag_, round_f( ( x ) ) )

#define _squant_( x ) OP_COUNT_WRAPPER1_( wmc_flag_ = wmc_flag_, _squant( ( x ) ) )

/* Set Min/Max */

#define roundf_( x )     OP_COUNT_WRAPPER1_( wmc_flag_ = wmc_flag_, roundf( ( x ) ) )

#define set_min_( a, b ) OP_COUNT_WRAPPER3_( ( ADD_( 1 ), BRANCH_( 1 ), MOVE_( 1 ) ), set_min( ( a ), ( b ) ) )

#define set_max_( a, b ) OP_COUNT_WRAPPER3_( ( ADD_( 1 ), BRANCH_( 1 ), MOVE_( 1 ) ), set_max( ( a ), ( b ) ) )

/* mac & msu (Instrumented Versions) */

#define mac_( a, b, c ) OP_COUNT_WRAPPER1_( MAC_( 1 ), mac( a, b, c ) )

#define msu_( a, b, c ) OP_COUNT_WRAPPER1_( MAC_( 1 ), msu( a, b, c ) )



/* Functions */

#define func_( name, x ) OP_COUNT_WRAPPER1_( FUNC_( x ), name )
@@ -1438,3 +1445,4 @@ static __inline void incrGoto( void) { 
#endif /* WMOPS_H */

lib_dec/ivas_omasa_dec.c

+10 −4
Original line number Diff line number Diff line
@@ -378,11 +378,17 @@ ivas_error ivas_omasa_dec_config( 
            if ( st_ivas->ism_mode == ISM_MASA_MODE_DISC )

            {

                /* Allocate TD renderer for the objects in DISC mode */

#ifdef FIX_1033_MEMORY_LEAK_OMASA

                if ( st_ivas->hBinRendererTd == NULL )

                {

#endif

                    if ( ( error = ivas_td_binaural_open( st_ivas ) ) != IVAS_ERR_OK )

                    {

                        return error;

                    }



#ifdef FIX_1033_MEMORY_LEAK_OMASA

                }

#endif

                /* Allocate 'hIsmRendererData' handle and memory for delay buffer within 'hMasaIsmData' */

                if ( ( error = ivas_omasa_separate_object_renderer_open( st_ivas ) ) != IVAS_ERR_OK )

                {
@@ -392,7 +398,7 @@ ivas_error ivas_omasa_dec_config( 
            else

            {

#ifdef FIX_1033_MEMORY_LEAK_OMASA

                if ( st_ivas->hBinRendererTd->HrFiltSet_p->ModelParams.modelROM == TRUE )

                if ( st_ivas->hBinRendererTd != NULL && st_ivas->hBinRendererTd->HrFiltSet_p->ModelParams.modelROM == TRUE )

                {

#endif

                    /* TD renderer handle */

scripts/tools/Darwin/wmc_tool

+3.08 KiB (642 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file