Commit 4bbe1428 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] accept NONBE_FIX_947_STEREO_DMX_FADOPT

parent 2fab46b1

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -114,7 +114,6 @@ 
#define FIX_699_FILE_READER_JBM_TSM                     /* VA: issue 699: complement FileReader_getFilePath() logic for TSM and JBM */

#define FIX_997_REMOVE_SPAR_DEC_UPMIXER                 /* VA: issue 997: remove obsolete function ivas_spar_dec_upmixer() */



#define NONBE_FIX_947_STEREO_DMX_FADOPT                       /* Orange: Fading optimisation */  

#define NONBE_FIX_978_MC_TDREND_REVERB                  /* Eri : activate reverb for TDREND with headtracking */

#define NONBE_FIX_999_JBM_MCT_FLUSH                           /* FhG: issue #999: fix wrong flushing for MCT at a JBM rate switch */

#define FIX_1003_PARAMISM_BINAURAL_RECONFIG_USAN        /* FhG: fix for #1003: fix USAN caused by ParamISM reconfig                    */

lib_enc/ivas_stereo_dmx_evs_fx.c

+0 −35
Original line number Diff line number Diff line
@@ -101,9 +101,7 @@ 
#define STEREO_DMX_EVS_POC_RENORM_SHIFT 3



#define STEREO_DMX_EVS_FAD_R 3

#ifdef NONBE_FIX_947_STEREO_DMX_FADOPT

#define STEREO_DMX_EVS_FAD_IR 10923 /* 1/3 in Q15 */

#endif

#define STEREO_DMX_EVS_SGC_EGY_FORGETTING_Q15 29491 // 0.9f

#define STEREO_DMX_EVS_SGC_GR_S               32919 // 1.00461543f

#define STEREO_DMX_EVS_SGC_GIR_S              32617 // 1/1.00461543f
@@ -2138,11 +2136,7 @@ void stereo_dmx_evs_enc_fx( 
    Word16 n;

    Word16 dmx_weight, corr; // Q15



#ifdef NONBE_FIX_947_STEREO_DMX_FADOPT

    Word16 k, m, pha_len, fad_len, sbfad_len;

#else

    Word16 k, m, pha_len, fad_len;

#endif



    Word32 data_fx[CPE_CHANNELS][L_FRAME48k]; // Q16/Q11
@@ -2545,21 +2539,9 @@ void stereo_dmx_evs_enc_fx( 
        ELSE

        {

            hPHA->n_fad_g = sub( input_frame, add( hPHA->n_fad_g, 1 ) );

#ifdef NONBE_FIX_947_STEREO_DMX_FADOPT

            hPHA->n_fad_cnt = 0;

            move16();

#else

            IF( EQ_16( is_transient, 1 ) )

            {

            hPHA->n_fad_cnt = 0;

            move16();

        }

            ELSE

            {

                hPHA->n_fad_cnt = sub( n_fad_r, hPHA->n_fad_cnt );

            }

#endif

        }

    }

    ELSE IF( is_transient )

    {
@@ -2579,7 +2561,6 @@ void stereo_dmx_evs_enc_fx( 
        move16();

        m_fad_g = sub( input_frame, add( n_fad_g, 1 ) );



#ifdef NONBE_FIX_947_STEREO_DMX_FADOPT

        IF( EQ_16( n_fad_r, 1 ) )

        {

            n_fad_cnt = 0;
@@ -2645,22 +2626,6 @@ void stereo_dmx_evs_enc_fx( 
                }

            }

        }

#else

        FOR( n = 0; n < fad_len; n++ )

        {

            p_dmx_data[n] = Mpy_32_32( p_dmx_data[n], fad_g[n_fad_g] );                                // Q26;

            p_dmx_data[n] = L_add_sat( p_dmx_data[n], Mpy_32_32( fad_g[m_fad_g], p_dmx_data_fo[n] ) ); // Q26



            n_fad_cnt = add( n_fad_cnt, 1 );

            IF( GE_16( n_fad_cnt, n_fad_r ) )

            {

                n_fad_cnt = 0;

                move16();

                n_fad_g = add( n_fad_g, 1 );

                m_fad_g = sub( m_fad_g, 1 );

            }

        }

#endif



        hPHA->n_fad_g = n_fad_g;

        hPHA->n_fad_cnt = n_fad_cnt;