Merge branch 'lc3plus-v161-update-main' into 'main' (bbb2908e) · Commits · SA4 / Audio / IVAS BASOP

CMakeLists.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -184,7 +184,7 @@ target_include_directories(lib_util PRIVATE lib_lc3plus lib_isar)

		if(NOT WMOPS)
		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_util lib_basop lib_com lib_debug lib_isar)
		target_link_libraries(ivas_lc3plus_unit_test lib_rend lib_dec lib_util lib_com lib_basop lib_debug lib_isar)
		endif()

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

Workspace_msvc/lib_lc3plus.vcxproj

+11 −11

Original line number	Diff line number	Diff line
		@@ -109,19 +109,20 @@
		<ClCompile Include="..\lib_lc3plus\basop_mpy_lc3plus.c" />
		<ClCompile Include="..\lib_lc3plus\basop_util_lc3plus.c" />
		<ClCompile Include="..\lib_lc3plus\constants.c" />
		<ClCompile Include="..\lib_lc3plus\com_entropy.c" />
		<ClCompile Include="..\lib_lc3plus\cutoff_bandwidth.c" />
		<ClCompile Include="..\lib_lc3plus\dct2_fx.c" />
		<ClCompile Include="..\lib_lc3plus\dct4_fx.c" />
		<ClCompile Include="..\lib_lc3plus\dec_entropy.c" />
		<ClCompile Include="..\lib_lc3plus\dec_lc3.c" />
		<ClCompile Include="..\lib_lc3plus\dec_lc3plus.c" />
		<ClCompile Include="..\lib_lc3plus\detect_cutoff_warped_fx.c" />
		<ClCompile Include="..\lib_lc3plus\dynmem.c" />
		<ClCompile Include="..\lib_lc3plus\enc_entropy.c" />
		<ClCompile Include="..\lib_lc3plus\enc_lc3.c" />
		<ClCompile Include="..\lib_lc3plus\enc_lc3plus.c" />
		<ClCompile Include="..\lib_lc3plus\estimate_global_gain_fx.c" />
		<ClCompile Include="..\lib_lc3plus\fft_lc3plus.c" />
		<ClCompile Include="..\lib_lc3plus\imdct_fx.c" />
		<ClCompile Include="..\lib_lc3plus\lc3.c" />
		<ClCompile Include="..\lib_lc3plus\lc3plus.c" />
		<ClCompile Include="..\lib_lc3plus\levinson_fx.c" />
		<ClCompile Include="..\lib_lc3plus\ltpf_coder_fx.c" />
		<ClCompile Include="..\lib_lc3plus\ltpf_decoder_fx.c" />
		@@ -166,8 +167,9 @@
		<ClCompile Include="..\lib_lc3plus\residual_decoding_fx.c" />
		<ClCompile Include="..\lib_lc3plus\rom_basop_util_lc3plus.c" />
		<ClCompile Include="..\lib_lc3plus\scale_signal24_fx.c" />
		<ClCompile Include="..\lib_lc3plus\setup_dec_lc3.c" />
		<ClCompile Include="..\lib_lc3plus\setup_enc_lc3.c" />
		<ClCompile Include="..\lib_lc3plus\setup_com_lc3plus.c" />
		<ClCompile Include="..\lib_lc3plus\setup_dec_lc3plus.c" />
		<ClCompile Include="..\lib_lc3plus\setup_enc_lc3plus.c" />
		<ClCompile Include="..\lib_lc3plus\sns_compute_scf_fx.c" />
		<ClCompile Include="..\lib_lc3plus\sns_interpolate_scf_fx.c" />
		<ClCompile Include="..\lib_lc3plus\sns_quantize_scf_fx.c" />
		@@ -181,13 +183,11 @@
		<ClInclude Include="..\lib_lc3plus\defines.h" />
		<ClInclude Include="..\lib_lc3plus\dynmem.h" />
		<ClInclude Include="..\lib_lc3plus\functions.h" />
		<ClInclude Include="..\lib_lc3plus\lc3.h" />
		<ClInclude Include="..\lib_lc3plus\lc3plus.h" />
		<ClInclude Include="..\lib_lc3plus\license.h" />
		<ClInclude Include="..\lib_lc3plus\rom_basop_util_lc3plus.h" />
		<ClInclude Include="..\lib_lc3plus\setup_dec_lc3.h" />
		<ClInclude Include="..\lib_lc3plus\setup_enc_lc3.h" />
		<ClInclude Include="..\lib_lc3plus\tinywavein_c.h" />
		<ClInclude Include="..\lib_lc3plus\tinywaveout_c.h" />
		<ClInclude Include="..\lib_lc3plus\setup_dec_lc3plus.h" />
		<ClInclude Include="..\lib_lc3plus\setup_enc_lc3plus.h" />
		</ItemGroup>
		<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
		<ImportGroup Label="ExtensionTargets">

