diff --git a/lib_enc/bw_detect.c b/lib_enc/bw_detect.c index c1357a7f7470346a038bfbd316f75d589c0e4e7b..c2955f1f39efe209b6caa99e2834339c47b9113b 100644 --- a/lib_enc/bw_detect.c +++ b/lib_enc/bw_detect.c @@ -494,7 +494,6 @@ void bw_detect( st->input_bwidth = st->max_bwidth; } - if ( st->element_mode == EVS_MONO ) { set_bw( -1, -1, st, st->codec_mode ); diff --git a/lib_enc/ivas_init_enc.c b/lib_enc/ivas_init_enc.c index 34868ebefc8e6f8773dabba3160534f72960e440..8d9f7e445e00e402088e5a21895f8898914ae306 100644 --- a/lib_enc/ivas_init_enc.c +++ b/lib_enc/ivas_init_enc.c @@ -233,6 +233,7 @@ void copy_encoder_config( st->force = st_ivas->hEncoderConfig->force; #endif st->element_mode = st_ivas->hEncoderConfig->element_mode_init; + return; } diff --git a/lib_enc/lib_enc.c b/lib_enc/lib_enc.c index ede42ddeaf0f766bd36a137537c52ead80879b10..ef5c621fec545b3596bcc152d50a9acf79058286 100644 --- a/lib_enc/lib_enc.c +++ b/lib_enc/lib_enc.c @@ -1905,12 +1905,14 @@ static void updateBandwidthFromFs( } #endif + #ifdef FIX_I74_BW_LIMITATION_ALT /*---------------------------------------------------------------------* * sanitizeBandwidth() * * *---------------------------------------------------------------------*/ + static ivas_error sanitizeBandwidth( const IVAS_ENC_HANDLE hIvasEnc ) { @@ -1967,7 +1969,6 @@ static ivas_error sanitizeBandwidth( { max_bwidth_tmp = WB; } -#endif /* in case of 8kHz input sampling or "-max_band NB", require the total bitrate to be below 24.40 kbps */ if ( ( max_bwidth_tmp == NB || hEncoderConfig->input_Fs == 8000 ) && hEncoderConfig->ivas_total_brate > ACELP_24k40 ) @@ -1981,6 +1982,7 @@ static ivas_error sanitizeBandwidth( return IVAS_ERR_INVALID_BITRATE; } } +#endif } else {