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

acceptance of switches, step 2

parent a3401351

apps/decoder.c

+12 −0
Original line number Diff line number Diff line
@@ -133,6 +133,10 @@ typedef struct 
    bool applyPiData;

    char *piOutputFilename;

    bool rtpOutSR;

<<<<<<< HEAD

=======

    bool evsMode;

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

    IVAS_ROOM_SIZE_T roomSize;



} DecArguments;
@@ -883,6 +887,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;
@@ -1466,7 +1474,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();

lib_enc/lib_enc_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -540,8 +540,8 @@ ivas_error IVAS_ENC_FeedObjectMetadata( 
    {

        return IVAS_ERR_INVALID_INDEX;

    }

    error = ivas_set_ism_metadata_fx( hIvasEnc->st_ivas->hIsmMetaData[ismIndex], metadata.azimuth_fx, metadata.elevation_fx, metadata.radius_fx, metadata.yaw_fx, metadata.pitch_fx, metadata.non_diegetic_flag );



    error = ivas_set_ism_metadata_fx( hIvasEnc->st_ivas->hIsmMetaData[ismIndex], metadata.azimuth_fx, metadata.elevation_fx, metadata.radius_fx, metadata.yaw_fx, metadata.pitch_fx, metadata.non_diegetic_flag );

    IF( error != IVAS_ERR_OK )

    {

        return error;