Commit c6bae996 authored by vaclav's avatar vaclav
Browse files

Merge branch... 

Merge branch '1277-evs-float-and-basop-have-different-thresholds-for-dtx-high-rate-activation-ism' into 'main'

[non-BE] Resolve "EVS float and BASOP have different thresholds for DTX high-rate activation, ISM DTX part"

See merge request !2020
parents 5a682e96 0e21195e

lib_com/cnst.h

+4 −0
Original line number Diff line number Diff line
@@ -742,6 +742,10 @@ typedef enum 
#define GAIN_PRED_ORDER                     4                       /* Gain quantization - prediction order for gain quantizer (only for AMR-WB IO mode) */

#define MEAN_ENER                           30                      /* Gain quantization - average innovation energy */



#ifdef NONBE_FIX_1277_EVS_DTX_HIGH_RATE_THRESHOLD

#define DTX_THR                             5                       /* DTX - lp_noise threshold for DTX at higher bitrates */

#endif



#define DTX_HIST_SIZE                       8                       /* CNG & DTX - number of last signal frames used for CNG averaging */

#define CNG_ISF_FACT                        0.9f                    /* CNG & DTX - CNG spectral envelope smoothing factor */

#define STEP_AMR_WB_SID                     2.625f                  /* CNG & DTX - CNG energy quantization step */

lib_enc/dtx.c

+0 −2
Original line number Diff line number Diff line
@@ -68,10 +68,8 @@ 


#ifdef NONBE_FIX_1277_EVS_DTX_HIGH_RATE_THRESHOLD

#define DTX_THR_EVS 15 /* lp_noise threshold for DTX at higher bitrates in EVS */ // ToDo: to be removed once EVS is CR fixed

#define DTX_THR     5                                                             /* lp_noise threshold for DTX at higher bitrates */

#endif





/*-------------------------------------------------------------------*

 * Local function prototypes

 *-------------------------------------------------------------------*/

lib_enc/ivas_ism_dtx_enc.c

+4 −0
Original line number Diff line number Diff line
@@ -155,7 +155,11 @@ int16_t ivas_ism_dtx_enc( 
            ( nchan_ism == 2 && ivas_total_brate <= IVAS_48k ) ||

            ( nchan_ism == 3 && ivas_total_brate <= IVAS_80k ) ||

            ( nchan_ism == 4 && ivas_total_brate <= IVAS_96k ) ||

#ifdef NONBE_FIX_1277_EVS_DTX_HIGH_RATE_THRESHOLD

            lp_noise_max < DTX_THR ) )

#else

            lp_noise_max < 15 ) )

#endif

    {

        dtx_flag = 0;

    }