Commit 91669b1a authored by korse's avatar korse
Browse files

Merge remote-tracking branch 'origin/main' into 115-bitrate-switching-in-ism-rev1

parents 4acd8d18 fde5c351

.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/dec_tcx.c

+1 −1
Original line number Diff line number Diff line
@@ -1559,7 +1559,7 @@ void decoder_tcx_tns( 
#ifndef FIX_I13_TCX_TNS_ISSUE

            tcx5TnsUngrouping( L_frameTCX >> 1, hTcxCfg->tnsConfig[0][0].iFilterBorders[0] >> 1, x, DEC );

#else

            if ( st->element_mode == EVS_MONO ) /* TBC: this is temporary to maintain EVS BE, this is a bug and should be fixed also for EVS (see issue 13) */

            if ( st->element_mode == EVS_MONO || L_spec < L_frameTCX ) /* TBC: this is temporary to maintain EVS BE, this is a bug and should be fixed also for EVS (see issue 13) */

            {

                tcx5TnsUngrouping( L_frameTCX >> 1, hTcxCfg->tnsConfig[0][0].iFilterBorders[0] >> 1, x, DEC );

            }

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

        }

    }