From f7dccc969877e72f8cc399a60f3a7f76e6dafa52 Mon Sep 17 00:00:00 2001 From: Archit Tamarapu Date: Thu, 12 Oct 2023 11:08:47 +0200 Subject: [PATCH 1/3] remove redundant glob of old subfolder for CLDFB codec in CMakeLists.txt --- CMakeLists.txt | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fec05bd3ed..3003e7eb10 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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() +add_library(lib_rend ${libRendSrcs} ${libRendHeaders}) 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) -- GitLab From a221eadfe07acca5baf996e518e39f147d988521 Mon Sep 17 00:00:00 2001 From: Kacper Sagnowski Date: Mon, 16 Oct 2023 16:57:54 +0200 Subject: [PATCH 2/3] Fix linker problems --- lib_rend/ivas_lc3plus_dec.c | 2 ++ lib_rend/ivas_lc3plus_enc.c | 3 ++- scripts/split_rendering/lc3plus/ivas_lc3plus_unit_test.c | 1 + .../lc3plus/ivas_lc3plus_unit_test_selective_decoding.c | 9 +++------ 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/lib_rend/ivas_lc3plus_dec.c b/lib_rend/ivas_lc3plus_dec.c index d2258e7e13..5dfdb9cec7 100644 --- a/lib_rend/ivas_lc3plus_dec.c +++ b/lib_rend/ivas_lc3plus_dec.c @@ -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 */ diff --git a/lib_rend/ivas_lc3plus_enc.c b/lib_rend/ivas_lc3plus_enc.c index dd52d243d5..8751d3dacc 100644 --- a/lib_rend/ivas_lc3plus_enc.c +++ b/lib_rend/ivas_lc3plus_enc.c @@ -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 */ diff --git a/scripts/split_rendering/lc3plus/ivas_lc3plus_unit_test.c b/scripts/split_rendering/lc3plus/ivas_lc3plus_unit_test.c index 4b49bc4315..3b45e1ec65 100644 --- a/scripts/split_rendering/lc3plus/ivas_lc3plus_unit_test.c +++ b/scripts/split_rendering/lc3plus/ivas_lc3plus_unit_test.c @@ -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 ) diff --git a/scripts/split_rendering/lc3plus/ivas_lc3plus_unit_test_selective_decoding.c b/scripts/split_rendering/lc3plus/ivas_lc3plus_unit_test_selective_decoding.c index d90e98ed5b..afbcf9bd0d 100644 --- a/scripts/split_rendering/lc3plus/ivas_lc3plus_unit_test_selective_decoding.c +++ b/scripts/split_rendering/lc3plus/ivas_lc3plus_unit_test_selective_decoding.c @@ -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 */ -- GitLab From 84b2d3b8d92411beea85c27389283b1c532cb724 Mon Sep 17 00:00:00 2001 From: knj Date: Tue, 17 Oct 2023 13:26:44 +0200 Subject: [PATCH 3/3] remove c flag from CMakeLists.txt to be in line with Makefile --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3003e7eb10..1f2b29b9c5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) -- GitLab