Loading lib_util/hrtf_file_reader.c +0 −120 Original line number Diff line number Diff line Loading @@ -944,108 +944,6 @@ static ivas_error create_HRTF_from_rawdata( return IVAS_ERR_OK; } static ivas_error init_fastconv_HRTF_handle( HRTFS_FASTCONV *hHrtf /* i/o: HRTF FastConv handle */ ) { int16_t i, j; if ( hHrtf == NULL ) { return IVAS_ERR_WRONG_PARAMS; } hHrtf->FASTCONV_HRIR_latency_s = 0; for ( i = 0; i < BINAURAL_CONVBANDS; i++ ) { for ( j = 0; j < HRTF_LS_CHANNELS; j++ ) { set_zero( hHrtf->leftHRIRReal[i][j], BINAURAL_NTAPS ); set_zero( hHrtf->leftHRIRImag[i][j], BINAURAL_NTAPS ); set_zero( hHrtf->rightHRIRReal[i][j], BINAURAL_NTAPS ); set_zero( hHrtf->rightHRIRImag[i][j], BINAURAL_NTAPS ); } } hHrtf->FASTCONV_HOA3_latency_s = 0; for ( i = 0; i < BINAURAL_CONVBANDS; i++ ) { #ifdef UPDATE_FASTCONV_SBA_FILTER for ( j = 0; j < HOA3_CHANNELS; j++ ) { set_zero( hHrtf->leftHRIRReal_HOA3[i][j], BINAURAL_NTAPS_SBA ); set_zero( hHrtf->leftHRIRImag_HOA3[i][j], BINAURAL_NTAPS_SBA ); set_zero( hHrtf->rightHRIRReal_HOA3[i][j], BINAURAL_NTAPS_SBA ); set_zero( hHrtf->rightHRIRImag_HOA3[i][j], BINAURAL_NTAPS_SBA ); #else for ( j = 0; j < HRTF_SH_CHANNELS; j++ ) { set_zero( hHrtf->leftHRIRReal_HOA3[i][j], BINAURAL_NTAPS ); set_zero( hHrtf->leftHRIRImag_HOA3[i][j], BINAURAL_NTAPS ); set_zero( hHrtf->rightHRIRReal_HOA3[i][j], BINAURAL_NTAPS ); set_zero( hHrtf->rightHRIRImag_HOA3[i][j], BINAURAL_NTAPS ); #endif } } hHrtf->FASTCONV_HOA2_latency_s = 0; for ( i = 0; i < BINAURAL_CONVBANDS; i++ ) { #ifdef UPDATE_FASTCONV_SBA_FILTER for ( j = 0; j < HOA2_CHANNELS; j++ ) { set_zero( hHrtf->leftHRIRReal_HOA2[i][j], BINAURAL_NTAPS_SBA ); set_zero( hHrtf->leftHRIRImag_HOA2[i][j], BINAURAL_NTAPS_SBA ); set_zero( hHrtf->rightHRIRReal_HOA2[i][j], BINAURAL_NTAPS_SBA ); set_zero( hHrtf->rightHRIRImag_HOA2[i][j], BINAURAL_NTAPS_SBA ); #else for ( j = 0; j < 9; j++ ) { set_zero( hHrtf->leftHRIRReal_HOA2[i][j], BINAURAL_NTAPS ); set_zero( hHrtf->leftHRIRImag_HOA2[i][j], BINAURAL_NTAPS ); set_zero( hHrtf->rightHRIRReal_HOA2[i][j], BINAURAL_NTAPS ); set_zero( hHrtf->rightHRIRImag_HOA2[i][j], BINAURAL_NTAPS ); #endif } } hHrtf->FASTCONV_FOA_latency_s = 0; for ( i = 0; i < BINAURAL_CONVBANDS; i++ ) { #ifdef UPDATE_FASTCONV_SBA_FILTER for ( j = 0; j < FOA_CHANNELS; j++ ) { set_zero( hHrtf->leftHRIRReal_FOA[i][j], BINAURAL_NTAPS_SBA ); set_zero( hHrtf->leftHRIRImag_FOA[i][j], BINAURAL_NTAPS_SBA ); set_zero( hHrtf->rightHRIRReal_FOA[i][j], BINAURAL_NTAPS_SBA ); set_zero( hHrtf->rightHRIRImag_FOA[i][j], BINAURAL_NTAPS_SBA ); #else for ( j = 0; j < 4; j++ ) { set_zero( hHrtf->leftHRIRReal_FOA[i][j], BINAURAL_NTAPS ); set_zero( hHrtf->leftHRIRImag_FOA[i][j], BINAURAL_NTAPS ); set_zero( hHrtf->rightHRIRReal_FOA[i][j], BINAURAL_NTAPS ); set_zero( hHrtf->rightHRIRImag_FOA[i][j], BINAURAL_NTAPS ); #endif } } hHrtf->FASTCONV_BRIR_latency_s = 0; for ( i = 0; i < BINAURAL_CONVBANDS; i++ ) { for ( j = 0; j < HRTF_LS_CHANNELS; j++ ) { set_zero( hHrtf->leftBRIRReal[i][j], BINAURAL_NTAPS_MAX ); set_zero( hHrtf->leftBRIRImag[i][j], BINAURAL_NTAPS_MAX ); set_zero( hHrtf->rightBRIRReal[i][j], BINAURAL_NTAPS_MAX ); set_zero( hHrtf->rightBRIRImag[i][j], BINAURAL_NTAPS_MAX ); } } set_zero( hHrtf->fastconvReverberationTimes, CLDFB_NO_CHANNELS_MAX ); set_zero( hHrtf->fastconvReverberationEneCorrections, CLDFB_NO_CHANNELS_MAX ); return IVAS_ERR_OK; } static ivas_error create_fastconv_HRTF_from_rawdata( HRTFS_FASTCONV_HANDLE *hHRTF, /* i/o: HRTF FastConv handle */ Loading @@ -1061,24 +959,6 @@ static ivas_error create_fastconv_HRTF_from_rawdata( ivas_allocate_binaural_hrtf( *hHRTF, 0, input_cfg, rend_type, ( *hHRTF )->allocate_init_flag ); #endif // if ( hHRTF == NULL ) // { #ifdef SPLIT_REND_WITH_HEAD_ROT // if ( ( ( *hHRTF ) = (HRTFS_FASTCONV_HANDLE) malloc( sizeof( HRTFS_FASTCONV ) ) ) == NULL ) #else // if ( ( ( *hHRTF ) = (HRTFS_FASTCONV_HANDLE) count_malloc( sizeof( HRTFS_FASTCONV ) ) ) == NULL ) #endif // { // return IVAS_ERROR( IVAS_ERR_UNEXPECTED_NULL_POINTER, "Can not allocate memory for Fastconv HRTF binary\n" ); // } // init_fastconv_HRTF_handle( *hHRTF ); // } // else // { // return IVAS_ERR_INTERNAL; // } hrtf_data_rptr = hrtf_data; /* BINAURAL_CONVBANDS */ Loading Loading
lib_util/hrtf_file_reader.c +0 −120 Original line number Diff line number Diff line Loading @@ -944,108 +944,6 @@ static ivas_error create_HRTF_from_rawdata( return IVAS_ERR_OK; } static ivas_error init_fastconv_HRTF_handle( HRTFS_FASTCONV *hHrtf /* i/o: HRTF FastConv handle */ ) { int16_t i, j; if ( hHrtf == NULL ) { return IVAS_ERR_WRONG_PARAMS; } hHrtf->FASTCONV_HRIR_latency_s = 0; for ( i = 0; i < BINAURAL_CONVBANDS; i++ ) { for ( j = 0; j < HRTF_LS_CHANNELS; j++ ) { set_zero( hHrtf->leftHRIRReal[i][j], BINAURAL_NTAPS ); set_zero( hHrtf->leftHRIRImag[i][j], BINAURAL_NTAPS ); set_zero( hHrtf->rightHRIRReal[i][j], BINAURAL_NTAPS ); set_zero( hHrtf->rightHRIRImag[i][j], BINAURAL_NTAPS ); } } hHrtf->FASTCONV_HOA3_latency_s = 0; for ( i = 0; i < BINAURAL_CONVBANDS; i++ ) { #ifdef UPDATE_FASTCONV_SBA_FILTER for ( j = 0; j < HOA3_CHANNELS; j++ ) { set_zero( hHrtf->leftHRIRReal_HOA3[i][j], BINAURAL_NTAPS_SBA ); set_zero( hHrtf->leftHRIRImag_HOA3[i][j], BINAURAL_NTAPS_SBA ); set_zero( hHrtf->rightHRIRReal_HOA3[i][j], BINAURAL_NTAPS_SBA ); set_zero( hHrtf->rightHRIRImag_HOA3[i][j], BINAURAL_NTAPS_SBA ); #else for ( j = 0; j < HRTF_SH_CHANNELS; j++ ) { set_zero( hHrtf->leftHRIRReal_HOA3[i][j], BINAURAL_NTAPS ); set_zero( hHrtf->leftHRIRImag_HOA3[i][j], BINAURAL_NTAPS ); set_zero( hHrtf->rightHRIRReal_HOA3[i][j], BINAURAL_NTAPS ); set_zero( hHrtf->rightHRIRImag_HOA3[i][j], BINAURAL_NTAPS ); #endif } } hHrtf->FASTCONV_HOA2_latency_s = 0; for ( i = 0; i < BINAURAL_CONVBANDS; i++ ) { #ifdef UPDATE_FASTCONV_SBA_FILTER for ( j = 0; j < HOA2_CHANNELS; j++ ) { set_zero( hHrtf->leftHRIRReal_HOA2[i][j], BINAURAL_NTAPS_SBA ); set_zero( hHrtf->leftHRIRImag_HOA2[i][j], BINAURAL_NTAPS_SBA ); set_zero( hHrtf->rightHRIRReal_HOA2[i][j], BINAURAL_NTAPS_SBA ); set_zero( hHrtf->rightHRIRImag_HOA2[i][j], BINAURAL_NTAPS_SBA ); #else for ( j = 0; j < 9; j++ ) { set_zero( hHrtf->leftHRIRReal_HOA2[i][j], BINAURAL_NTAPS ); set_zero( hHrtf->leftHRIRImag_HOA2[i][j], BINAURAL_NTAPS ); set_zero( hHrtf->rightHRIRReal_HOA2[i][j], BINAURAL_NTAPS ); set_zero( hHrtf->rightHRIRImag_HOA2[i][j], BINAURAL_NTAPS ); #endif } } hHrtf->FASTCONV_FOA_latency_s = 0; for ( i = 0; i < BINAURAL_CONVBANDS; i++ ) { #ifdef UPDATE_FASTCONV_SBA_FILTER for ( j = 0; j < FOA_CHANNELS; j++ ) { set_zero( hHrtf->leftHRIRReal_FOA[i][j], BINAURAL_NTAPS_SBA ); set_zero( hHrtf->leftHRIRImag_FOA[i][j], BINAURAL_NTAPS_SBA ); set_zero( hHrtf->rightHRIRReal_FOA[i][j], BINAURAL_NTAPS_SBA ); set_zero( hHrtf->rightHRIRImag_FOA[i][j], BINAURAL_NTAPS_SBA ); #else for ( j = 0; j < 4; j++ ) { set_zero( hHrtf->leftHRIRReal_FOA[i][j], BINAURAL_NTAPS ); set_zero( hHrtf->leftHRIRImag_FOA[i][j], BINAURAL_NTAPS ); set_zero( hHrtf->rightHRIRReal_FOA[i][j], BINAURAL_NTAPS ); set_zero( hHrtf->rightHRIRImag_FOA[i][j], BINAURAL_NTAPS ); #endif } } hHrtf->FASTCONV_BRIR_latency_s = 0; for ( i = 0; i < BINAURAL_CONVBANDS; i++ ) { for ( j = 0; j < HRTF_LS_CHANNELS; j++ ) { set_zero( hHrtf->leftBRIRReal[i][j], BINAURAL_NTAPS_MAX ); set_zero( hHrtf->leftBRIRImag[i][j], BINAURAL_NTAPS_MAX ); set_zero( hHrtf->rightBRIRReal[i][j], BINAURAL_NTAPS_MAX ); set_zero( hHrtf->rightBRIRImag[i][j], BINAURAL_NTAPS_MAX ); } } set_zero( hHrtf->fastconvReverberationTimes, CLDFB_NO_CHANNELS_MAX ); set_zero( hHrtf->fastconvReverberationEneCorrections, CLDFB_NO_CHANNELS_MAX ); return IVAS_ERR_OK; } static ivas_error create_fastconv_HRTF_from_rawdata( HRTFS_FASTCONV_HANDLE *hHRTF, /* i/o: HRTF FastConv handle */ Loading @@ -1061,24 +959,6 @@ static ivas_error create_fastconv_HRTF_from_rawdata( ivas_allocate_binaural_hrtf( *hHRTF, 0, input_cfg, rend_type, ( *hHRTF )->allocate_init_flag ); #endif // if ( hHRTF == NULL ) // { #ifdef SPLIT_REND_WITH_HEAD_ROT // if ( ( ( *hHRTF ) = (HRTFS_FASTCONV_HANDLE) malloc( sizeof( HRTFS_FASTCONV ) ) ) == NULL ) #else // if ( ( ( *hHRTF ) = (HRTFS_FASTCONV_HANDLE) count_malloc( sizeof( HRTFS_FASTCONV ) ) ) == NULL ) #endif // { // return IVAS_ERROR( IVAS_ERR_UNEXPECTED_NULL_POINTER, "Can not allocate memory for Fastconv HRTF binary\n" ); // } // init_fastconv_HRTF_handle( *hHRTF ); // } // else // { // return IVAS_ERR_INTERNAL; // } hrtf_data_rptr = hrtf_data; /* BINAURAL_CONVBANDS */ Loading