Commit 883bc1c9 authored by vaclav's avatar vaclav
Browse files

fix Linux builds

parent ea5ce9b0

lib_enc/lib_enc.c

+12 −4
Original line number Diff line number Diff line
@@ -1415,6 +1415,9 @@ static ivas_error printConfigInfo_enc( 
    ENCODER_CONFIG_HANDLE hEncoderConfig;

#ifndef FIX_I74_BW_LIMITATION_ALT

    char max_bwidth_string[4];

#else

    int16_t newBandwidthApi;

    ivas_error error;

#endif



    st_ivas = hIvasEnc->st_ivas;
@@ -1556,7 +1559,12 @@ static ivas_error printConfigInfo_enc( 
     * Print potential limitation of audio bandwidth

     *-----------------------------------------------------------------*/



#ifndef FIX_I74_BW_LIMITATION_ALT

#ifdef FIX_I74_BW_LIMITATION_ALT

    if ( ( error = bandwidthApiToInternal( hIvasEnc->newBandwidthApi, &newBandwidthApi ) ) != IVAS_ERR_OK )

    {

        return error;

    }

#else

    switch ( hEncoderConfig->max_bwidth )

    {

        case NB:
@@ -1589,9 +1597,9 @@ static ivas_error printConfigInfo_enc( 
    if ( hEncoderConfig->ivas_format == MONO_FORMAT )

    {

#ifdef FIX_I74_BW_LIMITATION_ALT

        if ( hIvasEnc->newBandwidthApi != hEncoderConfig->max_bwidth )

        if ( newBandwidthApi != hEncoderConfig->max_bwidth )

        {

            if ( hIvasEnc->newBandwidthApi == FB )

            if ( newBandwidthApi == FB )

            {

                fprintf( stdout, "\nFB coding not supported below %.2f kbps. ", ACELP_16k40 / 1000.f );

                if ( hEncoderConfig->max_bwidth == WB )
@@ -1630,7 +1638,7 @@ static ivas_error printConfigInfo_enc( 


        /* in case of 8kHz input sampling or "-max_band NB", require the total bitrate to be below 24.40 kbps */

#ifdef FIX_I74_BW_LIMITATION_ALT

        if ( ( hIvasEnc->newBandwidthApi == NB || hEncoderConfig->input_Fs == 8000 ) && hEncoderConfig->ivas_total_brate > ACELP_24k40 )

        if ( ( newBandwidthApi == NB || hEncoderConfig->input_Fs == 8000 ) && hEncoderConfig->ivas_total_brate > ACELP_24k40 )

#else

        if ( ( hEncoderConfig->max_bwidth == NB || hEncoderConfig->input_Fs == 8000 ) && hEncoderConfig->ivas_total_brate > ACELP_24k40 )

#endif