Commit c709140d authored by malenov's avatar malenov
Browse files

rename preemph_fx() to PREEMPH_FX() in order to be recognized as macro by the WMC tool

parent 0a39da33

lib_com/modif_fs_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ Word16 modify_Fs_fx( /* o : length of output Q0 */ 
        mu_preemph_fx = extract_h( t0 ); /*r_fx[1] / r_fx[0]; */

        mem_preemph_fx = signal_ana_fx[mem_len_ana + lg - LEN_WIN_SSS - 1];

        move16();

        preemph_fx( signal_ana_fx + mem_len_ana + lg - LEN_WIN_SSS, mu_preemph_fx, LEN_WIN_SSS, &mem_preemph_fx );

        PREEMPH_FX( signal_ana_fx + mem_len_ana + lg - LEN_WIN_SSS, mu_preemph_fx, LEN_WIN_SSS, &mem_preemph_fx );





        /* Autocorrelations */

lib_com/prot_fx.h

+1 −1
Original line number Diff line number Diff line
@@ -2417,7 +2417,7 @@ void lag_wind_32( 
);



// preemp_fx.c

#define preemph_fx( signal, mu, L, mem ) preemph_copy_fx( ( signal ), ( signal ), ( mu ), ( L ), ( mem ) )

#define PREEMPH_FX( signal, mu, L, mem ) preemph_copy_fx( ( signal ), ( signal ), ( mu ), ( L ), ( mem ) )



void preemph_copy_fx(

    const Word16 x[], /* i  : i   signal             Qx  */

lib_com/stat_noise_uv_mod_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ void stat_noise_uv_mod_fx( 
                exctilt = mult( shl( sub( TILT_COMP_LIM_FX, min_alpha ), 2 ), exctilt ); /*Q15  */

#endif                                                                                                /* BASOP_NOGLOB */



                preemph_fx( &Exc2_local[i_subfr], exctilt, L_SUBFR, exc_pe );

                PREEMPH_FX( &Exc2_local[i_subfr], exctilt, L_SUBFR, exc_pe );

            }

        }

lib_com/swb_tbe_com_fx.c

+5 −5
Original line number Diff line number Diff line
@@ -2510,7 +2510,7 @@ void GenShapedSHBExcitation_fx( 
                move16();

                /* exc16kWhtnd:  Q_bwe_exc */

            }

            preemph_fx( exc16kWhtnd, PREEMPH_FAC, L_FRAME16k, tbe_premph );

            PREEMPH_FX( exc16kWhtnd, PREEMPH_FAC, L_FRAME16k, tbe_premph );

            /* i/o: exc16kWhtnd  (Q_bwe_exc) */

            /* i/o: tbe_premph (Q_bwe_exc) */

        }
@@ -2605,7 +2605,7 @@ void GenShapedSHBExcitation_fx( 
                temp = div_s( temp, temp2 );           /* Q15 */

                temp = mult_r( PREEMPH_FAC, temp );



                preemph_fx( &exc16kWhtnd[i * lSubFr], temp, lSubFr, tbe_premph );

                PREEMPH_FX( &exc16kWhtnd[i * lSubFr], temp, lSubFr, tbe_premph );

                /* exc16kWhtnd: Q_bwe_exc;

                   tbe_premph: Q_bwe_exc*/

            }
@@ -3434,7 +3434,7 @@ void GenShapedSHBExcitation_ivas_fx( 
            }

        }

        // preemph(exc16kWhtnd, PREEMPH_FAC, L_FRAME16k, tbe_premph);

        preemph_fx( exc16kWhtnd, PREEMPH_FAC, L_FRAME16k, tbe_premph );

        PREEMPH_FX( exc16kWhtnd, PREEMPH_FAC, L_FRAME16k, tbe_premph );

    }

    ELSE

#endif
@@ -3460,7 +3460,7 @@ void GenShapedSHBExcitation_ivas_fx( 
                move16();

                /* exc16kWhtnd:  Q_bwe_exc */

            }

            preemph_fx( exc16kWhtnd, PREEMPH_FAC, L_FRAME16k, tbe_premph );

            PREEMPH_FX( exc16kWhtnd, PREEMPH_FAC, L_FRAME16k, tbe_premph );

            /* i/o: exc16kWhtnd  (Q_bwe_exc) */

            /* i/o: tbe_premph (Q_bwe_exc) */

        }
@@ -3558,7 +3558,7 @@ void GenShapedSHBExcitation_ivas_fx( 
                temp = div_s( temp, temp2 );           /* Q15 */

                temp = mult_r( PREEMPH_FAC, temp );



                preemph_fx( &exc16kWhtnd[i * lSubFr], temp, lSubFr, tbe_premph );

                PREEMPH_FX( &exc16kWhtnd[i * lSubFr], temp, lSubFr, tbe_premph );

                /* exc16kWhtnd: Q_bwe_exc;

                   tbe_premph: Q_bwe_exc*/

            }

lib_dec/acelp_core_dec_ivas_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -931,7 +931,7 @@ ivas_error acelp_core_dec_ivas_fx( 
                tmpF_fx = *old_exc_s_fx;

                st->mem_deemph_fx = old_exc_s_fx[sub( st->L_frame, 1 )];

                move16();

                preemph_fx( old_exc_s_fx, st->preemph_fac, L_FRAME16k, &tmpF_fx );

                PREEMPH_FX( old_exc_s_fx, st->preemph_fac, L_FRAME16k, &tmpF_fx );

                Copy( old_exc_s_fx + st->L_frame - M, st->mem_syn2_fx, M );

                Residu3_fx( Aq_fx, old_exc_s_fx, old_exc_fx + L_EXC_MEM_DEC - st->L_frame, st->L_frame, 0 );

#ifdef FIX_737_HQ_ACELP_SWITCH_SCALING_ERROR