fix MC 7.1 to BINAURAL (080129be) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_rend/ivas_crend.c

+30 −0

Original line number	Diff line number	Diff line
		@@ -794,6 +794,25 @@ static ivas_error ivas_rend_initCrend(
		}
		#ifdef FIX_1227_Crend_HRTF_LOADING_OPTIM
		}

		if ( inConfig == IVAS_AUDIO_CONFIG_7_1 && ext_rend_flag == 0 )
		{
		/* hack to enable pointers swapping - needed when indexes of 'channelIndex_CICPx[]' are not in increasing order */
		for ( i = 5; i < hHrtf->max_num_ir; i++ )
		{
		tmp = channelIndex_CICP12[i];
		int16_t tmp2 = channelIndex_CICP14[i];

		for ( j = 0; j < BINAURAL_CHANNELS; j++ )
		{
		hHrtf->inv_diffuse_weight[j][tmp2] = hSetOfHRTF->hHRTF_brir_combined->inv_diffuse_weight[j][tmp];
		hHrtf->num_iterations[tmp2][j] = hSetOfHRTF->hHRTF_brir_combined->num_iterations[tmp][j];
		hHrtf->pIndex_frequency_max[tmp2][j] = hSetOfHRTF->hHRTF_brir_combined->pIndex_frequency_max[tmp][j];
		hHrtf->pOut_to_bin_re[tmp2][j] = hSetOfHRTF->hHRTF_brir_combined->pOut_to_bin_re[tmp][j];
		hHrtf->pOut_to_bin_im[tmp2][j] = hSetOfHRTF->hHRTF_brir_combined->pOut_to_bin_im[tmp][j];
		}
		}
		}
		#endif

		for ( i = 0; i < hHrtf->max_num_ir; i++ )
		@@ -804,8 +823,19 @@ static ivas_error ivas_rend_initCrend(
		}
		else if ( inConfig == IVAS_AUDIO_CONFIG_7_1 )
		{
		#ifdef FIX_1227_Crend_HRTF_LOADING_OPTIM
		if ( ext_rend_flag == 0 )
		{
		tmp = channelIndex_CICP14[i];
		}
		else
		{
		tmp = channelIndex_CICP12[i];
		}
		#else
		tmp = channelIndex_CICP12[i];
		#endif
		}
		else if ( inConfig == IVAS_AUDIO_CONFIG_5_1_2 )
		{
		tmp = channelIndex_CICP14[i];