Commit 7de6eb0b authored by Fabian Bauer's avatar Fabian Bauer
Browse files

move some ivas-only part

parent e573af7a

lib_dec/tonalMDCTconcealment_fx.c

+21 −20
Original line number Diff line number Diff line
@@ -359,6 +359,27 @@ ivas_error TonalMDCTConceal_Init_ivas_fx( 
        move16();

        hTonalMDCTConc->nScaleFactors = nScaleFactors;

        move16();



        /*start IVAS-only*/

        set32_fx( hTonalMDCTConc->scaleFactorsBackground_fx, 0, FDNS_NPTS );

        hTonalMDCTConc->scf_fadeout = 16384 /*1.000000 Q14*/;

        PsychoacousticParameters_Init_fx( INT_FS_16k, L_FRAME16k, 64, 1, 1, &hTonalMDCTConc->psychParamsTCX20 );

        PsychoacousticParameters_Init_fx( INT_FS_16k, L_FRAME16k / 2, 64, 0, 1, &hTonalMDCTConc->psychParamsTCX10 );

        hTonalMDCTConc->psychParams = NULL;



        hTonalMDCTConc->last_block_nrg = 0;

        move16();

        hTonalMDCTConc->last_block_nrg_exp = 0;

        move16();

        hTonalMDCTConc->curr_noise_nrg = 0;

        move16();

        hTonalMDCTConc->curr_noise_nrg_exp = 0;

        move16();

        hTonalMDCTConc->faded_signal_nrg = 0;

        move16();

        hTonalMDCTConc->faded_signal_nrg_exp = 0;

        move16();

        /*stop IVAS-only*/

#endif /*!defined( HARMONIZE_2583_open_decoder_LPD_TonalConceal_reharmonize_stage2 ) && !defined( HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit )*/

#ifndef HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit

    }
@@ -394,26 +415,6 @@ ivas_error TonalMDCTConceal_Init_ivas_fx( 
    {

#endif /*#ifndef HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit*/



        /*start IVAS-only*/

        set32_fx( hTonalMDCTConc->scaleFactorsBackground_fx, 0, FDNS_NPTS );

        hTonalMDCTConc->scf_fadeout = 16384 /*1.000000 Q14*/;

        PsychoacousticParameters_Init_fx( INT_FS_16k, L_FRAME16k, 64, 1, 1, &hTonalMDCTConc->psychParamsTCX20 );

        PsychoacousticParameters_Init_fx( INT_FS_16k, L_FRAME16k / 2, 64, 0, 1, &hTonalMDCTConc->psychParamsTCX10 );

        hTonalMDCTConc->psychParams = NULL;



        hTonalMDCTConc->last_block_nrg = 0;

        move16();

        hTonalMDCTConc->last_block_nrg_exp = 0;

        move16();

        hTonalMDCTConc->curr_noise_nrg = 0;

        move16();

        hTonalMDCTConc->curr_noise_nrg_exp = 0;

        move16();

        hTonalMDCTConc->faded_signal_nrg = 0;

        move16();

        hTonalMDCTConc->faded_signal_nrg_exp = 0;

        move16();

        /*stop IVAS-only*/



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

        /*Common Part 3*/