Commit bf7fe5e6 authored by Fabian Bauer's avatar Fabian Bauer
Browse files

Revert "added macro and code HARMONIZE_2553_TonalConceal_SaveTimeSignal -... 

Revert "added macro and code HARMONIZE_2553_TonalConceal_SaveTimeSignal - deactivated all but apply"

This reverts commit 2eaf552a.
parent f2a8a72d

lib_com/options.h

+1 −2
Original line number Diff line number Diff line
@@ -101,8 +101,7 @@ 
#define FIX_BASOP_2532_cx_e                             /* FhG: Fix issue 2532 about additional exponent variable*/

#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_SaveFreqSignal      /* FhG: Harmonize TonalConceal_SaveFreqSignal with its ivas derivate */

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

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

#define HARMONIZE_2543_SQ_gain                          /* FhG: Harmonize SQ_gain */

#define FIX_ISSUE_2533_EXTRA_CONDITION                  /* FhG: Fix issue basop 2533 removing the extra condition*/

#define HARMONIZE_2537_SetTCXModeInfo                     /* FhG: Harmonize SetTCXModeInfo  - IVAS_VERSION OBVIOUSLY NOT FITTING FOR EVS - pipes not green */

lib_com/prot_fx.h

+1 −8
Original line number Diff line number Diff line
@@ -5780,21 +5780,14 @@ void TonalMDCTConceal_InsertNoise_fx( 
    Word16 crossfadeGain,

    const Word16 crossOverFreq );



#ifndef HARMONIZE_2553_TonalConceal_SaveTimeSignal

void TonalMDCTConceal_SaveTimeSignal_fx(

    TonalMDCTConcealPtr hTonalMDCTConc,

    Word16 *timeSignal,

    Word16 nNewSamples );

#endif



#ifdef HARMONIZE_2553_TonalConceal_SaveTimeSignal

void TonalMDCTConceal_SaveTimeSignal_fx(

    Word16 element_mode,

#else

void TonalMDCTConceal_SaveTimeSignal_ivas_fx(

#endif

    TonalMDCTConcealPtr hTonalMDCTConc,

    Word16 *timeSignal, // q_timeSignal

    Word16 *timeSignal,

    Word16 q_timeSignal,

    Word16 nNewSamples );

lib_dec/dec_LPD_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -768,11 +768,7 @@ void decoder_LPD_fx( 


        IF( !bfi )

        {

#ifdef HARMONIZE_2553_TonalConceal_SaveTimeSignal

            TonalMDCTConceal_SaveTimeSignal_fx( st->element_mode, st->hTonalMDCTConc, synthFB, 0, L_frameTCX );

#else

            TonalMDCTConceal_SaveTimeSignal_fx( st->hTonalMDCTConc, synthFB, L_frameTCX );

#endif

        }

        decoder_tcx_post_fx( st, synth, synthFB, Aq, bfi );

        IF( EQ_16( st->core, TCX_20_CORE ) )

lib_dec/ivas_mdct_core_dec_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -1258,11 +1258,7 @@ void ivas_mdct_core_reconstruct_fx( 
            test();

            IF( ( bfi == 0 ) && st->hTonalMDCTConc != NULL )

            {

#ifdef HARMONIZE_2553_TonalConceal_SaveTimeSignal

                TonalMDCTConceal_SaveTimeSignal_fx( st->element_mode, st->hTonalMDCTConc, synthFB_fx, q_winFB, L_frameTCX[ch] );

#else

                TonalMDCTConceal_SaveTimeSignal_ivas_fx( st->hTonalMDCTConc, synthFB_fx, q_winFB, L_frameTCX[ch] );

#endif

            }

            decoder_tcx_post_ivas_fx( st, synth_fx, synthFB_fx, q_winFB, NULL, bfi, MCT_flag );

lib_dec/ivas_tcx_core_dec_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -631,11 +631,7 @@ void stereo_tcx_core_dec_fx( 
    {

        IF( !bfi && st->hTonalMDCTConc != NULL )

        {

#ifdef HARMONIZE_2553_TonalConceal_SaveTimeSignal

            TonalMDCTConceal_SaveTimeSignal_fx( st->element_mode, st->hTonalMDCTConc, synthFB_fx, st->Q_syn, hTcxDec->L_frameTCX );

#else

            TonalMDCTConceal_SaveTimeSignal_ivas_fx( st->hTonalMDCTConc, synthFB_fx, st->Q_syn, hTcxDec->L_frameTCX );

#endif

        }



        decoder_tcx_post_ivas_fx( st, synth_fx, synthFB_fx, st->Q_syn, Aq_fx, bfi, 0 );