Updating Opus to a pre-release of 1.1

celt/mathops.c

 /* Copyright (c) 2002-2008 Jean-Marc Valin
    Copyright (c) 2007-2008 CSIRO
    Copyright (c) 2007-2009 Xiph.Org Foundation
    Written by Jean-Marc Valin */
 /**
    @file mathops.h
    @brief Various math functions
 */
 /*
    Redistribution and use in source and binary forms, with or without
@@ skipping 105 matching lines @@
 
 /** Sqrt approximation (QX input, QX/2 output) */
 opus_val32 celt_sqrt(opus_val32 x)
 {
    int k;
    opus_val16 n;
    opus_val32 rt;
    static const opus_val16 C[5] = {23175, 11561, -3011, 1699, -664};
    if (x==0)
       return 0;
+   else if (x>=1073741824)
+      return 32767;
    k = (celt_ilog2(x)>>1)-7;
    x = VSHR32(x, 2*k);
    n = x-32768;
    rt = ADD16(C[0], MULT16_16_Q15(n, ADD16(C[1], MULT16_16_Q15(n, ADD16(C[2],
               MULT16_16_Q15(n, ADD16(C[3], MULT16_16_Q15(n, (C[4])))))))));
    rt = VSHR32(rt,7-k);
    return rt;
 }
 
 #define L1 32767
@@ skipping 61 matching lines @@
        neatly compensates for truncation error in the rest of the process. */
    r = SUB16(r, ADD16(1, MULT16_16_Q15(r,
              ADD16(MULT16_16_Q15(r, n), ADD16(r, -32768)))));
    /* r is now the Q15 solution to 2/(n+1), with a maximum relative error
        of 7.05346E-5, a (relative) RMSE of 2.14418E-5, and a peak absolute
        error of 1.24665/32768. */
    return VSHR32(EXTEND32(r),i-16);
 }
 
 #endif