diff options
Diffstat (limited to 'libavcodec/psymodel.c')
| -rw-r--r-- | libavcodec/psymodel.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/libavcodec/psymodel.c b/libavcodec/psymodel.c index 824eefb79e..f7bca6890c 100644 --- a/libavcodec/psymodel.c +++ b/libavcodec/psymodel.c @@ -109,25 +109,21 @@ av_cold struct FFPsyPreprocessContext* ff_psy_preprocess_init(AVCodecContext *av return NULL; ctx->avctx = avctx; + /* AAC has its own LP method */ + if (avctx->codec_id != AV_CODEC_ID_AAC) { if (avctx->cutoff > 0) cutoff_coeff = 2.0 * avctx->cutoff / avctx->sample_rate; - if (!cutoff_coeff && avctx->codec_id == AV_CODEC_ID_AAC) - cutoff_coeff = 2.0 * AAC_CUTOFF(avctx) / avctx->sample_rate; - if (cutoff_coeff && cutoff_coeff < 0.98) ctx->fcoeffs = ff_iir_filter_init_coeffs(avctx, FF_FILTER_TYPE_BUTTERWORTH, FF_FILTER_MODE_LOWPASS, FILT_ORDER, cutoff_coeff, 0.0, 0.0); if (ctx->fcoeffs) { - ctx->fstate = av_mallocz_array(sizeof(ctx->fstate[0]), avctx->channels); - if (!ctx->fstate) { - av_free(ctx); - return NULL; - } + ctx->fstate = av_mallocz(sizeof(ctx->fstate[0]) * avctx->channels); for (i = 0; i < avctx->channels; i++) ctx->fstate[i] = ff_iir_filter_init_state(FILT_ORDER); } + } ff_iir_filter_init(&ctx->fiir); |