Commit de48fe9e authored by emerit's avatar emerit
Browse files

Merge branch 'float-pc' into 1741_ref_enable-new-hrtf-format

parents 0fdaf7e5 680487c8

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -202,6 +202,7 @@ 
#define FIX_INV_DIFFUSE_WEIGHT                          /* Orange : Fix error in energy compensation in late binaural */

#endif



#define FIX_1002_DEC_PHASE_ECU_USAN_OF_PHASE            /* Eri: issue #1002, usan-value-out-of-range-for-int16, kept BE for PLC-conditions   */

//#define FIX_777_COMBI_RENDER_CONFIG_FILE                /* Philips: Fix for combined renderer config file support */

#define NONBE_FIX_1004_USAN_DTX_MASA_NO_DIRS             /* Nokia: fix USAN error caused by non-setting of correctly the number of MASA directions in DTX */

/* #define NONBE_FIX_991_PARAMBIN_BINARY_HRTF */             /* Nokia: issue #991: fix using of binary file HRTF in ParamBin (to actiate when USE_NEW_HRTF_BINARY_FILE_FORMAT and FIX_777_COMBI_RENDER_CONFIG_FILE are on  )*/
@@ -210,6 +211,7 @@ 
#define FIX_998_UNUSED_FUNCTION                         /* FhG: issue 998: delete unused funtion ivas_dirac_dec_get_response_split_order */ 

#define NONBE_FIX_1014_1015_1016_OSBA_JBM_STEREO             /* FhG: issues #1014, #1015, #1016: fix tc buffer info update in the discrete ism renderer */

#define NONBE_FIX_987_PARAMC_BINAURAL_REVERB_RENDERING       /* FhG: issue 987: solution b: downmix HOA3 to stereo a input for the reverberator */

#define NONBE_FIX_1006_PAST_DMX_NRG_ERROR               /* Eri/FhG: Issue 1006: Bug fix in ivas_stereo_dft_dec not replicated in ivas_stereo_dft_dec_dmx */



/* #################### End BASOP porting switches ############################ */

lib_dec/FEC_HQ_phase_ecu.c

+10 −0
Original line number Diff line number Diff line
@@ -1092,7 +1092,13 @@ static void subst_spec( 
        }



        Xph = corr_phase[m];



#ifdef FIX_1002_DEC_PHASE_ECU_USAN_OF_PHASE

        /* extract fractional phase integer index in the range [0...1023] */

        Xph_short = (int16_t) ( 0x000003ff & (int32_t) ( ( Xph * 512 ) / EVS_PI ) );

#else

        Xph_short = (int16_t) ( ( (int32_t) ( Xph * 512 / EVS_PI ) ) % 32768 ) & 0x03ff;

#endif

        if ( Xph_short >= 512 )

        {

            sin_F = -sincos_t_ext[Xph_short - 512];
@@ -1136,7 +1142,11 @@ static void subst_spec( 
                    mag_chg_local *= 0.5f + ( 1.0f - ( 1.0f / PHASE_DITH ) * ph_dith ) * 0.5f;

                }



#ifdef FIX_1002_DEC_PHASE_ECU_USAN_OF_PHASE

                Xph_short = (int16_t) ( ( (int32_t) ( ( Xph * 512 ) / EVS_PI ) ) & 0x000003ff );

#else

                Xph_short = (int16_t) ( Xph * 512 / EVS_PI ) & 0x03ff;

#endif



                if ( Xph_short >= 512 )

                {

lib_dec/ivas_stereo_dft_dec_dmx.c

+4 −0
Original line number Diff line number Diff line
@@ -229,7 +229,11 @@ void stereo_dft_unify_dmx( 
        if ( st0->bfi && !prev_bfi )

        {

            int16_t idx_k0, idx_k1;

#ifdef NONBE_FIX_1006_PAST_DMX_NRG_ERROR

            idx_k0 = ( hStereoDft->past_DMX_pos + STEREO_DFT_PAST_MAX - 1 ) % STEREO_DFT_PAST_MAX;

#else

            idx_k0 = ( hStereoDft->past_DMX_pos + 1 ) % STEREO_DFT_PAST_MAX;

#endif

            idx_k1 = ( idx_k0 + 1 ) % STEREO_DFT_PAST_MAX;



            /*dmx energy memory*/