Commit ca0f4cf5 authored by norvell's avatar norvell
Browse files

Cleanup of switches in options.h

parents feae45be 18d69b69

.gitlab-ci.yml

+20 −20
Original line number Diff line number Diff line
@@ -1056,7 +1056,7 @@ branch-is-up-to-date-with-target-pre: 
  stage: prevalidate

  needs: []

  tags:

    - ivas-basop-linux

    - ivas-linux

  script:

    - *get-commits-behind-count

    - echo $commits_behind_count
@@ -1071,7 +1071,7 @@ branch-is-up-to-date-with-target-post: 
    - .rules-merge-request-to-main-pc

  stage: postvalidate

  tags:

    - ivas-basop-linux

    - ivas-linux

  script:

    - *get-commits-behind-count

    - echo $commits_behind_count
@@ -1101,7 +1101,7 @@ check-naming-of-branch-for-main-pc-merges: 
    - .rules-merge-request-to-main-pc

  stage: prevalidate

  tags:

    - ivas-basop-linux

    - ivas-linux

  script:

    - *update-scripts-repo

    - if [[ ! "$CI_MERGE_REQUEST_TITLE" =~ \[skip[[:space:]_-]name[[:space:]_-]check\] ]] && [[ ! "$CI_MERGE_REQUEST_TITLE" =~ \[CI\] ]]; then
@@ -1118,7 +1118,7 @@ branch-is-up-to-date-with-target-pre: 
  stage: prevalidate

  needs: []

  tags:

    - ivas-basop-linux

    - ivas-linux

  script:

    - *get-commits-behind-count

    - |
@@ -1132,7 +1132,7 @@ branch-is-up-to-date-with-target-post: 
    - .rules-merge-request

  stage: postvalidate

  tags:

    - ivas-basop-linux

    - ivas-linux

  script:

    - *get-commits-behind-count

    - |
@@ -1154,7 +1154,7 @@ clang-format-check: 
    ARTIFACT_BASE_NAME: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--formatting-fix"

  stage: prevalidate

  tags:

    - ivas-basop-linux

    - ivas-linux

  needs: []

  timeout: "5 minutes"

  script:
@@ -1237,7 +1237,7 @@ build-codec-linux-make: 
  extends:

    - .build-job-linux

  tags:

    - ivas-basop-linux

    - ivas-linux

  timeout: "10 minutes"

  script:

    - *print-common-info
@@ -1255,7 +1255,7 @@ build-codec-linux-cmake: 
  extends:

    - .build-job-linux

  tags:

    - ivas-basop-linux

    - ivas-linux

  timeout: "10 minutes"

  script:

    - *print-common-info
@@ -1276,7 +1276,7 @@ build-codec-linux-instrumented-make: 
    - .build-job-linux

  timeout: "10 minutes"

  tags:

    - ivas-basop-linux

    - ivas-linux

  script:

    - *print-common-info

    - *update-scripts-repo
@@ -1290,7 +1290,7 @@ build-codec-sanitizers-linux: 
    - .build-job-linux

    - .rules-basis

  tags:

    - ivas-basop-linux

    - ivas-linux

  timeout: "10 minutes"

  script:

    - *update-scripts-repo
@@ -1707,7 +1707,7 @@ ivas-pytest-enc-msan: 
  extends:

    - .test-job-linux

  tags:

    - ivas-basop-linux-fast

    - ivas-linux-fast

  before_script:

    - CLANG_NUM=1

    - DUT_DECODER_PATH=./$REF_DECODER_PATH
@@ -1718,7 +1718,7 @@ ivas-pytest-enc-asan: 
  extends:

    - .test-job-linux

  tags:

    - ivas-basop-linux-fast

    - ivas-linux-fast

  before_script:

    - CLANG_NUM=2

    - DUT_DECODER_PATH=./$REF_DECODER_PATH
