Commit be76af46 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] accept NONBE_FIX_1006_PAST_DMX_NRG_ERROR

parent a9834331

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -122,7 +122,6 @@ 


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

/* #define NONBE_FIX_991_PARAMBIN_BINARY_HRTF   */           /* Nokia: issue #991: fix using of binary file HRTF in ParamBin (to activate when USE_NEW_HRTF_BINARY_FILE_FORMAT and FIX_777_COMBI_RENDER_CONFIG_FILE are on ) */

#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_fx.c

+0 −7
Original line number Diff line number Diff line
@@ -378,15 +378,8 @@ void stereo_dft_unify_dmx_fx( 
            Word16 idx_k0, idx_k1;

            Word16 q_shift0;

            Word16 q_shift1;

#ifdef NONBE_FIX_1006_PAST_DMX_NRG_ERROR

            idx_k0 = add( hStereoDft->past_DMX_pos, STEREO_DFT_PAST_MAX - 1 ) & ( STEREO_DFT_PAST_MAX - 1 ); /* Q0 */

            idx_k1 = add( idx_k0, 1 ) & ( STEREO_DFT_PAST_MAX - 1 );

#else

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

            move16();

            idx_k1 = ( add( idx_k0, 1 ) ) % STEREO_DFT_PAST_MAX;

            move16();

#endif

            q_shift0 = sub( hStereoDft->q_dft, hStereoDft->q_DFT_past_DMX_fx[idx_k0] );

            q_shift1 = sub( hStereoDft->q_dft, hStereoDft->q_DFT_past_DMX_fx[idx_k1] );