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

Cleanup

parent ca1710e5

lib_com/ivas_prot_fx.h

+4 −2
Original line number Diff line number Diff line
@@ -2721,13 +2721,15 @@ void ivas_param_mc_metadata_open_fx( 
    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               */

    const Word32 enerBuffer[],                                  /* i  : energy buffer                           */

    Word16 enerBuffer_exp,                                      /* i: enenrgy buffer exponent                   */

    Word16 enerBuffer_exp,                                      /* i  : energy buffer exponent                  */

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

);

#endif



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

 * Range Coder prototypes

lib_enc/ivas_decision_matrix_enc_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -191,7 +191,11 @@ 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( st, fft_buff, 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

+7 −4
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
#include "rom_com.h"

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

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

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

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



/*--------------------------------------------------------------------------*
@@ -505,11 +504,15 @@ Word16 mdct_classifier_fx( 
    return clas_final; /* Q0 */

}

#endif

#ifdef HQ_ALIGN_DUPLICATED_CODE

Word16 mdct_classifier_fx(

#else

Word16 mdct_classifier_ivas_fx(

#endif

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

    const Word16 *fft_buff,    /* i  : FFT spectrum from fft_rel               */

    const Word32 enerBuffer[], /* i  : energy buffer                           enerBuffer_exp*/

    Word16 enerBuffer_exp,

    const Word32 enerBuffer[], /* i  : energy buffer                           */

    Word16 enerBuffer_exp,     /* i  : energy buffer exponent                  */

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

)

{

lib_enc/pre_proc_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -789,7 +789,7 @@ void pre_proc_fx( 
            {

                /* Select MDCT Core */

#ifdef HQ_ALIGN_DUPLICATED_CODE

                st->core = mdct_classifier_ivas_fx( st, fft_buff, enerBuffer, sub( enerBuffer_exp, 31 ), st->total_brate );

                st->core = mdct_classifier_fx( st, fft_buff, enerBuffer, sub( enerBuffer_exp, 31 ), st->total_brate );

#else

                st->core = mdct_classifier_fx( fft_buff, st, enerBuffer, sub( enerBuffer_exp, 31 ), st->total_brate );

#endif
@@ -1234,7 +1234,7 @@ void pre_proc_fx( 
                IF( ( EQ_16( st->bwidth, SWB ) || EQ_16( st->bwidth, FB ) ) && EQ_32( st->total_brate, ACELP_24k40 ) )

                {

#ifdef HQ_ALIGN_DUPLICATED_CODE

                    st->core = mdct_classifier_ivas_fx( st, fft_buff, enerBuffer, sub( enerBuffer_exp, 31 ), st->total_brate );

                    st->core = mdct_classifier_fx( st, fft_buff, enerBuffer, sub( enerBuffer_exp, 31 ), st->total_brate );

#else

                    st->core = mdct_classifier_fx( fft_buff, st, enerBuffer, sub( enerBuffer_exp, 31 ), st->total_brate );

#endif

lib_enc/prot_fx_enc.h

+9 −1
Original line number Diff line number Diff line
@@ -244,7 +244,15 @@ void ivas_long_enr_fx( 
    const Word16 Etot_LR[]             /* i  : total channel energy LR channels         Q=8*/

);



#ifndef HQ_ALIGN_DUPLICATED_CODE

#ifdef HQ_ALIGN_DUPLICATED_CODE

Word16 mdct_classifier_fx(

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

    const Word16 *fft_buff,    /* i  : FFT spectrum from fft_rel               */

    const Word32 enerBuffer[], /* i  : energy buffer                           */

    Word16 enerBuffer_exp,     /* i  : energy buffer exponent                  */

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

);

#else

/* o: MDCT A/B decision  */

Word16 mdct_classifier_fx(

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