Commit 6fbdff39 authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_FIX_947_STEREO_DMX_ROMOPT

parent 5aae34ae

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -171,7 +171,6 @@ 
/* all switches in this category should start with "NONBE_" */



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

#define NONBE_FIX_947_STEREO_DMX_ROMOPT                       /* Orange: ROM optimisation for POC*/  

#define NONBE_FIX_947_STEREO_DMX_EVS_PHA                      /* Orange: Fix issues on PHA */

#ifdef NONBE_FIX_947_STEREO_DMX_EVS_PHA

#define NONBE_FIX_947_STEREO_DMX_FADOPT                       /* Orange: Fading optimisation */

lib_enc/ivas_stereo_dmx_evs.c

+0 −36
Original line number Diff line number Diff line
@@ -1226,7 +1226,6 @@ static void weighted_ave( 
)

{



#ifdef NONBE_FIX_947_STEREO_DMX_ROMOPT



    int16_t i, len, len2;

    float gain_tmp = 0.f, gain_sub;
@@ -1250,25 +1249,6 @@ static void weighted_ave( 
        dst[i] = src1[i] * gain + src2[i] * ( 1.0f - gain_tmp );

    }



#else



    int16_t i, len;

    float gain_tmp = 0.f, gain_sub;



    len = input_frame >> 1;

    gain_sub = gain - old_gain;



    for ( i = 0; i < len; i++ )

    {

        gain_tmp = old_gain + gain_sub * wnd[i];

        dst[i] = src1[i] * gain_tmp + src2[i] * ( 1.0f - gain_tmp );

    }

    for ( ; i < input_frame; i++ )

    {

        dst[i] = src1[i] * gain + src2[i] * ( 1.0f - gain_tmp );

    }



#endif





    return;
@@ -1388,7 +1368,6 @@ static void adapt_gain( 
)

{



#ifdef NONBE_FIX_947_STEREO_DMX_ROMOPT



    int16_t i, len, len2;

    float gain_tmp, gain_sub;
@@ -1408,21 +1387,6 @@ static void adapt_gain( 
        dst[i] = src[i] * gain_tmp;

    }



#else



    int16_t i, len;

    float gain_tmp, gain_sub;



    len = input_frame >> 1;

    gain_sub = gain - old_gain;



    for ( i = 0; i < len; i++ )

    {

        gain_tmp = old_gain + gain_sub * wnd[i];

        dst[i] = src[i] * gain_tmp;

    }



#endif



    for ( ; i < input_frame; i++ )

    {