Commit 96b0b8c3 authored by vaclav's avatar vaclav
Browse files

Merge branch 'basop-2305-user-defined-macros-leftovers' into 'main' 

Resolve "User-defined macros leftovers"

See merge request !2686
parents abd14370 58c8d89d

apps/renderer.c

+2 −7
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
@@ -666,8 +661,8 @@ static void setupWithSingleFormatInput( 


            /* It is allowed on CLI to have no metadata for an ISM input - skip opening if string contains "NULL" */

            char charBuf[FILENAME_MAX];

            strncpy( charBuf, args.inMetadataFilePaths[i], min( FILENAME_MAX, RENDERER_MAX_CLI_ARG_LENGTH ) - 1 );

            charBuf[min( FILENAME_MAX, RENDERER_MAX_CLI_ARG_LENGTH ) - 1] = '\0';

            strncpy( charBuf, args.inMetadataFilePaths[i], RENDERER_MAX_CLI_ARG_LENGTH - 1 );

            charBuf[RENDERER_MAX_CLI_ARG_LENGTH - 1] = '\0';

            to_upper( charBuf );

            if ( strncmp( charBuf, "NULL", 4 ) == 0 )

            {

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_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                      1                           /* == max( STEREO_DFT_ITD_MAX - pow(2,STEREO_DFT_ITD_NBITS-1) + 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_com/ivas_rotation_com_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ void Quat2EulerDegree_fx( 
        Word32 tmp8 = W_extract_l( W_shr( W_mult0_32_32( quat.w_fx, quat.y_fx ), Q22 ) ); // Q22

        Word32 tmp9 = W_extract_l( W_shr( W_mult0_32_32( quat.z_fx, quat.x_fx ), Q22 ) ); // Q22

        p_fx = L_shl( L_sub( tmp8, tmp9 ), 1 );

        p_fx = max( L_negate( ONE_IN_Q22 ), min( ONE_IN_Q22, p_fx ) ); // Q22

        p_fx = L_max( L_negate( ONE_IN_Q22 ), L_min( ONE_IN_Q22, p_fx ) ); // Q22



        Word32 p_fx_sq = W_extract_l( W_shr( W_mult0_32_32( p_fx, p_fx ), Q22 ) );

        Word16 res_exp = 0;