Commit 97bd8882 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'accept-mdct-st-plc-fadeout-switches' into 'main' 

Accept mdct st plc fadeout switches

See merge request !205
parents bffe3c8f 37bf5da7

lib_com/ivas_cnst.h

+0 −4
Original line number Diff line number Diff line
@@ -793,14 +793,11 @@ enum fea_names 
#define MAX_MDCT_ITD_BRATE                      IVAS_64k



#define SNS_LOW_BR_MODE                         -1

#ifdef MDCT_STEREO_PLC_FADE_2_BG_NOISE

#define SNS_NPTS                                16 /* Number of downsampled SNS parameters */



#define MDCT_ST_PLC_FADEOUT_MIN_NOISE_NRG       0.001f

#ifdef FADE_TO_ZERO_FOR_TOO_LONG_FRAMELOSS

#define MDCT_ST_PLC_FADEOUT_MAX_CONC_FRAME      2 * FRAMES_PER_SEC

#define MDCT_ST_PLC_FADEOUT_TO_ZERO_LEN         20

#endif



typedef enum {

    EQUAL_CORES,
@@ -812,7 +809,6 @@ typedef enum { 
    ON_FIRST_LOST_FRAME,

    ON_FIRST_GOOD_FRAME,

} TONALMDCTCONC_NOISE_SHAPE_WHITENING_MODE;

#endif





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

lib_com/ivas_prot.h

+0 −14
Original line number Diff line number Diff line
@@ -1985,9 +1985,7 @@ void decoder_tcx_invQ( 


void decoder_tcx_noisefilling(

    Decoder_State *st,                                          /* i/o: coder memory state                      */

#ifdef MDCT_STEREO_PLC_FADE_2_BG_NOISE

    float concealment_noise[L_FRAME48k],

#endif

    const float A[],                                            /* i  : coefficients NxAz[M+1]                  */

    const int16_t L_frameTCX_glob,

    const int16_t L_spec,
@@ -2000,9 +1998,7 @@ void decoder_tcx_noisefilling( 
    const int16_t *prm_sqQ,

    int16_t nf_seed,

    const int16_t bfi,                                          /* i  : Bad frame indicator                     */

#ifdef MDCT_STEREO_PLC_FADE_2_BG_NOISE

    const int16_t isMCT,

#endif

    const int16_t frame_cnt                                     /* i  : frame counter in the super frame        */

);
@@ -2085,12 +2081,8 @@ void decoder_tcx_IGF_stereo( 
    const int16_t L_frame,                                      /* i  : frame length                            */

    const int16_t left_rect,                                    /* i  : left part is rectangular                */

    const int16_t k,                                            /* i  : Subframe index                          */

#ifdef MDCT_STEREO_PLC_FADE_2_BG_NOISE

    const int16_t bfi,                                          /* i  : bad frame indicator                     */

    const int16_t is_mct                                        /* i  : flag to signal MCT or SMDCT                         */

#else

    const int16_t bfi                                           /* i  : bad frame indicator                     */

#endif

);



void ms_processing(
@@ -2123,12 +2115,8 @@ void IGFDecApplyStereo( 
    const int16_t igfGridIdx,                                   /* i  : in case of CELP->TCX switching, use 1.25 framelength */

    const int16_t *coreMsMask,

    const int16_t restrict_hopsize,

#ifdef MDCT_STEREO_PLC_FADE_2_BG_NOISE

    const int16_t bfi,                                          /* i  : frame loss == 1, frame good == 0        */

    const int16_t bfi_apply_damping                                  /* i  : decoder element mode                    */

#else

    const int16_t bfi                                           /* i  : frame loss == 1, frame good == 0        */

#endif

);



void IGFEncStereoEncoder(
@@ -5490,7 +5478,6 @@ ivas_error ivas_orient_trk_GetTrackedOrientation( 
    float *roll 

);



#ifdef MDCT_STEREO_PLC_FADE_2_BG_NOISE

void TonalMdctConceal_create_concealment_noise(

    float concealment_noise[L_FRAME48k],

    CPE_DEC_HANDLE hCPE,
@@ -5514,7 +5501,6 @@ int16_t get_igf_startline( 
    int16_t L_frame,

    int16_t L_frameTCX

);

#endif



float rand_triangular_signed(

    int16_t *seed );

lib_com/ivas_sns_com.c

+0 −4
Original line number Diff line number Diff line
@@ -37,15 +37,12 @@ 
#include "ivas_prot.h"

#include "rom_com.h"

#include <math.h>

#ifdef MDCT_STEREO_PLC_FADE_2_BG_NOISE

#include <assert.h>

#endif

#ifdef DEBUGGING

#include "debug.h"

#endif

#include "wmops.h"



#ifdef MDCT_STEREO_PLC_FADE_2_BG_NOISE



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

 * sns_compute_scf()
@@ -212,7 +209,6 @@ void sns_compute_scf( 


    return;

}

#endif



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

 * sns_interpolate_scalefactors()

lib_com/ivas_stereo_psychlpc_com.c

+0 −3
Original line number Diff line number Diff line
@@ -68,9 +68,6 @@ static void SpectrumWeighting_Init( 
 *  initialize a PsychoacousticParameters structure

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



#ifndef MDCT_STEREO_PLC_FADE_2_BG_NOISE

static

#endif

    ivas_error

    PsychoacousticParameters_Init(

        const int32_t sr_core,  /* i  : sampling rate of core-coder                                     */

lib_com/options.h

+0 −2
Original line number Diff line number Diff line
@@ -142,8 +142,6 @@ 
#define DISABLE_ADAP_RES_COD_TMP                        /* temporary fix for IVAS-403, disables adaptive residual coding */

/*#define ITD_WINNER_GAIN_MODIFY */                     /* ITD optimization - WORK IN PROGRESS */

/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

#define MDCT_STEREO_PLC_FADE_2_BG_NOISE                /* IVAS-185 fix bug in TCX-PLC fadeout for MDCT-Stereo and improve fadeout by fading to background noise instead of white noise */

#define FADE_TO_ZERO_FOR_TOO_LONG_FRAMELOSS

/*#define FIX_I1_113*/                                  /* under review : MCT bit distribution optimization for SBA high bitrates*/



#define FIX_I13_TCX_TNS_ISSUE                           /* Issue 13: Fix reported artifacts. Bug in TNS with TCX5 */