Merge branch 'main' of forge.3gpp.org:ivas-codec-pc/ivas-codec into... (c72f3f0e) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/bitstream.c

+0 −176

Original line number	Diff line number	Diff line
		@@ -576,182 +576,6 @@ int16_t get_ivas_max_num_indices(
		return 2450;
		}

		/-----------------------------------------------------------------------
		* get_core_max_num_indices()
		*
		* Get the maximum allowed number of indices in the core coder
		-----------------------------------------------------------------------/

		/! r: maximum number of indices /
		int16_t get_core_max_num_indices(
		const int16_t core, /* i : core */
		const int32_t total_brate /* i : total bitrate */
		)
		{

		/* set the maximum number of indices in the core coder */
		if ( core == ACELP_CORE \|\| core == AMR_WB_CORE )
		{
		if ( total_brate <= 9600 )
		{
		return 60;
		}
		else if ( total_brate <= IVAS_13k2 )
		{
		return 70;
		}
		else if ( total_brate <= IVAS_16k4 )
		{
		return 80;
		}
		else if ( total_brate <= IVAS_24k4 )
		{
		return 100;
		}
		else if ( total_brate <= IVAS_32k )
		{
		return 180;
		}
		else if ( total_brate <= IVAS_48k )
		{
		return 340;
		}
		else if ( total_brate <= IVAS_80k )
		{
		return 450;
		}
		else if ( total_brate <= IVAS_96k )
		{
		return 500;
		}
		else if ( total_brate <= IVAS_128k )
		{
		return 550;
		}
		else if ( total_brate <= IVAS_160k )
		{
		return 600;
		}
		else if ( total_brate <= IVAS_192k )
		{
		return 650;
		}
		else if ( total_brate <= IVAS_256k )
		{
		return 700;
		}
		else
		{
		return 800;
		}
		}
		else if ( core == TCX_20_CORE \|\| core == TCX_10_CORE )
		{
		if ( total_brate <= 9600 )
		{
		return 100;
		}
		else if ( total_brate <= IVAS_13k2 )
		{
		return 150;
		}
		else if ( total_brate <= IVAS_16k4 )
		{
		return 200;
		}
		else if ( total_brate <= IVAS_24k4 )
		{
		return 310;
		}
		else if ( total_brate <= IVAS_32k )
		{
		return 330;
		}
		else if ( total_brate <= IVAS_48k )
		{
		return 340;
		}
		else if ( total_brate <= IVAS_80k )
		{
		return 380;
		}
		else if ( total_brate <= IVAS_96k )
		{
		return 400;
		}
		else if ( total_brate <= IVAS_128k )
		{
		return 460;
		}
		else if ( total_brate <= IVAS_160k )
		{
		return 470;
		}
		else if ( total_brate <= IVAS_192k )
		{
		return 570;
		}
		else if ( total_brate <= IVAS_256k )
		{
		return 680;
		}
		else
		{
		return 800;
		}
		}
		else if ( core == HQ_CORE )
		{
		if ( total_brate <= 9600 )
		{
		return 100;
		}
		else if ( total_brate <= IVAS_16k4 )
		{
		return 200;
		}
		else if ( total_brate <= IVAS_24k4 )
		{
		return 240;
		}
		else if ( total_brate <= IVAS_32k )
		{
		return 300;
		}
		else if ( total_brate <= IVAS_48k )
		{
		return 380;
		}
		else if ( total_brate <= IVAS_96k )
		{
		return 400;
		}
		else if ( total_brate <= IVAS_128k )
		{
		return 450;
		}
		else if ( total_brate <= IVAS_160k )
		{
		return 550;
		}
		else if ( total_brate <= IVAS_192k )
		{
		return 600;
		}
		else if ( total_brate <= IVAS_256k )
		{
		return 700;
		}
		else
		{
		return 800;
		}
		}
		else
		{
		return 50;
		}
		}

		/-----------------------------------------------------------------------
		* get_BWE_max_num_indices()

lib_com/ivas_dirac_com.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -325,7 +325,7 @@ void ivas_dirac_config_bands(
		}

		/-------------------------------------------------------------------
		* ivas_sba_get_max_md_bits()
		* ivas_get_dirac_sba_max_md_bits()
		*
		* Return maximum SBA DirAC metadata bit-budget and nominal bit-budget
		-------------------------------------------------------------------/

lib_com/ivas_prot.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -5381,6 +5381,7 @@ ivas_error ivas_allocate_binaural_hrtf(
		const int16_t allocate_init_flag /* i : Memory allocation flag */
		);

		#ifdef DEBUGGING
		void ivas_binaural_cldfb(
		Decoder_Struct st_ivas, / i/o: IVAS decoder structure */
		float output_f[] / i/o: synthesized core-coder transport channels/DirAC output */
		@@ -5392,6 +5393,7 @@ void ivas_binaural_cldfb_sf(
		const int16_t slot_size, /* i : JBM slot size */
		float output_f[] / i/o: synthesized core-coder transport channels/DirAC output */
		);
		#endif

		void ivas_binRenderer(
		BINAURAL_RENDERER_HANDLE hBinRenderer, /* i/o: binaural renderer handle */

lib_com/options.h

100644 → 100755

+3 −0

Original line number	Diff line number	Diff line
		@@ -155,6 +155,7 @@
		#define SBA_AND_OBJECTS
		#ifdef SBA_AND_OBJECTS
		#define OSBA_BR_SWITCHING
		#define FIX_691_OSBA_NULL_META /* FhG: Issue 691: Fix crashes for OSBA with NULL metadata */
		#endif

		/#define SPLIT_REND_WITH_HEAD_ROT/ /* Dlb,FhG: Split Rendering contributions 21 and 35 */
		@@ -171,6 +172,8 @@
		#define FIX_691_OSBA_CRASH /* FhG: Fix for issue 691: Crash for OSBA Stereo out */
		#define FIX_694_OMASA_EXTREME /* Nokia: fix for crash in OMASA on extreme sample */
		#define FIX_679_JBM_MC2SBA /* FhG: fix issue 679: check for transport vs. internal channel count in JBM prior to ivas_mc2sba() */
		#define FIX_591_PARAMISM_JBM_ENER_CORRECTION /* FhG: fix energy correction in ParamISM rendering */
		#define FIX_551_HEADTRACKER_INIT /* FhG: move setting of orientation tracking type to earlier */

		#define FIX_LARGE_RENDERER_DELAY_COMP /* Fix renderer delay compensation with delays greater than 1 frame */

lib_com/prot.h

+0 −6

Original line number	Diff line number	Diff line
		@@ -521,12 +521,6 @@ int16_t get_ivas_max_num_indices(
		const int32_t ivas_total_brate /* i : IVAS total bitrate */
		);

		/! r: maximum number of indices /
		int16_t get_core_max_num_indices(
		const int16_t core, /* i : core */
		const int32_t total_brate /* i : total bitrate */
		);

		/! r: maximum number of indices /
		int16_t get_BWE_max_num_indices(
		const int32_t extl_brate /* i : extensiona layer bitrate */