Commit 0cf25b6a authored by emerit's avatar emerit
Browse files

update switchs

parent a3764bf2

apps/decoder.c

+5 −1
Original line number Diff line number Diff line
@@ -3821,7 +3821,11 @@ static ivas_error load_hrtf_from_file( 
                return error;

            }



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

#ifdef FIX_989_TD_REND_ROM

            if ( ( error = load_TDrend_HRTF_binary( *hHrtfBinary->hHrtfTD, arg.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 )

                {

lib_com/ivas_error.h

+2 −2
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ typedef enum 
    IVAS_ERR_DIRECTIVITY_NOT_SUPPORTED,

    IVAS_ERR_ACOUSTIC_ENVIRONMENT_NOT_SUPPORTED,

    IVAS_ERR_INVALID_HRTF,

#ifdef FIX_989_TD_REND_ROM

#if defined FIX_CREND_SIMPLIFY_CODE || defined FIX_989_TD_REND_ROM

    IVAS_ERR_INVALID_HRTF_SAMPLING_RATE,

#endif

    IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA,
@@ -259,7 +259,7 @@ static inline const char *ivas_error_to_string( ivas_error error_code ) 
            return "Acoustic environment not supported";

        case IVAS_ERR_INVALID_HRTF:

            return "Unsupported HRTF filter set";

#ifdef FIX_989_TD_REND_ROM

#if defined FIX_CREND_SIMPLIFY_CODE || defined FIX_989_TD_REND_ROM

        case IVAS_ERR_INVALID_HRTF_SAMPLING_RATE:

            return "Wrong sampling rate in HRTF binary file";

#endif

lib_rend/ivas_rom_TdBinauralRenderer.h

+4 −0
Original line number Diff line number Diff line
@@ -47,7 +47,11 @@ 
 *------------------------------------------------------------------------*/

/* TD renderer default HRIR model */

extern const float defaultHRIR_rom_latency_s;

#ifdef FIX_989_TD_REND_ROM

extern const int16_t defaultHRIR_rom_model_configuration[6];

#else

extern const int16_t defaultHRIR_rom_azimDim2[15];

#endif

extern const int16_t defaultHRIR_rom_azimDim3[15];

extern const int16_t defaultHRIR_rom_azim_start_idx[15];

extern const int16_t defaultHRIR_rom_azimSegSamples[1];

lib_util/hrtf_file_reader.c

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 


#include "hrtf_file_reader.h"

#include <string.h>

#ifdef FIX_989_TD_REND_ROM

#if defined FIX_989_TD_REND_ROM || defined FIX_CREND_SIMPLIFY_CODE

#include <math.h>

#include <stdlib.h>

#else
@@ -64,7 +64,7 @@ typedef struct ivas_hrtfs_file_header_t 


} ivas_hrtfs_file_header_t;



#ifndef FIX_CREND_SIMPLIFY_CODE

#ifndef FIX_989_TD_REND_ROM



/*---------------------------------------------------------------------*

 * Local constants