Commit 6259e70f authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Change defaults to agreed values

parent 918b13e7

lib_com/ivas_cnst.h

+3 −1
Original line number Diff line number Diff line
@@ -1577,7 +1577,9 @@ typedef enum 
#define IVAS_REVERB_DEFAULT_S_N_BANDS           60



#ifdef FIX_1452_DEFAULT_REVERB

#define IVAS_REVERB_DEFAULT_SYNTH_PRE_DELAY     0.016f

#define IVAS_REVERB_DEFAULT_S_ACOUSTIC_PRE_DELAY    0.015f

#define IVAS_REVERB_DEFAULT_M_ACOUSTIC_PRE_DELAY    0.015f

#define IVAS_REVERB_DEFAULT_L_ACOUSTIC_PRE_DELAY    0.01625f

#define IVAS_REVERB_DEFAULT_S_INPUT_PRE_DELAY   0.02f

#define IVAS_REVERB_DEFAULT_M_INPUT_PRE_DELAY   0.02f

#define IVAS_REVERB_DEFAULT_L_INPUT_PRE_DELAY   0.1f

lib_rend/ivas_render_config.c

+4 −2
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ ivas_error ivas_render_config_init_from_rom( 
    ( *hRenderConfig )->roomAcoustics.aeID = IVAS_DEFAULT_AEID;

    ( *hRenderConfig )->roomAcoustics.nBands = IVAS_REVERB_DEFAULT_L_N_BANDS;

#ifdef FIX_1452_DEFAULT_REVERB

    ( *hRenderConfig )->roomAcoustics.acousticPreDelay = IVAS_REVERB_DEFAULT_SYNTH_PRE_DELAY;

    ( *hRenderConfig )->roomAcoustics.acousticPreDelay = IVAS_REVERB_DEFAULT_L_ACOUSTIC_PRE_DELAY;

    ( *hRenderConfig )->roomAcoustics.inputPreDelay = IVAS_REVERB_DEFAULT_L_INPUT_PRE_DELAY;

#else

    ( *hRenderConfig )->roomAcoustics.acousticPreDelay = IVAS_REVERB_DEFAULT_L_PRE_DELAY;
@@ -177,13 +177,13 @@ ivas_error ivas_render_config_change_defaults( 
    IVAS_DefaultReverbSize defaultReverbSize /* i:   Reverb default size    */

)

{

    hRenderConfig->roomAcoustics.acousticPreDelay = IVAS_REVERB_DEFAULT_SYNTH_PRE_DELAY;

    hRenderConfig->roomAcoustics.use_er = IVAS_REVERB_DEFAULT_USE_ER;



    switch ( defaultReverbSize )

    {

        case DEFAULT_REVERB_SMALL:

            hRenderConfig->roomAcoustics.nBands = IVAS_REVERB_DEFAULT_S_N_BANDS;

            hRenderConfig->roomAcoustics.acousticPreDelay = IVAS_REVERB_DEFAULT_S_ACOUSTIC_PRE_DELAY;

            hRenderConfig->roomAcoustics.inputPreDelay = IVAS_REVERB_DEFAULT_S_INPUT_PRE_DELAY;

            set_zero( &hRenderConfig->roomAcoustics.pFc_input[0], CLDFB_NO_CHANNELS_MAX );

            set_zero( &hRenderConfig->roomAcoustics.pAcoustic_rt60[0], CLDFB_NO_CHANNELS_MAX );
@@ -195,6 +195,7 @@ ivas_error ivas_render_config_change_defaults( 
            break;

        case DEFAULT_REVERB_MEDIUM:

            hRenderConfig->roomAcoustics.nBands = IVAS_REVERB_DEFAULT_M_N_BANDS;

            hRenderConfig->roomAcoustics.acousticPreDelay = IVAS_REVERB_DEFAULT_M_ACOUSTIC_PRE_DELAY;

            hRenderConfig->roomAcoustics.inputPreDelay = IVAS_REVERB_DEFAULT_M_INPUT_PRE_DELAY;

            set_zero( &hRenderConfig->roomAcoustics.pFc_input[0], CLDFB_NO_CHANNELS_MAX );

            set_zero( &hRenderConfig->roomAcoustics.pAcoustic_rt60[0], CLDFB_NO_CHANNELS_MAX );
@@ -206,6 +207,7 @@ ivas_error ivas_render_config_change_defaults( 
            break;

        case DEFAULT_REVERB_LARGE:

            hRenderConfig->roomAcoustics.nBands = IVAS_REVERB_DEFAULT_L_N_BANDS;

            hRenderConfig->roomAcoustics.acousticPreDelay = IVAS_REVERB_DEFAULT_L_ACOUSTIC_PRE_DELAY;

            hRenderConfig->roomAcoustics.inputPreDelay = IVAS_REVERB_DEFAULT_L_INPUT_PRE_DELAY;

            set_zero( &hRenderConfig->roomAcoustics.pFc_input[0], CLDFB_NO_CHANNELS_MAX );

            set_zero( &hRenderConfig->roomAcoustics.pAcoustic_rt60[0], CLDFB_NO_CHANNELS_MAX );

lib_util/render_config_reader.c

+1 −1
Original line number Diff line number Diff line
@@ -2376,7 +2376,7 @@ ivas_error RenderConfigReader_read( 
                params_idx = 0;

                pValue = (char *) calloc( strlen( pParams ), sizeof( char ) );

#ifdef FIX_1452_DEFAULT_REVERB

                hRenderConfig->roomAcoustics.acousticPreDelay = IVAS_REVERB_DEFAULT_SYNTH_PRE_DELAY;

                hRenderConfig->roomAcoustics.acousticPreDelay = IVAS_REVERB_DEFAULT_L_ACOUSTIC_PRE_DELAY;

#endif

                while ( sscanf( pParams + params_idx, "%64[^=]=%[^;];", item, pValue ) == 2 )

                {