Commit 0da1c444 authored by Jouni Paulus's avatar Jouni Paulus
Browse files

simplify object edit file interface command line argument now that the... 

simplify object edit file interface command line argument now that the non-file operation has been merged into it
parent d1ad7c6a

apps/decoder.c

+3 −10
Original line number Diff line number Diff line
@@ -1508,16 +1508,11 @@ static bool parseCmdlIVAS_dec( 


            i += tmp;

        }

#ifndef OBJECT_EDIT_FILE_INTERFACE

        else if ( strcmp( argv_to_upper, "-OBJ_EDIT" ) == 0 )

        {

            arg->objEditEnabled = true;

            i++;

        }

#else

        else if ( strcmp( argv_to_upper, "-OBJ_EDIT_FILE" ) == 0 )

        {

            i++;

#ifdef OBJECT_EDIT_FILE_INTERFACE

            if ( argc - i <= 3 || argv[i][0] == '-' )

            {

                fprintf( stderr, "Error: Object editing instruction filename not specified!\n\n" );
@@ -1533,11 +1528,9 @@ static bool parseCmdlIVAS_dec( 
            {

                arg->objEditFileName = argv[i]; /* read edit instructions from this file */

            }



            arg->objEditEnabled = true;

            i++;

        }

#endif

        }



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

         * Option not recognized
@@ -1742,7 +1735,7 @@ static void usage_dec( void ) 
#ifndef OBJECT_EDIT_FILE_INTERFACE

    fprintf( stdout, "-obj_edit           : Enable objects editing\n" );

#else

    fprintf( stdout, "-obj_edit_file File : Object editing instructions file or NULL for built-in example\n" );

    fprintf( stdout, "-obj_edit File      : Object editing instructions file or NULL for built-in example\n" );

#endif

    fprintf( stdout, "-level level        : Complexity level, level = (1, 2, 3), will be defined after characterisation. \n" );

    fprintf( stdout, "                      Currently, all values default to level 3 (full functionality).\n" );

readme.txt

+1 −1
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ Options: 
-aeid ID | File     : Acoustic environment ID (number > 0) or

                      alternatively, it can be a text file where each line contains "ID duration"

                      for BINAURAL_ROOM_REVERB output configuration.

-obj_edit_file File : Object editing instructions file or NULL for built-in example

-obj_edit File      : Object editing instructions file or NULL for built-in example

-level level        : Complexity level, level = (1, 2, 3), will be defined after characterisation.

-om File            : Coded metadata File for BINAURAL_SPLIT_PCM OutputConf

                      Currently, all values default to level 3 (full functionality).