merge main to branch (84b1ad3a) · Commits · SA4 / Audio / IVAS BASOP

apps/decoder.c

+1 −17

Original line number	Diff line number	Diff line
		@@ -134,10 +134,7 @@ static bool parseCmdlIVAS_dec( int16_t argc, char *argv, DecArguments arg );
		static void usage_dec( void );
		static ivas_error decodeG192( DecArguments arg, BS_READER_HANDLE hBsReader, RotFileReader headRotReader, RotFileReader externalOrientationFileReader, RotFileReader refRotReader, Vector3PairFileReader referenceVectorReader, IVAS_DEC_HANDLE hIvasDec, int16_t *pcmBuf );
		static ivas_error decodeVoIP( DecArguments arg, BS_READER_HANDLE hBsReader, RotFileReader headRotReader, RotFileReader externalOrientationFileReader, RotFileReader refRotReader, Vector3PairFileReader referenceVectorReader, IVAS_DEC_HANDLE hIvasDec );
		#if 0
		void run_fft_unit_test( void );
		void run_mdct_unit_test( void );
		#endif


		/------------------------------------------------------------------------------------------
		* main()
		@@ -165,9 +162,6 @@ int main(
		RenderConfigReader *renderConfigReader = NULL;
		int16_t *pcmBuf = NULL;
		IVAS_RENDER_FRAMESIZE asked_frame_size;
		#if 0
		int16_t run_unit_tests = 0;
		#endif

		#ifdef WMOPS
		reset_wmops();
		@@ -180,16 +174,6 @@ int main(

		IVAS_DEC_PrintDisclaimer();

		#if 0
		if ( run_unit_tests )
		{
		run_fft_unit_test();
		run_mdct_unit_test();
		return 0;
		}

		#endif

		if ( !parseCmdlIVAS_dec( (int16_t) argc, argv, &arg ) )
		{
		/* Error printout done in parseCmdlIVAS_dec() */

apps/encoder.c

+0 −9

Original line number	Diff line number	Diff line
		@@ -371,21 +371,12 @@ int main(
		}
		break;
		case IVAS_ENC_INPUT_SBA:
		#if 0
		if ((error = IVAS_ENC_ConfigureForAmbisonics_fx(hIvasEnc, arg.inputFs, totalBitrate, arg.max_bwidth_user, bandwidth, arg.dtxConfig, arg.inputFormatConfig.sba.order, arg.inputFormatConfig.sba.isPlanar,
		arg.pca)) != IVAS_ERR_OK)
		{
		fprintf(stderr, "\nIVAS_ENC_ConfigureForAmbisonics failed: %s\n\n", IVAS_ENC_GetErrorMessage(error));
		goto cleanup;
		}
		#else
		if ( ( error = IVAS_ENC_ConfigureForAmbisonics( hIvasEnc, arg.inputFs, totalBitrate, arg.max_bwidth_user, bandwidth, arg.dtxConfig, arg.inputFormatConfig.sba.order, arg.inputFormatConfig.sba.isPlanar,
		arg.pca ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_ENC_ConfigureForAmbisonics failed: %s\n\n", IVAS_ENC_GetErrorMessage( error ) );
		goto cleanup;
		}
		#endif
		break;
		case IVAS_ENC_INPUT_MASA:
		if ( ( error = IVAS_ENC_ConfigureForMasa( hIvasEnc, arg.inputFs, totalBitrate, arg.max_bwidth_user, bandwidth, arg.dtxConfig, arg.inputFormatConfig.masaVariant ) ) != IVAS_ERR_OK )

lib_com/ACcontextMapping.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -39,6 +39,7 @@
		#include "cnst.h"
		#include "prot.h"
		#include "wmc_auto.h"
		#include "prot_fx.h"

		/-------------------------------------------------------------------
		* get_next_coeff_mapped_ivas()
		@@ -66,7 +67,7 @@ int16_t get_next_coeff_mapped_ivas(
		return hm_cfg->indexBuffer[*idx];
		}
		#else
		Word16 get_next_coeff_mapped_ivas(
		Word16 get_next_coeff_mapped_ivas_fx(
		Word16 ii[2], /* i/o: coefficient indexes Q0*/
		Word32 pp, / o : peak(1)/hole(0) indicator Q0*/
		Word16 idx, / o : index in unmapped domain Q0*/
		@@ -89,6 +90,7 @@ Word16 get_next_coeff_mapped_ivas(
		#endif


		#ifndef IVAS_FLOAT_FIXED
		/-------------------------------------------------------------------
		* get_next_coeff_unmapped_ivas()
		*
		@@ -106,7 +108,9 @@ int16_t get_next_coeff_unmapped_ivas(

		return *idx;
		}
		#endif

		#ifndef IVAS_FLOAT_FIXED
		/-------------------------------------------------------------------
		* update_mixed_context_ivas()
		*
		@@ -128,3 +132,4 @@ int32_t update_mixed_context_ivas(

		return ( ctx & 0xf ) * 16 + t + 13;
		}
		#endif

lib_com/ari.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -42,6 +42,7 @@
		#include "wmc_auto.h"


		#ifndef IVAS_FLOAT_FIXED
		/*---------------------------------------------------------------
		Ari 14 bits common routines
		-------------------------------------------------------------*/
		@@ -65,3 +66,4 @@ int32_t mul_sbc_14bits_ivas(

		/function in line/
		}
		#endif

lib_com/ari_hm.c

+10 −0

Original line number	Diff line number	Diff line
		@@ -50,6 +50,7 @@
		*
		-------------------------------------------------------------------/

		#ifndef IVAS_FLOAT_FIXED
		void UnmapIndex_ivas(
		const int16_t PeriodicityIndex,
		const int16_t Bandwidth,
		@@ -99,6 +100,7 @@ void UnmapIndex_ivas(

		return;
		}
		#endif

		void UnmapIndex_fx(
		const Word16 PeriodicityIndex, /* Q0 */
		@@ -167,6 +169,7 @@ void UnmapIndex_fx(
		}


		#ifndef IVAS_FLOAT_FIXED
		/-------------------------------------------------------------------
		* ConfigureContextHm_ivas()
		*
		@@ -241,6 +244,7 @@ void ConfigureContextHm_ivas(

		return;
		}
		#endif


		/-------------------------------------------------------------------
		@@ -249,6 +253,7 @@ void ConfigureContextHm_ivas(
		*
		-------------------------------------------------------------------/

		#ifndef IVAS_FLOAT_FIXED
		int16_t CountIndexBits_ivas(
		const int16_t Bandwidth,
		const int16_t PeriodicityIndex )
		@@ -261,6 +266,7 @@ int16_t CountIndexBits_ivas(

		return 8;
		}
		#endif

		Word16 CountIndexBits_fx(
		Word16 Bandwidth, /* Q0 */
		@@ -285,6 +291,7 @@ Word16 CountIndexBits_fx(

		#define WMC_TOOL_SKIP

		#ifndef IVAS_FLOAT_FIXED
		/-------------------------------------------------------------------
		* tcx_hm_render_ivas()
		*
		@@ -343,6 +350,7 @@ Word16 tcx_hm_render_ivas(

		return 0;
		}
		#endif

		Word32 tcx_hm_render_fx(
		const Word32 lag, /* i: pitch lag Q0 */
		@@ -400,6 +408,7 @@ Word32 tcx_hm_render_fx(
		return 0;
		}

		#ifndef IVAS_FLOAT_FIXED
		/-------------------------------------------------------------------
		* tcx_hm_modify_envelope_ivas()
		*
		@@ -446,6 +455,7 @@ void tcx_hm_modify_envelope_ivas(

		return;
		}
		#endif

		void tcx_hm_modify_envelope_fx(
		const Word16 gain, /* i: HM gain Q11 */