fix issue 911: resolve duplication of CRend binaural external renderer... (95803be3) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/options.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -155,6 +155,7 @@
		#define FIX_881_REMOVE_LFE_ADDITION_IN_ISM /* VA: issue 881: remove LFE addition in ISM format */
		#define FIX_887_ARRAY_SIZE_DFT_MDCT_STEREO /* VA: Fix the definition of buffers/arrays in DFT and MDCT stereo to satisfy gcc v 11.4.0 */
		#define FIX_891_PARAMUPMIX_CLEANUP /* Dlb: issue 891: remove unneeded code from ParamUpmix */
		#define FIX_911_REMOVE_CREND_DUPLICATION /* VA: issue 911: resolve duplication of CRend binaural external renderer function */

		/* #################### End BE switches ################################## */

lib_rend/ivas_crend.c

+50 −13

Original line number	Diff line number	Diff line
		@@ -1738,7 +1738,7 @@ static ivas_error ivas_rend_crendConvolver(
		return IVAS_ERR_OK;
		}


		#ifndef FIX_911_REMOVE_CREND_DUPLICATION
		/-----------------------------------------------------------------------------------------
		* Function ivas_rend_crendProcess()
		*
		@@ -1882,7 +1882,7 @@ ivas_error ivas_rend_crendProcess(
		pop_wmops();
		return IVAS_ERR_OK;
		}

		#endif

		/-----------------------------------------------------------------------------------------
		* Function ivas_rend_crendProcessSubframe()
		@@ -1963,6 +1963,10 @@ ivas_error ivas_rend_crendProcessSubframe(
		p_pcm_tmp[ch] = pcm_tmp[ch];
		}

		#ifdef FIX_911_REMOVE_CREND_DUPLICATION
		if ( hTcBuffer != NULL )
		{
		#endif
		slot_size = hTcBuffer->n_samples_granularity;

		/* loop for synthesis, assume we always have to render in multiples of 5ms subframes with spills */
		@@ -1975,10 +1979,27 @@ ivas_error ivas_rend_crendProcessSubframe(
		slots_to_render -= hTcBuffer->subframe_nbslots[last_sf];
		last_sf++;
		}
		#ifdef FIX_911_REMOVE_CREND_DUPLICATION
		subframe_len = -1; /* will be set later */
		}
		else
		{
		subframe_len = (int16_t) ( output_Fs / ( FRAMES_PER_SEC * MAX_PARAM_SPATIAL_SUBFRAMES ) );
		first_sf = 0;
		last_sf = n_samples_to_render / subframe_len;
		}
		#endif

		for ( subframe_idx = first_sf; subframe_idx < last_sf; subframe_idx++ )
		{
		#ifdef FIX_911_REMOVE_CREND_DUPLICATION
		if ( hTcBuffer != NULL )
		{
		#endif
		subframe_len = hTcBuffer->subframe_nbslots[subframe_idx] * hTcBuffer->n_samples_granularity;
		#ifdef FIX_911_REMOVE_CREND_DUPLICATION
		}
		#endif

		/* Early Reflections */
		if ( hCrend->reflections != NULL )
		@@ -2055,7 +2076,15 @@ ivas_error ivas_rend_crendProcessSubframe(
		{
		p_pcm_tmp[ch] += subframe_len;
		}

		#ifdef FIX_911_REMOVE_CREND_DUPLICATION
		if ( hTcBuffer != NULL )
		{
		#endif
		hTcBuffer->slots_rendered += hTcBuffer->subframe_nbslots[subframe_idx];
		#ifdef FIX_911_REMOVE_CREND_DUPLICATION
		}
		#endif
		}
		else
		{
		@@ -2074,7 +2103,15 @@ ivas_error ivas_rend_crendProcessSubframe(
		mvr2r( pcm_tmp[ch], output[ch], n_samples_to_render );
		}

		#ifdef FIX_911_REMOVE_CREND_DUPLICATION
		if ( hTcBuffer != NULL )
		{
		#endif
		hTcBuffer->subframes_rendered = last_sf;
		#ifdef FIX_911_REMOVE_CREND_DUPLICATION
		}
		#endif

		pop_wmops();

		return IVAS_ERR_OK;

lib_rend/ivas_prot_rend.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -933,6 +933,7 @@ ivas_error ivas_rend_initCrendWrapper(
		#endif
		);

		#ifndef FIX_911_REMOVE_CREND_DUPLICATION
		ivas_error ivas_rend_crendProcess(
		const CREND_WRAPPER *pCrend,
		const AUDIO_CONFIG inConfig,
		@@ -951,6 +952,7 @@ ivas_error ivas_rend_crendProcess(
		#endif
		);

		#endif
		ivas_error ivas_rend_crendProcessSubframe(
		const CREND_WRAPPER pCrend, / i/o: Crend wrapper handle */
		const AUDIO_CONFIG inConfig, /* i : input audio configuration */

lib_rend/lib_rend.c

+74 −2

Original line number	Diff line number	Diff line
		@@ -5548,13 +5548,23 @@ static ivas_error renderIsmToBinauralRoom(

		/* render 7_1_4 with BRIRs */
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		#ifdef FIX_911_REMOVE_CREND_DUPLICATION
		if ( ( error = ivas_rend_crendProcessSubframe( ismInput->crendWrapper, IVAS_AUDIO_CONFIG_7_1_4, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR, NULL, NULL,
		NULL, NULL, NULL, p_tmpRendBuffer, p_tmpRendBuffer, ismInput->base.inputBuffer.config.numSamplesPerChannel, *ismInput->base.ctx.pOutSampleRate, 0 ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = ivas_rend_crendProcess( ismInput->crendWrapper, IVAS_AUDIO_CONFIG_7_1_4, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR,
		NULL, NULL, NULL, NULL, p_tmpRendBuffer, *ismInput->base.ctx.pOutSampleRate,
		getNumSubframesInBuffer( &outAudio, *ismInput->base.ctx.pOutSampleRate ), 0 ) ) != IVAS_ERR_OK )
		#endif
		#else
		#ifdef FIX_911_REMOVE_CREND_DUPLICATION
		if ( ( error = ivas_rend_crendProcessSubframe( ismInput->crendWrapper, IVAS_AUDIO_CONFIG_7_1_4, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR, NULL, NULL,
		NULL, NULL, NULL, p_tmpRendBuffer, p_tmpRendBuffer, ismInput->base.inputBuffer.config.numSamplesPerChannel, *ismInput->base.ctx.pOutSampleRate ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = ivas_rend_crendProcess( ismInput->crendWrapper, IVAS_AUDIO_CONFIG_7_1_4, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR,
		NULL, NULL, NULL, NULL, p_tmpRendBuffer, *ismInput->base.ctx.pOutSampleRate,
		getNumSubframesInBuffer( &outAudio, *ismInput->base.ctx.pOutSampleRate ) ) ) != IVAS_ERR_OK )
		#endif

		#endif
		{
		@@ -6129,11 +6139,21 @@ static ivas_error renderMcToBinaural(

		/* call CREND */
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		#ifdef FIX_911_REMOVE_CREND_DUPLICATION
		if ( ( error = ivas_rend_crendProcessSubframe( mcInput->crendWrapper, mcInput->base.inConfig, outConfig, NULL, NULL,
		NULL, NULL, NULL, p_tmpRendBuffer, p_tmpRendBuffer, mcInput->base.inputBuffer.config.numSamplesPerChannel, *mcInput->base.ctx.pOutSampleRate, 0 ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = ivas_rend_crendProcess( mcInput->crendWrapper, mcInput->base.inConfig, outConfig, NULL, NULL, NULL, NULL, p_tmpRendBuffer, *mcInput->base.ctx.pOutSampleRate,
		getNumSubframesInBuffer( &outAudio, *mcInput->base.ctx.pOutSampleRate ), 0 ) ) != IVAS_ERR_OK )
		#endif
		#else
		#ifdef FIX_911_REMOVE_CREND_DUPLICATION
		if ( ( error = ivas_rend_crendProcessSubframe( mcInput->crendWrapper, mcInput->base.inConfig, outConfig, NULL, NULL,
		NULL, NULL, NULL, p_tmpRendBuffer, p_tmpRendBuffer, mcInput->base.inputBuffer.config.numSamplesPerChannel, *mcInput->base.ctx.pOutSampleRate ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = ivas_rend_crendProcess( mcInput->crendWrapper, mcInput->base.inConfig, outConfig, NULL, NULL, NULL, NULL, p_tmpRendBuffer, *mcInput->base.ctx.pOutSampleRate,
		getNumSubframesInBuffer( &outAudio, *mcInput->base.ctx.pOutSampleRate ) ) ) != IVAS_ERR_OK )
		#endif
		#endif
		{
		return error;
		@@ -6234,11 +6254,21 @@ static ivas_error renderMcToBinauralRoom(

		/* call CREND */
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		#ifdef FIX_911_REMOVE_CREND_DUPLICATION
		if ( ( error = ivas_rend_crendProcessSubframe( mcInput->crendWrapper, mcInput->base.inConfig, outConfig, NULL, NULL,
		NULL, NULL, NULL, p_tmpRendBuffer, p_tmpRendBuffer, mcInput->base.inputBuffer.config.numSamplesPerChannel, *mcInput->base.ctx.pOutSampleRate, 0 ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = ivas_rend_crendProcess( mcInput->crendWrapper, mcInput->base.inConfig, outConfig, NULL, NULL, NULL, NULL, p_tmpRendBuffer, *mcInput->base.ctx.pOutSampleRate,
		getNumSubframesInBuffer( &outAudio, *mcInput->base.ctx.pOutSampleRate ), 0 ) ) != IVAS_ERR_OK )
		#endif
		#else
		#ifdef FIX_911_REMOVE_CREND_DUPLICATION
		if ( ( error = ivas_rend_crendProcessSubframe( mcInput->crendWrapper, mcInput->base.inConfig, outConfig, NULL, NULL,
		NULL, NULL, NULL, p_tmpRendBuffer, p_tmpRendBuffer, mcInput->base.inputBuffer.config.numSamplesPerChannel, *mcInput->base.ctx.pOutSampleRate ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = ivas_rend_crendProcess( mcInput->crendWrapper, mcInput->base.inConfig, outConfig, NULL, NULL, NULL, NULL, p_tmpRendBuffer, *mcInput->base.ctx.pOutSampleRate,
		getNumSubframesInBuffer( &outAudio, *mcInput->base.ctx.pOutSampleRate ) ) ) != IVAS_ERR_OK )
		#endif
		#endif
		{
		return error;
		@@ -6340,11 +6370,21 @@ static ivas_error renderMcCustomLsToBinauralRoom(

		/* call CREND */
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		#ifdef FIX_911_REMOVE_CREND_DUPLICATION
		if ( ( error = ivas_rend_crendProcessSubframe( mcInput->crendWrapper, IVAS_AUDIO_CONFIG_7_1_4, outConfig, NULL, NULL,
		NULL, NULL, NULL, p_tmpCrendBuffer, p_tmpCrendBuffer, mcInput->base.inputBuffer.config.numSamplesPerChannel, *mcInput->base.ctx.pOutSampleRate, 0 ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = ivas_rend_crendProcess( mcInput->crendWrapper, IVAS_AUDIO_CONFIG_7_1_4, outConfig, NULL, NULL, NULL, NULL,
		p_tmpCrendBuffer, mcInput->base.ctx.pOutSampleRate, getNumSubframesInBuffer( &outAudio, mcInput->base.ctx.pOutSampleRate ), 0 ) ) != IVAS_ERR_OK )
		#endif
		#else
		#ifdef FIX_911_REMOVE_CREND_DUPLICATION
		if ( ( error = ivas_rend_crendProcessSubframe( mcInput->crendWrapper, IVAS_AUDIO_CONFIG_7_1_4, outConfig, NULL, NULL,
		NULL, NULL, NULL, p_tmpCrendBuffer, p_tmpCrendBuffer, mcInput->base.inputBuffer.config.numSamplesPerChannel, *mcInput->base.ctx.pOutSampleRate ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = ivas_rend_crendProcess( mcInput->crendWrapper, IVAS_AUDIO_CONFIG_7_1_4, outConfig, NULL, NULL, NULL, NULL,
		p_tmpCrendBuffer, mcInput->base.ctx.pOutSampleRate, getNumSubframesInBuffer( &outAudio, mcInput->base.ctx.pOutSampleRate ) ) ) != IVAS_ERR_OK )
		#endif
		#endif
		{
		return error;
		@@ -6553,7 +6593,12 @@ static ivas_error renderMcToSplitBinaural(
		copyBufferTo2dArray( tmpRotBuffer, tmpRendBuffer );

		/* call CREND (rotation already performed) */
		#ifdef FIX_911_REMOVE_CREND_DUPLICATION
		if ( ( error = ivas_rend_crendProcessSubframe( mcInput->crendWrapper, mcInput->base.inConfig, outConfig, NULL, NULL,
		NULL, NULL, NULL, p_tmpRendBuffer, p_tmpRendBuffer, mcInput->base.inputBuffer.config.numSamplesPerChannel, *mcInput->base.ctx.pOutSampleRate, pos_idx ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = ivas_rend_crendProcess( mcInput->crendWrapper, mcInput->base.inConfig, outConfig, NULL, NULL, NULL, NULL, p_tmpRendBuffer, mcInput->base.ctx.pOutSampleRate, getNumSubframesInBuffer( &mcInput->base.inputBuffer, mcInput->base.ctx.pOutSampleRate ), pos_idx ) ) != IVAS_ERR_OK )
		#endif
		{
		return error;
		}
		@@ -7098,8 +7143,13 @@ static ivas_error renderSbaToMultiBinaural(
		assert( sbaInput->crendWrapper->hCrend[0]->hReverb == NULL );

		/* call CREND */
		#ifdef FIX_911_REMOVE_CREND_DUPLICATION
		if ( ( error = ivas_rend_crendProcessSubframe( sbaInput->crendWrapper, sbaInput->base.inConfig, outConfig, NULL, NULL,
		NULL, NULL, NULL, p_tmpCrendBuffer, p_tmpCrendBuffer, sbaInput->base.inputBuffer.config.numSamplesPerChannel, *sbaInput->base.ctx.pOutSampleRate, pos_idx ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = ivas_rend_crendProcess( sbaInput->crendWrapper, sbaInput->base.inConfig, outConfig, NULL, NULL, NULL, NULL, p_tmpCrendBuffer, *sbaInput->base.ctx.pOutSampleRate,
		getNumSubframesInBuffer( &sbaInput->base.inputBuffer, *sbaInput->base.ctx.pOutSampleRate ), pos_idx ) ) != IVAS_ERR_OK )
		#endif
		{
		return error;
		}
		@@ -7266,11 +7316,21 @@ static ivas_error renderSbaToBinaural(

		/* call CREND */
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		#ifdef FIX_911_REMOVE_CREND_DUPLICATION
		if ( ( error = ivas_rend_crendProcessSubframe( sbaInput->crendWrapper, sbaInput->base.inConfig, outConfig, NULL, NULL,
		NULL, NULL, NULL, p_tmpCrendBuffer, p_tmpCrendBuffer, sbaInput->base.inputBuffer.config.numSamplesPerChannel, *sbaInput->base.ctx.pOutSampleRate, 0 ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = ivas_rend_crendProcess( sbaInput->crendWrapper, sbaInput->base.inConfig, outConfig, NULL, NULL, NULL, NULL, p_tmpCrendBuffer, *sbaInput->base.ctx.pOutSampleRate,
		getNumSubframesInBuffer( &outAudio, *sbaInput->base.ctx.pOutSampleRate ), 0 ) ) != IVAS_ERR_OK )
		#endif
		#else
		#ifdef FIX_911_REMOVE_CREND_DUPLICATION
		if ( ( error = ivas_rend_crendProcessSubframe( sbaInput->crendWrapper, sbaInput->base.inConfig, outConfig, NULL, NULL,
		NULL, NULL, NULL, p_tmpCrendBuffer, p_tmpCrendBuffer, sbaInput->base.inputBuffer.config.numSamplesPerChannel, *sbaInput->base.ctx.pOutSampleRate ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = ivas_rend_crendProcess( sbaInput->crendWrapper, sbaInput->base.inConfig, outConfig, NULL, NULL, NULL, NULL, p_tmpCrendBuffer, *sbaInput->base.ctx.pOutSampleRate,
		getNumSubframesInBuffer( &outAudio, *sbaInput->base.ctx.pOutSampleRate ) ) ) != IVAS_ERR_OK )
		#endif
		#endif
		{
		return error;
		@@ -7366,12 +7426,24 @@ static ivas_error renderSbaToBinauralRoom(
		copyBufferTo2dArray( tmpMcBuffer, tmpCrendBuffer );

		/* call CREND */
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		#ifdef FIX_911_REMOVE_CREND_DUPLICATION
		if ( ( error = ivas_rend_crendProcessSubframe( sbaInput->crendWrapper, IVAS_AUDIO_CONFIG_7_1_4, outConfig, NULL, NULL,
		NULL, NULL, NULL, p_tmpCrendBuffer, p_tmpCrendBuffer, sbaInput->base.inputBuffer.config.numSamplesPerChannel, *sbaInput->base.ctx.pOutSampleRate, 0 ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = ivas_rend_crendProcess( sbaInput->crendWrapper, IVAS_AUDIO_CONFIG_7_1_4, outConfig,
		NULL, NULL, NULL, NULL, p_tmpCrendBuffer, *sbaInput->base.ctx.pOutSampleRate,
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		getNumSubframesInBuffer( &outAudio, *sbaInput->base.ctx.pOutSampleRate ), 0 ) ) != IVAS_ERR_OK )
		#endif
		#else
		#ifdef FIX_911_REMOVE_CREND_DUPLICATION
		if ( ( error = ivas_rend_crendProcessSubframe( sbaInput->crendWrapper, IVAS_AUDIO_CONFIG_7_1_4, outConfig, NULL, NULL,
		NULL, NULL, NULL, p_tmpCrendBuffer, p_tmpCrendBuffer, sbaInput->base.inputBuffer.config.numSamplesPerChannel, *sbaInput->base.ctx.pOutSampleRate ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = ivas_rend_crendProcess( sbaInput->crendWrapper, IVAS_AUDIO_CONFIG_7_1_4, outConfig,
		NULL, NULL, NULL, NULL, p_tmpCrendBuffer, *sbaInput->base.ctx.pOutSampleRate,
		getNumSubframesInBuffer( &outAudio, *sbaInput->base.ctx.pOutSampleRate ) ) ) != IVAS_ERR_OK )
		#endif
		#endif
		{
		return error;

Admin message