Commit e5ab4419 authored by vaclav's avatar vaclav
Browse files

Merge remote-tracking branch... 

Merge remote-tracking branch 'remotes/origin/133-bitrate-switching-in-core-coder' into 114-bitrate-switching-in-sba

# Conflicts:
#	lib_dec/ivas_sba_dec.c
#	lib_enc/ivas_sba_enc.c
parents 701eb9cb c664f705

.gitlab-ci.yml

+13 −40
Original line number Diff line number Diff line
@@ -492,6 +492,11 @@ codec-comparison-on-main-push: 
  stage: test

  tags:

    - sanitizer_test_main

  artifacts:

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

    when: always

    paths:

      - ep_015.g192



sanitizer-test-mono:

  extends: .sanitizer-test-template
@@ -555,11 +560,7 @@ sanitizer-test-ism4: 
    - python3 ci/run_scheduled_sanitizer_test.py ISM4 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS



sanitizer-test-mc-5_1:

  extends:

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

  stage: test

  tags:

    - sanitizer_test_main

  extends: .sanitizer-test-template

  rules:

    - if: $IS_SANITIZER_TEST_RUN

      when: delayed
@@ -568,11 +569,7 @@ sanitizer-test-mc-5_1: 
    - python3 ci/run_scheduled_sanitizer_test.py 5_1 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS



sanitizer-test-mc-5_1_2:

  extends:

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

  stage: test

  tags:

    - sanitizer_test_main

  extends: .sanitizer-test-template

  rules:

    - if: $IS_SANITIZER_TEST_RUN

      when: delayed
@@ -581,11 +578,7 @@ sanitizer-test-mc-5_1_2: 
    - python3 ci/run_scheduled_sanitizer_test.py 5_1_2 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS



sanitizer-test-mc-5_1_4:

  extends:

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

  stage: test

  tags:

    - sanitizer_test_main

  extends: .sanitizer-test-template

  rules:

    - if: $IS_SANITIZER_TEST_RUN

      when: delayed
@@ -594,11 +587,7 @@ sanitizer-test-mc-5_1_4: 
    - python3 ci/run_scheduled_sanitizer_test.py 5_1_4 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS



sanitizer-test-mc-7_1:

  extends:

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

  stage: test

  tags:

    - sanitizer_test_main

  extends: .sanitizer-test-template

  rules:

    - if: $IS_SANITIZER_TEST_RUN

      when: delayed
@@ -607,11 +596,7 @@ sanitizer-test-mc-7_1: 
    - python3 ci/run_scheduled_sanitizer_test.py 7_1 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS



sanitizer-test-mc-7_1_4:

  extends:

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

  stage: test

  tags:

    - sanitizer_test_main

  extends: .sanitizer-test-template

  rules:

    - if: $IS_SANITIZER_TEST_RUN

      when: delayed
@@ -620,11 +605,7 @@ sanitizer-test-mc-7_1_4: 
    - python3 ci/run_scheduled_sanitizer_test.py 7_1_4 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS



sanitizer-test-masa:

  extends:

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

  stage: test

  tags:

    - sanitizer_test_main

  extends: .sanitizer-test-template

  rules:

    - if: $IS_SANITIZER_TEST_RUN

      when: delayed
@@ -633,11 +614,7 @@ sanitizer-test-masa: 
    - python3 ci/run_scheduled_sanitizer_test.py MASA $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS



sanitizer-test-sba:

  extends:

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

  stage: test

  tags:

    - sanitizer_test_main

  extends: .sanitizer-test-template

  rules:

    - if: $IS_SANITIZER_TEST_RUN

      when: delayed
@@ -646,11 +623,7 @@ sanitizer-test-sba: 
    - python3 ci/run_scheduled_sanitizer_test.py SBA $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL --tests $SANITIZER_TESTS



sanitizer-test-planarsba:

  extends:

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

  stage: test

  tags:

    - sanitizer_test_main

  extends: .sanitizer-test-template

  rules:

    - if: $IS_SANITIZER_TEST_RUN

      when: delayed

Workspace_msvc/lib_dec.vcxproj

+1 −0
Original line number Diff line number Diff line
@@ -267,6 +267,7 @@ 
    <ClCompile Include="..\lib_dec\ivas_allrad_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_binauralRenderer.c" />

    <ClCompile Include="..\lib_dec\ivas_binaural_reverb.c" />

    <ClCompile Include="..\lib_dec\ivas_corecoder_dec_reconfig.c" />

    <ClCompile Include="..\lib_dec\ivas_core_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_cpe_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_crend.c" />

Workspace_msvc/lib_dec.vcxproj.filters

+3 −0
Original line number Diff line number Diff line
@@ -581,6 +581,9 @@ 
    <ClCompile Include="..\lib_dec\ivas_spar_md_dec.c">

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\ivas_corecoder_dec_reconfig.c">

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

  </ItemGroup>

  <ItemGroup>

    <ClInclude Include="..\lib_dec\jbm_jb4_inputbuffer.h">

Workspace_msvc/lib_enc.vcxproj

+1 −0
Original line number Diff line number Diff line
@@ -206,6 +206,7 @@ 
  </ItemDefinitionGroup>

  <ItemGroup>

    <ClCompile Include="..\lib_enc\ivas_agc_enc.c" />

    <ClCompile Include="..\lib_enc\ivas_corecoder_enc_reconfig.c" />

    <ClCompile Include="..\lib_enc\ivas_core_pre_proc.c" />

    <ClCompile Include="..\lib_enc\ivas_core_pre_proc_front.c" />

    <ClCompile Include="..\lib_enc\ivas_enc_cov_handler.c" />

Workspace_msvc/lib_enc.vcxproj.filters

+3 −0
Original line number Diff line number Diff line
@@ -581,6 +581,9 @@ 
    <ClCompile Include="..\lib_enc\ivas_spar_md_enc.c">

      <Filter>enc_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\ivas_corecoder_enc_reconfig.c">

      <Filter>enc_ivas_c</Filter>

    </ClCompile>

  </ItemGroup>

  <ItemGroup>

    <ClInclude Include="..\lib_enc\ivas_stat_enc.h">