Commit 630bec40 authored by vaclav's avatar vaclav
Browse files

Merge branch 'main' into 250-tb-bwe-state-memories-reset-simplification

parents 2828f57d 76583324

Workspace_msvc/lib_debug.vcxproj

+1 −2
Original line number Diff line number Diff line
@@ -145,7 +145,6 @@ 
    <ClCompile Include="..\lib_debug\debug.c" />

    <ClCompile Include="..\lib_debug\memory.c" />

    <ClCompile Include="..\lib_debug\mem_count.c" />

    <ClCompile Include="..\lib_debug\segsnr.c" />

    <ClCompile Include="..\lib_debug\snr.c" />

    <ClCompile Include="..\lib_debug\sba_debug.c" />

    <ClCompile Include="..\lib_debug\wmops.c" />

apps/renderer.c

+0 −19
Original line number Diff line number Diff line
@@ -62,25 +62,6 @@ 
#include <stdio.h>

#include <string.h>



#ifndef count_malloc

#ifdef RAM_COUNTING_TOOL

#define count_malloc( n1 )     MALLOC_FCT_CALL( n1 )

#define count_calloc( n1, n2 ) CALLOC_FCT_CALL( n1, n2 )

#define count_free( ptr )      FREE_FCT_CALL( ptr )

#else

#define count_malloc( n1 )     malloc( n1 )

#define count_calloc( n1, n2 ) calloc( n1, n2 )

#define count_free( ptr )      free( ptr )

#endif

#endif



#ifndef min

#define min( x, y ) ( ( x ) < ( y ) ? ( x ) : ( y ) )

#endif



#ifndef max

#define max( x, y ) ( ( x ) > ( y ) ? ( x ) : ( y ) )

#endif



#define RENDERER_MAX_CLI_ARG_LENGTH       ( FILENAME_MAX )

#define RENDERER_MAX_METADATA_LENGTH      8192

lib_com/bitstream.c

+4 −1
Original line number Diff line number Diff line
@@ -2948,14 +2948,17 @@ void evs_dec_previewFrame( 


void dtx_read_padding_bits(

    DEC_CORE_HANDLE st,

    int16_t num_bits )

    const int16_t num_bits )

{

    /* TODO: temporary hack, need to decide what to do with core-coder bitrate */

    int32_t tmp;



    tmp = st->total_brate;

    st->total_brate = st->total_brate + num_bits * FRAMES_PER_SEC;

    get_next_indice( st, num_bits );

    st->total_brate = tmp;



    return;

}



#undef WMC_TOOL_MAN

lib_com/delay_comp.c

+1 −5
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ 
 *--------------------------------------------------------------------------*/



/*! r: delay value in ns */



int32_t get_delay(

    const int16_t enc_dec,           /* i  : encoder/decoder flag                */

    const int32_t io_fs,             /* i  : input/output sampling frequency     */
@@ -116,12 +115,9 @@ int32_t get_delay( 
            }



            /* compensate for Binaural renderer HRTF delay */

            {

            delay += binaural_latency_ns;

            }

#endif

        }

    }



    return delay;

}

lib_com/ivas_cnst.h

+12 −7
Original line number Diff line number Diff line
@@ -107,8 +107,8 @@ typedef enum 
    AUDIO_CONFIG_ISM2,                          /* ISM2                         */

    AUDIO_CONFIG_ISM3,                          /* ISM3                         */

    AUDIO_CONFIG_ISM4,                          /* ISM4                         */

    AUDIO_CONFIG_MASA1,                         /* MASA1                        */

    AUDIO_CONFIG_MASA2,                         /* MASA2                        */

    AUDIO_CONFIG_MASA1,                         /* MASA1                        */ // TBV: seems not to be used

    AUDIO_CONFIG_MASA2,                         /* MASA2                        */ // TBV: seems not to be used

    AUDIO_CONFIG_EXTERNAL                       /* external renderer            */



} AUDIO_CONFIG;
@@ -191,8 +191,6 @@ typedef enum 


#define IVAS_MAX_SBA_ORDER                      3                           /* Maximum supported Ambisonics order */



#define IVAS_LIMITER_THRESHOLD      32729 /* -0.01 dBFS */

#define IVAS_LIMITER_ATTACK_SECONDS 0.005f

#define IVAS_NUM_SUPPORTED_FS                   3                           /* number of supported sampling-rates in IVAS */



/*----------------------------------------------------------------------------------*
@@ -1378,7 +1376,7 @@ typedef enum 
 * TD Binaural Object renderer

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



#define MAX_NUM_TDREND_CHANNELS                 16                          /* max. number of channels in TD renderer (objects or loudspeaker channels) */

#define MAX_NUM_TDREND_CHANNELS                 MAX_CICP_CHANNELS           /* max. number of channels in TD renderer (objects or loudspeaker channels) */



#define SFX_SPAT_BIN_MAX_NO_OF_OUTPUT_SAMPLES   288                         /* 288 = 6 msec @ 48 kHz.                                           */

#define HRTF_MODEL_N_SECTIONS                   3                           /* No. sections used in approximate evaluation of model             */
@@ -1471,8 +1469,6 @@ typedef enum 
#define RV_LENGTH_NR_FC                         ( RV_FILTER_MAX_FFT_SIZE / 2 ) + 1



#define IVAS_REVERB_DEFAULT_N_BANDS             31

#define IVAS_REVERB_DEFAULT_PRE_DELAY           0.016f

#define IVAS_REVERB_DEFAULT_INPUT_DELAY         0.1f





/*----------------------------------------------------------------------------------*
@@ -1593,6 +1589,15 @@ typedef enum 
#define SPAR_DIRAC_DTX_BANDS                    ( SPAR_DTX_BANDS + DIRAC_DTX_BANDS )

#define CLDFB_PAR_WEIGHT_START_BAND             7





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

 * Limiter constants

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



#define IVAS_LIMITER_THRESHOLD                  32729           /* -0.01 dBFS */

#define IVAS_LIMITER_ATTACK_SECONDS             0.005f





#endif

/* clang-format on */

/* IVAS_CNST_H  */