IVAS_MAX_INPUT_CHANNELS and IVAS_MAX_OUTPUT_CHANNELS are replaced by IVAS_MAX_CICP_CHANNELS (bda9b5b9) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/renderer.c

+10 −10

Original line number	Diff line number	Diff line
		@@ -663,8 +663,8 @@ int main(
		RotFileReader *headRotReader = NULL;
		RotFileReader *externalOrientationFileReader = NULL;
		RotFileReader *referenceRotReader = NULL;
		IVAS_CLDFB_FILTER_BANK_HANDLE cldfbAna[IVAS_MAX_INPUT_CHANNELS];
		IVAS_CLDFB_FILTER_BANK_HANDLE cldfbSyn[IVAS_MAX_INPUT_CHANNELS];
		IVAS_CLDFB_FILTER_BANK_HANDLE cldfbAna[RENDERER_MAX_INPUT_CHANNELS];
		IVAS_CLDFB_FILTER_BANK_HANDLE cldfbSyn[RENDERER_MAX_INPUT_CHANNELS];
		int16_t cldfb_in_flag, CLDFBframeSize_smpls;
		SplitRendBFIFileReader *splitRendBFIReader = NULL;
		Vector3PairFileReader *referenceVectorReader = NULL;
		@@ -3739,7 +3739,7 @@ static ivas_error parseLfePanMtxFile(
		{
		int16_t i, lfe_in, ch_out;
		const char *tok;
		char line[200]; /* > (10 chars * IVAS_MAX_OUTPUT_CHANNELS) i.e. "-999, " */
		char line[200]; /* > (10 chars * RENDERER_MAX_OUTPUT_CHANNELS) i.e. "-999, " */
		FILE *mtxFile;

		if ( strlen( lfeRoutingMatrixFilePath ) < 1 )
		@@ -3758,7 +3758,7 @@ static ivas_error parseLfePanMtxFile(
		any subsequent issue in file reading will gracefully exit the function */
		for ( lfe_in = 0; lfe_in < RENDERER_MAX_INPUT_LFE_CHANNELS; lfe_in++ )
		{
		for ( i = 0; i < IVAS_MAX_OUTPUT_CHANNELS; i++ )
		for ( i = 0; i < RENDERER_MAX_OUTPUT_CHANNELS; i++ )
		{
		( *lfePanMtx )[lfe_in][i] = 0.0f;
		}
		@@ -3786,7 +3786,7 @@ static ivas_error parseLfePanMtxFile(
		{
		continue;
		}
		if ( ch_out > IVAS_MAX_OUTPUT_CHANNELS )
		if ( ch_out > RENDERER_MAX_OUTPUT_CHANNELS )
		{
		break;
		}
		@@ -3827,13 +3827,13 @@ static void convertInputBuffer(
		if ( cldfb_in_flag )
		{
		int16_t slotIdx, numCldfbBands, numFloatPcmSamples;
		float fIn[IVAS_MAX_OUTPUT_CHANNELS][IVAS_MAX_FRAME_SIZE];
		float fIn[RENDERER_MAX_OUTPUT_CHANNELS][IVAS_MAX_FRAME_SIZE];

		numFloatPcmSamples = numFloatSamplesPerChannel >> 1;
		numCldfbBands = numFloatPcmSamples / IVAS_CLDFB_NO_COL_MAX;

		/* CLDFB Analysis*/
		assert( numIntSamplesPerChannel <= IVAS_MAX_OUTPUT_CHANNELS * IVAS_MAX_FRAME_SIZE );
		assert( numIntSamplesPerChannel <= RENDERER_MAX_OUTPUT_CHANNELS * IVAS_MAX_FRAME_SIZE );
		for ( smpl = 0; smpl < numFloatPcmSamples; ++smpl )
		{
		for ( chnl = 0; chnl < numChannels; ++chnl )
		@@ -3908,9 +3908,9 @@ static void convertOutputBuffer(
		if ( cldfb_in_flag )
		{
		int16_t slotIdx, numCldfbBands, numPcmSamples, b;
		float fIn[IVAS_MAX_OUTPUT_CHANNELS][IVAS_MAX_FRAME_SIZE];
		float re[IVAS_MAX_OUTPUT_CHANNELS][IVAS_CLDFB_NO_COL_MAX][IVAS_CLDFB_NO_CHANNELS_MAX];
		float im[IVAS_MAX_OUTPUT_CHANNELS][IVAS_CLDFB_NO_COL_MAX][IVAS_CLDFB_NO_CHANNELS_MAX];
		float fIn[RENDERER_MAX_OUTPUT_CHANNELS][IVAS_MAX_FRAME_SIZE];
		float re[RENDERER_MAX_OUTPUT_CHANNELS][IVAS_CLDFB_NO_COL_MAX][IVAS_CLDFB_NO_CHANNELS_MAX];
		float im[RENDERER_MAX_OUTPUT_CHANNELS][IVAS_CLDFB_NO_COL_MAX][IVAS_CLDFB_NO_CHANNELS_MAX];

		numPcmSamples = numSamplesPerChannel >> 1;
		numCldfbBands = numPcmSamples / IVAS_CLDFB_NO_COL_MAX;

lib_com/common_api_types.h

+4 −5

Original line number	Diff line number	Diff line
		@@ -50,8 +50,7 @@
		#define IVAS_MAX_BITS_PER_FRAME ( 512000 / IVAS_NUM_FRAMES_PER_SEC ) /* maximum bits per frame; corresponds to maximum bitrate of 512 kbps */

		#define IVAS_MAX_NUM_OBJECTS 4
		#define IVAS_MAX_INPUT_CHANNELS 16
		#define IVAS_MAX_OUTPUT_CHANNELS 16 /* Note: there is an exception for OSBA and EXT otuput where it can be 20 (HOA3 + 4 ISM channels) */
		#define IVAS_MAX_CICP_CHANNELS 16
		#define IVAS_CLDFB_NO_COL_MAX 16
		#define IVAS_CLDFB_NO_CHANNELS_MAX 60

		@@ -190,10 +189,10 @@ typedef struct ivas_LS_setup_custom IVAS_LSSETUP_CUSTOM_STRUCT;
		typedef struct _IVAS_LS_CUSTOM_LAYOUT
		{
		int16_t num_spk;
		float azimuth[IVAS_MAX_OUTPUT_CHANNELS];
		float elevation[IVAS_MAX_OUTPUT_CHANNELS];
		float azimuth[IVAS_MAX_CICP_CHANNELS];
		float elevation[IVAS_MAX_CICP_CHANNELS];
		int16_t num_lfe;
		int16_t lfe_idx[IVAS_MAX_OUTPUT_CHANNELS];
		int16_t lfe_idx[IVAS_MAX_CICP_CHANNELS];

		} IVAS_CUSTOM_LS_DATA;

lib_com/ivas_cnst.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -128,12 +128,12 @@ typedef enum
		* IVAS general constants
		----------------------------------------------------------------------------------/

		#define MAX_INPUT_CHANNELS 16 /* Maximum number of input channels (HOA 3rd order), == IVAS_MAX_INPUT_CHANNELS */
		#define MAX_INPUT_CHANNELS 16 /* Maximum number of input channels (HOA 3rd order or IVAS_MAX_CICP_CHANNELS) without separate objects in combined formats */
		#define MAX_TRANSPORT_CHANNELS 12 /* Maximum number of transport channels */
		#define MAX_INTERN_CHANNELS 16 /* Maximum number of intern channels (HOA 3rd order) */
		#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) without separate objects in combined formats */
		#define MAX_CICP_CHANNELS 16 /* max channels for loudspeaker layouts (16 for custom layouts), == IVAS_MAX_CICP_CHANNELS */
		#define MAX_OUTPUT_CHANNELS 16 /* Maximum number of output channels (HOA 3rd order or IVAS_MAX_CICP_CHANNELS) without separate objects in combined formats */
		#define MAX_OUTPUT_CHANNELS_IN_DIEGETIC_PAN 2 /* Maximum number of output channels with non diegetic panning */

		#define BINAURAL_CHANNELS 2 /* number of channels for binaural output configuration */

lib_dec/lib_dec.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2219,7 +2219,7 @@ static int16_t getOutputBufferSize(

		if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_EXTERNAL )
		{
		return (int16_t) ( st_ivas->hDecoderConfig->output_Fs * ( IVAS_MAX_OUTPUT_CHANNELS + IVAS_MAX_NUM_OBJECTS ) / FRAMES_PER_SEC );
		return (int16_t) ( st_ivas->hDecoderConfig->output_Fs * ( MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS ) / FRAMES_PER_SEC );
		}
		else if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_LS_CUSTOM )
		{

lib_rend/lib_rend.c

+14 −14

Original line number	Diff line number	Diff line
		@@ -1832,7 +1832,7 @@ static ivas_error updateLfePanGainsForAmbiOut(
		ivas_dirac_dec_get_response( (int16_t) inputMc->lfeRouting.lfeOutputAzimuth, (int16_t) inputMc->lfeRouting.lfeOutputElevation, inputMc->lfeRouting.lfePanMtx[i], outAmbiOrder );

		/* linear input gain */
		v_multc( inputMc->lfeRouting.lfePanMtx[i], inputMc->lfeRouting.lfeInputGain, inputMc->lfeRouting.lfePanMtx[i], IVAS_MAX_OUTPUT_CHANNELS );
		v_multc( inputMc->lfeRouting.lfePanMtx[i], inputMc->lfeRouting.lfeInputGain, inputMc->lfeRouting.lfePanMtx[i], RENDERER_MAX_OUTPUT_CHANNELS );
		}

		return error;
		@@ -2024,13 +2024,13 @@ static ivas_error updateMcPanGains(
		{
		for ( i = 0; i < inputMc->customLsInput.num_lfe; ++i )
		{
		mvr2r( inputMc->lfeRouting.lfePanMtx[i], inputMc->panGains[inputMc->customLsInput.lfe_idx[i]], IVAS_MAX_OUTPUT_CHANNELS );
		mvr2r( inputMc->lfeRouting.lfePanMtx[i], inputMc->panGains[inputMc->customLsInput.lfe_idx[i]], RENDERER_MAX_OUTPUT_CHANNELS );
		}
		}
		else
		{
		/* For code simplicity, always copy LFE gains. If config has no LFE, gains will be zero anyway. */
		mvr2r( inputMc->lfeRouting.lfePanMtx[0], inputMc->panGains[LFE_CHANNEL], IVAS_MAX_OUTPUT_CHANNELS );
		mvr2r( inputMc->lfeRouting.lfePanMtx[0], inputMc->panGains[LFE_CHANNEL], RENDERER_MAX_OUTPUT_CHANNELS );
		}

		return IVAS_ERR_OK;
		@@ -2211,7 +2211,7 @@ static lfe_routing defaultLfeRouting(

		for ( i = 0; i < RENDERER_MAX_INPUT_LFE_CHANNELS; ++i )
		{
		set_zero( routing.lfePanMtx[i], IVAS_MAX_OUTPUT_CHANNELS );
		set_zero( routing.lfePanMtx[i], RENDERER_MAX_OUTPUT_CHANNELS );
		}

		routing.pan_lfe = false;
		@@ -3667,7 +3667,7 @@ ivas_error IVAS_REND_SetInputLfeMtx(
		/* copy LFE panning matrix */
		for ( i = 0; i < RENDERER_MAX_INPUT_LFE_CHANNELS; i++ )
		{
		mvr2r( ( *lfePanMtx )[i], pInputMc->lfeRouting.lfePanMtx[i], IVAS_MAX_OUTPUT_CHANNELS );
		mvr2r( ( *lfePanMtx )[i], pInputMc->lfeRouting.lfePanMtx[i], RENDERER_MAX_OUTPUT_CHANNELS );
		}

		if ( ( error = updateMcPanGains( pInputMc, hIvasRend->outputConfig ) ) != IVAS_ERR_OK )
		@@ -7701,8 +7701,8 @@ void IVAS_REND_Close(
		-------------------------------------------------------------------/

		ivas_error IVAS_REND_openCldfb(
		IVAS_CLDFB_FILTER_BANK_HANDLE cldfbAna[IVAS_MAX_INPUT_CHANNELS],
		IVAS_CLDFB_FILTER_BANK_HANDLE cldfbSyn[IVAS_MAX_OUTPUT_CHANNELS],
		IVAS_CLDFB_FILTER_BANK_HANDLE cldfbAna[RENDERER_MAX_INPUT_CHANNELS],
		IVAS_CLDFB_FILTER_BANK_HANDLE cldfbSyn[RENDERER_MAX_OUTPUT_CHANNELS],
		const int16_t num_in_chs,
		const int16_t num_out_chs,
		const int32_t output_Fs )
		@@ -7717,7 +7717,7 @@ ivas_error IVAS_REND_openCldfb(
		return error;
		}
		}
		for ( ; n < IVAS_MAX_INPUT_CHANNELS; n++ )
		for ( ; n < RENDERER_MAX_INPUT_CHANNELS; n++ )
		{
		cldfbAna[n] = NULL;
		}
		@@ -7729,7 +7729,7 @@ ivas_error IVAS_REND_openCldfb(
		return error;
		}
		}
		for ( ; n < IVAS_MAX_OUTPUT_CHANNELS; n++ )
		for ( ; n < RENDERER_MAX_OUTPUT_CHANNELS; n++ )
		{
		cldfbSyn[n] = NULL;
		}
		@@ -7745,12 +7745,12 @@ ivas_error IVAS_REND_openCldfb(
		-------------------------------------------------------------------/

		void IVAS_REND_closeCldfb(
		IVAS_CLDFB_FILTER_BANK_HANDLE cldfbAna[IVAS_MAX_INPUT_CHANNELS],
		IVAS_CLDFB_FILTER_BANK_HANDLE cldfbSyn[IVAS_MAX_OUTPUT_CHANNELS] )
		IVAS_CLDFB_FILTER_BANK_HANDLE cldfbAna[RENDERER_MAX_INPUT_CHANNELS],
		IVAS_CLDFB_FILTER_BANK_HANDLE cldfbSyn[RENDERER_MAX_OUTPUT_CHANNELS] )
		{
		int16_t n;

		for ( n = 0; n < IVAS_MAX_INPUT_CHANNELS; n++ )
		for ( n = 0; n < RENDERER_MAX_INPUT_CHANNELS; n++ )
		{
		if ( cldfbAna[n] != NULL )
		{
		@@ -7759,7 +7759,7 @@ void IVAS_REND_closeCldfb(
		}
		}

		for ( n = 0; n < IVAS_MAX_OUTPUT_CHANNELS; n++ )
		for ( n = 0; n < RENDERER_MAX_OUTPUT_CHANNELS; n++ )
		{
		if ( cldfbSyn[n] != NULL )
		{