Commit 871f392c authored by Ke Zhao's avatar Ke Zhao
Browse files

Merge branch '584-update-sba-cldfb-domain-hrtfs' into 'main' 

[Non-BE] Resolve "Update SBA CLDFB-Domain HRTFs"

See merge request !796
parents 354e7a8a 6f3e8d4a

lib_com/ivas_cnst.h

+12 −0
Original line number Diff line number Diff line
@@ -174,6 +174,9 @@ typedef enum 
#define CPE_CHANNELS                            2                           /* number of CPE (stereo) channels */

#define FOA_CHANNELS                            4                           /* number of FOA channels */

#define HOA2_CHANNELS                           9

#ifdef UPDATE_FASTCONV_SBA_FILTER

#define HOA3_CHANNELS                           16

#endif



#define MAX_NUM_OBJECTS                         4                           /* max. number of audio objects */
@@ -1501,10 +1504,19 @@ typedef enum 
#define BINAURAL_MAXBANDS                       60                          /* Max number of bands */

#define BINAURAL_CONVBANDS                      50                          /* Bands upto which convolution is performed */

#define BINAURAL_NTAPS                           5



#ifdef UPDATE_FASTCONV_SBA_FILTER

#define BINAURAL_NTAPS_SBA                       3

#endif



#define BINAURAL_NTAPS_MAX                      96



#define HRTF_SH_ORDER                           3

#ifdef UPDATE_FASTCONV_SBA_FILTER

#define HRTF_SH_CHANNELS                        HOA3_CHANNELS

#else

#define HRTF_SH_CHANNELS                        16

#endif

#define HRTF_LS_CHANNELS                        15

#define HRTF_NUM_BINS                           60

#define REVERB_PREDELAY_MAX                     20                          /* Max input delay for reverb module */

lib_com/options.h

100755 → 100644
+1 −0
Original line number Diff line number Diff line
@@ -165,6 +165,7 @@ 
#define FIX_575_LOW_OVERLAP_PLC_RECOVERY                /* FhG: Issue 575 fix for PLC and transistion to TCX5*/

#define ISM_FB_16k4                                     /* VA: Issue: 579: change BW from SWB to FB in NxISM conditions to match the EVS codec */

#define FIX_580_PARAMMC_ENER_BURSTS                     /* FhG: issue 580: energy bursts due to ILD holding when energy relations change too much */

#define UPDATE_FASTCONV_SBA_FILTER                      /* Dlb: Issue 584: Update SBA CLDFB-Domain HRTFs */

#define FIX_570_SF_EXT_ORIENTATION

#define FIX_593_STL_INCLUDE                             /* FhG: Issue 593: correct include of stl.h in lib_enc/ivas_stereo_eclvq_enc.c */

#define FIX_583_CLANG_TRANS_DET                         /* FhG: Issue 583: clang left shift on ramp_up_flag in transient detector */

lib_dec/ivas_binRenderer_internal.c

