Commit c6b28724 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_2485_HARMONIZE_minimum_statistics

parent 82a098e0

lib_com/fd_cng_com_fx.c

+0 −1207

File changed.

Preview size limit exceeded, changes collapsed.

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -91,7 +91,6 @@ 
#define NONBE_FIX_ISSUE_2206_AVOID_OVERFLOW_SWB_fenv_fx2 /* FhG: Avoid overflow of SWB_fenv_fx in SWB_BWE_encoding_fx because of very small energies. */

#define NONBE_FIX_ISSUE_2206_AVOID_OVERFLOW_MSVQ_Interpol_Tran_fx /* FhG: Fix saturation crash in MSVQ_Interpol_Tran_fx() */

#define FIX_2452_HQ_CORE_PEAQ_AVR_RATIO_HARM            /* Eri: Basop issue 2453: Fix alignment of peak_avrg_ratio_fx */

#define FIX_2485_HARMONIZE_minimum_statistics           /* FhG: harmonize minimum_statistics and minimum_statistics_fx */

#define FIX_FLOAT_ISSUE_1546_DEAD_CODE                  /* FhG: remove dead code reported in the issue*/

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

#define OPTIMIZE_FFT_STACK                              /* VA: removal of intermediate FFT buffers */

lib_com/prot_fx.h

+0 −52
Original line number Diff line number Diff line
@@ -4620,7 +4620,6 @@ void expand_range_var_exp( 
    Word16 *out_exp,

    const Word16 len );



#ifdef FIX_2485_HARMONIZE_minimum_statistics

