Commit da3a7c85 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[strip] FIX_1123_PARAMBIN_16BIT_ROM

parent de96ddbf

lib_rend/ivas_dirac_dec_binaural_functions.c

+0 −29
Original line number Diff line number Diff line
@@ -384,11 +384,7 @@ ivas_error ivas_dirac_dec_binaural_copy_hrtfs( 
    HRTFS_PARAMBIN_HANDLE *hHrtfParambin /* i/o: HRTF structure for rendering */

)

{

#ifdef FIX_1123_PARAMBIN_16BIT_ROM

    int16_t i, j, k;

#else

    int16_t i, j;

#endif



    if ( hHrtfParambin != NULL && *hHrtfParambin != NULL )

    {
@@ -399,14 +395,6 @@ ivas_error ivas_dirac_dec_binaural_copy_hrtfs( 
    {

        /* Initialise tables from ROM */

        HRTFS_PARAMBIN *hrtfParambin;

#ifdef FIX_1123_PARAMBIN_16BIT_ROM

        float shCoef_scale, rt_scale, rene_scale, early_scale;



        shCoef_scale = powf( 2.f, -1.f * hrtfShCoeffs_factorQ );

        rt_scale = powf( 2.f, -1.f * parametricReverberationTimes_factorQ );

        rene_scale = powf( 2.f, -1.f * parametricReverberationEneCorrections_factorQ );

        early_scale = powf( 2.f, -1.f * parametricEarlyPartEneCorrection_factorQ );

#endif



        if ( ( hrtfParambin = (HRTFS_PARAMBIN *) malloc( sizeof( HRTFS_PARAMBIN ) ) ) == NULL )

        {
@@ -417,31 +405,14 @@ ivas_error ivas_dirac_dec_binaural_copy_hrtfs( 
        {

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

            {

#ifdef FIX_1123_PARAMBIN_16BIT_ROM

                for ( k = 0; k < HRTF_NUM_BINS; k++ )

                {

                    hrtfParambin->hrtfShCoeffsRe[i][j][k] = hrtfShCoeffsRe[i][j][k] * shCoef_scale;

                    hrtfParambin->hrtfShCoeffsIm[i][j][k] = hrtfShCoeffsIm[i][j][k] * shCoef_scale;

                }

#else

                mvr2r( hrtfShCoeffsRe[i][j], hrtfParambin->hrtfShCoeffsRe[i][j], HRTF_NUM_BINS );

                mvr2r( hrtfShCoeffsIm[i][j], hrtfParambin->hrtfShCoeffsIm[i][j], HRTF_NUM_BINS );

#endif

            }

        }



#ifdef FIX_1123_PARAMBIN_16BIT_ROM

        for ( i = 0; i < CLDFB_NO_CHANNELS_MAX; i++ )

        {

            hrtfParambin->parametricReverberationTimes[i] = parametricReverberationTimes[i] * rt_scale;

            hrtfParambin->parametricReverberationEneCorrections[i] = parametricReverberationEneCorrections[i] * rene_scale;

            hrtfParambin->parametricEarlyPartEneCorrection[i] = parametricEarlyPartEneCorrection[i] * early_scale;

        }

#else

        mvr2r( parametricReverberationTimes, hrtfParambin->parametricReverberationTimes, CLDFB_NO_CHANNELS_MAX );

        mvr2r( parametricReverberationEneCorrections, hrtfParambin->parametricReverberationEneCorrections, CLDFB_NO_CHANNELS_MAX );

        mvr2r( parametricEarlyPartEneCorrection, hrtfParambin->parametricEarlyPartEneCorrection, CLDFB_NO_CHANNELS_MAX );

#endif



        *hHrtfParambin = hrtfParambin;

lib_rend/ivas_rom_binauralRenderer.h

+0 −16
Original line number Diff line number Diff line
@@ -79,21 +79,6 @@ extern float fastconvReverberationTimes[CLDFB_NO_CHANNELS_MAX]; 
extern float fastconvReverberationEneCorrections[CLDFB_NO_CHANNELS_MAX];





#ifdef FIX_1123_PARAMBIN_16BIT_ROM

/* Binaural rendering data set based on BRIRs, to be used in a combined manner

 * with the above binaural rendering data set based on HRIRs for parametric

 * renderer */

extern const int16_t hrtfShCoeffs_factorQ;

extern const int16_t hrtfShCoeffsRe[BINAURAL_CHANNELS][HRTF_SH_CHANNELS][HRTF_NUM_BINS];

extern const int16_t hrtfShCoeffsIm[BINAURAL_CHANNELS][HRTF_SH_CHANNELS][HRTF_NUM_BINS];



extern const int16_t parametricReverberationTimes_factorQ;

extern const int16_t parametricReverberationEneCorrections_factorQ;

extern const int16_t parametricEarlyPartEneCorrection_factorQ;

extern const int16_t parametricReverberationTimes[CLDFB_NO_CHANNELS_MAX];

extern const int16_t parametricReverberationEneCorrections[CLDFB_NO_CHANNELS_MAX];

extern const int16_t parametricEarlyPartEneCorrection[CLDFB_NO_CHANNELS_MAX];

#else

/* Binaural rendering data set based on BRIRs, to be used in a combined manner

 * with the above binaural rendering data set based on HRIRs for parametric

 * renderer */
@@ -103,4 +88,3 @@ extern float hrtfShCoeffsIm[BINAURAL_CHANNELS][HRTF_SH_CHANNELS][HRTF_NUM_BINS]; 
extern const float parametricReverberationTimes[CLDFB_NO_CHANNELS_MAX];

extern const float parametricReverberationEneCorrections[CLDFB_NO_CHANNELS_MAX];

extern const float parametricEarlyPartEneCorrection[CLDFB_NO_CHANNELS_MAX];
 
#endif