Commit 38065d56 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

Merge branch 'main' of forge.3gpp.org:ivas-codec-pc/ivas-codec into... 

Merge branch 'main' of forge.3gpp.org:ivas-codec-pc/ivas-codec into hrtf_float_tables_fx_file_format
parents 9aec5472 d2b74ab9

CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ target_include_directories(lib_util PUBLIC lib_util PRIVATE lib_com lib_enc lib_ 
target_include_directories(lib_util PRIVATE lib_lc3plus lib_isar)



if(NOT WMOPS)

  add_executable(ivas_lc3plus_unit_test ${CMAKE_SOURCE_DIR}/scripts/split_rendering/lc3plus/ivas_lc3plus_unit_test.c)

  add_executable(ivas_lc3plus_unit_test scripts/split_rendering/lc3plus/ivas_lc3plus_unit_test.c)

  target_link_libraries(ivas_lc3plus_unit_test lib_rend lib_dec lib_util lib_com lib_debug lib_isar)

endif()

lib_com/ivas_cnst.h

+3 −0
Original line number Diff line number Diff line
@@ -1530,6 +1530,9 @@ typedef enum 
#define MAX_ANGULAR_STEP_INV                    ( 1.0f / MAX_ANGULAR_STEP )

#define MAX_INTERPOLATION_STEPS                 12



#define RESAMPLE_FACTOR_16_48                   ( 16.0f / 48.0f )

#define RESAMPLE_FACTOR_32_48                   ( 32.0f / 48.0f )



/* ----- Enums - TD Renderer ----- */



typedef enum

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -171,6 +171,7 @@ 
/*#define FIX_1123_FASTCONV_16BIT_ROM*/                 /* FhG: issue 1123: update FastConv ROM tables to 16 bit (must regenerate ROM file!) */

#define FIX_1123_FASTCONV_16BIT_FMT                     /* FhG: issue 1123: update FastConv binary file format and scripts to 16 bit */

/*#define FIX_1123_PARAMBIN_16BIT_ROM*/                 /* FhG,Nok: issue 1123: update ParamBin ROM tables and scripts to generate 16 bit tables instead of float */

#define FIX_RETURN                                      /* VA: fix location of function returns */

#endif

#define FIX_BASOP_812_NAN_COHSNR                        /* FhG: BASOP issue 812: fix nan values in sparse frames for cohSNR value in ITD estimation*/

lib_dec/ivas_binRenderer_internal.c

+61 −46
Original line number Diff line number Diff line
@@ -720,8 +720,8 @@ ivas_error ivas_allocate_binaural_hrtf( 
        }

    }



#ifdef FIX_1123_FASTCONV_16BIT_FMT

    if ( ( ( renderer_type == RENDERER_BINAURAL_FASTCONV ) && ( bin_input_config == BINAURAL_INPUT_AUDIO_CONFIG_COMBINED ) ) || ( ( renderer_type == RENDERER_BINAURAL_FASTCONV ) && ( input_config != IVAS_AUDIO_CONFIG_INVALID ) ) )

#ifdef FIX_1123_FASTCONV_16BIT_ROM

    if ( ( renderer_type == RENDERER_BINAURAL_FASTCONV && bin_input_config == BINAURAL_INPUT_AUDIO_CONFIG_COMBINED ) || ( renderer_type == RENDERER_BINAURAL_FASTCONV && input_config != IVAS_AUDIO_CONFIG_INVALID ) )

#else

    if ( renderer_type == RENDERER_BINAURAL_FASTCONV || bin_input_config == BINAURAL_INPUT_AUDIO_CONFIG_COMBINED )

#endif
@@ -766,8 +766,8 @@ ivas_error ivas_allocate_binaural_hrtf( 
        }

    }



#ifdef FIX_1123_FASTCONV_16BIT_FMT

    if ( ( ( renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM ) && ( bin_input_config == BINAURAL_INPUT_AUDIO_CONFIG_COMBINED ) ) || ( ( renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM ) && ( input_config != IVAS_AUDIO_CONFIG_INVALID ) ) )

#ifdef FIX_1123_FASTCONV_16BIT_ROM

    if ( ( renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM && bin_input_config == BINAURAL_INPUT_AUDIO_CONFIG_COMBINED ) || ( renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM && input_config != IVAS_AUDIO_CONFIG_INVALID ) )

