Commit dca223bf authored by emerit's avatar emerit
Browse files

split switch names

parent 6397fb42

lib_com/options.h

+3 −2
Original line number Diff line number Diff line
@@ -161,7 +161,8 @@ 
#define FIX_1081_BINAURAL_SPLIT_PCM_SANITY_CHECK        /* VA: issue 1081: correct error print-out when BINAURAL_SPLIT_PCM is requested */

#endif



//#define FIX_CREND_FIX_POINT_HRTF_FILE_FORMAT            /* Orange issue 1031 : fix point hrtf binary file format */

//#define FIX_CREND_FIX_POINT_HRTF_FILE_FORMAT          /* Orange issue 1031 : new fix point hrtf binary file format */

#define FIX_CREND_SIMPLIFY_CODE                         /* Ora : simplify line code in crend */

#define FLOAT_FIX_POINT_HRTF_FILE_FORMAT                /* allows reading floation or fix point hrtf binary file format */

#define FIX_1053_REVERB_RECONFIGURATION                 /* Philips: issue 1053: fix for dynamic switching of acoustic environment */

#define CONF_DISTATT                                    /* Eri: Make distance attenuation configurable */

lib_rend/ivas_crend.c

+5 −5
Original line number Diff line number Diff line
@@ -1642,7 +1642,7 @@ static ivas_error ivas_rend_crendConvolver( 
    const float *pIn;

    float *pFreq_buf_re, *pFreq_buf_im;

    float *pFreq_buf2_re, *pFreq_buf2_im;

#ifdef FIX_CREND_FIX_POINT_HRTF_FILE_FORMAT

#ifdef FIX_CREND_SIMPLIFY_CODE

    float *pFreq_filt_re, *pFreq_filt_im;

#else

    const float *pFreq_filt_re, *pFreq_filt_im;
@@ -1698,7 +1698,7 @@ static ivas_error ivas_rend_crendConvolver( 
    }



    i = 0;

#ifdef FIX_CREND_FIX_POINT_HRTF_FILE_FORMAT

#ifdef FIX_CREND_SIMPLIFY_CODE

    if ( pCrend->hHrtfCrend->num_iterations_diffuse[0] > 0 )

    {

        if ( pCrend->hHrtfCrend->same_inv_diffuse_weight )
@@ -1724,7 +1724,7 @@ static ivas_error ivas_rend_crendConvolver( 
            {

                if ( pCrend->hHrtfCrend->same_inv_diffuse_weight )

                {

#ifndef FIX_CREND_FIX_POINT_HRTF_FILE_FORMAT

#ifndef FIX_CREND_SIMPLIFY_CODE

                    pFreq_buf_re = &hCrend->freq_buffer_re_diffuse[0][offset_diffuse];

                    pFreq_buf_im = &hCrend->freq_buffer_im_diffuse[0][offset_diffuse];

#endif
@@ -1739,7 +1739,7 @@ static ivas_error ivas_rend_crendConvolver( 
                }

                else

                {

#ifndef FIX_CREND_FIX_POINT_HRTF_FILE_FORMAT

#ifndef FIX_CREND_SIMPLIFY_CODE

                    pFreq_buf_re = &hCrend->freq_buffer_re_diffuse[0][offset_diffuse];

                    pFreq_buf_im = &hCrend->freq_buffer_im_diffuse[0][offset_diffuse];

                    pFreq_buf2_re = &hCrend->freq_buffer_re_diffuse[1][offset_diffuse];
@@ -1757,7 +1757,7 @@ static ivas_error ivas_rend_crendConvolver( 
                    }

                }

            }

#ifdef FIX_CREND_FIX_POINT_HRTF_FILE_FORMAT

#ifdef FIX_CREND_SIMPLIFY_CODE

            pFreq_filt_re = &hCrend->freq_buffer_re[i][offset];

            pFreq_filt_im = &hCrend->freq_buffer_im[i][offset];