Commit a371e2c9 authored by vaclav's avatar vaclav
Browse files

Merge branch 'main' into 98-setting-of-decoder-handles-to-null

parents 51c905bd 68fbd32e

.gitlab-ci.yml

+21 −2
Original line number Diff line number Diff line
@@ -219,6 +219,12 @@ msan-on-merge-request-linux: 
    - python3 scripts/self_test.py --create | tee test_output.txt

    - run_errors=$(cat test_output.txt | grep -ic "run errors") || true

    - if [ $run_errors != 0 ] ; then echo "Run errors in self_test.py with Clang memory-sanitizer"; exit 1; fi

  artifacts:

    name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"

    paths:

      - scripts/ref/logs/

      - test_output.txt

    expose_as: 'Msan selftest results'





# code selftest testvectors with address-sanitizer binaries
@@ -235,6 +241,12 @@ asan-on-merge-request-linux: 
    - python3 scripts/self_test.py --create | tee test_output.txt

    - run_errors=$(cat test_output.txt | grep -ic "run errors") || true

    - if [ $run_errors != 0 ] ; then echo "Run errors in self_test.py with Clang address-sanitizer"; exit 1; fi

  artifacts:

    name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"

    paths:

      - scripts/ref/logs/

      - test_output.txt

    expose_as: 'Asan selftest results'





# compare bit exactness between target and source branch
@@ -343,6 +355,7 @@ be-2-evs-linux: 
    - be-2-evs-temp

  stage: test

  needs: [ "build-codec-linux-cmake" ]

  timeout: "20 minutes" # To be revisited

  script:

    - *print-common-info
@@ -468,9 +481,15 @@ sanitizer-test-on-main-scheduled: 
    - if: $SANITIZER_TEST_IN_FMT && $SANITIZER_TEST_OUT_FMTS && $SANITIZER_TEST_TESTS

  script:

    - *print-common-info

    - echo "Running scheduled sanitizer"

    - echo " $SANITIZER_TEST_IN_FMT && $SANITIZER_TEST_OUT_FMTS && $SANITIZER_TEST_TESTS "

    - echo "Running scheduled sanitizer tests $SANITIZER_TEST_TESTS for input format $SANITIZER_TEST_IN_FMT and output format(s) $SANITIZER_TEST_OUT_FMTS"



    - python3 ci/run_scheduled_sanitizer_test.py $SANITIZER_TEST_IN_FMT $SANITIZER_TEST_OUT_FMTS --tests $SANITIZER_TEST_TESTS

  artifacts:

    name: "sanitizer-test-results-and-error_pattern-$SANITIZER_TEST_IN_FMT-in-$SANITIZER_TEST_OUT_FMTS-out"

    when: always

    paths:

      - ep_015.g192

      - "./*/logs"





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

ci/run_scheduled_sanitizer_test.py

+3 −2
Original line number Diff line number Diff line
@@ -60,7 +60,8 @@ def run_check(modes: list, out_formats: list, tests: list, run_fec: bool = True) 
        "--oc",

        *out_formats,

    ]

    print(cmd_no_fec)



    print("======== Script command line WITHOUT plc: ========\n{}".format(" ".join(cmd_no_fec)))



    proc = subprocess.Popen(cmd_no_fec, stdout=subprocess.PIPE, stderr=subprocess.PIPE)

    for c in iter(lambda: proc.stdout.read(1), b""):
@@ -89,7 +90,7 @@ def run_check(modes: list, out_formats: list, tests: list, run_fec: bool = True) 
                fi.unlink()



    cmd_fec = cmd_no_fec + ["--decoder_only", "-f", EP_FILE]

    print(cmd_fec)

    print("======== Script command line WITH plc: ========\n{}".format(" ".join(cmd_no_fec)))



    proc = subprocess.Popen(cmd_fec, stdout=subprocess.PIPE, stderr=subprocess.PIPE)

    for c in iter(lambda: proc.stdout.read(1), b""):

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -147,8 +147,10 @@ 
/*#define FIX_I1_113*/                                  /* under review : MCT bit distribution optimization for SBA high bitrates*/



#define SPAR_SCALING_HARMONIZATION                      /* Issue 80: Changes to harmonize scaling in spar */

#define SBA_INTERN_CONFIG_FIX_HOA2                      /* Issue 99 : Fix for incorrect internal_config when output format is HOA2 or FOA*/

#define FIX_I98_HANDLES_TO_NULL                         /* Issue 98: do the setting of all handles to NULL in one place */





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

/* clang-format on */

#endif

lib_dec/ivas_output_init.c

+11 −0
Original line number Diff line number Diff line
@@ -511,7 +511,18 @@ void ivas_renderer_select( 
        if ( st_ivas->ivas_format == SBA_FORMAT && st_ivas->sba_mode == SBA_MODE_SPAR &&

             ( output_config != AUDIO_CONFIG_5_1 && output_config != AUDIO_CONFIG_5_1_2 && output_config != AUDIO_CONFIG_5_1_4 && output_config != AUDIO_CONFIG_7_1 && output_config != AUDIO_CONFIG_7_1_4 && output_config != AUDIO_CONFIG_LS_CUSTOM ) )

        {

#ifdef SBA_INTERN_CONFIG_FIX_HOA2

            if ( output_config == AUDIO_CONFIG_HOA2 || output_config == AUDIO_CONFIG_FOA )

            {

                *internal_config = output_config;

            }

            else

            {

                *internal_config = AUDIO_CONFIG_HOA3;

            }

#else

            *internal_config = AUDIO_CONFIG_HOA3;

#endif

            st_ivas->renderer_type = RENDERER_SBA_LINEAR_DEC;

        }

        else if ( ( st_ivas->ivas_format == MASA_FORMAT && output_config == AUDIO_CONFIG_MONO && st_ivas->nchan_transport == 1 ) ||