Commit 5da38eed authored by vaclav's avatar vaclav
Browse files

avoid defined-function macros

parent 2ee982b8

lib_com/ivas_cnst.h

+1 −1
Original line number Diff line number Diff line
@@ -561,7 +561,7 @@ typedef enum 
#define STEREO_DFT_ITD_FS                       32000

#define STEREO_DFT_ITD_MAX                      160                         /*samples @ 32000*/

#define STEREO_DFT_ITD_MAX_ANA                  200

#define STEREO_DFT_ITD_MIN                      max( STEREO_DFT_ITD_MAX - 256 + 1, 1 ) /*STEREO_DFT_ITD_MAX-pow(2,STEREO_DFT_ITD_NBITS-1)+1*/

#define STEREO_DFT_ITD_MIN                      s_max( STEREO_DFT_ITD_MAX - 256 + 1, 1 ) /*STEREO_DFT_ITD_MAX-pow(2,STEREO_DFT_ITD_NBITS-1)+1*/

#define STEREO_DFT_ITD_NBITS                    9                           /* 1 bit for sign, the rest for the absolute value*/

#define STEREO_DFT_ITD_MODE_NBITS               1

lib_util/ivas_rtp_pi_data.c

+0 −9
Original line number Diff line number Diff line
@@ -37,15 +37,6 @@ 
#include "cnst.h"





#ifndef min

#define min( x, y ) ( ( x ) < ( y ) ? ( x ) : ( y ) )

#endif



#ifndef max

#define max( x, y ) ( ( x ) > ( y ) ? ( x ) : ( y ) )

#endif





/* Generic PI data packing/unpacking functions */

typedef ivas_error ( *PACK_PI_FN )( const IVAS_PIDATA_GENERIC *piData, uint8_t *buffer, uint32_t maxDataBytes, uint32_t *nBytesWritten );

typedef ivas_error ( *UNPACK_PI_FN )( const uint8_t *buffer, uint32_t numDataBytes, IVAS_PIDATA_GENERIC *piData );

lib_util/render_config_reader.c

+8 −10
Original line number Diff line number Diff line
@@ -87,14 +87,6 @@ 
#define FALSE 0

#endif



#ifndef min

#define min( x, y ) ( ( x ) < ( y ) ? ( x ) : ( y ) )

#endif



#ifndef max

#define max( x, y ) ( ( x ) > ( y ) ? ( x ) : ( y ) )

#endif





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

 * Local Type definitions
@@ -661,8 +653,14 @@ static ivas_error read_bin_code_word( 
    /* First read minLen bits, then add one bit per iteration to find the correct value */

    for ( n = 0; n < size; n++ )

    {

        minLen = min( minLen, pLengths[n] );

        maxLen = max( maxLen, pLengths[n] );

        if ( minLen < pLengths[n] )

        {

            minLen = pLengths[n];

        }

        if ( pLengths[n] > maxLen )

        {

            maxLen = pLengths[n];

        }

    }

    for ( len = minLen; len <= maxLen; len++ )

    {