[cleanup] accept FIX_473_JITTER_NONDIEGETIC_PANNING (4d65c1aa) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/options.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -153,7 +153,6 @@

		#define FIX_501_TABLE_IDX_INIT /* Dlb: Fix for the issue 501 */

		#define FIX_473_JITTER_NONDIEGETIC_PANNING /* FhG,Orange: add missing non-diegetic panning to JITTER */

		#define SBA_MODE_CLEAN_UP /* Dlb: Cean up SBA mode references */
		#define FIX_502_IND_LIST_SIZE /* Fix issue #502: insufficient index buffer sizes */

lib_dec/ivas_ism_renderer.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -259,11 +259,7 @@ void ivas_ism_render_sf(
		for ( i = 0; i < num_objects; i++ )
		{
		/* Head rotation: rotate the object positions depending the head's orientation */
		#ifdef FIX_473_JITTER_NONDIEGETIC_PANNING
		if ( st_ivas->hHeadTrackData != NULL && st_ivas->hHeadTrackData->num_quaternions >= 0 && !st_ivas->hIsmMetaData[i]->non_diegetic_flag )
		#else
		if ( st_ivas->hHeadTrackData != NULL && st_ivas->hHeadTrackData->num_quaternions >= 0 )
		#endif
		{
		rotateAziEle( st_ivas->hIsmMetaData[i]->azimuth, st_ivas->hIsmMetaData[i]->elevation, &azimuth, &elevation, Rmat, st_ivas->hIntSetup.is_planar_setup );
		if ( st_ivas->hEFAPdata != NULL )

lib_dec/ivas_jbm_dec.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -644,9 +644,7 @@ ivas_error ivas_jbm_dec_render(
		int16_t nchan_remapped;
		int32_t output_Fs;
		AUDIO_CONFIG output_config;
		#ifdef FIX_473_JITTER_NONDIEGETIC_PANNING
		float pan_left, pan_right;
		#endif
		int16_t nSamplesAskedLocal;
		ivas_error error;
		float *p_output[MAX_OUTPUT_CHANNELS];
		@@ -706,7 +704,6 @@ ivas_error ivas_jbm_dec_render(
		{
		ivas_dirac_dec_binaural_render( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, st_ivas->nchan_transport, p_output );
		}
		#ifdef FIX_473_JITTER_NONDIEGETIC_PANNING
		else if ( st_ivas->renderer_type == RENDERER_NON_DIEGETIC_DOWNMIX )
		{
		*nSamplesRendered = min( st_ivas->hTcBuffer->n_samples_available, nSamplesAskedLocal );
		@@ -715,7 +712,6 @@ ivas_error ivas_jbm_dec_render(
		v_multc( st_ivas->hTcBuffer->tc[0], pan_right, output[1], *nSamplesRendered );
		v_multc( st_ivas->hTcBuffer->tc[0], pan_left, output[0], *nSamplesRendered );
		}
		#endif
		else if ( st_ivas->renderer_type == RENDERER_PARAM_ISM \|\| st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC )
		{
		ivas_param_ism_dec_render( st_ivas, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, p_output );
		@@ -737,7 +733,6 @@ ivas_error ivas_jbm_dec_render(
		/* Convert to CICPxx; used also for ISM->CICP19->binaural_room rendering */
		ivas_ism_render_sf( st_ivas, p_output, *nSamplesRendered );
		}
		#ifdef FIX_473_JITTER_NONDIEGETIC_PANNING
		else if ( st_ivas->renderer_type == RENDERER_NON_DIEGETIC_DOWNMIX )
		{
		pan_left = ( st_ivas->hDecoderConfig->non_diegetic_pan_gain + 1.f ) * 0.5f;
		@@ -745,7 +740,6 @@ ivas_error ivas_jbm_dec_render(
		v_multc( st_ivas->hTcBuffer->tc[0], pan_right, output[1], *nSamplesRendered );
		v_multc( st_ivas->hTcBuffer->tc[0], pan_left, output[0], *nSamplesRendered );
		}
		#endif
		else if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC \|\| st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV )
		{
		/* Convert to Ambisonics; used also for ISM->HOA3->binaural rendering */
		@@ -1810,9 +1804,7 @@ TC_BUFFER_MODE ivas_jbm_dec_get_tc_buffer_mode(
		case RENDERER_PARAM_ISM:
		case RENDERER_BINAURAL_MIXER_CONV:
		case RENDERER_BINAURAL_MIXER_CONV_ROOM:
		#ifdef FIX_473_JITTER_NONDIEGETIC_PANNING
		case RENDERER_NON_DIEGETIC_DOWNMIX:
		#endif
		buffer_mode = TC_BUFFER_MODE_RENDERER;
		break;
		case RENDERER_MC_PARAMMC:

lib_dec/lib_dec.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -766,7 +766,6 @@ static ivas_error IVAS_DEC_Setup(

		if ( hIvasDec->mode == IVAS_DEC_MODE_EVS )
		{
		#ifdef FIX_473_JITTER_NONDIEGETIC_PANNING
		if ( hIvasDec->st_ivas->renderer_type == RENDERER_NON_DIEGETIC_DOWNMIX )
		{
		*nTransportChannels = MAX_OUTPUT_CHANNELS_IN_DIEGETIC_PAN;
		@@ -774,12 +773,9 @@ static ivas_error IVAS_DEC_Setup(
		}
		else
		{
		#endif
		*nTransportChannels = 1;
		*nOutChannels = 1;
		#ifdef FIX_473_JITTER_NONDIEGETIC_PANNING
		}
		#endif
		}
		else
		{
		@@ -2733,11 +2729,7 @@ static ivas_error evs_dec_main(
		if ( floatBuf != NULL )
		{
		/* BE workaround */
		#ifdef FIX_473_JITTER_NONDIEGETIC_PANNING
		int16_t pcm_buf_local[L_FRAME48k * MAX_OUTPUT_CHANNELS_IN_DIEGETIC_PAN];
		#else
		int16_t pcm_buf_local[L_FRAME48k];
		#endif

		/* convert 'float' output data to 'short' */
		#ifdef DEBUGGING