Commit 4207e7c9 authored by Fabian Bauer's avatar Fabian Bauer
Browse files

rebuid harmonized function, activated... 

rebuid harmonized function, activated HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit , added some stages to get re-harmonization done
parent 0899a7a2

lib_com/options.h

+5 −1
Original line number Diff line number Diff line
@@ -95,7 +95,11 @@ 
#define HARMONIZE_2595_reconfig_decoder_LPD             /* FhG: Harmonize reconfig_decoder_LPD with its ivas derivate */

#define HARMONIZE_2596_SetModeIndex                     /* FhG: Harmonize SetModeIndex with its ivas derivate */

#define HARMONIZE_2583_open_decoder_LPD             /* FhG: harmonize open_decoder_LPD between EVS and IVAS versions */

//#define HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit /*devlop: get EVS/IVAS init for tonal concealment back*/2_FORMAT_SWITCH               /* VA/Nokia: reintroduce format switching for g192 bitstreams */

#define HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit /*devlop: get EVS/IVAS init for tonal concealment back*/

//#define HARMONIZE_2583_open_decoder_LPD_TonalConceal_reharmonize_stage1 /*devlop: reharmonize tonalconcealmen-init*/

//#define HARMONIZE_2583_open_decoder_LPD_TonalConceal_reharmonize_stage2 /*devlop: reharmonize tonalconcealmen-init*/

//#define HARMONIZE_2583_open_decoder_LPD_TonalConceal_reharmonize_stage3 /*devlop: reharmonize tonalconcealmen-init*/

//#define HARMONIZE_2583_open_decoder_LPD_TonalConceal_reharmonize_stage4 /*devlop: reharmonize tonalconcealmen-init*/



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

lib_dec/tonalMDCTconcealment_fx.c

