Commit b4f570ab authored Oct 10, 2022 by vaclav

Merge branch '71-get-rid-of-define-ivas_max_num_ch' into 'main'

Get rid of define IVAS_MAX_NUM_CH_rev2

See merge request !178

parents 7ae1c8fb a7147ee0

lib_com/ivas_cnst.h

+4 −2

Original line number	Diff line number	Diff line
		@@ -165,11 +165,13 @@ typedef enum
		#define HEAD_ROTATION_HOA_ORDER 3 /* HOA 3rd order */
		#define MAX_CICP_CHANNELS 16 /* max channels for loudspeaker layouts (16 for custom layouts)*/
		#define MAX_OUTPUT_CHANNELS 16 /* Maximum number of output channels (HOA 3rd order) */

		#define FOA_CHANNELS 4 /* number of FOA channels */
		#ifndef FIX_DIRAC_CHANNELS
		#define IVAS_MAX_NUM_CH 16 /* == MAX_OUTPUT_CHANNELS */
		#endif

		#define BINAURAL_CHANNELS 2 /* number of channels for binaural output configuration */
		#define CPE_CHANNELS 2 /* number of CPE (stereo) channels */
		#define FOA_CHANNELS 4 /* number of FOA channels */
		#define MAX_NUM_OBJECTS 4 /* max. number of audio objects */

		#define MAX_SCE MAX_NUM_OBJECTS /* max. number of SCEs */

lib_com/ivas_prot.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -3034,7 +3034,7 @@ void ivas_sba_config(
		int16_t nCPE, / o : number of CPEs */
		int16_t element_mode / o : element mode of the core coder */
		#ifndef HARMONIZE_SBA_NCHAN_TRANSPORT
		const SBA_MODE sba_mode /* i : SBA mode */
		,const SBA_MODE sba_mode /* i : SBA mode */
		#endif
		);