Commit 1ed047e3 authored by vaclav's avatar vaclav
Browse files

Merge branch 'nokia/contribution-omasa-combined-format' of... 

Merge branch 'nokia/contribution-omasa-combined-format' of https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec into nokia/contribution-omasa-combined-format
parents 4a43f57b a54695e7

.gitlab-ci.yml

+42 −2
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
@@ -285,7 +286,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 +299,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
@@ -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

+1 −4
Original line number Diff line number Diff line
@@ -263,7 +263,7 @@ enum{ 
enum

{

    IND_IVAS_FORMAT,

#ifdef FIX_OMASA_STEREO_SWITCHING

#ifdef MASA_AND_OBJECTS

    IND_SMODE_OMASA,

#endif

    IND_SMODE,
@@ -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

+2 −22

File changed.

Preview size limit exceeded, changes collapsed.

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