+211 −48
Original line number Diff line number Diff line
@@ -121,18 +121,38 @@ ivas_error TonalMDCTConceal_Init_fx( 
    Word16 element_mode,

#else

ivas_error TonalMDCTConceal_Init_ivas_fx(

#endif

#endif /*HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit*/

    TonalMDCTConcealPtr hTonalMDCTConc,

    const UWord16 nSamples,

    const UWord16 nSamplesCore,

    const UWord16 nScaleFactors,

    TCX_CONFIG_HANDLE hTcxCfg )

{



#if defined( HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit ) || defined( HARMONIZE_2583_open_decoder_LPD_TonalConceal_reharmonize_stage1 )

    /*Common Part 1*/

    test();

    IF( GT_16( nSamples, L_FRAME_MAX ) || GT_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( ( 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];

    move16();

#endif /*defined( HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit ) || defined( HARMONIZE_2583_open_decoder_LPD_TonalConceal_reharmonize_stage1 )*/





#ifndef HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit

    /*HARMONIZED*/

    IF( EQ_16( element_mode, EVS_MONO ) )

    {

        /*EVS*/

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

        /*Common Part 1*/

        test();

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

        {
@@ -146,6 +166,8 @@ ivas_error TonalMDCTConceal_Init_ivas_fx( 


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

        move16();

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

        /*Start EVS-only*/

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

        move16();

        hTonalMDCTConc->secondLastPowerSpectrum = hTonalMDCTConc->secondLastBlockData.spectralData;
@@ -155,6 +177,54 @@ ivas_error TonalMDCTConceal_Init_ivas_fx( 
        move16();

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

        move16();

        /*Stop EVS-only*/

    }

#endif /*#ifndef HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit*/



#ifndef HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit

    IF( GT_16( element_mode, EVS_MONO ) )

    {

#endif /*#ifndef HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit*/

        /*IVAS*/



        /*SEPARATE IVAS CODE*/

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

        /*Common Part 1*/

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

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

        /*Start IVAS-only*/

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

        /*Stop IVAS-only*/

#ifndef HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit

    }

#endif /*#ifndef HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit*/



#if defined( HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit ) || defined( HARMONIZE_2583_open_decoder_LPD_TonalConceal_reharmonize_stage2 )

    /*Common Part 2*/

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

    move16();

    hTonalMDCTConc->secondLastBlockData.scaleFactors_exp = hTonalMDCTConc->scaleFactorsBuffers_exp[1];
@@ -194,54 +264,65 @@ ivas_error TonalMDCTConceal_Init_ivas_fx( 


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

        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

    {

        /*IVAS*/

#endif

        /*SEPARATE IVAS CODE*/

#endif //*#if defined( HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit ) || defined( HARMONIZE_2583_open_decoder_LPD_TonalConceal_reharmonize_stage2 )



        test();

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

#ifndef HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit

    IF( EQ_16( element_mode, EVS_MONO ) )

    {

            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 */

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

        /*Common Part 2*/

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

        move16();

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

        move16();



        hTonalMDCTConc->tcx_cfg = hTcxCfg;

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

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



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

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

        move16();

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

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



        hTonalMDCTConc->lastPitchLag = L_deposit_l( 0 );



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

        {

            hTonalMDCTConc->secondLastBlockData.blockIsValid = 0;

            move16();

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

            hTonalMDCTConc->lastBlockData.blockIsValid = 0;

            move16();

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

        }



        hTonalMDCTConc->nSamples = nSamples;

        move16();

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

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

        hTonalMDCTConc->nSamplesCore = nSamplesCore;

        move16();

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

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



        hTonalMDCTConc->nScaleFactors = nScaleFactors;

        move16();



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

    }

#endif /*#ifndef HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit*/



#ifndef HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit

    IF( GT_16( element_mode, EVS_MONO ) )

    {

#endif /*#ifndef HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit*/



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

        /*Common Part 2*/

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

        move16();

        hTonalMDCTConc->secondLastBlockData.scaleFactors_exp = hTonalMDCTConc->scaleFactorsBuffers_exp[1];
@@ -278,7 +359,43 @@ ivas_error TonalMDCTConceal_Init_ivas_fx( 
        move16();

        hTonalMDCTConc->nScaleFactors = nScaleFactors;

        move16();

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

#ifndef HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit

    }

#endif /*#ifndef HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit*/



#if defined( HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit ) || defined( HARMONIZE_2583_open_decoder_LPD_TonalConceal_reharmonize_stage3 )

    /*Common Part 3*/

    /* 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 */

#endif /*#if defined( HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit ) || defined( HARMONIZE_2583_open_decoder_LPD_TonalConceal_reharmonize_stage3 )*/



#ifndef HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit

    IF( EQ_16( element_mode, EVS_MONO ) )

    {

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

        /*Common Part 3*/

        /* 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 */

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

    }



#endif /*#ifndef HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit*/







#ifndef HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit

    IF( GT_16( element_mode, EVS_MONO ) )

    {

#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 );
@@ -297,24 +414,70 @@ ivas_error TonalMDCTConceal_Init_ivas_fx( 
        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*/

        /* 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 */

#endif /*#if !defined( HARMONIZE_2583_open_decoder_LPD_TonalConceal_reharmonize_stage3 ) && !defined( HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit )*/



        /*start IVAS-only*/

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

        /*stop IVAS-only*/



#ifndef HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit

    }

#endif /*#ifndef HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit*/





#if defined( HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit ) || defined( HARMONIZE_2583_open_decoder_LPD_TonalConceal_reharmonize_stage4 )

    /*Common Part 4*/

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



        return IVAS_ERR_OK;

#endif /*#if defined( HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit ) || defined( HARMONIZE_2583_open_decoder_LPD_TonalConceal_reharmonize_stage4 )*/







#ifndef HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit

    IF( EQ_16( element_mode, EVS_MONO ) )

    {

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

        /*Common Part 4*/

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

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

    }

#endif



#endif /*#ifndef HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit*/





    #ifndef HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit

    IF( GT_16( element_mode, EVS_MONO ) )

    {

#endif /*#ifndef HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit*/



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

        /*Common Part 4*/

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

#endif /*#if !defined( HARMONIZE_2583_open_decoder_LPD_TonalConceal_reharmonize_stage4 ) && !defined( HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit )*/



#ifndef HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit

    }

#endif /*#ifndef HARMONIZE_2583_open_decoder_LPD_TonalConcealseparateinit*/

    

    return IVAS_ERR_OK;

}