Commit b6cda5a3 authored by norvell's avatar norvell
Browse files

Merge with main-pc

parents de86dcf1 779a6164

.gitlab-ci.yml

+123 −51

File changed.

Preview size limit exceeded, changes collapsed.

CMakeLists.txt

+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
#        cmake --build . --config Release





cmake_minimum_required(VERSION 3.1)

cmake_minimum_required(VERSION 3.10)



set(CMAKE_C_STANDARD 99)
@@ -121,7 +121,7 @@ if(WMOPS) 
  add_definitions("-DWMOPS=1")

endif()



project(stereo-evs)

project(stereo-evs LANGUAGES C)

set_property(GLOBAL PROPERTY USE_FOLDERS ON) # make Visual Studio projects look nicer

include(CTest)

apps/decoder.c

+17 −1
Original line number Diff line number Diff line
@@ -1289,7 +1289,23 @@ static bool parseCmdlIVAS_dec( 
     * Mandatory input arguments

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



    if ( i < argc - 3 )

    if ( i < argc - 4 )

    {

        for ( i = 1; i < argc; i++ )

        {

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

            {

                fprintf( stderr, "Error: Wrong order of command-line arguments (optional arguments are first)\n\n" );

                usage_dec();

                return false;

            }

        }



        fprintf( stderr, "Error: Too many mandatory command-line arguments\n\n" );

        usage_dec();

        return false;

    }

    else if ( i < argc - 3 )

    {

        arg->outputConfig = cmdline2config( argv[i] );

        if ( arg->outputConfig == IVAS_AUDIO_CONFIG_LS_CUSTOM )

apps/renderer.c

+0 −8
Original line number Diff line number Diff line
@@ -323,11 +323,7 @@ static const CmdLnParser_Option cliOptions[] = { 
      .description = "LFE panning matrix. File (CSV table) containing a matrix of dimensions [ num_input_lfe x num_output_channels ] with elements specifying linear routing gain (like --gain, -g). \nIf specified, overrides the output LFE position option and the default behavior which attempts to map input to output LFE channel(s)" },

    {

        .id = CmdLnOptionId_noDelayCmp,

#ifdef FIX_929_RENDERER_CMDL

        .match = "no_delay_compensation",

#else

        .match = "no_delay_comparison",

#endif

        .matchShort = "no_delay_cmp",

        .description = "[flag] Turn off delay compensation",

    },
@@ -841,10 +837,8 @@ int main( 
        lfeRoutingConfigs[i] = NULL;

    }



#ifdef FIX_DISCLAIMER

    IVAS_REND_PrintDisclaimer();



#endif

    CmdlnArgs args = parseCmdlnArgs( argc, argv );



    if ( args.nonDiegeticPan && !( ( args.inConfig.numAudioObjects == 0 && args.inConfig.multiChannelBuses[0].audioConfig == IVAS_AUDIO_CONFIG_MONO ) ||
@@ -1013,7 +1007,6 @@ int main( 
        exit( -1 );

    }



#ifdef FIX_DISCLAIMER

    fprintf( stdout, "Input audio file:       %s\n", args.inputFilePath );

    fprintf( stdout, "Output audio file:      %s\n\n", args.outputFilePath );
@@ -1056,7 +1049,6 @@ int main( 
        exit( -1 );

    }



#endif

    /* === Configure === */

    if ( ( error = IVAS_REND_InitConfig( hIvasRend, args.outConfig.audioConfig ) ) != IVAS_ERR_OK )

    {

lib_com/basop32.c

+0 −4
Original line number Diff line number Diff line
@@ -2563,10 +2563,8 @@ Word16 shr_ro( Word16 var1, Word16 var2, Flag *Overflow ) 
    {

        var_out = shr_o( var1, var2, Overflow );



#ifdef FIX_1049_SHR_RO_COMPLEXITY

#ifdef WMOPS

        multiCounter[currCounter].shr--;

#endif

#endif

        if ( var2 > 0 )

        {
@@ -2577,13 +2575,11 @@ Word16 shr_ro( Word16 var1, Word16 var2, Flag *Overflow ) 
        }

    }



#ifdef FIX_1049_SHR_RO_COMPLEXITY

#ifdef WMOPS

    multiCounter[currCounter].shr_r++;

#endif



    BASOP_CHECK();

#endif



    return ( var_out );

}