[fix] add possiblity for different number of taps per ambisonics order (e9cfaa67) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_dec/ivas_binRenderer_internal.c

+31 −16

Original line number	Diff line number	Diff line
		@@ -201,7 +201,22 @@ static ivas_error ivas_binRenderer_convModuleOpen(
		if ( hBinRenderer->ivas_format == SBA_FORMAT )
		{
		#ifdef FIX_1123_FASTCONV_16BIT_ROM
		hBinRenConvModule->numTaps = hHrtf->ntaps_hrir_sba;
		if ( input_config == IVAS_AUDIO_CONFIG_HOA3 )
		{
		hBinRenConvModule->numTaps = hHrtf->ntaps_hrir_hoa3;
		}
		if ( input_config == IVAS_AUDIO_CONFIG_HOA2 )
		{
		hBinRenConvModule->numTaps = hHrtf->ntaps_hrir_hoa2;
		}
		if ( input_config == IVAS_AUDIO_CONFIG_FOA )
		{
		hBinRenConvModule->numTaps = hHrtf->ntaps_hrir_foa;
		}
		else
		{
		return IVAS_ERR_INVALID_INPUT_FORMAT;
		}
		#else
		hBinRenConvModule->numTaps = BINAURAL_NTAPS_SBA;
		#endif
		@@ -556,19 +571,19 @@ ivas_error ivas_allocate_binaural_hrtf(
		else
		{
		#ifdef FIX_1123_FASTCONV_16BIT_ROM
		if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->leftHRIRReal_HOA3, BINAURAL_CONVBANDS, HOA3_CHANNELS, HrtfFastConv->ntaps_hrir_sba, allocate_init_flag ) )
		if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->leftHRIRReal_HOA3, BINAURAL_CONVBANDS, HOA3_CHANNELS, HrtfFastConv->ntaps_hrir_hoa3, allocate_init_flag ) )
		{
		return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for leftHRIRReal_HOA3" );
		}
		if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->leftHRIRImag_HOA3, BINAURAL_CONVBANDS, HOA3_CHANNELS, HrtfFastConv->ntaps_hrir_sba, allocate_init_flag ) )
		if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->leftHRIRImag_HOA3, BINAURAL_CONVBANDS, HOA3_CHANNELS, HrtfFastConv->ntaps_hrir_hoa3, allocate_init_flag ) )
		{
		return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for leftHRIRImag_HOA3" );
		}
		if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->rightHRIRReal_HOA3, BINAURAL_CONVBANDS, HOA3_CHANNELS, HrtfFastConv->ntaps_hrir_sba, allocate_init_flag ) )
		if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->rightHRIRReal_HOA3, BINAURAL_CONVBANDS, HOA3_CHANNELS, HrtfFastConv->ntaps_hrir_hoa3, allocate_init_flag ) )
		{
		return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for rightHRIRReal_HOA3" );
		}
		if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->rightHRIRImag_HOA3, BINAURAL_CONVBANDS, HOA3_CHANNELS, HrtfFastConv->ntaps_hrir_sba, allocate_init_flag ) )
		if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->rightHRIRImag_HOA3, BINAURAL_CONVBANDS, HOA3_CHANNELS, HrtfFastConv->ntaps_hrir_hoa3, allocate_init_flag ) )
		{
		return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for rightHRIRImag_HOA3" );
		}
		@@ -602,19 +617,19 @@ ivas_error ivas_allocate_binaural_hrtf(
		else
		{
		#ifdef FIX_1123_FASTCONV_16BIT_ROM
		if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->leftHRIRReal_HOA2, BINAURAL_CONVBANDS, HOA2_CHANNELS, HrtfFastConv->ntaps_hrir_sba, allocate_init_flag ) )
		if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->leftHRIRReal_HOA2, BINAURAL_CONVBANDS, HOA2_CHANNELS, HrtfFastConv->ntaps_hrir_hoa2, allocate_init_flag ) )
		{
		return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for leftHRIRReal_HOA2" );
		}
		if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->leftHRIRImag_HOA2, BINAURAL_CONVBANDS, HOA2_CHANNELS, HrtfFastConv->ntaps_hrir_sba, allocate_init_flag ) )
		if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->leftHRIRImag_HOA2, BINAURAL_CONVBANDS, HOA2_CHANNELS, HrtfFastConv->ntaps_hrir_hoa2, allocate_init_flag ) )
		{
		return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for leftHRIRImag_HOA2" );
		}
		if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->rightHRIRReal_HOA2, BINAURAL_CONVBANDS, HOA2_CHANNELS, HrtfFastConv->ntaps_hrir_sba, allocate_init_flag ) )
		if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->rightHRIRReal_HOA2, BINAURAL_CONVBANDS, HOA2_CHANNELS, HrtfFastConv->ntaps_hrir_hoa2, allocate_init_flag ) )
		{
		return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for rightHRIRReal_HOA2" );
		}
		if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->rightHRIRImag_HOA2, BINAURAL_CONVBANDS, HOA2_CHANNELS, HrtfFastConv->ntaps_hrir_sba, allocate_init_flag ) )
		if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->rightHRIRImag_HOA2, BINAURAL_CONVBANDS, HOA2_CHANNELS, HrtfFastConv->ntaps_hrir_hoa2, allocate_init_flag ) )
		{
		return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for rightHRIRImag_HOA2" );
		}
		@@ -648,19 +663,19 @@ ivas_error ivas_allocate_binaural_hrtf(
		else
		{
		#ifdef FIX_1123_FASTCONV_16BIT_ROM
		if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->leftHRIRReal_FOA, BINAURAL_CONVBANDS, FOA_CHANNELS, HrtfFastConv->ntaps_hrir_sba, allocate_init_flag ) )
		if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->leftHRIRReal_FOA, BINAURAL_CONVBANDS, FOA_CHANNELS, HrtfFastConv->ntaps_hrir_foa, allocate_init_flag ) )
		{
		return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for leftHRIRReal_FOA" );
		}
		if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->leftHRIRImag_FOA, BINAURAL_CONVBANDS, FOA_CHANNELS, HrtfFastConv->ntaps_hrir_sba, allocate_init_flag ) )
		if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->leftHRIRImag_FOA, BINAURAL_CONVBANDS, FOA_CHANNELS, HrtfFastConv->ntaps_hrir_foa, allocate_init_flag ) )
		{
		return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for leftHRIRImag_FOA" );
		}
		if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->rightHRIRReal_FOA, BINAURAL_CONVBANDS, FOA_CHANNELS, HrtfFastConv->ntaps_hrir_sba, allocate_init_flag ) )
		if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->rightHRIRReal_FOA, BINAURAL_CONVBANDS, FOA_CHANNELS, HrtfFastConv->ntaps_hrir_foa, allocate_init_flag ) )
		{
		return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for rightHRIRReal_FOA" );
		}
		if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->rightHRIRImag_FOA, BINAURAL_CONVBANDS, FOA_CHANNELS, HrtfFastConv->ntaps_hrir_sba, allocate_init_flag ) )
		if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->rightHRIRImag_FOA, BINAURAL_CONVBANDS, FOA_CHANNELS, HrtfFastConv->ntaps_hrir_foa, allocate_init_flag ) )
		{
		return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for rightHRIRImag_FOA" );
		}
		@@ -887,7 +902,7 @@ static ivas_error ivas_binaural_hrtf_open(
		for ( j = 0; j < HOA3_CHANNELS; j++ )
		{
		#ifdef FIX_1123_FASTCONV_16BIT_ROM
		for ( k = 0; k < HrtfFastConv->ntaps_hrir_sba; k++ )
		for ( k = 0; k < HrtfFastConv->ntaps_hrir_hoa3; k++ )
		{
		HrtfFastConv->leftHRIRReal_HOA3[i][j][k] = (float) leftHRIRReal_HOA3[i][j][k] * powf( 2.f, -1.f * (float) FASTCONV_HRIR_HOA3_factorQ );
		HrtfFastConv->leftHRIRImag_HOA3[i][j][k] = (float) leftHRIRImag_HOA3[i][j][k] * powf( 2.f, -1.f * (float) FASTCONV_HRIR_HOA3_factorQ );
		@@ -907,7 +922,7 @@ static ivas_error ivas_binaural_hrtf_open(
		for ( j = 0; j < HOA2_CHANNELS; j++ )
		{
		#ifdef FIX_1123_FASTCONV_16BIT_ROM
		for ( k = 0; k < HrtfFastConv->ntaps_hrir_sba; k++ )
		for ( k = 0; k < HrtfFastConv->ntaps_hrir_hoa2; k++ )
		{
		HrtfFastConv->leftHRIRReal_HOA2[i][j][k] = (float) leftHRIRReal_HOA2[i][j][k] * powf( 2.f, -1.f * (float) FASTCONV_HRIR_HOA2_factorQ );
		HrtfFastConv->leftHRIRImag_HOA2[i][j][k] = (float) leftHRIRImag_HOA2[i][j][k] * powf( 2.f, -1.f * (float) FASTCONV_HRIR_HOA2_factorQ );
		@@ -927,7 +942,7 @@ static ivas_error ivas_binaural_hrtf_open(
		for ( j = 0; j < FOA_CHANNELS; j++ )
		{
		#ifdef FIX_1123_FASTCONV_16BIT_ROM
		for ( k = 0; k < HrtfFastConv->ntaps_hrir_sba; k++ )
		for ( k = 0; k < HrtfFastConv->ntaps_hrir_foa; k++ )
		{
		HrtfFastConv->leftHRIRReal_FOA[i][j][k] = (float) leftHRIRReal_FOA[i][j][k] * powf( 2.f, -1.f * (float) FASTCONV_HRIR_FOA_factorQ );
		HrtfFastConv->leftHRIRImag_FOA[i][j][k] = (float) leftHRIRImag_FOA[i][j][k] * powf( 2.f, -1.f * (float) FASTCONV_HRIR_FOA_factorQ );

lib_rend/ivas_stat_rend.h

+3 −1

Original line number	Diff line number	Diff line
		@@ -1300,7 +1300,9 @@ typedef struct ivas_hrtfs_fastconv_struct
		int16_t allocate_init_flag; /Memory allocation flag 0: if the hrtf pointers are allocated at application level , 1: of allocated at ivas_binaural_hrtf_open() /
		#ifdef FIX_1123_FASTCONV_16BIT_ROM
		uint16_t ntaps_hrir;
		uint16_t ntaps_hrir_sba;
		uint16_t ntaps_hrir_hoa3;
		uint16_t ntaps_hrir_hoa2;
		uint16_t ntaps_hrir_foa;
		uint16_t ntaps_brir;
		#endif

lib_util/hrtf_file_reader.c

+27 −27

Original line number	Diff line number	Diff line
		@@ -2004,7 +2004,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata_fx(
		hrtf_data_rptr += sizeof( uint16_t );

		#ifdef FIX_1123_FASTCONV_16BIT_ROM
		( hHRTF )->ntaps_hrir_sba = ( (uint16_t *) ( hrtf_data_rptr ) );
		( hHRTF )->ntaps_hrir_hoa3 = ( (uint16_t *) ( hrtf_data_rptr ) );
		#else
		if ( BINAURAL_NTAPS_SBA != ( (uint16_t ) ( hrtf_data_rptr ) ) )
		{
		@@ -2023,7 +2023,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata_fx(
		{
		#ifdef FIX_1123_FASTCONV_16BIT_ROM
		ptW16 = (Word16 *) hrtf_data_rptr;
		for ( k = 0; k < ( *hHRTF )->ntaps_hrir_sba; k++ )
		for ( k = 0; k < ( *hHRTF )->ntaps_hrir_hoa3; k++ )
		#else
		ptW32 = (Word32 *) hrtf_data_rptr;
		for ( k = 0; k < BINAURAL_NTAPS_SBA; k++ )
		@@ -2036,7 +2036,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata_fx(
		#endif
		}
		#ifdef FIX_1123_FASTCONV_16BIT_ROM
		hrtf_data_rptr += ( hHRTF )->ntaps_hrir_sba sizeof( Word16 );
		hrtf_data_rptr += ( hHRTF )->ntaps_hrir_hoa3 sizeof( Word16 );
		#else
		hrtf_data_rptr += BINAURAL_NTAPS_SBA * sizeof( int32_t );
		#endif
		@@ -2048,7 +2048,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata_fx(
		{
		#ifdef FIX_1123_FASTCONV_16BIT_ROM
		ptW16 = (Word16 *) hrtf_data_rptr;
		for ( k = 0; k < ( *hHRTF )->ntaps_hrir_sba; k++ )
		for ( k = 0; k < ( *hHRTF )->ntaps_hrir_hoa3; k++ )
		#else
		ptW32 = (Word32 *) hrtf_data_rptr;
		for ( k = 0; k < BINAURAL_NTAPS_SBA; k++ )
		@@ -2061,7 +2061,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata_fx(
		#endif
		}
		#ifdef FIX_1123_FASTCONV_16BIT_ROM
		hrtf_data_rptr += ( hHRTF )->ntaps_hrir_sba sizeof( Word16 );
		hrtf_data_rptr += ( hHRTF )->ntaps_hrir_hoa3 sizeof( Word16 );
		#else
		hrtf_data_rptr += BINAURAL_NTAPS_SBA * sizeof( int32_t );
		#endif
		@@ -2073,7 +2073,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata_fx(
		{
		#ifdef FIX_1123_FASTCONV_16BIT_ROM
		ptW16 = (Word16 *) hrtf_data_rptr;
		for ( k = 0; k < ( *hHRTF )->ntaps_hrir_sba; k++ )
		for ( k = 0; k < ( *hHRTF )->ntaps_hrir_hoa3; k++ )
		#else
		ptW32 = (Word32 *) hrtf_data_rptr;
		for ( k = 0; k < BINAURAL_NTAPS_SBA; k++ )
		@@ -2086,7 +2086,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata_fx(
		#endif
		}
		#ifdef FIX_1123_FASTCONV_16BIT_ROM
		hrtf_data_rptr += ( hHRTF )->ntaps_hrir_sba sizeof( Word16 );
		hrtf_data_rptr += ( hHRTF )->ntaps_hrir_hoa3 sizeof( Word16 );
		#else
		hrtf_data_rptr += BINAURAL_NTAPS_SBA * sizeof( int32_t );
		#endif
		@@ -2098,7 +2098,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata_fx(
		{
		#ifdef FIX_1123_FASTCONV_16BIT_ROM
		ptW16 = (Word16 *) hrtf_data_rptr;
		for ( k = 0; k < ( *hHRTF )->ntaps_hrir_sba; k++ )
		for ( k = 0; k < ( *hHRTF )->ntaps_hrir_hoa3; k++ )
		#else
		ptW32 = (Word32 *) hrtf_data_rptr;
		for ( k = 0; k < BINAURAL_NTAPS_SBA; k++ )
		@@ -2111,7 +2111,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata_fx(
		#endif
		}
		#ifdef FIX_1123_FASTCONV_16BIT_ROM
		hrtf_data_rptr += ( hHRTF )->ntaps_hrir_sba sizeof( Word16 );
		hrtf_data_rptr += ( hHRTF )->ntaps_hrir_hoa3 sizeof( Word16 );
		#else
		hrtf_data_rptr += BINAURAL_NTAPS_SBA * sizeof( int32_t );
		#endif
		@@ -2141,7 +2141,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata_fx(
		hrtf_data_rptr += sizeof( uint16_t );

		#ifdef FIX_1123_FASTCONV_16BIT_ROM
		( hHRTF )->ntaps_hrir_sba = ( (uint16_t *) ( hrtf_data_rptr ) );
		( hHRTF )->ntaps_hrir_hoa2 = ( (uint16_t *) ( hrtf_data_rptr ) );
		#else
		if ( BINAURAL_NTAPS_SBA != ( (uint16_t ) ( hrtf_data_rptr ) ) )
		{
		@@ -2160,7 +2160,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata_fx(
		{
		#ifdef FIX_1123_FASTCONV_16BIT_ROM
		ptW16 = (Word16 *) hrtf_data_rptr;
		for ( k = 0; k < ( *hHRTF )->ntaps_hrir_sba; k++ )
		for ( k = 0; k < ( *hHRTF )->ntaps_hrir_hoa2; k++ )
		#else
		ptW32 = (Word32 *) hrtf_data_rptr;
		for ( k = 0; k < BINAURAL_NTAPS_SBA; k++ )
		@@ -2173,7 +2173,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata_fx(
		#endif
		}
		#ifdef FIX_1123_FASTCONV_16BIT_ROM
		hrtf_data_rptr += ( hHRTF )->ntaps_hrir_sba sizeof( Word16 );
		hrtf_data_rptr += ( hHRTF )->ntaps_hrir_hoa2 sizeof( Word16 );
		#else
		hrtf_data_rptr += BINAURAL_NTAPS_SBA * sizeof( int32_t );
		#endif
		@@ -2185,7 +2185,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata_fx(
		{
		#ifdef FIX_1123_FASTCONV_16BIT_ROM
		ptW16 = (Word16 *) hrtf_data_rptr;
		for ( k = 0; k < ( *hHRTF )->ntaps_hrir_sba; k++ )
		for ( k = 0; k < ( *hHRTF )->ntaps_hrir_hoa2; k++ )
		#else
		ptW32 = (Word32 *) hrtf_data_rptr;
		for ( k = 0; k < BINAURAL_NTAPS_SBA; k++ )
		@@ -2198,7 +2198,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata_fx(
		#endif
		}
		#ifdef FIX_1123_FASTCONV_16BIT_ROM
		hrtf_data_rptr += ( hHRTF )->ntaps_hrir_sba sizeof( Word16 );
		hrtf_data_rptr += ( hHRTF )->ntaps_hrir_hoa2 sizeof( Word16 );
		#else
		hrtf_data_rptr += BINAURAL_NTAPS_SBA * sizeof( int32_t );
		#endif
		@@ -2210,7 +2210,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata_fx(
		{
		#ifdef FIX_1123_FASTCONV_16BIT_ROM
		ptW16 = (Word16 *) hrtf_data_rptr;
		for ( k = 0; k < ( *hHRTF )->ntaps_hrir_sba; k++ )
		for ( k = 0; k < ( *hHRTF )->ntaps_hrir_hoa2; k++ )
		#else
		ptW32 = (Word32 *) hrtf_data_rptr;
		for ( k = 0; k < BINAURAL_NTAPS_SBA; k++ )
		@@ -2223,7 +2223,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata_fx(
		#endif
		}
		#ifdef FIX_1123_FASTCONV_16BIT_ROM
		hrtf_data_rptr += ( hHRTF )->ntaps_hrir_sba sizeof( Word16 );
		hrtf_data_rptr += ( hHRTF )->ntaps_hrir_hoa2 sizeof( Word16 );
		#else
		hrtf_data_rptr += BINAURAL_NTAPS_SBA * sizeof( int32_t );
		#endif
		@@ -2235,7 +2235,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata_fx(
		{
		#ifdef FIX_1123_FASTCONV_16BIT_ROM
		ptW16 = (Word16 *) hrtf_data_rptr;
		for ( k = 0; k < ( *hHRTF )->ntaps_hrir_sba; k++ )
		for ( k = 0; k < ( *hHRTF )->ntaps_hrir_hoa2; k++ )
		#else
		ptW32 = (Word32 *) hrtf_data_rptr;
		for ( k = 0; k < BINAURAL_NTAPS_SBA; k++ )
		@@ -2248,7 +2248,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata_fx(
		#endif
		}
		#ifdef FIX_1123_FASTCONV_16BIT_ROM
		hrtf_data_rptr += ( hHRTF )->ntaps_hrir_sba sizeof( Word16 );
		hrtf_data_rptr += ( hHRTF )->ntaps_hrir_hoa2 sizeof( Word16 );
		#else
		hrtf_data_rptr += BINAURAL_NTAPS_SBA * sizeof( int32_t );
		#endif
		@@ -2279,7 +2279,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata_fx(
		hrtf_data_rptr += sizeof( uint16_t );

		#ifdef FIX_1123_FASTCONV_16BIT_ROM
		( hHRTF )->ntaps_hrir_sba = ( (uint16_t *) ( hrtf_data_rptr ) );
		( hHRTF )->ntaps_hrir_foa = ( (uint16_t *) ( hrtf_data_rptr ) );
		#else
		if ( BINAURAL_NTAPS_SBA != ( (uint16_t ) ( hrtf_data_rptr ) ) )
		{
		@@ -2298,7 +2298,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata_fx(
		{
		#ifdef FIX_1123_FASTCONV_16BIT_ROM
		ptW16 = (Word16 *) hrtf_data_rptr;
		for ( k = 0; k < ( *hHRTF )->ntaps_hrir_sba; k++ )
		for ( k = 0; k < ( *hHRTF )->ntaps_hrir_foa; k++ )
		#else
		ptW32 = (Word32 *) hrtf_data_rptr;
		for ( k = 0; k < BINAURAL_NTAPS_SBA; k++ )
		@@ -2311,7 +2311,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata_fx(
		#endif
		}
		#ifdef FIX_1123_FASTCONV_16BIT_ROM
		hrtf_data_rptr += ( hHRTF )->ntaps_hrir_sba sizeof( Word16 );
		hrtf_data_rptr += ( hHRTF )->ntaps_hrir_foa sizeof( Word16 );
		#else
		hrtf_data_rptr += BINAURAL_NTAPS_SBA * sizeof( int32_t );
		#endif
		@@ -2323,7 +2323,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata_fx(
		{
		#ifdef FIX_1123_FASTCONV_16BIT_ROM
		ptW16 = (Word16 *) hrtf_data_rptr;
		for ( k = 0; k < ( *hHRTF )->ntaps_hrir_sba; k++ )
		for ( k = 0; k < ( *hHRTF )->ntaps_hrir_foa; k++ )
		#else
		ptW32 = (Word32 *) hrtf_data_rptr;
		for ( k = 0; k < BINAURAL_NTAPS_SBA; k++ )
		@@ -2336,7 +2336,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata_fx(
		#endif
		}
		#ifdef FIX_1123_FASTCONV_16BIT_ROM
		hrtf_data_rptr += ( hHRTF )->ntaps_hrir_sba sizeof( Word16 );
		hrtf_data_rptr += ( hHRTF )->ntaps_hrir_foa sizeof( Word16 );
		#else
		hrtf_data_rptr += BINAURAL_NTAPS_SBA * sizeof( int32_t );
		#endif
		@@ -2348,7 +2348,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata_fx(
		{
		#ifdef FIX_1123_FASTCONV_16BIT_ROM
		ptW16 = (Word16 *) hrtf_data_rptr;
		for ( k = 0; k < ( *hHRTF )->ntaps_hrir_sba; k++ )
		for ( k = 0; k < ( *hHRTF )->ntaps_hrir_foa; k++ )
		#else
		ptW32 = (Word32 *) hrtf_data_rptr;
		for ( k = 0; k < BINAURAL_NTAPS_SBA; k++ )
		@@ -2361,7 +2361,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata_fx(
		#endif
		}
		#ifdef FIX_1123_FASTCONV_16BIT_ROM
		hrtf_data_rptr += ( hHRTF )->ntaps_hrir_sba sizeof( Word16 );
		hrtf_data_rptr += ( hHRTF )->ntaps_hrir_foa sizeof( Word16 );
		#else
		hrtf_data_rptr += BINAURAL_NTAPS_SBA * sizeof( int32_t );
		#endif
		@@ -2373,7 +2373,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata_fx(
		{
		#ifdef FIX_1123_FASTCONV_16BIT_ROM
		ptW16 = (Word16 *) hrtf_data_rptr;
		for ( k = 0; k < ( *hHRTF )->ntaps_hrir_sba; k++ )
		for ( k = 0; k < ( *hHRTF )->ntaps_hrir_foa; k++ )
		#else
		ptW32 = (Word32 *) hrtf_data_rptr;
		for ( k = 0; k < BINAURAL_NTAPS_SBA; k++ )
		@@ -2386,7 +2386,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata_fx(
		#endif
		}
		#ifdef FIX_1123_FASTCONV_16BIT_ROM
		hrtf_data_rptr += ( hHRTF )->ntaps_hrir_sba sizeof( Word16 );
		hrtf_data_rptr += ( hHRTF )->ntaps_hrir_foa sizeof( Word16 );
		#else
		hrtf_data_rptr += BINAURAL_NTAPS_SBA * sizeof( int32_t );
		#endif