Commit aa2bb221 authored by Jonas Svedberg's avatar Jonas Svedberg
Browse files

merged with main

parents 700db0e7 998c3935

.gitlab-ci.yml

+58 −8
Original line number Diff line number Diff line
@@ -49,6 +49,13 @@ stages: 
    echo "Commit time was $CI_COMMIT_TIMESTAMP"

    date | xargs echo "System time is"



.print-common-info-windows: &print-common-info-windows

  - |

    echo "Printing common information for build job."

    echo "Current job is run on commit $CI_COMMIT_SHA"

    echo "Commit time was $CI_COMMIT_TIMESTAMP"

    ("echo 'System time is'", "Get-Date -Format 'dddd dd/MM/yyyy HH:mm K'") | Invoke-Expression



.get-previous-merge-commit-sha: &get-previous-merge-commit-sha

  - previous_merge_commit=$(git --no-pager log --merges HEAD~1 -n 1 --pretty=format:%H)
@@ -156,6 +163,11 @@ stages: 
  tags:

    - ivas-linux



.build-job-windows:

  stage: build

  timeout: "4 minutes"

  tags:

    - ivas-windows



# template for test jobs on linux that need the TESTV_DIR

.test-job-linux-needs-testv-dir:
@@ -172,6 +184,12 @@ stages: 
    exit_codes:

      - 123



.build-job-windows-with-check-for-warnings:

  extends: .build-job-windows

  stage: build

  allow_failure:

    exit_codes:

      - 123





# ---------------------------------------------------------------
@@ -262,6 +280,31 @@ build-codec-sanitizers-linux: 
    - *print-common-info

    - bash ci/build_codec_sanitizers_linux.sh



build-codec-windows-cmake:

  extends:

    - .build-job-windows-with-check-for-warnings

    - .rules-basis

  script:

    - *print-common-info-windows

    - $winoutdata = $null

    - cmake -G "Visual Studio 15 2017" . -Bbuild

    - cmake --build build -j | tee -variable winoutdata

    - $winoutdata | Out-File $BUILD_OUTPUT -Encoding Utf8

    - ("& python ci/check_for_warnings.py '$BUILD_OUTPUT'") | Invoke-Expression

    - ("exit $LASTEXITCODE") | Invoke-Expression



build-codec-windows-msbuild:

  extends:

    - .build-job-windows-with-check-for-warnings

    - .rules-basis

  script:

    - *print-common-info-windows

    - $winoutdata = $null

    - MSBuild.exe .\Workspace_msvc\Workspace_msvc.sln /property:Configuration=Debug | tee -variable winoutdata

    - $winoutdata | Out-File $BUILD_OUTPUT -Encoding Utf8

    - ("& python ci/check_for_warnings.py '$BUILD_OUTPUT'") | Invoke-Expression

    - ("exit $LASTEXITCODE") | Invoke-Expression



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

# Test jobs for merge requests

# ---------------------------------------------------------------
@@ -740,13 +783,13 @@ codec-comparison-on-main-push: 
.sanitizer-test-schedule-A:

  extends:

    - .sanitizer-test-template

  timeout: 2 hours 30 minutes





sanitizer-test-mono:

  extends: .sanitizer-test-schedule-A

  rules:

    - if: $SANITIZER_SCHEDULE_A

  timeout: 2 hour

  script:

    - *update-ltv-repo

    - python3 ci/run_scheduled_sanitizer_test.py mono mono --tests $SANITIZER_TESTS
@@ -756,7 +799,8 @@ sanitizer-test-stereo: 
  rules:

    - if: $SANITIZER_SCHEDULE_A

      when: delayed

      start_in: 2 hours 30 minutes

      start_in: 2 hour

  timeout: 2 hour

  script:

    - *update-ltv-repo

    - python3 ci/run_scheduled_sanitizer_test.py stereo $OUT_FORMATS_CHANNEL_BASED --tests $SANITIZER_TESTS
@@ -766,7 +810,8 @@ sanitizer-test-stereodmxevs: 
  rules:

    - if: $SANITIZER_SCHEDULE_A

      when: delayed

      start_in: 5 hours

      start_in: 4 hours

  timeout: 2 hour

  script:

    - *update-ltv-repo

    - python3 ci/run_scheduled_sanitizer_test.py StereoDmxEVS mono --tests $SANITIZER_TESTS
@@ -776,7 +821,8 @@ sanitizer-test-ism1: 
  rules:

    - if: $SANITIZER_SCHEDULE_A

      when: delayed

      start_in: 7 hours 30 minutes

      start_in: 6 hours

  timeout: 2 hours

  script:

    - *update-ltv-repo

    - python3 ci/run_scheduled_sanitizer_test.py ISM1 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS
@@ -786,7 +832,8 @@ sanitizer-test-ism2: 
  rules:

    - if: $SANITIZER_SCHEDULE_A

      when: delayed

      start_in: 10 hours

      start_in: 8 hours

  timeout: 3 hours

  script:

    - *update-ltv-repo

    - python3 ci/run_scheduled_sanitizer_test.py ISM2 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS
@@ -796,7 +843,8 @@ sanitizer-test-ism3: 
  rules:

    - if: $SANITIZER_SCHEDULE_A

      when: delayed

      start_in: 12 hours 30 minutes

      start_in: 11 hours

  timeout: 3 hour

  script:

    - *update-ltv-repo

    - python3 ci/run_scheduled_sanitizer_test.py ISM3 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS
@@ -806,7 +854,8 @@ sanitizer-test-ism4: 
  rules:

    - if: $SANITIZER_SCHEDULE_A

      when: delayed

      start_in: 15 hours

      start_in: 14 hours

  timeout: 4 hours

  script:

    - *update-ltv-repo

    - python3 ci/run_scheduled_sanitizer_test.py ISM4 $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS
