Commit b7198557 authored by Jan Kiene's avatar Jan Kiene
Browse files

Accept HARMONIZE_2553_TonalConceal_Init

parent 138cd28e

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -92,7 +92,6 @@ 
#define NONBE_FIX_ISSUE_2206_AVOID_OVERFLOW_MSVQ_Interpol_Tran_fx /* FhG: Fix saturation crash in MSVQ_Interpol_Tran_fx() */

#define NONBE_FIX_ISSUE_2206_SWB_EXPERIMENT_FIX_2527    /* Fix crash from issue #2527 */

#define FIX_FLOAT_1539_G192_FORMAT_SWITCH               /* VA/Nokia: reintroduce format switching for g192 bitstreams */

#define HARMONIZE_2553_TonalConceal_Init                /* FhG: Harmonize TonalMDCTConceal_Init with its ivas derivate */

#define HARMONIZE_2553_TonalConceal_SaveFreqSignal      /* FhG: Harmonize TonalConceal_SaveFreqSignal with its ivas derivate */

#define HARMONIZE_2553_TonalConceal_SaveTimeSignal      /* FhG: Harmonize TonalConceal_SaveTimeSignal with its ivas derivate */

lib_com/prot_fx.h

+0 −13
Original line number Diff line number Diff line
@@ -5546,22 +5546,9 @@ void RefineTonalComponents_fx( 
    const Word16 element_mode,

    const PsychoacousticParameters *psychParamsCurrent );



#ifndef HARMONIZE_2553_TonalConceal_Init

ivas_error TonalMDCTConceal_Init_fx(

    TonalMDCTConcealPtr self,

    const Word16 nSamples,

    const Word16 nSamplesCore,

    const Word16 nScaleFactors,

    TCX_CONFIG_HANDLE hTcxCfg /* TCX config */

);

#endif



#ifdef HARMONIZE_2553_TonalConceal_Init

ivas_error TonalMDCTConceal_Init_fx(

    Word16 element_mode,

#else

ivas_error TonalMDCTConceal_Init_ivas_fx(

#endif

    TonalMDCTConcealPtr hTonalMDCTConc,

    const UWord16 nSamples,

    const UWord16 nSamplesCore,

lib_dec/core_dec_init_fx.c

+0 −8
Original line number Diff line number Diff line
@@ -907,11 +907,7 @@ void open_decoder_LPD_fx( 
        st->hTonalMDCTConc->lastBlockData.nSamples = 0;

        move16();



#ifdef HARMONIZE_2553_TonalConceal_Init

        TonalMDCTConceal_Init_fx( EVS_MONO, st->hTonalMDCTConc, hTcxDec->L_frameTCX, st->L_frame, FDNS_NPTS, st->hTcxCfg );

#else

        TonalMDCTConceal_Init_fx( st->hTonalMDCTConc, hTcxDec->L_frameTCX, st->L_frame, FDNS_NPTS, st->hTcxCfg );

#endif

    }

    st->last_tns_active = 0;

    move16();
@@ -1966,11 +1962,7 @@ void open_decoder_LPD_ivas_fx( 
        move16();

        st->hTonalMDCTConc->lastBlockData.nSamples = 0;

        move16();

#ifdef HARMONIZE_2553_TonalConceal_Init

        TonalMDCTConceal_Init_fx( 1 /*signal non-EVS*/, st->hTonalMDCTConc, st->hTcxDec->L_frameTCX, st->L_frame, FDNS_NPTS, st->hTcxCfg );

#else

        TonalMDCTConceal_Init_ivas_fx( st->hTonalMDCTConc, st->hTcxDec->L_frameTCX, st->L_frame, FDNS_NPTS, st->hTcxCfg );

#endif

    }



    st->last_tns_active = 0;

lib_dec/tonalMDCTconcealment_fx.c

+0 −131
Original line number Diff line number Diff line
@@ -34,98 +34,10 @@ static void FindPhaseDifferences( TonalMDCTConcealPtr const hTonalMDCTConc, Word 
/*-------------- public functions -------------------- */

/*******************************************************/



#ifndef HARMONIZE_2553_TonalConceal_Init

ivas_error TonalMDCTConceal_Init_fx(

    TonalMDCTConcealPtr hTonalMDCTConc,

    const Word16 nSamples,

    const Word16 nSamplesCore,

    const Word16 nScaleFactors,

    TCX_CONFIG_HANDLE hTcxCfg /* TCX config */

)

{

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

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

    move16();

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

    move16();



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

    move16();

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

    move16();

    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->lastBlockData.blockIsValid = 0;

        move16();

    }



    hTonalMDCTConc->nSamples = nSamples;

    move16();

    hTonalMDCTConc->nSamplesCore = nSamplesCore;

    move16();



    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;

}

#endif





#ifdef HARMONIZE_2553_TonalConceal_Init

ivas_error TonalMDCTConceal_Init_fx(

    Word16 element_mode,

#else

ivas_error TonalMDCTConceal_Init_ivas_fx(

#endif

    TonalMDCTConcealPtr hTonalMDCTConc,

    const UWord16 nSamples,

    const UWord16 nSamplesCore,
@@ -143,7 +55,6 @@ ivas_error TonalMDCTConceal_Init_ivas_fx( 


    hTonalMDCTConc->tcx_cfg = hTcxCfg;

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

#ifdef HARMONIZE_2553_TonalConceal_Init

    IF( GT_16( element_mode, EVS_MONO ) )

    {

        set16_fx( hTonalMDCTConc->lastBlockData.spectralData, 0, L_FRAME_MAX );
@@ -175,24 +86,6 @@ ivas_error TonalMDCTConceal_Init_ivas_fx( 
        hTonalMDCTConc->secondLastBlockData.scaleFactors = hTonalMDCTConc->scaleFactorsBuffers[1];

        move16();

    }

#else



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

#endif

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

    move16();

    hTonalMDCTConc->secondLastBlockData.scaleFactors_exp = hTonalMDCTConc->scaleFactorsBuffers_exp[1];
@@ -229,7 +122,6 @@ ivas_error TonalMDCTConceal_Init_ivas_fx( 
    move16();

    hTonalMDCTConc->nScaleFactors = nScaleFactors;

    move16();

#ifdef HARMONIZE_2553_TonalConceal_Init

    IF( GT_16( element_mode, EVS_MONO ) )

    {

        set32_fx( hTonalMDCTConc->scaleFactorsBackground_fx, 0, FDNS_NPTS );
@@ -250,36 +142,13 @@ ivas_error TonalMDCTConceal_Init_ivas_fx( 
        hTonalMDCTConc->faded_signal_nrg_exp = 0;

        move16();

    }

#else



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

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



#ifdef HARMONIZE_2553_TonalConceal_Init

    IF( GT_16( element_mode, EVS_MONO ) )

#endif

    {

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

    }