revision of includes in lib_rend (e252d752) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/decoder.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -50,6 +50,7 @@
		#endif
		#include "wmc_auto.h"
		#include "render_config_reader.h"
		#include "hrtf_file_reader.h"


		#define WMC_TOOL_SKIP

lib_com/ivas_prot.h

+1 −48

Original line number	Diff line number	Diff line
		@@ -681,33 +681,6 @@ MC_LS_SETUP ivas_mc_map_output_config_to_mc_ls_setup(
		const AUDIO_CONFIG output_config /* i : output audio configuration */
		);

		/! r: limiter struct handle /
		IVAS_LIMITER_HANDLE ivas_limiter_open(
		const int16_t num_channels, /* i : number of I/O channels */
		const int32_t sampling_rate /* i : sampling rate for processing */
		);

		void ivas_limiter_close(
		IVAS_LIMITER_HANDLE* phLimiter /* i/o: pointer to limiter handle, can be NULL */
		);

		void ivas_limiter_dec
		(
		IVAS_LIMITER_HANDLE hLimiter, /* i/o: limiter struct handle */
		float output[MAX_OUTPUT_CHANNELS][L_FRAME48k], /* i/o: input/output buffer */
		const int16_t num_channels, /* i : number of channels to be processed */
		const int16_t output_frame, /* i : number of samples per channel in the buffer */
		const int16_t BER_detect /* i : BER detect flag */
		);

		void limiter_process(
		IVAS_LIMITER_HANDLE hLimiter, /* i/o: limiter struct handle */
		const int16_t output_frame, /* i : number of samples to be processed per channel in the I/O buffer */
		const float threshold, /* i : signal amplitude above which limiting starts to be applied */
		const int16_t BER_detect, /* i : BER detect flag */
		int16_t strong_saturation_cnt / i/o: counter of strong saturations (can be NULL) */
		);

		void smooth_dft2td_transition(
		CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */
		float output[CPE_CHANNELS][L_FRAME48k], /* i/o: synthesis @external Fs */
		@@ -4588,7 +4561,7 @@ void ivas_ism2sba(


		/----------------------------------------------------------------------------------
		* Amplitude Panning (EFAP, VBAP) prototypes
		* Amplitude Panning VBAP prototypes
		----------------------------------------------------------------------------------/

		void panning_wrap_angles(
		@@ -4598,26 +4571,6 @@ void panning_wrap_angles(
		float ele_wrapped / o : wrapped elevation component */
		);

		ivas_error efap_init_data(
		EFAP_HANDLE hEFAPdata, / i/o: handle for EFAP data structure that will be initialized */
		const float speaker_node_azi_deg, / i : vector of speaker node azimuths (positive left) */
		const float speaker_node_ele_deg, / i : vector of speaker node elevations (positive up) */
		const int16_t num_speaker_nodes, /* i : number of speaker nodes in the set */
		const int16_t efap_mode /* i : indicates whether EFAP or EFIP is used */
		);

		void efap_free_data(
		EFAP_HANDLE hEFAPdata / i/o: EFAP handle to be freed */
		);

		void efap_determine_gains(
		EFAP_HANDLE hEFAPdata, /* i : EFAP structure */
		float gains, / o : gain vector for speaker nodes for given direction */
		const float azi_deg, /* i : azimuth in degrees for panning direction (positive left) */
		const float ele_deg, /* i : elevation in degrees for panning direction (positive up) */
		const int16_t efap_mode /* i : indicates whether EFAP or EFIP is used */
		);

		ivas_error vbap_init_data(
		VBAP_HANDLE hVBAPdata, / i/o: handle for VBAP data structure that will be initialized */
		const float speaker_node_azi_deg, / i : vector of speaker node azimuths (positive left) */

lib_dec/ivas_rom_dec.c

+0 −39

Original line number	Diff line number	Diff line
		@@ -513,43 +513,4 @@ const int16_t sba_map_tc[8] =
		};


		/----------------------------------------------------------------------------------
		* FASTCONV and PARAMETRIC binaural renderer ROM tables
		----------------------------------------------------------------------------------/

		const float surCohEne[MASA_NUM_DEFINED_SUR_SPR_COH_ENE_BINS] =
		{
		3.0903f, 2.0053f, 1.0860f, 0.8072f, 0.7079f
		};

		const float spreadCohEne05[MASA_NUM_DEFINED_SUR_SPR_COH_ENE_BINS] =
		{
		2.3988f, 1.7783f, 1.1220f, 1.1220f, 1.1220f
		};

		const float spreadCohEne1[MASA_NUM_DEFINED_SUR_SPR_COH_ENE_BINS] =
		{
		1.5975f, 1.1220f, 1.1220f, 1.1220f, 1.1220f
		};

		const float lowBitRateBinauralEQ[LOW_BIT_RATE_BINAURAL_EQ_BINS] =
		{
		0.979f, 0.893f, 0.762f, 0.615f, 0.52f, 0.48f, 0.477f, 0.477f, 0.48f, 0.501f, 0.546f, 0.602f, 0.652f, 0.664f, 0.652f, 0.639f, 0.635f
		};

		const float diffuseFieldCoherenceDifferenceX[BINAURAL_COHERENCE_DIFFERENCE_BINS] =
		{
		0.047421f, 0.19773f, 0.22582f, 0.10637f, 0.0087111f, 0.012028f, 0.031972f, 0.019668f, 0.0079928f
		};

		const float diffuseFieldCoherenceDifferenceY[BINAURAL_COHERENCE_DIFFERENCE_BINS] =
		{
		-0.095628f, -0.30569f, -0.34427f, -0.15425f, -0.044628f, -0.057224f, -0.050835f, -0.035214f, -0.02215f
		};

		const float diffuseFieldCoherenceDifferenceZ[BINAURAL_COHERENCE_DIFFERENCE_BINS] =
		{
		0.048207f, 0.10796f, 0.11845f, 0.047886f, 0.035917f, 0.045196f, 0.018863f, 0.015547f, 0.014157f
		};

		/* clang-format on */

lib_dec/ivas_rom_dec.h

+0 −18

Original line number	Diff line number	Diff line
		@@ -111,22 +111,4 @@ extern const float ap_split_frequencies[DIRAC_DECORR_NUM_SPLIT_BANDS + 1];
		extern const int16_t sba_map_tc[8];


		/----------------------------------------------------------------------------------
		* FASTCONV and PARAMETRIC binaural renderer ROM tables
		----------------------------------------------------------------------------------/

		/* These are equalization values for spread and surround coherent sounds, approximating the spectrum
		* for such sounds at anechoic multichannel listening. */
		extern const float surCohEne[MASA_NUM_DEFINED_SUR_SPR_COH_ENE_BINS];
		extern const float spreadCohEne05[MASA_NUM_DEFINED_SUR_SPR_COH_ENE_BINS];
		extern const float spreadCohEne1[MASA_NUM_DEFINED_SUR_SPR_COH_ENE_BINS];

		/* Values for low-bit-rate equalization */
		extern const float lowBitRateBinauralEQ[LOW_BIT_RATE_BINAURAL_EQ_BINS];

		/* Diffuse field binaural coherence directional adjustment values */
		extern const float diffuseFieldCoherenceDifferenceX[BINAURAL_COHERENCE_DIFFERENCE_BINS];
		extern const float diffuseFieldCoherenceDifferenceY[BINAURAL_COHERENCE_DIFFERENCE_BINS];
		extern const float diffuseFieldCoherenceDifferenceZ[BINAURAL_COHERENCE_DIFFERENCE_BINS];

		#endif

lib_dec/ivas_td_decorr.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -100,7 +100,7 @@ static ivas_error ivas_td_decorr_init( ivas_td_decorr_state_t *hTdDecorr, const
		*
		* Allocate and initialize SPAR time domain decorrelator handle
		------------------------------------------------------------------------/

		// VE2AT: this fucntion is used also in lib_rend...; where to put it?
		ivas_error ivas_spar_td_decorr_dec_open(
		ivas_td_decorr_state_t *hTdDecorr, / i/o: SPAR Covar. decoder handle */
		const int32_t output_Fs, /* i : output sampling rate */