Commit 3d7ab7e7 authored by multrus's avatar multrus
Browse files

merge from main

parents e7296a14 b8925bcb

.gitlab-ci.yml

+5 −5
Original line number Diff line number Diff line
@@ -795,7 +795,7 @@ sanitizer-test-masa: 
.sanitizer-test-schedule-B:

  extends:

    - .sanitizer-test-template

  timeout: 3 hours

  timeout: 4 hours



sanitizer-test-mc-5_1:

  extends: .sanitizer-test-schedule-B
@@ -810,7 +810,7 @@ sanitizer-test-mc-5_1_2: 
  rules:

    - if: $SANITIZER_SCHEDULE_B

      when: delayed

      start_in: 3 hours

      start_in: 4 hours

  script:

    - *update-ltv-repo

    - python3 ci/run_scheduled_sanitizer_test.py 5_1_2 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS
@@ -820,7 +820,7 @@ sanitizer-test-mc-5_1_4: 
  rules:

    - if: $SANITIZER_SCHEDULE_B

      when: delayed

      start_in: 6 hours

      start_in: 8 hours

  script:

    - *update-ltv-repo

    - python3 ci/run_scheduled_sanitizer_test.py 5_1_4 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS
@@ -830,7 +830,7 @@ sanitizer-test-mc-7_1: 
  rules:

    - if: $SANITIZER_SCHEDULE_B

      when: delayed

      start_in: 9 hours

      start_in: 12 hours

  script:

    - *update-ltv-repo

    - python3 ci/run_scheduled_sanitizer_test.py 7_1 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS
@@ -840,7 +840,7 @@ sanitizer-test-mc-7_1_4: 
  rules:

    - if: $SANITIZER_SCHEDULE_B

      when: delayed

      start_in: 12 hours

      start_in: 16 hours

  script:

    - *update-ltv-repo

    - python3 ci/run_scheduled_sanitizer_test.py 7_1_4 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS

lib_com/.#options.h

0 → 120000
+1 −0
Original line number Diff line number Diff line 
mul@ix1347.iis.fhg.de.217051
 
 No newline at end of file

lib_com/options.h

+2 −1
Original line number Diff line number Diff line
@@ -147,8 +147,9 @@ 
#endif

#define FIX_I59_DELAY_ROUNDING                          /* Issue 59: rounding in sample domain instead of nanosec for IVAS_ENC_GetDelay() and IVAS_DEC_GetDelay() */

#define FIX_FIX_I59                                     /* Issue 59:  small fix concerning LFE delay rounding */



#define FIX_197_CREND_INTERFACE 

#define SET_TNS_FLAG_IN_EVERY_FRAME                     /* FhG: issue 288 - mismatch between encoder and decoder wrt TNS usage in unified stereo  with frameloss */



/* ################## End DEVELOPMENT switches ######################### */

/* clang-format on */

#endif

lib_dec/core_dec_init.c

+7 −0
Original line number Diff line number Diff line
@@ -670,6 +670,13 @@ void open_decoder_LPD( 
    st->last_tns_active = 0;

    st->second_last_tns_active = 0;

    st->second_last_core = -1;

#ifdef SET_TNS_FLAG_IN_EVERY_FRAME

    /* TODO: also apply for MCT modes, once issue #24 is solved */

    if ( st->hTcxCfg != NULL && !MCT_flag && st->element_mode != EVS_MONO )

    {

        st->hTcxCfg->fIsTNSAllowed = getTnsAllowed( is_init ? total_brate : st->bits_frame_nominal * FRAMES_PER_SEC, st->igf, st->element_mode, st->mct_chan_mode );

    }

#endif

    if ( hTcxDec != NULL )

    {

        hTcxDec->tcxltp_second_last_pitch = st->old_fpitch;

lib_dec/ivas_tcx_core_dec.c

+7 −0
Original line number Diff line number Diff line
@@ -96,6 +96,13 @@ void stereo_tcx_init_dec( 
    st->hTcxCfg->resq = getResq( st->bits_frame_nominal * FRAMES_PER_SEC );

    hTcxDec->tcx_lpc_shaped_ari = getTcxLpcShapedAri( st->bits_frame_nominal * FRAMES_PER_SEC, st->rf_flag, st->element_mode );

    st->igf = getIgfPresent( st->element_mode, st->bits_frame_nominal * FRAMES_PER_SEC, st->bwidth, st->rf_flag, st->mct_chan_mode );

#ifdef SET_TNS_FLAG_IN_EVERY_FRAME

    /* TODO: also apply for MCT modes, once issue #24 is solved */

    if ( !MCT_flag && st->element_mode != EVS_MONO )

    {

        st->hTcxCfg->fIsTNSAllowed = getTnsAllowed( st->bits_frame_nominal * FRAMES_PER_SEC, st->igf, st->element_mode, st->mct_chan_mode );

    }

#endif

    if ( hTcxLtpDec != NULL )

    {

        hTcxLtpDec->tcxltp = getTcxLtp( st->sr_core );