void minimum_statistics_fx(

    Word16 len,                    /* i  : Total number of partitions (CLDFB or FFT)                   */

    Word16 lenFFT,                 /* i  : Number of FFT partitions                                  */
@@ -4646,57 +4645,6 @@ void minimum_statistics_fx( 
    const Word16 enc_dec,          /* i  : encoder/decoder indicator */

    const Word16 element_mode      /* i  : element mode type    */

);

#else

void minimum_statistics(

    Word16 len,                    /* i  : Total number of partitions (CLDFB or FFT)                   */

    Word16 lenFFT,                 /* i  : Number of FFT partitions                                  */

    Word16 *psize,                 /* i  : Partition sizes, fractional                               */

    Word16 *msPeriodog,            /* i  : Periodogram (energies)                                    */

    Word16 *msNoiseFloor,          /* i/o: Noise floors (energies)                                   */

    Word16 *msNoiseEst,            /* i/o: Noise estimates (energies)                                */

    Word32 *msAlpha,               /* i/o: Forgetting factors                                        */

    Word16 *msPsd,                 /* i/o: Power Spectral Density (smoothed periodogram => energies) */

    Word16 *msPsdFirstMoment,      /* i/o: PSD statistics of 1st order (energy means)                */

    Word32 *msPsdSecondMoment,     /* i/o: PSD statistics of 2nd order (energy variances)            */

    Word32 *msMinBuf,              /* i/o: Buffer of minima (energies)                               */

    Word32 *msBminWin,             /* o  : Bias correction factors                                   */

    Word32 *msBminSubWin,          /* o  : Bias correction factors                                   */

    Word32 *msCurrentMin,          /* i/o: Local minima (energies)                                   */

    Word32 *msCurrentMinOut,       /* i/o: Local minima (energies)                                   */

    Word32 *msCurrentMinSubWindow, /* i/o: Local minima (energies)                                   */

    Word16 *msLocalMinFlag,        /* i  : Binary flag                                               */

    Word16 *msNewMinFlag,          /* i  : Binary flag                                               */

    Word16 *msPeriodogBuf,         /* i/o: Buffer of periodograms (energies)                         */

    Word16 *msPeriodogBufPtr,      /* i/o: Counter                                                   */

    HANDLE_FD_CNG_COM st           /* i/o: FD_CNG structure containing buffers and variables         */

);



void minimum_statistics_fx(

    Word16 len,                    /* i  : Total number of partitions (CLDFB or FFT)                   */

    Word16 lenFFT,                 /* i  : Number of FFT partitions                                  */

    Word16 *psize,                 /* i  : Partition sizes, fractional                               */

    Word16 *msPeriodog,            /* i  : Periodogram (energies)                                    */

    Word32 *msNoiseFloor,          /* i/o: Noise floors (energies)                                Q25*/

    Word32 *msNoiseEst,            /* i/o: Noise estimates (energies)                             Q25*/

    Word32 *msAlpha,               /* i/o: Forgetting factors                                        */

    Word16 *msPsd,                 /* i/o: Power Spectral Density (smoothed periodogram => energies) */

    Word16 *msPsdFirstMoment,      /* i/o: PSD statistics of 1st order (energy means)                */

    Word32 *msPsdSecondMoment,     /* i/o: PSD statistics of 2nd order (energy variances)            */

    Word32 *msMinBuf,              /* i/o: Buffer of minima (energies)                               */

    Word32 *msBminWin,             /* o  : Bias correction factors                                   */

    Word32 *msBminSubWin,          /* o  : Bias correction factors                                   */

    Word32 *msCurrentMin,          /* i/o: Local minima (energies)                                   */

    Word32 *msCurrentMinOut,       /* i/o: Local minima (energies)                                   */

    Word32 *msCurrentMinSubWindow, /* i/o: Local minima (energies)                                   */

    Word16 *msLocalMinFlag,        /* i  : Binary flag                                               */

    Word16 *msNewMinFlag,          /* i  : Binary flag                                               */

    Word16 *msPeriodogBuf,         /* i/o: Buffer of periodograms (energies)                         */

    Word16 *msPeriodogBufPtr,      /* i/o: Counter                                                   */

    HANDLE_FD_CNG_COM hFdCngCom,   /* i/o: FD_CNG structure containing all buffers and variables */

    const Word16 enc_dec,          /* i  : encoder/decoder indicator */

    const Word16 element_mode      /* i  : IVAS element mode type    */

);

#endif



/* Apply bitrate-dependant scale */

void apply_scale(

lib_dec/fd_cng_dec_fx.c

+0 −25
Original line number Diff line number Diff line
@@ -1280,7 +1280,6 @@ void perform_noise_estimation_dec_fx( 
        compress_range( hFdCngDec->msPeriodog, hFdCngDec->msPeriodog_exp, hFdCngDec->msLogPeriodog, npart );



        /* Call the minimum statistics routine for noise estimation */

#ifdef FIX_2485_HARMONIZE_minimum_statistics

        minimum_statistics_fx(

            npart,

            nFFTpart,
@@ -1305,30 +1304,6 @@ void perform_noise_estimation_dec_fx( 
            hFdCngDec->hFdCngCom,

            DEC,

            EVS_MONO );

#else

        minimum_statistics(

            npart,

            nFFTpart,

            psize_norm,

            hFdCngDec->msLogPeriodog,

            hFdCngDec->msNoiseFloor,

            hFdCngDec->msLogNoiseEst,

            hFdCngDec->msAlpha,

            hFdCngDec->msPsd,

            hFdCngDec->msPsdFirstMoment,

            hFdCngDec->msPsdSecondMoment,

            hFdCngDec->msMinBuf,

            hFdCngDec->msBminWin,

            hFdCngDec->msBminSubWin,

            hFdCngDec->msCurrentMin,

            hFdCngDec->msCurrentMinOut,

            hFdCngDec->msCurrentMinSubWindow,

            hFdCngDec->msLocalMinFlag,

            hFdCngDec->msNewMinFlag,

            hFdCngDec->msPeriodogBuf,

            &( hFdCngDec->msPeriodogBufPtr ),

            hFdCngDec->hFdCngCom );

#endif



        /* Expand MS outputs */

        expand_range( hFdCngDec->msLogNoiseEst, hFdCngDec->msNoiseEst, &hFdCngDec->msNoiseEst_exp, npart );

lib_enc/fd_cng_enc_fx.c

+0 −61
Original line number Diff line number Diff line
@@ -1761,7 +1761,6 @@ void perform_noise_estimation_enc_fx( 
    compress_range( msPeriodog_fx, hFdCngEnc->msPeriodog_fx_exp, hFdCngEnc->msLogPeriodog_fx, hFdCngEnc->hFdCngCom->npart );



    /* Call the minimum statistics routine for noise estimation */

#ifdef FIX_2485_HARMONIZE_minimum_statistics

    minimum_statistics_fx(

        hFdCngEnc->hFdCngCom->npart,

        nFFTpart,
@@ -1797,66 +1796,6 @@ void perform_noise_estimation_enc_fx( 
    {

        expand_range( hFdCngEnc->msLogNoiseEst_fx, hFdCngEnc->msNoiseEst_fx, &hFdCngEnc->msNoiseEst_fx_exp, hFdCngEnc->hFdCngCom->npart );

    }

#else

    IF( element_mode > 0 )

    {

        minimum_statistics_fx(

            hFdCngEnc->hFdCngCom->npart,

            nFFTpart,

            hFdCngEnc->hFdCngCom->psize_norm,

            hFdCngEnc->msLogPeriodog_fx,

            hFdCngEnc->msNoiseFloor_32fx,  /*32bit*/

            hFdCngEnc->msLogNoiseEst_32fx, /*32bit*/

            hFdCngEnc->msAlpha_fx,

            hFdCngEnc->msPsd_fx,

            hFdCngEnc->msPsdFirstMoment_fx,

            hFdCngEnc->msPsdSecondMoment_fx,

            hFdCngEnc->msMinBuf_fx,

            hFdCngEnc->msBminWin_fx,

            hFdCngEnc->msBminSubWin_fx,

            hFdCngEnc->msCurrentMin_fx,

            hFdCngEnc->msCurrentMinOut_fx,

            hFdCngEnc->msCurrentMinSubWindow_fx,

            hFdCngEnc->msLocalMinFlag,

            hFdCngEnc->msNewMinFlag,

            hFdCngEnc->msPeriodogBuf_fx,

            &( hFdCngEnc->msPeriodogBufPtr ),

            hFdCngEnc->hFdCngCom,

            ENC,

            ( hCPE == NULL ) ? 0 : hCPE->element_mode );



        /* Expand MS outputs */

        expand_range_fx( hFdCngEnc->msLogNoiseEst_32fx, hFdCngEnc->msNoiseEst_fx, &hFdCngEnc->msNoiseEst_fx_exp, hFdCngEnc->hFdCngCom->npart );

    }

    ELSE

    {

        minimum_statistics(

            hFdCngEnc->hFdCngCom->npart,

            nFFTpart,

            hFdCngEnc->hFdCngCom->psize_norm,

            hFdCngEnc->msLogPeriodog_fx,

            hFdCngEnc->msNoiseFloor_fx,  /*16bit*/

            hFdCngEnc->msLogNoiseEst_fx, /*16bit*/

            hFdCngEnc->msAlpha_fx,

            hFdCngEnc->msPsd_fx,

            hFdCngEnc->msPsdFirstMoment_fx,

            hFdCngEnc->msPsdSecondMoment_fx,

            hFdCngEnc->msMinBuf_fx,

            hFdCngEnc->msBminWin_fx,

            hFdCngEnc->msBminSubWin_fx,

            hFdCngEnc->msCurrentMin_fx,

            hFdCngEnc->msCurrentMinOut_fx,

            hFdCngEnc->msCurrentMinSubWindow_fx,

            hFdCngEnc->msLocalMinFlag,

            hFdCngEnc->msNewMinFlag,

            hFdCngEnc->msPeriodogBuf_fx,

            &( hFdCngEnc->msPeriodogBufPtr ),

            hFdCngEnc->hFdCngCom );



        /* Expand MS outputs */

        expand_range( hFdCngEnc->msLogNoiseEst_fx, hFdCngEnc->msNoiseEst_fx, &hFdCngEnc->msNoiseEst_fx_exp, hFdCngEnc->hFdCngCom->npart );

    }

#endif /*FIX_2485_HARMONIZE_minimum_statistics*/



    return;

}