Commit 8087c2e8 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge branch 'va/omasa_updt' into 'nokia/contribution-omasa-combined-format' 

va_omasa_updt

See merge request !745
parents e380832a cc07d42d

.gitignore

+0 −8
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 
IVAS_cod

IVAS_dec

IVAS_rend

IVAS_crend_unit_test

obj/

*.a

*.o
@@ -17,7 +16,6 @@ build*/**/* 
IVAS_cod.exe

IVAS_dec.exe

IVAS_rend.exe

IVAS_crend_unit_test.exe

*.user

.vs/

Debug_*/
@@ -25,12 +23,6 @@ Release_*/ 
*.obj

*.pdb



# Unittests

scripts/ivas_pytests/tests/unit_tests/crend/IVAS_crend_unit_test

scripts/ivas_pytests/tests/unit_tests/crend/IVAS_crend_unit_test.exe

scripts/ivas_pytests/tests/unit_tests/crend/Debug_*/

scripts/ivas_pytests/tests/unit_tests/crend/Release_*/



# Standalone TD object renderer

scripts/td_object_renderer/object_renderer_standalone/renderer_standalone

scripts/td_object_renderer/object_renderer_standalone/renderer_standalone.exe

.gitlab-ci.yml

+29 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ variables: 
  SANITIZER_TESTS: "CLANG1 CLANG2"

  OUT_FORMATS_CHANNEL_BASED: "stereo mono 5_1 5_1_2 5_1_4 7_1 7_1_4"

  OUT_FORMATS_SCENE_BASED: "FOA HOA2 HOA3"

  OUT_FORMATS_BINAURAL: "BINAURAL BINAURAL_ROOM"

  OUT_FORMATS_BINAURAL: "BINAURAL BINAURAL_ROOM_IR BINAURAL_ROOM_REVERB"

  EXIT_CODE_NON_BE: 123

  EXIT_CODE_FAIL: 1
@@ -266,6 +266,7 @@ build-codec-instrumented-linux: 
  extends:

    - .build-job-linux

    - .rules-basis

  timeout: "6 minutes"

  script:

    - *print-common-info

    - bash ci/build_codec_instrumented_linux.sh
@@ -658,12 +659,38 @@ clang-format-check: 
    name: "$ARTIFACT_BASE_NAME"

    expose_as: 'formatting patch'



# check for crashes if first received frame on decoder side is an SID

.check-first-frame-is-sid:

  extends:

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

    - .rules-merge-request

  tags:

    - ivas-linux

  stage: test

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

  script:

    - *print-common-info

    - *update-ltv-repo

    - cmake .

    - make -j



    # TODO: for some MASA modes, we currently do not have testvectors that actually trigger DTX

    - modes=$(scripts/runIvasCodec.py -l | grep dtx | grep -v MASA)

    - echo $modes

    - scripts/runIvasCodec.py -p scripts/config/ci_linux_sidstart_test.json -m $modes -s --bs_length 500

  artifacts:

    paths:

      - out/logs

    when: on_failure

    name: "$CI_JOB_NAME--$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--sidstart"

    expose_as: "logs-sidstart"



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

# Test jobs for main branch

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



# check bitexactness to EVS windows binaries

be-2-evs-windows:

.be-2-evs-windows: # Temporarily disabled -- Ericsson Windows runner used for HL activities which the reduces capacity for this job. To be resumed after selection

  extends:

    - .rules-main-push

  tags:

Workspace_msvc/lib_rend.vcxproj

+4 −0
Original line number Diff line number Diff line
@@ -202,14 +202,18 @@ 
    <ClCompile Include="..\lib_rend\ivas_sba_rendering.c" />

    <ClCompile Include="..\lib_rend\ivas_allrad_dec.c" />

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

    <ClCompile Include="..\lib_rend\ivas_dirac_ana.c" />

    <ClCompile Include="..\lib_rend\ivas_efap.c" />

    <ClCompile Include="..\lib_rend\ivas_limiter.c" />

    <ClCompile Include="..\lib_rend\ivas_masa_merge.c" />

    <ClCompile Include="..\lib_rend\ivas_mcmasa_ana.c" />

    <ClCompile Include="..\lib_rend\ivas_objectRenderer.c" />

    <ClCompile Include="..\lib_rend\ivas_objectRenderer_hrFilt.c" />

    <ClCompile Include="..\lib_rend\ivas_objectRenderer_mix.c" />

    <ClCompile Include="..\lib_rend\ivas_objectRenderer_sfx.c" />

    <ClCompile Include="..\lib_rend\ivas_objectRenderer_sources.c" />

    <ClCompile Include="..\lib_rend\ivas_objectRenderer_vec.c" />

    <ClCompile Include="..\lib_rend\ivas_omasa_ana.c" />

    <ClCompile Include="..\lib_rend\ivas_orient_trk.c" />

    <ClCompile Include="..\lib_rend\ivas_output_init.c" />

    <ClCompile Include="..\lib_rend\ivas_render_config.c" />

Workspace_msvc/lib_util.vcxproj

+2 −0
Original line number Diff line number Diff line
@@ -157,6 +157,7 @@ 
    <ClCompile Include="..\lib_util\masa_file_writer.c" />

    <ClCompile Include="..\lib_util\mime_io.c" />

    <ClCompile Include="..\lib_util\render_config_reader.c" />

    <ClCompile Include="..\lib_util\rotation_file_reader.c" />

    <ClCompile Include="..\lib_util\rtpdump.c" />

    <ClCompile Include="..\lib_util\tsm_scale_file_reader.c" />

  </ItemGroup>
@@ -181,6 +182,7 @@ 
    <ClInclude Include="..\lib_util\masa_file_reader.h" />

    <ClInclude Include="..\lib_util\masa_file_writer.h" />

    <ClInclude Include="..\lib_util\render_config_reader.h" />

    <ClInclude Include="..\lib_util\rotation_file_reader.h" />

    <ClInclude Include="..\lib_util\rtpdump.h" />

    <ClInclude Include="..\lib_util\tinywavein_c.h" />

    <ClInclude Include="..\lib_util\tinywaveout_c.h" />

apps/decoder.c

+168 −126

File changed.

Preview size limit exceeded, changes collapsed.