Commit 680487c8 authored by norvell's avatar norvell
Browse files

Merge branch '1710_ref_FlpPort1430' into 'float-pc' 

[Non-BE]1710 ref flp port1430

See merge request !1636
parents 6522f00a 1b385c51

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -211,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/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*/