Commit ddf18e6b authored by vaclav's avatar vaclav
Browse files

remove obsolete parameter 'arg->evsMode'

parent dd004cdd

apps/decoder.c

+1 −8
Original line number Diff line number Diff line
@@ -159,9 +159,6 @@ typedef struct 
    uint16_t directivityPatternId[IVAS_MAX_NUM_OBJECTS];

    bool objEditEnabled;

    char *objEditFileName;

#ifdef FIX_1419_MONO_STEREO_UMX

    bool evsMode;

#endif

#ifdef FIX_1318_ROOM_SIZE_CMD_LINE

    IVAS_ROOM_SIZE_T roomSize;

#endif
@@ -1097,9 +1094,6 @@ static bool parseCmdlIVAS_dec( 
    arg->output_Fs = IVAS_MAX_SAMPLING_RATE;

    arg->outputConfig = IVAS_AUDIO_CONFIG_MONO;

    arg->decMode = IVAS_DEC_MODE_IVAS;

#ifdef FIX_1419_MONO_STEREO_UMX

    arg->evsMode = false;

#endif

    arg->quietModeEnabled = false;

    arg->delayCompensationEnabled = true;

    arg->voipMode = false;
@@ -1660,7 +1654,6 @@ static bool parseCmdlIVAS_dec( 
#ifdef FIX_1419_MONO_STEREO_UMX

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

        {

            arg->evsMode = true;

            arg->decMode = IVAS_DEC_MODE_EVS;

            i++;

        }
@@ -1755,7 +1748,7 @@ static bool parseCmdlIVAS_dec( 
            return false;

        }

#ifdef FIX_1419_MONO_STEREO_UMX

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

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

        {

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

            usage_dec();

lib_dec/ivas_init_dec.c

+1 −12
Original line number Diff line number Diff line
@@ -1487,16 +1487,6 @@ ivas_error ivas_init_decoder( 
        st_ivas->intern_config = ivas_set_audio_config_from_sba_order( st_ivas->sba_order );

        ivas_output_init( &( st_ivas->hOutSetup ), st_ivas->intern_config );

    }

#ifdef FIX_1419_MONO_STEREO_UMX

    else if ( st_ivas->ivas_format == MONO_FORMAT )

    {

        st_ivas->intern_config = IVAS_AUDIO_CONFIG_MONO;

    }

    else if ( st_ivas->ivas_format == STEREO_FORMAT )

    {

        st_ivas->intern_config = IVAS_AUDIO_CONFIG_STEREO;

    }

#endif

    else

    {

        ivas_output_init( &( st_ivas->hOutSetup ), output_config );
@@ -1647,9 +1637,8 @@ ivas_error ivas_init_decoder( 
    else if ( st_ivas->ivas_format == STEREO_FORMAT )

    {

        st_ivas->nchan_transport = CPE_CHANNELS;

#ifndef FIX_1419_MONO_STEREO_UMX /* already set now by renderer_select() */

        st_ivas->intern_config = IVAS_AUDIO_CONFIG_STEREO;

#endif



        st_ivas->nSCE = 0;

        st_ivas->nCPE = 1; /* in stereo, there is always only one CPE */

        cpe_id = 0;

lib_dec/lib_dec.c

+3 −0
Original line number Diff line number Diff line
@@ -904,6 +904,9 @@ ivas_error IVAS_DEC_FeedFrame_Serial( 
        if ( hIvasDec->mode == IVAS_DEC_MODE_EVS )

        {

            hIvasDec->st_ivas->hDecoderConfig->ivas_total_brate = ACELP_8k00;

#ifdef FIX_1419_MONO_STEREO_UMX

            hIvasDec->st_ivas->transport_config = IVAS_AUDIO_CONFIG_MONO;

#endif



            if ( ( error = ivas_init_decoder( hIvasDec->st_ivas ) ) != IVAS_ERR_OK )

            {