Commit 77c5de09 authored by sagnowski's avatar sagnowski
Browse files

Merge branch 'main' into FhG/external-renderer

parents a97ebdc1 cc0abbd2

.gitlab-ci.yml

+15 −15
Original line number Diff line number Diff line
@@ -399,18 +399,8 @@ codec-comparison-on-main-push: 
    ### re-checkout the latest commit in the main branch

    - git checkout $latest_commit



    ### run selftest

    - ls -altr scripts/testv

    - python3 ./scripts/self_test.py --encref IVAS_cod_ref --decref IVAS_dec_ref --enctest IVAS_cod_test --dectest IVAS_dec_test | tee test_output.txt



    ### analyse test output



    # 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

    - run_errors=$(cat test_output.txt | grep -c "test conditions had run errors") || true

    - bitexact=$(cat test_output.txt | grep -c "All [0-9]* tests are bitexact") || true

    - EXIT_CODE_NON_BE=123

    - EXIT_CODE_FAIL=1

    # 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



    - selftest_exit_code=0
@@ -454,9 +444,19 @@ sanitizer-test-on-main-scheduled: 
    - if: $SANITIZER_TEST_IN_FMT

  script:

    - *print-common-info

    - echo "Running scheduled sanitizer"

    # - python3 ci/run_scheduled_sanitizer_test.py $SANITIZER_TEST_IN_FMT $SANITIZER_TEST_OUT_FMTS



    - make GCOV=1 -j

    - python3 tests/create_short_testvectors.py

    - python3 -m pytest tests -v -n 0 --update_ref 1 -m create_ref --ref_encoder_path ./IVAS_cod --ref_decoder_path ./IVAS_dec

    - python3 -m pytest tests -v -n 0 --update_ref 1 -m create_ref_part2 --ref_encoder_path ./IVAS_cod --ref_decoder_path ./IVAS_dec

    - python3 -m pytest tests/test_param_file.py -v -n 0 --update_ref 1 -m create_ref --param_file scripts/config/self_test_evs.prm --ref_encoder_path ./IVAS_cod --ref_decoder_path ./IVAS_dec

    - lcov -c -d obj -o coverage.info

    - genhtml coverage.info -o coverage

  artifacts:

    name: "main-coverage-sha-$CI_COMMIT_SHORT_SHA"

    when: always

    paths:

      - coverage.info

      - coverage



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

# Other jobs

lib_com/ivas_prot.h

+4 −0
Original line number Diff line number Diff line
@@ -2000,6 +2000,10 @@ void decoder_tcx_tns( 
    const int16_t bfi,                                          /* i  : Bad frame indicator                     */

    const int16_t frame_cnt,                                    /* i  : frame counter in the super frame        */

    const int16_t whitenedDomain 

#ifdef FIX_I13_TCX_TNS_ISSUE

    ,

    const int16_t isEvsMono /*i: EVS mono flag */

#endif

);



void decoder_tcx_imdct(

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -154,6 +154,7 @@ 
// #define FIX_CREND_CHANNELS                              /* Issue 71: fix number of Crend channels */

#define HARMONIZE_SBA_NCHAN_TRANSPORT                   /* harmonize setting of number of transport channels in SBA */

#define DRAM_REDUCTION_MCT_IGF                          /* Issue 121: reduce dynamic RAM consumption in MCT IGF */

#define FIX_I13_TCX_TNS_ISSUE                           /* Issue 13: Fix reported artifacts. Bug in TNS with TCX5 */



#define EXT_RENDERER                                    /* FhG: external renderer library and standalone application */

#define FIX_EFAP_MATH                                   /* fix for EFAP: remove angle quantization and a bug in polygon lookup causing incorrect gains. minor tweak for ALLRAD. non-BE for modes using EFAP */

lib_com/prot.h

+4 −0
Original line number Diff line number Diff line
@@ -7889,6 +7889,10 @@ void decoder_tcx( 
    const int16_t bfi,                  /* i  : Bad frame indicator                   */

    const int16_t frame_cnt,            /* i  : frame counter in the super_frame      */

    const int16_t sba_dirac_stereo_flag /* i  : signal stereo output for SBA DirAC    */

#ifdef FIX_I13_TCX_TNS_ISSUE

    ,

    const int16_t isEvsMono /*i: EVS mono flag */

#endif

);



void decoder_tcx_post(

lib_dec/dec_LPD.c

+12 −2
Original line number Diff line number Diff line
@@ -595,7 +595,12 @@ void decoder_LPD( 
        }



        /* TCX decoder */

        decoder_tcx( st, prm, Aq, Aind, &synth[0], &synthFB[0], bfi, 0, 0 );

        decoder_tcx( st, prm, Aq, Aind, &synth[0], &synthFB[0], bfi, 0, 0

#ifdef FIX_I13_TCX_TNS_ISSUE

                     ,

                     1

#endif

        );

    }



    /*--------------------------------------------------------------------------------*
@@ -621,7 +626,12 @@ void decoder_LPD( 
            IGFDecRestoreTCX10SubFrameData( st->hIGFDec, k );



            /* TCX decoder */

            decoder_tcx( st, prm, Aq, Aind, &synth[k * L_frame / 2], &synthFB[k * L_frameTCX / 2], bfi, k, 0 );

            decoder_tcx( st, prm, Aq, Aind, &synth[k * L_frame / 2], &synthFB[k * L_frameTCX / 2], bfi, k, 0

#ifdef FIX_I13_TCX_TNS_ISSUE

                         ,

                         1

#endif

            );

        }

    }