Commit 2ee982b8 authored by vaclav's avatar vaclav
Browse files

avoid defined-function macros

parent 96ae0d1c

apps/renderer.c

+0 −5
Original line number Diff line number Diff line
@@ -87,11 +87,6 @@ static 
#define SEP_FOLDER '/'

#endif



#ifndef _WIN32

#define max( a, b ) ( ( ( a ) > ( b ) ) ? ( a ) : ( b ) )

#define min( a, b ) ( ( ( a ) < ( b ) ) ? ( a ) : ( b ) )

#endif





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

 * Local structures

lib_com/ari_hm_fx.c

+1 −2
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
    EVS Codec 3GPP TS26.452 Nov 04, 2021. Version 16.4.0

  ====================================================================================*/





#include <stdint.h>

#include <assert.h>

#include "options.h"
@@ -11,7 +10,7 @@ 
#include "rom_com.h"

#include "prot_fx.h"



#define GET_ADJ2( T, L, F ) ( ( ( L ) << ( F ) ) - ( T ) )



void UnmapIndex(

    const Word16 PeriodicityIndex, /* Q0 */

    const Word16 Bandwidth,        /* Q0 */

lib_com/cnst.h

+3 −0
Original line number Diff line number Diff line
@@ -985,6 +985,9 @@ enum 
 * TCX constants

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



#define TCX_IMDCT_SCALE                     15

#define TCX_IMDCT_HEADROOM                  1



#define NBITS_TCX_GAIN                      7



#define NOISE_FILL_RANGES                   1

lib_com/ivas_tools_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -605,7 +605,7 @@ void v_mult_mat_fx( 
        pt_y++;

    }



    MVR2R_WORD32( tmp_y, y, Nc ); /*Qx - guardbits*/

    Copy32( tmp_y, y, Nc ); /*Qx - guardbits*/

}

lib_com/modif_fs_fx.c

+2 −8
Original line number Diff line number Diff line
@@ -168,7 +168,6 @@ Word16 modify_Fs_ivas_fx( /* o : length of output Q 
    {

        autocorr_fx( signal_ana_fx + mem_len_ana + lg - LEN_WIN_SSS, 1, r_fx_h, r_fx_l, &Q_r, LEN_WIN_SSS, wind_sss_fx, 0, 0 );





        t1 = L_Comp( r_fx_h[1], r_fx_l[1] ); /* R[1] in Q31      */

        t2 = L_abs( t1 );                    /* abs R[1]         */

        t0 = L_deposit_l( 0 );
@@ -181,12 +180,10 @@ Word16 modify_Fs_ivas_fx( /* o : length of output Q 
            t0 = L_negate( t0 ); /* R[1]/R[0]       */

        }





        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 */

        autocorr_fx( signal_ana_fx + mem_len_ana + lg - LEN_WIN_SSS, M, r_fx_h, r_fx_l, &Q_r,
@@ -449,7 +446,6 @@ Word16 modify_Fs_fx( /* o : length of output Q0 */ 
    {

        autocorr_fx( signal_ana_fx + sub( add( mem_len_ana, lg ), LEN_WIN_SSS ), 1, r_fx_h, r_fx_l, &Q_r, LEN_WIN_SSS, wind_sss_fx, 0, 0 );





        t1 = L_Comp( r_fx_h[1], r_fx_l[1] ); /* R[1] in Q31      */

        t2 = L_abs( t1 );                    /* abs R[1]         */

        t0 = L_deposit_l( 0 );
@@ -462,12 +458,10 @@ Word16 modify_Fs_fx( /* o : length of output Q0 */ 
            t0 = L_negate( t0 ); /* R[1]/R[0]       */

        }





        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 + sub( add( mem_len_ana, lg ), LEN_WIN_SSS ), mu_preemph_fx, LEN_WIN_SSS, &mem_preemph_fx );



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



        /* Autocorrelations */

        autocorr_fx( signal_ana_fx + sub( add( mem_len_ana, lg ), LEN_WIN_SSS ), M, r_fx_h, r_fx_l, &Q_r,