Commit 005ccc4b authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[pre-merge] fix inconsistencies between branch and main + MSVC warnings

parent d8a429b5

.gitlab-ci.yml

+5 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ variables: 
  EXIT_CODE_NON_BE: 123

  EXIT_CODE_FAIL: 1





# This sets when pipelines are created. Jobs have more specific rules to restrict them.

workflow:

  rules:
@@ -136,6 +137,7 @@ stages: 
  rules:

    - if: $CI_PIPELINE_SOURCE == 'schedule' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH





# templates to define stages and platforms

.test-job-linux:

  tags:
@@ -147,6 +149,7 @@ stages: 
  tags:

    - ivas-linux





# template for test jobs on linux that need the TESTV_DIR

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

  extends: .test-job-linux
@@ -162,6 +165,7 @@ stages: 
    exit_codes:

      - 123





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

# Validation jobs

# ---------------------------------------------------------------
@@ -180,6 +184,7 @@ check-if-branch-is-up-to-date-with-main: 
    - echo $commits_behind_count

    - if [ $commits_behind_count -eq 0 ]; then exit 0; else exit 1; fi;





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

# Build jobs

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

apps/encoder.c

+2 −8
Original line number Diff line number Diff line
@@ -264,18 +264,12 @@ int main( 
    /*------------------------------------------------------------------------------------------*

     * Open input audio file

     *------------------------------------------------------------------------------------------*/

    int32_t inFileSampleRate = 0;

    if ( AudioFileReader_open( &audioReader, arg.inputWavFilename, &inFileSampleRate ) != IVAS_ERR_OK )



    if ( AudioFileReader_open( &audioReader, arg.inputWavFilename, arg.inputFs ) != IVAS_ERR_OK )

    {

        fprintf( stderr, "\nCan't open %s\n\n", arg.inputWavFilename );

        goto cleanup;

    }

    if ( inFileSampleRate != 0 && /* inFileSampleRate will remain zero if input file is raw PCM */

         inFileSampleRate != arg.inputFs )

    {

        fprintf( stderr, "Sampling rate mismatch: %d Hz requested, but %d Hz found in file %s\n", arg.inputFs, inFileSampleRate, arg.inputWavFilename );

        goto cleanup;

    }



    /*------------------------------------------------------------------------------------------*

     * Open output bitstream file

apps/renderer.c

+3 −3
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ typedef struct 
    char executableName[RENDERER_MAX_CLI_ARG_LENGTH];

    char inputFilePath[RENDERER_MAX_CLI_ARG_LENGTH];

    char outputFilePath[RENDERER_MAX_CLI_ARG_LENGTH];

    int32_t sampleRate;

    uint32_t sampleRate;

    InputConfig inConfig;

    OutputConfig outConfig;

    char inMetadataFilePaths[RENDERER_MAX_ISM_INPUTS][RENDERER_MAX_CLI_ARG_LENGTH];
@@ -626,8 +626,8 @@ int main( 
        setupWithSingleFormatInput( args, audioFilePath, positionProvider, masaReaders );

    }



    int32_t inFileSampleRate = 0;

    if ( AudioFileReader_open( &audioReader, audioFilePath, &inFileSampleRate ) != IVAS_ERR_OK )

    uint32_t inFileSampleRate = 0;

    if ( AudioFileReader_open( &audioReader, audioFilePath, inFileSampleRate ) != IVAS_ERR_OK )

    {

        fprintf( stderr, "Error opening file: %s\n", audioFilePath );

        exit( -1 );

lib_com/common_api_types.h

+5 −0
Original line number Diff line number Diff line
@@ -79,7 +79,11 @@ typedef struct _IVAS_ISM_METADATA 
    float gainFactor;

} IVAS_ISM_METADATA;



#ifdef EXT_RENDERER

typedef struct

#else

typedef struct _IVAS_QUATERNION

#endif

{

    float w, x, y, z;
@@ -127,6 +131,7 @@ typedef struct _IVAS_LS_CUSTOM_LAYOUT 
    float elevation[IVAS_MAX_OUTPUT_CHANNELS];

    int16_t num_lfe;

    int16_t lfe_idx[IVAS_MAX_OUTPUT_CHANNELS];



} IVAS_CUSTOM_LS_DATA;



typedef struct ivas_LS_setup_custom *IVAS_LSSETUP_CUSTOM_HANDLE;

lib_com/ivas_cnst.h

+2 −0
Original line number Diff line number Diff line
@@ -193,8 +193,10 @@ typedef enum 


#define IVAS_MAX_SBA_ORDER                      3                           /* Maximum supported Ambisonics order */



#ifdef EXT_RENDERER

#define IVAS_LIMITER_THRESHOLD      32729 /* -0.01 dBFS */

#define IVAS_LIMITER_ATTACK_SECONDS 0.005f

#endif

#define IVAS_NUM_SUPPORTED_FS                   3                           /* number of supported sampling-rates in IVAS */



/*----------------------------------------------------------------------------------*