Commit 079486cc authored by emerit's avatar emerit
Browse files

make switch FIX_989_TD_REND_ROM independant

parent db67d95d

apps/decoder.c

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

        }



#ifdef FIX_989_TD_REND_ROM

        if ( ( error = load_TDrend_HRTF_binary( *hHrtfTD, arg.output_Fs, hrtfReader ) ) != IVAS_ERR_OK )

#else

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

#endif

        {

            if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )

            {

apps/renderer.c

+1 −1
Original line number Diff line number Diff line
@@ -953,7 +953,7 @@ int main( 
                goto cleanup;

            }



#ifdef FIX_CREND_SIMPLIFY_CODE

#ifdef FIX_989_TD_REND_ROM

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

#else

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

lib_com/ivas_cnst.h

+1 −1
Original line number Diff line number Diff line
@@ -1534,7 +1534,7 @@ typedef enum 
#define MAX_ANGULAR_STEP_INV                    ( 1.0f / MAX_ANGULAR_STEP )

#define MAX_INTERPOLATION_STEPS                 12



#ifdef FIX_CREND_SIMPLIFY_CODE

#ifdef FIX_989_TD_REND_ROM

#define RESAMPLE_FACTOR_16_48                   ( 16.0f / 48.0f )

#define RESAMPLE_FACTOR_32_48                   ( 32.0f / 48.0f )

#endif

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_CREND_SIMPLIFY_CODE

#ifdef 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_CREND_SIMPLIFY_CODE

#ifdef FIX_989_TD_REND_ROM

        case IVAS_ERR_INVALID_HRTF_SAMPLING_RATE:

            return "Wrong sampling rate in HRTF binary file";

#endif

lib_com/options.h

+2 −1
Original line number Diff line number Diff line
@@ -160,7 +160,8 @@ 
#define FIX_1129_EXT_REND_OUTPUT_HIGH                   /* Philips: issue 1129: External renderer BINAURAL_ROOM_REVERB format output level too high compared to internal rendering output */

#define NONBE_1244_FIX_SWB_BWE_MEMORY                   /* VA: issue 1244: fix to SWB BWE memory in case of switching from FB coding - pending a review by Huawei */

#define FIX_1113_CLDFB_REND_IN_ISAR                     /* issue 1113: fix the use of CLDFB renderer in split-rendering at the external renderer */

#define FIX_CREND_SIMPLIFY_CODE   

#define FIX_989_TD_REND_ROM                             /* Eri: Clean-up for TD renderer and completion of ROM generation tool */

//#define FIX_CREND_SIMPLIFY_CODE   

#ifdef FIX_CREND_SIMPLIFY_CODE

#define FIX_989_TD_REND_ROM                             /* Eri: Clean-up for TD renderer and completion of ROM generation tool */

#endif