Commit ed89b9fb authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'main' into ci/fix-combined-formats-input-in-main-comparison-job

parents 8674ee0d 22042545

.gitlab-ci.yml

+8 −7
Original line number Diff line number Diff line
@@ -244,6 +244,7 @@ stages: 
  extends: .test-job-linux

  before_script:

    - if [ ! -d "$TESTV_DIR" ]; then mkdir -p $TESTV_DIR; fi

    - python3 scripts/prepare_combined_format_inputs.py

    - cp -r scripts/testv/* $TESTV_DIR/



# ---------------------------------------------------------------
@@ -440,7 +441,7 @@ codec-smoke-test: 
# code selftest testvectors with memory-sanitizer binaries

codec-msan:

  extends:

    - .test-job-linux

    - .test-job-linux-needs-testv-dir

    - .rules-merge-request

  stage: test

  needs: ["build-codec-sanitizers-linux"]
@@ -463,7 +464,7 @@ codec-msan: 
# code selftest testvectors with address-sanitizer binaries

codec-asan:

  extends:

    - .test-job-linux

    - .test-job-linux-needs-testv-dir

    - .rules-merge-request

  stage: test

  needs: ["build-codec-sanitizers-linux"]
@@ -486,7 +487,7 @@ codec-asan: 
# code selftest testvectors with address-sanitizer binaries

codec-usan:

  extends:

    - .test-job-linux

    - .test-job-linux-needs-testv-dir

    - .rules-merge-request

  stage: test

  needs: ["build-codec-sanitizers-linux"]
@@ -607,7 +608,7 @@ renderer-usan: 
# compare renderer bitexactness between target and source branch

renderer-pytest-on-merge-request:

  extends:

    - .test-job-linux

    - .test-job-linux-needs-testv-dir

    - .rules-merge-request

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

  # TODO: set reasonable timeout, will most likely take less
@@ -682,7 +683,7 @@ split-rendering-smoke-test: 
# compare split-rendering bitexactness between target and source branch

split-rendering-pytest-on-merge-request:

  extends:

    - .test-job-linux

    - .test-job-linux-needs-testv-dir

    - .rules-merge-request

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

  # TODO: set reasonable timeout, will most likely take less
@@ -755,7 +756,7 @@ split-rendering-pytest-on-merge-request: 
# compare bit exactness between target and source branch

ivas-pytest-on-merge-request:

  extends:

    - .test-job-linux

    - .test-job-linux-needs-testv-dir

    - .rules-merge-request

  stage: compare

  needs: ["build-codec-linux-cmake", "codec-smoke-test"]
@@ -812,7 +813,7 @@ ivas-pytest-on-merge-request: 
# Check interop IVAS_cod_test -> IVAS_dec_ref

ivas-interop-on-merge-request:

  extends:

    - .test-job-linux

    - .test-job-linux-needs-testv-dir

    - .rules-merge-request

  stage: test

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

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -168,6 +168,7 @@ 
#define NONBE_FIX_BINARY_BINAURAL_READING                     /* Orange: Add support for reading binaural binary file */

#define NONBE_FIX_AVG_IAC_CLDFB_REVERB                        /* Orange: Add computation avg energy and iac tables for rom and binaural binary file */

#define NONBE_FIX_935_EARLY_REFLECTIONS_WRONG_ORDER           /* Qualcomm: issue 953: fix order or ER channels in LC mode*/

#define NONBE_FIX_935_SBA_REVERB                              /* FhG: issue 935: fix MSAN error for SBA related to BINAURAL_ROOM_REVERB */

#define NONBE_FIX_952_MC_PARAMUPMIX_5MS                       /* Dlb : issue 952 : Differences between 5ms and 20ms rendering for ParamUpmix*/

#define NONBE_FIX_967_ISM_MONO_DMX                            /* FhG: issue 967: accumulating energies in ISM mono DMX */

#define NONBE_FIX_968_ISM_BRIR_WITH_HEADROTATION_5MS_FIX      /* FhG : issue #968: differences between 5ms and 20ms rendering for discrete ISM with BRIR and head rotation*/

lib_dec/ivas_output_config.c

+4 −0
Original line number Diff line number Diff line
@@ -160,7 +160,11 @@ void ivas_renderer_select( 
        {

            *internal_config = IVAS_AUDIO_CONFIG_HOA3;



#ifdef NONBE_FIX_935_SBA_REVERB

            if ( output_config == IVAS_AUDIO_CONFIG_BINAURAL

#else

            if ( output_config == IVAS_AUDIO_CONFIG_BINAURAL || output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB

#endif

#ifdef SPLIT_REND_WITH_HEAD_ROT

                 || output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM

#endif

lib_dec/ivas_sba_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -194,7 +194,11 @@ ivas_error ivas_sba_dec_reconfigure( 
        }

        else

        {

#ifdef NONBE_FIX_935_SBA_REVERB

            if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL

#else

            if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL || st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB

#endif

#ifdef SPLIT_REND_WITH_HEAD_ROT

                 || st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM

#endif

lib_dec/ivas_spar_decoder.c

+7 −1
Original line number Diff line number Diff line
@@ -249,7 +249,13 @@ ivas_error ivas_spar_dec_open( 
            nchan_to_allocate = 2 * BINAURAL_CHANNELS;

        }



        if ( st_ivas->ivas_format == SBA_ISM_FORMAT && ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL || st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) && st_ivas->ism_mode == ISM_SBA_MODE_DISC )

        if ( st_ivas->ivas_format == SBA_ISM_FORMAT &&

#ifdef NONBE_FIX_935_SBA_REVERB

             st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL &&

#else

             ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL || st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) &&

#endif

             st_ivas->ism_mode == ISM_SBA_MODE_DISC )

        {

            /* get correct granularity in case of binaural rendering of the discrete objects with the td obj renderer */

            granularity = (int16_t) ( st_ivas->hDecoderConfig->output_Fs / ( FRAMES_PER_SEC * MAX_PARAM_SPATIAL_SUBFRAMES ) );