Commit c199eb02 authored by vaclav's avatar vaclav
Browse files

Merge branch '1217-object-edit-file-interface-and-test-cases' of... 

Merge branch '1217-object-edit-file-interface-and-test-cases' of https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec into 1217-object-edit-file-interface-and-test-cases
parents 035bb7e3 4e298ec0

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

scripts/config/self_test.prm

+2 −2
Original line number Diff line number Diff line
@@ -1949,9 +1949,9 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_10pct.g 
../IVAS_dec -render_config testv/rend_config_hospital_patientroom.cfg BINAURAL_ROOM_REVERB 48 bit testv/stvOSBA_4ISM_3OA48c.wav_BINAURAL_ROOM_REVERB_512000_48-48_custom_configuration.tst



// TODO: OBJECT EDITING TESTS: finalize and replicate to LTV

// OMASA 2Dir2TC 4ISM at 80 kbps, 48kHz in, 48kHz out, BINAURAL out, object editing, 1SEP-PARAM

// OMASA 2Dir2TC 4ISM at 80 kbps, 48kHz in, 48kHz out, BINAURAL out, default object editing, 1SEP-PARAM

// ../IVAS_cod -ism_masa 4 2 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv testv/stv2MASA2TC48c.met 80000 48 testv/stvOMASA_4ISM_2MASA2TC48c.wav bit

// ../IVAS_dec -obj_edit_file ../scripts/object_edit/combined_edit.txt BINAURAL 48 bit testv/stvOMASA_4ISM_2MASA2TC48c.wav_BINAURAL_80000_48-48_OE.tst

// ../IVAS_dec -obj_edit_file NULL BINAURAL 48 bit testv/stvOMASA_4ISM_2MASA2TC48c.wav_BINAURAL_80000_48-48_OE.tst



// OMASA 2Dir2TC 4ISM at 256 kbps, 48kHz in, 48kHz out, BINAURAL out, object editing, JBM Prof 5, DISC

// ../IVAS_cod -ism_masa 4 2 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv testv/stvISM4.csv testv/stv2MASA2TC48c.met 256000 48 testv/stvOMASA_4ISM_2MASA2TC48c.wav bit

scripts/object_edit/azi_obj_0.txt

0 → 100644
+15000 −0

File added.

Preview size limit exceeded, changes collapsed.

scripts/object_edit/bg_gain.txt

0 → 100644
+15000 −0

File added.

Preview size limit exceeded, changes collapsed.