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

[fix] merge artefact for new FASTCONV_FMT switch

parent 38065d56

lib_util/hrtf_file_reader.c

+29 −29
Original line number Diff line number Diff line
@@ -1957,7 +1957,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata( 
        /* HRIR Q factor*/

        factorQ = *( (Word16 *) ( hrtf_data_rptr ) );

        hrtf_data_rptr += sizeof( Word16 );

#ifdef FIX_1123_FASTCONV_16BIT_ROM

#ifdef FIX_1123_FASTCONV_16BIT_FMT

        scaleFactor = powf( 2.f, -1.f * factorQ );

#endif
@@ -1973,7 +1973,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata( 
                for ( k = 0; k < BINAURAL_NTAPS; k++ )

#endif

                {

#ifdef FIX_1123_FASTCONV_16BIT_ROM

#ifdef FIX_1123_FASTCONV_16BIT_FMT

                    ( *hHRTF )->leftHRIRReal[i][j][k] = ptW16[k] * scaleFactor;

#else

                    ( *hHRTF )->leftHRIRReal[i][j][k] = (float) ptW32[k] * powf( 2.f, -1.f * (float) factorQ );
@@ -1998,7 +1998,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata( 
                for ( k = 0; k < BINAURAL_NTAPS; k++ )

#endif

                {

#ifdef FIX_1123_FASTCONV_16BIT_ROM

#ifdef FIX_1123_FASTCONV_16BIT_FMT

                    ( *hHRTF )->leftHRIRImag[i][j][k] = ptW16[k] * scaleFactor;

#else

                    ( *hHRTF )->leftHRIRImag[i][j][k] = (float) ptW32[k] * powf( 2.f, -1.f * (float) factorQ );
@@ -2023,7 +2023,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata( 
                for ( k = 0; k < BINAURAL_NTAPS; k++ )

#endif

                {

#ifdef FIX_1123_FASTCONV_16BIT_ROM

#ifdef FIX_1123_FASTCONV_16BIT_FMT

                    ( *hHRTF )->rightHRIRReal[i][j][k] = ptW16[k] * scaleFactor;

#else

                    ( *hHRTF )->rightHRIRReal[i][j][k] = (float) ptW32[k] * powf( 2.f, -1.f * (float) factorQ );
@@ -2048,7 +2048,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata( 
                for ( k = 0; k < BINAURAL_NTAPS; k++ )

#endif

                {

#ifdef FIX_1123_FASTCONV_16BIT_ROM

#ifdef FIX_1123_FASTCONV_16BIT_FMT

                    ( *hHRTF )->rightHRIRImag[i][j][k] = ptW16[k] * scaleFactor;

#else

                    ( *hHRTF )->rightHRIRImag[i][j][k] = (float) ptW32[k] * powf( 2.f, -1.f * (float) factorQ );
@@ -2104,7 +2104,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata( 
        /* HRIR Q factor*/

        factorQ = *( (Word16 *) ( hrtf_data_rptr ) );

        hrtf_data_rptr += sizeof( Word16 );

#ifdef FIX_1123_FASTCONV_16BIT_ROM

#ifdef FIX_1123_FASTCONV_16BIT_FMT

        scaleFactor = powf( 2.f, -1.f * factorQ );

#endif
@@ -2120,7 +2120,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata( 
                for ( k = 0; k < BINAURAL_NTAPS_SBA; k++ )

#endif

                {

#ifdef FIX_1123_FASTCONV_16BIT_ROM

#ifdef FIX_1123_FASTCONV_16BIT_FMT

                    ( *hHRTF )->leftHRIRReal_HOA3[i][j][k] = ptW16[k] * scaleFactor;

#else

                    ( *hHRTF )->leftHRIRReal_HOA3[i][j][k] = (float) ptW32[k] * powf( 2.f, -1.f * (float) factorQ );
@@ -2145,7 +2145,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata( 
                for ( k = 0; k < BINAURAL_NTAPS_SBA; k++ )

#endif

                {

#ifdef FIX_1123_FASTCONV_16BIT_ROM

#ifdef FIX_1123_FASTCONV_16BIT_FMT

                    ( *hHRTF )->leftHRIRImag_HOA3[i][j][k] = ptW16[k] * scaleFactor;

#else

                    ( *hHRTF )->leftHRIRImag_HOA3[i][j][k] = (float) ptW32[k] * powf( 2.f, -1.f * (float) factorQ );
@@ -2170,7 +2170,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata( 
                for ( k = 0; k < BINAURAL_NTAPS_SBA; k++ )

#endif

                {

#ifdef FIX_1123_FASTCONV_16BIT_ROM

#ifdef FIX_1123_FASTCONV_16BIT_FMT

                    ( *hHRTF )->rightHRIRReal_HOA3[i][j][k] = ptW16[k] * scaleFactor;

#else

                    ( *hHRTF )->rightHRIRReal_HOA3[i][j][k] = (float) ptW32[k] * powf( 2.f, -1.f * (float) factorQ );
@@ -2195,7 +2195,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata( 
                for ( k = 0; k < BINAURAL_NTAPS_SBA; k++ )

#endif

                {

#ifdef FIX_1123_FASTCONV_16BIT_ROM

#ifdef FIX_1123_FASTCONV_16BIT_FMT

                    ( *hHRTF )->rightHRIRImag_HOA3[i][j][k] = ptW16[k] * scaleFactor;

#else

                    ( *hHRTF )->rightHRIRImag_HOA3[i][j][k] = (float) ptW32[k] * powf( 2.f, -1.f * (float) factorQ );
@@ -2251,7 +2251,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata( 
        /* HRIR Q factor*/

        factorQ = *( (Word16 *) ( hrtf_data_rptr ) );

        hrtf_data_rptr += sizeof( Word16 );

#ifdef FIX_1123_FASTCONV_16BIT_ROM

#ifdef FIX_1123_FASTCONV_16BIT_FMT

        scaleFactor = powf( 2.f, -1.f * factorQ );

#endif
@@ -2267,7 +2267,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata( 
                for ( k = 0; k < BINAURAL_NTAPS_SBA; k++ )

#endif

                {

#ifdef FIX_1123_FASTCONV_16BIT_ROM

#ifdef FIX_1123_FASTCONV_16BIT_FMT

                    ( *hHRTF )->leftHRIRReal_HOA2[i][j][k] = ptW16[k] * scaleFactor;

#else

                    ( *hHRTF )->leftHRIRReal_HOA2[i][j][k] = (float) ptW32[k] * powf( 2.f, -1.f * (float) factorQ );
@@ -2292,7 +2292,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata( 
                for ( k = 0; k < BINAURAL_NTAPS_SBA; k++ )

#endif

                {

#ifdef FIX_1123_FASTCONV_16BIT_ROM

#ifdef FIX_1123_FASTCONV_16BIT_FMT

                    ( *hHRTF )->leftHRIRImag_HOA2[i][j][k] = ptW16[k] * scaleFactor;

#else

                    ( *hHRTF )->leftHRIRImag_HOA2[i][j][k] = (float) ptW32[k] * powf( 2.f, -1.f * (float) factorQ );
@@ -2317,7 +2317,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata( 
                for ( k = 0; k < BINAURAL_NTAPS_SBA; k++ )

#endif

                {

#ifdef FIX_1123_FASTCONV_16BIT_ROM

#ifdef FIX_1123_FASTCONV_16BIT_FMT

                    ( *hHRTF )->rightHRIRReal_HOA2[i][j][k] = ptW16[k] * scaleFactor;

#else

                    ( *hHRTF )->rightHRIRReal_HOA2[i][j][k] = (float) ptW32[k] * powf( 2.f, -1.f * (float) factorQ );
@@ -2342,7 +2342,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata( 
                for ( k = 0; k < BINAURAL_NTAPS_SBA; k++ )

#endif

                {

#ifdef FIX_1123_FASTCONV_16BIT_ROM

#ifdef FIX_1123_FASTCONV_16BIT_FMT

                    ( *hHRTF )->rightHRIRImag_HOA2[i][j][k] = ptW16[k] * scaleFactor;

#else

                    ( *hHRTF )->rightHRIRImag_HOA2[i][j][k] = (float) ptW32[k] * powf( 2.f, -1.f * (float) factorQ );
@@ -2399,7 +2399,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata( 
        /* HRIR Q factor*/

        factorQ = *( (Word16 *) ( hrtf_data_rptr ) );

        hrtf_data_rptr += sizeof( Word16 );

#ifdef FIX_1123_FASTCONV_16BIT_ROM

#ifdef FIX_1123_FASTCONV_16BIT_FMT

        scaleFactor = powf( 2.f, -1.f * factorQ );

#endif
@@ -2415,7 +2415,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata( 
                for ( k = 0; k < BINAURAL_NTAPS_SBA; k++ )

#endif

                {

#ifdef FIX_1123_FASTCONV_16BIT_ROM

#ifdef FIX_1123_FASTCONV_16BIT_FMT

                    ( *hHRTF )->leftHRIRReal_FOA[i][j][k] = ptW16[k] * scaleFactor;

#else

                    ( *hHRTF )->leftHRIRReal_FOA[i][j][k] = (float) ptW32[k] * powf( 2.f, -1.f * (float) factorQ );
@@ -2440,7 +2440,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata( 
                for ( k = 0; k < BINAURAL_NTAPS_SBA; k++ )

#endif

                {

#ifdef FIX_1123_FASTCONV_16BIT_ROM

#ifdef FIX_1123_FASTCONV_16BIT_FMT

                    ( *hHRTF )->leftHRIRImag_FOA[i][j][k] = ptW16[k] * scaleFactor;

#else

                    ( *hHRTF )->leftHRIRImag_FOA[i][j][k] = (float) ptW32[k] * powf( 2.f, -1.f * (float) factorQ );
@@ -2465,7 +2465,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata( 
                for ( k = 0; k < BINAURAL_NTAPS_SBA; k++ )

#endif

                {

#ifdef FIX_1123_FASTCONV_16BIT_ROM

#ifdef FIX_1123_FASTCONV_16BIT_FMT

                    ( *hHRTF )->rightHRIRReal_FOA[i][j][k] = ptW16[k] * scaleFactor;

#else

                    ( *hHRTF )->rightHRIRReal_FOA[i][j][k] = (float) ptW32[k] * powf( 2.f, -1.f * (float) factorQ );
@@ -2490,7 +2490,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata( 
                for ( k = 0; k < BINAURAL_NTAPS_SBA; k++ )

#endif

                {

#ifdef FIX_1123_FASTCONV_16BIT_ROM

#ifdef FIX_1123_FASTCONV_16BIT_FMT

                    ( *hHRTF )->rightHRIRImag_FOA[i][j][k] = ptW16[k] * scaleFactor;

#else

                    ( *hHRTF )->rightHRIRImag_FOA[i][j][k] = (float) ptW32[k] * powf( 2.f, -1.f * (float) factorQ );
@@ -2547,7 +2547,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata( 
        /* BRIR Q factor*/

        factorQ = *( (Word16 *) ( hrtf_data_rptr ) );

        hrtf_data_rptr += sizeof( Word16 );

#ifdef FIX_1123_FASTCONV_16BIT_ROM

#ifdef FIX_1123_FASTCONV_16BIT_FMT

        scaleFactor = powf( 2.f, -1.f * factorQ );

#endif
@@ -2563,7 +2563,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata( 
                for ( k = 0; k < BINAURAL_NTAPS_MAX; k++ )

#endif

                {

#ifdef FIX_1123_FASTCONV_16BIT_ROM

#ifdef FIX_1123_FASTCONV_16BIT_FMT

                    ( *hHRTF )->leftBRIRReal[i][j][k] = ptW16[k] * scaleFactor;

#else

                    ( *hHRTF )->leftBRIRReal[i][j][k] = (float) ptW32[k] * powf( 2.f, -1.f * (float) factorQ );
@@ -2588,7 +2588,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata( 
                for ( k = 0; k < BINAURAL_NTAPS_MAX; k++ )

#endif

                {

#ifdef FIX_1123_FASTCONV_16BIT_ROM

#ifdef FIX_1123_FASTCONV_16BIT_FMT

                    ( *hHRTF )->leftBRIRImag[i][j][k] = ptW16[k] * scaleFactor;

#else

                    ( *hHRTF )->leftBRIRImag[i][j][k] = (float) ptW32[k] * powf( 2.f, -1.f * (float) factorQ );
@@ -2613,7 +2613,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata( 
                for ( k = 0; k < BINAURAL_NTAPS_MAX; k++ )

#endif

                {

#ifdef FIX_1123_FASTCONV_16BIT_ROM

#ifdef FIX_1123_FASTCONV_16BIT_FMT

                    ( *hHRTF )->rightBRIRReal[i][j][k] = ptW16[k] * scaleFactor;

#else

                    ( *hHRTF )->rightBRIRReal[i][j][k] = (float) ptW32[k] * powf( 2.f, -1.f * (float) factorQ );
@@ -2638,7 +2638,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata( 
                for ( k = 0; k < BINAURAL_NTAPS_MAX; k++ )

#endif

                {

#ifdef FIX_1123_FASTCONV_16BIT_ROM

#ifdef FIX_1123_FASTCONV_16BIT_FMT

                    ( *hHRTF )->rightBRIRImag[i][j][k] = ptW16[k] * scaleFactor;

#else

                    ( *hHRTF )->rightBRIRImag[i][j][k] = (float) ptW32[k] * powf( 2.f, -1.f * (float) factorQ );
@@ -2662,14 +2662,14 @@ static ivas_error create_fastconv_HRTF_from_rawdata( 
        /* fastconvReverberationTimes Q factor*/

        factorQ = *( (Word16 *) ( hrtf_data_rptr ) );

        hrtf_data_rptr += sizeof( Word16 );

#ifdef FIX_1123_FASTCONV_16BIT_ROM

#ifdef FIX_1123_FASTCONV_16BIT_FMT

        scaleFactor = powf( 2.f, -1.f * factorQ );

#endif



        ptW16 = (int16_t *) hrtf_data_rptr;

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

        {

#ifdef FIX_1123_FASTCONV_16BIT_ROM

#ifdef FIX_1123_FASTCONV_16BIT_FMT

            ( *hHRTF )->fastconvReverberationTimes[j] = ptW16[j] * powf( 2.f, -1.f * factorQ );

#else

            ( *hHRTF )->fastconvReverberationTimes[j] = (float) ptW16[j] * scaleFactor;
@@ -2680,14 +2680,14 @@ static ivas_error create_fastconv_HRTF_from_rawdata( 
        /* fastconvReverberationEneCorrections Q factor */

        factorQ = *( (Word16 *) ( hrtf_data_rptr ) );

        hrtf_data_rptr += sizeof( Word16 );

#ifdef FIX_1123_FASTCONV_16BIT_ROM

#ifdef FIX_1123_FASTCONV_16BIT_FMT

        scaleFactor = powf( 2.f, -1.f * factorQ );

#endif



        ptW16 = (int16_t *) hrtf_data_rptr;

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

        {

#ifdef FIX_1123_FASTCONV_16BIT_ROM

#ifdef FIX_1123_FASTCONV_16BIT_FMT

            ( *hHRTF )->fastconvReverberationEneCorrections[j] = ptW16[j] * powf( 2.f, -1.f * factorQ );

#else

            ( *hHRTF )->fastconvReverberationEneCorrections[j] = (float) ptW16[j] * scaleFactor;