Commit 2c3cbc0d authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge branch '1716_basop_activate_switch' into 'main-pc' 

[Allow-regression][Non-BE][Rend Non-BE]Activate switch NONBE_FIX_991_PARAMBIN_BINARY_HRTF.

See merge request !1849
parents d0034383 be1174d2

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ 




#define FIX_777_COMBI_RENDER_CONFIG_FILE                /* Philips: Fix for combined renderer config file support */

/* #define NONBE_FIX_991_PARAMBIN_BINARY_HRTF   */           /* Nokia: issue #991: fix using of binary file HRTF in ParamBin (to activate when USE_NEW_HRTF_BINARY_FILE_FORMAT and FIX_777_COMBI_RENDER_CONFIG_FILE are on ) */

#define NONBE_FIX_991_PARAMBIN_BINARY_HRTF              /* Nokia: issue #991: fix using of binary file HRTF in ParamBin (to activate when USE_NEW_HRTF_BINARY_FILE_FORMAT and FIX_777_COMBI_RENDER_CONFIG_FILE are on ) */



#define FIX_1024_REMOVE_PARAMMC_MIXING_MAT              /* VA: issue 1024: remove unused function ivas_param_mc_get_mono_stereo_mixing_matrices() */

#define FIX_1741_REVERB_TIMES_Q_FORMAT                  /* Philips: reverberation times in Q26 format instead of Q31 */

lib_rend/ivas_rom_binauralRenderer.h

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ extern Word32 rightHRIRImag_fx[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][BINAURAL_NT 
extern Word32 FASTCONV_HOA3_latency_s_fx;

extern Word32 FASTCONV_HOA2_latency_s_fx;

extern Word32 FASTCONV_FOA_latency_s_fx;

extern Word16 hrtfShCoeffsRe_fx[BINAURAL_CHANNELS][HRTF_SH_CHANNELS][HRTF_NUM_BINS]; /* Q15 */

extern Word16 hrtfShCoeffsRe_fx[BINAURAL_CHANNELS][HRTF_SH_CHANNELS][HRTF_NUM_BINS]; /* Q14 */

extern Word16 hrtfShCoeffsIm_fx[BINAURAL_CHANNELS][HRTF_SH_CHANNELS][HRTF_NUM_BINS]; /* Q14 */

lib_util/hrtf_file_reader.c

+1 −1
Original line number Diff line number Diff line
@@ -2023,7 +2023,7 @@ static ivas_error create_parambin_HRTF_from_rawdata( 
        {

            memcpy( f_tmp_hrtfShCoeffs, hrtf_data_rptr, data_size_tmp );

            /*adding conversion as file reading is done in float*/

            floatToFixed_arr16( f_tmp_hrtfShCoeffs, ( *hHRTF )->hrtfShCoeffsRe_fx[i][j], Q15, HRTF_NUM_BINS );

            floatToFixed_arr16( f_tmp_hrtfShCoeffs, ( *hHRTF )->hrtfShCoeffsRe_fx[i][j], Q14, HRTF_NUM_BINS );

            hrtf_data_rptr += data_size_tmp;

        }

    }