Commit f85e8279 authored by vaillancour's avatar vaillancour
Browse files

fix linux compiler

parent fec71f13

lib_com/ivas_prot_fx.h

+4 −1
Original line number Diff line number Diff line
@@ -1326,8 +1326,11 @@ void stereo_icBWE_decproc_fx( 
    Word32 outputHB[CPE_CHANNELS][L_FRAME48k], /* i  : HB synthesis                */

    const Word16 last_core,                    /* i  : last core, primary channel  */

    const Word16 last_bwidth,                  /* i  : last bandwidth              */

    const Word16 output_frame,                 /* i  : frame length                */

    const Word16 output_frame                  /* i  : frame length                */

#ifndef FIX_826_PRECISION_LOST_AND_COMPL

    ,

    Word16 q_output                            /* i  : Q-fac of output             */

#endif

);



void add_HB_to_mono_dmx_fx(

lib_dec/ivas_cpe_dec_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -848,7 +848,11 @@ ivas_error ivas_cpe_dec_fx( 
     * IC-BWE: output LB and HB mix in ACELP mode

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



#ifndef FIX_826_PRECISION_LOST_AND_COMPL

    stereo_icBWE_decproc_fx( hCPE, output, outputHB_fx, last_core, last_bwidth, output_frame, *q_output );

#else

    stereo_icBWE_decproc_fx( hCPE, output, outputHB_fx, last_core, last_bwidth, output_frame);

#endif



    smooth_dft2td_transition_fx( hCPE, output, output_frame );

lib_dec/ivas_stereo_icbwe_dec.c

+11 −2
Original line number Diff line number Diff line
@@ -578,7 +578,11 @@ void stereo_icBWE_dec_fx( 
    Word16 temp1_fx, temp2_fx;

    Word16 icbweM2Ref_fx, ratio_L_fx;

    Word16 gsMapping_fx;

#ifndef FIX_826_PRECISION_LOST_AND_COMPL

    Word32 hb_nrg_fx, hb_nrg2_fx;

#else

    Word32 hb_nrg_fx;

#endif

    Word16 Q_syn_shb;

    Word16 shift_prev_pow, synthRef_shift;

    Word32 L_tmp;
@@ -626,7 +630,9 @@ void stereo_icBWE_dec_fx( 
    {

        hb_nrg_fx = 0;

        move32();

#ifndef FIX_826_PRECISION_LOST_AND_COMPL 

        hb_nrg2_fx = 0;

#endif

        move32();

        maximum_abs_32_fx( synthRef_fx, output_frame, &maxVal );

        synthRef_shift = norm_l( maxVal );
@@ -1729,8 +1735,11 @@ void stereo_icBWE_decproc_fx( 
    Word32 outputHB[CPE_CHANNELS][L_FRAME48k], /* i  : HB synthesis                */

    const Word16 last_core,                    /* i  : last core, primary channel  */

    const Word16 last_bwidth,                  /* i  : last bandwidth              */

    const Word16 output_frame,                 /* i  : frame length                */

    const Word16 output_frame                  /* i  : frame length                */

#ifndef FIX_826_PRECISION_LOST_AND_COMPL

    ,

    Word16 q_output                             /* i  : Q-fac of output             */

#endif

)

{

    Word16 i, j, n, decoderDelay, icbweOLASize, dftOvlLen;