Commit e009d101 authored by bayers's avatar bayers
Browse files

Merge remote-tracking branch 'remotes/origin/main' into... 

Merge remote-tracking branch 'remotes/origin/main' into 661-basop32-ch-api-for-div_s-and-div_l-different-from-itu-stl
parents a3725947 065d7624

Workspace_msvc/lib_rend.vcxproj

+2 −0
Original line number Diff line number Diff line
@@ -239,6 +239,7 @@ 
    <ClCompile Include="..\lib_rend\ivas_omasa_ana.c" />

    <ClCompile Include="..\lib_rend\ivas_orient_trk.c" />

    <ClCompile Include="..\lib_rend\ivas_output_init.c" />

	<ClCompile Include="..\lib_rend\ivas_reflections.c" />

    <ClCompile Include="..\lib_rend\ivas_render_config.c" />

    <ClCompile Include="..\lib_rend\ivas_reverb.c" />

    <ClCompile Include="..\lib_rend\ivas_reverb_delay_line.c" />
@@ -251,6 +252,7 @@ 
    <ClCompile Include="..\lib_rend\ivas_rom_binaural_crend_head.c" />

    <ClCompile Include="..\lib_rend\ivas_rotation.c" />

    <ClCompile Include="..\lib_rend\ivas_rom_rend.c" />

	<ClCompile Include="..\lib_rend\ivas_shoebox.c" />

    <ClCompile Include="..\lib_rend\lib_rend.c" />

  </ItemGroup>

  <ItemGroup>

apps/decoder.c

+2 −0
Original line number Diff line number Diff line
@@ -705,6 +705,7 @@ int main( 
        if ( ( error = load_fastconv_HRTF_from_binary( hHrtfFastConv, hrtfReader ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nError in loading HRTF binary file %s for FastConv \n\n", arg.hrtfCRendFileName );

            goto cleanup;

        }

        IVAS_DEC_HRTF_PARAMBIN_HANDLE hHrtfParambin = NULL;

        IVAS_DEC_GetHrtfParamBinHandle( hIvasDec, &hHrtfParambin );
@@ -712,6 +713,7 @@ int main( 
        if ( ( error = load_parambin_HRTF_from_binary( hHrtfParambin, hrtfReader ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nError in loading HRTF binary file %s for parametric binauralizer \n\n", arg.hrtfCRendFileName );

            goto cleanup;

        }

    }

lib_com/common_api_types.h

+10 −0
Original line number Diff line number Diff line
@@ -52,6 +52,9 @@ 


#define RENDERER_HEAD_POSITIONS_PER_FRAME 4



#ifdef EARLY_REFLECTIONS

#define QC_ABS_COEFF 6

#endif



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

 * Common API structures
@@ -184,6 +187,13 @@ typedef struct _IVAS_ROOM_ACOUSTICS_CONFIG 
    float pAcoustic_dsr[IVAS_CLDFB_NO_CHANNELS_MAX];  /*  - The room's Diffuse to Source Ratio per center frequency */

    float acousticPreDelay;                           /* Time elapsed between input signal and late reverberation start, float, range [0.001..10] */

    float inputPreDelay;                              /* Offset in seconds from where DSR is computed in the RIR (0 = at source), float, range [0.001..10] */

#ifdef EARLY_REFLECTIONS

    int16_t use_er;               /* ER activation flag */

    int32_t lowComplexity;        /* Low complexity ER flag */

    IVAS_VECTOR3 dimensions;      /* Room dimensions [m] */

    float AbsCoeff[QC_ABS_COEFF]; /* Absorption coeffs */

    IVAS_VECTOR3 ListenerOrigin;  /* Listener origin */

#endif

} IVAS_ROOM_ACOUSTICS_CONFIG_DATA;



#ifdef SPLIT_REND_WITH_HEAD_ROT

lib_com/ivas_cnst.h

+42 −0
Original line number Diff line number Diff line
@@ -1018,6 +1018,13 @@ typedef enum 
#define DIRAC_SLOT_NS                           1250000L                    /* time duration of a time slot, 1.25ms (==DELAY_RENERER_NS/MAX_PARAM_SPATIAL_SUBFRAMES) */

#define DIRAC_SLOT_ENC_NS                       5000000L



#define DIRAC_MONO_THRESH_SILENCE				3e4f

#define DIRAC_MONO_NORM_FACTOR					1e13f

#define DIRAC_MONO_ONE_ON_NORM_FACTOR			(1.f / 1e13f)

#define DIRAC_MONO_MAX_THRESH					1e6f

#define DIRAC_MONO_MIN_THRESH					1e2f

#define DIRAC_MONO_FRAME_THRESH					15 /* 30ms */



typedef enum

{

    DIRAC_OPEN,                                 /* initialize to default value              */
@@ -1056,6 +1063,11 @@ typedef enum 
#define IVAS_ACTIVEW_DM_F_SCALE_VLBR            0.25f

#define IVAS_SPAR_FOA_DFLT_FREQ_PER_CHAN        24000



#ifdef FIX_SBA_VANISHING_RESIDUAL

#define IVAS_SPAR_DYN_ACTIVEW_THRESH           (0.0039f)

#define IVAS_SPAR_SIDE_CH_DYN_ACTIVEW_THRESH   (32.0f)

#endif



#define MAX_QUANT_STRATS                        3

#define MAX_CODING_STRATS                       3

#define IVAS_NUM_PROB_MODELS                    4
@@ -1891,6 +1903,36 @@ typedef enum 
#define IVAS_LIMITER_THRESHOLD                  32729           /* -0.01 dBFS */

#define IVAS_LIMITER_ATTACK_SECONDS             0.005f





#ifdef EARLY_REFLECTIONS

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

 * 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)



#endif



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

 * Stereo downmix EVS constants

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

lib_com/ivas_error.h

+3 −0
Original line number Diff line number Diff line
@@ -138,6 +138,9 @@ typedef enum 
#ifdef CONTROL_METADATA_REVERB

    IVAS_ERR_INVALID_RENDER_CONFIG,

    IVAS_ERR_ACOUSTIC_ENVIRONMENT_MISSING,

#ifdef EARLY_REFLECTIONS

    IVAS_ERR_INVALID_ER_PARAM,

#endif

#ifdef CONTROL_METADATA_DIRECTIVITY

    IVAS_ERR_DIRECTIVITY_PATTERN_ID_MISSING,

#endif