Commit bb24565a authored by multrus's avatar multrus
Browse files

[cleanup] accept NTT_UPDATE_ITD_SW

parent 7dcca215

lib_com/options.h

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




/* NTT switches */

#define NTT_UPDATE_ITD_SW                               /* contribution 4: Update of ITD switch in stereo downmix for EVS */

#define NTT_REMOVE_EPS_ROM                              /* contribution 4: Reduction of ROM size in stereo downmix for EVS */



#define SPAR_SCALING_HARMONIZATION                      /* issue 80: Changes to harmonize scaling in spar */

lib_enc/ivas_stereo_dmx_evs.c

+0 −15
Original line number Diff line number Diff line
@@ -445,20 +445,6 @@ static float find_poc_peak( 
        }

    }



#ifndef NTT_UPDATE_ITD_SW

    if ( on[0] && prev_off[0] )

    {

        *itd = (float) itdLR[0];

    }

    else if ( on[1] && prev_off[1] )

    {

        *itd = (float) itdLR[1];

    }

    else

    {

        *itd = ( *itd > 0 ) ? (float) itdLR[0] : (float) itdLR[1];

    }

#else

    if ( ( on[0] && prev_off[0] ) && ( on[1] && prev_off[1] ) ) /*if both channels have newly detected as active (possibility of preceding), select channel by peakness Q[] of POC */

    {

        *itd = ( Q[0] > Q[1] ) ? (float) itdLR[0] : (float) itdLR[1];
@@ -487,7 +473,6 @@ static float find_poc_peak( 
    {

        *itd = ( *itd > 0 ) ? (float) itdLR[0] : (float) itdLR[1];

    }

#endif



    cconfidence = sqrtf( fabsf( Q[0] - Q[1] ) ); /*higher value indicates higher confidence for one preceding channel*/