[cleanup] accept EXT_RENDERER (d04fc2ae) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/renderer.c

+0 −12

Original line number	Diff line number	Diff line
		@@ -62,7 +62,6 @@
		#include <stdio.h>
		#include <string.h>

		#ifdef EXT_RENDERER
		#ifndef count_malloc
		#ifdef RAM_COUNTING_TOOL
		#define count_malloc( n1 ) MALLOC_FCT_CALL( n1 )
		@@ -2476,14 +2475,3 @@ static void convertOutputBuffer(

		return;
		}
		#else
		int main(
		int argc,
		char **argv )
		{
		(void) argc;
		(void) argv;
		fprintf( stderr, "Enable EXT_RENDERER in options.h to use the external renderer.\n" );
		return 0;
		}
		#endif

lib_com/common_api_types.h

+0 −6

Original line number	Diff line number	Diff line
		@@ -47,9 +47,7 @@
		#define IVAS_MAX_NUM_OBJECTS 4
		#define IVAS_MAX_OUTPUT_CHANNELS 16
		#define IVAS_CLDFB_NO_CHANNELS_MAX ( 60 )
		#ifdef EXT_RENDERER
		#define IVAS_MAX_INPUT_LFE_CHANNELS 4
		#endif

		/----------------------------------------------------------------------------------
		* Common API structures
		@@ -79,11 +77,7 @@ typedef struct _IVAS_ISM_METADATA
		float gainFactor;
		} IVAS_ISM_METADATA;

		#ifdef EXT_RENDERER
		typedef struct
		#else
		typedef struct _IVAS_QUATERNION
		#endif
		{
		float w, x, y, z;

lib_com/ivas_cnst.h

+0 −10

Original line number	Diff line number	Diff line
		@@ -107,10 +107,8 @@ typedef enum
		AUDIO_CONFIG_ISM2, /* ISM2 */
		AUDIO_CONFIG_ISM3, /* ISM3 */
		AUDIO_CONFIG_ISM4, /* ISM4 */
		#ifdef EXT_RENDERER /* TODO tmu : temporary, or use something like IVAS_ENC input format */
		AUDIO_CONFIG_MASA1, /* MASA1 */
		AUDIO_CONFIG_MASA2, /* MASA2 */
		#endif
		AUDIO_CONFIG_EXTERNAL /* external renderer */

		} AUDIO_CONFIG;
		@@ -193,10 +191,8 @@ typedef enum

		#define IVAS_MAX_SBA_ORDER 3 /* Maximum supported Ambisonics order */

		#ifdef EXT_RENDERER
		#define IVAS_LIMITER_THRESHOLD 32729 /* -0.01 dBFS */
		#define IVAS_LIMITER_ATTACK_SECONDS 0.005f
		#endif
		#define IVAS_NUM_SUPPORTED_FS 3 /* number of supported sampling-rates in IVAS */

		/----------------------------------------------------------------------------------
		@@ -1374,21 +1370,15 @@ typedef enum

		#define BINAURAL_COHERENCE_DIFFERENCE_BINS 9 /* Number of bins for direction-dependent diffuse-field binaural coherence */

		#ifdef EXT_RENDERER
		#define HEADROT_ORDER 3
		#define HEADROT_SHMAT_DIM ( ( HEADROT_ORDER + 1 ) * ( HEADROT_ORDER + 1 ) )
		#define HEADROT_SHMAT_DIM2 ( HEADROT_SHMAT_DIM * HEADROT_SHMAT_DIM )
		#endif

		/----------------------------------------------------------------------------------
		* TD Binaural Object renderer
		----------------------------------------------------------------------------------/

		#ifdef EXT_RENDERER
		#define MAX_NUM_TDREND_CHANNELS 16 /* max. number of channels in TD renderer (objects or loudspeaker channels) */
		#else
		#define MAX_NUM_TDREND_CHANNELS 11 /* max. number of channels in TD renderer (objects or loudspeaker channels) */
		#endif

		#define SFX_SPAT_BIN_MAX_NO_OF_OUTPUT_SAMPLES 288 /* 288 = 6 msec @ 48 kHz. */
		#define HRTF_MODEL_N_SECTIONS 3 /* No. sections used in approximate evaluation of model */

lib_com/ivas_error.h

+0 −8

