Merge branch 'main' into 744-fix-sofa-to-rom-tables-and-binaural-binary-files (276e6586) · Commits · IVAS Codec Public Collaboration / IVAS Codec

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)

+3 −1

Original line number	Diff line number	Diff line
		@@ -178,9 +178,11 @@
		#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_FIX_856_TCX_LTP_SYNTH_FILTER /* FhG: issue 856: correct filtering length for tcx-ltp synth filtering*/

		#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 */

		#define BE_FIX_867_PARAMC_RECONFIG /* FhG: issue #867: fix ParamMC CLDFB buffer dealloc when reconfiguring */

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

100644 → 100755

+10 −0

Original line number	Diff line number	Diff line
		@@ -740,7 +740,11 @@ static void tcx_ltp_synth_filter_11_unequal_pitch(
		gain = prev_gain;
		gain_step = -prev_gain / length;

		#ifdef NONBE_FIX_856_TCX_LTP_SYNTH_FILTER
		for ( j = 0; j < length; j++ )
		#else
		for ( j = 0; j < length + L; j++ )
		#endif
		{
		s = 0;
		s2 = 0;
		@@ -761,8 +765,14 @@ static void tcx_ltp_synth_filter_11_unequal_pitch(
		gain += gain_step;
		}

		#ifdef NONBE_FIX_856_TCX_LTP_SYNTH_FILTER
		mvr2r( out - L, temp_buf, length + L );
		mvr2r( in + length, temp_buf + length + L, L );
		temp_ptr = &temp_buf[0] + L;
		#else
		mvr2r( out - MAX_TCX_LTP_FILTER_LEN, temp_buf, MAX_TRANSITION_LEN + 2 * MAX_TCX_LTP_FILTER_LEN );
		temp_ptr = &temp_buf[0] + MAX_TCX_LTP_FILTER_LEN;
		#endif

		m0 = temp_ptr;
		m1 = temp_ptr - 1;

+16 −1

Original line number	Diff line number	Diff line
		@@ -989,11 +989,19 @@ ivas_error ivas_param_mc_dec_reconfig(
		hParamMC->Cldfb_RealBuffer_tc = NULL;
		}

		#ifdef BE_FIX_867_PARAMC_RECONFIG
		if ( hParamMC->Cldfb_ImagBuffer_tc != NULL )
		{
		free( hParamMC->Cldfb_ImagBuffer_tc );
		hParamMC->Cldfb_ImagBuffer_tc = NULL;
		}
		#else
		if ( hParamMC->Cldfb_RealBuffer_tc != NULL )
		{
		free( hParamMC->Cldfb_RealBuffer_tc );
		hParamMC->Cldfb_RealBuffer_tc = NULL;
		}
		#endif

		n_cldfb_slots = DEFAULT_JBM_CLDFB_TIMESLOTS;
		if ( st_ivas->hDecoderConfig->Opt_tsm )
		@@ -1019,12 +1027,19 @@ ivas_error ivas_param_mc_dec_reconfig(
		free( hParamMC->Cldfb_RealBuffer_tc );
		hParamMC->Cldfb_RealBuffer_tc = NULL;
		}

		#ifdef BE_FIX_867_PARAMC_RECONFIG
		if ( hParamMC->Cldfb_ImagBuffer_tc != NULL )
		{
		free( hParamMC->Cldfb_ImagBuffer_tc );
		hParamMC->Cldfb_ImagBuffer_tc = NULL;
		}
		#else
		if ( hParamMC->Cldfb_RealBuffer_tc != NULL )
		{
		free( hParamMC->Cldfb_RealBuffer_tc );
		hParamMC->Cldfb_RealBuffer_tc = NULL;
		}
		#endif
		}
		}
		#endif

+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 */