@@ -1729,7 +1729,7 @@ ivas-pytest-enc-usan: 
  extends:

    - .test-job-linux

  tags:

    - ivas-basop-linux-fast

    - ivas-linux-fast

  before_script:

    - CLANG_NUM=3

    - DUT_DECODER_PATH=./$REF_DECODER_PATH
@@ -1797,7 +1797,7 @@ ivas-pytest-dec-msan: 
  extends:

    - .test-job-linux

  tags:

    - ivas-basop-linux-fast

    - ivas-linux-fast

  before_script:

    - CLANG_NUM=1

    - DUT_ENCODER_PATH=./$REF_ENCODER_PATH
@@ -1808,7 +1808,7 @@ ivas-pytest-dec-asan: 
  extends:

    - .test-job-linux

  tags:

    - ivas-basop-linux-fast

    - ivas-linux-fast

  before_script:

    - CLANG_NUM=2

    - DUT_ENCODER_PATH=./$REF_ENCODER_PATH
@@ -1819,7 +1819,7 @@ ivas-pytest-dec-usan: 
  extends:

    - .test-job-linux

  tags:

    - ivas-basop-linux-fast

    - ivas-linux-fast

  before_script:

    - CLANG_NUM=3

    - DUT_ENCODER_PATH=./$REF_ENCODER_PATH
@@ -2099,7 +2099,7 @@ voip-be-on-merge-request: 
    - .rules-merge-request-no-draft

  timeout: "20 minutes"

  tags:

    - ivas-basop-linux

    - ivas-linux

  stage: test

  needs: ["build-codec-linux-make"] #, "build-codec-instrumented-linux", "build-codec-sanitizers-linux"]

  script:
@@ -2133,7 +2133,7 @@ renderer-pytest-on-merge-request: 
  # TODO: set reasonable timeout, will most likely take less

  timeout: "20 minutes"

  tags:

    - ivas-basop-linux

    - ivas-linux

  stage: compare

  script:

    - *print-common-info
@@ -2193,7 +2193,7 @@ ivas-pytest-on-merge-request: 
  needs: ["build-codec-linux-make"] #, "codec-smoke-test"]

  timeout: "40 minutes"

  tags:

    - ivas-basop-linux

    - ivas-linux

  script:

    - *print-common-info

    - *get-commits-behind-count
@@ -2686,7 +2686,7 @@ complexity-osba-in-binaural_room_ir-out: 
pages:

  stage: deploy

  tags:

    - ivas-basop-linux

    - ivas-linux

  rules:

    - if: $UPDATE_PAGES

  script:

apps/decoder.c

+18 −175

File changed.

Preview size limit exceeded, changes collapsed.

apps/encoder.c

