Commit d5a3a31e authored by sekine's avatar sekine
Browse files

Merge branch 'main' into NTT/REDUC_COMP_POC_202209

parents 4d762489 c27a5ae4
Loading
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -79,7 +79,6 @@ static
#define NUM_BITS_SID_IVAS_9K3  186
#define NUM_BITS_SID_IVAS_10K2 204
#endif
#define META_LINE_LENGTH           200
#define MAX_FRAME_SIZE             ( 48000 / 50 )
#define MAX_NUM_OUTPUT_CHANNELS    16
#define MAX_OUTPUT_PCM_BUFFER_SIZE ( MAX_NUM_OUTPUT_CHANNELS * MAX_FRAME_SIZE )
+11 −3
Original line number Diff line number Diff line
@@ -50,8 +50,12 @@
 *--------------------------------------------------------------------------*/

/*! r: delay value in ns */
#ifdef FIX_GET_DELAY_RETURN
int32_t get_delay(
#else
float get_delay(
    const int16_t what_delay,         /* i  : what delay? (ENC or DEC)            */
#endif
    const int16_t enc_dec,            /* i  : encoder/decoder flag                */
    const int32_t io_fs,              /* i  : input/output sampling frequency     */
    const IVAS_FORMAT ivas_format,    /* i  : IVAS format                         */
    HANDLE_CLDFB_FILTER_BANK hCldfb,  /* i  : Handle of Cldfb analysis            */
@@ -59,9 +63,13 @@ float get_delay(
    const int32_t binaural_latency_ns /* i  : binaural renderer HRTF delay in ns  */
)
{
#ifdef FIX_GET_DELAY_RETURN
    int32_t delay = 0;
#else
    float delay = 0;
#endif

    if ( what_delay == ENC )
    if ( enc_dec == ENC )
    {
        if ( ivas_format == MONO_FORMAT ) /* EVS mono */
        {
@@ -78,7 +86,7 @@ float get_delay(
            delay += IVAS_FB_ENC_DELAY_NS;
        }
    }
    else
    else /* DEC */
    {
        if ( ivas_format == MONO_FORMAT ) /* EVS mono */
        {
+0 −2
Original line number Diff line number Diff line
@@ -303,8 +303,6 @@ typedef enum
 * ISm Constants
 *----------------------------------------------------------------------------------*/

#define META_LINE_LENGTH                        200                         /* max number of characters at one line of metadata input/output file */

#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 */

#define ISM_METADATA_VAD_FLAG_BITS              1
+3 −0
Original line number Diff line number Diff line
@@ -89,6 +89,9 @@ typedef enum
    IVAS_ERR_NOT_IMPLEMENTED,
    IVAS_ERR_FILE_READER_TIMESTAMP_MISMATCH,
    IVAS_ERR_ISM_FILE_READER_INVALID_METADATA_FORMAT,
#ifdef FIX_ISM_METADATA_READER
    IVAS_ERR_ISM_INVALID_METADATA_VALUE,
#endif
    IVAS_ERR_INVALID_MASA_FORMAT_METADATA_FILE,
#ifdef DEBUGGING
    IVAS_ERR_INVALID_FORCE_MODE,

lib_com/options.h

100644 → 100755
+2 −0
Original line number Diff line number Diff line
@@ -170,6 +170,8 @@
#define FIX_I220_PARAMMC_CPROTO                         /* Issue 220: sanitizer error in the svd due to NaNs coming from negative energies in Cproto */
#define FIX_221_BR_SWITCH_STEREO                        /* Issue 221: Fix missing initialization when switchin from TD to MDCT stereo*/
#define FIX_DTX_RANGE                                   /* Issue 118: fix the DTX usage: default DTX up to 64 kbps, otherwise only in silence */
#define FIX_ISM_METADATA_READER                         /* Issue 211: make ISM metadata file reader robust against invalid files */
#define FIX_GET_DELAY_RETURN                            /* Issue 223: change return data type in function get_delay() */

/* NTT switches */
#define NTT_REDUC_COMP_POC                              /* Contribution  : Complexity reduction of phase spectrum in stereo downmix*/
Loading