Commit 7c3aaeff authored by vaclav's avatar vaclav Committed by Manuel Jander
Browse files

acceptance of switches, step 2

parent 64a77d5c

apps/decoder.c

+15 −0
Original line number Diff line number Diff line
@@ -143,11 +143,15 @@ typedef struct 
    char *piOutputFilename;

    bool rtpOutSR;

<<<<<<< HEAD

<<<<<<< HEAD

=======

#ifdef FIX_1419_MONO_STEREO_UMX

    bool evsMode;

#endif

>>>>>>> 526949b21 (accept RTPDUMP switches)

=======

    bool evsMode;

>>>>>>> 88f1eb3c8 (acceptance of switches, step 2)

    IVAS_ROOM_SIZE_T roomSize;



} DecArguments;
@@ -898,6 +902,10 @@ static bool parseCmdlIVAS_dec( 
    arg->output_Fs = IVAS_MAX_SAMPLING_RATE;

    arg->outputConfig = IVAS_AUDIO_CONFIG_MONO;

    arg->decMode = IVAS_DEC_MODE_IVAS;

<<<<<<< HEAD

=======

    arg->evsMode = false;

>>>>>>> 88f1eb3c8 (acceptance of switches, step 2)

    arg->quietModeEnabled = false;

    arg->delayCompensationEnabled = true;

    arg->voipMode = false;
@@ -1395,9 +1403,12 @@ static bool parseCmdlIVAS_dec( 
            i++;

        }

<<<<<<< HEAD

<<<<<<< HEAD

=======

#endif

>>>>>>> 526949b21 (accept RTPDUMP switches)

=======

>>>>>>> 88f1eb3c8 (acceptance of switches, step 2)

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

        {

            i++;
@@ -1485,7 +1496,11 @@ static bool parseCmdlIVAS_dec( 
            usage_dec();

            return false;

        }

<<<<<<< HEAD

        else if ( arg->non_diegetic_pan_enabled && arg->outputConfig == IVAS_AUDIO_CONFIG_STEREO && arg->decMode == IVAS_DEC_MODE_EVS )

=======

        else if ( arg->non_diegetic_pan_enabled && arg->outputConfig == IVAS_AUDIO_CONFIG_STEREO && arg->evsMode )

>>>>>>> 88f1eb3c8 (acceptance of switches, step 2)

        {

            fprintf( stderr, "Error: Both non-diegetic panning and stereo output specified!\n\n" );

            usage_dec();