Commit 3dddbd81 authored by emerit's avatar emerit
Browse files

version ready for cross check

parent 46b594e4

lib_com/options.h

+3 −3
Original line number Diff line number Diff line
@@ -118,9 +118,9 @@ 
#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_REVERB_16BIT_ROM

#define USE_TDREND_16BIT_ROM                           /* when active some tests case with 4 ISM fail due to owerflow in round_fixed function */

#define USE_FASTCONV_PARAMBIN_16BIT_ROM

//#define USE_REVERB_16BIT_ROM

//#define USE_TDREND_16BIT_ROM                           /* when active some tests case with 4 ISM fail due to owerflow in round_fixed function */

//#define USE_FASTCONV_PARAMBIN_16BIT_ROM

#endif

#define NONBE_1377_REND_DIRATT_CONF                     /* Eri: Issue 1377: Error in directivity attenuation configuration for both IVAS_dec and IVAS_rend */

lib_rend/ivas_crend_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -2057,7 +2057,7 @@ ivas_error ivas_rend_openCrend( 
                hCrend->hReverb = NULL;

            }

#ifdef FIX_CREND_SIMPLIFY_CODE

            ( *pCrend )->binaural_latency_ns = L_shr_r( Mpy_32_32_r( ( *pCrend )->hHrtfCrend->latency_s_fx, 1000000000 ), ( *pCrend )->hHrtfCrend->factor_Q_latency_s_fx );

            ( *pCrend )->binaural_latency_ns = L_shr_r( Mpy_32_32_r( ( *pCrend )->hHrtfCrend->latency_s_fx, (Word32) 1000000000 ), ( *pCrend )->hHrtfCrend->factor_Q_latency_s_fx );

#else

            ( *pCrend )->binaural_latency_ns = Mult_32_32( ( *pCrend )->hHrtfCrend->latency_s_fx, (Word32) 1000000000 );

#endif

lib_rend/ivas_rom_binauralRenderer.h

+2 −2
Original line number Diff line number Diff line
@@ -102,6 +102,8 @@ extern const Word16 parametricReverberationEneCorrections_fx[CLDFB_NO_CHANNELS_M 
extern const Word16 parametricEarlyPartEneCorrection_fx[CLDFB_NO_CHANNELS_MAX];      /* Q28 */



#else

/* Binaural rendering data set based on HRIRs */

extern const Word32 FASTCONV_HRIR_latency_s_fx;

extern Word32 leftHRIRReal_HOA3_fx[BINAURAL_CONVBANDS][HOA3_CHANNELS][BINAURAL_NTAPS_SBA];  /* Q29 */

extern Word32 leftHRIRImag_HOA3_fx[BINAURAL_CONVBANDS][HOA3_CHANNELS][BINAURAL_NTAPS_SBA];  /* Q29 */

extern Word32 rightHRIRReal_HOA3_fx[BINAURAL_CONVBANDS][HOA3_CHANNELS][BINAURAL_NTAPS_SBA]; /* Q29 */
@@ -124,8 +126,6 @@ extern Word32 FASTCONV_FOA_latency_s_fx; 
extern Word16 hrtfShCoeffsRe_fx[BINAURAL_CHANNELS][HRTF_SH_CHANNELS][HRTF_NUM_BINS]; /* Q14 */

extern Word16 hrtfShCoeffsIm_fx[BINAURAL_CHANNELS][HRTF_SH_CHANNELS][HRTF_NUM_BINS]; /* Q14 */



/* Binaural rendering data set based on HRIRs */

extern const Word32 FASTCONV_HRIR_latency_s_fx;

/* Binaural rendering data set based on BRIRs */

extern const Word32 FASTCONV_BRIR_latency_s_fx;

extern Word32 leftBRIRReal_fx[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][BINAURAL_NTAPS_MAX];  /* Q29 */

lib_rend/ivas_rom_binaural_crend_head_fx.c

+56 −56

File changed.

Contains only whitespace changes.