Commit 0e6921e0 authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_FIX_1006_PAST_DMX_NRG_ERROR

parent a7b4b50e

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -164,7 +164,6 @@ 
/* any switch which is non-be wrt selection floating point code */

/* all switches in this category should start with "NONBE_" */



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

#define NONBE_FIX_1010_STEREO_CNG_DIV_BY_ZERO                 /* Eri: Issue 1010: Division by zero in Stereo CNG */



/* ##################### End NON-BE switches ########################### */

lib_dec/ivas_stereo_dft_dec_dmx.c

+0 −4
Original line number Diff line number Diff line
@@ -229,11 +229,7 @@ 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*/