@@ -816,7 +865,8 @@ sanitizer-test-masa: 
  rules:

    - if: $SANITIZER_SCHEDULE_A

      when: delayed

      start_in: 17 hours 30 minutes

      start_in: 18 hours

  timeout: 3 hours

  script:

    - *update-ltv-repo

    - python3 ci/run_scheduled_sanitizer_test.py MASA $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS

Workspace_msvc/lib_com.vcxproj

+1 −1
Original line number Diff line number Diff line
@@ -244,9 +244,9 @@ 
    <ClCompile Include="..\lib_com\ivas_entropy_coder_common.c" />

    <ClCompile Include="..\lib_com\ivas_fb_mixer.c" />

    <ClCompile Include="..\lib_com\ivas_filters.c" />

    <ClCompile Include="..\lib_com\ivas_ism_com.c" />

    <ClCompile Include="..\lib_com\ivas_mcmasa_com.c" />

    <ClCompile Include="..\lib_com\ivas_dirac_com.c" />

    <ClCompile Include="..\lib_com\ivas_ism_config.c" />

    <ClCompile Include="..\lib_com\ivas_masa_com.c" />

    <ClCompile Include="..\lib_com\ivas_mct_com.c" />

    <ClCompile Include="..\lib_com\ivas_mc_com.c" />

Workspace_msvc/lib_com.vcxproj.filters

+3 −3
Original line number Diff line number Diff line
@@ -379,9 +379,6 @@ 
    <ClCompile Include="..\lib_com\swb_bwe_com_lr.c">

      <Filter>common_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_ism_config.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_qmetadata_com.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>
@@ -466,6 +463,9 @@ 
    <ClCompile Include="..\lib_com\ivas_td_decorr.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_ism_com.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

  </ItemGroup>

  <ItemGroup>

    <ClInclude Include="..\lib_com\basop_proto_func.h">

apps/decoder.c

+59 −185

File changed.

Preview size limit exceeded, changes collapsed.

apps/encoder.c

+1 −16
Original line number Diff line number Diff line
@@ -126,9 +126,7 @@ typedef struct 
#endif

#endif

    bool pca;

#ifdef TD5

    bool ism_extended_metadata;

#endif



} EncArguments;
@@ -381,11 +379,7 @@ int main( 
            }

            break;

        case IVAS_ENC_INPUT_ISM:

#ifdef TD5

            if ( ( error = IVAS_ENC_ConfigureForObjects( hIvasEnc, arg.inputFs, totalBitrate, arg.max_bwidth_user, bandwidth, arg.dtxConfig, arg.inputFormatConfig.ism.numObjects, arg.ism_extended_metadata ) ) != IVAS_ERR_OK )

#else

            if ( ( error = IVAS_ENC_ConfigureForObjects( hIvasEnc, arg.inputFs, totalBitrate, arg.max_bwidth_user, bandwidth, arg.dtxConfig, arg.inputFormatConfig.ism.numObjects ) ) != IVAS_ERR_OK )

#endif

            {

                fprintf( stderr, "\nIVAS_ENC_ConfigureForObjects failed: %s\n\n", IVAS_ENC_GetErrorMessage( error ) );

                goto cleanup;
@@ -706,7 +700,7 @@ int main( 
        }

#endif



        /* Read ISm input metadata */

        /* Read ISM input metadata */

        for ( i = 0; i < numIsmInputs; ++i )

        {

            if ( ismReaders[i] == NULL )
@@ -883,9 +877,7 @@ static void initArgStruct( EncArguments *arg ) 
    arg->caConfig = IVAS_ENC_GetDefaultChannelAwareConfig();

    arg->ca_config_file = NULL;

    arg->mimeOutput = false;

#ifdef TD5

    arg->ism_extended_metadata = false;

#endif



#ifdef DEBUGGING

    arg->forcedMode = IVAS_ENC_FORCE_UNFORCED;
@@ -1273,13 +1265,11 @@ static bool parseCmdlIVAS_enc( 


            if ( i < argc - 4 )

            {

#ifdef TD5

                if ( argv[i][0] == '+' )

                {

                    argv[i]++;

                    arg->ism_extended_metadata = true;

                }

#endif

                if ( !is_digits_only( argv[i] ) )

                {

                    fprintf( stderr, "Error: Number of ISM channels must be an integer number!\n\n" );
@@ -1660,14 +1650,9 @@ static void usage_enc( void ) 
    fprintf( stdout, "EVS mono is default, for IVAS choose one of the following: -stereo, -ism, -sba, -masa, -mc\n" );

    fprintf( stdout, "-stereo [Mode]      : Stereo format, default is unified stereo \n" );

    fprintf( stdout, "                      optional for Mode: 1: DFT Stereo, 2: TD Stereo, 3: MDCT Stereo\n" );

#ifdef TD5

    fprintf( stdout, "-ism (+)Ch Files    : ISM format \n" );

    fprintf( stdout, "                      where Ch specifies the number of ISMs (1-4)\n" );

    fprintf( stdout, "                      where positive (+) means extended metadata format is used (including orientation and radius) \n" );

#else

    fprintf( stdout, "-ism Channels Files : ISM format \n" );

    fprintf( stdout, "                      where Channels specifies the number of ISMs (1-4)\n" );

#endif

    fprintf( stdout, "                      and Files specify input files containing metadata, one file per object\n" );

    fprintf( stdout, "                      (use NULL for no input metadata)\n" );

    fprintf( stdout, "-sba +/-Order       : Scene Based Audio input format (Ambisonics ACN/SN3D),\n" );