merge from main, 1st part (3d78b280) · Commits · SA4 / Audio / IVAS BASOP

CMakeLists.txt

+13 −4

Original line number	Diff line number	Diff line
		@@ -63,9 +63,16 @@ if(UNIX)
		# to be uncommented in CI
		# set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")

		# don't override CMAKE_C_COMPILER if it's already set
		if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR AND NOT CMAKE_C_COMPILER)
		# set C compiler
		find_program(cc NAMES clang-18 clang REQUIRED)
		set(CMAKE_C_COMPILER "${cc}" CACHE STRING "")
		find_program(cc NAMES clang-18 clang)
		if(cc)
		set(CMAKE_C_COMPILER "${cc}" CACHE FILEPATH "")
		else()
		message(WARNING "clang compiler not found - falling back to system default")
		endif()
		endif()

		# CLANG
		if(CLANG)
		@@ -189,9 +196,11 @@ add_library(lib_util ${libUtilSrcs} ${libUtilHeaders})
		target_include_directories(lib_util PUBLIC lib_util PRIVATE lib_basop lib_com lib_enc lib_dec lib_rend lib_debug)
		target_include_directories(lib_util PRIVATE lib_lc3plus lib_isar)

		if(NOT WMOPS)
		if(NOT WMOPS AND EXISTS "${CMAKE_SOURCE_DIR}/scripts/split_rendering/lc3plus_basop/ivas_lc3plus_unit_test.c")
		add_executable(ivas_lc3plus_unit_test ${CMAKE_SOURCE_DIR}/scripts/split_rendering/lc3plus_basop/ivas_lc3plus_unit_test.c)
		target_link_libraries(ivas_lc3plus_unit_test lib_rend lib_dec lib_com lib_basop lib_debug lib_isar)
		else()
		message(WARNING "ivas_lc3plus_unit_test is not built - scripts folder probably missing")
		endif()

		file(GLOB libISARSrcs "lib_isar/*.c")

+0 −1

Original line number	Diff line number	Diff line
		@@ -321,7 +321,6 @@
		<ClInclude Include="..\lib_dec\jbm_jb4_inputbuffer.h" />
		<ClInclude Include="..\lib_dec\jbm_jb4_jmf.h" />
		<ClInclude Include="..\lib_dec\jbm_pcmdsp_apa.h" />
		<ClInclude Include="..\lib_dec\jbm_pcmdsp_fifo.h" />
		<ClInclude Include="..\lib_dec\jbm_pcmdsp_similarityestimation.h" />
		<ClInclude Include="..\lib_dec\jbm_pcmdsp_window.h" />
		<ClInclude Include="..\lib_dec\lib_dec.h" />

+0 −3

Original line number	Diff line number	Diff line
		@@ -515,9 +515,6 @@
		<ClInclude Include="..\lib_dec\jbm_pcmdsp_apa.h">
		<Filter>decoder_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_dec\jbm_pcmdsp_fifo.h">
		<Filter>decoder_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_dec\jbm_pcmdsp_similarityestimation.h">
		<Filter>decoder_h</Filter>
		</ClInclude>

+84 −233

File changed.

Preview size limit exceeded, changes collapsed.

+0 −15

Original line number	Diff line number	Diff line
		@@ -363,7 +363,6 @@ int main(
		}
		}

		#ifdef FIX_FMSW_DEC
		/------------------------------------------------------------------------------------------
		* Open remote requests file for rtp packing (E-bytes)
		------------------------------------------------------------------------------------------/
		@@ -383,7 +382,6 @@ int main(
		goto cleanup;
		}
		}
		#endif

		/------------------------------------------------------------------------------------------
		* Handle Channel-aware mode
		@@ -678,19 +676,6 @@ int main(
		}
		}

		#ifndef FIX_FMSW_DEC
		/------------------------------------------------------------------------------------------
		* Open remote requests file for rtp packing (E-bytes)
		------------------------------------------------------------------------------------------/
		if ( arg.requestsFileName != NULL )
		{
		if ( ( error = RequestsFileReader_open( arg.requestsFileName, &requestsFileReader ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError: Can't open requests file %s \n\n", arg.requestsFileName );
		goto cleanup;
		}
		}
		#endif
		/------------------------------------------------------------------------------------------
		* Run the encoder
		------------------------------------------------------------------------------------------/