+35 −0
Original line number Diff line number Diff line
@@ -179,8 +179,19 @@ static ivas_error ivas_binRenderer_convModuleOpen( 
        }

    }

    else

    {

#ifdef UPDATE_FASTCONV_SBA_FILTER

        if ( hBinRenderer->ivas_format == SBA_FORMAT )

        {

            hBinRenConvModule->numTaps = BINAURAL_NTAPS_SBA;

        }

        else

        {

            hBinRenConvModule->numTaps = BINAURAL_NTAPS;

        }

#else

        hBinRenConvModule->numTaps = BINAURAL_NTAPS;

#endif



        /* Use fixed order filtering */

        bandIdx = 0;
@@ -429,6 +440,29 @@ static ivas_error ivas_binaural_hrtf_open( 
                mvr2r( rightBRIRImag[i][j], HrtfFastConv->rightBRIRImag[i][j], BINAURAL_NTAPS_MAX );

            }



#ifdef UPDATE_FASTCONV_SBA_FILTER

            for ( j = 0; j < HOA3_CHANNELS; j++ )

            {

                mvr2r( leftHRIRReal_HOA3[i][j], HrtfFastConv->leftHRIRReal_HOA3[i][j], BINAURAL_NTAPS_SBA );

                mvr2r( leftHRIRImag_HOA3[i][j], HrtfFastConv->leftHRIRImag_HOA3[i][j], BINAURAL_NTAPS_SBA );

                mvr2r( rightHRIRReal_HOA3[i][j], HrtfFastConv->rightHRIRReal_HOA3[i][j], BINAURAL_NTAPS_SBA );

                mvr2r( rightHRIRImag_HOA3[i][j], HrtfFastConv->rightHRIRImag_HOA3[i][j], BINAURAL_NTAPS_SBA );

            }

            for ( j = 0; j < HOA2_CHANNELS; j++ )

            {

                mvr2r( leftHRIRReal_HOA2[i][j], HrtfFastConv->leftHRIRReal_HOA2[i][j], BINAURAL_NTAPS_SBA );

                mvr2r( leftHRIRImag_HOA2[i][j], HrtfFastConv->leftHRIRImag_HOA2[i][j], BINAURAL_NTAPS_SBA );

                mvr2r( rightHRIRReal_HOA2[i][j], HrtfFastConv->rightHRIRReal_HOA2[i][j], BINAURAL_NTAPS_SBA );

                mvr2r( rightHRIRImag_HOA2[i][j], HrtfFastConv->rightHRIRImag_HOA2[i][j], BINAURAL_NTAPS_SBA );

            }

            for ( j = 0; j < FOA_CHANNELS; j++ )

            {

                mvr2r( leftHRIRReal_FOA[i][j], HrtfFastConv->leftHRIRReal_FOA[i][j], BINAURAL_NTAPS_SBA );

                mvr2r( leftHRIRImag_FOA[i][j], HrtfFastConv->leftHRIRImag_FOA[i][j], BINAURAL_NTAPS_SBA );

                mvr2r( rightHRIRReal_FOA[i][j], HrtfFastConv->rightHRIRReal_FOA[i][j], BINAURAL_NTAPS_SBA );

                mvr2r( rightHRIRImag_FOA[i][j], HrtfFastConv->rightHRIRImag_FOA[i][j], BINAURAL_NTAPS_SBA );

            }

#else

            for ( j = 0; j < HRTF_SH_CHANNELS; j++ )

            {

                mvr2r( leftHRIRReal_HOA3[i][j], HrtfFastConv->leftHRIRReal_HOA3[i][j], BINAURAL_NTAPS );
@@ -450,6 +484,7 @@ static ivas_error ivas_binaural_hrtf_open( 
                mvr2r( rightHRIRReal_FOA[i][j], HrtfFastConv->rightHRIRReal_FOA[i][j], BINAURAL_NTAPS );

                mvr2r( rightHRIRImag_FOA[i][j], HrtfFastConv->rightHRIRImag_FOA[i][j], BINAURAL_NTAPS );

            }

#endif

        }



        mvr2r( fastconvReverberationTimes, HrtfFastConv->fastconvReverberationTimes, CLDFB_NO_CHANNELS_MAX );

lib_rend/ivas_rom_binauralRenderer.c

+7059 −0

File changed.

Preview size limit exceeded, changes collapsed.

lib_rend/ivas_rom_binauralRenderer.h

+15 −0
Original line number Diff line number Diff line
@@ -44,6 +44,20 @@ 


/* Binaural rendering data set based on HRIRs */

extern const float FASTCONV_HRIR_latency_s;

#ifdef UPDATE_FASTCONV_SBA_FILTER

extern float leftHRIRReal_HOA3[BINAURAL_CONVBANDS][HOA3_CHANNELS][BINAURAL_NTAPS_SBA];

extern float leftHRIRImag_HOA3[BINAURAL_CONVBANDS][HOA3_CHANNELS][BINAURAL_NTAPS_SBA];

extern float rightHRIRReal_HOA3[BINAURAL_CONVBANDS][HOA3_CHANNELS][BINAURAL_NTAPS_SBA];

extern float rightHRIRImag_HOA3[BINAURAL_CONVBANDS][HOA3_CHANNELS][BINAURAL_NTAPS_SBA];

extern float leftHRIRReal_HOA2[BINAURAL_CONVBANDS][HOA2_CHANNELS][BINAURAL_NTAPS_SBA];

extern float leftHRIRImag_HOA2[BINAURAL_CONVBANDS][HOA2_CHANNELS][BINAURAL_NTAPS_SBA];

extern float rightHRIRReal_HOA2[BINAURAL_CONVBANDS][HOA2_CHANNELS][BINAURAL_NTAPS_SBA];

extern float rightHRIRImag_HOA2[BINAURAL_CONVBANDS][HOA2_CHANNELS][BINAURAL_NTAPS_SBA];

extern float leftHRIRReal_FOA[BINAURAL_CONVBANDS][FOA_CHANNELS][BINAURAL_NTAPS_SBA];

extern float leftHRIRImag_FOA[BINAURAL_CONVBANDS][FOA_CHANNELS][BINAURAL_NTAPS_SBA];

extern float rightHRIRReal_FOA[BINAURAL_CONVBANDS][FOA_CHANNELS][BINAURAL_NTAPS_SBA];

extern float rightHRIRImag_FOA[BINAURAL_CONVBANDS][FOA_CHANNELS][BINAURAL_NTAPS_SBA];

#else

extern float leftHRIRReal_HOA3[BINAURAL_CONVBANDS][HRTF_SH_CHANNELS][BINAURAL_NTAPS];

extern float leftHRIRImag_HOA3[BINAURAL_CONVBANDS][HRTF_SH_CHANNELS][BINAURAL_NTAPS];

extern float rightHRIRReal_HOA3[BINAURAL_CONVBANDS][HRTF_SH_CHANNELS][BINAURAL_NTAPS];
@@ -56,6 +70,7 @@ extern float leftHRIRReal_FOA[BINAURAL_CONVBANDS][4][BINAURAL_NTAPS]; 
extern float leftHRIRImag_FOA[BINAURAL_CONVBANDS][4][BINAURAL_NTAPS];

extern float rightHRIRReal_FOA[BINAURAL_CONVBANDS][4][BINAURAL_NTAPS];

extern float rightHRIRImag_FOA[BINAURAL_CONVBANDS][4][BINAURAL_NTAPS];

#endif



extern float leftHRIRReal[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][BINAURAL_NTAPS];

extern float leftHRIRImag[BINAURAL_CONVBANDS][HRTF_LS_CHANNELS][BINAURAL_NTAPS];