#else

    if ( renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM || bin_input_config == BINAURAL_INPUT_AUDIO_CONFIG_COMBINED )

#endif
@@ -817,7 +817,7 @@ ivas_error ivas_allocate_binaural_hrtf( 




/*-------------------------------------------------------------------------*

 * ivas_binaural_HRTF_open()

 * ivas_binaural_hrtf_open()

 *

 *

 *-------------------------------------------------------------------------*/
@@ -830,13 +830,17 @@ static ivas_error ivas_binaural_hrtf_open( 
{

#ifdef FIX_1123_FASTCONV_16BIT_ROM

    int16_t i, j, k;

    float scaleFactor = 1.f;

    float scaleFactorSBA = 1.f;

    float scaleFactor, scaleFactorSBA;

#else

    int16_t i, j;

#endif

    ivas_error error;



#ifdef FIX_1123_FASTCONV_16BIT_ROM

    scaleFactor = 1.f;

    scaleFactorSBA = 1.f;

#endif



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

    {

        /* Tables already loaded from file */
@@ -857,7 +861,7 @@ static ivas_error ivas_binaural_hrtf_open( 
        if ( input_config == IVAS_AUDIO_CONFIG_BINAURAL || renderer_type == RENDERER_BINAURAL_FASTCONV )

        {

#ifdef FIX_1123_FASTCONV_16BIT_ROM

            HrtfFastConv->FASTCONV_HRIR_latency_s = (float) FASTCONV_HRIR_latency_s * powf( 2.f, -1.f * (float) FASTCONV_FOA_latency_s_factorQ );

            HrtfFastConv->FASTCONV_HRIR_latency_s = FASTCONV_HRIR_latency_s * powf( 2.f, -1.f * FASTCONV_FOA_latency_s_factorQ );

#else

            HrtfFastConv->FASTCONV_HRIR_latency_s = FASTCONV_HRIR_latency_s;

#endif
@@ -865,7 +869,7 @@ static ivas_error ivas_binaural_hrtf_open( 
        if ( input_config == IVAS_AUDIO_CONFIG_HOA2 )

        {

#ifdef FIX_1123_FASTCONV_16BIT_ROM

            HrtfFastConv->FASTCONV_HOA2_latency_s = (float) FASTCONV_HOA2_latency_s * powf( 2.f, -1.f * (float) FASTCONV_HOA2_latency_s_factorQ );

            HrtfFastConv->FASTCONV_HOA2_latency_s = FASTCONV_HOA2_latency_s * powf( 2.f, -1.f * FASTCONV_HOA2_latency_s_factorQ );

#else

            HrtfFastConv->FASTCONV_HOA2_latency_s = FASTCONV_HOA2_latency_s;

#endif
@@ -873,7 +877,7 @@ static ivas_error ivas_binaural_hrtf_open( 
        if ( input_config == IVAS_AUDIO_CONFIG_HOA3 )

        {

#ifdef FIX_1123_FASTCONV_16BIT_ROM

            HrtfFastConv->FASTCONV_HOA3_latency_s = (float) FASTCONV_HOA3_latency_s * powf( 2.f, -1.f * (float) FASTCONV_HOA3_latency_s_factorQ );

            HrtfFastConv->FASTCONV_HOA3_latency_s = FASTCONV_HOA3_latency_s * powf( 2.f, -1.f * FASTCONV_HOA3_latency_s_factorQ );

#else

            HrtfFastConv->FASTCONV_HOA3_latency_s = FASTCONV_HOA3_latency_s;

#endif
@@ -881,7 +885,7 @@ static ivas_error ivas_binaural_hrtf_open( 
        if ( input_config == IVAS_AUDIO_CONFIG_FOA )

        {

#ifdef FIX_1123_FASTCONV_16BIT_ROM

            HrtfFastConv->FASTCONV_FOA_latency_s = (float) FASTCONV_FOA_latency_s * powf( 2.f, -1.f * (float) FASTCONV_HRIR_latency_s_factorQ );

            HrtfFastConv->FASTCONV_FOA_latency_s = FASTCONV_FOA_latency_s * powf( 2.f, -1.f * FASTCONV_HRIR_latency_s_factorQ );

#else

            HrtfFastConv->FASTCONV_FOA_latency_s = FASTCONV_FOA_latency_s;

#endif
@@ -889,7 +893,7 @@ static ivas_error ivas_binaural_hrtf_open( 
        if ( input_config == IVAS_AUDIO_CONFIG_BINAURAL || renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM )

        {

#ifdef FIX_1123_FASTCONV_16BIT_ROM

            HrtfFastConv->FASTCONV_BRIR_latency_s = (float) FASTCONV_BRIR_latency_s * powf( 2.f, -1.f * (float) FASTCONV_BRIR_latency_s_factorQ );

            HrtfFastConv->FASTCONV_BRIR_latency_s = FASTCONV_BRIR_latency_s * powf( 2.f, -1.f * FASTCONV_BRIR_latency_s_factorQ );

#else

            HrtfFastConv->FASTCONV_BRIR_latency_s = FASTCONV_BRIR_latency_s;

#endif
@@ -898,23 +902,23 @@ static ivas_error ivas_binaural_hrtf_open( 
#ifdef FIX_1123_FASTCONV_16BIT_ROM

        if ( renderer_type == RENDERER_BINAURAL_FASTCONV )

        {

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

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

        }

        else if ( renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM )

        {

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

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

        }

        if ( input_config == IVAS_AUDIO_CONFIG_HOA3 )

        {

            scaleFactorSBA = powf( 2.f, -1.f * (float) FASTCONV_HRIR_HOA3_factorQ );

            scaleFactorSBA = powf( 2.f, -1.f * FASTCONV_HRIR_HOA3_factorQ );

        }

        else if ( input_config == IVAS_AUDIO_CONFIG_HOA2 )

        {

            scaleFactorSBA = powf( 2.f, -1.f * (float) FASTCONV_HRIR_HOA2_factorQ );

            scaleFactorSBA = powf( 2.f, -1.f * FASTCONV_HRIR_HOA2_factorQ );

        }

        else if ( input_config == IVAS_AUDIO_CONFIG_FOA )

        {

            scaleFactorSBA = powf( 2.f, -1.f * (float) FASTCONV_HRIR_FOA_factorQ );

            scaleFactorSBA = powf( 2.f, -1.f * FASTCONV_HRIR_FOA_factorQ );

        }

#else

        HrtfFastConv->allocate_init_flag = 1;
@@ -928,6 +932,7 @@ static ivas_error ivas_binaural_hrtf_open( 
        {

            return error;

        }



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

        {

            if ( renderer_type == RENDERER_BINAURAL_FASTCONV )
@@ -937,10 +942,10 @@ static ivas_error ivas_binaural_hrtf_open( 
#ifdef FIX_1123_FASTCONV_16BIT_ROM

                    for ( k = 0; k < HrtfFastConv->ntaps_hrir; k++ )

                    {

                        HrtfFastConv->leftHRIRReal[i][j][k] = (float) leftHRIRReal[i][j][k] * scaleFactor;

                        HrtfFastConv->leftHRIRImag[i][j][k] = (float) leftHRIRImag[i][j][k] * scaleFactor;

                        HrtfFastConv->rightHRIRReal[i][j][k] = (float) rightHRIRReal[i][j][k] * scaleFactor;

                        HrtfFastConv->rightHRIRImag[i][j][k] = (float) rightHRIRImag[i][j][k] * scaleFactor;

                        HrtfFastConv->leftHRIRReal[i][j][k] = leftHRIRReal[i][j][k] * scaleFactor;

                        HrtfFastConv->leftHRIRImag[i][j][k] = leftHRIRImag[i][j][k] * scaleFactor;

                        HrtfFastConv->rightHRIRReal[i][j][k] = rightHRIRReal[i][j][k] * scaleFactor;

                        HrtfFastConv->rightHRIRImag[i][j][k] = rightHRIRImag[i][j][k] * scaleFactor;

                    }

#else

                    HrtfFastConv->leftHRIRReal[i][j] = leftHRIRReal[i][j];
@@ -957,10 +962,10 @@ static ivas_error ivas_binaural_hrtf_open( 
#ifdef FIX_1123_FASTCONV_16BIT_ROM

                    for ( k = 0; k < HrtfFastConv->ntaps_brir; k++ )

                    {

                        HrtfFastConv->leftBRIRReal[i][j][k] = (float) leftBRIRReal[i][j][k] * scaleFactor;

                        HrtfFastConv->leftBRIRImag[i][j][k] = (float) leftBRIRImag[i][j][k] * scaleFactor;

                        HrtfFastConv->rightBRIRReal[i][j][k] = (float) rightBRIRReal[i][j][k] * scaleFactor;

                        HrtfFastConv->rightBRIRImag[i][j][k] = (float) rightBRIRImag[i][j][k] * scaleFactor;

                        HrtfFastConv->leftBRIRReal[i][j][k] = leftBRIRReal[i][j][k] * scaleFactor;

                        HrtfFastConv->leftBRIRImag[i][j][k] = leftBRIRImag[i][j][k] * scaleFactor;

                        HrtfFastConv->rightBRIRReal[i][j][k] = rightBRIRReal[i][j][k] * scaleFactor;

                        HrtfFastConv->rightBRIRImag[i][j][k] = rightBRIRImag[i][j][k] * scaleFactor;

                    }

#else

                    HrtfFastConv->leftBRIRReal[i][j] = leftBRIRReal[i][j];
@@ -970,6 +975,7 @@ static ivas_error ivas_binaural_hrtf_open( 
#endif

                }

            }



            if ( input_config == IVAS_AUDIO_CONFIG_HOA3 )

            {

                for ( j = 0; j < HOA3_CHANNELS; j++ )
@@ -977,10 +983,10 @@ static ivas_error ivas_binaural_hrtf_open( 
#ifdef FIX_1123_FASTCONV_16BIT_ROM

                    for ( k = 0; k < HrtfFastConv->ntaps_hrir_hoa3; k++ )

                    {

                        HrtfFastConv->leftHRIRReal_HOA3[i][j][k] = (float) leftHRIRReal_HOA3[i][j][k] * scaleFactorSBA;

                        HrtfFastConv->leftHRIRImag_HOA3[i][j][k] = (float) leftHRIRImag_HOA3[i][j][k] * scaleFactorSBA;

                        HrtfFastConv->rightHRIRReal_HOA3[i][j][k] = (float) rightHRIRReal_HOA3[i][j][k] * scaleFactorSBA;

                        HrtfFastConv->rightHRIRImag_HOA3[i][j][k] = (float) rightHRIRImag_HOA3[i][j][k] * scaleFactorSBA;

                        HrtfFastConv->leftHRIRReal_HOA3[i][j][k] = leftHRIRReal_HOA3[i][j][k] * scaleFactorSBA;

                        HrtfFastConv->leftHRIRImag_HOA3[i][j][k] = leftHRIRImag_HOA3[i][j][k] * scaleFactorSBA;

                        HrtfFastConv->rightHRIRReal_HOA3[i][j][k] = rightHRIRReal_HOA3[i][j][k] * scaleFactorSBA;

                        HrtfFastConv->rightHRIRImag_HOA3[i][j][k] = rightHRIRImag_HOA3[i][j][k] * scaleFactorSBA;

                    }

#else

                    HrtfFastConv->leftHRIRReal_HOA3[i][j] = leftHRIRReal_HOA3[i][j];
@@ -991,19 +997,20 @@ static ivas_error ivas_binaural_hrtf_open( 
                }

            }

#ifdef FIX_1123_FASTCONV_16BIT_ROM

            else

#endif

            else if ( input_config == IVAS_AUDIO_CONFIG_HOA2 )

#else

            if ( input_config == IVAS_AUDIO_CONFIG_HOA2 )

#endif

            {

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

                {

#ifdef FIX_1123_FASTCONV_16BIT_ROM

                    for ( k = 0; k < HrtfFastConv->ntaps_hrir_hoa2; k++ )

                    {

                        HrtfFastConv->leftHRIRReal_HOA2[i][j][k] = (float) leftHRIRReal_HOA2[i][j][k] * scaleFactorSBA;

                        HrtfFastConv->leftHRIRImag_HOA2[i][j][k] = (float) leftHRIRImag_HOA2[i][j][k] * scaleFactorSBA;

                        HrtfFastConv->rightHRIRReal_HOA2[i][j][k] = (float) rightHRIRReal_HOA2[i][j][k] * scaleFactorSBA;

                        HrtfFastConv->rightHRIRImag_HOA2[i][j][k] = (float) rightHRIRImag_HOA2[i][j][k] * scaleFactorSBA;

                        HrtfFastConv->leftHRIRReal_HOA2[i][j][k] = leftHRIRReal_HOA2[i][j][k] * scaleFactorSBA;

                        HrtfFastConv->leftHRIRImag_HOA2[i][j][k] = leftHRIRImag_HOA2[i][j][k] * scaleFactorSBA;

                        HrtfFastConv->rightHRIRReal_HOA2[i][j][k] = rightHRIRReal_HOA2[i][j][k] * scaleFactorSBA;

                        HrtfFastConv->rightHRIRImag_HOA2[i][j][k] = rightHRIRImag_HOA2[i][j][k] * scaleFactorSBA;

                    }

#else

                    HrtfFastConv->leftHRIRReal_HOA2[i][j] = leftHRIRReal_HOA2[i][j];
@@ -1014,19 +1021,20 @@ static ivas_error ivas_binaural_hrtf_open( 
                }

            }

#ifdef FIX_1123_FASTCONV_16BIT_ROM

            else

#endif

            else if ( input_config == IVAS_AUDIO_CONFIG_FOA )

#else

            if ( input_config == IVAS_AUDIO_CONFIG_FOA )

#endif

            {

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

                {

#ifdef FIX_1123_FASTCONV_16BIT_ROM

                    for ( k = 0; k < HrtfFastConv->ntaps_hrir_foa; k++ )

                    {

                        HrtfFastConv->leftHRIRReal_FOA[i][j][k] = (float) leftHRIRReal_FOA[i][j][k] * scaleFactorSBA;

                        HrtfFastConv->leftHRIRImag_FOA[i][j][k] = (float) leftHRIRImag_FOA[i][j][k] * scaleFactorSBA;

                        HrtfFastConv->rightHRIRReal_FOA[i][j][k] = (float) rightHRIRReal_FOA[i][j][k] * scaleFactorSBA;

                        HrtfFastConv->rightHRIRImag_FOA[i][j][k] = (float) rightHRIRImag_FOA[i][j][k] * scaleFactorSBA;

                        HrtfFastConv->leftHRIRReal_FOA[i][j][k] = leftHRIRReal_FOA[i][j][k] * scaleFactorSBA;

                        HrtfFastConv->leftHRIRImag_FOA[i][j][k] = leftHRIRImag_FOA[i][j][k] * scaleFactorSBA;

                        HrtfFastConv->rightHRIRReal_FOA[i][j][k] = rightHRIRReal_FOA[i][j][k] * scaleFactorSBA;

                        HrtfFastConv->rightHRIRImag_FOA[i][j][k] = rightHRIRImag_FOA[i][j][k] * scaleFactorSBA;

                    }

#else

                    HrtfFastConv->leftHRIRReal_FOA[i][j] = leftHRIRReal_FOA[i][j];
@@ -1037,16 +1045,18 @@ static ivas_error ivas_binaural_hrtf_open( 
                }

            }

        }



#ifdef FIX_1123_FASTCONV_16BIT_ROM

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

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

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

        {

            HrtfFastConv->fastconvReverberationTimes[i] = (float) fastconvReverberationTimes[i] * scaleFactor;

            HrtfFastConv->fastconvReverberationTimes[i] = fastconvReverberationTimes[i] * scaleFactor;

        }

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



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

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

        {

            HrtfFastConv->fastconvReverberationEneCorrections[i] = (float) fastconvReverberationEneCorrections[i] * scaleFactor;

            HrtfFastConv->fastconvReverberationEneCorrections[i] = fastconvReverberationEneCorrections[i] * scaleFactor;

        }

#else

        mvr2r( fastconvReverberationTimes, HrtfFastConv->fastconvReverberationTimes, CLDFB_NO_CHANNELS_MAX );
@@ -1054,9 +1064,14 @@ static ivas_error ivas_binaural_hrtf_open( 
#endif



        *hHrtfFastConv = HrtfFastConv;

    }



#ifdef FIX_RETURN

        return IVAS_ERR_OK;

#endif

    }

#ifndef FIX_RETURN

    return IVAS_ERR_OK;

#endif

}

lib_rend/ivas_crend.c

+50 −43

File changed.

Preview size limit exceeded, changes collapsed.