Commit b52f9995 authored by bayers's avatar bayers
Browse files

Merge branch '500-head-tracking-api-causes-extra-15ms-of-delay' of... 

Merge branch '500-head-tracking-api-causes-extra-15ms-of-delay' of forge.3gpp.org:ivas-codec-pc/ivas-codec into 500-head-tracking-api-causes-extra-15ms-of-delay
parents c3a35842 bc27786f

.gitignore

+4 −0
Original line number Diff line number Diff line
@@ -47,6 +47,10 @@ tests/**/[c|d]ut 
tests/**/ref

tests/*/testv

scripts/testv/*_cut*.pcm

scripts/testv/stvOMASA_*.met

scripts/testv/stvOMASA_*.csv

scripts/testv/stvOMASA_2ISM_1MASA1TC48c.wav

scripts/testv/stvOMASA_3ISM_1MASA1TC48c.wav

# default reference binary name

IVAS_cod_ref*

IVAS_dec_ref*

.gitlab-ci.yml

+39 −36
Original line number Diff line number Diff line
@@ -68,12 +68,12 @@ stages: 
  # needed when depth is lower than the number of commits in the branch

  - git fetch origin $CI_MERGE_REQUEST_TARGET_BRANCH_NAME:$CI_MERGE_REQUEST_TARGET_BRANCH_NAME



.mr-get-target-commit: &mr-get-target-commit

  # compare to last target branch commit before pipeline was created

.mr-get-target-commit:

  &mr-get-target-commit # compare to last target branch commit before pipeline was created

  - target_commit=$(git log $CI_MERGE_REQUEST_TARGET_BRANCH_NAME -1 --oneline --before=${CI_PIPELINE_CREATED_AT} --format=%H)



.check-for-testvectors: &check-for-testvectors

  # check if the testvector files specified in scripts/config/ci_linux*.json are present

.check-for-testvectors:

  &check-for-testvectors # check if the testvector files specified in scripts/config/ci_linux*.json are present

  - python3 -m pytest ci/test_vectors_available.py



.merge-request-comparison-setup-codec:
@@ -157,7 +157,6 @@ stages: 
  rules:

    - if: $CI_PIPELINE_SOURCE == 'schedule' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH





# templates to define stages and platforms

.test-job-linux:

  tags:
@@ -197,7 +196,6 @@ stages: 
    exit_codes:

      - 123





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

# .pre jobs for setting up things

# ---------------------------------------------------------------
@@ -220,8 +218,6 @@ uninterruptible: 
  tags:

    - ivas-linux







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

# Validation jobs

# ---------------------------------------------------------------
@@ -240,7 +236,6 @@ check-if-branch-is-up-to-date-with-main: 
    - echo $commits_behind_count

    - if [ $commits_behind_count -eq 0 ]; then exit 0; else exit 1; fi;





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

# Build jobs

# ---------------------------------------------------------------
@@ -517,8 +512,10 @@ renderer-pytest-on-merge-request: 
    - *print-common-info



    # some helper variables - "|| true" to prevent failures from grep not finding anything

    - non_be_flag=$(echo $CI_MERGE_REQUEST_TITLE | grep -c --ignore-case "\[rend\(erer\)*[ -]*non[ -]*be\]") || true

    - ref_using_main=$(echo $CI_MERGE_REQUEST_TITLE | grep -c --ignore-case "\[ref[ -]*using[ -]*main\]") || true

    # write to temporary file as workaround for failures observed with piping echo

    - echo $CI_MERGE_REQUEST_TITLE > tmp.txt

    - non_be_flag=$(grep -c --ignore-case "\[rend\(erer\)*[ -]*non[ -]*be\]" tmp.txt) || true

    - ref_using_main=$(grep -c --ignore-case "\[ref[ -]*using[ -]*main\]" tmp.txt) || true



    # store the current commit hash

    - source_branch_commit_sha=$(git rev-parse HEAD)
@@ -595,8 +592,10 @@ split-rendering-pytest-on-merge-request: 
    - *print-common-info



    # some helper variables - "|| true" to prevent failures from grep not finding anything

    - non_be_flag=$(echo $CI_MERGE_REQUEST_TITLE | grep -c --ignore-case "\[split*[ -]*non[ -]*be\]") || true

    - ref_using_main=$(echo $CI_MERGE_REQUEST_TITLE | grep -c --ignore-case "\[ref[ -]*using[ -]*main\]") || true

    # write to temporary file as workaround for failures observed with piping echo

    - echo $CI_MERGE_REQUEST_TITLE > tmp.txt

    - non_be_flag=$(grep -c --ignore-case "\[split*[ -]*non[ -]*be\]" tmp.txt) || true

    - ref_using_main=$(grep -c --ignore-case "\[ref[ -]*using[ -]*main\]" tmp.txt) || true



    # store the current commit hash

    - source_branch_commit_sha=$(git rev-parse HEAD)
@@ -654,8 +653,10 @@ ivas-pytest-on-merge-request: 
    - *merge-request-comparison-setup-codec



    # some helper variables - "|| true" to prevent failures from grep not finding anything

    - non_be_flag=$(echo $CI_MERGE_REQUEST_TITLE | grep -c --ignore-case "\[non[ -]*be\]") || true

    - ref_using_main=$(echo $CI_MERGE_REQUEST_TITLE | grep -c --ignore-case "\[ref[ -]*using[ -]*main\]") || true

    # write to temporary file as workaround for failures observed with piping echo

    - echo $CI_MERGE_REQUEST_TITLE > tmp.txt

    - non_be_flag=$(grep -c --ignore-case "\[non[ -]*be\]" tmp.txt) || true

    - ref_using_main=$(grep -c --ignore-case "\[ref[ -]*using[ -]*main\]" tmp.txt) || true



    ### If ref_using_main is not set, checkoug the source branch to use scripts and input from there

    - if [ $ref_using_main == 0 ]; then git checkout $source_branch_commit_sha; fi
@@ -704,8 +705,10 @@ evs-pytest-on-merge-request: 
    - *merge-request-comparison-setup-codec



    # some helper variables - "|| true" to prevent failures from grep not finding anything

    - non_be_flag=$(echo $CI_MERGE_REQUEST_TITLE | grep -c --ignore-case "\[evs[ -]*non[ -]*be\]") || true

    - ref_using_main=$(echo $CI_MERGE_REQUEST_TITLE | grep -c --ignore-case "\[ref[ -]*using[ -]*main\]") || true

    # write to temporary file as workaround for failures observed with piping echo

    - echo $CI_MERGE_REQUEST_TITLE > tmp.txt

    - non_be_flag=$(grep -c --ignore-case "\[evs[ -]*non[ -]*be\]" tmp.txt) || true

    - ref_using_main=$(grep -c --ignore-case "\[ref[ -]*using[ -]*main\]" tmp.txt) || true



    ### If ref_using_main is not set, checkoug the source branch to use scripts and input from there

    - if [ $ref_using_main == 0 ]; then git checkout $source_branch_commit_sha; fi
@@ -793,7 +796,7 @@ clang-format-check: 
      - tmp-formatting-fix/

    when: on_failure

    name: "$ARTIFACT_BASE_NAME"

    expose_as: 'formatting patch'

    expose_as: "formatting patch"



# check for crashes if first received frame on decoder side is an SID

check-first-frame-is-sid:
@@ -807,6 +810,8 @@ check-first-frame-is-sid: 
  script:

    - *print-common-info

    - *update-ltv-repo

    # Temporary fix to test only SID start config files in this job

    - rm scripts/config/ci_linux_ltv.json scripts/config/ci_linux.json

    - *check-for-testvectors

    - cmake .

    - make -j
@@ -880,7 +885,6 @@ lc3plus-ensure-no-code-changes: 
    - modified_files=$(git status -s)

    - if [[ $modified_files ]]; then printf 'LC3plus codebase was modified!\n\n'"$modified_files"'\n\n'; exit $EXIT_CODE_FAIL; fi





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

# Test jobs for main branch

# ---------------------------------------------------------------
@@ -976,8 +980,10 @@ codec-comparison-on-main-push: 
    - cd ..



    # helper variable - "|| true" to prevent failures from grep not finding anything

    - non_be_flag=$(echo $CI_COMMIT_MESSAGE | grep -c --ignore-case "\[non[ -]*be\]") || true

    - ref_using_main=$(echo $CI_COMMIT_MESSAGE | grep -c --ignore-case "\[ref[ -]*using[ -]*main\]") || true

    # write to temporary file as workaround for failures observed with piping echo

    - echo $CI_COMMIT_MESSAGE > tmp.txt

    - non_be_flag=$(grep -c --ignore-case "\[non[ -]*be\]" tmp.txt) || true

    - ref_using_main=$(grep -c --ignore-case "\[ref[ -]*using[ -]*main\]" tmp.txt) || true



    ### re-checkout the latest commit in the main branch, if ref_using_main is not set

    - if [ $ref_using_main == 0 ]; then git checkout $latest_commit;fi
@@ -1042,7 +1048,6 @@ codec-comparison-on-main-push: 
  extends:

    - .sanitizer-test-template





sanitizer-test-mono:

  extends: .sanitizer-test-schedule-A

  rules:
@@ -1257,7 +1262,6 @@ sanitizer-test-ism+4: 
    - *update-ltv-repo

    - python3 ci/run_scheduled_sanitizer_test.py ISM+4 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS





# GCOV/LCOV coverage analysis of self_test suite

coverage-test-on-main-scheduled:

  extends:
@@ -1292,13 +1296,12 @@ coverage-test-on-main-scheduled: 
      - coverage.info

      - coverage





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

# Complexity measurement jobs

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



.complexity-measurements-setup: &complexity-measurements-setup

  # create necessary environment

.complexity-measurements-setup:

  &complexity-measurements-setup # create necessary environment

  - mkdir -p wmops/logs



  - job_id=$(python3 ci/get_id_of_last_job_occurence.py $CI_COMMIT_REF_NAME $CI_JOB_NAME)
@@ -1313,8 +1316,8 @@ coverage-test-on-main-scheduled: 
  - rm artifacts.zip

  - rm -rf $public_dir



.complexity-measurements-prepare-artifacts: &complexity-measurements-prepare-artifacts

  # prepare artifacts -> move to public directory

.complexity-measurements-prepare-artifacts:

  &complexity-measurements-prepare-artifacts # prepare artifacts -> move to public directory

  - public_dir="$CI_JOB_NAME-public"

  - mkdir $public_dir

  - mv -f wmops/log_*_all.txt wmops/*.js ${public_dir}/

ci/smoke_test.sh

+9 −4
Original line number Diff line number Diff line
@@ -75,10 +75,14 @@ if [ $BUILD -eq 1 ];then 


fi



# prepare combined format test signals

echo "\n======================= 0. preparing combined format test inputs =======================\n\n"

./scripts/prepare_combined_format_inputs.py



# run all modes vanilla-fashion

# treat ISM modes separately because passing the metadata files to MASA modes causes crashes

ism_modes=$(./scripts/runIvasCodec.py -l | grep ISM)

non_ism_modes=$(./scripts/runIvasCodec.py -l | grep -v ISM)

ism_modes=$(./scripts/runIvasCodec.py -l | grep ^ISM)

non_ism_modes=$(./scripts/runIvasCodec.py -l | grep -v ^ISM)

echo "\n======================= 1. non-ism modes no FEC =======================\n\n"

./scripts/runIvasCodec.py -m $non_ism_modes -p $cfg $duration_arg $WORKERS | tee smoke_test_output.txt

echo "\n======================= 2. ism modes no FEC =======================\n\n"
@@ -88,8 +92,9 @@ echo "\n======================= 3. all modes with FEC =======================\n\ 
./scripts/runIvasCodec.py -p $cfg $duration_arg $WORKERS -D="-fec 15" --decoder_only | tee smoke_test_output_plc.txt



# run JBM modes - EXT is excluded as not supported yet

modes_with_no_ext_out=$(./scripts/runIvasCodec.py -l | grep -v MASA | grep -v ISM)

modes_with_ext_out=$(./scripts/runIvasCodec.py -l | grep 'MASA\|ISM' | grep -v ISM+)

# OMASA disabled for now

modes_with_no_ext_out=$(./scripts/runIvasCodec.py -l | grep -v ^MASA | grep -v ^ISM | grep -v OMASA)

modes_with_ext_out=$(./scripts/runIvasCodec.py -l | grep 'MASA\|ISM' | grep -v ^ISM+ | grep -v OMASA)

echo "\n======================= 4. JBM, modes with no EXT =======================\n\n"

./scripts/runIvasCodec.py -m $modes_with_no_ext_out -p $cfg $duration_arg $WORKERS --decoder_only --jbm_file $dly_profile | tee smoke_test_output_jbm_noEXT.txt

echo "\n======================= 5. JBM, modes with EXT =======================\n\n"

lib_com/options.h

+4 −1
Original line number Diff line number Diff line
@@ -234,7 +234,8 @@ 
#define FIX_613_DIRAC_NULL_PTR_USAN                     /* Nokia: Issue #613: USAN in DirAC decoder setup */



