Commit ead79a96 authored by fotopoulou's avatar fotopoulou
Browse files

Merge branch 'main' into... 

Merge branch 'main' into 13-sba-cpe-mct-artefacts-in-drums-vector-at-48khz-encode-16khz-decode-64-160-256kbps-189
parents e4f5ffeb 1a518017

.gitlab-ci.yml

+20 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ stages: 
  - build

  - test

  - compare

  - validate



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

# Generic script anchors
@@ -107,6 +108,25 @@ stages: 
      - 123





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

# Validation jobs

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



check-if-branch-is-up-to-date-with-main:

  extends:

    - .rules-merge-request

  stage: validate

  needs: []

  tags:

    - ivas-linux

  script:

    - echo $CI_COMMIT_SHA

    - echo $CI_MERGE_REQUEST_TARGET_BRANCH_NAME

    - commits_behind_count=$(git rev-list --count $CI_COMMIT_SHA..origin/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME)

    - echo $commits_behind_count

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





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

# Build jobs

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

lib_dec/ivas_stereo_switching_dec.c

+1 −0
Original line number Diff line number Diff line
@@ -1496,6 +1496,7 @@ void stereo_switching_dec( 
            sts[1]->pit_res_max_past = sts[0]->pit_res_max_past;

#ifdef MDCT_STEREO_PLC_FADE_2_BG_NOISE

            sts[1]->hTcxDec->L_frameTCX = sts[0]->hTcxDec->L_frameTCX;

            sts[1]->hTcxDec->conceal_eof_gain = sts[0]->hTcxDec->conceal_eof_gain;

#endif

        }

    }