Updating Opus to release 1.1

src/mlp.c

 /* Copyright (c) 2008-2011 Octasic Inc.
    Written by Jean-Marc Valin */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
    are met:
 
    - Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
 
@@ skipping 11 matching lines @@
    PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
+#include "opus_types.h"
+#include "opus_defines.h"
+
 #include <math.h>
 #include "mlp.h"
 #include "arch.h"
 #include "tansig_table.h"
 #define MAX_NEURONS 100
 
 #if 0
-static inline opus_val16 tansig_approx(opus_val32 _x) /* Q19 */
+static OPUS_INLINE opus_val16 tansig_approx(opus_val32 _x) /* Q19 */
 {
         int i;
         opus_val16 xx; /* Q11 */
         /*double x, y;*/
         opus_val16 dy, yy; /* Q14 */
         /*x = 1.9073e-06*_x;*/
         if (_x>=QCONST32(8,19))
                 return QCONST32(1.,14);
         if (_x<=-QCONST32(8,19))
                 return -QCONST32(1.,14);
         xx = EXTRACT16(SHR32(_x, 8));
         /*i = lrint(25*x);*/
         i = SHR32(ADD32(1024,MULT16_16(25, xx)),11);
         /*x -= .04*i;*/
         xx -= EXTRACT16(SHR32(MULT16_16(20972,i),8));
         /*x = xx*(1./2048);*/
         /*y = tansig_table[250+i];*/
         yy = tansig_table[250+i];
         /*y = yy*(1./16384);*/
         dy = 16384-MULT16_16_Q14(yy,yy);
         yy = yy + MULT16_16_Q14(MULT16_16_Q11(xx,dy),(16384 - MULT16_16_Q11(yy,xx)));
         return yy;
 }
 #else
 /*extern const float tansig_table[501];*/
-static inline float tansig_approx(float x)
+static OPUS_INLINE float tansig_approx(float x)
 {
         int i;
         float y, dy;
         float sign=1;
-    if (x>=8)
+        /* Tests are reversed to catch NaNs */
+    if (!(x<8))
         return 1;
-    if (x<=-8)
+    if (!(x>-8))
         return -1;
         if (x<0)
         {
            x=-x;
            sign=-1;
         }
         i = (int)floor(.5f+25*x);
         x -= .04f*i;
         y = tansig_table[i];
         dy = 1-y*y;
@@ skipping 44 matching lines @@
     for (j=0;j<m->topo[2];j++)
     {
         int k;
         float sum = *W++;
         for (k=0;k<m->topo[1];k++)
             sum = sum + hidden[k]**W++;
         out[j] = tansig_approx(sum);
     }
 }
 #endif