Commit 5dc50d2d authored by emerit's avatar emerit
Browse files

take into account voice age comments

parent c4219156

apps/decoder.c

+28 −4
Original line number Diff line number Diff line
@@ -53,7 +53,9 @@ 
#include "wmc_auto.h"

#include "render_config_reader.h"

#ifdef NO_DIEGETIC_PAN

#include "cnst.h"

#ifndef FLT_MAX

#define FLT_MAX ( 3.402823466e+38F )

#endif

#endif

#include "hrtf_file_reader.h"
@@ -1067,16 +1069,38 @@ static bool parseCmdlIVAS_dec( 
        {

            i++;

#ifdef NO_DIEGETIC_PAN

            if ( ( ( argv[i][0] != '-' ) && ( ( strlen( argv[0] ) >= 1 ) && ( ( argv[i][0] != '0' ) && ( argv[i][0] != '1' ) ) ) ) || ( ( argv[i][0] == '-' ) && ( ( strlen( argv[i] ) > 1 ) && ( ( argv[i][1] != '0' ) && ( argv[i][1] != '1' ) ) ) ) )

            if ( argc - i <= 4 )

            {

                fprintf( stderr, "Error: Argument for panning option not specified!\n\n" );

                usage_dec();

                return false;

            }

            if ( argv[i][0] == '-' ) /* negative value or error*/

            {

                if ( strlen( argv[i] ) > 1 )

                {

                    if ( ( argv[i][1] != '0' ) && ( argv[i][1] != '1' ) )

                    {

                        fprintf( stderr, "Error: Argument for panning option not specified!\n\n" );

                        usage_dec();

                        return false;

                    }

                }

                else

                {

                    fprintf( stderr, "Error: Argument for panning option not specified!\n\n" );

                    usage_dec();

                    return false;

                }

            }

#else

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

#endif

            {

                fprintf( stderr, "Error: Argument for panning option not specified!\n\n" );

                usage_dec();

                return false;

            }



#endif

            strncpy( argv_to_upper, argv[i], sizeof( argv_to_upper ) - 1 );

            argv_to_upper[sizeof( argv_to_upper ) - 1] = '\0';

            if ( ( strcmp( argv_to_upper, "CENTER" ) == 0 ) || ( strchr( argv_to_upper, 'C' ) != NULL ) )

apps/renderer.c

+1 −1
Original line number Diff line number Diff line
@@ -1737,7 +1737,7 @@ static CmdlnArgs defaultArgs( 
    args.orientationTracking = IVAS_ORIENT_TRK_REF;

#endif

#ifdef NO_DIEGETIC_PAN

    args.noDiegeticPan = FLT_MAX;

    args.noDiegeticPan = FLT_MAX; /* intialize with a value such as abs(value) > 1 */

#else

    args.noDiegeticPan = 0.0f;

#endif