Commit d39a11dc authored by vaillancour's avatar vaillancour
Browse files

Merge branch 'main' into basop-2248-basop-assert-in-evs-encoder

parents fa9c6a16 aaa0a523

lib_com/hq2_noise_inject_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
#include "options.h"

#include "prot_fx.h"

#include "oper_32b.h"

#include "move.h"

#include "stl.h"



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

 * hq2_noise_inject()

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -85,9 +85,9 @@ 
#define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR      /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */

#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */

#define FIX_1435_MOVE_STEREO_PANNING                    /* VA: issue 1435: do the EVS stereo panning in the renderer */

#define FIX_BASOP_2201_HARMONIZE_HRTF_FILE_READER_CREND /* OR : Fix issue basop 2201 hrtf_file_reader crend differs between basop ivas-main and ivas-float-update */

#define FIX_2248_EVS_ASSERT                             /* VA: Include _sat in an EVS related part of the code */





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



/* #################### Start NON-BE switches ############################ */

lib_debug/wmc_auto.c

+18 −4
Original line number Diff line number Diff line
@@ -820,7 +820,6 @@ static void *mem_alloc_block( size_t size, const char *size_str ); 


void reset_mem( Counting_Size cnt_size )

{

    int16_t something;

    size_t tmp_size;



    /* initialize list of stack records */
@@ -840,7 +839,13 @@ void reset_mem( Counting_Size cnt_size ) 
    max_num_calls = MAX_NUM_RECORDS;



    /* initialize stack pointers */

#if defined( __GNUC__ ) || defined( __clang__ )

    /* GCC/Clang: use builtin (works for many targets) */

    ptr_base_stack = __builtin_frame_address( 0 );

#else

    int16_t something;

    ptr_base_stack = &something;

#endif

    ptr_max_stack = ptr_base_stack;

    ptr_current_stack = ptr_base_stack;
@@ -945,10 +950,14 @@ void reset_mem( Counting_Size cnt_size ) 


void reset_stack( void )

{

    int16_t something;



    /* initialize/reset stack pointers */

#if defined( __GNUC__ ) || defined( __clang__ )

    /* GCC/Clang: use builtin (works for many targets) */

    ptr_base_stack = __builtin_frame_address( 0 );

#else

    int16_t something;

    ptr_base_stack = &something;

#endif

    ptr_max_stack = ptr_base_stack;

    ptr_current_stack = ptr_base_stack;
@@ -963,10 +972,15 @@ void reset_stack( void ) 


int push_stack( const char *filename, const char *fctname )

{

    int16_t something;

    int32_t current_stack_size;



#if defined( __GNUC__ ) || defined( __clang__ )

    /* GCC/Clang: use builtin (works for many targets) */

    ptr_base_stack = __builtin_frame_address( 0 );

#else

    int16_t something;

    ptr_current_stack = &something;

#endif



    (void) *filename; /* to avoid compilation warning */

lib_dec/fd_cng_dec_fx.c

+4 −6
Original line number Diff line number Diff line
@@ -3,17 +3,15 @@ 
  ====================================================================================*/





#include "basop32.h"

#include <assert.h>

#include <stdint.h>

#include "options.h"

#include "stl.h"

#include "cnst.h"

#include "enh1632.h"

#include "ivas_cnst.h"

#include "ivas_rom_com.h"

#include "move.h"

#include "wmc_auto.h"

#include <assert.h>

#include "typedef.h"

#include <stdint.h>

#include "options.h"

#include "rom_com.h"

#include "stat_dec.h"

#include "prot_fx.h"

lib_dec/ivas_ism_metadata_dec_fx.c

+2 −1
Original line number Diff line number Diff line
@@ -31,13 +31,14 @@ 
*******************************************************************************************************/



#include <stdint.h>

#include <math.h>

#include "options.h"

#include "stl.h"

#include "ivas_cnst.h"

#include "ivas_prot_fx.h"

#include "ivas_rom_com.h"

#include "prot_fx.h"

#include "ivas_stat_enc.h"

#include <math.h>

#include "wmc_auto.h"

#include "move.h"

#include "ivas_prot_fx.h"