Commit b4fde8bc authored by vaclav's avatar vaclav
Browse files

port FIX_956_DECODER_COMMAND_LINE_FIX

parent f9a567b8

apps/decoder.c

+20 −0
Original line number Diff line number Diff line
@@ -1289,7 +1289,27 @@ static bool parseCmdlIVAS_dec( 
     * Mandatory input arguments

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



#ifdef FIX_956_DECODER_COMMAND_LINE_FIX

    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 )

#else

    if ( i < argc - 3 )

#endif

    {

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

        if ( arg->outputConfig == IVAS_AUDIO_CONFIG_LS_CUSTOM )

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -182,6 +182,8 @@ 
#define ISAR_BITSTREAM_UPDATE_LC3PLUS                   /* FhG: Multiple improvements to the ISAR bitstream when LC3plus is used. See MR 1456 for details. */

#endif



#define FIX_956_DECODER_COMMAND_LINE_FIX                /* VA: Output correct error message when the decoder command-line has too many mandatory arguments. */



/* #################### End BASOP porting switches ############################ */



#endif