Updating Opus to release 1.1

celt/_kiss_fft_guts.h

 /*Copyright (c) 2003-2004, Mark Borgerding
 
   All rights reserved.
 
   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.
     * Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 76 matching lines @@
     do {(res).r=SUB32((a).r,(b).r);  (res).i=SUB32((a).i,(b).i); \
     }while(0)
 #define C_ADDTO( res , a)\
     do {(res).r = ADD32((res).r, (a).r);  (res).i = ADD32((res).i,(a).i);\
     }while(0)
 
 #define C_SUBFROM( res , a)\
     do {(res).r = ADD32((res).r,(a).r);  (res).i = SUB32((res).i,(a).i); \
     }while(0)
 
-#if defined(ARMv4_ASM)
+#if defined(OPUS_ARM_INLINE_ASM)
 #include "arm/kiss_fft_armv4.h"
 #endif
 
-#if defined(ARMv5E_ASM)
+#if defined(OPUS_ARM_INLINE_EDSP)
 #include "arm/kiss_fft_armv5e.h"
 #endif
 
 #else  /* not FIXED_POINT*/
 
 #   define S_MUL(a,b) ( (a)*(b) )
 #define C_MUL(m,a,b) \
     do{ (m).r = (a).r*(b).r - (a).i*(b).i;\
         (m).i = (a).r*(b).i + (a).i*(b).r; }while(0)
 #define C_MULC(m,a,b) \
@@ skipping 62 matching lines @@
                 (x)->i = KISS_FFT_SIN(phase);\
         }while(0)
 
 #define  kf_cexp2(x,phase) \
    do{ \
       (x)->r = TRIG_UPSCALE*celt_cos_norm((phase));\
       (x)->i = TRIG_UPSCALE*celt_cos_norm((phase)-32768);\
 }while(0)
 
 #endif /* KISS_FFT_GUTS_H */