+0 −4
Original line number Diff line number Diff line
@@ -681,11 +681,7 @@ int main( 
        {

            if ( ( error = JbmFileReader_readCAconfig( jbmReader, &caConfig ) ) != IVAS_ERR_OK )

            {

#ifdef FIX_699_FILE_READER_JBM_TSM

                fprintf( stderr, "\nError (%s) while reading Channel-Aware Config. from: %s\n\n", IVAS_ENC_GetErrorMessage( error ), JbmFileReader_getFilePath( jbmReader ) );

#else

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

#endif

                goto cleanup;

            }

apps/isar_post_rend.c

+7 −44
Original line number Diff line number Diff line
@@ -33,17 +33,6 @@ 
#include "lib_isar_post_rend.h"

//#undef IVAS_FLOAT_FIXED



#ifndef SPLIT_REND_WITH_HEAD_ROT



int main( int argc, char **argv )

{

    (void) argc;

    (void) argv;

    ISAR_POST_REND_void_func();

    return 0;

}



#else



#include <assert.h>

#include <math.h>
@@ -734,13 +723,9 @@ int main( 
    bitsBuffer.config.bufLenInBytes = 0;

    bitsBuffer.config.codec = ISAR_SPLIT_REND_CODEC_DEFAULT;

    bitsBuffer.config.poseCorrection = ISAR_SPLIT_REND_POSE_CORRECTION_MODE_NONE;

#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS

    bitsBuffer.config.codec_frame_size_ms = 5;

    bitsBuffer.config.isar_frame_size_ms = 20;

    bitsBuffer.config.lc3plusHighRes = 0;

#else

    bitsBuffer.config.codec_frame_size_ms = 20;

#endif





    CmdlnArgs args = parseCmdlnArgs( argc, argv );
@@ -764,9 +749,7 @@ int main( 
        SplitRendBFIFileReader_open( args.splitRendBFIFilePath, &splitRendBFIReader );

    }



#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS

    int32_t inFileSampleRate = 0;

#endif

    strncpy( audioFilePath, args.inputFilePath, FILENAME_MAX - 1 );

    hSplitRendFileReadWrite = NULL;

    if ( ( args.inConfig.numBinBuses > 0 ) && ( args.inConfig.binBuses[0].audioConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )
@@ -775,14 +758,10 @@ int main( 
                                        args.inMetadataFilePaths[0],

                                        &bitsBuffer.config.codec,

                                        &bitsBuffer.config.poseCorrection,

                                        &bitsBuffer.config.codec_frame_size_ms

#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS

                                        ,

                                        &bitsBuffer.config.codec_frame_size_ms,

                                        &bitsBuffer.config.isar_frame_size_ms,

                                        &inFileSampleRate,

                                        &bitsBuffer.config.lc3plusHighRes

#endif

        );

                                        &bitsBuffer.config.lc3plusHighRes );

        if ( error != IVAS_ERR_OK )

        {

            fprintf( stderr, "Could not open split rend metadata file %s\n", args.inMetadataFilePaths[0] );
@@ -803,14 +782,10 @@ int main( 
                                        args.inputFilePath,

                                        &bitsBuffer.config.codec,

                                        &bitsBuffer.config.poseCorrection,

                                        &bitsBuffer.config.codec_frame_size_ms

#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS

                                        ,

                                        &bitsBuffer.config.codec_frame_size_ms,

                                        &bitsBuffer.config.isar_frame_size_ms,

                                        &inFileSampleRate,

                                        &bitsBuffer.config.lc3plusHighRes

#endif

        );

                                        &bitsBuffer.config.lc3plusHighRes );

        if ( error != IVAS_ERR_OK )

        {

            fprintf( stderr, "Could not open split rend metadata file %s\n", args.inputFilePath );
@@ -819,17 +794,11 @@ int main( 
        audioReader = NULL;

    }



#ifndef ISAR_BITSTREAM_UPDATE_LC3PLUS

    int32_t inFileSampleRate = 0;

#endif

    if ( audioReader != NULL )

    {

        error = AudioFileReader_getSamplingRate( audioReader, &inFileSampleRate );

    }

    else

#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS

        if ( hSplitRendFileReadWrite == NULL )

#endif

    else if ( hSplitRendFileReadWrite == NULL )

    {

        inFileSampleRate = args.sampleRate;

    }
@@ -891,13 +860,9 @@ int main( 
        if ( ( error = ISAR_REND_SetSplitRendBitstreamHeader( hIsarPostRend,

                                                              bitsBuffer.config.codec,

                                                              bitsBuffer.config.poseCorrection,

                                                              bitsBuffer.config.codec_frame_size_ms

#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS

                                                              ,

                                                              bitsBuffer.config.codec_frame_size_ms,

                                                              bitsBuffer.config.isar_frame_size_ms,

                                                              bitsBuffer.config.lc3plusHighRes

#endif

                                                              ) ) != IVAS_ERR_OK )

                                                              bitsBuffer.config.lc3plusHighRes ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "Error in getting split renderer bitstream header: %s\n", ivas_error_to_string( error ) );

            exit( -1 );
@@ -1258,5 +1223,3 @@ int main( 




#undef WMC_TOOL_SKIP
 


#endif /* SPLIT_REND_WITH_HEAD_ROT */

apps/renderer.c

+12 −189

File changed.

Preview size limit exceeded, changes collapsed.