Commit 4ce71960 authored by multrus's avatar multrus
Browse files

FIX_I74_BW_LIMITATION_ALT: no need for updateBandwidthFromFs() anymore

parent fa408b98

lib_enc/lib_enc.c

+8 −2
Original line number Diff line number Diff line
@@ -80,7 +80,9 @@ static ivas_error setChannelAwareConfig( IVAS_ENC_HANDLE hIvasEnc, const IVAS_EN 
static int16_t getInputBufferSize( const Encoder_Struct *st_ivas );

static ivas_error doCommonConfigureChecks( IVAS_ENC_HANDLE hIvasEnc );

static ivas_error doCommonSetterChecks( IVAS_ENC_HANDLE hIvasEnc );

#ifndef FIX_I74_BW_LIMITATION_ALT

static void updateBandwidthFromFs( const ENCODER_CONFIG_HANDLE hEncoderConfig );

#endif

static ivas_error sanitizeBandwidth( const IVAS_ENC_HANDLE hIvasEnc );

static void init_encoder_config( ENCODER_CONFIG_HANDLE hEncoderConfig );

static void resetIsmMetadataProvidedFlags( IVAS_ENC_HANDLE hIvasEnc );
@@ -826,7 +828,9 @@ static ivas_error configureEncoder( 


    hEncoderConfig->input_Fs = inputFs;



#ifndef FIX_I74_BW_LIMITATION_ALT

    updateBandwidthFromFs( hEncoderConfig );

#endif



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

     * Channel-aware mode
@@ -1814,7 +1818,7 @@ static ivas_error doCommonSetterChecks( 
    return IVAS_ERR_OK;

}





#ifndef FIX_I74_BW_LIMITATION_ALT

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

 * updateBandwidthFromFs()

 *
@@ -1840,7 +1844,7 @@ static void updateBandwidthFromFs( 


    return;

}



#endif



#ifdef FIX_I74_BW_LIMITATION_ALT

/*---------------------------------------------------------------------*
@@ -1974,12 +1978,14 @@ static ivas_error setBandwidth( 
        hIvasEnc->switchingActive = true;

    }



#ifndef FIX_I74_BW_LIMITATION_ALT

    /* Limit bandwidth to half of sampling rate - only possible if

     * sampling rate has already been set via configure function */

    if ( hIvasEnc->isConfigured )

    {

        updateBandwidthFromFs( hIvasEnc->st_ivas->hEncoderConfig );

    }

#endif



    return IVAS_ERR_OK;

}