add missing delay to ISMs for Ambisonics, LS and EXT output (2b5f2160) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_dec/ivas_dec.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -649,6 +649,7 @@ ivas_error ivas_dec(
		for ( n = 0; n < nchan_ism; n++ )
		{
		mvr2r( output[n], tmp_ism_out[n], output_frame );
		delay_signal( tmp_ism_out[n], output_frame, st_ivas->hMasaIsmData->delayBuffer[n], st_ivas->hMasaIsmData->delayBuffer_size );
		}

		ivas_ism2sba( p_tmp_ism_out, st_ivas->hIsmRendererData, st_ivas->hIsmMetaData, st_ivas->nchan_ism, output_frame, st_ivas->hIntSetup.ambisonics_order );
		@@ -677,6 +678,7 @@ ivas_error ivas_dec(
		for ( n = 0; n < nchan_ism; n++ )
		{
		mvr2r( output[n], tmp_ism_out[n], output_frame );
		delay_signal( tmp_ism_out[n], output_frame, st_ivas->hMasaIsmData->delayBuffer[n], st_ivas->hMasaIsmData->delayBuffer_size );
		}

		ivas_ism_render( st_ivas, p_tmp_ism_out, output_frame );
		@@ -693,6 +695,11 @@ ivas_error ivas_dec(
		else /HOA3 rendering for now/
		{
		#ifdef OSBA_EXT_OUT
		for ( n = 0; n < nchan_ism; n++ )
		{
		delay_signal( output[n], output_frame, st_ivas->hMasaIsmData->delayBuffer[n], st_ivas->hMasaIsmData->delayBuffer_size );
		}

		ivas_sba_upmixer_renderer( st_ivas, &output[st_ivas->nchan_ism], output_frame );
		#endif
		}

+5 −6

Original line number	Diff line number	Diff line
		@@ -1732,14 +1732,13 @@ ivas_error ivas_init_decoder(
		{
		return error;
		}

		}
		/* Allocate 'hIsmRendererData' handle and memory for delay buffer within 'hMasaIsmData' */
		if ( ( error = ivas_masa_ism_separate_object_renderer_open( st_ivas ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		}
		}
		#endif

		/-----------------------------------------------------------------