Commit 2b626b01 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE

parent 783c4431

apps/decoder.c

+0 −8
Original line number Diff line number Diff line
@@ -3895,11 +3895,7 @@ static ivas_error load_hrtf_from_file( 
                return error;

            }



#ifdef FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE

            if ( ( error = load_TDrend_HRTF_binary( *hHrtfBinary->hHrtfTD, output_Fs, hHrtfBinary->hrtfReader ) ) != IVAS_ERR_OK )

#else

            if ( ( error = load_HRTF_binary( *hHrtfBinary->hHrtfTD, hHrtfBinary->hrtfReader ) ) != IVAS_ERR_OK )

#endif

            {

                if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )

                {
@@ -3983,11 +3979,7 @@ static ivas_error load_hrtf_from_file( 
        }

    }



#ifdef FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE

    if ( hHrtfBinary->hHrtfStatistics == NULL && ( binaural_renderer == IVAS_BIN_RENDERER_TYPE_FASTCONV || binaural_renderer == IVAS_BIN_RENDERER_TYPE_CREND ) && OutputConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

#else

    if ( hHrtfBinary->hHrtfStatistics == NULL )

#endif

    {

        if ( ( error = IVAS_DEC_GetHrtfStatisticsHandle( hIvasDec, &hHrtfBinary->hHrtfStatistics ) ) != IVAS_ERR_OK )

        {

apps/renderer.c

+0 −4
Original line number Diff line number Diff line
@@ -957,11 +957,7 @@ int main( 
                goto cleanup;

            }



#ifdef FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE

            if ( ( error = load_TDrend_HRTF_binary( *hHrtfTD, args.sampleRate, hrtfFileReader ) ) != IVAS_ERR_OK )

#else

            if ( ( error = load_HRTF_binary( *hHrtfTD, hrtfFileReader ) ) != IVAS_ERR_OK )

#endif

            {

                if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )

                {

lib_com/ivas_error.h

+0 −4
Original line number Diff line number Diff line
@@ -82,9 +82,7 @@ typedef enum 
    IVAS_ERR_OBJECTS_EDITING_AND_PANNING_NOT_SUPPORTED,

#endif

    IVAS_ERR_INVALID_HRTF,

#ifdef FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE

    IVAS_ERR_INVALID_HRTF_SAMPLING_RATE,

#endif

    IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA,

    IVAS_ERR_INVALID_INPUT_FORMAT,

    IVAS_ERR_INVALID_INDEX,
@@ -269,10 +267,8 @@ static inline const char *ivas_error_to_string( ivas_error error_code ) 
#endif

        case IVAS_ERR_INVALID_HRTF:

            return "Unsupported HRTF filter set";

#ifdef FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE

        case IVAS_ERR_INVALID_HRTF_SAMPLING_RATE:

            return "Wrong sampling rate in HRTF binary file";

#endif

        case IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA:

            return "Renderer data missing in HRTF binary file";

        case IVAS_ERR_INVALID_INPUT_FORMAT:

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -160,7 +160,6 @@ 


/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

#define TMP_FIX_1119_SPLIT_RENDERING_VOIP               /* FhG: Add error check for unsupported config: split rendering with VoIP mode */

#define FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE    /* VA: issue 1228: Exit the processing when a HRTF binary file with wrong sampling rate is provided */

#define FIX_1225_DISCLAIMER                             /* VA: issue 1225: Add disclaimer for external renderer + Add info about IVAS reference version */

#define FIX_1179_USAN_PHASEECU                          /* Eri: issue 1179:  better handling of 16 bit wrap around for very long(>200ms) FER-bursts   */

#define FIX_1249_REMOVE_OBSOLETE_ALLRAD_MATRIX          /* VA: issue 1249: remove obsolete code around ALLRAD decoder matrix */

lib_dec/lib_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -3171,11 +3171,7 @@ ivas_error IVAS_DEC_HRTF_binary_open( 
            }

        }



#ifdef FIX_1228_SAMPLING_RATE_MISMATCH_IN_HRTF_FILE

        if ( st_ivas->hHrtfStatistics == NULL && ( binaural_renderer == IVAS_BIN_RENDERER_TYPE_FASTCONV || binaural_renderer == IVAS_BIN_RENDERER_TYPE_CREND ) && st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

#else

        if ( st_ivas->hHrtfStatistics == NULL )

#endif

        {

            if ( ( error = ivas_HRTF_statistics_binary_open( &st_ivas->hHrtfStatistics ) ) != IVAS_ERR_OK )

            {