Commit 923042ed authored by Fabian Bauer's avatar Fabian Bauer
Browse files

lead HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit to absurdity

parent 80b3c4a2

lib_dec/tonalMDCTconcealment_fx.c

+134 −105
Original line number Diff line number Diff line
@@ -128,50 +128,103 @@ ivas_error TonalMDCTConceal_Init_ivas_fx( 
    const UWord16 nScaleFactors,

    TCX_CONFIG_HANDLE hTcxCfg )

{

#ifndef HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit

    /*HARMONIZED*/

    IF( EQ_16( element_mode, EVS_MONO ) )

    {

        /*EVS*/

        test();

        IF( GT_16( nSamples, L_FRAME_MAX ) || GT_16( nScaleFactors, FDNS_NPTS ) )

        {

        assert( LE_16( nSamples, L_FRAME_MAX ) );

        assert( LE_16( nScaleFactors, FDNS_NPTS ) );

            assert( nSamples <= L_FRAME_MAX );

            assert( nScaleFactors <= FDNS_NPTS );

            return ( IVAS_ERROR( IVAS_ERR_INTERNAL, "TonalMDCT FEC: Number of samples larger than max. block size\n" ) );

        }

    assert( EQ_16( hTonalMDCTConc->nScaleFactors, nScaleFactors ) || NE_16( hTonalMDCTConc->nSamples, nSamples ) ); /* If nSamples doesn't change then also nScaleFactors must stay the same */

        assert( ( hTonalMDCTConc->nScaleFactors == nScaleFactors ) || ( hTonalMDCTConc->nSamples != nSamples ) ); /* If nSamples doesn't change then also nScaleFactors must stay the same */



        hTonalMDCTConc->tcx_cfg = hTcxCfg;



        hTonalMDCTConc->lastBlockData.spectralData = hTonalMDCTConc->spectralDataBuffers[0];

#ifndef HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit

    IF( GT_16( element_mode, EVS_MONO ) )

    {

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

        move16();

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

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

        move16();

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

        move16();

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

        move16();



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

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

        move16();

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

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

        move16();

    }

    ELSE

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

        move16();

        hTonalMDCTConc->secondLastBlockData.scaleFactors_exp = hTonalMDCTConc->scaleFactorsBuffers_exp[1];

        move16();



        hTonalMDCTConc->lastBlockData.blockIsValid = 0;

        move16();

        hTonalMDCTConc->secondLastBlockData.blockIsValid = 0;

        move16();

        hTonalMDCTConc->nSamples = 0;

        move16();

        hTonalMDCTConc->nScaleFactors = 0;

        move16();



        hTonalMDCTConc->lastBlockData.blockIsConcealed = 0;

        move16();

        hTonalMDCTConc->secondLastBlockData.blockIsConcealed = 0;

        move16();



        hTonalMDCTConc->pTCI = (TonalComponentsInfo *) hTonalMDCTConc->timeDataBuffer;

        move16();



        hTonalMDCTConc->lastPitchLag = L_deposit_l( 0 );



        IF( NE_16( hTonalMDCTConc->nSamples, nSamples ) )

        {

            hTonalMDCTConc->secondLastBlockData.blockIsValid = 0;

            move16();

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

            hTonalMDCTConc->lastBlockData.blockIsValid = 0;

            move16();

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

        }



        hTonalMDCTConc->nSamples = nSamples;

        move16();

        hTonalMDCTConc->nSamplesCore = nSamplesCore;

        move16();



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

        hTonalMDCTConc->nScaleFactors = nScaleFactors;

        move16();

        /* Offset the pointer to the end of buffer, so that pTCI is not destroyed when

           new time samples are stored in lastPcmOut */

        move16();

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

        move16();

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

        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 ) )];



        /* 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] ) );



        return IVAS_ERR_OK;

    }

#else

    ELSE

    {

        /*IVAS*/

#endif

        /*SEPARATE IVAS CODE*/



    test();

        IF( GT_16( nSamples, L_FRAME_MAX ) || GT_16( nScaleFactors, FDNS_NPTS ) )

        {

            assert( LE_16( nSamples, L_FRAME_MAX ) );

            assert( LE_16( nScaleFactors, FDNS_NPTS ) );

            return ( IVAS_ERROR( IVAS_ERR_INTERNAL, "TonalMDCT FEC: Number of samples larger than max. block size\n" ) );

        }

        assert( EQ_16( hTonalMDCTConc->nScaleFactors, nScaleFactors ) || NE_16( hTonalMDCTConc->nSamples, nSamples ) ); /* If nSamples doesn't change then also nScaleFactors must stay the same */



        hTonalMDCTConc->tcx_cfg = hTcxCfg;

        hTonalMDCTConc->lastBlockData.spectralData = hTonalMDCTConc->spectralDataBuffers[0];





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

        move16();
@@ -188,7 +241,7 @@ ivas_error TonalMDCTConceal_Init_ivas_fx( 
        hTonalMDCTConc->secondLastBlockData.scaleFactors = hTonalMDCTConc->scaleFactorsBuffers[1];

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

        move16();

#endif



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

        move16();

        hTonalMDCTConc->secondLastBlockData.scaleFactors_exp = hTonalMDCTConc->scaleFactorsBuffers_exp[1];
@@ -225,29 +278,6 @@ ivas_error TonalMDCTConceal_Init_ivas_fx( 
        move16();

        hTonalMDCTConc->nScaleFactors = nScaleFactors;

        move16();

#ifndef HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit

    IF( GT_16( element_mode, EVS_MONO ) )

    {

        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();

    }

#else



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

        hTonalMDCTConc->scf_fadeout = 16384 /*1.000000 Q14*/;
@@ -267,19 +297,14 @@ ivas_error TonalMDCTConceal_Init_ivas_fx( 
        move16();

        hTonalMDCTConc->faded_signal_nrg_exp = 0;

        move16();

#endif



        /* Offset the pointer to the end of buffer, so that pTCI is not destroyed when

           new time samples are stored in lastPcmOut */

        move16();

        move16();

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



#ifndef HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit

    IF( GT_16( element_mode, EVS_MONO ) )

#endif

    {

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

    }



        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 )];
@@ -287,6 +312,10 @@ ivas_error TonalMDCTConceal_Init_ivas_fx( 
        assert( sizeof( *hTonalMDCTConc->pTCI ) <= ( hTonalMDCTConc->lastPcmOut - hTonalMDCTConc->timeDataBuffer ) * sizeof( hTonalMDCTConc->timeDataBuffer[0] ) );



        return IVAS_ERR_OK;

#ifndef HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit

    }

#endif



}