Original line number	Diff line number	Diff line
		@@ -59,11 +59,7 @@ typedef enum
		IVAS_ERR_INVALID_CICP_INDEX,
		IVAS_ERR_INVALID_BITRATE,
		IVAS_ERR_INVALID_MASA_CONFIG,
		#ifdef EXT_RENDERER
		IVAS_ERR_TOO_MANY_INPUTS,
		#else
		IVAS_ERR_TOO_MANY_OBJECT_INPUTS,
		#endif
		#ifdef NOKIA_MASA_EXTERNAL_RENDERER
		IVAS_ERR_MISSING_METADATA,
		#endif
		@@ -128,7 +124,6 @@ typedef enum
		IVAS_ERR_BITSTREAM_READER_INVALID_DATA,
		IVAS_ERR_BITSTREAM_READER_INVALID_FORMAT,

		#ifdef EXT_RENDERER
		/----------------------------------------
		* renderer (lib_rend only) *
		----------------------------------------/
		@@ -138,7 +133,6 @@ typedef enum
		IVAS_ERR_INVALID_INPUT_ID,
		IVAS_ERR_WRONG_NUM_CHANNELS,
		IVAS_ERR_INVALID_BUFFER_SIZE,
		#endif

		/----------------------------------------
		* unknown error *
		@@ -172,7 +166,6 @@ static inline const char *ivas_error_to_string( ivas_error error_code )
		return "Internal error";
		case IVAS_ERR_INTERNAL_FATAL:
		return "Internal fatal error";
		#ifdef EXT_RENDERER
		case IVAS_ERR_INVALID_SAMPLING_RATE:
		return "Invalid sampling rate";
		case IVAS_ERR_INVALID_OUTPUT_FORMAT:
		@@ -185,7 +178,6 @@ static inline const char *ivas_error_to_string( ivas_error error_code )
		return "Wrong number of channels";
		case IVAS_ERR_INVALID_BUFFER_SIZE:
		return "Invalid buffer size";
		#endif
		case IVAS_ERR_FAILED_FILE_OPEN:
		return "File open error";
		case IVAS_ERR_FAILED_FILE_WRITE:

lib_com/ivas_prot.h

+0 −22

Original line number	Diff line number	Diff line
		@@ -3181,7 +3181,6 @@ ivas_error ivas_sba_get_hoa_dec_matrix(
		const int16_t ambisonics_order /* i : Ambisonics order */
		);

		#ifdef EXT_RENDERER
		void ivas_sba_mtx_mult(
		float output_f[][L_FRAME48k], /* i/o: synthesized core-corder transport channels/DirAC output */
		const int16_t output_frame, /* i : frame length per channel */
		@@ -3189,7 +3188,6 @@ void ivas_sba_mtx_mult(
		const IVAS_OUTPUT_SETUP output_setup, /* i : Output configuration */
		const float mtx_hoa_decoder / o : HOA decoding matrix */
		);
		#endif

		/----------------------------------------------------------------------------------
		* DirAC prototypes
		@@ -4570,32 +4568,22 @@ void ivas_binaural_add_LFE(
		);

		void QuatToRotMat(
		#ifdef EXT_RENDERER
		const IVAS_QUATERNION quat, /* i : quaternion describing the rotation */
		#else
		const Quaternion quat, /* i : quaternion describing the rotation */
		#endif
		float Rmat[3][3] /* o : real-space rotation matrix for this rotation */
		);

		void Quat2Euler(
		#ifdef EXT_RENDERER
		const IVAS_QUATERNION quat, /* i : quaternion describing the rotation */
		#else
		const Quaternion quat, /* i : quaternion describing the rotation */
		#endif
		float yaw, / o : yaw */
		float pitch, / o : pitch */
		float roll / o : roll */
		);

		#ifdef EXT_RENDERER
		void SHrotmatgen(
		float SHrotmat[SBA_NHARM_HOA3][SBA_NHARM_HOA3], /* o : SHD rotation matrix */
		float Rmat[3][3], /* i : real-space rotation matrix */
		const int16_t order /* i : ambisonics order */
		);
		#endif

		void rotateAziEle(
		float azi_in, /* i : output elevation */
		@@ -4621,9 +4609,6 @@ ivas_error ivas_headTrack_open(
		void rotateFrame_shd(
		HEAD_TRACK_DATA_HANDLE hHeadTrackData, /* i : head track handle */
		float output[][L_FRAME48k], /* i/o: unrotated HOA3 signal buffer in TD */
		#ifndef EXT_RENDERER
		const int32_t output_Fs, /* i : output sampling frequency */
		#endif
		const int16_t subframe_len, /* i : subframe length per channel */
		const IVAS_OUTPUT_SETUP hTransSetup, /* i : format for rotation */
		const int16_t subframe_idx /* i : subframe index */
		@@ -4632,9 +4617,6 @@ void rotateFrame_shd(
		void rotateFrame_sd(
		HEAD_TRACK_DATA_HANDLE hHeadTrackData, /* i : head track handle */
		float output[][L_FRAME48k], /* i/o: unrotated SD signal buffer in TD */
		#ifndef EXT_RENDERER
		const int32_t output_Fs, /* i : output sampling frequency */
		#endif
		const int16_t subframe_len, /* i : subframe length per channel */
		const IVAS_OUTPUT_SETUP hTransSetup, /* i : format for rotation */
		const EFAP_HANDLE hEFAPdata, /* i : EFAP structure */
		@@ -4805,11 +4787,7 @@ ivas_error ivas_ls_custom_output_init(

		void ivas_ls_custom_setup(
		IVAS_OUTPUT_SETUP_HANDLE hOutSetup, /* o : IVAS output setup handle */
		#ifdef EXT_RENDERER
		const LSSETUP_CUSTOM_STRUCT hLsSetupCustom / i : Custom loudspeaker setup handle */
		#else
		const LSSETUP_CUSTOM_HANDLE hLsSetupCustom /* i : Custom loudspeaker setup handle */
		#endif
		);