Commit d5bb4e38 authored by Jan Kiene's avatar Jan Kiene
Browse files

Accept HARMONIZE_2553_TonalConceal_SaveFreqSignal

parent b7198557

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

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



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

lib_com/prot_fx.h

+0 −15
Original line number Diff line number Diff line
@@ -5556,24 +5556,9 @@ ivas_error TonalMDCTConceal_Init_fx( 
    TCX_CONFIG_HANDLE hTcxCfg );



/* Must be called only when a good frame is recieved - concealment is inactive */

#ifndef HARMONIZE_2553_TonalConceal_SaveFreqSignal

void TonalMDCTConceal_SaveFreqSignal_fx(

    TonalMDCTConcealPtr self,

    const Word32 *mdctSpectrum,

    const Word16 mdctSpectrum_exp,

    Word16 nNewSamples,

    Word16 nNewSamplesCore,

    const Word16 *scaleFactors,

    const Word16 *scaleFactors_exp,

    const Word16 gain_tcx_exp );

#endif



#ifdef HARMONIZE_2553_TonalConceal_SaveFreqSignal

void TonalMDCTConceal_SaveFreqSignal_fx(

    Word16 element_mode,

#else

void TonalMDCTConceal_SaveFreqSignal_ivas_fx(

#endif

    TonalMDCTConcealPtr hTonalMDCTConc,

    const Word32 *mdctSpectrum,

    const Word16 mdctSpectrum_exp,

lib_dec/dec_tcx_fx.c

+0 −8
Original line number Diff line number Diff line
@@ -814,11 +814,7 @@ void decoder_tcx_fx( 


    IF( bfi == 0 )

    {

#ifdef HARMONIZE_2553_TonalConceal_SaveFreqSignal

        TonalMDCTConceal_SaveFreqSignal_fx( st->element_mode, st->hTonalMDCTConc, x, x_e, L_frameTCX, L_frame, gainlpc2, gainlpc2_e, gain_tcx_e, 0 );

#else

        TonalMDCTConceal_SaveFreqSignal_fx( st->hTonalMDCTConc, x, x_e, L_frameTCX, L_frame, gainlpc2, gainlpc2_e, gain_tcx_e );

#endif

    }

    ELSE

    {
@@ -4883,11 +4879,7 @@ void decoder_tcx_noisefilling_fx( 
        test();

        IF( bfi == 0 && NE_16( st->element_mode, IVAS_CPE_MDCT ) )

        {

#ifdef HARMONIZE_2553_TonalConceal_SaveFreqSignal

            TonalMDCTConceal_SaveFreqSignal_fx( st->element_mode, st->hTonalMDCTConc, x, *x_e, L_frameTCX, L_frame, gainlpc2, gainlpc2_e, gain_tcx_e, infoIGFStartLine );

#else

            TonalMDCTConceal_SaveFreqSignal_ivas_fx( st->hTonalMDCTConc, x, *x_e, L_frameTCX, L_frame, gainlpc2, gainlpc2_e, gain_tcx_e, infoIGFStartLine );

#endif

        }

        ELSE IF( bfi )

        {

lib_dec/ivas_mdct_core_dec_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -1593,11 +1593,7 @@ void ivas_mdct_core_tns_ns_fx( 
                        scf_e[ind] = sub( 15, q_shift );

                        move16();

                    }

#ifdef HARMONIZE_2553_TonalConceal_SaveFreqSignal

                    TonalMDCTConceal_SaveFreqSignal_fx( st->element_mode, st->hTonalMDCTConc, x_fx[ch][k], x_e, L_frameTCX[ch], L_frame[ch], &scf_fx[0], scf_e, 0, get_igf_startline_fx( st, L_frame[ch], L_frameTCX[ch] ) );

#else

                    TonalMDCTConceal_SaveFreqSignal_ivas_fx( st->hTonalMDCTConc, x_fx[ch][k], x_e, L_frameTCX[ch], L_frame[ch], &scf_fx[0], scf_e, 0, get_igf_startline_fx( st, L_frame[ch], L_frameTCX[ch] ) );

#endif

                }

            }

            ELSE

lib_dec/ivas_stereo_mdct_core_dec_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -418,11 +418,7 @@ void stereo_mdct_core_dec_fx( 
                    }

                    Word16 s = getScaleFactor32( x_fx[ch][k], L_frameTCX[ch] );

                    Scale_sig32( x_fx[ch][k], L_frameTCX[ch], s ); /* exp(x_e + 31 - s) */

#ifdef HARMONIZE_2553_TonalConceal_SaveFreqSignal

                    TonalMDCTConceal_SaveFreqSignal_fx( 1 /*signal non-EVS*/, st->hTonalMDCTConc, x_fx[ch][k], sub( x_e[ch][k], s ), L_frameTCX[ch], L_frame[ch], &scf_fx[0], scf_e, 0, get_igf_startline_fx( st, L_frame[ch], L_frameTCX[ch] ) );

#else

                    TonalMDCTConceal_SaveFreqSignal_ivas_fx( st->hTonalMDCTConc, x_fx[ch][k], sub( x_e[ch][k], s ), L_frameTCX[ch], L_frame[ch], &scf_fx[0], scf_e, 0, get_igf_startline_fx( st, L_frame[ch], L_frameTCX[ch] ) );

#endif

                    Scale_sig32( x_fx[ch][k], L_frameTCX[ch], negate( s ) ); /* exp(x_e) */

                }

            }