Commit d0406ddc authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge remote-tracking branch 'origin/main' into 866-move-ivas_vbab-c-to-renderer

parents b27603d8 427b9392

CMakeLists.txt

+2 −10
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ if(UNIX) 
  # C compiler flags

  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pedantic -Wcast-qual -Wall -W -Wextra -Wno-long-long")

  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes")

  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror-implicit-function-declaration -Wno-unused-parameter -Wno-unused-function")

  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror-implicit-function-declaration -Wno-unused-parameter")

  # CLANG

  if(CLANG)

    find_program(clangBin NAMES /home/amm-archiv/soft/Linux/clang/current/bin/clang clang REQUIRED)
@@ -162,10 +162,6 @@ if(INCLUDE_SPLIT) 
  endif()

endif()



if(INCLUDE_SPLIT)

  file(GLOB libCldfbTransCodecSrcs "lib_rend/ivas_cldfb_trans_codec/*.c")

  file(GLOB libCldfbTransCodecHeaders "lib_rend/ivas_cldfb_trans_codec/*.h")

endif()

file(GLOB libRendSrcs "lib_rend/*.c")

file(GLOB libRendHeaders "lib_rend/*.h")

if(NOT INCLUDE_SPLIT)
@@ -184,11 +180,7 @@ if(NOT INCLUDE_SPLIT) 
  list(FILTER libRendHeaders EXCLUDE REGEX ".*lib_rend\/.*ivas_lcld_rom_tables.*\.h$")

endif()



if(INCLUDE_SPLIT)

  add_library(lib_rend ${libRendSrcs} ${libCldfbTransCodecSrcs} ${libRendHeaders}  ${libCldfbTransCodecHeaders})

else()

add_library(lib_rend ${libRendSrcs} ${libRendHeaders})

endif()

target_link_libraries(lib_rend lib_dec lib_com lib_debug) # Todo refactor: This dependency on lib_dec should be removed.

if(INCLUDE_SPLIT)

  target_link_libraries(lib_rend lib_lc3plus)

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