diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-11-18 10:11:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-18 10:11:49 +0100 |
| commit | 84761ca106df2ae9d06116cc5237524438ebad76 (patch) | |
| tree | 16402c6d5edd0f5fc754d49d5b7aff573fbd69de /thirdparty/opus/silk/float/find_LPC_FLP.c | |
| parent | 5c13db0150168c14d81bd320540d2d541be72dcb (diff) | |
| parent | 46ae64cd60166ead412bacc1bf03e9c8f8965e2c (diff) | |
Merge pull request #33698 from akien-mga/revert-opus-1.3.1-pr33311
Revert "Update opus to 1.3.1 and opusfile to 0.11"
Diffstat (limited to 'thirdparty/opus/silk/float/find_LPC_FLP.c')
| -rw-r--r-- | thirdparty/opus/silk/float/find_LPC_FLP.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/thirdparty/opus/silk/float/find_LPC_FLP.c b/thirdparty/opus/silk/float/find_LPC_FLP.c index fa3ffe7f8b..fcfe1c3681 100644 --- a/thirdparty/opus/silk/float/find_LPC_FLP.c +++ b/thirdparty/opus/silk/float/find_LPC_FLP.c @@ -73,7 +73,7 @@ void silk_find_LPC_FLP( silk_interpolate( NLSF0_Q15, psEncC->prev_NLSFq_Q15, NLSF_Q15, k, psEncC->predictLPCOrder ); /* Convert to LPC for residual energy evaluation */ - silk_NLSF2A_FLP( a_tmp, NLSF0_Q15, psEncC->predictLPCOrder, psEncC->arch ); + silk_NLSF2A_FLP( a_tmp, NLSF0_Q15, psEncC->predictLPCOrder ); /* Calculate residual energy with LSF interpolation */ silk_LPC_analysis_filter_FLP( LPC_res, a_tmp, x, 2 * subfr_length, psEncC->predictLPCOrder ); @@ -99,6 +99,6 @@ void silk_find_LPC_FLP( silk_A2NLSF_FLP( NLSF_Q15, a, psEncC->predictLPCOrder ); } - celt_assert( psEncC->indices.NLSFInterpCoef_Q2 == 4 || + silk_assert( psEncC->indices.NLSFInterpCoef_Q2 == 4 || ( psEncC->useInterpolatedNLSFs && !psEncC->first_frame_after_reset && psEncC->nb_subfr == MAX_NB_SUBFR ) ); } |