Commit 2cc8dd38 authored by Jan Kiene's avatar Jan Kiene
Browse files

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

Resolve "CMake build fails with -DINCLUDE_SPLIT=1" on Linux

See merge request !1165
parents a505850b 84b2d3b8

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)

lib_rend/ivas_lc3plus_dec.c

+2 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
#include "ivas_error_utils.h"

#include "wmc_auto.h"



#ifdef SPLIT_REND_WITH_HEAD_ROT



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

 * IVAS_LC3PLUS_DEC_Open()
@@ -699,3 +700,4 @@ ivas_error IVAS_LC3PLUS_DEC_Conceal( 


    return IVAS_LC3PLUS_DEC_Decode_or_Conceal_internal( handle, bitstream_in, 0, badFrameIndicator, pcm_out );

}

#endif /* SPLIT_REND_WITH_HEAD_ROT */

lib_rend/ivas_lc3plus_enc.c

+2 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
#include "prot.h"

#include "wmc_auto.h"





#ifdef SPLIT_REND_WITH_HEAD_ROT

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

 * Function IVAS_LC3PLUS_ENC_Open()

 *
@@ -331,3 +331,4 @@ ivas_error IVAS_LC3PLUS_ENC_Encode( 


    return IVAS_ERR_OK;

}

#endif /* SPLIT_REND_WITH_HEAD_ROT */

scripts/split_rendering/lc3plus/ivas_lc3plus_unit_test.c

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ the United Nations Convention on Contracts on the International Sales of Goods. 
#include "ivas_error_utils.h"



#ifdef SPLIT_REND_WITH_HEAD_ROT



#define MAX_SAMPLES_PER_CHANNEL 960



static int encodeAndDecodeOneStereoFrame( LC3PLUS_CONFIG config )

scripts/split_rendering/lc3plus/ivas_lc3plus_unit_test_selective_decoding.c

+3 −6
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ the United Nations Convention on Contracts on the International Sales of Goods. 
#include "ivas_lc3plus_dec.h"

#include "ivas_error_utils.h"



#ifdef SPLIT_REND_WITH_HEAD_ROT



#define MAX_SAMPLES_PER_CHANNEL 960



/* included by ivas_lc3plus_unit_test.c */
@@ -1946,9 +1948,4 @@ static int selectiveDecIvas20msLc3plus5ms_48kHz_scenario_get_active_dont_cache( 
    }

    return err;

}











#endif /* SPLIT_REND_WITH_HEAD_ROT */