Commit 7ec07c67 authored by Ke Zhao's avatar Ke Zhao
Browse files

Include some changes under switch UPDATE_SBA_FILTER

parent 37794106

lib_rend/ivas_crend.c

+8 −0
Original line number Diff line number Diff line
@@ -1308,9 +1308,17 @@ static ivas_error ivas_rend_crendConvolver( 
    int16_t lfe_idx_in;

    int16_t offset, offset_in, offset_diffuse;

    int16_t nchan_in, nchan_out;

#ifdef UPDATE_SBA_FILTER

    const float *pIn;

#else

    float *pIn;

#endif

    float *pFreq_buf_re, *pFreq_buf_im;

#ifdef UPDATE_SBA_FILTER

    const float *pFreq_filt_re, *pFreq_filt_im;

#else

    float *pFreq_filt_re, *pFreq_filt_im;

#endif

    float pOut[L_FRAME48k * 2];

    float tmp_out_re[L_FRAME48k], tmp_out_im[L_FRAME48k];

    ivas_error error;

lib_rend/ivas_rom_binaural_crend_head.c

+6 −0
Original line number Diff line number Diff line
@@ -42,7 +42,13 @@ 








































#ifndef UPDATE_SBA_FILTER













#include <stdint.h>













#endif















#include <stddef.h>













#ifndef UPDATE_SBA_FILTER













#include "cnst.h"













#endif















#include "ivas_cnst.h"





























/* clang-format off */

























lib_rend/ivas_rom_binaural_crend_head.h



+4
−0




























Original line number
Diff line number
Diff line








@@ -45,6 +45,10 @@













#ifndef _IVAS_ROM_BINAURAL_CREND_HEAD_















#define _IVAS_ROM_BINAURAL_CREND_HEAD_





























#ifndef UPDATE_SBA_FILTER













#include <stdint.h>













#include "cnst.h"













#endif















#include "ivas_cnst.h"































#ifdef USE_HRIR_128_METH5_IRC_53_Q10_SYML_ITRP1_48000

































lib_rend/ivas_stat_rend.h



+1
−0




























Original line number
Diff line number
Diff line








@@ -739,6 +739,7 @@ typedef struct ivas_hrtfs_fastconv_struct













    float rightHRIRReal_HOA3[BINAURAL_CONVBANDS][HRTF_SH_CHANNELS][7];















    float rightHRIRImag_HOA3[BINAURAL_CONVBANDS][HRTF_SH_CHANNELS][7];















#endif





























#ifdef UPDATE_SBA_FILTER















    float FASTCONV_HOA2_latency_s;















    float leftHRIRReal_HOA2[BINAURAL_CONVBANDS][9][BINAURAL_NTAPS];

































lib_util/hrtf_file_reader.c



+5
−1




























Original line number
Diff line number
Diff line








@@ -1111,7 +1111,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata(













#ifdef UPDATE_SBA_FILTER















    else if ( rend_type == RENDERER_BINAURAL_FASTCONV && input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_HOA3 )















#else













    else if ( rend_type == RENDERER_BINAURAL_FASTCONV && input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_HOA )













    if ( rend_type == RENDERER_BINAURAL_FASTCONV && input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_HOA )















#endif















    {















        /* HRIR_HOA3 */










@@ -1268,7 +1268,11 @@ static ivas_error create_fastconv_HRTF_from_rawdata(













    }















#endif















    /* BRIR */













#ifdef UPDATE_SBA_FILTER















    else if ( rend_type == RENDERER_BINAURAL_FASTCONV_ROOM && input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_COMBINED )













#else













    if ( rend_type == RENDERER_BINAURAL_FASTCONV_ROOM && input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_COMBINED )













#endif















    {















        ( *hHRTF )->FASTCONV_BRIR_latency_s = *( (float *) ( hrtf_data_rptr ) );















        hrtf_data_rptr += sizeof( float );