Commit 16c76485 authored by vaclav's avatar vaclav
Browse files

Merge branch 'main' of https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec

parents acf9be80 1b0cf878

.gitlab-ci.yml

+2 −2
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ build-codec-sanitizers-linux: 
build-codec-windows-cmake:

  extends:

    - .build-job-windows-with-check-for-warnings

    - .rules-basis

    - .rules-main-push

  script:

    - *print-common-info-windows

    - $winoutdata = $null
@@ -298,7 +298,7 @@ build-codec-windows-cmake: 
build-codec-windows-msbuild:

  extends:

    - .build-job-windows-with-check-for-warnings

    - .rules-basis

    - .rules-main-push

  script:

    - *print-common-info-windows

    - $winoutdata = $null

lib_com/bitstream.c

100755 → 100644
+4 −329

File changed.File mode changed from 100755 to 100644.

Preview size limit exceeded, changes collapsed.

lib_com/cnst.h

+0 −3
Original line number Diff line number Diff line
@@ -447,9 +447,6 @@ enum 
    IND_STEREO_2ND_CODER_T,



    IND_UNUSED,

#ifndef IND_LIST_DYN

    MAX_NUM_INDICES = IND_UNUSED + 772 /* Total 2640 in line with MAX_BITS_METADATA */

#endif

};



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

lib_com/core_com_config.c

+8 −9
Original line number Diff line number Diff line
@@ -165,9 +165,9 @@ int16_t get_codec_mode( 
int16_t getTcxonly(

    const int16_t element_mode, /* i  : IVAS element mode                   */

    const int32_t total_brate,  /* i  : total bitrate                       */

    const int16_t MCT_flag      /* i  : hMCT handle allocated (1) or not (0)*/

    ,

    const int16_t is_ism_format )

    const int16_t MCT_flag,     /* i  : hMCT handle allocated (1) or not (0)*/

    const int16_t is_ism_format /* i  : flag indicating ISM format          */

)

{

    int16_t tcxonly = 0;
@@ -357,8 +357,7 @@ int32_t getCoreSamplerateMode2( 
    const int32_t total_brate,      /* i  : total bitrate                  */

    const int16_t bwidth,           /* i  : audio bandwidth                */

    const int16_t flag_ACELP16k,    /* i  : ACELP@16kHz flag               */

    const int16_t rf_mode        /* i  : flag to signal the RF mode     */

    ,

    const int16_t rf_mode,          /* i  : flag to signal the RF mode     */

    const IVAS_FORMAT is_ism_format /* i  : flag indicating ISM format     */

)

{

lib_com/ivas_cnst.h

+0 −16
Original line number Diff line number Diff line
@@ -181,15 +181,10 @@ typedef enum 
#define MAX_CPE                                 ( MAX_TRANSPORT_CHANNELS / CPE_CHANNELS )    /* max. number of CPEs */



#define MAX_BITS_METADATA                       2640                        /* max. bit-budget of metadata, one channel */ /* IVAS_fmToDo: to be confirmed for final value once mature */

#ifndef IND_LIST_DYN

#define MAX_NUM_METADATA                        max( 2, MAX_NUM_OBJECTS )   /* number of max. metadata (now only 2 for DirAC) */

#endif

#ifdef IND_LIST_DYN

#define MIN_NUM_IND                             10                          /* minimum number of indices in the core coder */

#define MAX_NUM_IND_LFE                         100                         /* maximum number of indices in the LFE encoder */

#define MAX_NUM_IND_TEMP_LIST                   10                          /* maximum number of indices in the temporary list */

#define MAX_IND_TDM_TMP                         10                          /* maximum number of indices in the temporary list of TD stereo spatial parameters */

#endif



#define IVAS_ENC_DELAY_NS                       ACELP_LOOK_NS

#define IVAS_DEC_DELAY_NS                       3250000L                    /* 3.25 ms: IVAS decoder delay (without renderer delay) */
@@ -335,12 +330,8 @@ typedef enum 


#define ISM_NB_BITS_METADATA_NOMINAL            ( ( SCE_CORE_16k_LOW_LIMIT - ACELP_16k_LOW_LIMIT ) / FRAMES_PER_SEC ) /* nominal number of metadata bits - used for configuration of Core-Coder modules */



#ifdef FIX_532_ISM_MD_INACTIVE

#define ISM_METADATA_MD_FLAG_BITS               1 /* flag to distinguish between NULL metadata and low-rate ISM_NO_META class */

#define ISM_METADATA_INACTIVE_FLAG_BITS         1 /* flag to signal whether MD are sent in low-rate inactive frame */

#else

#define ISM_METADATA_VAD_FLAG_BITS              1

#endif

#define ISM_METADATA_FLAG_BITS                  2



#define ISM_NO_META                             0
@@ -394,9 +385,7 @@ typedef enum 
#define ISM_Q_STEP_LOW                          (ISM_Q_STEP * 2)

#define ISM_Q_STEP_BORDER_LOW                   (ISM_Q_STEP_BORDER * 2)



#ifdef FIX_532_ISM_MD_INACTIVE

#define BRATE_ISM_INACTIVE                      2450 /* CoreCoder bitrate in ISM inactive frames */

#endif



typedef enum 

{
@@ -413,14 +402,9 @@ enum 
    IND_ISM_EXTENDED_FLAG = IND_ISM_NUM_OBJECTS + MAX_NUM_OBJECTS,

    IND_ISM_EXTENDED_NDP_FLAG, 

    IND_ISM_METADATA_FLAG,

#ifdef FIX_532_ISM_MD_INACTIVE

    IND_ISM_MD_NULL_FLAG = IND_ISM_METADATA_FLAG + MAX_NUM_OBJECTS,

    IND_ISM_MD_INACTIVE_FLAG = IND_ISM_MD_NULL_FLAG + MAX_NUM_OBJECTS,

    IND_ISM_NOISY_SPEECH_FLAG = IND_ISM_MD_INACTIVE_FLAG + MAX_NUM_OBJECTS,

#else

    IND_ISM_VAD_FLAG = IND_ISM_METADATA_FLAG + MAX_NUM_OBJECTS,

    IND_ISM_NOISY_SPEECH_FLAG = IND_ISM_VAD_FLAG + MAX_NUM_OBJECTS,

#endif

    IND_ISM_SCE_ID_DTX,

    IND_ISM_DTX_COH_SCA,