Commit d61c162f authored by TYAGIRIS's avatar TYAGIRIS
Browse files

Merge branch '1330_basop_split_rendering_porting' into 1330_basop_test_split_rendering_ci

parents 17167fdb ffec7e4b

apps/isar_post_rend.c

+1 −1
Original line number Diff line number Diff line 
/******************************************************************************************************



   (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,

   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,

   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,

   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,

   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other

lib_com/cnst.h

+4 −0
Original line number Diff line number Diff line
@@ -935,6 +935,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/ivas_rotation_com.c

+1 −1
Original line number Diff line number Diff line 
/******************************************************************************************************



   (C) 2022-2023 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,

   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,

   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,

   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,

   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -170,6 +170,8 @@ 
#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 */





/* #################### Start BASOP porting switches ############################ */

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;