Commit 9d1d7ebc authored by Jan Kiene's avatar Jan Kiene
Browse files

Modifications for MDCT-Stereo PLC fadeout

parent 08924bdb

lib_com/ivas_cnst.h

+1 −1
Original line number Diff line number Diff line
@@ -797,7 +797,7 @@ enum fea_names 
#define MAX_MDCT_ITD_BRATE                      IVAS_64k



#define SNS_LOW_BR_MODE                         -1

#ifdef FIX_IVAS_185_MDCT_ST_PLC_FADEOUT

#ifdef MDCT_STEREO_PLC_FADE_2_BG_NOISE

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



#define MDCT_ST_PLC_FADEOUT_START_FRAME         3

lib_com/ivas_prot.h

+4 −4
Original line number Diff line number Diff line
@@ -1945,7 +1945,7 @@ void decoder_tcx_invQ( 
    const int16_t **prm_sqQ,

    int16_t *nf_seed,

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

#ifdef FIX_IVAS_185_MDCT_ST_PLC_FADEOUT

#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        */
@@ -1953,7 +1953,7 @@ void decoder_tcx_invQ( 


void decoder_tcx_noisefilling(

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

#ifdef FIX_IVAS_185_MDCT_ST_PLC_FADEOUT

#ifdef MDCT_STEREO_PLC_FADE_2_BG_NOISE

    float concealment_noise[L_FRAME48k],

#endif

    const float A[],                                            /* i  : coefficients NxAz[M+1]                  */
@@ -1968,7 +1968,7 @@ void decoder_tcx_noisefilling( 
    const int16_t *prm_sqQ,

    int16_t nf_seed,

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

#ifdef FIX_IVAS_185_MDCT_ST_PLC_FADEOUT

#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        */
@@ -5617,7 +5617,7 @@ ivas_error ivas_orient_trk_GetTrackedOrientation( 
    float *roll 

);



#ifdef FIX_IVAS_185_MDCT_ST_PLC_FADEOUT

#ifdef MDCT_STEREO_PLC_FADE_2_BG_NOISE

void TonalMdctConceal_create_concealment_noise(

    float concealment_noise[L_FRAME48k],

    CPE_DEC_HANDLE hCPE,

lib_com/ivas_sns_com.c

+2 −2
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
#include "ivas_prot.h"

#include "rom_com.h"

#include <math.h>

#ifdef FIX_IVAS_185_MDCT_ST_PLC_FADEOUT

#ifdef MDCT_STEREO_PLC_FADE_2_BG_NOISE

#include <assert.h>

#endif

#ifdef DEBUGGING
@@ -45,7 +45,7 @@ 
#endif

#include "wmops.h"



#ifdef FIX_IVAS_185_MDCT_ST_PLC_FADEOUT

#ifdef MDCT_STEREO_PLC_FADE_2_BG_NOISE



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

 * sns_compute_scf()

lib_com/ivas_stereo_psychlpc_com.c

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ static void SpectrumWeighting_Init( 
 *  initialize a PsychoacousticParameters structure

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



#ifndef FIX_IVAS_185_MDCT_ST_PLC_FADEOUT

#ifndef MDCT_STEREO_PLC_FADE_2_BG_NOISE

static

#endif

    ivas_error

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ 




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

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

/*#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 FIX_IVAS_180_PLC_SIGNAL_LAST_OVLP_IN_TCX10      /* IVAS-180 write last overlap mode in TCX10 frames to allow for correct TCX10/TCX5 subframe decomposition in TCX10 frames after a lost frame */

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