Commit bce5df99 authored by TYAGIRIS's avatar TYAGIRIS
Browse files

Merge branch '1328_basop_merge_main_to_main_pc' into 'main-pc' 

[Renderer Non-BE][non-BE][allow regression] merge main to main-pc to fix crashes

See merge request !1201
parents e31ba67e da982026

lib_com/cnst.h

+4 −0
Original line number Diff line number Diff line
@@ -932,6 +932,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_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -170,4 +170,6 @@ 
#define FIX_1298                                /* VA: fix possible assert in gaus_enc */

#define FIX_1300_ICA_SHIFT_QUANT_IMPROV         /* VA: Fix to 1300 to improve precision of the lag quantizer */

#define FIX_1301_CORRECT_TD_CNST                /* VA: Fix 1301, correct wrong constant in TD stereo */

#define NONBE_FIX_1277_EVS_DTX_HIGH_RATE_THRESHOLD      /* VA/Eri: FLP issue 1277: Fix Mismatch in DTX high-rate threshold between EVS float and BASOP */

#define NONBE_FIX_708_OSBA_BR_SWITCHING_CRASH   /* FhG: issue 708: fix crash in OSBA BR switching with long test vectors */

#endif

lib_com/stat_com.h

+2 −1
Original line number Diff line number Diff line
@@ -197,7 +197,8 @@ typedef struct TNS_filter_structure 
    Word16 order;                           /* Filter order. */

    Word16 coefIndex[TNS_MAX_FILTER_ORDER]; /* Quantized filter coefficients. */

    Word16 predictionGain;                  /* Prediction gain. The ratio of a signal and TNS residual energy. E(PRED_GAIN_E), Q7 */

    Word32 predictionGain32;                /* Prediction gain. The ratio of a signal and TNS residual energy. E(PRED_GAIN_E), Q23 */

    Word32 predictionGain32;                /* Prediction gain. The ratio of a signal and TNS residual energy.  predictionGain_e */

    Word16 predictionGain_e;                /*Exponent for predictionGain32 */

    Word16 avgSqrCoef;                      /* Average squared filter coefficient. E(0), Q15 */

} STnsFilter;

lib_com/tns_base.c

+2 −0
Original line number Diff line number Diff line
@@ -1204,6 +1204,8 @@ void ResetTnsData( STnsData *pTnsData ) 
        move16();

        pTnsFilter->predictionGain32 = ONE_IN_Q23; /*Q23*/

        move32();

        pTnsFilter->predictionGain_e = PRED_GAIN_E;

        move16();

        pTnsFilter->avgSqrCoef = 0;

        move16();

        pTnsFilter->filterType = TNS_FILTER_OFF; /*Q0*/

lib_dec/ivas_sba_dec.c

+5 −0
Original line number Diff line number Diff line
@@ -351,7 +351,12 @@ ivas_error ivas_sba_dec_reconfigure_fx( 
        test();

        test();

        test();

#ifdef NONBE_FIX_708_OSBA_BR_SWITCHING_CRASH

        test();

        IF( hSpar->hPCA == NULL && EQ_32( st_ivas->hDecoderConfig->ivas_total_brate, PCA_BRATE ) && EQ_16( st_ivas->sba_order, 1 ) && ( EQ_32( st_ivas->ivas_format, SBA_FORMAT ) || EQ_32( st_ivas->ivas_format, SBA_ISM_FORMAT ) ) )

#else

        IF( hSpar->hPCA == NULL && EQ_32( st_ivas->hDecoderConfig->ivas_total_brate, PCA_BRATE ) && EQ_16( st_ivas->sba_order, 1 ) && EQ_32( st_ivas->ivas_format, SBA_FORMAT ) )

#endif

        {

            IF( ( hSpar->hPCA = (PCA_DEC_STATE *) malloc( sizeof( PCA_DEC_STATE ) ) ) == NULL )

            {