bugs fixed in renderer configuration (66bc1a91) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_dec/ivas_binRenderer_internal.c

+8 −4

Original line number	Diff line number	Diff line
		@@ -350,17 +350,14 @@ static ivas_error ivas_binRenderer_convModuleOpen(
		}
		else
		{
		#ifdef UPDATE_SBA_FILTER
		#ifdef UPDATE_SBA_FILTER
		if ( input_config == AUDIO_CONFIG_HOA3 )
		{
		#endif
		/* HOA3 filter coefficients */
		hBinRenConvModule->filterTapsLeftReal[bandIdx][chIdx] = hHrtf->leftHRIRReal_HOA3[bandIdx][chIdx];
		hBinRenConvModule->filterTapsLeftImag[bandIdx][chIdx] = hHrtf->leftHRIRImag_HOA3[bandIdx][chIdx];
		hBinRenConvModule->filterTapsRightReal[bandIdx][chIdx] = hHrtf->rightHRIRReal_HOA3[bandIdx][chIdx];
		hBinRenConvModule->filterTapsRightImag[bandIdx][chIdx] = hHrtf->rightHRIRImag_HOA3[bandIdx][chIdx];
		#ifdef UPDATE_SBA_FILTER
		}
		else if ( input_config == AUDIO_CONFIG_HOA2 )
		{
		@@ -382,7 +379,6 @@ static ivas_error ivas_binRenderer_convModuleOpen(
		{
		return IVAS_ERR_INVALID_INPUT_FORMAT;
		}
		#endif
		#else
		/* HOA3 filter coefficients */
		hBinRenConvModule->filterTapsLeftReal[bandIdx][chIdx] = hHrtf->leftHRIRReal_HOA3[bandIdx][chIdx];
		@@ -464,6 +460,14 @@ static ivas_error ivas_binaural_hrtf_open(
		mvr2r( leftHRIRImag_HOA3[i][j], HrtfFastConv->leftHRIRImag_HOA3[i][j], BINAURAL_NTAPS );
		mvr2r( rightHRIRReal_HOA3[i][j], HrtfFastConv->rightHRIRReal_HOA3[i][j], BINAURAL_NTAPS );
		mvr2r( rightHRIRImag_HOA3[i][j], HrtfFastConv->rightHRIRImag_HOA3[i][j], BINAURAL_NTAPS );
		mvr2r( leftHRIRReal_HOA2[i][j], HrtfFastConv->leftHRIRReal_HOA2[i][j], BINAURAL_NTAPS );
		mvr2r( leftHRIRImag_HOA2[i][j], HrtfFastConv->leftHRIRImag_HOA2[i][j], BINAURAL_NTAPS );
		mvr2r( rightHRIRReal_HOA2[i][j], HrtfFastConv->rightHRIRReal_HOA2[i][j], BINAURAL_NTAPS );
		mvr2r( rightHRIRImag_HOA2[i][j], HrtfFastConv->rightHRIRImag_HOA2[i][j], BINAURAL_NTAPS );
		mvr2r( leftHRIRReal_FOA[i][j], HrtfFastConv->leftHRIRReal_FOA[i][j], BINAURAL_NTAPS );
		mvr2r( leftHRIRImag_FOA[i][j], HrtfFastConv->leftHRIRImag_FOA[i][j], BINAURAL_NTAPS );
		mvr2r( rightHRIRReal_FOA[i][j], HrtfFastConv->rightHRIRReal_FOA[i][j], BINAURAL_NTAPS );
		mvr2r( rightHRIRImag_FOA[i][j], HrtfFastConv->rightHRIRImag_FOA[i][j], BINAURAL_NTAPS );
		#else
		mvr2r( leftHRIRReal_HOA3[i][j], HrtfFastConv->leftHRIRReal_HOA3[i][j], 7 );
		mvr2r( leftHRIRImag_HOA3[i][j], HrtfFastConv->leftHRIRImag_HOA3[i][j], 7 );

lib_rend/ivas_crend.c

+14 −11

Original line number	Diff line number	Diff line
		@@ -447,11 +447,9 @@ static ivas_error ivas_rend_initCrend(
		}
		else if ( inConfigType == IVAS_REND_AUDIO_CONFIG_TYPE_AMBISONICS )
		{
		#ifdef UPDATE_SBA_FILTER
		#ifdef UPDATE_SBA_FILTER
		if ( inConfig == IVAS_REND_AUDIO_CONFIG_HOA3 )
		{
		#endif
		if ( output_Fs == 48000 )
		{
		hHrtf->latency_s = CRendBin_HOA3_HRIR_latency_s;
		@@ -532,7 +530,10 @@ static ivas_error ivas_rend_initCrend(
		hHrtf->pOut_to_bin_diffuse_im[j] = CRendBin_HOA3_HRIR_coeff_diffuse_im_16kHz[j];
		}
		}
		#ifdef UPDATE_SBA_FILTER
		else
		{
		return IVAS_ERROR( IVAS_ERR_INVALID_SAMPLING_RATE, "Encountered Unsupported sampling rate in Crend" );
		}
		}
		else if ( inConfig == IVAS_REND_AUDIO_CONFIG_HOA2 )
		{
		@@ -616,6 +617,10 @@ static ivas_error ivas_rend_initCrend(
		hHrtf->pOut_to_bin_diffuse_im[j] = CRendBin_HOA2_HRIR_coeff_diffuse_im_16kHz[j];
		}
		}
		else
		{
		return IVAS_ERROR( IVAS_ERR_INVALID_SAMPLING_RATE, "Encountered Unsupported sampling rate in Crend" );
		}
		}
		else if ( inConfig == IVAS_REND_AUDIO_CONFIG_FOA )
		{
		@@ -699,13 +704,15 @@ static ivas_error ivas_rend_initCrend(
		hHrtf->pOut_to_bin_diffuse_im[j] = CRendBin_FOA_HRIR_coeff_diffuse_im_16kHz[j];
		}
		}
		}
		#endif
		else
		{
		return IVAS_ERROR( IVAS_ERR_INVALID_SAMPLING_RATE, "Encountered Unsupported sampling rate in Crend" );
		}

		}
		else
		{
		return IVAS_ERROR( IVAS_ERR_INVALID_INPUT_FORMAT, "Encountered unsupported input config in Crend" );
		}
		#else
		if ( output_Fs == 48000 )
		{
		@@ -893,11 +900,9 @@ static ivas_error ivas_rend_initCrend(
		}
		else if ( inConfigType == IVAS_REND_AUDIO_CONFIG_TYPE_AMBISONICS )
		{
		#ifdef UPDATE_SBA_FILTER
		#ifdef UPDATE_SBA_FILTER
		if ( inConfig == IVAS_REND_AUDIO_CONFIG_HOA3 )
		{
		#endif
		hHrtf->latency_s = hSetOfHRTF->hHRTF_hrir_hoa3->latency_s;
		hHrtf->max_num_iterations = hSetOfHRTF->hHRTF_hrir_hoa3->max_num_iterations;
		hHrtf->index_frequency_max_diffuse = hSetOfHRTF->hHRTF_hrir_hoa3->index_frequency_max_diffuse;
		@@ -921,7 +926,6 @@ static ivas_error ivas_rend_initCrend(
		hHrtf->pOut_to_bin_diffuse_re[j] = hSetOfHRTF->hHRTF_hrir_hoa3->pOut_to_bin_diffuse_re[j];
		hHrtf->pOut_to_bin_diffuse_im[j] = hSetOfHRTF->hHRTF_hrir_hoa3->pOut_to_bin_diffuse_im[j];
		}
		#ifdef UPDATE_SBA_FILTER
		}
		else if ( inConfig == IVAS_REND_AUDIO_CONFIG_HOA2 )
		{
		@@ -949,7 +953,7 @@ static ivas_error ivas_rend_initCrend(
		hHrtf->pOut_to_bin_diffuse_im[j] = hSetOfHRTF->hHRTF_hrir_hoa2->pOut_to_bin_diffuse_im[j];
		}
		}
		else if ( inConfig == IVAS_REND_AUDIO_CONFIG_HOA2 )
		else if ( inConfig == IVAS_REND_AUDIO_CONFIG_FOA )
		{
		hHrtf->latency_s = hSetOfHRTF->hHRTF_hrir_foa->latency_s;
		hHrtf->max_num_iterations = hSetOfHRTF->hHRTF_hrir_foa->max_num_iterations;
		@@ -979,7 +983,6 @@ static ivas_error ivas_rend_initCrend(
		{
		return IVAS_ERROR( IVAS_ERR_INTERNAL, "Unsupported renderer type in Crend" );
		}
		#endif
		}
		#else
		hHrtf->latency_s = hSetOfHRTF->hHRTF_hrir_hoa3->latency_s;