Commit 29f210c9 authored by vaclav's avatar vaclav
Browse files

define RESAMPLE_FACTOR_16_48/RESAMPLE_FACTOR_48_48 only once

parent 83101f87

lib_com/ivas_cnst.h

+3 −0
Original line number Diff line number Diff line
@@ -1530,6 +1530,9 @@ typedef enum 
#define MAX_ANGULAR_STEP_INV                    ( 1.0f / MAX_ANGULAR_STEP )

#define MAX_INTERPOLATION_STEPS                 12



#define RESAMPLE_FACTOR_16_48                   ( 16.0f / 48.0f )

#define RESAMPLE_FACTOR_32_48                   ( 32.0f / 48.0f )



/* ----- Enums - TD Renderer ----- */



typedef enum

lib_rend/ivas_objectRenderer_mix.c

+1 −9
Original line number Diff line number Diff line
@@ -45,16 +45,8 @@ 
#endif





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

 * Local constants

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



#define RESAMPLE_FACTOR_16_48 ( 16.0f / 48.0f )

#define RESAMPLE_FACTOR_32_48 ( 32.0f / 48.0f )





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

 * Local functions

 * Local functions declaration

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



static ivas_error DefaultBSplineModel( TDREND_HRFILT_FiltSet_t *HrFiltSet_p, const int32_t output_Fs );

lib_util/hrtf_file_reader.c

+2 −10
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
#ifdef FIX_POINT_HRTF_FILE_FORMAT

#include <math.h>

#endif

#include "prot.h"

#include <stdlib.h>

#include "ivas_prot_rend.h"

#include "ivas_prot.h"
@@ -58,14 +58,6 @@ typedef struct ivas_hrtfs_file_header_t 


} ivas_hrtfs_file_header_t;





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

 * Local constants

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



#define RESAMPLE_FACTOR_16_48 ( 16.0f / 48.0f )

#define RESAMPLE_FACTOR_32_48 ( 32.0f / 48.0f )



#ifndef FIX_POINT_HRTF_FILE_FORMAT

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

 * Local function declarations
@@ -479,7 +471,6 @@ static void LoadBSplineBinaryITD( 
    return;

}

#endif



#ifdef FIX_POINT_HRTF_FILE_FORMAT



/*-------------------------------------------------------------------*
@@ -907,6 +898,7 @@ static ivas_error LoadBSplineBinary( 
}

#endif





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

 * load_reverb_from_binary()

 *