Commit 9ec438bd authored by Jouni Paulus's avatar Jouni Paulus
Browse files

simplify decoder object editing arguments into one, and when the provided... 

simplify decoder object editing arguments into one, and when the provided filename is NULL, use the built-in editing
parent 9d9c11fb

apps/decoder.c

+14 −4
Original line number Diff line number Diff line
@@ -1505,12 +1505,13 @@ static bool parseCmdlIVAS_dec( 


            i += tmp;

        }

#ifndef OBJECT_EDIT_FILE_INTERFACE

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

        {

            arg->objEditEnabled = true;

            i++;

        }

#ifdef OBJECT_EDIT_FILE_INTERFACE

#else

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

        {

            i++;
@@ -1521,7 +1522,15 @@ static bool parseCmdlIVAS_dec( 
                return false;

            }



            arg->objEditFileName = argv[i];

            if ( strcmp( argv[i], "NULL" ) == 0 || strcmp( argv[i], "null" ) == 0 )

            {

                arg->objEditFileName = NULL;  /* use the built-in editing function */

            }

            else

            {

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

            }



            arg->objEditEnabled = true;

            i++;

        }
@@ -1727,9 +1736,10 @@ static void usage_dec( void ) 
    fprintf( stdout, "-aeid ID | File     : Acoustic environment ID (number > 0)\n" );

    fprintf( stdout, "                      alternatively, it can be a text file where each line contains \"ID duration\"\n" );

    fprintf( stdout, "                      for BINAURAL_ROOM_REVERB output configuration.\n" );

#ifndef OBJECT_EDIT_FILE_INTERFACE

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

#ifdef OBJECT_EDIT_FILE_INTERFACE

    fprintf( stdout, "-obj_edit_file File : Name of file from which object editing instructions are read\n" );

#else

    fprintf( stdout, "-obj_edit_file 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 −2
Original line number Diff line number Diff line
@@ -307,8 +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           : Enable objects editing

-obj_edit_file File : Name of file from which object editing instructions are read

-obj_edit_file 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).