Commit e1f7d3f0 authored by vaclav's avatar vaclav
Browse files

Merge branch '427-function-maximum_s-returns-wrong-index' into 'main' 

Resolve "Function maximum_s() returns wrong index"

See merge request !594
parents d88924e2 d7db76e9

lib_com/options.h

+1 −2
Original line number Diff line number Diff line
@@ -166,9 +166,8 @@ 
#define FIX_SP2A                                        /* VA: Issue 412: Adjust threshold for the S_p2a feature in the tonal detector */

#define FIX_413_SBA_DTX                                 /* Dlb: Fix for issue 413, SBA DTX CNG in 2TC mode*/

#define FIX_417_TD_DECORR_BRATE_SW                      /* VA: Issue 417: fix incorrect use of TD decorrelator in bitrate switching */

#define FIX_427_MAXIMUM_S_INDEX                         /* VA: issue 427: fix return index of function maximum_s() */

#define FIX_431_PARAMMC_PLC_INTERPOLATOR                /* FhG: Issue 431: fix missing interpolator reset for ParamMC PCL */





#define LBR_SBA                                         /* Contribution 47: Master macro for low bitrate SBA (SPAR+DirAC) */

#ifdef LBR_SBA

#define LBR_SBA_BR_SWITCHING                            /* Clean up changes for SBA bitrate switching */

lib_com/tools.c

+3 −0
Original line number Diff line number Diff line
@@ -553,6 +553,9 @@ int16_t maximum_s( 
    {

        if ( vec[i] > tmp )

        {

#ifdef FIX_427_MAXIMUM_S_INDEX

            ind = i;

#endif

            tmp = vec[i];

        }

    }