Commit 28501c00 authored by emerit's avatar emerit
Browse files

remove define FIX_FOR_TEST

parent 46734646
Loading
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -150,7 +150,6 @@
#define HRTF_BINARY_FILE                                /* HRTF filters' binary file used for binaural rendering. */

#define FIX_197_CREND_INTERFACE 
#define FIX_FOR_TEST                                    /* allows tests to pass using old TD binary file, to be removed after merge*/
#define FIX_301_PLC                                     /* FhG: issue 301 - fix bug of missing update of overlap buffer for DFT-stereo PLC*/


+0 −27
Original line number Diff line number Diff line
@@ -453,34 +453,7 @@ static ivas_error TDREND_MIX_LoadHRTF(

    if ( ( header_check_result = read_and_check_hrtf_binary_file_header( &hrtfs_file_header, f_hrtf ) ) != IVAS_ERR_OK )
    {
#ifdef FIX_FOR_TEST
        fseek( f_hrtf, 0, SEEK_SET );
        if ( fread( &tmp, 1, sizeof( int16_t ), f_hrtf ) == 0 )
        {
            return IVAS_ERROR( IVAS_ERR_FAILED_FILE_READ, "Error in HRTF file reading" );
        }

        HrFiltSet_p->FilterMethod = (TDREND_HRFILT_Method_t) tmp;

        if ( HrFiltSet_p->FilterMethod != TDREND_HRFILT_Method_BSplineModel )
        {
            error = IVAS_ERROR( IVAS_ERR_INVALID_HRTF, "The HR filter set file is not a supported type." );
        }
        else
        {
            error = LoadBSplineBinary( HrFiltSet_p, f_hrtf );
        }
        if ( error != IVAS_ERR_OK )
        {
            return header_check_result;
        }
        else
        {
            return error;
        }
#else
        return header_check_result;
#endif
    }

    is_tdrend = FALSE;