Commit 863efc36 authored by Fabian Bauer's avatar Fabian Bauer
Browse files

deactivate all macros of harmonization, activate separate tonalconcealinit

parent f4c2c3dd

lib_com/options.h

+2 −1
Original line number Diff line number Diff line
@@ -109,10 +109,11 @@ 
#define FIX_2570_BUF_OVFL                               /* Orange: basop issue 2570: global-buffer-overflow in lib_rend/ivas_objectRenderer_sources_fx.c */

#define FIX_1550_WRONG_RENDER_FRAMESIZE_PRINTOUT        /* Dolby: float issue 1550: Wrong render framesize printout */

#define HARMONIZE_2553_TonalConceal_Apply               /* FhG: Harmonize TonalMDCTConceal_Apply with its ivas derivate */

//#define HARMONIZE_2553_TonalConceal_Init                /* FhG: Harmonize TonalMDCTConceal_Init with its ivas derivate */

#define HARMONIZE_2553_TonalConceal_Init                /* FhG: Harmonize TonalMDCTConceal_Init with its ivas derivate */

#define HARMONIZE_2553_TonalConceal_SaveFreqSignal      /* FhG: Harmonize TonalConceal_SaveFreqSignal with its ivas derivate */

#define HARMONIZE_2553_TonalConceal_SaveTimeSignal      /* FhG: Harmonize TonalConceal_SaveTimeSignal with its ivas derivate */

#define HARMONIZE_2583_open_decoder_LPD             /* FhG: harmonize open_decoder_LPD between EVS and IVAS versions */

#define HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit /*devlop: get EVS/IVAS init for tonal concealment back*/



/* #################### End BE switches ################################## */

lib_com/prot_fx.h

+2 −2
Original line number Diff line number Diff line
@@ -5556,7 +5556,7 @@ void RefineTonalComponents_fx( 
    const Word16 element_mode,

    const PsychoacousticParameters *psychParamsCurrent );



#ifndef HARMONIZE_2553_TonalConceal_Init

#if !defined( HARMONIZE_2553_TonalConceal_Init ) || defined( HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit )

