Commit 63d803d8 authored by Jan Kiene's avatar Jan Kiene
Browse files

Accept HARMONIZE_2553_TonalConceal_SaveTimeSignal

parent d5bb4e38

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -92,7 +92,6 @@ 
#define NONBE_FIX_ISSUE_2206_AVOID_OVERFLOW_MSVQ_Interpol_Tran_fx /* FhG: Fix saturation crash in MSVQ_Interpol_Tran_fx() */

#define NONBE_FIX_ISSUE_2206_SWB_EXPERIMENT_FIX_2527    /* Fix crash from issue #2527 */

#define FIX_FLOAT_1539_G192_FORMAT_SWITCH               /* VA/Nokia: reintroduce format switching for g192 bitstreams */

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



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

lib_com/prot_fx.h

+0 −10
Original line number Diff line number Diff line
@@ -5609,19 +5609,9 @@ 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 q_timeSignal,

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
@@ -1257,11 +1257,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 );