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

more cleanup

parent 3998603a

lib_dec/tonalMDCTconcealment_fx.c

+2 −16
Original line number Diff line number Diff line
@@ -272,13 +272,6 @@ ivas_error TonalMDCTConceal_Init_ivas_fx( 
    move16();

    move16();

    /* just the second half of the second last pcm output is needed */

#ifdef HARMONIZE_2553_TonalConceal_Init

    IF( EQ_16( element_mode, EVS_MONO ) )

    {

        hTonalMDCTConc->secondLastPcmOut = &hTonalMDCTConc->timeDataBuffer[sub( ( 3 * L_FRAME_MAX ) / 2, 3 * ( s_min( L_FRAME_MAX, nSamples ) ) / 2 )];

        hTonalMDCTConc->lastPcmOut = &hTonalMDCTConc->timeDataBuffer[sub( ( 3 * L_FRAME_MAX ) / 2, s_min( L_FRAME_MAX, nSamples ) )];

    }

#endif



#ifdef HARMONIZE_2553_TonalConceal_Init

    IF( GT_16( element_mode, EVS_MONO ) )
@@ -286,14 +279,9 @@ ivas_error TonalMDCTConceal_Init_ivas_fx( 
    {

        set16_fx( hTonalMDCTConc->timeDataBuffer, 0, ( 3 * L_FRAME_MAX ) / 2 );

    }

#ifdef HARMONIZE_2553_TonalConceal_Init

    IF( GT_16( element_mode, EVS_MONO ) )

#endif

    {



    hTonalMDCTConc->secondLastPcmOut = &hTonalMDCTConc->timeDataBuffer[( 3 * L_FRAME_MAX ) / 2 - ( 3 * s_min( L_FRAME_MAX, nSamples ) / 2 )];

    hTonalMDCTConc->lastPcmOut = &hTonalMDCTConc->timeDataBuffer[( 3 * L_FRAME_MAX ) / 2 - s_min( L_FRAME_MAX, nSamples )];

    }



    /* If the second last frame was lost, we reuse saved TonalComponentsInfo and don't update pcm buffers */

    assert( sizeof( *hTonalMDCTConc->pTCI ) <= ( hTonalMDCTConc->lastPcmOut - hTonalMDCTConc->timeDataBuffer ) * sizeof( hTonalMDCTConc->timeDataBuffer[0] ) );
@@ -2701,7 +2689,6 @@ void TonalMDCTConceal_Apply_ivas_fx( 
        }

#ifdef HARMONIZE_2553_TonalConceal_Apply

        ELSE

#endif

        {
@@ -2711,7 +2698,6 @@ void TonalMDCTConceal_Apply_ivas_fx( 


            powerSpectrum_exp = add( add( hTonalMDCTConc->secondLastPowerSpectrum_exp, hTonalMDCTConc->secondLastBlockData.gain_tcx_exp ), hTonalMDCTConc->secondLastBlockData.scaleFactors_max_e );

        }

#ifdef HARMONIZE_2553_TonalConceal_Apply

        exp = sub( mdctSpectrum_exp, add( powerSpectrum_exp, 1 ) );

#endif

        phaseDiff = hTonalMDCTConc->pTCI->phaseDiff; /* if multiple frame loss occurs use the phase from the last frame and continue rotating */