Commit 889e5dd8 authored by Marek Szczerba's avatar Marek Szczerba
Browse files

Cleanup and refactoring

parent d655d8c1

lib_com/ivas_cnst.h

+4 −4
Original line number Diff line number Diff line
@@ -1593,10 +1593,10 @@ typedef enum 


typedef enum

{

    REVERB_DEFAULT_SMALL,

    REVERB_DEFAULT_MEDIUM,

    REVERB_DEFAULT_LARGE

} IVAS_ReverbDefaultSize;

    DEFAULT_REVERB_SMALL,

    DEFAULT_REVERB_MEDIUM,

    DEFAULT_REVERB_LARGE

} IVAS_DefaultReverbSize;



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

 * FB mixer constants

lib_dec/ivas_init_dec.c

+4 −4
Original line number Diff line number Diff line
@@ -1396,18 +1396,18 @@ ivas_error ivas_init_decoder( 
        /* Get default reverb values based on format, if custom values were not given */

        if ( st_ivas->hDecoderConfig->Opt_RendConfigCustom == 0 )

        {

            IVAS_ReverbDefaultSize defaultReverbSize;

            IVAS_DefaultReverbSize defaultReverbSize;



            switch ( st_ivas->ivas_format )

            {

                case MASA_FORMAT:

                    defaultReverbSize = REVERB_DEFAULT_SMALL;

                    defaultReverbSize = DEFAULT_REVERB_SMALL;

                    break;

                case MC_FORMAT:

                    defaultReverbSize = REVERB_DEFAULT_MEDIUM;

                    defaultReverbSize = DEFAULT_REVERB_MEDIUM;

                    break;

                default:

                    defaultReverbSize = REVERB_DEFAULT_LARGE;

                    defaultReverbSize = DEFAULT_REVERB_LARGE;

            }



            if ( ( error = ivas_render_config_change_defaults( st_ivas->hRenderConfig, defaultReverbSize ) ) != IVAS_ERR_OK )

lib_rend/ivas_prot_rend.h

+1 −1
Original line number Diff line number Diff line
@@ -1345,7 +1345,7 @@ ivas_error ivas_render_config_init_from_rom( 


ivas_error ivas_render_config_change_defaults(

    RENDER_CONFIG_HANDLE hRenderConfig,                         /* i/o: Renderer config handle                  */

    IVAS_FORMAT ivas_format                                     /* i:   IVAS format                             */

    IVAS_DefaultReverbSize reverbDefault                        /* i:   Reverb default size                     */

);

lib_rend/ivas_render_config.c

+6 −6
Original line number Diff line number Diff line
@@ -166,12 +166,12 @@ ivas_error ivas_render_config_init_from_rom( 


ivas_error ivas_render_config_change_defaults(

    RENDER_CONFIG_HANDLE hRenderConfig,      /* i/o: Renderer config handle */

    IVAS_ReverbDefaultSize reverbDefault /* i:   IVAS format            */

    IVAS_DefaultReverbSize defaultReverbSize /* i:   Reverb default size    */

)

{

    switch ( reverbDefault )

    switch ( defaultReverbSize )

    {

        case REVERB_DEFAULT_SMALL:

        case DEFAULT_REVERB_SMALL:

            hRenderConfig->roomAcoustics.nBands = IVAS_REVERB_DEFAULT_S_N_BANDS;

            hRenderConfig->roomAcoustics.acousticPreDelay = IVAS_REVERB_DEFAULT_S_PRE_DELAY;

            hRenderConfig->roomAcoustics.inputPreDelay = IVAS_REVERB_DEFAULT_S_INPUT_DELAY;
@@ -184,7 +184,7 @@ ivas_error ivas_render_config_change_defaults( 
            mvr2r( ivas_reverb_default_small_RT60, hRenderConfig->roomAcoustics.pAcoustic_rt60, IVAS_REVERB_DEFAULT_S_N_BANDS );

            mvr2r( ivas_reverb_default_small_DSR, hRenderConfig->roomAcoustics.pAcoustic_dsr, IVAS_REVERB_DEFAULT_S_N_BANDS );

            break;

        case REVERB_DEFAULT_MEDIUM:

        case DEFAULT_REVERB_MEDIUM:

            hRenderConfig->roomAcoustics.nBands = IVAS_REVERB_DEFAULT_M_N_BANDS;

            hRenderConfig->roomAcoustics.acousticPreDelay = IVAS_REVERB_DEFAULT_M_PRE_DELAY;

            hRenderConfig->roomAcoustics.inputPreDelay = IVAS_REVERB_DEFAULT_M_INPUT_DELAY;
@@ -197,7 +197,7 @@ ivas_error ivas_render_config_change_defaults( 
            mvr2r( ivas_reverb_default_medium_RT60, hRenderConfig->roomAcoustics.pAcoustic_rt60, IVAS_REVERB_DEFAULT_M_N_BANDS );

            mvr2r( ivas_reverb_default_medium_DSR, hRenderConfig->roomAcoustics.pAcoustic_dsr, IVAS_REVERB_DEFAULT_M_N_BANDS );

            break;

        case REVERB_DEFAULT_LARGE:

        case DEFAULT_REVERB_LARGE:

            hRenderConfig->roomAcoustics.nBands = IVAS_REVERB_DEFAULT_L_N_BANDS;

            hRenderConfig->roomAcoustics.acousticPreDelay = IVAS_REVERB_DEFAULT_L_PRE_DELAY;

            hRenderConfig->roomAcoustics.inputPreDelay = IVAS_REVERB_DEFAULT_L_INPUT_DELAY;