Commit 4d7f30f6 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'main' into 823-cmake-build-fails-with-dinclude_split-1

parents c0c0f4a2 a505850b

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ endif 
CFLAGS   += -std=c99 -pedantic -Wcast-qual -Wall -W -Wextra -Wno-long-long     \

            -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes  \

            -Werror-implicit-function-declaration \

            -Wno-unused-function -Wno-implicit-fallthrough

            -Wno-implicit-fallthrough



# libs to link

LDLIBS   += -lm

apps/renderer.c

+2 −2
Original line number Diff line number Diff line
@@ -3834,7 +3834,7 @@ static ivas_error parseLfePanMtxFile( 


    /* set default panning matrix to all zeros

       any subsequent issue in file reading will gracefully exit the function */

    for ( lfe_in = 0; lfe_in < IVAS_MAX_INPUT_LFE_CHANNELS; lfe_in++ )

    for ( lfe_in = 0; lfe_in < RENDERER_MAX_INPUT_LFE_CHANNELS; lfe_in++ )

    {

        for ( i = 0; i < IVAS_MAX_OUTPUT_CHANNELS; i++ )

        {
@@ -3842,7 +3842,7 @@ static ivas_error parseLfePanMtxFile( 
        }

    }



    for ( lfe_in = 0; lfe_in < IVAS_MAX_INPUT_LFE_CHANNELS; lfe_in++ )

    for ( lfe_in = 0; lfe_in < RENDERER_MAX_INPUT_LFE_CHANNELS; lfe_in++ )

    {

        ch_out = 0;

lib_com/common_api_types.h

+6 −9
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ 


#define IVAS_NUM_FRAMES_PER_SEC 50

#define IVAS_MAX_FRAME_SIZE     ( 48000 / IVAS_NUM_FRAMES_PER_SEC )



#define IVAS_MAX_BITS_PER_FRAME ( 512000 / IVAS_NUM_FRAMES_PER_SEC )



#define IVAS_MAX_NUM_OBJECTS       4
@@ -54,10 +53,8 @@ 
#define IVAS_MAX_OUTPUT_CHANNELS   16

#define IVAS_CLDFB_NO_COL_MAX      16

#define IVAS_CLDFB_NO_CHANNELS_MAX 60

#define IVAS_MAX_INPUT_LFE_CHANNELS 4



#define IVAS_MAX_PARAM_SPATIAL_SUBFRAMES 4



#define IVAS_ROOM_ABS_COEFF              6



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

lib_com/ivas_cnst.h

+0 −18
Original line number Diff line number Diff line
@@ -1822,29 +1822,11 @@ typedef enum 
 * Early Reflection constants

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



#define ER_ABS_COEFF                            6

#define ER_MAX_SOURCES                          25

#define ER_REF_ORDER                            1

#define ER_NUM_REF                              6



#define ER_AIR_COEFF                            (0.00137f)

#define ER_SOUND_SPEED                          (343.0f)

#define ER_MIN_WALL_DIST                        (0.1f)

#define ER_EUCLIDEAN_SCALE                      (1.29246971E-26f)



#define ER_DEFAULT_ROOM_L                       (3.0f)

#define ER_DEFAULT_ROOM_W                       (4.0f)

#define ER_DEFAULT_ROOM_H                       (5.0f)

#define ER_RADIUS                               (1.0f)

#define ER_LIST_ORIGIN_X                        (0.0f)

#define ER_LIST_ORIGIN_Y                        (0.0f)

#define ER_LIST_HEIGHT                          (1.6f)



#define ER_MIN_ROOM_DIMENSION                   (1.0f)

#define ER_MAX_ROOM_DIMENSION                   (999.0f)

#define ER_MIN_ABS_COEFF                        (0.0f)

#define ER_MAX_ABS_COEFF                        (1.0f)





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

 * Stereo downmix EVS constants

lib_com/options.h

+2 −1
Original line number Diff line number Diff line
@@ -172,8 +172,9 @@ 
#define BE_FIX_832_ASAN_ERROR_EFAP_OSBA                       /* FhG: issue #832: fix ASAN error caused by re-allocating EFAP memories in OSBA*/

#define NONBE_FIX_819_DOUBLE_PREC_COMB_FORMATS                /* VA: issue 820: Double precision arithmetic in combined formats */

#define NONBE_FIX_849_OMASA_BFI_CRASH                         /* VA: issue 849: fix OMASA 2TC and FEC crashes */



#define NONBE_UNIFIED_DECODING_PATHS                          /* FhG: unify decoding paths   */

#define NONBE_FIX_861_MASA_CRASH_STEREO_SWITCHING             /* VA: issue 861: fix MASA 2TC crash when switching from MDCT stereo to TD/DFT stereo */





/* ##################### End NON-BE switches ########################### */