Commit 4e1b6edf authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge remote-tracking branch 'origin/main' into nokia/contribution-omasa-combined-format

parents e14f1c10 8f037b8c

.gitlab-ci.yml

+40 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ variables: 
  OUT_FORMATS_BINAURAL: "BINAURAL BINAURAL_ROOM_IR BINAURAL_ROOM_REVERB"

  EXIT_CODE_NON_BE: 123

  EXIT_CODE_FAIL: 1

  PROCESSING_SCRIPTS_BIN_DIR: "/test-bin"



default:

  interruptible: true # Make all jobs by default interruptible
@@ -692,6 +693,45 @@ check-first-frame-is-sid: 
    expose_as: "logs-sidstart"

    expire_in: "5 days"



selection-test-processing:

  extends:

    - .test-job-linux-needs-testv-dir

    - .rules-merge-request

  tags:

    - processing-scripts-linux

  stage: test

  needs: ["build-codec-linux-make"]

  script:

    # get processing script code

    - git clone https://forge.3gpp.org/rep/ivas-codec-pc/ivas-processing-scripts.git --single-branch -b main



    - mkdir -p ivas-processing-scripts/tests/data/testv

    - cp -r scripts/testv/* ivas-processing-scripts/tests/data/testv/



    # copy binaries into local bin dir, those should take precendence over PATH

    - cp $PROCESSING_SCRIPTS_BIN_DIR/* ivas-processing-scripts/ivas_processing_scripts/bin/

    # for testing with native binaries

    - rm ivas-processing-scripts/ivas_processing_scripts/bin/IVAS*.exe

    - rm ivas-processing-scripts/ivas_processing_scripts/bin/EVS*.exe



    # build codec and put into bin dir

    - make -j

    - cp ./IVAS_* ivas-processing-scripts/ivas_processing_scripts/bin/



    # patch the use_windows_codec_binaries key (weird folding is needed so colons are accepted)

    - >

      sed -i "s/use_windows_codec_binaries: true/use_windows_codec_binaries: false/" ivas-processing-scripts/experiments/selection/*/config/*.yml



    # run experiments test

    - cd ivas-processing-scripts

    - python3 -m pytest tests/test_experiments.py::test_generate_test_items -n auto | tee log.txt

  artifacts:

    paths:

      - ivas-processing-scripts/experiments/selection/*/proc_output/*.log

      - log.txt

    when: on_failure

    expire_in: 1 week



# ---------------------------------------------------------------

# Test jobs for main branch

# ---------------------------------------------------------------

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
@@ -450,9 +450,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/ivas_cnst.h

+0 −20
Original line number Diff line number Diff line
@@ -186,19 +186,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

#ifdef MASA_AND_OBJECTS

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

#else

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

#endif

#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) */
@@ -344,12 +335,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



#ifdef MASA_AND_OBJECTS
@@ -415,9 +402,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 

{
@@ -441,14 +426,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,

lib_com/ivas_fb_mixer.c

+0 −3
Original line number Diff line number Diff line
@@ -49,9 +49,6 @@ 


static void ivas_get_active_bins( const int16_t **pActive_bins, const int16_t **pActive_bins_abs, const int16_t **pStart_offset, const int16_t **pStart_offset_ab, const int32_t sampling_rate );

static void ivas_get_ld_fb_resp( float **ppIdeal_FRs_re, float **ppIdeal_FRs_im, float **ppNew_FRs_re, float **ppNew_FRs_im, const int16_t *pActive_bins, const int16_t *pStart_offset, const int16_t num_bands, const int16_t delay, const int32_t sampling_rate );

#ifndef FIX_383_CLEAN_UP

static int16_t ivas_fb_mixer_get_band_diff_non48k( const int32_t sampling_rate, const float delay_ms );

#endif

static const float *ivas_get_cheby_ramp( const int16_t delay );

static void ivas_get_hanning_win( const int16_t len, float *pH_win );

static ivas_error ivas_filterbank_setup( IVAS_FB_MIXER_HANDLE hFbMixer, const int32_t sampling_rate );