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/A2NLSF.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/A2NLSF.c')
| -rw-r--r-- | thirdparty/opus/silk/A2NLSF.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/thirdparty/opus/silk/A2NLSF.c b/thirdparty/opus/silk/A2NLSF.c index b487686ff9..b6e9e5ffcc 100644 --- a/thirdparty/opus/silk/A2NLSF.c +++ b/thirdparty/opus/silk/A2NLSF.c @@ -40,7 +40,7 @@ POSSIBILITY OF SUCH DAMAGE. /* Number of binary divisions, when not in low complexity mode */ #define BIN_DIV_STEPS_A2NLSF_FIX 3 /* must be no higher than 16 - log2( LSF_COS_TAB_SZ_FIX ) */ -#define MAX_ITERATIONS_A2NLSF_FIX 16 +#define MAX_ITERATIONS_A2NLSF_FIX 30 /* Helper function for A2NLSF(..) */ /* Transforms polynomials from cos(n*f) to cos(f)^n */ @@ -130,7 +130,7 @@ void silk_A2NLSF( const opus_int d /* I Filter order (must be even) */ ) { - opus_int i, k, m, dd, root_ix, ffrac; + opus_int i, k, m, dd, root_ix, ffrac; opus_int32 xlo, xhi, xmid; opus_int32 ylo, yhi, ymid, thr; opus_int32 nom, den; @@ -239,13 +239,13 @@ void silk_A2NLSF( /* Set NLSFs to white spectrum and exit */ NLSF[ 0 ] = (opus_int16)silk_DIV32_16( 1 << 15, d + 1 ); for( k = 1; k < d; k++ ) { - NLSF[ k ] = (opus_int16)silk_ADD16( NLSF[ k-1 ], NLSF[ 0 ] ); + NLSF[ k ] = (opus_int16)silk_SMULBB( k + 1, NLSF[ 0 ] ); } return; } /* Error: Apply progressively more bandwidth expansion and run again */ - silk_bwexpander_32( a_Q16, d, 65536 - silk_LSHIFT( 1, i ) ); + silk_bwexpander_32( a_Q16, d, 65536 - silk_SMULBB( 10 + i, i ) ); /* 10_Q16 = 0.00015*/ silk_A2NLSF_init( a_Q16, P, Q, dd ); p = P; /* Pointer to polynomial */ |