Commit adecd812 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Cleanup and minimize diff.

parent 2ebfdaa5

apps/decoder.c

+0 −3
Original line number Diff line number Diff line
@@ -39,9 +39,6 @@ 
#include "evs_rtp_payload.h"

#include "ism_file_writer.h"

#include "ivas_rtp_file.h"

#ifdef FIX_1452_DEFAULT_REVERB

#include "ivas_cnst.h"

#endif

#include "jbm_file_writer.h"

#include "hrtf_file_reader.h"

#include "ls_custom_file_reader.h"

apps/renderer.c

+0 −3
Original line number Diff line number Diff line
@@ -49,9 +49,6 @@ 
#include "aeid_file_reader.h"

#include "split_render_file_read_write.h"

#include "vector3_pair_file_reader.h"

#ifdef FIX_1452_DEFAULT_REVERB

#include "ivas_cnst.h"

#endif

#ifdef DEBUGGING

#include "debug.h"

#endif

lib_com/common_api_types.h

+1 −3
Original line number Diff line number Diff line
@@ -60,9 +60,7 @@ 
#define IVAS_ROOM_ABS_COEFF              6

#define IVAS_REVERB_PREDELAY_MAX         20 /* Max input delay for reverb module */

#define IVAS_ER_LIST_HEIGHT              1.6f

#ifndef FIX_1452_DEFAULT_REVERB

#define IVAS_DEFAULT_AEID                65535

#endif



/* JBM constants for adaptive-playout */

#define IVAS_TIME_SCALE_MIN 50  /* min. time-scaling [%] */

lib_com/ivas_cnst.h

+5 −4
Original line number Diff line number Diff line
@@ -1578,12 +1578,13 @@ typedef enum 


#ifdef FIX_1452_DEFAULT_REVERB

#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_ACOUSTIC_PRE_DELAY    0.015f

#define IVAS_REVERB_DEFAULT_M_INPUT_PRE_DELAY       0.02f



#define IVAS_REVERB_DEFAULT_L_ACOUSTIC_PRE_DELAY    0.01625f

#define IVAS_REVERB_DEFAULT_L_INPUT_PRE_DELAY       0.1f

#define IVAS_DEFAULT_AEID                       65535u

#endif



#define LR_IAC_LENGTH_NR_FC                     ( RV_LENGTH_NR_FC )

lib_rend/ivas_render_config.c

+20 −0
Original line number Diff line number Diff line
@@ -177,14 +177,22 @@ ivas_error ivas_render_config_change_defaults( 
    IVAS_DefaultReverbSize defaultReverbSize /* i:   Reverb default size    */

)

{

#ifdef FIX_1452_DEFAULT_REVERB

    hRenderConfig->roomAcoustics.use_er = IVAS_REVERB_DEFAULT_USE_ER;



#endif

    switch ( defaultReverbSize )

    {

        case DEFAULT_REVERB_SMALL:

            hRenderConfig->roomAcoustics.nBands = IVAS_REVERB_DEFAULT_S_N_BANDS;

#ifdef FIX_1452_DEFAULT_REVERB

            hRenderConfig->roomAcoustics.acousticPreDelay = IVAS_REVERB_DEFAULT_S_ACOUSTIC_PRE_DELAY;

            hRenderConfig->roomAcoustics.inputPreDelay = IVAS_REVERB_DEFAULT_S_INPUT_PRE_DELAY;

#else

            hRenderConfig->roomAcoustics.acousticPreDelay = IVAS_REVERB_DEFAULT_S_PRE_DELAY;

            hRenderConfig->roomAcoustics.inputPreDelay = IVAS_REVERB_DEFAULT_S_INPUT_DELAY;

            hRenderConfig->roomAcoustics.use_er = IVAS_REVERB_DEFAULT_USE_ER;

#endif

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

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

            set_zero( &hRenderConfig->roomAcoustics.pAcoustic_dsr[0], CLDFB_NO_CHANNELS_MAX );
@@ -195,8 +203,14 @@ ivas_error ivas_render_config_change_defaults( 
            break;

        case DEFAULT_REVERB_MEDIUM:

            hRenderConfig->roomAcoustics.nBands = IVAS_REVERB_DEFAULT_M_N_BANDS;

#ifdef FIX_1452_DEFAULT_REVERB

            hRenderConfig->roomAcoustics.acousticPreDelay = IVAS_REVERB_DEFAULT_M_ACOUSTIC_PRE_DELAY;

            hRenderConfig->roomAcoustics.inputPreDelay = IVAS_REVERB_DEFAULT_M_INPUT_PRE_DELAY;

#else

            hRenderConfig->roomAcoustics.acousticPreDelay = IVAS_REVERB_DEFAULT_M_PRE_DELAY;

            hRenderConfig->roomAcoustics.inputPreDelay = IVAS_REVERB_DEFAULT_M_INPUT_DELAY;

            hRenderConfig->roomAcoustics.use_er = IVAS_REVERB_DEFAULT_USE_ER;

#endif

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

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

            set_zero( &hRenderConfig->roomAcoustics.pAcoustic_dsr[0], CLDFB_NO_CHANNELS_MAX );
@@ -207,8 +221,14 @@ ivas_error ivas_render_config_change_defaults( 
            break;

        case DEFAULT_REVERB_LARGE:

            hRenderConfig->roomAcoustics.nBands = IVAS_REVERB_DEFAULT_L_N_BANDS;

#ifdef FIX_1452_DEFAULT_REVERB

            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;

            hRenderConfig->roomAcoustics.inputPreDelay = IVAS_REVERB_DEFAULT_L_INPUT_DELAY;

            hRenderConfig->roomAcoustics.use_er = IVAS_REVERB_DEFAULT_USE_ER;

#endif

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

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

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