Commit 2b261853 authored by emerit's avatar emerit
Browse files

make switch FIX_989_TD_REND_ROM independant

parent 61f0762e

apps/decoder.c

+4 −0
Original line number Diff line number Diff line
@@ -613,7 +613,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
@@ -996,7 +996,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
@@ -1695,7 +1695,7 @@ typedef enum 
#define ONE_BY_360_Q15                          ( 91 )          // Q15

#define ONE_BY_180_Q31                          ( 11930465 )    // Q31



#ifdef FIX_CREND_SIMPLIFY_CODE

#ifdef FIX_989_TD_REND_ROM

#define RESAMPLE_FACTOR_16_48_FX ( 5461 )  // Q14

#define RESAMPLE_FACTOR_32_48_FX ( 10922 ) // Q14

#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,
@@ -253,7 +253,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
@@ -107,7 +107,8 @@ 
#define NONBE_FIX_1143_MASA_BRSW                        /* Nok: Fix for issue 1143: MSAN use of uninitialized value in masa decoding to binaural with dtx bitrate switching and 5 % FER */

#define NONBE_FIX_1220_OMASA_JBM_EXT_USAN               /* Nokia: fix issue 1220 OMASA EXT JBM USAN, also fix similar cases of free to avoid future problems */

#define NONBE_FIX_1376_MDCT_CONCEALMENT                 /* FhG: fix concealment artifact in MDCT Stereo with DTX, in case transition frame gets lost */

#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 */

#define USE_CREND_16BIT_ROM