Commit a6c6950f authored by multrus's avatar multrus
Browse files

[cleanup] accept UPDATE_FASTCONV_SBA_FILTER

parent 22e2b481

lib_com/ivas_cnst.h

+0 −8
Original line number Diff line number Diff line
@@ -192,9 +192,7 @@ 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 */
@@ -1581,9 +1579,7 @@ typedef enum 
#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
@@ -1651,11 +1647,7 @@ typedef enum 
#endif /* SPLIT_REND_WITH_HEAD_ROT */



#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

+0 −1
Original line number Diff line number Diff line
@@ -151,7 +151,6 @@ 
/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */





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

#define FIX_570_SF_EXT_ORIENTATION

#define FIX_280_PLANAR_CP                               /* Dlb : fix issue 28 : remove planarCP=1 related code*/

#define CODE_CLEAN_UP_DIRAC                             /* Dlb : code clean up*/

lib_dec/ivas_binRenderer_internal.c

+0 −28
Original line number Diff line number Diff line
@@ -202,7 +202,6 @@ static ivas_error ivas_binRenderer_convModuleOpen( 
    }

    else

    {

#ifdef UPDATE_FASTCONV_SBA_FILTER

        if ( hBinRenderer->ivas_format == SBA_FORMAT )

        {

            hBinRenConvModule->numTaps = BINAURAL_NTAPS_SBA;
@@ -211,9 +210,6 @@ static ivas_error ivas_binRenderer_convModuleOpen( 
        {

            hBinRenConvModule->numTaps = BINAURAL_NTAPS;

        }

#else

        hBinRenConvModule->numTaps = BINAURAL_NTAPS;

#endif



        /* Use fixed order filtering */

        bandIdx = 0;
@@ -856,7 +852,6 @@ static ivas_error ivas_binaural_hrtf_open( 
                mvr2r( rightBRIRReal[i][j], HrtfFastConv->rightBRIRReal[i][j], BINAURAL_NTAPS_MAX );

                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 );
@@ -878,29 +873,6 @@ static ivas_error ivas_binaural_hrtf_open( 
                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 );

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

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

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

            }

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

            {

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

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

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

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

            }

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

            {

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

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

                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

#endif

        }

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

lib_rend/ivas_rom_binauralRenderer.c

+0 −7059

File changed.

Preview size limit exceeded, changes collapsed.

lib_rend/ivas_rom_binauralRenderer.h

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


/* 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];
@@ -57,20 +56,6 @@ extern float leftHRIRReal_FOA[BINAURAL_CONVBANDS][FOA_CHANNELS][BINAURAL_NTAPS_S 
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];

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

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

extern float leftHRIRImag_HOA2[BINAURAL_CONVBANDS][9][BINAURAL_NTAPS];

extern float rightHRIRReal_HOA2[BINAURAL_CONVBANDS][9][BINAURAL_NTAPS];

extern float rightHRIRImag_HOA2[BINAURAL_CONVBANDS][9][BINAURAL_NTAPS];

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];