Unverified Commit c3d6f9f6 authored by norvell's avatar norvell
Browse files

Remove mdct_classifier_ivas_fx

parent c95fb11d

lib_com/hq_tools_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -2648,12 +2648,12 @@ void enforce_zero_for_min_envelope_fx( 
 *--------------------------------------------------------------------------*/



void apply_envelope_enc_fx(

    const Word16 *coeff,     /* i/o: Normalized/scaled normalized spectrum  Q12 */

    const Word16 *coeff,     /* i  : Normalized spectrum                    Q12 */

    const Word16 *norm,      /* i  : Envelope                               Q0  */

    const Word16 num_sfm,    /* i  : Total number of bands                  Q0  */

    const Word16 *sfm_start, /* i  : Sub band start indices                 Q0  */

    const Word16 *sfm_end,   /* i  : Sub band end indices                   Q0  */

    Word32 *coeff_out        /* o  : scaled normalized spectrum             Q12 */

    Word32 *coeff_out        /* o  : scaled spectrum                        Q12 */

)

#else

/*--------------------------------------------------------------------------*

lib_com/ivas_prot_fx.h

+2 −2
Original line number Diff line number Diff line
@@ -2720,7 +2720,7 @@ void ivas_param_mc_metadata_open_fx( 
    const Word32 ivas_total_brate,                              /* i  : IVAS total bitrate                                  */

    HANDLE_IVAS_PARAM_MC_METADATA hMetadataPMC                  /* o  : handle for the Parametric MC parameter coding state */

);



#ifndef HQ_ALIGN_DUPLICATED_CODE

Word16 mdct_classifier_ivas_fx(

    Encoder_State *st,                                          /* i/o: Encoder state variable                  */

    const Word16 *fft_buff,                                     /* i  : FFT spectrum from fft_rel               */
@@ -2728,7 +2728,7 @@ Word16 mdct_classifier_ivas_fx( 
    Word16 enerBuffer_exp,                                      /* i: enenrgy buffer exponent                   */

    const Word32 brate                                          /* i  : current brate, IVAS: nominal bitrate, EVS: st->total_brate */

);



#endif



/*----------------------------------------------------------------------------------*

 * Range Coder prototypes

lib_com/prot_fx.h

+11 −0
Original line number Diff line number Diff line
@@ -735,6 +735,16 @@ void enforce_zero_for_min_envelope_fx( 
    const Word16 *sfm_end    /* i  : Sub band end indices               Q0  */

);



#ifdef HQ_ALIGN_DUPLICATED_CODE

void apply_envelope_enc_fx(

    const Word16 *coeff,     /* i  : Normalized spectrum                    Q12 */

    const Word16 *norm,      /* i  : Envelope                               Q0  */

    const Word16 num_sfm,    /* i  : Total number of bands                  Q0  */

    const Word16 *sfm_start, /* i  : Sub band start indices                 Q0  */

    const Word16 *sfm_end,   /* i  : Sub band end indices                   Q0  */

    Word32 *coeff_out        /* o  : scaled spectrum                        Q12 */

);

#else

void apply_envelope_enc_ivas_fx(

    const Word16 *coeff,     /* i/o: Coded/noisefilled normalized spectrum  Q12 */

    const Word16 *norm,      /* i  : Envelope                               Q0  */
@@ -743,6 +753,7 @@ void apply_envelope_enc_ivas_fx( 
    const Word16 *sfm_end,   /* i  : Sub band end indices                   Q0  */

    Word32 *coeff_out        /* o  : coded/noisefilled spectrum             Q12 */

);

#endif



void apply_envelope_fx(

    const Word16 *coeff,     /* i  : Coded/noisefilled normalized spectrum      Q12 */

lib_enc/ivas_decision_matrix_enc_fx.c

+12 −2
Original line number Diff line number Diff line
@@ -36,7 +36,9 @@ 
#include "prot_fx.h"

#include "wmc_auto.h"

#include "ivas_prot_fx.h" /* Function prototypes                    */



#ifdef HQ_ALIGN_DUPLICATED_CODE

#include "prot_fx_enc.h"

#endif



/*-----------------------------------------------------------------*

 *  ivas_decision_matrix_enc()
@@ -189,7 +191,15 @@ void ivas_decision_matrix_enc_fx( 
        ELSE

        {

/* select TCX core or HQ core using bits_frame_nominal to match the TCX configuration bitrate */

#ifdef HQ_ALIGN_DUPLICATED_CODE

            st->core = mdct_classifier_fx( fft_buff,

                                           st,

                                           enerBuffer,

                                           enerBuffer_exp,

                                           L_mult0( st->bits_frame_nominal, FRAMES_PER_SEC ) ); /* Q0 */

#else

            st->core = mdct_classifier_ivas_fx( st, fft_buff, enerBuffer, enerBuffer_exp, L_mult0( st->bits_frame_nominal, FRAMES_PER_SEC ) ); /* Q0 */

#endif

            move16();

        }

    }

lib_enc/mdct_classifier_fx.c

+10 −4
Original line number Diff line number Diff line
@@ -92,8 +92,13 @@ static void dft_mag_square_fx( 
Word16 mdct_classifier_fx(

    const Word16 *fft_buff, /* i  : re[0], re[1], ..., re[n/2], im[n/2 - 1], im[n/2 - 2], ..., im[1] */

    Encoder_State *st_fx,   /* i/o: Encoder state variable                                           */

#ifdef HQ_ALIGN_DUPLICATED_CODE

    const Word32 *cldfbBuf_Ener, /* i  : Sum array of energy values of CLDFB buffer                       */

    const Word16 enerBuffer_exp, /* i  : Exponent of cldfbBuf_Ener                                        */

#else

    Word32 *cldfbBuf_Ener, // enerBuffer_exp

    Word16 enerBuffer_exp,

#endif

    const Word32 brate /* i  : current brate, IVAS: nominal bitrate, EVS: st->total_brate       */

)

{
@@ -504,7 +509,7 @@ Word16 mdct_classifier_fx( 


    return clas_final; /* Q0 */

}



#ifndef HQ_ALIGN_DUPLICATED_CODE

Word16 mdct_classifier_ivas_fx(

    Encoder_State *st,         /* i/o: Encoder state variable                  */

    const Word16 *fft_buff,    /* i  : FFT spectrum from fft_rel               */
@@ -1045,3 +1050,4 @@ Word16 mdct_classifier_ivas_fx( 


    return clas_final;

}

#endif