lib_isar/isar_lc3plus_common.c

+31 −1

Original line number	Diff line number	Diff line
		@@ -33,7 +33,7 @@
		#include "options.h"
		#include "isar_lc3plus_common.h"
		#include "ivas_error.h"
		#include "lc3.h"
		#include "lc3plus.h"

		/-----------------------------------------------------------------------------------------
		* Function ISAR_LC3PLUS_LC3plusErrToIvasErr()
		@@ -58,6 +58,12 @@ ivas_error ISAR_LC3PLUS_LC3plusErrToIvasErr(
		}


		/-----------------------------------------------------------------------------------------
		* Function IVAS_LC3PLUS_LC3plusRtpErrToIvasErr()
		*
		*
		-----------------------------------------------------------------------------------------/

		ivas_error IVAS_LC3PLUS_LC3plusRtpErrToIvasErr(
		const LC3PLUS_RTP_ERR lc3PlusRtpError )
		{
		@@ -86,3 +92,27 @@ ivas_error IVAS_LC3PLUS_LC3plusRtpErrToIvasErr(

		return IVAS_ERR_UNKNOWN;
		}

		/-----------------------------------------------------------------------------------------
		* Function IVAS_LC3PLUS_UsToLC3plusFrameDuration()
		*
		*
		-----------------------------------------------------------------------------------------/

		LC3PLUS_FrameDuration IVAS_LC3PLUS_UsToLC3plusFrameDuration(
		const int16_t lc3PlusFrameDurationUs )
		{
		switch ( lc3PlusFrameDurationUs )
		{
		case 2500:
		return LC3PLUS_FRAME_DURATION_2p5MS;
		case 5000:
		return LC3PLUS_FRAME_DURATION_5MS;
		case 10000:
		return LC3PLUS_FRAME_DURATION_10MS;
		default:
		break;
		}

		return LC3PLUS_FRAME_DURATION_UNDEFINED;
		}

lib_isar/isar_lc3plus_common.h

+4 −1

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@
		#include <stdint.h>
		#include "options.h"
		#include "ivas_error.h"
		#include "lc3.h"
		#include "lc3plus.h"
		#include "isar_lc3plus_payload.h"

		/! common configuration parameters between encoder and decoder /
		@@ -61,4 +61,7 @@ ivas_error ISAR_LC3PLUS_LC3plusErrToIvasErr( const LC3PLUS_Error lc3PlusError );
		/! utility function to convert LC3PLUS_Errors to the suitable ivas_error /
		ivas_error IVAS_LC3PLUS_LC3plusRtpErrToIvasErr( const LC3PLUS_RTP_ERR lc3PlusRtpError );

		/! utility function to convert a value in microseconds to an LC3PLUS_FrameDuration /
		LC3PLUS_FrameDuration IVAS_LC3PLUS_UsToLC3plusFrameDuration( const int16_t lc3PlusFrameDuration );

		#endif /* ISAR_LC3PLUS_COM_H */

lib_isar/isar_lc3plus_dec.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -36,7 +36,7 @@
		#include "ivas_prot_fx.h"
		#include "isar_lc3plus_dec.h"
		#include "isar_lc3plus_common.h"
		#include "lc3.h"
		#include "lc3plus.h"
		#include "ivas_error_utils.h"
		#include "wmc_auto.h"

		@@ -137,7 +137,7 @@ ivas_error ISAR_LC3PLUS_DEC_Open(
		return IVAS_ERROR( ISAR_LC3PLUS_LC3plusErrToIvasErr( err ), "lc3plus_dec_init failed\n" );
		}

		err = lc3plus_dec_set_frame_dms( ( *handle )->handles[iCh], config.lc3plus_frame_duration_us / 100 );
		err = lc3plus_dec_set_frame_dms( ( *handle )->handles[iCh], IVAS_LC3PLUS_UsToLC3plusFrameDuration( config.lc3plus_frame_duration_us ) );
		if ( LC3PLUS_OK != err )
		{
		ISAR_LC3PLUS_DEC_Close( handle );