#define MASA_AND_OBJECTS                                /* Nokia: Combination of MASA and objects */



#define FIX_653_BUG_IN_SKIP_MATRIX                      /* Dlb: fix for issue #653, bug in the ivas_spar_get_skip_mat function*/

#define FIX_663_PARAM_ISM_EXT                           /* FhG: Issue 663: ParamISM EXT output improvement */





/* ################## End BE DEVELOPMENT switches ######################### */
@@ -242,7 +243,9 @@ 
/* #################### Start NON-BE CR switches ########################## */

/* any switch which is non-be wrt operation points tested in selection */

/* all switches in this category should start with "CR_" */



#define CR_FIX_585_MASA_2TC_DTX_EXT                     /* Nokia: issue 585: fixes transition artifacts in MASA 2TC DTX by applying correct condition */

#define CR_FIX_586_BPF_DFT_MEM                          /* FhG: issue 586: set input memory of DFT analysis of BPF signal to zero for HQ core to fix issue with PLC and bitrate switching */

#define CR_FIX_ISM_DTX_INFINITE_CNG_ON_TRAILING_SILENCE /* FhG: fix for cng in ISM DTX on sudden silence periods */



/* ##################### End NON-BE CR switches ########################### */

lib_dec/ivas_binRenderer_internal.c

+1 −0
Original line number Diff line number Diff line
@@ -1085,6 +1085,7 @@ ivas_error ivas_rend_openCldfbRend( 
        hBinRenderer->conv_band = convBand;

    }

    hBinRenderer->hInputSetup->is_loudspeaker_setup = 0;

    hBinRenderer->hInputSetup->output_config = in_config;

    getAudioConfigNumChannels( inConfig, &hBinRenderer->hInputSetup->nchan_out_woLFE );



    if ( ( out_config == AUDIO_CONFIG_BINAURAL_SPLIT_CODED ) || ( out_config == AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )