Loading lib_util/hrtf_file_reader.c +0 −21 Original line number Diff line number Diff line Loading @@ -2019,14 +2019,10 @@ static ivas_error create_fastconv_HRTF_from_rawdata( } hrtf_data_rptr += sizeof( uint16_t ); #ifdef FIX_1123_FASTCONV_16BIT_FMT ( *hHRTF )->ntaps_hrir = *( (uint16_t *) ( hrtf_data_rptr ) ); #else if ( BINAURAL_NTAPS != *( (uint16_t *) ( hrtf_data_rptr ) ) ) { return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "HRTF binary file not compliant (BINAURAL_NTAPS)" ); } #endif hrtf_data_rptr += sizeof( uint16_t ); #endif Loading Loading @@ -2161,18 +2157,13 @@ static ivas_error create_fastconv_HRTF_from_rawdata( } hrtf_data_rptr += sizeof( uint16_t ); #ifdef FIX_1123_FASTCONV_16BIT_FMT ( *hHRTF )->ntaps_hrir_hoa3 = *( (uint16_t *) ( hrtf_data_rptr ) ); #else if ( BINAURAL_NTAPS_SBA != *( (uint16_t *) ( hrtf_data_rptr ) ) ) { return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "HRTF binary file not compliant (BINAURAL_NTAPS_SBA)" ); } #endif hrtf_data_rptr += sizeof( uint16_t ); #endif /* HRIR Q factor*/ factorQ = *( (Word16 *) ( hrtf_data_rptr ) ); hrtf_data_rptr += sizeof( Word16 ); Loading Loading @@ -2303,14 +2294,10 @@ static ivas_error create_fastconv_HRTF_from_rawdata( return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "HRTF binary file not compliant (HOA2_CHANNELS)" ); } hrtf_data_rptr += sizeof( uint16_t ); #ifdef FIX_1123_FASTCONV_16BIT_FMT ( *hHRTF )->ntaps_hrir_hoa2 = *( (uint16_t *) ( hrtf_data_rptr ) ); #else if ( BINAURAL_NTAPS_SBA != *( (uint16_t *) ( hrtf_data_rptr ) ) ) { return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "HRTF binary file not compliant (BINAURAL_NTAPS_SBA)" ); } #endif hrtf_data_rptr += sizeof( uint16_t ); #endif Loading Loading @@ -2446,14 +2433,10 @@ static ivas_error create_fastconv_HRTF_from_rawdata( } hrtf_data_rptr += sizeof( uint16_t ); #ifdef FIX_1123_FASTCONV_16BIT_FMT ( *hHRTF )->ntaps_hrir_foa = *( (uint16_t *) ( hrtf_data_rptr ) ); #else if ( BINAURAL_NTAPS_SBA != *( (uint16_t *) ( hrtf_data_rptr ) ) ) { return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "HRTF binary file not compliant (BINAURAL_NTAPS_SBA)" ); } #endif hrtf_data_rptr += sizeof( uint16_t ); #endif Loading Loading @@ -2589,14 +2572,10 @@ static ivas_error create_fastconv_HRTF_from_rawdata( } hrtf_data_rptr += sizeof( uint16_t ); #ifdef FIX_1123_FASTCONV_16BIT_FMT ( *hHRTF )->ntaps_brir = *( (uint16_t *) ( hrtf_data_rptr ) ); #else if ( BINAURAL_NTAPS_MAX != *( (uint16_t *) ( hrtf_data_rptr ) ) ) { return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "HRTF binary file not compliant (BINAURAL_NTAPS)" ); } #endif hrtf_data_rptr += sizeof( uint16_t ); #endif Loading Loading
lib_util/hrtf_file_reader.c +0 −21 Original line number Diff line number Diff line Loading @@ -2019,14 +2019,10 @@ static ivas_error create_fastconv_HRTF_from_rawdata( } hrtf_data_rptr += sizeof( uint16_t ); #ifdef FIX_1123_FASTCONV_16BIT_FMT ( *hHRTF )->ntaps_hrir = *( (uint16_t *) ( hrtf_data_rptr ) ); #else if ( BINAURAL_NTAPS != *( (uint16_t *) ( hrtf_data_rptr ) ) ) { return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "HRTF binary file not compliant (BINAURAL_NTAPS)" ); } #endif hrtf_data_rptr += sizeof( uint16_t ); #endif Loading Loading @@ -2161,18 +2157,13 @@ static ivas_error create_fastconv_HRTF_from_rawdata( } hrtf_data_rptr += sizeof( uint16_t ); #ifdef FIX_1123_FASTCONV_16BIT_FMT ( *hHRTF )->ntaps_hrir_hoa3 = *( (uint16_t *) ( hrtf_data_rptr ) ); #else if ( BINAURAL_NTAPS_SBA != *( (uint16_t *) ( hrtf_data_rptr ) ) ) { return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "HRTF binary file not compliant (BINAURAL_NTAPS_SBA)" ); } #endif hrtf_data_rptr += sizeof( uint16_t ); #endif /* HRIR Q factor*/ factorQ = *( (Word16 *) ( hrtf_data_rptr ) ); hrtf_data_rptr += sizeof( Word16 ); Loading Loading @@ -2303,14 +2294,10 @@ static ivas_error create_fastconv_HRTF_from_rawdata( return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "HRTF binary file not compliant (HOA2_CHANNELS)" ); } hrtf_data_rptr += sizeof( uint16_t ); #ifdef FIX_1123_FASTCONV_16BIT_FMT ( *hHRTF )->ntaps_hrir_hoa2 = *( (uint16_t *) ( hrtf_data_rptr ) ); #else if ( BINAURAL_NTAPS_SBA != *( (uint16_t *) ( hrtf_data_rptr ) ) ) { return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "HRTF binary file not compliant (BINAURAL_NTAPS_SBA)" ); } #endif hrtf_data_rptr += sizeof( uint16_t ); #endif Loading Loading @@ -2446,14 +2433,10 @@ static ivas_error create_fastconv_HRTF_from_rawdata( } hrtf_data_rptr += sizeof( uint16_t ); #ifdef FIX_1123_FASTCONV_16BIT_FMT ( *hHRTF )->ntaps_hrir_foa = *( (uint16_t *) ( hrtf_data_rptr ) ); #else if ( BINAURAL_NTAPS_SBA != *( (uint16_t *) ( hrtf_data_rptr ) ) ) { return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "HRTF binary file not compliant (BINAURAL_NTAPS_SBA)" ); } #endif hrtf_data_rptr += sizeof( uint16_t ); #endif Loading Loading @@ -2589,14 +2572,10 @@ static ivas_error create_fastconv_HRTF_from_rawdata( } hrtf_data_rptr += sizeof( uint16_t ); #ifdef FIX_1123_FASTCONV_16BIT_FMT ( *hHRTF )->ntaps_brir = *( (uint16_t *) ( hrtf_data_rptr ) ); #else if ( BINAURAL_NTAPS_MAX != *( (uint16_t *) ( hrtf_data_rptr ) ) ) { return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "HRTF binary file not compliant (BINAURAL_NTAPS)" ); } #endif hrtf_data_rptr += sizeof( uint16_t ); #endif Loading