Merge branch 'main' into philips/contribution-38-control-metadata-reverb (eff664bf) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/core_com_config.c

+41 −0

Original line number	Diff line number	Diff line
		@@ -166,6 +166,10 @@ int16_t getTcxonly(
		const int16_t element_mode, /* i : IVAS element mode */
		const int32_t total_brate, /* i : total bitrate */
		const int16_t MCT_flag /* i : hMCT handle allocated (1) or not (0)*/
		#ifdef ISM_25k6_HZ_CORE
		,
		const int16_t is_ism_format
		#endif
		)
		{
		int16_t tcxonly = 0;
		@@ -179,6 +183,24 @@ int16_t getTcxonly(
		}
		break;
		case IVAS_SCE:
		#ifdef ISM_25k6_HZ_CORE
		if ( is_ism_format )
		{
		if ( total_brate > MAX_ACELP_BRATE_ISM )
		{
		tcxonly = 1;
		}
		}
		else
		{
		if ( total_brate > MAX_ACELP_BRATE )
		{
		tcxonly = 1;
		}
		}
		break;

		#endif
		case IVAS_CPE_DFT:
		case IVAS_CPE_TD:
		if ( total_brate > MAX_ACELP_BRATE )
		@@ -341,6 +363,10 @@ int32_t getCoreSamplerateMode2(
		const int16_t bwidth, /* i : audio bandwidth */
		const int16_t flag_ACELP16k, /* i : ACELP@16kHz flag */
		const int16_t rf_mode /* i : flag to signal the RF mode */
		#ifdef ISM_25k6_HZ_CORE
		,
		const IVAS_FORMAT is_ism_format /* i : flag indicating ISM format */
		#endif
		)
		{
		int32_t sr_core = 0;
		@@ -361,10 +387,25 @@ int32_t getCoreSamplerateMode2(
		{
		sr_core = INT_FS_16k;
		}
		#ifdef ISM_25k6_HZ_CORE
		else if ( ( bwidth == SWB \|\| bwidth == FB ) && total_brate <= MAX_ACELP_BRATE && element_mode == IVAS_SCE && !is_ism_format )
		{
		sr_core = INT_FS_16k;
		}
		else if ( ( bwidth == SWB \|\| bwidth == FB ) && total_brate <= MAX_ACELP_BRATE_ISM && element_mode == IVAS_SCE && is_ism_format )
		{
		sr_core = INT_FS_16k;
		}
		else if ( ( bwidth == SWB \|\| bwidth == FB ) && total_brate <= MAX_ACELP_BRATE && element_mode == IVAS_SCE && is_ism_format )
		{
		sr_core = 25600;
		}
		#else
		else if ( ( bwidth == SWB && total_brate <= MAX_ACELP_BRATE && element_mode == IVAS_SCE ) \|\| ( bwidth == FB && total_brate <= MAX_ACELP_BRATE && element_mode == IVAS_SCE ) )
		{
		sr_core = INT_FS_16k;
		}
		#endif
		else if ( ( ( bwidth == SWB \|\| bwidth == FB ) && element_mode == EVS_MONO && total_brate <= HQ_64k ) \|\| ( element_mode > IVAS_SCE && ( ( bwidth == SWB && total_brate <= IVAS_96k ) \|\| ( bwidth == FB && total_brate <= IVAS_96k ) ) ) )
		{
		sr_core = 25600;

lib_com/ivas_cnst.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -290,6 +290,9 @@ typedef enum
		#define MAX_VOICED_BRATE ACELP_13k20 /* max. per channel bitrate where VOICED is supported */
		#define MIN_TC_BRATE 6450 /* min. per channel bitrate where TRANSITION is supported */
		#define MAX_ACELP_BRATE 48000 /* max. per channel bitrate where ACELP core is supported */
		#ifdef ISM_25k6_HZ_CORE
		#define MAX_ACELP_BRATE_ISM 40000 /* max. per channel bitrate where ACELP core is supported in ISM format */
		#endif

		#define ACELP_12k8_HIGH_LIMIT 24350 /* max. per channel bitrate where the ACELP@12.8kHz is supported */
		#define ACELP_16k_LOW_LIMIT 13250 /* min. per channel bitrate where the ACELP@16kHz is supported */

lib_com/ivas_prot.h

+185 −184

Original line number	Diff line number	Diff line
		@@ -5159,10 +5159,11 @@ void ivas_binaural_cldfb_sf(
		#endif
		void ivas_binRenderer(
		BINAURAL_RENDERER_HANDLE hBinRenderer, /* i/o: fastconv binaural renderer handle */
		HEAD_TRACK_DATA_HANDLE hHeadTrackData, /* i/o: head track handle */
		#ifdef EXTERNAL_ORIENTATIONS
		COMBINED_ORIENTATION_HANDLE hCombinedOrientationData, /* i : combined head and external orientation handle */
		int16_t subframe_idx, /* i : subframe index */
		#else
		HEAD_TRACK_DATA_HANDLE hHeadTrackData, /* i/o: head track handle */
		#endif
		const int16_t numTimeSlots, /* i: : number of time slots to process */
		float Cldfb_RealBuffer_Binaural[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX], /* o : Binaural signals */

lib_com/options.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -179,8 +179,12 @@
		#define FIX_395_CNG_BW /* Eri: Issue 395 - CNG bandwidth issue for unified stereo */

		#define EXTERNAL_ORIENTATIONS /* Nokia: Contribution 41: (external) orientation information handling */
		#define FIX_541_EXT_REND_MASA_ROTATIONS /* Nokia: Issue 541, rotations missing in masa external renderer */

		#define MASA_PREREND /* Nokia: Contribution 42: Support for IVAS_rend to merge MASA + other format to MASA */
		#define ISM_25k6_HZ_CORE /* VA: issue 540: 1ISM 48 kbps - change ACELP/TCX 16 kHz core to TCX only 25.6 kHz core */



		#define FIX_528_ISM_MD_FILE_TOO_SHORT /* VA: issue 528: ISM Metadata file too short */

lib_com/prot.h

+8 −0

Original line number	Diff line number	Diff line
		@@ -9766,6 +9766,10 @@ int16_t getTcxonly(
		const int16_t element_mode, /* i : IVAS element mode */
		const int32_t total_brate, /* i : total bitrate */
		const int16_t MCT_flag /* i : hMCT handle allocated (1) or not (0)*/
		#ifdef ISM_25k6_HZ_CORE
		,
		const int16_t is_ism_format
		#endif
		);

		int16_t getTnsAllowed(
		@@ -9803,6 +9807,10 @@ int32_t getCoreSamplerateMode2(
		const int16_t bwidth, /* i : audio bandwidth */
		const int16_t flag_ACELP16k, /* i : ACELP@16kHz flag */
		const int16_t rf_mode /* i : flag to signal the RF mode */
		#ifdef ISM_25k6_HZ_CORE
		,
		const IVAS_FORMAT is_ism_format /* i : flag indicating ISM format */
		#endif
		);

		float getTcxBandwidth(