Commit 6ae4cefd authored by Fabian Bauer's avatar Fabian Bauer
Browse files

fix init for bith paths, evs and ivas

parent b9836c5a

lib_dec/tonalMDCTconcealment_fx.c

+8 −8
Original line number Diff line number Diff line
@@ -156,24 +156,23 @@ ivas_error TonalMDCTConceal_Init_ivas_fx( 
    set16_fx( hTonalMDCTConc->secondLastBlockData.scaleFactors, 0, FDNS_NPTS );

    move16();

#else

    hTonalMDCTConc->secondLastBlockData.spectralData = hTonalMDCTConc->spectralDataBuffers[1];

    hTonalMDCTConc->lastBlockData.scaleFactors = hTonalMDCTConc->scaleFactorsBuffers[0];

    hTonalMDCTConc->secondLastBlockData.scaleFactors = hTonalMDCTConc->scaleFactorsBuffers[1];

    move16();

    move16();

    move16();

    IF( GT_16( element_mode, EVS_MONO ) )

    {

        set16_fx( hTonalMDCTConc->lastBlockData.spectralData, 0, L_FRAME_MAX );

        move16();

        set16_fx( hTonalMDCTConc->secondLastBlockData.spectralData, 0, L_FRAME_MAX );

        move16();

        hTonalMDCTConc->secondLastPowerSpectrum_exp = hTonalMDCTConc->secondLastBlockData.spectralData_exp;

        move16();

        set16_fx( hTonalMDCTConc->lastBlockData.scaleFactors, 0, FDNS_NPTS );

        move16();

        hTonalMDCTConc->secondLastBlockData.scaleFactors = hTonalMDCTConc->scaleFactorsBuffers[1];

        set16_fx( hTonalMDCTConc->secondLastBlockData.scaleFactors, 0, FDNS_NPTS );

        move16();

    }

    hTonalMDCTConc->secondLastBlockData.spectralData = hTonalMDCTConc->spectralDataBuffers[1];

    hTonalMDCTConc->secondLastPowerSpectrum = hTonalMDCTConc->secondLastBlockData.spectralData;

    move16();

    hTonalMDCTConc->lastBlockData.scaleFactors = hTonalMDCTConc->scaleFactorsBuffers[0];

#endif

    hTonalMDCTConc->lastBlockData.scaleFactors_exp = hTonalMDCTConc->scaleFactorsBuffers_exp[0];

    move16();
@@ -1630,7 +1629,8 @@ void TonalMDCTConceal_InsertNoise_ivas_fx( 
            *mdctSpectrum_exp = add( *mdctSpectrum_exp, exp );

        }

    }

    ELSE{

    ELSE

    {

        IF( tonalConcealmentActive == 0 ){

            sum1 = 0;

    sum2 = 0;