ivas_error TonalMDCTConceal_Init_fx(

    TonalMDCTConcealPtr self,

    const Word16 nSamples,
@@ -5566,7 +5566,7 @@ ivas_error TonalMDCTConceal_Init_fx( 
);

#endif



#ifdef HARMONIZE_2553_TonalConceal_Init

#if defined( HARMONIZE_2553_TonalConceal_Init ) && !defined( HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit )

ivas_error TonalMDCTConceal_Init_fx(

    Word16 element_mode,

#else

lib_dec/core_dec_init_fx.c

+9 −9
Original line number Diff line number Diff line
@@ -908,7 +908,7 @@ void open_decoder_LPD_fx( 
        st->hTonalMDCTConc->lastBlockData.nSamples = 0;

        move16();



#ifdef HARMONIZE_2553_TonalConceal_Init

#if defined( HARMONIZE_2553_TonalConceal_Init ) && !defined( HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit )

        TonalMDCTConceal_Init_fx( EVS_MONO, st->hTonalMDCTConc, hTcxDec->L_frameTCX, st->L_frame, FDNS_NPTS, st->hTcxCfg );

#else

        TonalMDCTConceal_Init_fx( st->hTonalMDCTConc, hTcxDec->L_frameTCX, st->L_frame, FDNS_NPTS, st->hTcxCfg );
@@ -1120,7 +1120,7 @@ void open_decoder_LPD_ivas_fx( 
    hTcxLtpDec = st->hTcxLtpDec;

    hTcxDec = st->hTcxDec;



#ifdef HARMONIZE_2583_open_decoder_LPD

#ifdef HARMONIZE_2583_open_decoder_LPD_

    if ( EQ_16( st->element_mode, EVS_MONO ) )

    {

        st->total_brate = total_brate;
@@ -1186,7 +1186,7 @@ void open_decoder_LPD_ivas_fx( 
    }

    st->bits_frame = extract_l( L_shr( Mpy_32_16_1( L_shl( st->total_brate, 1 ), 20972 ), 6 ) ); /* 20972 = 0.01 * 64 * 32768 */

    move16();

#ifdef HARMONIZE_2583_open_decoder_LPD

#ifdef HARMONIZE_2583_open_decoder_LPD_

    IF( EQ_16( st->element_mode, EVS_MONO ) )

    {

        assert( FSCALE_DENOM == 512 );
@@ -1255,7 +1255,7 @@ void open_decoder_LPD_ivas_fx( 
    }



    test();

#ifdef HARMONIZE_2583_open_decoder_LPD

#ifdef HARMONIZE_2583_open_decoder_LPD_

    /*TODO: CHECK THIS*/

    IF( EQ_32( st->sr_core, INT_FS_16k ) )

    {
@@ -1376,7 +1376,7 @@ void open_decoder_LPD_ivas_fx( 


        IF( st->hTcxDec != NULL )

        {

#ifdef HARMONIZE_2583_open_decoder_LPD

#ifdef HARMONIZE_2583_open_decoder_LPD_

            IF( EQ_16( st->element_mode, EVS_MONO ) )

            {

                set16_fx( hTcxDec->old_syn_Overl, 0, shr( L_FRAME32k, 1 ) ); /* hTcxDec->Q_syn_Overl_TDACFB */
@@ -1482,7 +1482,7 @@ void open_decoder_LPD_ivas_fx( 
        test();

        test();

        test();

#ifdef HARMONIZE_2583_open_decoder_LPD

#ifdef HARMONIZE_2583_open_decoder_LPD_

        IF( EQ_16( st->element_mode, EVS_MONO ) )

        {

            IF( ( NE_16( st->element_mode, IVAS_CPE_DFT ) || ( EQ_16( st->element_mode, IVAS_CPE_DFT ) && st->prev_bfi ) ) && EQ_16( st->last_codec_mode, MODE1 ) && ( st->last_core == ACELP_CORE ) )
@@ -1572,7 +1572,7 @@ void open_decoder_LPD_ivas_fx( 
                    move16();

                }

            }

#ifdef HARMONIZE_2583_open_decoder_LPD

#ifdef HARMONIZE_2583_open_decoder_LPD_

        }

#endif

        test();
@@ -2339,7 +2339,7 @@ void open_decoder_LPD_ivas_fx( 
        move16();

        st->hTonalMDCTConc->lastBlockData.nSamples = 0;

        move16();

#ifdef HARMONIZE_2553_TonalConceal_Init

#if defined( HARMONIZE_2553_TonalConceal_Init ) && !defined( HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit )

        TonalMDCTConceal_Init_fx( st->element_mode, st->hTonalMDCTConc, st->hTcxDec->L_frameTCX, st->L_frame, FDNS_NPTS, st->hTcxCfg );

#else
@@ -2355,7 +2355,7 @@ void open_decoder_LPD_ivas_fx( 
#ifdef HARMONIZE_2583_open_decoder_LPD_

        }

#endif

#endif /*HARMONIZE_2553_TonalConceal_Init*/

#endif /*#if defined( HARMONIZE_2553_TonalConceal_Init ) && !defined( HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit )*/

    }



    st->last_tns_active = 0;

lib_dec/tonalMDCTconcealment_fx.c

+5 −5
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ static void FindPhaseDifferences( TonalMDCTConcealPtr const hTonalMDCTConc, Word 
/*-------------- public functions -------------------- */

/*******************************************************/



#ifndef HARMONIZE_2553_TonalConceal_Init

#if !defined( HARMONIZE_2553_TonalConceal_Init ) || defined( HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit )

ivas_error TonalMDCTConceal_Init_fx(

    TonalMDCTConcealPtr hTonalMDCTConc,

    const Word16 nSamples,
@@ -120,7 +120,7 @@ ivas_error TonalMDCTConceal_Init_fx( 
#endif





#ifdef HARMONIZE_2553_TonalConceal_Init

#if defined( HARMONIZE_2553_TonalConceal_Init ) && !defined( HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit )

ivas_error TonalMDCTConceal_Init_fx(

    Word16 element_mode,

#else
@@ -143,7 +143,7 @@ ivas_error TonalMDCTConceal_Init_ivas_fx( 


    hTonalMDCTConc->tcx_cfg = hTcxCfg;

    hTonalMDCTConc->lastBlockData.spectralData = hTonalMDCTConc->spectralDataBuffers[0];

#ifdef HARMONIZE_2553_TonalConceal_Init

#if defined( HARMONIZE_2553_TonalConceal_Init ) && !defined( HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit )

    IF( GT_16( element_mode, EVS_MONO ) )

    {

        set16_fx( hTonalMDCTConc->lastBlockData.spectralData, 0, L_FRAME_MAX );
@@ -229,7 +229,7 @@ ivas_error TonalMDCTConceal_Init_ivas_fx( 
    move16();

    hTonalMDCTConc->nScaleFactors = nScaleFactors;

    move16();

#ifdef HARMONIZE_2553_TonalConceal_Init

#if defined( HARMONIZE_2553_TonalConceal_Init ) && !defined( HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit )

    IF( GT_16( element_mode, EVS_MONO ) )

    {

        set32_fx( hTonalMDCTConc->scaleFactorsBackground_fx, 0, FDNS_NPTS );
@@ -277,7 +277,7 @@ ivas_error TonalMDCTConceal_Init_ivas_fx( 
    move16();

    /* just the second half of the second last pcm output is needed */



#ifdef HARMONIZE_2553_TonalConceal_Init

#if defined( HARMONIZE_2553_TonalConceal_Init ) && !defined( HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit )

    IF( GT_16( element_mode, EVS_MONO ) )

#endif

    {