Commit 5f371a59 authored by vaclav's avatar vaclav
Browse files

revision of API public constants and ER constants

parent 91907d94

apps/renderer.c

+2 −2
Original line number Diff line number Diff line
@@ -3750,7 +3750,7 @@ static ivas_error parseLfePanMtxFile( 


    /* set default panning matrix to all zeros

       any subsequent issue in file reading will gracefully exit the function */

    for ( lfe_in = 0; lfe_in < IVAS_MAX_INPUT_LFE_CHANNELS; lfe_in++ )

    for ( lfe_in = 0; lfe_in < RENDERER_MAX_INPUT_LFE_CHANNELS; lfe_in++ )

    {

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

        {
@@ -3758,7 +3758,7 @@ static ivas_error parseLfePanMtxFile( 
        }

    }



    for ( lfe_in = 0; lfe_in < IVAS_MAX_INPUT_LFE_CHANNELS; lfe_in++ )

    for ( lfe_in = 0; lfe_in < RENDERER_MAX_INPUT_LFE_CHANNELS; lfe_in++ )

    {

        ch_out = 0;

lib_com/common_api_types.h

+6 −9
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ 


#define IVAS_NUM_FRAMES_PER_SEC 50

#define IVAS_MAX_FRAME_SIZE     ( 48000 / IVAS_NUM_FRAMES_PER_SEC )



#define IVAS_MAX_BITS_PER_FRAME ( 512000 / IVAS_NUM_FRAMES_PER_SEC )



#define IVAS_MAX_NUM_OBJECTS       4
@@ -54,10 +53,8 @@ 
#define IVAS_MAX_OUTPUT_CHANNELS   16

#define IVAS_CLDFB_NO_COL_MAX      16

#define IVAS_CLDFB_NO_CHANNELS_MAX 60

#define IVAS_MAX_INPUT_LFE_CHANNELS 4



#define IVAS_MAX_PARAM_SPATIAL_SUBFRAMES 4



#define IVAS_ROOM_ABS_COEFF              6



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

lib_com/ivas_cnst.h

+0 −18
Original line number Diff line number Diff line
@@ -1841,29 +1841,11 @@ typedef enum 
 * Early Reflection constants

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



#define ER_ABS_COEFF                            6

#define ER_MAX_SOURCES                          25

#define ER_REF_ORDER                            1

#define ER_NUM_REF                              6



#define ER_AIR_COEFF                            (0.00137f)

#define ER_SOUND_SPEED                          (343.0f)

#define ER_MIN_WALL_DIST                        (0.1f)

#define ER_EUCLIDEAN_SCALE                      (1.29246971E-26f)



#define ER_DEFAULT_ROOM_L                       (3.0f)

#define ER_DEFAULT_ROOM_W                       (4.0f)

#define ER_DEFAULT_ROOM_H                       (5.0f)

#define ER_RADIUS                               (1.0f)

#define ER_LIST_ORIGIN_X                        (0.0f)

#define ER_LIST_ORIGIN_Y                        (0.0f)

#define ER_LIST_HEIGHT                          (1.6f)



#define ER_MIN_ROOM_DIMENSION                   (1.0f)

#define ER_MAX_ROOM_DIMENSION                   (999.0f)

#define ER_MIN_ABS_COEFF                        (0.0f)

#define ER_MAX_ABS_COEFF                        (1.0f)





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

 * Stereo downmix EVS constants

lib_dec/lib_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -2032,7 +2032,7 @@ ivas_error IVAS_DEC_FeedRenderConfig( 
        hRenderConfig->roomAcoustics.dimensions = renderConfig.roomAcoustics.dimensions;

        hRenderConfig->roomAcoustics.ListenerOrigin = renderConfig.roomAcoustics.ListenerOrigin;



        mvr2r( renderConfig.roomAcoustics.AbsCoeff, hRenderConfig->roomAcoustics.AbsCoeff, ER_ABS_COEFF );

        mvr2r( renderConfig.roomAcoustics.AbsCoeff, hRenderConfig->roomAcoustics.AbsCoeff, IVAS_ROOM_ABS_COEFF );

    }



    mvr2r( renderConfig.roomAcoustics.pFc_input, hRenderConfig->roomAcoustics.pFc_input, CLDFB_NO_CHANNELS_MAX );

lib_rend/ivas_crend.c

+1 −1
Original line number Diff line number Diff line
@@ -992,7 +992,7 @@ static ivas_error ivas_shoebox_config_init_params( 
    hShoeboxConfig->room_W = 0.0f;

    hShoeboxConfig->room_H = 0.0f;



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

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

    {

        hShoeboxConfig->abs_coeff[i] = 0.0f;

    }