Commit 68971719 authored by sbsarac's avatar sbsarac
Browse files

Replace comma and colon

parent 704dcc52

apps/decoder.c

+6 −6
Original line number Diff line number Diff line
@@ -1536,7 +1536,7 @@ static bool parseCmdlIVAS_dec( 


                for ( k = 0; s[k]; )

                {

                    s[k] == ',' ? k++ : *s++;

                    s[k] == '_' ? k++ : *s++;

                }

                k++;
@@ -1558,7 +1558,7 @@ static bool parseCmdlIVAS_dec( 
                arg->aeSequence.count = k;



                k = 0;

                token = strtok( argv[i++], ":" );

                token = strtok( argv[i++], "-" );



                while ( token != NULL )

                {
@@ -1570,7 +1570,7 @@ static bool parseCmdlIVAS_dec( 
                    }

                    arg->aeSequence.pID[k] = (uint16_t) atoi( token );



                    token = strtok( NULL, "," );

                    token = strtok( NULL, "_" );

                    if ( !is_number( token ) )

                    {

                        fprintf( stdout, "Error: Invalid token %s found in acoustic environment sequence: %s\n\n", token, argv[i] );
@@ -1579,7 +1579,7 @@ static bool parseCmdlIVAS_dec( 
                    }

                    arg->aeSequence.pValidity[k] = (uint16_t) atoi( token );



                    token = strtok( NULL, ":" );

                    token = strtok( NULL, "-" );

                    k++;

                }
@@ -1853,8 +1853,8 @@ static void usage_dec( void ) 
    fprintf( stdout, "                      otherwise a default directivity pattern is used.\n" );

#ifdef FIX_1053_REVERB_RECONFIGURATION

    fprintf( stdout, "-aeid ID            : Acoustic environment ID (number > 0) or\n" );

    fprintf( stdout, "                      a sequence thereof in the format [ID1:duration1,ID2:duration2...]\n" );

    fprintf( stdout, "                      without braces and spaces, with ':' character separating ID from duration and ',' separating\n" );

    fprintf( stdout, "                      a sequence thereof in the format [ID1-duration1_ID2-duration2...]\n" );

    fprintf( stdout, "                      without braces and spaces, with '-' character separating ID from duration and '_' separating\n" );

    fprintf( stdout, "                      ID and duration pairs, where duration is specified in frames\n" );

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

#else

apps/renderer.c

+5 −5
Original line number Diff line number Diff line
@@ -400,7 +400,7 @@ static const CmdLnParser_Option cliOptions[] = { 
        .match = "acoustic_environment_id",

        .matchShort = "aeid",

#ifdef FIX_1053_REVERB_RECONFIGURATION

        .description = "Acoustic environment ID( number > 0 ) or a sequence thereof in the format [ID1:duration1,ID2:duration2...] without braces and spaces, with ':' character separating ID from duration and ',' separating ID and duration pairs, where duration is specified in frames for BINAURAL_ROOM_REVERB output configuration.",

        .description = "Acoustic environment ID( number > 0 ) or a sequence thereof in the format [ID1-duration1_ID2-duration2...] without braces and spaces, with '-' character separating ID from duration and '_' separating ID and duration pairs, where duration is specified in frames for BINAURAL_ROOM_REVERB output configuration.",

#else

        .description = "Acoustic environment ID (number >= 0) for BINAURAL_ROOM_REVERB output configuration",

#endif
@@ -2532,7 +2532,7 @@ static bool parseAcousticEnvironmentIds( 


        for ( k = 0; s[k]; )

        {

            s[k] == ',' ? k++ : *s++;

            s[k] == '_' ? k++ : *s++;

        }

        k++;
@@ -2553,7 +2553,7 @@ static bool parseAcousticEnvironmentIds( 


        k = 0;



        token = strtok( config_string, ":" );

        token = strtok( config_string, "-" );



        while ( token != NULL )

        {
@@ -2564,7 +2564,7 @@ static bool parseAcousticEnvironmentIds( 
            }

            aeSequence->pID[k] = (uint16_t) atoi( token );



            token = strtok( NULL, "," );

            token = strtok( NULL, "_" );

            if ( !is_number( token ) )

            {

                fprintf( stdout, "Error: Invalid token %s found in acoustic environment sequence: %s\n\n", token, config_string );
@@ -2572,7 +2572,7 @@ static bool parseAcousticEnvironmentIds( 
            }

            aeSequence->pValidity[k] = (uint16_t) atoi( token );



            token = strtok( NULL, ":" );

            token = strtok( NULL, "-" );

            k++;

        }

readme.txt

+7 −3
Original line number Diff line number Diff line
@@ -282,7 +282,11 @@ Options: 
-exof File          : External orientation trajectory File for simulation of external orientations

-dpid ID            : Directivity pattern ID(s) (space-separated list of up to 4 numbers can be 

                      specified) for binaural output configuration

-aeid ID            : Acoustic environment ID (number >= 0) for BINAURAL_ROOM_REVERB output config.

-aeid ID            : Acoustic environment ID (number >= 0) or

                      a sequence thereof in the format [ID1-duration1_ID2-duration2...]

                      without braces and spaces, with '-' character separating ID from duration and '_' separating

                      ID and duration pairs, where duration is specified in frames

                      for BINAURAL_ROOM_REVERB output configuration.

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

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

-q                  : Quiet mode, limit printouts to terminal, default is deactivated
@@ -315,8 +319,8 @@ Options: 
-dpid ID            : Directivity pattern ID(s) (space-separated list of up to 4 numbers can be 

                      specified) for binaural output configuration

-aeid ID            : Acoustic environment ID (number > 0) or

                      a sequence thereof in the format [ID1:duration1,ID2:duration2...]

                      without braces and spaces, with ':' character separating ID from duration and ',' separating

                      a sequence thereof in the format [ID1-duration1_ID2-duration2...]

                      without braces and spaces, with '-' character separating ID from duration and '_' separating

                      ID and duration pairs, where duration is specified in frames

                      for BINAURAL_ROOM_REVERB output configuration.

-lp Position        : Output LFE position. Comma-delimited triplet of [gain, azimuth, elevation] where gain is linear

scripts/config/self_test.prm

+3 −3
Original line number Diff line number Diff line
@@ -1294,15 +1294,15 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 


// Multi-channel 5_1 at 512 kbps, 48kHz in 48kHz out, BINAURAL_ROOM_REVERB out custom acoustic environment with a sequence (CREND)

//../IVAS_cod -mc 5_1 512000 48 testv/stv51MC48c.wav bit

//../IVAS_dec -render_config testv/rend_config_combined.cfg -aeid 1:200,0:100,2:500 BINAURAL_ROOM_REVERB 48 bit testv/stv51MC48c.wav_MC51_512000_48-48_MC_reverb_sequence.tst

//../IVAS_dec -render_config testv/rend_config_combined.cfg -aeid 1-200_0-100_2-500 BINAURAL_ROOM_REVERB 48 bit testv/stv51MC48c.wav_MC51_512000_48-48_MC_reverb_sequence.tst



// Multi-channel 5_1 at 64 kbps, 48kHz in 48kHz out, BINAURAL_ROOM_REVERB out custom acoustic environment with a sequence (FastConv)

//../IVAS_cod -mc 5_1 64000 48 testv/stv51MC48c.wav bit

//../IVAS_dec -render_config testv/rend_config_combined.cfg -aeid 1:500,2:100,0:300 BINAURAL_ROOM_REVERB 48 bit testv/stv51MC48c.wav_MC51_64000_48-48_MC_reverb_sequence.tst

//../IVAS_dec -render_config testv/rend_config_combined.cfg -aeid 1-500_2-100_0-300 BINAURAL_ROOM_REVERB 48 bit testv/stv51MC48c.wav_MC51_64000_48-48_MC_reverb_sequence.tst



// Multi-channel 5_1 at 32 kbps, 48kHz in 48kHz out, BINAURAL_ROOM_REVERB out custom acoustic environment with a sequence (ParamBin)

//../IVAS_cod -mc 5_1 32000 48 testv/stv51MC48c.wav bit

//../IVAS_dec -render_config testv/rend_config_combined.cfg -aeid 0:100,2:500,1:200 BINAURAL_ROOM_REVERB 48 bit testv/stv51MC48c.wav_MC51_32000_48-48_MC_reverb_sequence.tst

//../IVAS_dec -render_config testv/rend_config_combined.cfg -aeid 0-100_2-500_1-200 BINAURAL_ROOM_REVERB 48 bit testv/stv51MC48c.wav_MC51_32000_48-48_MC_reverb_sequence.tst



// Multi-channel 5_1 at 32 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM_REVERB out Config hospital_patientroom

../IVAS_cod -mc 5_1 32000 48 testv/stv51MC48c.wav bit

scripts/config/self_test_ltv.prm

+3 −3
Original line number Diff line number Diff line
@@ -1293,15 +1293,15 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 


// Multi-channel 5_1 at 512 kbps, 48kHz in 48kHz out, BINAURAL_ROOM_REVERB out custom acoustic environment with a sequence (CREND)

//../IVAS_cod -mc 5_1 512000 48 testv/ltv51MC48c.wav bit

//../IVAS_dec -render_config testv/rend_config_combined.cfg -aeid 1:500,0:1000,2:500 BINAURAL_ROOM_REVERB 48 bit testv/ltv51MC48c.wav_MC51_512000_48-48_MC_reverb_sequence.tst

//../IVAS_dec -render_config testv/rend_config_combined.cfg -aeid 1-500_0-1000_2-500 BINAURAL_ROOM_REVERB 48 bit testv/ltv51MC48c.wav_MC51_512000_48-48_MC_reverb_sequence.tst



// Multi-channel 5_1 at 64 kbps, 48kHz in 48kHz out, BINAURAL_ROOM_REVERB out custom acoustic environment with a sequence (FastConv)

//../IVAS_cod -mc 5_1 64000 48 testv/ltv51MC48c.wav bit

//../IVAS_dec -render_config testv/rend_config_combined.cfg -aeid 1:500,2:500,0:500 BINAURAL_ROOM_REVERB 48 bit testv/ltv51MC48c.wav_MC51_64000_48-48_MC_reverb_sequence.tst

//../IVAS_dec -render_config testv/rend_config_combined.cfg -aeid 1-500_2-500_0-500 BINAURAL_ROOM_REVERB 48 bit testv/ltv51MC48c.wav_MC51_64000_48-48_MC_reverb_sequence.tst



// Multi-channel 5_1 at 32 kbps, 48kHz in 48kHz out, BINAURAL_ROOM_REVERB out custom acoustic environment with a sequence (ParamBin)

//../IVAS_cod -mc 5_1 32000 48 testv/ltv51MC48c.wav bit

//../IVAS_dec -render_config testv/rend_config_combined.cfg -aeid 0:1000,2:500,1:500 BINAURAL_ROOM_REVERB 48 bit testv/ltv51MC48c.wav_MC51_32000_48-48_MC_reverb_sequence.tst

//../IVAS_dec -render_config testv/rend_config_combined.cfg -aeid 0-1000_2-500_1-500 BINAURAL_ROOM_REVERB 48 bit testv/ltv51MC48c.wav_MC51_32000_48-48_MC_reverb_sequence.tst



// Multi-channel 5_1 at 32 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM_REVERB out Config hospital_patientroom

../IVAS_cod -mc 5_1 32000 48 testv/ltv48_MC51.wav bit