Browse Source

cosmetics: drop trailing whitespace

Tristan Matthews 6 months ago
parent
commit
39a7979ad7

+ 2 - 2
libspeex/_kiss_fft_guts.h

@@ -23,7 +23,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 #include "math_approx.h"
 #include "math_approx.h"
 
 
 #define MAXFACTORS 32
 #define MAXFACTORS 32
-/* e.g. an fft of length 128 has 4 factors 
+/* e.g. an fft of length 128 has 4 factors
  as far as kissfft is concerned
  as far as kissfft is concerned
  4*4*4*2
  4*4*4*2
  */
  */
@@ -47,7 +47,7 @@ struct kiss_fft_state{
 #ifdef FIXED_POINT
 #ifdef FIXED_POINT
 #include "arch.h"
 #include "arch.h"
 # define FRACBITS 15
 # define FRACBITS 15
-# define SAMPPROD spx_int32_t 
+# define SAMPPROD spx_int32_t
 #define SAMP_MAX 32767
 #define SAMP_MAX 32767
 
 
 #define SAMP_MIN -SAMP_MAX
 #define SAMP_MIN -SAMP_MAX

+ 6 - 6
libspeex/arch.h

@@ -7,18 +7,18 @@
    Redistribution and use in source and binary forms, with or without
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
    modification, are permitted provided that the following conditions
    are met:
    are met:
-   
+
    - Redistributions of source code must retain the above copyright
    - Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
    notice, this list of conditions and the following disclaimer.
-   
+
    - Redistributions in binary form must reproduce the above copyright
    - Redistributions in binary form must reproduce the above copyright
    notice, this list of conditions and the following disclaimer in the
    notice, this list of conditions and the following disclaimer in the
    documentation and/or other materials provided with the distribution.
    documentation and/or other materials provided with the distribution.
-   
+
    - Neither the name of the Xiph.org Foundation nor the names of its
    - Neither the name of the Xiph.org Foundation nor the names of its
    contributors may be used to endorse or promote products derived from
    contributors may be used to endorse or promote products derived from
    this software without specific prior written permission.
    this software without specific prior written permission.
-   
+
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -215,11 +215,11 @@ typedef float spx_word32_t;
 #if defined (CONFIG_TI_C54X) || defined (CONFIG_TI_C55X)
 #if defined (CONFIG_TI_C54X) || defined (CONFIG_TI_C55X)
 
 
 /* 2 on TI C5x DSP */
 /* 2 on TI C5x DSP */
-#define BYTES_PER_CHAR 2 
+#define BYTES_PER_CHAR 2
 #define BITS_PER_CHAR 16
 #define BITS_PER_CHAR 16
 #define LOG2_BITS_PER_CHAR 4
 #define LOG2_BITS_PER_CHAR 4
 
 
-#else 
+#else
 
 
 #define BYTES_PER_CHAR 1
 #define BYTES_PER_CHAR 1
 #define BITS_PER_CHAR 8
 #define BITS_PER_CHAR 8

+ 4 - 4
libspeex/cb_search.h

@@ -7,18 +7,18 @@
    Redistribution and use in source and binary forms, with or without
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
    modification, are permitted provided that the following conditions
    are met:
    are met:
-   
+
    - Redistributions of source code must retain the above copyright
    - Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
    notice, this list of conditions and the following disclaimer.
-   
+
    - Redistributions in binary form must reproduce the above copyright
    - Redistributions in binary form must reproduce the above copyright
    notice, this list of conditions and the following disclaimer in the
    notice, this list of conditions and the following disclaimer in the
    documentation and/or other materials provided with the distribution.
    documentation and/or other materials provided with the distribution.
-   
+
    - Neither the name of the Xiph.org Foundation nor the names of its
    - Neither the name of the Xiph.org Foundation nor the names of its
    contributors may be used to endorse or promote products derived from
    contributors may be used to endorse or promote products derived from
    this software without specific prior written permission.
    this software without specific prior written permission.
-   
+
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

+ 4 - 4
libspeex/cb_search_arm4.h

@@ -7,18 +7,18 @@
    Redistribution and use in source and binary forms, with or without
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
    modification, are permitted provided that the following conditions
    are met:
    are met:
-   
+
    - Redistributions of source code must retain the above copyright
    - Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
    notice, this list of conditions and the following disclaimer.
-   
+
    - Redistributions in binary form must reproduce the above copyright
    - Redistributions in binary form must reproduce the above copyright
    notice, this list of conditions and the following disclaimer in the
    notice, this list of conditions and the following disclaimer in the
    documentation and/or other materials provided with the distribution.
    documentation and/or other materials provided with the distribution.
-   
+
    - Neither the name of the Xiph.org Foundation nor the names of its
    - Neither the name of the Xiph.org Foundation nor the names of its
    contributors may be used to endorse or promote products derived from
    contributors may be used to endorse or promote products derived from
    this software without specific prior written permission.
    this software without specific prior written permission.
-   
+
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

+ 7 - 7
libspeex/cb_search_bfin.h

@@ -1,6 +1,6 @@
 /* Copyright (C) 2005 Analog Devices */
 /* Copyright (C) 2005 Analog Devices */
 /**
 /**
-   @author Jean-Marc Valin 
+   @author Jean-Marc Valin
    @file cb_search_bfin.h
    @file cb_search_bfin.h
    @brief Fixed codebook functions (Blackfin version)
    @brief Fixed codebook functions (Blackfin version)
 */
 */
@@ -8,18 +8,18 @@
    Redistribution and use in source and binary forms, with or without
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
    modification, are permitted provided that the following conditions
    are met:
    are met:
-   
+
    - Redistributions of source code must retain the above copyright
    - Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
    notice, this list of conditions and the following disclaimer.
-   
+
    - Redistributions in binary form must reproduce the above copyright
    - Redistributions in binary form must reproduce the above copyright
    notice, this list of conditions and the following disclaimer in the
    notice, this list of conditions and the following disclaimer in the
    documentation and/or other materials provided with the distribution.
    documentation and/or other materials provided with the distribution.
-   
+
    - Neither the name of the Xiph.org Foundation nor the names of its
    - Neither the name of the Xiph.org Foundation nor the names of its
    contributors may be used to endorse or promote products derived from
    contributors may be used to endorse or promote products derived from
    this software without specific prior written permission.
    this software without specific prior written permission.
-   
+
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -35,7 +35,7 @@
 
 
 #include "bfin.h"
 #include "bfin.h"
 
 
-#define OVERRIDE_COMPUTE_WEIGHTED_CODEBOOK 
+#define OVERRIDE_COMPUTE_WEIGHTED_CODEBOOK
 void compute_weighted_codebook(const signed char *shape_cb, const spx_word16_t *r, spx_word16_t *resp, spx_word16_t *resp2, spx_word32_t *E, int shape_cb_size, int subvect_size, char *stack)
 void compute_weighted_codebook(const signed char *shape_cb, const spx_word16_t *r, spx_word16_t *resp, spx_word16_t *resp2, spx_word32_t *E, int shape_cb_size, int subvect_size, char *stack)
 {
 {
    int i;
    int i;
@@ -74,7 +74,7 @@ void compute_weighted_codebook(const signed char *shape_cb, const spx_word16_t *
          "[P4] = R1;\n\t"
          "[P4] = R1;\n\t"
          :
          :
       : "m" (subvect_size), "m" (shape_cb), "m" (r), "m" (resp), "m" (E)
       : "m" (subvect_size), "m" (shape_cb), "m" (r), "m" (resp), "m" (E)
-      : "A0", "P0", "P1", "P2", "P3", "P4", "R0", "R1", "R2", "I0", "I1", "L0", 
+      : "A0", "P0", "P1", "P2", "P3", "P4", "R0", "R1", "R2", "I0", "I1", "L0",
         "L1", "A0", "A1", "memory", "ASTAT" BFIN_HWLOOP0_REGS BFIN_HWLOOP1_REGS
         "L1", "A0", "A1", "memory", "ASTAT" BFIN_HWLOOP0_REGS BFIN_HWLOOP1_REGS
       );
       );
       shape_cb += subvect_size;
       shape_cb += subvect_size;

+ 5 - 5
libspeex/cb_search_sse.h

@@ -7,18 +7,18 @@
    Redistribution and use in source and binary forms, with or without
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
    modification, are permitted provided that the following conditions
    are met:
    are met:
-   
+
    - Redistributions of source code must retain the above copyright
    - Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
    notice, this list of conditions and the following disclaimer.
-   
+
    - Redistributions in binary form must reproduce the above copyright
    - Redistributions in binary form must reproduce the above copyright
    notice, this list of conditions and the following disclaimer in the
    notice, this list of conditions and the following disclaimer in the
    documentation and/or other materials provided with the distribution.
    documentation and/or other materials provided with the distribution.
-   
+
    - Neither the name of the Xiph.org Foundation nor the names of its
    - Neither the name of the Xiph.org Foundation nor the names of its
    contributors may be used to endorse or promote products derived from
    contributors may be used to endorse or promote products derived from
    this software without specific prior written permission.
    this software without specific prior written permission.
-   
+
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -40,7 +40,7 @@ static inline void _spx_mm_getr_ps (__m128 U, float *__Z, float *__Y, float *__X
     float __a[4];
     float __a[4];
     __m128 __v;
     __m128 __v;
   } __u;
   } __u;
-  
+
   __u.__v = U;
   __u.__v = U;
 
 
   *__Z = __u.__a[0];
   *__Z = __u.__a[0];

+ 6 - 6
libspeex/fftwrap.h

@@ -1,23 +1,23 @@
-/* Copyright (C) 2005 Jean-Marc Valin 
+/* Copyright (C) 2005 Jean-Marc Valin
    File: fftwrap.h
    File: fftwrap.h
 
 
-   Wrapper for various FFTs 
+   Wrapper for various FFTs
 
 
    Redistribution and use in source and binary forms, with or without
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
    modification, are permitted provided that the following conditions
    are met:
    are met:
-   
+
    - Redistributions of source code must retain the above copyright
    - Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
    notice, this list of conditions and the following disclaimer.
-   
+
    - Redistributions in binary form must reproduce the above copyright
    - Redistributions in binary form must reproduce the above copyright
    notice, this list of conditions and the following disclaimer in the
    notice, this list of conditions and the following disclaimer in the
    documentation and/or other materials provided with the distribution.
    documentation and/or other materials provided with the distribution.
-   
+
    - Neither the name of the Xiph.org Foundation nor the names of its
    - Neither the name of the Xiph.org Foundation nor the names of its
    contributors may be used to endorse or promote products derived from
    contributors may be used to endorse or promote products derived from
    this software without specific prior written permission.
    this software without specific prior written permission.
-   
+
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

+ 4 - 4
libspeex/filters.h

@@ -7,18 +7,18 @@
    Redistribution and use in source and binary forms, with or without
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
    modification, are permitted provided that the following conditions
    are met:
    are met:
-   
+
    - Redistributions of source code must retain the above copyright
    - Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
    notice, this list of conditions and the following disclaimer.
-   
+
    - Redistributions in binary form must reproduce the above copyright
    - Redistributions in binary form must reproduce the above copyright
    notice, this list of conditions and the following disclaimer in the
    notice, this list of conditions and the following disclaimer in the
    documentation and/or other materials provided with the distribution.
    documentation and/or other materials provided with the distribution.
-   
+
    - Neither the name of the Xiph.org Foundation nor the names of its
    - Neither the name of the Xiph.org Foundation nor the names of its
    contributors may be used to endorse or promote products derived from
    contributors may be used to endorse or promote products derived from
    this software without specific prior written permission.
    this software without specific prior written permission.
-   
+
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

+ 5 - 5
libspeex/filters_arm4.h

@@ -7,18 +7,18 @@
    Redistribution and use in source and binary forms, with or without
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
    modification, are permitted provided that the following conditions
    are met:
    are met:
-   
+
    - Redistributions of source code must retain the above copyright
    - Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
    notice, this list of conditions and the following disclaimer.
-   
+
    - Redistributions in binary form must reproduce the above copyright
    - Redistributions in binary form must reproduce the above copyright
    notice, this list of conditions and the following disclaimer in the
    notice, this list of conditions and the following disclaimer in the
    documentation and/or other materials provided with the distribution.
    documentation and/or other materials provided with the distribution.
-   
+
    - Neither the name of the Xiph.org Foundation nor the names of its
    - Neither the name of the Xiph.org Foundation nor the names of its
    contributors may be used to endorse or promote products derived from
    contributors may be used to endorse or promote products derived from
    this software without specific prior written permission.
    this software without specific prior written permission.
-   
+
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -68,7 +68,7 @@ int normalize16(const spx_sig_t *x, spx_word16_t *y, spx_sig_t max_scale, int le
       sig_shift++;
       sig_shift++;
       max_val >>= 1;
       max_val >>= 1;
    }
    }
-   
+
    __asm__ __volatile__ (
    __asm__ __volatile__ (
          ".normalize16loop%=: \n"
          ".normalize16loop%=: \n"
 
 

+ 27 - 27
libspeex/filters_bfin.h

@@ -7,18 +7,18 @@
    Redistribution and use in source and binary forms, with or without
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
    modification, are permitted provided that the following conditions
    are met:
    are met:
-   
+
    - Redistributions of source code must retain the above copyright
    - Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
    notice, this list of conditions and the following disclaimer.
-   
+
    - Redistributions in binary form must reproduce the above copyright
    - Redistributions in binary form must reproduce the above copyright
    notice, this list of conditions and the following disclaimer in the
    notice, this list of conditions and the following disclaimer in the
    documentation and/or other materials provided with the distribution.
    documentation and/or other materials provided with the distribution.
-   
+
    - Neither the name of the Xiph.org Foundation nor the names of its
    - Neither the name of the Xiph.org Foundation nor the names of its
    contributors may be used to endorse or promote products derived from
    contributors may be used to endorse or promote products derived from
    this software without specific prior written permission.
    this software without specific prior written permission.
-   
+
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -39,7 +39,7 @@ int normalize16(const spx_sig_t *x, spx_word16_t *y, spx_sig_t max_scale, int le
 {
 {
    spx_sig_t max_val=1;
    spx_sig_t max_val=1;
    int sig_shift;
    int sig_shift;
-   __asm__ 
+   __asm__
    (
    (
    "%0 = 0;\n\t"
    "%0 = 0;\n\t"
    "I0 = %1;\n\t"
    "I0 = %1;\n\t"
@@ -62,7 +62,7 @@ int normalize16(const spx_sig_t *x, spx_word16_t *y, spx_sig_t max_scale, int le
       max_val >>= 1;
       max_val >>= 1;
    }
    }
 
 
-   __asm__ __volatile__ 
+   __asm__ __volatile__
    (
    (
    "I0 = %0;\n\t"
    "I0 = %0;\n\t"
    "L0 = 0;\n\t"
    "L0 = 0;\n\t"
@@ -94,7 +94,7 @@ void filter_mem16(const spx_word16_t *_x, const spx_coef_t *num, const spx_coef_
 
 
    ALLOC(xy2, (N+1), spx_word32_t);
    ALLOC(xy2, (N+1), spx_word32_t);
    ALLOC(numden_a, (2*ord+2), spx_word32_t);
    ALLOC(numden_a, (2*ord+2), spx_word32_t);
-   xy = xy2+1;  
+   xy = xy2+1;
    numden = (spx_word16_t*) numden_a;
    numden = (spx_word16_t*) numden_a;
 
 
    for (i=0;i<ord;i++)
    for (i=0;i<ord;i++)
@@ -106,20 +106,20 @@ void filter_mem16(const spx_word16_t *_x, const spx_coef_t *num, const spx_coef_
    (
    (
    /* Register setup */
    /* Register setup */
    "R0 = %5;\n\t"      /*ord */
    "R0 = %5;\n\t"      /*ord */
-   
+
    "P0 = %3;\n\t"
    "P0 = %3;\n\t"
    "I0 = P0;\n\t"
    "I0 = P0;\n\t"
    "B0 = P0;\n\t" /* numden */
    "B0 = P0;\n\t" /* numden */
    "L0 = 0;\n\t"
    "L0 = 0;\n\t"
-      
+
    "P2 = %0;\n\t" /* Fused xy */
    "P2 = %0;\n\t" /* Fused xy */
    "I2 = P2;\n\t"
    "I2 = P2;\n\t"
    "L2 = 0;\n\t"
    "L2 = 0;\n\t"
-   
+
    "P4 = %6;\n\t" /* mem */
    "P4 = %6;\n\t" /* mem */
    "P0 = %1;\n\t" /* _x */
    "P0 = %1;\n\t" /* _x */
    "P1 = %2;\n\t" /* _y */
    "P1 = %2;\n\t" /* _y */
-   
+
    /* First sample */
    /* First sample */
    "R1 = [P4++];\n\t"
    "R1 = [P4++];\n\t"
    "R1 <<= 3;\n\t" /* shift mem */
    "R1 <<= 3;\n\t" /* shift mem */
@@ -129,7 +129,7 @@ void filter_mem16(const spx_word16_t *_x, const spx_coef_t *num, const spx_coef_
    "W[P1++] = R1;\n\t" /* store y[0] */
    "W[P1++] = R1;\n\t" /* store y[0] */
    "R2 = PACK(R1.L, R2.L);\n\t" /* pack x16 and y16 */
    "R2 = PACK(R1.L, R2.L);\n\t" /* pack x16 and y16 */
    "[P2] = R2;\n\t"
    "[P2] = R2;\n\t"
-               
+
    /* Samples 1 to ord-1 (using memory) */
    /* Samples 1 to ord-1 (using memory) */
    "R0 += -1;\n\t"
    "R0 += -1;\n\t"
    "R3 = 0;\n\t"
    "R3 = 0;\n\t"
@@ -138,7 +138,7 @@ void filter_mem16(const spx_word16_t *_x, const spx_coef_t *num, const spx_coef_
    "LOOP_BEGIN filter_start%=;\n\t"
    "LOOP_BEGIN filter_start%=;\n\t"
       "R3 += 1;\n\t"
       "R3 += 1;\n\t"
       "LC1 = R3;\n\t"
       "LC1 = R3;\n\t"
-      
+
       "R1 = [P4++];\n\t"
       "R1 = [P4++];\n\t"
       "A1 = R1;\n\t"
       "A1 = R1;\n\t"
       "A0 = 0;\n\t"
       "A0 = 0;\n\t"
@@ -164,13 +164,13 @@ void filter_mem16(const spx_word16_t *_x, const spx_coef_t *num, const spx_coef_
 
 
    "LOOP_END filter_start%=;\n\t"
    "LOOP_END filter_start%=;\n\t"
 
 
-   /* Samples ord to N*/   
+   /* Samples ord to N*/
    "R0 = %5;\n\t"
    "R0 = %5;\n\t"
    "R0 <<= 1;\n\t"
    "R0 <<= 1;\n\t"
    "I0 = B0;\n\t" /* numden */
    "I0 = B0;\n\t" /* numden */
-   "R0 <<= 1;\n\t"   
+   "R0 <<= 1;\n\t"
    "L0 = R0;\n\t"
    "L0 = R0;\n\t"
-   
+
    "R0 = %5;\n\t" /* org */
    "R0 = %5;\n\t" /* org */
    "R2 = %4;\n\t" /* N */
    "R2 = %4;\n\t" /* N */
    "R2 = R2 - R0;\n\t"
    "R2 = R2 - R0;\n\t"
@@ -242,20 +242,20 @@ void iir_mem16(const spx_word16_t *_x, const spx_coef_t *den, spx_word16_t *_y,
    (
    (
    /* Register setup */
    /* Register setup */
    "R0 = %5;\n\t"      /*ord */
    "R0 = %5;\n\t"      /*ord */
-   
+
    "P1 = %3;\n\t"
    "P1 = %3;\n\t"
    "I1 = P1;\n\t"
    "I1 = P1;\n\t"
    "B1 = P1;\n\t"
    "B1 = P1;\n\t"
    "L1 = 0;\n\t"
    "L1 = 0;\n\t"
-   
+
    "P3 = %0;\n\t"
    "P3 = %0;\n\t"
    "I3 = P3;\n\t"
    "I3 = P3;\n\t"
    "L3 = 0;\n\t"
    "L3 = 0;\n\t"
-   
+
    "P4 = %6;\n\t"
    "P4 = %6;\n\t"
    "P0 = %1;\n\t"
    "P0 = %1;\n\t"
    "P1 = %2;\n\t"
    "P1 = %2;\n\t"
-   
+
    /* First sample */
    /* First sample */
    "R1 = [P4++];\n\t"
    "R1 = [P4++];\n\t"
    "R1 = R1 << 3 (S);\n\t"
    "R1 = R1 << 3 (S);\n\t"
@@ -273,7 +273,7 @@ void iir_mem16(const spx_word16_t *_x, const spx_coef_t *den, spx_word16_t *_y,
    "LOOP_BEGIN filter_start%=;\n\t"
    "LOOP_BEGIN filter_start%=;\n\t"
       "R3 += 1;\n\t"
       "R3 += 1;\n\t"
       "LC1 = R3;\n\t"
       "LC1 = R3;\n\t"
-      
+
       "R1 = [P4++];\n\t"
       "R1 = [P4++];\n\t"
       "A1 = R1;\n\t"
       "A1 = R1;\n\t"
       "I1 = B1;\n\t"
       "I1 = B1;\n\t"
@@ -285,7 +285,7 @@ void iir_mem16(const spx_word16_t *_x, const spx_coef_t *den, spx_word16_t *_y,
          "R5.L = W[I3--];\n\t"
          "R5.L = W[I3--];\n\t"
          "A1 -= R4.L*R5.L (IS);\n\t"
          "A1 -= R4.L*R5.L (IS);\n\t"
       "LOOP_END filter_start_inner%=;\n\t"
       "LOOP_END filter_start_inner%=;\n\t"
-   
+
       "R1 = A1;\n\t"
       "R1 = A1;\n\t"
       "R1 <<= 3;\n\t"
       "R1 <<= 3;\n\t"
       "R1.L = R1 (RND);\n\t"
       "R1.L = R1 (RND);\n\t"
@@ -295,12 +295,12 @@ void iir_mem16(const spx_word16_t *_x, const spx_coef_t *den, spx_word16_t *_y,
       "W[P3] = R1;\n\t"
       "W[P3] = R1;\n\t"
    "LOOP_END filter_start%=;\n\t"
    "LOOP_END filter_start%=;\n\t"
 
 
-   /* Samples ord to N*/   
+   /* Samples ord to N*/
    "R0 = %5;\n\t"
    "R0 = %5;\n\t"
    "R0 <<= 1;\n\t"
    "R0 <<= 1;\n\t"
    "I1 = B1;\n\t"
    "I1 = B1;\n\t"
    "L1 = R0;\n\t"
    "L1 = R0;\n\t"
-   
+
    "R0 = %5;\n\t"
    "R0 = %5;\n\t"
    "R2 = %4;\n\t"
    "R2 = %4;\n\t"
    "R2 = R2 - R0;\n\t"
    "R2 = R2 - R0;\n\t"
@@ -324,7 +324,7 @@ void iir_mem16(const spx_word16_t *_x, const spx_coef_t *den, spx_word16_t *_y,
       "W[P1++] = R1;\n\t"
       "W[P1++] = R1;\n\t"
       "W[P3] = R1;\n\t"
       "W[P3] = R1;\n\t"
    "LOOP_END filter_mid%=;\n\t"
    "LOOP_END filter_mid%=;\n\t"
-     
+
    /* Update memory */
    /* Update memory */
    "P4 = %6;\n\t"
    "P4 = %6;\n\t"
    "R0 = %5;\n\t"
    "R0 = %5;\n\t"
@@ -445,7 +445,7 @@ void compute_impulse_response(const spx_coef_t *ak, const spx_coef_t *awk1, cons
    int i,j;
    int i,j;
    VARDECL(spx_word16_t *ytmp);
    VARDECL(spx_word16_t *ytmp);
    ALLOC(ytmp, N, spx_word16_t);
    ALLOC(ytmp, N, spx_word16_t);
-   
+
    y[0] = LPC_SCALING;
    y[0] = LPC_SCALING;
    for (i=0;i<ord;i++)
    for (i=0;i<ord;i++)
       y[i+1] = awk1[i];
       y[i+1] = awk1[i];
@@ -482,7 +482,7 @@ void filter_mem2(const spx_sig_t *_x, const spx_coef_t *num, const spx_coef_t *d
    {
    {
       x[i] = EXTRACT16(SHR32(_x[i],SIG_SHIFT));
       x[i] = EXTRACT16(SHR32(_x[i],SIG_SHIFT));
    }
    }
-   
+
    for (i=0;i<ord;i++)
    for (i=0;i<ord;i++)
    {
    {
       spx_word32_t yi = mem[i];
       spx_word32_t yi = mem[i];

+ 16 - 16
libspeex/filters_sse.h

@@ -7,18 +7,18 @@
    Redistribution and use in source and binary forms, with or without
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
    modification, are permitted provided that the following conditions
    are met:
    are met:
-   
+
    - Redistributions of source code must retain the above copyright
    - Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
    notice, this list of conditions and the following disclaimer.
-   
+
    - Redistributions in binary form must reproduce the above copyright
    - Redistributions in binary form must reproduce the above copyright
    notice, this list of conditions and the following disclaimer in the
    notice, this list of conditions and the following disclaimer in the
    documentation and/or other materials provided with the distribution.
    documentation and/or other materials provided with the distribution.
-   
+
    - Neither the name of the Xiph.org Foundation nor the names of its
    - Neither the name of the Xiph.org Foundation nor the names of its
    contributors may be used to endorse or promote products derived from
    contributors may be used to endorse or promote products derived from
    this software without specific prior written permission.
    this software without specific prior written permission.
-   
+
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -50,7 +50,7 @@ void filter_mem16_10(const float *x, const float *_num, const float *_den, float
    mem[2] = _mm_setr_ps(_mem[8], _mem[9], 0, 0);
    mem[2] = _mm_setr_ps(_mem[8], _mem[9], 0, 0);
    num[2] = _mm_setr_ps(_num[8], _num[9], 0, 0);
    num[2] = _mm_setr_ps(_num[8], _num[9], 0, 0);
    den[2] = _mm_setr_ps(_den[8], _den[9], 0, 0);
    den[2] = _mm_setr_ps(_den[8], _den[9], 0, 0);
-   
+
    for (i=0;i<N;i++)
    for (i=0;i<N;i++)
    {
    {
       __m128 xx;
       __m128 xx;
@@ -60,7 +60,7 @@ void filter_mem16_10(const float *x, const float *_num, const float *_den, float
       yy = _mm_add_ss(xx, mem[0]);
       yy = _mm_add_ss(xx, mem[0]);
       _mm_store_ss(y+i, yy);
       _mm_store_ss(y+i, yy);
       yy = _mm_shuffle_ps(yy, yy, 0);
       yy = _mm_shuffle_ps(yy, yy, 0);
-      
+
       /* Update memory */
       /* Update memory */
       mem[0] = _mm_move_ss(mem[0], mem[1]);
       mem[0] = _mm_move_ss(mem[0], mem[1]);
       mem[0] = _mm_shuffle_ps(mem[0], mem[0], 0x39);
       mem[0] = _mm_shuffle_ps(mem[0], mem[0], 0x39);
@@ -100,7 +100,7 @@ void filter_mem16_8(const float *x, const float *_num, const float *_den, float
       num[i] = _mm_loadu_ps(_num+4*i);
       num[i] = _mm_loadu_ps(_num+4*i);
       den[i] = _mm_loadu_ps(_den+4*i);
       den[i] = _mm_loadu_ps(_den+4*i);
    }
    }
-   
+
    for (i=0;i<N;i++)
    for (i=0;i<N;i++)
    {
    {
       __m128 xx;
       __m128 xx;
@@ -110,7 +110,7 @@ void filter_mem16_8(const float *x, const float *_num, const float *_den, float
       yy = _mm_add_ss(xx, mem[0]);
       yy = _mm_add_ss(xx, mem[0]);
       _mm_store_ss(y+i, yy);
       _mm_store_ss(y+i, yy);
       yy = _mm_shuffle_ps(yy, yy, 0);
       yy = _mm_shuffle_ps(yy, yy, 0);
-      
+
       /* Update memory */
       /* Update memory */
       mem[0] = _mm_move_ss(mem[0], mem[1]);
       mem[0] = _mm_move_ss(mem[0], mem[1]);
       mem[0] = _mm_shuffle_ps(mem[0], mem[0], 0x39);
       mem[0] = _mm_shuffle_ps(mem[0], mem[0], 0x39);
@@ -155,7 +155,7 @@ void iir_mem16_10(const float *x, const float *_den, float *y, int N, int ord, f
    }
    }
    mem[2] = _mm_setr_ps(_mem[8], _mem[9], 0, 0);
    mem[2] = _mm_setr_ps(_mem[8], _mem[9], 0, 0);
    den[2] = _mm_setr_ps(_den[8], _den[9], 0, 0);
    den[2] = _mm_setr_ps(_den[8], _den[9], 0, 0);
-   
+
    for (i=0;i<N;i++)
    for (i=0;i<N;i++)
    {
    {
       __m128 xx;
       __m128 xx;
@@ -165,7 +165,7 @@ void iir_mem16_10(const float *x, const float *_den, float *y, int N, int ord, f
       yy = _mm_add_ss(xx, mem[0]);
       yy = _mm_add_ss(xx, mem[0]);
       _mm_store_ss(y+i, yy);
       _mm_store_ss(y+i, yy);
       yy = _mm_shuffle_ps(yy, yy, 0);
       yy = _mm_shuffle_ps(yy, yy, 0);
-      
+
       /* Update memory */
       /* Update memory */
       mem[0] = _mm_move_ss(mem[0], mem[1]);
       mem[0] = _mm_move_ss(mem[0], mem[1]);
       mem[0] = _mm_shuffle_ps(mem[0], mem[0], 0x39);
       mem[0] = _mm_shuffle_ps(mem[0], mem[0], 0x39);
@@ -202,7 +202,7 @@ void iir_mem16_8(const float *x, const float *_den, float *y, int N, int ord, fl
       mem[i] = _mm_loadu_ps(_mem+4*i);
       mem[i] = _mm_loadu_ps(_mem+4*i);
       den[i] = _mm_loadu_ps(_den+4*i);
       den[i] = _mm_loadu_ps(_den+4*i);
    }
    }
-   
+
    for (i=0;i<N;i++)
    for (i=0;i<N;i++)
    {
    {
       __m128 xx;
       __m128 xx;
@@ -212,7 +212,7 @@ void iir_mem16_8(const float *x, const float *_den, float *y, int N, int ord, fl
       yy = _mm_add_ss(xx, mem[0]);
       yy = _mm_add_ss(xx, mem[0]);
       _mm_store_ss(y+i, yy);
       _mm_store_ss(y+i, yy);
       yy = _mm_shuffle_ps(yy, yy, 0);
       yy = _mm_shuffle_ps(yy, yy, 0);
-      
+
       /* Update memory */
       /* Update memory */
       mem[0] = _mm_move_ss(mem[0], mem[1]);
       mem[0] = _mm_move_ss(mem[0], mem[1]);
       mem[0] = _mm_shuffle_ps(mem[0], mem[0], 0x39);
       mem[0] = _mm_shuffle_ps(mem[0], mem[0], 0x39);
@@ -253,7 +253,7 @@ void fir_mem16_10(const float *x, const float *_num, float *y, int N, int ord, f
    }
    }
    mem[2] = _mm_setr_ps(_mem[8], _mem[9], 0, 0);
    mem[2] = _mm_setr_ps(_mem[8], _mem[9], 0, 0);
    num[2] = _mm_setr_ps(_num[8], _num[9], 0, 0);
    num[2] = _mm_setr_ps(_num[8], _num[9], 0, 0);
-   
+
    for (i=0;i<N;i++)
    for (i=0;i<N;i++)
    {
    {
       __m128 xx;
       __m128 xx;
@@ -263,7 +263,7 @@ void fir_mem16_10(const float *x, const float *_num, float *y, int N, int ord, f
       yy = _mm_add_ss(xx, mem[0]);
       yy = _mm_add_ss(xx, mem[0]);
       _mm_store_ss(y+i, yy);
       _mm_store_ss(y+i, yy);
       yy = _mm_shuffle_ps(yy, yy, 0);
       yy = _mm_shuffle_ps(yy, yy, 0);
-      
+
       /* Update memory */
       /* Update memory */
       mem[0] = _mm_move_ss(mem[0], mem[1]);
       mem[0] = _mm_move_ss(mem[0], mem[1]);
       mem[0] = _mm_shuffle_ps(mem[0], mem[0], 0x39);
       mem[0] = _mm_shuffle_ps(mem[0], mem[0], 0x39);
@@ -299,7 +299,7 @@ void fir_mem16_8(const float *x, const float *_num, float *y, int N, int ord, fl
       mem[i] = _mm_loadu_ps(_mem+4*i);
       mem[i] = _mm_loadu_ps(_mem+4*i);
       num[i] = _mm_loadu_ps(_num+4*i);
       num[i] = _mm_loadu_ps(_num+4*i);
    }
    }
-   
+
    for (i=0;i<N;i++)
    for (i=0;i<N;i++)
    {
    {
       __m128 xx;
       __m128 xx;
@@ -309,7 +309,7 @@ void fir_mem16_8(const float *x, const float *_num, float *y, int N, int ord, fl
       yy = _mm_add_ss(xx, mem[0]);
       yy = _mm_add_ss(xx, mem[0]);
       _mm_store_ss(y+i, yy);
       _mm_store_ss(y+i, yy);
       yy = _mm_shuffle_ps(yy, yy, 0);
       yy = _mm_shuffle_ps(yy, yy, 0);
-      
+
       /* Update memory */
       /* Update memory */
       mem[0] = _mm_move_ss(mem[0], mem[1]);
       mem[0] = _mm_move_ss(mem[0], mem[1]);
       mem[0] = _mm_shuffle_ps(mem[0], mem[0], 0x39);
       mem[0] = _mm_shuffle_ps(mem[0], mem[0], 0x39);

+ 5 - 5
libspeex/fixed_arm4.h

@@ -7,18 +7,18 @@
    Redistribution and use in source and binary forms, with or without
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
    modification, are permitted provided that the following conditions
    are met:
    are met:
-   
+
    - Redistributions of source code must retain the above copyright
    - Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
    notice, this list of conditions and the following disclaimer.
-   
+
    - Redistributions in binary form must reproduce the above copyright
    - Redistributions in binary form must reproduce the above copyright
    notice, this list of conditions and the following disclaimer in the
    notice, this list of conditions and the following disclaimer in the
    documentation and/or other materials provided with the distribution.
    documentation and/or other materials provided with the distribution.
-   
+
    - Neither the name of the Xiph.org Foundation nor the names of its
    - Neither the name of the Xiph.org Foundation nor the names of its
    contributors may be used to endorse or promote products derived from
    contributors may be used to endorse or promote products derived from
    this software without specific prior written permission.
    this software without specific prior written permission.
-   
+
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -109,7 +109,7 @@ static inline short DIV32_16(int a, int b)
          "\tsubs %3, %0, %1, asl #6 \n"
          "\tsubs %3, %0, %1, asl #6 \n"
          "\tmovpl %0, %3 \n"
          "\tmovpl %0, %3 \n"
          "\torrpl %2, %2, %4, asl #6 \n"
          "\torrpl %2, %2, %4, asl #6 \n"
-         
+
          "\tsubs %3, %0, %1, asl #5 \n"
          "\tsubs %3, %0, %1, asl #5 \n"
          "\tmovpl %0, %3 \n"
          "\tmovpl %0, %3 \n"
          "\torrpl %2, %2, %4, asl #5 \n"
          "\torrpl %2, %2, %4, asl #5 \n"

+ 5 - 5
libspeex/fixed_arm5e.h

@@ -7,18 +7,18 @@
    Redistribution and use in source and binary forms, with or without
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
    modification, are permitted provided that the following conditions
    are met:
    are met:
-   
+
    - Redistributions of source code must retain the above copyright
    - Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
    notice, this list of conditions and the following disclaimer.
-   
+
    - Redistributions in binary form must reproduce the above copyright
    - Redistributions in binary form must reproduce the above copyright
    notice, this list of conditions and the following disclaimer in the
    notice, this list of conditions and the following disclaimer in the
    documentation and/or other materials provided with the distribution.
    documentation and/or other materials provided with the distribution.
-   
+
    - Neither the name of the Xiph.org Foundation nor the names of its
    - Neither the name of the Xiph.org Foundation nor the names of its
    contributors may be used to endorse or promote products derived from
    contributors may be used to endorse or promote products derived from
    this software without specific prior written permission.
    this software without specific prior written permission.
-   
+
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -161,7 +161,7 @@ static inline short DIV32_16(int a, int b)
          "\tsubs %3, %0, %1 \n"
          "\tsubs %3, %0, %1 \n"
          "\torrpl %2, %2, %4 \n"
          "\torrpl %2, %2, %4 \n"
          "\tmovpl %0, %3 \n"
          "\tmovpl %0, %3 \n"
-         
+
          "\tmovs %5, %5, lsr #31 \n"
          "\tmovs %5, %5, lsr #31 \n"
          "\trsbne %2, %2, #0 \n"
          "\trsbne %2, %2, #0 \n"
    : "=r" (dead1), "=r" (dead2), "=r" (res),
    : "=r" (dead1), "=r" (dead2), "=r" (res),

+ 6 - 6
libspeex/fixed_bfin.h

@@ -8,18 +8,18 @@
    Redistribution and use in source and binary forms, with or without
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
    modification, are permitted provided that the following conditions
    are met:
    are met:
-   
+
    - Redistributions of source code must retain the above copyright
    - Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
    notice, this list of conditions and the following disclaimer.
-   
+
    - Redistributions in binary form must reproduce the above copyright
    - Redistributions in binary form must reproduce the above copyright
    notice, this list of conditions and the following disclaimer in the
    notice, this list of conditions and the following disclaimer in the
    documentation and/or other materials provided with the distribution.
    documentation and/or other materials provided with the distribution.
-   
+
    - Neither the name of the Xiph.org Foundation nor the names of its
    - Neither the name of the Xiph.org Foundation nor the names of its
    contributors may be used to endorse or promote products derived from
    contributors may be used to endorse or promote products derived from
    this software without specific prior written permission.
    this software without specific prior written permission.
-   
+
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -68,9 +68,9 @@ static inline spx_word16_t DIV32_16(spx_word32_t a, spx_word16_t b)
 {
 {
    spx_word32_t res, bb;
    spx_word32_t res, bb;
    bb = b;
    bb = b;
-   /* Make the roundinf consistent with the C version 
+   /* Make the roundinf consistent with the C version
       (do we need to do that?)*/
       (do we need to do that?)*/
-   if (a<0) 
+   if (a<0)
       a += (b-1);
       a += (b-1);
    __asm__  (
    __asm__  (
          "P0 = 15;\n\t"
          "P0 = 15;\n\t"

+ 25 - 25
libspeex/fixed_debug.h

@@ -7,18 +7,18 @@
    Redistribution and use in source and binary forms, with or without
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
    modification, are permitted provided that the following conditions
    are met:
    are met:
-   
+
    - Redistributions of source code must retain the above copyright
    - Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
    notice, this list of conditions and the following disclaimer.
-   
+
    - Redistributions in binary form must reproduce the above copyright
    - Redistributions in binary form must reproduce the above copyright
    notice, this list of conditions and the following disclaimer in the
    notice, this list of conditions and the following disclaimer in the
    documentation and/or other materials provided with the distribution.
    documentation and/or other materials provided with the distribution.
-   
+
    - Neither the name of the Xiph.org Foundation nor the names of its
    - Neither the name of the Xiph.org Foundation nor the names of its
    contributors may be used to endorse or promote products derived from
    contributors may be used to endorse or promote products derived from
    this software without specific prior written permission.
    this software without specific prior written permission.
-   
+
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -101,7 +101,7 @@ static inline int _EXTEND32(int x, char *file, int line)
 }
 }
 
 
 #define SHR16(a, shift) _SHR16(a, shift, __FILE__, __LINE__)
 #define SHR16(a, shift) _SHR16(a, shift, __FILE__, __LINE__)
-static inline short _SHR16(int a, int shift, char *file, int line) 
+static inline short _SHR16(int a, int shift, char *file, int line)
 {
 {
    int res;
    int res;
    if (!VERIFY_SHORT(a) || !VERIFY_SHORT(shift))
    if (!VERIFY_SHORT(a) || !VERIFY_SHORT(shift))
@@ -115,7 +115,7 @@ static inline short _SHR16(int a, int shift, char *file, int line)
    return res;
    return res;
 }
 }
 #define SHL16(a, shift) _SHL16(a, shift, __FILE__, __LINE__)
 #define SHL16(a, shift) _SHL16(a, shift, __FILE__, __LINE__)
-static inline short _SHL16(int a, int shift, char *file, int line) 
+static inline short _SHL16(int a, int shift, char *file, int line)
 {
 {
    int res;
    int res;
    if (!VERIFY_SHORT(a) || !VERIFY_SHORT(shift))
    if (!VERIFY_SHORT(a) || !VERIFY_SHORT(shift))
@@ -129,7 +129,7 @@ static inline short _SHL16(int a, int shift, char *file, int line)
    return res;
    return res;
 }
 }
 
 
-static inline int SHR32(long long a, int shift) 
+static inline int SHR32(long long a, int shift)
 {
 {
    long long  res;
    long long  res;
    if (!VERIFY_INT(a) || !VERIFY_SHORT(shift))
    if (!VERIFY_INT(a) || !VERIFY_SHORT(shift))
@@ -144,7 +144,7 @@ static inline int SHR32(long long a, int shift)
    spx_mips++;
    spx_mips++;
    return res;
    return res;
 }
 }
-static inline int SHL32(long long a, int shift) 
+static inline int SHL32(long long a, int shift)
 {
 {
    long long  res;
    long long  res;
    if (!VERIFY_INT(a) || !VERIFY_SHORT(shift))
    if (!VERIFY_INT(a) || !VERIFY_SHORT(shift))
@@ -171,7 +171,7 @@ static inline int SHL32(long long a, int shift)
 //#define SHL(a,shift) ((a) << (shift))
 //#define SHL(a,shift) ((a) << (shift))
 
 
 #define ADD16(a, b) _ADD16(a, b, __FILE__, __LINE__)
 #define ADD16(a, b) _ADD16(a, b, __FILE__, __LINE__)
-static inline short _ADD16(int a, int b, char *file, int line) 
+static inline short _ADD16(int a, int b, char *file, int line)
 {
 {
    int res;
    int res;
    if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b))
    if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b))
@@ -188,7 +188,7 @@ static inline short _ADD16(int a, int b, char *file, int line)
 }
 }
 
 
 #define SUB16(a, b) _SUB16(a, b, __FILE__, __LINE__)
 #define SUB16(a, b) _SUB16(a, b, __FILE__, __LINE__)
-static inline short _SUB16(int a, int b, char *file, int line) 
+static inline short _SUB16(int a, int b, char *file, int line)
 {
 {
    int res;
    int res;
    if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b))
    if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b))
@@ -203,7 +203,7 @@ static inline short _SUB16(int a, int b, char *file, int line)
 }
 }
 
 
 #define ADD32(a, b) _ADD32(a, b, __FILE__, __LINE__)
 #define ADD32(a, b) _ADD32(a, b, __FILE__, __LINE__)
-static inline int _ADD32(long long a, long long b, char *file, int line) 
+static inline int _ADD32(long long a, long long b, char *file, int line)
 {
 {
    long long res;
    long long res;
    if (!VERIFY_INT(a) || !VERIFY_INT(b))
    if (!VERIFY_INT(a) || !VERIFY_INT(b))
@@ -219,7 +219,7 @@ static inline int _ADD32(long long a, long long b, char *file, int line)
    return res;
    return res;
 }
 }
 
 
-static inline int SUB32(long long a, long long b) 
+static inline int SUB32(long long a, long long b)
 {
 {
    long long res;
    long long res;
    if (!VERIFY_INT(a) || !VERIFY_INT(b))
    if (!VERIFY_INT(a) || !VERIFY_INT(b))
@@ -236,7 +236,7 @@ static inline int SUB32(long long a, long long b)
 #define ADD64(a,b) (MIPS_INC(a)+(b))
 #define ADD64(a,b) (MIPS_INC(a)+(b))
 
 
 /* result fits in 16 bits */
 /* result fits in 16 bits */
-static inline short MULT16_16_16(int a, int b) 
+static inline short MULT16_16_16(int a, int b)
 {
 {
    int res;
    int res;
    if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b))
    if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b))
@@ -251,7 +251,7 @@ static inline short MULT16_16_16(int a, int b)
 }
 }
 
 
 #define MULT16_16(a, b) _MULT16_16(a, b, __FILE__, __LINE__)
 #define MULT16_16(a, b) _MULT16_16(a, b, __FILE__, __LINE__)
-static inline int _MULT16_16(int a, int b, char *file, int line) 
+static inline int _MULT16_16(int a, int b, char *file, int line)
 {
 {
    long long res;
    long long res;
    if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b))
    if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b))
@@ -280,7 +280,7 @@ static inline int _MULT16_32_QX(int a, long long b, int Q, char *file, int line)
       fprintf (stderr, "MULT16_32_Q%d: inputs are not short+int: %d %d in %s: line %d\n", Q, (int)a, (int)b, file, line);
       fprintf (stderr, "MULT16_32_Q%d: inputs are not short+int: %d %d in %s: line %d\n", Q, (int)a, (int)b, file, line);
    }
    }
    if (ABS32(b)>=(EXTEND32(1)<<(15+Q)))
    if (ABS32(b)>=(EXTEND32(1)<<(15+Q)))
-      fprintf (stderr, "MULT16_32_Q%d: second operand too large: %d %d in %s: line %d\n", Q, (int)a, (int)b, file, line);      
+      fprintf (stderr, "MULT16_32_Q%d: second operand too large: %d %d in %s: line %d\n", Q, (int)a, (int)b, file, line);
    res = (((long long)a)*(long long)b) >> Q;
    res = (((long long)a)*(long long)b) >> Q;
    if (!VERIFY_INT(res))
    if (!VERIFY_INT(res))
       fprintf (stderr, "MULT16_32_Q%d: output is not int: %d*%d=%d in %s: line %d\n", Q, (int)a, (int)b,(int)res, file, line);
       fprintf (stderr, "MULT16_32_Q%d: output is not int: %d*%d=%d in %s: line %d\n", Q, (int)a, (int)b,(int)res, file, line);
@@ -296,7 +296,7 @@ static inline int MULT16_32_PX(int a, long long b, int Q)
       fprintf (stderr, "MULT16_32_P%d: inputs are not short+int: %d %d\n", Q, (int)a, (int)b);
       fprintf (stderr, "MULT16_32_P%d: inputs are not short+int: %d %d\n", Q, (int)a, (int)b);
    }
    }
    if (ABS32(b)>=(EXTEND32(1)<<(15+Q)))
    if (ABS32(b)>=(EXTEND32(1)<<(15+Q)))
-      fprintf (stderr, "MULT16_32_Q%d: second operand too large: %d %d\n", Q, (int)a, (int)b);      
+      fprintf (stderr, "MULT16_32_Q%d: second operand too large: %d %d\n", Q, (int)a, (int)b);
    res = ((((long long)a)*(long long)b) + ((EXTEND32(1)<<Q)>>1))>> Q;
    res = ((((long long)a)*(long long)b) + ((EXTEND32(1)<<Q)>>1))>> Q;
    if (!VERIFY_INT(res))
    if (!VERIFY_INT(res))
       fprintf (stderr, "MULT16_32_P%d: output is not int: %d*%d=%d\n", Q, (int)a, (int)b,(int)res);
       fprintf (stderr, "MULT16_32_P%d: output is not int: %d*%d=%d\n", Q, (int)a, (int)b,(int)res);
@@ -323,7 +323,7 @@ static inline int SATURATE(int a, int b)
    return a;
    return a;
 }
 }
 
 
-static inline int MULT16_16_Q11_32(int a, int b) 
+static inline int MULT16_16_Q11_32(int a, int b)
 {
 {
    long long res;
    long long res;
    if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b))
    if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b))
@@ -337,7 +337,7 @@ static inline int MULT16_16_Q11_32(int a, int b)
    spx_mips+=3;
    spx_mips+=3;
    return res;
    return res;
 }
 }
-static inline short MULT16_16_Q13(int a, int b) 
+static inline short MULT16_16_Q13(int a, int b)
 {
 {
    long long res;
    long long res;
    if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b))
    if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b))
@@ -351,7 +351,7 @@ static inline short MULT16_16_Q13(int a, int b)
    spx_mips+=3;
    spx_mips+=3;
    return res;
    return res;
 }
 }
-static inline short MULT16_16_Q14(int a, int b) 
+static inline short MULT16_16_Q14(int a, int b)
 {
 {
    long long res;
    long long res;
    if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b))
    if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b))
@@ -365,7 +365,7 @@ static inline short MULT16_16_Q14(int a, int b)
    spx_mips+=3;
    spx_mips+=3;
    return res;
    return res;
 }
 }
-static inline short MULT16_16_Q15(int a, int b) 
+static inline short MULT16_16_Q15(int a, int b)
 {
 {
    long long res;
    long long res;
    if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b))
    if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b))
@@ -382,7 +382,7 @@ static inline short MULT16_16_Q15(int a, int b)
    return res;
    return res;
 }
 }
 
 
-static inline short MULT16_16_P13(int a, int b) 
+static inline short MULT16_16_P13(int a, int b)
 {
 {
    long long res;
    long long res;
    if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b))
    if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b))
@@ -399,7 +399,7 @@ static inline short MULT16_16_P13(int a, int b)
    spx_mips+=4;
    spx_mips+=4;
    return res;
    return res;
 }
 }
-static inline short MULT16_16_P14(int a, int b) 
+static inline short MULT16_16_P14(int a, int b)
 {
 {
    long long res;
    long long res;
    if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b))
    if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b))
@@ -416,7 +416,7 @@ static inline short MULT16_16_P14(int a, int b)
    spx_mips+=4;
    spx_mips+=4;
    return res;
    return res;
 }
 }
-static inline short MULT16_16_P15(int a, int b) 
+static inline short MULT16_16_P15(int a, int b)
 {
 {
    long long res;
    long long res;
    if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b))
    if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b))
@@ -436,7 +436,7 @@ static inline short MULT16_16_P15(int a, int b)
 
 
 #define DIV32_16(a, b) _DIV32_16(a, b, __FILE__, __LINE__)
 #define DIV32_16(a, b) _DIV32_16(a, b, __FILE__, __LINE__)
 
 
-static inline int _DIV32_16(long long a, long long b, char *file, int line) 
+static inline int _DIV32_16(long long a, long long b, char *file, int line)
 {
 {
    long long res;
    long long res;
    if (b==0)
    if (b==0)
@@ -462,7 +462,7 @@ static inline int _DIV32_16(long long a, long long b, char *file, int line)
 }
 }
 
 
 #define DIV32(a, b) _DIV32(a, b, __FILE__, __LINE__)
 #define DIV32(a, b) _DIV32(a, b, __FILE__, __LINE__)
-static inline int _DIV32(long long a, long long b, char *file, int line) 
+static inline int _DIV32(long long a, long long b, char *file, int line)
 {
 {
    long long res;
    long long res;
    if (b==0)
    if (b==0)

+ 4 - 4
libspeex/fixed_generic.h

@@ -7,18 +7,18 @@
    Redistribution and use in source and binary forms, with or without
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
    modification, are permitted provided that the following conditions
    are met:
    are met:
-   
+
    - Redistributions of source code must retain the above copyright
    - Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
    notice, this list of conditions and the following disclaimer.
-   
+
    - Redistributions in binary form must reproduce the above copyright
    - Redistributions in binary form must reproduce the above copyright
    notice, this list of conditions and the following disclaimer in the
    notice, this list of conditions and the following disclaimer in the
    documentation and/or other materials provided with the distribution.
    documentation and/or other materials provided with the distribution.
-   
+
    - Neither the name of the Xiph.org Foundation nor the names of its
    - Neither the name of the Xiph.org Foundation nor the names of its
    contributors may be used to endorse or promote products derived from
    contributors may be used to endorse or promote products derived from
    this software without specific prior written permission.
    this software without specific prior written permission.
-   
+
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

+ 13 - 13
libspeex/kiss_fft.h

@@ -26,13 +26,13 @@ extern "C" {
 # include <xmmintrin.h>
 # include <xmmintrin.h>
 # define kiss_fft_scalar __m128
 # define kiss_fft_scalar __m128
 #define KISS_FFT_MALLOC(nbytes) memalign(16,nbytes)
 #define KISS_FFT_MALLOC(nbytes) memalign(16,nbytes)
-#else	
+#else
 #define KISS_FFT_MALLOC speex_alloc
 #define KISS_FFT_MALLOC speex_alloc
-#endif	
+#endif
 
 
 
 
 #ifdef FIXED_POINT
 #ifdef FIXED_POINT
-#include "arch.h"	
+#include "arch.h"
 #  define kiss_fft_scalar spx_int16_t
 #  define kiss_fft_scalar spx_int16_t
 #else
 #else
 # ifndef kiss_fft_scalar
 # ifndef kiss_fft_scalar
@@ -48,9 +48,9 @@ typedef struct {
 
 
 typedef struct kiss_fft_state* kiss_fft_cfg;
 typedef struct kiss_fft_state* kiss_fft_cfg;
 
 
-/* 
+/*
  *  kiss_fft_alloc
  *  kiss_fft_alloc
- *  
+ *
  *  Initialize a FFT (or IFFT) algorithm's cfg/state buffer.
  *  Initialize a FFT (or IFFT) algorithm's cfg/state buffer.
  *
  *
  *  typical usage:      kiss_fft_cfg mycfg=kiss_fft_alloc(1024,0,NULL,NULL);
  *  typical usage:      kiss_fft_cfg mycfg=kiss_fft_alloc(1024,0,NULL,NULL);
@@ -60,18 +60,18 @@ typedef struct kiss_fft_state* kiss_fft_cfg;
  *
  *
  *  If lenmem is NULL, then kiss_fft_alloc will allocate a cfg buffer using malloc.
  *  If lenmem is NULL, then kiss_fft_alloc will allocate a cfg buffer using malloc.
  *  The returned value should be free()d when done to avoid memory leaks.
  *  The returned value should be free()d when done to avoid memory leaks.
- *  
+ *
  *  The state can be placed in a user supplied buffer 'mem':
  *  The state can be placed in a user supplied buffer 'mem':
  *  If lenmem is not NULL and mem is not NULL and *lenmem is large enough,
  *  If lenmem is not NULL and mem is not NULL and *lenmem is large enough,
  *      then the function places the cfg in mem and the size used in *lenmem
  *      then the function places the cfg in mem and the size used in *lenmem
  *      and returns mem.
  *      and returns mem.
- *  
+ *
  *  If lenmem is not NULL and ( mem is NULL or *lenmem is not large enough),
  *  If lenmem is not NULL and ( mem is NULL or *lenmem is not large enough),
- *      then the function returns NULL and places the minimum cfg 
+ *      then the function returns NULL and places the minimum cfg
  *      buffer size in *lenmem.
  *      buffer size in *lenmem.
  * */
  * */
 
 
-kiss_fft_cfg kiss_fft_alloc(int nfft,int inverse_fft,void * mem,size_t * lenmem); 
+kiss_fft_cfg kiss_fft_alloc(int nfft,int inverse_fft,void * mem,size_t * lenmem);
 
 
 /*
 /*
  * kiss_fft(cfg,in_out_buf)
  * kiss_fft(cfg,in_out_buf)
@@ -90,19 +90,19 @@ void kiss_fft(kiss_fft_cfg cfg,const kiss_fft_cpx *fin,kiss_fft_cpx *fout);
  * */
  * */
 void kiss_fft_stride(kiss_fft_cfg cfg,const kiss_fft_cpx *fin,kiss_fft_cpx *fout,int fin_stride);
 void kiss_fft_stride(kiss_fft_cfg cfg,const kiss_fft_cpx *fin,kiss_fft_cpx *fout,int fin_stride);
 
 
-/* If kiss_fft_alloc allocated a buffer, it is one contiguous 
+/* If kiss_fft_alloc allocated a buffer, it is one contiguous
    buffer and can be simply free()d when no longer needed*/
    buffer and can be simply free()d when no longer needed*/
 #define kiss_fft_free speex_free
 #define kiss_fft_free speex_free
 
 
 /*
 /*
- Cleans up some memory that gets managed internally. Not necessary to call, but it might clean up 
+ Cleans up some memory that gets managed internally. Not necessary to call, but it might clean up
  your compiler output to call this before you exit.
  your compiler output to call this before you exit.
 */
 */
 void kiss_fft_cleanup(void);
 void kiss_fft_cleanup(void);
-	
+
 
 
 #ifdef __cplusplus
 #ifdef __cplusplus
-} 
+}
 #endif
 #endif
 
 
 #endif
 #endif

+ 6 - 6
libspeex/kiss_fftr.h

@@ -6,13 +6,13 @@
 extern "C" {
 extern "C" {
 #endif
 #endif
 
 
-    
-/* 
- 
+
+/*
+
  Real optimized version can save about 45% cpu time vs. complex fft of a real seq.
  Real optimized version can save about 45% cpu time vs. complex fft of a real seq.
 
 
- 
- 
+
+
  */
  */
 
 
 typedef struct kiss_fftr_state *kiss_fftr_cfg;
 typedef struct kiss_fftr_state *kiss_fftr_cfg;
@@ -22,7 +22,7 @@ kiss_fftr_cfg kiss_fftr_alloc(int nfft,int inverse_fft,void * mem, size_t * lenm
 /*
 /*
  nfft must be even
  nfft must be even
 
 
- If you don't care to allocate space, use mem = lenmem = NULL 
+ If you don't care to allocate space, use mem = lenmem = NULL
 */
 */
 
 
 
 

+ 4 - 4
libspeex/lpc.h

@@ -7,18 +7,18 @@
    Redistribution and use in source and binary forms, with or without
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
    modification, are permitted provided that the following conditions
    are met:
    are met:
-   
+
    - Redistributions of source code must retain the above copyright
    - Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
    notice, this list of conditions and the following disclaimer.
-   
+
    - Redistributions in binary form must reproduce the above copyright
    - Redistributions in binary form must reproduce the above copyright
    notice, this list of conditions and the following disclaimer in the
    notice, this list of conditions and the following disclaimer in the
    documentation and/or other materials provided with the distribution.
    documentation and/or other materials provided with the distribution.
-   
+
    - Neither the name of the Xiph.org Foundation nor the names of its
    - Neither the name of the Xiph.org Foundation nor the names of its
    contributors may be used to endorse or promote products derived from
    contributors may be used to endorse or promote products derived from
    this software without specific prior written permission.
    this software without specific prior written permission.
-   
+
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

+ 10 - 10
libspeex/lpc_bfin.h

@@ -1,25 +1,25 @@
 /* Copyright (C) 2005 Analog Devices */
 /* Copyright (C) 2005 Analog Devices */
 /**
 /**
    @file lpc_bfin.h
    @file lpc_bfin.h
-   @author Jean-Marc Valin 
+   @author Jean-Marc Valin
    @brief Functions for LPC (Linear Prediction Coefficients) analysis (Blackfin version)
    @brief Functions for LPC (Linear Prediction Coefficients) analysis (Blackfin version)
 */
 */
 /*
 /*
    Redistribution and use in source and binary forms, with or without
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
    modification, are permitted provided that the following conditions
    are met:
    are met:
-   
+
    - Redistributions of source code must retain the above copyright
    - Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
    notice, this list of conditions and the following disclaimer.
-   
+
    - Redistributions in binary form must reproduce the above copyright
    - Redistributions in binary form must reproduce the above copyright
    notice, this list of conditions and the following disclaimer in the
    notice, this list of conditions and the following disclaimer in the
    documentation and/or other materials provided with the distribution.
    documentation and/or other materials provided with the distribution.
-   
+
    - Neither the name of the Xiph.org Foundation nor the names of its
    - Neither the name of the Xiph.org Foundation nor the names of its
    contributors may be used to endorse or promote products derived from
    contributors may be used to endorse or promote products derived from
    this software without specific prior written permission.
    this software without specific prior written permission.
-   
+
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -39,7 +39,7 @@
 void _spx_autocorr(
 void _spx_autocorr(
 const spx_word16_t *x,   /*  in: [0...n-1] samples x   */
 const spx_word16_t *x,   /*  in: [0...n-1] samples x   */
 spx_word16_t       *ac,  /* out: [0...lag-1] ac values */
 spx_word16_t       *ac,  /* out: [0...lag-1] ac values */
-int          lag, 
+int          lag,
 int          n
 int          n
                   )
                   )
 {
 {
@@ -69,10 +69,10 @@ int          n
       ac_shift--;
       ac_shift--;
       ac0 <<= 1;
       ac0 <<= 1;
    }
    }
-   
+
    xs = x+lag-1;
    xs = x+lag-1;
    nshift = -shift;
    nshift = -shift;
-   __asm__ __volatile__ 
+   __asm__ __volatile__
    (
    (
          "P2 = %0;\n\t"
          "P2 = %0;\n\t"
          "I0 = P2;\n\t" /* x in I0 */
          "I0 = P2;\n\t" /* x in I0 */
@@ -102,7 +102,7 @@ int          n
             "LOOP_END inner_prod%=;\n\t"
             "LOOP_END inner_prod%=;\n\t"
             "A0 = ASHIFT A0 by R4.L;\n\t"
             "A0 = ASHIFT A0 by R4.L;\n\t"
             "A1 = ASHIFT A1 by R4.L;\n\t"
             "A1 = ASHIFT A1 by R4.L;\n\t"
-   
+
             "R2 = A0, R3 = A1;\n\t"
             "R2 = A0, R3 = A1;\n\t"
             "[P1--] = R2;\n\t"
             "[P1--] = R2;\n\t"
             "[P1--] = R3;\n\t"
             "[P1--] = R3;\n\t"
@@ -118,7 +118,7 @@ int          n
       d = ADD32(d,SHR32(MULT16_16(x[j],x[j]), shift));
       d = ADD32(d,SHR32(MULT16_16(x[j],x[j]), shift));
    }
    }
    ac32[0] = d;
    ac32[0] = d;
-   
+
    for (i=0;i<lag;i++)
    for (i=0;i<lag;i++)
    {
    {
       d=0;
       d=0;

+ 4 - 4
libspeex/lsp.h

@@ -23,18 +23,18 @@ Modified by Jean-Marc Valin
    Redistribution and use in source and binary forms, with or without
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
    modification, are permitted provided that the following conditions
    are met:
    are met:
-   
+
    - Redistributions of source code must retain the above copyright
    - Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
    notice, this list of conditions and the following disclaimer.
-   
+
    - Redistributions in binary form must reproduce the above copyright
    - Redistributions in binary form must reproduce the above copyright
    notice, this list of conditions and the following disclaimer in the
    notice, this list of conditions and the following disclaimer in the
    documentation and/or other materials provided with the distribution.
    documentation and/or other materials provided with the distribution.
-   
+
    - Neither the name of the Xiph.org Foundation nor the names of its
    - Neither the name of the Xiph.org Foundation nor the names of its
    contributors may be used to endorse or promote products derived from
    contributors may be used to endorse or promote products derived from
    this software without specific prior written permission.
    this software without specific prior written permission.
-   
+
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

+ 7 - 7
libspeex/lsp_bfin.h

@@ -8,18 +8,18 @@
    Redistribution and use in source and binary forms, with or without
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
    modification, are permitted provided that the following conditions
    are met:
    are met:
-   
+
    - Redistributions of source code must retain the above copyright
    - Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
    notice, this list of conditions and the following disclaimer.
-   
+
    - Redistributions in binary form must reproduce the above copyright
    - Redistributions in binary form must reproduce the above copyright
    notice, this list of conditions and the following disclaimer in the
    notice, this list of conditions and the following disclaimer in the
    documentation and/or other materials provided with the distribution.
    documentation and/or other materials provided with the distribution.
-   
+
    - Neither the name of the Xiph.org Foundation nor the names of its
    - Neither the name of the Xiph.org Foundation nor the names of its
    contributors may be used to endorse or promote products derived from
    contributors may be used to endorse or promote products derived from
    this software without specific prior written permission.
    this software without specific prior written permission.
-   
+
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -60,13 +60,13 @@ static inline spx_word32_t cheb_poly_eva(
       "R5 = R5.L * R2.L (IS);\n\t"
       "R5 = R5.L * R2.L (IS);\n\t"
       "R5 = R5 + R4;\n\t"
       "R5 = R5 + R4;\n\t"
       "R5 >>>= 14;\n\t"
       "R5 >>>= 14;\n\t"
-      "R3 = R3 + R5;\n\t" 
-      
+      "R3 = R3 + R5;\n\t"
+
       "R0 = R2;\n\t"           /* R0: b0 */
       "R0 = R2;\n\t"           /* R0: b0 */
       "R1 = 16384;\n\t"        /* R1: b1 */
       "R1 = 16384;\n\t"        /* R1: b1 */
       "LOOP cpe%= LC0 = %3;\n\t"
       "LOOP cpe%= LC0 = %3;\n\t"
       "LOOP_BEGIN cpe%=;\n\t"
       "LOOP_BEGIN cpe%=;\n\t"
-        "P1 = R0;\n\t" 
+        "P1 = R0;\n\t"
         "R0 = R2.L * R0.L (IS) || R5 = W[P0--] (X);\n\t"
         "R0 = R2.L * R0.L (IS) || R5 = W[P0--] (X);\n\t"
         "R0 >>>= 13;\n\t"
         "R0 >>>= 13;\n\t"
         "R0 = R0 - R1;\n\t"
         "R0 = R0 - R1;\n\t"

+ 4 - 4
libspeex/ltp.h

@@ -7,18 +7,18 @@
    Redistribution and use in source and binary forms, with or without
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
    modification, are permitted provided that the following conditions
    are met:
    are met:
-   
+
    - Redistributions of source code must retain the above copyright
    - Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
    notice, this list of conditions and the following disclaimer.
-   
+
    - Redistributions in binary form must reproduce the above copyright
    - Redistributions in binary form must reproduce the above copyright
    notice, this list of conditions and the following disclaimer in the
    notice, this list of conditions and the following disclaimer in the
    documentation and/or other materials provided with the distribution.
    documentation and/or other materials provided with the distribution.
-   
+
    - Neither the name of the Xiph.org Foundation nor the names of its
    - Neither the name of the Xiph.org Foundation nor the names of its
    contributors may be used to endorse or promote products derived from
    contributors may be used to endorse or promote products derived from
    this software without specific prior written permission.
    this software without specific prior written permission.
-   
+
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

+ 6 - 6
libspeex/ltp_arm4.h

@@ -7,18 +7,18 @@
    Redistribution and use in source and binary forms, with or without
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
    modification, are permitted provided that the following conditions
    are met:
    are met:
-   
+
    - Redistributions of source code must retain the above copyright
    - Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
    notice, this list of conditions and the following disclaimer.
-   
+
    - Redistributions in binary form must reproduce the above copyright
    - Redistributions in binary form must reproduce the above copyright
    notice, this list of conditions and the following disclaimer in the
    notice, this list of conditions and the following disclaimer in the
    documentation and/or other materials provided with the distribution.
    documentation and/or other materials provided with the distribution.
-   
+
    - Neither the name of the Xiph.org Foundation nor the names of its
    - Neither the name of the Xiph.org Foundation nor the names of its
    contributors may be used to endorse or promote products derived from
    contributors may be used to endorse or promote products derived from
    this software without specific prior written permission.
    this software without specific prior written permission.
-   
+
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -117,8 +117,8 @@ void pitch_xcorr(const spx_word16_t *_x, const spx_word16_t *_y, spx_word32_t *c
                "\tmul %6, %10, %2 \n"
                "\tmul %6, %10, %2 \n"
                "\tldrsh %1, [%9], #2 \n"
                "\tldrsh %1, [%9], #2 \n"
                "\tmul %7, %10, %3 \n"
                "\tmul %7, %10, %3 \n"
-               
-               
+
+
                "\tmla %4, %15, %2, %4 \n"
                "\tmla %4, %15, %2, %4 \n"
                "\tldrsh %2, [%9], #2 \n"
                "\tldrsh %2, [%9], #2 \n"
                "\tmla %5, %15, %3, %5 \n"
                "\tmla %5, %15, %3, %5 \n"

+ 28 - 28
libspeex/ltp_bfin.h

@@ -8,18 +8,18 @@
    Redistribution and use in source and binary forms, with or without
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
    modification, are permitted provided that the following conditions
    are met:
    are met:
-   
+
    - Redistributions of source code must retain the above copyright
    - Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
    notice, this list of conditions and the following disclaimer.
-   
+
    - Redistributions in binary form must reproduce the above copyright
    - Redistributions in binary form must reproduce the above copyright
    notice, this list of conditions and the following disclaimer in the
    notice, this list of conditions and the following disclaimer in the
    documentation and/or other materials provided with the distribution.
    documentation and/or other materials provided with the distribution.
-   
+
    - Neither the name of the Xiph.org Foundation nor the names of its
    - Neither the name of the Xiph.org Foundation nor the names of its
    contributors may be used to endorse or promote products derived from
    contributors may be used to endorse or promote products derived from
    this software without specific prior written permission.
    this software without specific prior written permission.
-   
+
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -118,35 +118,35 @@ static inline spx_word32_t compute_pitch_error(spx_word16_t *C, spx_word16_t *g,
    __asm__ __volatile__
    __asm__ __volatile__
          (
          (
          "A0 = 0;\n\t"
          "A0 = 0;\n\t"
-         
+
          "R0 = W[%1++];\n\t"
          "R0 = W[%1++];\n\t"
          "R1.L = %2.L*%5.L (IS);\n\t"
          "R1.L = %2.L*%5.L (IS);\n\t"
          "A0 += R1.L*R0.L (IS) || R0 = W[%1++];\n\t"
          "A0 += R1.L*R0.L (IS) || R0 = W[%1++];\n\t"
-         
+
          "R1.L = %3.L*%5.L (IS);\n\t"
          "R1.L = %3.L*%5.L (IS);\n\t"
          "A0 += R1.L*R0.L (IS) || R0 = W[%1++];\n\t"
          "A0 += R1.L*R0.L (IS) || R0 = W[%1++];\n\t"
-         
+
          "R1.L = %4.L*%5.L (IS);\n\t"
          "R1.L = %4.L*%5.L (IS);\n\t"
          "A0 += R1.L*R0.L (IS) || R0 = W[%1++];\n\t"
          "A0 += R1.L*R0.L (IS) || R0 = W[%1++];\n\t"
-         
+
          "R1.L = %2.L*%3.L (IS);\n\t"
          "R1.L = %2.L*%3.L (IS);\n\t"
          "A0 -= R1.L*R0.L (IS) || R0 = W[%1++];\n\t"
          "A0 -= R1.L*R0.L (IS) || R0 = W[%1++];\n\t"
 
 
          "R1.L = %4.L*%3.L (IS);\n\t"
          "R1.L = %4.L*%3.L (IS);\n\t"
          "A0 -= R1.L*R0.L (IS) || R0 = W[%1++];\n\t"
          "A0 -= R1.L*R0.L (IS) || R0 = W[%1++];\n\t"
-         
+
          "R1.L = %4.L*%2.L (IS);\n\t"
          "R1.L = %4.L*%2.L (IS);\n\t"
          "A0 -= R1.L*R0.L (IS) || R0 = W[%1++];\n\t"
          "A0 -= R1.L*R0.L (IS) || R0 = W[%1++];\n\t"
-         
+
          "R1.L = %2.L*%2.L (IS);\n\t"
          "R1.L = %2.L*%2.L (IS);\n\t"
          "A0 -= R1.L*R0.L (IS) || R0 = W[%1++];\n\t"
          "A0 -= R1.L*R0.L (IS) || R0 = W[%1++];\n\t"
 
 
          "R1.L = %3.L*%3.L (IS);\n\t"
          "R1.L = %3.L*%3.L (IS);\n\t"
          "A0 -= R1.L*R0.L (IS) || R0 = W[%1++];\n\t"
          "A0 -= R1.L*R0.L (IS) || R0 = W[%1++];\n\t"
-         
+
          "R1.L = %4.L*%4.L (IS);\n\t"
          "R1.L = %4.L*%4.L (IS);\n\t"
          "A0 -= R1.L*R0.L (IS);\n\t"
          "A0 -= R1.L*R0.L (IS);\n\t"
-         
+
          "%0 = A0;\n\t"
          "%0 = A0;\n\t"
    : "=&D" (sum), "=a" (C)
    : "=&D" (sum), "=a" (C)
    : "d" (g[0]), "d" (g[1]), "d" (g[2]), "d" (pitch_control), "1" (C)
    : "d" (g[0]), "d" (g[1]), "d" (g[2]), "d" (pitch_control), "1" (C)
@@ -203,7 +203,7 @@ void open_loop_nbest_pitch(spx_word16_t *sw, int start, int end, int len, int *p
 "          R2 = MAX(R1,R3);\n\t"
 "          R2 = MAX(R1,R3);\n\t"
 "eu2:      [P0++] = R2;\n\t"
 "eu2:      [P0++] = R2;\n\t"
        : : "d" (energy), "d" (&sw[-start-1]), "d" (&sw[-start+len-1]),
        : : "d" (energy), "d" (&sw[-start-1]), "d" (&sw[-start+len-1]),
-           "a" (end-start)  
+           "a" (end-start)
        : "P0", "I1", "I2", "R0", "R1", "R2", "R3", "ASTAT" BFIN_HWLOOP1_REGS
        : "P0", "I1", "I2", "R0", "R1", "R2", "R3", "ASTAT" BFIN_HWLOOP1_REGS
        );
        );
 
 
@@ -232,7 +232,7 @@ void open_loop_nbest_pitch(spx_word16_t *sw, int start, int end, int len, int *p
 "        P0 = %4;\n\t"                     /* P0: best pitch  */
 "        P0 = %4;\n\t"                     /* P0: best pitch  */
 "        P1 = %4;\n\t"                     /* P1: counter     */
 "        P1 = %4;\n\t"                     /* P1: counter     */
 "        LSETUP (sl1, sl2) LC1 = %3;\n\t"
 "        LSETUP (sl1, sl2) LC1 = %3;\n\t"
-"sl1:      R0.L = W [I0++] || R1.L = W [I1++];\n\t"         
+"sl1:      R0.L = W [I0++] || R1.L = W [I1++];\n\t"
 "          R0 = R0.L * R0.L (IS);\n\t"
 "          R0 = R0.L * R0.L (IS);\n\t"
 "          R1   += 1;\n\t"
 "          R1   += 1;\n\t"
 "          R4   = R0.L * R3.L;\n\t"
 "          R4   = R0.L * R3.L;\n\t"
@@ -244,7 +244,7 @@ void open_loop_nbest_pitch(spx_word16_t *sw, int start, int end, int len, int *p
 "sl2:      P1 += 1;\n\t"
 "sl2:      P1 += 1;\n\t"
 "        %0 = P0;\n\t"
 "        %0 = P0;\n\t"
        : "=&d" (pitch[0])
        : "=&d" (pitch[0])
-       : "a" (corr16), "a" (ener16), "a" (end+1-start), "d" (start) 
+       : "a" (corr16), "a" (ener16), "a" (end+1-start), "d" (start)
        : "P0", "P1", "I0", "I1", "R0", "R1", "R2", "R3", "R4", "R5",
        : "P0", "P1", "I0", "I1", "R0", "R1", "R2", "R3", "R4", "R5",
          "ASTAT", "CC" BFIN_HWLOOP1_REGS
          "ASTAT", "CC" BFIN_HWLOOP1_REGS
        );
        );
@@ -338,39 +338,39 @@ static int pitch_gain_search_3tap_vq(
 "          R4 += 32;\n\t"
 "          R4 += 32;\n\t"
 "          R4.H = 64;\n\t"                 /* R4.H: pitch_control    */
 "          R4.H = 64;\n\t"                 /* R4.H: pitch_control    */
 
 
-"          R0  = B [P0++] (X);\n\t"              
+"          R0  = B [P0++] (X);\n\t"
 "          B0  = R0;\n\t"                  /* BO: gain_sum         */
 "          B0  = R0;\n\t"                  /* BO: gain_sum         */
-          
+
            /* compute_pitch_error() -------------------------------*/
            /* compute_pitch_error() -------------------------------*/
 
 
 "          I1 = %3;\n\t"                   /* I1: ptr to C         */
 "          I1 = %3;\n\t"                   /* I1: ptr to C         */
 "          A0 = 0;\n\t"
 "          A0 = 0;\n\t"
-         
+
 "          R0.L = W[I1++];\n\t"
 "          R0.L = W[I1++];\n\t"
 "          R1.L = R2.L*R4.H (IS);\n\t"
 "          R1.L = R2.L*R4.H (IS);\n\t"
 "          A0 += R1.L*R0.L (IS) || R0.L = W[I1++];\n\t"
 "          A0 += R1.L*R0.L (IS) || R0.L = W[I1++];\n\t"
-         
+
 "          R1.L = R3.L*R4.H (IS);\n\t"
 "          R1.L = R3.L*R4.H (IS);\n\t"
 "          A0 += R1.L*R0.L (IS) || R0.L = W[I1++];\n\t"
 "          A0 += R1.L*R0.L (IS) || R0.L = W[I1++];\n\t"
-         
+
 "          R1.L = R4.L*R4.H (IS);\n\t"
 "          R1.L = R4.L*R4.H (IS);\n\t"
 "          A0 += R1.L*R0.L (IS) || R0.L = W[I1++];\n\t"
 "          A0 += R1.L*R0.L (IS) || R0.L = W[I1++];\n\t"
-         
+
 "          R1.L = R2.L*R3.L (IS);\n\t"
 "          R1.L = R2.L*R3.L (IS);\n\t"
 "          A0 -= R1.L*R0.L (IS) || R0.L = W[I1++];\n\t"
 "          A0 -= R1.L*R0.L (IS) || R0.L = W[I1++];\n\t"
 
 
 "          R1.L = R4.L*R3.L (IS);\n\t"
 "          R1.L = R4.L*R3.L (IS);\n\t"
 "          A0 -= R1.L*R0.L (IS) || R0.L = W[I1++];\n\t"
 "          A0 -= R1.L*R0.L (IS) || R0.L = W[I1++];\n\t"
-         
+
 "          R1.L = R4.L*R2.L (IS);\n\t"
 "          R1.L = R4.L*R2.L (IS);\n\t"
 "          A0 -= R1.L*R0.L (IS) || R0.L = W[I1++];\n\t"
 "          A0 -= R1.L*R0.L (IS) || R0.L = W[I1++];\n\t"
-         
+
 "          R1.L = R2.L*R2.L (IS);\n\t"
 "          R1.L = R2.L*R2.L (IS);\n\t"
 "          A0 -= R1.L*R0.L (IS) || R0.L = W[I1++];\n\t"
 "          A0 -= R1.L*R0.L (IS) || R0.L = W[I1++];\n\t"
 
 
 "          R1.L = R3.L*R3.L (IS);\n\t"
 "          R1.L = R3.L*R3.L (IS);\n\t"
 "          A0 -= R1.L*R0.L (IS) || R0.L = W[I1++];\n\t"
 "          A0 -= R1.L*R0.L (IS) || R0.L = W[I1++];\n\t"
-         
+
 "          R1.L = R4.L*R4.L (IS);\n\t"
 "          R1.L = R4.L*R4.L (IS);\n\t"
 "          R0 = (A0 -= R1.L*R0.L) (IS);\n\t"
 "          R0 = (A0 -= R1.L*R0.L) (IS);\n\t"
 
 
@@ -393,18 +393,18 @@ static int pitch_gain_search_3tap_vq(
 "          R1 = B0\n\t"
 "          R1 = B0\n\t"
 "          R2 = %5\n\t"
 "          R2 = %5\n\t"
 "          R3 = %6\n\t"
 "          R3 = %6\n\t"
-"          cc = R2 <= R1;\n\t" 
+"          cc = R2 <= R1;\n\t"
 "          if cc R0 = R3;\n\t"
 "          if cc R0 = R3;\n\t"
 "          cc = %0 <= R0;\n\t"
 "          cc = %0 <= R0;\n\t"
 "          if cc %0 = R0;\n\t"
 "          if cc %0 = R0;\n\t"
 "          if cc %1 = P1;\n\t"
 "          if cc %1 = P1;\n\t"
 
 
 "pgs2:     P1 += 1;\n\t"
 "pgs2:     P1 += 1;\n\t"
-   
-       : "=&d" (best_sum), "=&d" (best_cdbk) 
+
+       : "=&d" (best_sum), "=&d" (best_cdbk)
        : "a" (gain_cdbk), "a" (C16), "a" (gain_cdbk_size), "a" (max_gain),
        : "a" (gain_cdbk), "a" (C16), "a" (gain_cdbk_size), "a" (max_gain),
          "b" (-VERY_LARGE32)
          "b" (-VERY_LARGE32)
-       : "R0", "R1", "R2", "R3", "R4", "P0", 
+       : "R0", "R1", "R2", "R3", "R4", "P0",
          "P1", "I1", "L1", "A0", "B0", "CC", "ASTAT" BFIN_HWLOOP1_REGS
          "P1", "I1", "L1", "A0", "B0", "CC", "ASTAT" BFIN_HWLOOP1_REGS
        );
        );
 
 

+ 4 - 4
libspeex/ltp_sse.h

@@ -7,18 +7,18 @@
    Redistribution and use in source and binary forms, with or without
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
    modification, are permitted provided that the following conditions
    are met:
    are met:
-   
+
    - Redistributions of source code must retain the above copyright
    - Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
    notice, this list of conditions and the following disclaimer.
-   
+
    - Redistributions in binary form must reproduce the above copyright
    - Redistributions in binary form must reproduce the above copyright
    notice, this list of conditions and the following disclaimer in the
    notice, this list of conditions and the following disclaimer in the
    documentation and/or other materials provided with the distribution.
    documentation and/or other materials provided with the distribution.
-   
+
    - Neither the name of the Xiph.org Foundation nor the names of its
    - Neither the name of the Xiph.org Foundation nor the names of its
    contributors may be used to endorse or promote products derived from
    contributors may be used to endorse or promote products derived from
    this software without specific prior written permission.
    this software without specific prior written permission.
-   
+
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

+ 7 - 7
libspeex/math_approx.h

@@ -7,18 +7,18 @@
    Redistribution and use in source and binary forms, with or without
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
    modification, are permitted provided that the following conditions
    are met:
    are met:
-   
+
    - Redistributions of source code must retain the above copyright
    - Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
    notice, this list of conditions and the following disclaimer.
-   
+
    - Redistributions in binary form must reproduce the above copyright
    - Redistributions in binary form must reproduce the above copyright
    notice, this list of conditions and the following disclaimer in the
    notice, this list of conditions and the following disclaimer in the
    documentation and/or other materials provided with the distribution.
    documentation and/or other materials provided with the distribution.
-   
+
    - Neither the name of the Xiph.org Foundation nor the names of its
    - Neither the name of the Xiph.org Foundation nor the names of its
    contributors may be used to endorse or promote products derived from
    contributors may be used to endorse or promote products derived from
    this software without specific prior written permission.
    this software without specific prior written permission.
-   
+
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -168,11 +168,11 @@ static inline spx_word16_t spx_acos(spx_word16_t x)
       x = NEG16(x);
       x = NEG16(x);
    }
    }
    x = SUB16(16384,x);
    x = SUB16(16384,x);
-   
+
    x = x >> 1;
    x = x >> 1;
    sq = MULT16_16_Q13(x, ADD16(A1, MULT16_16_Q13(x, ADD16(A2, MULT16_16_Q13(x, (A3))))));
    sq = MULT16_16_Q13(x, ADD16(A1, MULT16_16_Q13(x, ADD16(A2, MULT16_16_Q13(x, (A3))))));
    ret = spx_sqrt(SHL32(EXTEND32(sq),13));
    ret = spx_sqrt(SHL32(EXTEND32(sq),13));
-   
+
    /*ret = spx_sqrt(67108864*(-1.6129e-04 + 2.0104e+00*f + 2.7373e-01*f*f + 1.8136e-01*f*f*f));*/
    /*ret = spx_sqrt(67108864*(-1.6129e-04 + 2.0104e+00*f + 2.7373e-01*f*f + 1.8136e-01*f*f*f));*/
    if (s)
    if (s)
       ret = SUB16(25736,ret);
       ret = SUB16(25736,ret);
@@ -208,7 +208,7 @@ static inline spx_word16_t spx_cos(spx_word16_t x)
 static inline spx_word16_t _spx_cos_pi_2(spx_word16_t x)
 static inline spx_word16_t _spx_cos_pi_2(spx_word16_t x)
 {
 {
    spx_word16_t x2;
    spx_word16_t x2;
-   
+
    x2 = MULT16_16_P15(x,x);
    x2 = MULT16_16_P15(x,x);
    return ADD16(1,MIN16(32766,ADD32(SUB16(L1,x2), MULT16_16_P15(x2, ADD32(L2, MULT16_16_P15(x2, ADD32(L3, MULT16_16_P15(L4, x2))))))));
    return ADD16(1,MIN16(32766,ADD32(SUB16(L1,x2), MULT16_16_P15(x2, ADD32(L2, MULT16_16_P15(x2, ADD32(L3, MULT16_16_P15(L4, x2))))))));
 }
 }

+ 5 - 5
libspeex/misc_bfin.h

@@ -1,25 +1,25 @@
 /* Copyright (C) 2005 Analog Devices */
 /* Copyright (C) 2005 Analog Devices */
 /**
 /**
    @file misc_bfin.h
    @file misc_bfin.h
-   @author Jean-Marc Valin 
+   @author Jean-Marc Valin
    @brief Various compatibility routines for Speex (Blackfin version)
    @brief Various compatibility routines for Speex (Blackfin version)
 */
 */
 /*
 /*
    Redistribution and use in source and binary forms, with or without
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
    modification, are permitted provided that the following conditions
    are met:
    are met:
-   
+
    - Redistributions of source code must retain the above copyright
    - Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
    notice, this list of conditions and the following disclaimer.
-   
+
    - Redistributions in binary form must reproduce the above copyright
    - Redistributions in binary form must reproduce the above copyright
    notice, this list of conditions and the following disclaimer in the
    notice, this list of conditions and the following disclaimer in the
    documentation and/or other materials provided with the distribution.
    documentation and/or other materials provided with the distribution.
-   
+
    - Neither the name of the Xiph.org Foundation nor the names of its
    - Neither the name of the Xiph.org Foundation nor the names of its
    contributors may be used to endorse or promote products derived from
    contributors may be used to endorse or promote products derived from
    this software without specific prior written permission.
    this software without specific prior written permission.
-   
+
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

+ 7 - 7
libspeex/modes.h

@@ -7,18 +7,18 @@
    Redistribution and use in source and binary forms, with or without
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
    modification, are permitted provided that the following conditions
    are met:
    are met:
-   
+
    - Redistributions of source code must retain the above copyright
    - Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
    notice, this list of conditions and the following disclaimer.
-   
+
    - Redistributions in binary form must reproduce the above copyright
    - Redistributions in binary form must reproduce the above copyright
    notice, this list of conditions and the following disclaimer in the
    notice, this list of conditions and the following disclaimer in the
    documentation and/or other materials provided with the distribution.
    documentation and/or other materials provided with the distribution.
-   
+
    - Neither the name of the Xiph.org Foundation nor the names of its
    - Neither the name of the Xiph.org Foundation nor the names of its
    contributors may be used to endorse or promote products derived from
    contributors may be used to endorse or promote products derived from
    this software without specific prior written permission.
    this software without specific prior written permission.
-   
+
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -71,8 +71,8 @@ typedef void (*lsp_unquant_func)(spx_lsp_t *, int, SpeexBits *);
 
 
 
 
 /** Long-term predictor quantization */
 /** Long-term predictor quantization */
-typedef int (*ltp_quant_func)(spx_word16_t *, spx_word16_t *, spx_coef_t *, spx_coef_t *, 
-                              spx_coef_t *, spx_sig_t *, const void *, int, int, spx_word16_t, 
+typedef int (*ltp_quant_func)(spx_word16_t *, spx_word16_t *, spx_coef_t *, spx_coef_t *,
+                              spx_coef_t *, spx_sig_t *, const void *, int, int, spx_word16_t,
                               int, int, SpeexBits*, char *, spx_word16_t *, spx_word16_t *, int, int, int, spx_word32_t *);
                               int, int, SpeexBits*, char *, spx_word16_t *, spx_word16_t *, int, int, int, spx_word32_t *);
 
 
 /** Long-term un-quantize */
 /** Long-term un-quantize */
@@ -81,7 +81,7 @@ typedef void (*ltp_unquant_func)(spx_word16_t *, spx_word32_t *, int, int, spx_w
 
 
 
 
 /** Innovation quantization function */
 /** Innovation quantization function */
-typedef void (*innovation_quant_func)(spx_word16_t *, spx_coef_t *, spx_coef_t *, spx_coef_t *, const void *, int, int, 
+typedef void (*innovation_quant_func)(spx_word16_t *, spx_coef_t *, spx_coef_t *, spx_coef_t *, const void *, int, int,
                                       spx_sig_t *, spx_word16_t *, SpeexBits *, char *, int, int);
                                       spx_sig_t *, spx_word16_t *, SpeexBits *, char *, int, int);
 
 
 /** Innovation unquantization function */
 /** Innovation unquantization function */

+ 8 - 8
libspeex/nb_celp.h

@@ -7,18 +7,18 @@
    Redistribution and use in source and binary forms, with or without
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
    modification, are permitted provided that the following conditions
    are met:
    are met:
-   
+
    - Redistributions of source code must retain the above copyright
    - Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
    notice, this list of conditions and the following disclaimer.
-   
+
    - Redistributions in binary form must reproduce the above copyright
    - Redistributions in binary form must reproduce the above copyright
    notice, this list of conditions and the following disclaimer in the
    notice, this list of conditions and the following disclaimer in the
    documentation and/or other materials provided with the distribution.
    documentation and/or other materials provided with the distribution.
-   
+
    - Neither the name of the Xiph.org Foundation nor the names of its
    - Neither the name of the Xiph.org Foundation nor the names of its
    contributors may be used to endorse or promote products derived from
    contributors may be used to endorse or promote products derived from
    this software without specific prior written permission.
    this software without specific prior written permission.
-   
+
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -109,7 +109,7 @@ typedef struct EncState {
    float  abr_drift2;
    float  abr_drift2;
    float  abr_count;
    float  abr_count;
 #endif /* #ifndef DISABLE_VBR */
 #endif /* #ifndef DISABLE_VBR */
-   
+
    int    complexity;            /**< Complexity setting (0-10 from least complex to most complex) */
    int    complexity;            /**< Complexity setting (0-10 from least complex to most complex) */
    spx_int32_t sampling_rate;
    spx_int32_t sampling_rate;
    int    plc_tuning;
    int    plc_tuning;
@@ -139,18 +139,18 @@ typedef struct DecState {
    spx_mem_t mem_hp[2];         /**< High-pass filter memory */
    spx_mem_t mem_hp[2];         /**< High-pass filter memory */
    spx_word32_t pi_gain[NB_NB_SUBFRAMES];       /**< Gain of LPC filter at theta=pi (fe/2) */
    spx_word32_t pi_gain[NB_NB_SUBFRAMES];       /**< Gain of LPC filter at theta=pi (fe/2) */
    spx_word16_t *innov_save;    /** If non-NULL, innovation is copied here */
    spx_word16_t *innov_save;    /** If non-NULL, innovation is copied here */
-   
+
    spx_word16_t level;
    spx_word16_t level;
    spx_word16_t max_level;
    spx_word16_t max_level;
    spx_word16_t min_level;
    spx_word16_t min_level;
-   
+
    /* This is used in packet loss concealment */
    /* This is used in packet loss concealment */
    int    last_pitch;           /**< Pitch of last correctly decoded frame */
    int    last_pitch;           /**< Pitch of last correctly decoded frame */
    spx_word16_t  last_pitch_gain; /**< Pitch gain of last correctly decoded frame */
    spx_word16_t  last_pitch_gain; /**< Pitch gain of last correctly decoded frame */
    spx_word16_t  pitch_gain_buf[3]; /**< Pitch gain of last decoded frames */
    spx_word16_t  pitch_gain_buf[3]; /**< Pitch gain of last decoded frames */
    int    pitch_gain_buf_idx;   /**< Tail of the buffer */
    int    pitch_gain_buf_idx;   /**< Tail of the buffer */
    spx_uint32_t seed;            /** Seed used for random number generation */
    spx_uint32_t seed;            /** Seed used for random number generation */
-   
+
    int    encode_submode;
    int    encode_submode;
    const SpeexSubmode * const *submodes; /**< Sub-mode data */
    const SpeexSubmode * const *submodes; /**< Sub-mode data */
    int    submodeID;            /**< Activated sub-mode */
    int    submodeID;            /**< Activated sub-mode */

+ 3 - 3
libspeex/os_support.h

@@ -1,5 +1,5 @@
 /* Copyright (C) 2007 Jean-Marc Valin
 /* Copyright (C) 2007 Jean-Marc Valin
-      
+
    File: os_support.h
    File: os_support.h
    This is the (tiny) OS abstraction layer. Aside from math.h, this is the
    This is the (tiny) OS abstraction layer. Aside from math.h, this is the
    only place where system headers are allowed.
    only place where system headers are allowed.
@@ -45,12 +45,12 @@
 #include "os_support_custom.h"
 #include "os_support_custom.h"
 #endif
 #endif
 
 
-/** Speex wrapper for calloc. To do your own dynamic allocation, all you need to do is replace this function, speex_realloc and speex_free 
+/** Speex wrapper for calloc. To do your own dynamic allocation, all you need to do is replace this function, speex_realloc and speex_free
     NOTE: speex_alloc needs to CLEAR THE MEMORY */
     NOTE: speex_alloc needs to CLEAR THE MEMORY */
 #ifndef OVERRIDE_SPEEX_ALLOC
 #ifndef OVERRIDE_SPEEX_ALLOC
 static inline void *speex_alloc (int size)
 static inline void *speex_alloc (int size)
 {
 {
-   /* WARNING: this is not equivalent to malloc(). If you want to use malloc() 
+   /* WARNING: this is not equivalent to malloc(). If you want to use malloc()
       or your own allocator, YOU NEED TO CLEAR THE MEMORY ALLOCATED. Otherwise
       or your own allocator, YOU NEED TO CLEAR THE MEMORY ALLOCATED. Otherwise
       you will experience strange bugs */
       you will experience strange bugs */
    return calloc(size,1);
    return calloc(size,1);

+ 4 - 4
libspeex/quant_lsp.h

@@ -7,18 +7,18 @@
    Redistribution and use in source and binary forms, with or without
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
    modification, are permitted provided that the following conditions
    are met:
    are met:
-   
+
    - Redistributions of source code must retain the above copyright
    - Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
    notice, this list of conditions and the following disclaimer.
-   
+
    - Redistributions in binary form must reproduce the above copyright
    - Redistributions in binary form must reproduce the above copyright
    notice, this list of conditions and the following disclaimer in the
    notice, this list of conditions and the following disclaimer in the
    documentation and/or other materials provided with the distribution.
    documentation and/or other materials provided with the distribution.
-   
+
    - Neither the name of the Xiph.org Foundation nor the names of its
    - Neither the name of the Xiph.org Foundation nor the names of its
    contributors may be used to endorse or promote products derived from
    contributors may be used to endorse or promote products derived from
    this software without specific prior written permission.
    this software without specific prior written permission.
-   
+
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

+ 22 - 22
libspeex/quant_lsp_bfin.h

@@ -8,18 +8,18 @@
    Redistribution and use in source and binary forms, with or without
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
    modification, are permitted provided that the following conditions
    are met:
    are met:
-   
+
    - Redistributions of source code must retain the above copyright
    - Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
    notice, this list of conditions and the following disclaimer.
-   
+
    - Redistributions in binary form must reproduce the above copyright
    - Redistributions in binary form must reproduce the above copyright
    notice, this list of conditions and the following disclaimer in the
    notice, this list of conditions and the following disclaimer in the
    documentation and/or other materials provided with the distribution.
    documentation and/or other materials provided with the distribution.
-   
+
    - Neither the name of the Xiph.org Foundation nor the names of its
    - Neither the name of the Xiph.org Foundation nor the names of its
    contributors may be used to endorse or promote products derived from
    contributors may be used to endorse or promote products derived from
    this software without specific prior written permission.
    this software without specific prior written permission.
-   
+
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -45,9 +45,9 @@
 */
 */
 
 
 static int lsp_quant(
 static int lsp_quant(
-  spx_word16_t      *x, 
-  const signed char *cdbk, 
-  int                nbVec, 
+  spx_word16_t      *x,
+  const signed char *cdbk,
+  int                nbVec,
   int                nbDim
   int                nbDim
 )
 )
 {
 {
@@ -57,23 +57,23 @@ static int lsp_quant(
 
 
    __asm__ __volatile__
    __asm__ __volatile__
      (
      (
-"	%0 = 1 (X);\n\t"                       /* %0: best_dist */    
-"	%0 <<= 30;\n\t"     
+"	%0 = 1 (X);\n\t"                       /* %0: best_dist */
+"	%0 <<= 30;\n\t"
 "	%1 = 0 (X);\n\t"                       /* %1: best_i         */
 "	%1 = 0 (X);\n\t"                       /* %1: best_i         */
 "       P2 = %3\n\t"                           /* P2: ptr to cdbk    */
 "       P2 = %3\n\t"                           /* P2: ptr to cdbk    */
 "       R5 = 0;\n\t"                           /* R5: best cb entry  */
 "       R5 = 0;\n\t"                           /* R5: best cb entry  */
 
 
 "       R0 = %5;\n\t"                          /* set up circ addr   */
 "       R0 = %5;\n\t"                          /* set up circ addr   */
 "       R0 <<= 1;\n\t"
 "       R0 <<= 1;\n\t"
-"       L0 = R0;\n\t"                          
+"       L0 = R0;\n\t"
 "       I0 = %2;\n\t"                          /* %2: &x[0]          */
 "       I0 = %2;\n\t"                          /* %2: &x[0]          */
-"       B0 = %2;\n\t"                          
+"       B0 = %2;\n\t"
 
 
 "       R2.L = W [I0++];\n\t"
 "       R2.L = W [I0++];\n\t"
 "	LSETUP (1f, 2f) LC0 = %4;\n\t"
 "	LSETUP (1f, 2f) LC0 = %4;\n\t"
 "1:	  R3 = 0;\n\t"                         /* R3: dist           */
 "1:	  R3 = 0;\n\t"                         /* R3: dist           */
 "	  LSETUP (3f, 4f) LC1 = %5;\n\t"
 "	  LSETUP (3f, 4f) LC1 = %5;\n\t"
-"3:       R1 = B [P2++] (X);\n\t"            
+"3:       R1 = B [P2++] (X);\n\t"
 "	    R1 <<= 5;\n\t"
 "	    R1 <<= 5;\n\t"
 "	    R0.L = R2.L - R1.L || R2.L = W [I0++];\n\t"
 "	    R0.L = R2.L - R1.L || R2.L = W [I0++];\n\t"
 "	    R0 = R0.L*R0.L;\n\t"
 "	    R0 = R0.L*R0.L;\n\t"
@@ -107,10 +107,10 @@ static int lsp_quant(
 */
 */
 
 
 static int lsp_weight_quant(
 static int lsp_weight_quant(
-  spx_word16_t      *x, 
-  spx_word16_t      *weight, 
-  const signed char *cdbk, 
-  int                nbVec, 
+  spx_word16_t      *x,
+  spx_word16_t      *weight,
+  const signed char *cdbk,
+  int                nbVec,
   int                nbDim
   int                nbDim
 )
 )
 {
 {
@@ -120,26 +120,26 @@ static int lsp_weight_quant(
 
 
    __asm__ __volatile__
    __asm__ __volatile__
      (
      (
-"	%0 = 1 (X);\n\t"                       /* %0: best_dist */    
-"	%0 <<= 30;\n\t"     
+"	%0 = 1 (X);\n\t"                       /* %0: best_dist */
+"	%0 <<= 30;\n\t"
 "	%1 = 0 (X);\n\t"                       /* %1: best_i         */
 "	%1 = 0 (X);\n\t"                       /* %1: best_i         */
 "       P2 = %4\n\t"                           /* P2: ptr to cdbk    */
 "       P2 = %4\n\t"                           /* P2: ptr to cdbk    */
 "       R5 = 0;\n\t"                           /* R5: best cb entry  */
 "       R5 = 0;\n\t"                           /* R5: best cb entry  */
 
 
 "       R0 = %6;\n\t"                          /* set up circ addr   */
 "       R0 = %6;\n\t"                          /* set up circ addr   */
 "       R0 <<= 1;\n\t"
 "       R0 <<= 1;\n\t"
-"       L0 = R0;\n\t"                          
+"       L0 = R0;\n\t"
 "       L1 = R0;\n\t"
 "       L1 = R0;\n\t"
 "       I0 = %2;\n\t"                          /* %2: &x[0]          */
 "       I0 = %2;\n\t"                          /* %2: &x[0]          */
 "	I1 = %3;\n\t"                          /* %3: &weight[0]     */
 "	I1 = %3;\n\t"                          /* %3: &weight[0]     */
-"       B0 = %2;\n\t"                          
-"	B1 = %3;\n\t"                          
+"       B0 = %2;\n\t"
+"	B1 = %3;\n\t"
 
 
 "	LSETUP (1f, 2f) LC0 = %5;\n\t"
 "	LSETUP (1f, 2f) LC0 = %5;\n\t"
 "1:	  R3 = 0 (X);\n\t"                     /* R3: dist           */
 "1:	  R3 = 0 (X);\n\t"                     /* R3: dist           */
 "	  LSETUP (3f, 4f) LC1 = %6;\n\t"
 "	  LSETUP (3f, 4f) LC1 = %6;\n\t"
 "3:	    R0.L = W [I0++] || R2.L = W [I1++];\n\t"
 "3:	    R0.L = W [I0++] || R2.L = W [I1++];\n\t"
-"           R1 = B [P2++] (X);\n\t"            
+"           R1 = B [P2++] (X);\n\t"
 "	    R1 <<= 5;\n\t"
 "	    R1 <<= 5;\n\t"
 "	    R0.L = R0.L - R1.L;\n\t"
 "	    R0.L = R0.L - R1.L;\n\t"
 "           R0 = R0.L*R0.L;\n\t"
 "           R0 = R0.L*R0.L;\n\t"

+ 6 - 6
libspeex/sb_celp.h

@@ -7,18 +7,18 @@
    Redistribution and use in source and binary forms, with or without
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
    modification, are permitted provided that the following conditions
    are met:
    are met:
-   
+
    - Redistributions of source code must retain the above copyright
    - Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
    notice, this list of conditions and the following disclaimer.
-   
+
    - Redistributions in binary form must reproduce the above copyright
    - Redistributions in binary form must reproduce the above copyright
    notice, this list of conditions and the following disclaimer in the
    notice, this list of conditions and the following disclaimer in the
    documentation and/or other materials provided with the distribution.
    documentation and/or other materials provided with the distribution.
-   
+
    - Neither the name of the Xiph.org Foundation nor the names of its
    - Neither the name of the Xiph.org Foundation nor the names of its
    contributors may be used to endorse or promote products derived from
    contributors may be used to endorse or promote products derived from
    this software without specific prior written permission.
    this software without specific prior written permission.
-   
+
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -83,7 +83,7 @@ typedef struct SBEncState {
    int    vad_enabled;            /**< 1 for enabling VAD, 0 otherwise */
    int    vad_enabled;            /**< 1 for enabling VAD, 0 otherwise */
    float  relative_quality;
    float  relative_quality;
 #endif /* #ifndef DISABLE_VBR */
 #endif /* #ifndef DISABLE_VBR */
-   
+
    int    encode_submode;
    int    encode_submode;
    const SpeexSubmode * const *submodes;
    const SpeexSubmode * const *submodes;
    int    submodeID;
    int    submodeID;
@@ -118,7 +118,7 @@ typedef struct SBDecState {
    spx_word32_t *pi_gain;
    spx_word32_t *pi_gain;
    spx_word16_t *exc_rms;
    spx_word16_t *exc_rms;
    spx_word16_t *innov_save;      /** If non-NULL, innovation is copied here */
    spx_word16_t *innov_save;      /** If non-NULL, innovation is copied here */
-   
+
    spx_word16_t last_ener;
    spx_word16_t last_ener;
    spx_uint32_t seed;
    spx_uint32_t seed;
 
 

+ 5 - 5
libspeex/stack_alloc.h

@@ -7,18 +7,18 @@
    Redistribution and use in source and binary forms, with or without
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
    modification, are permitted provided that the following conditions
    are met:
    are met:
-   
+
    - Redistributions of source code must retain the above copyright
    - Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
    notice, this list of conditions and the following disclaimer.
-   
+
    - Redistributions in binary form must reproduce the above copyright
    - Redistributions in binary form must reproduce the above copyright
    notice, this list of conditions and the following disclaimer in the
    notice, this list of conditions and the following disclaimer in the
    documentation and/or other materials provided with the distribution.
    documentation and/or other materials provided with the distribution.
-   
+
    - Neither the name of the Xiph.org Foundation nor the names of its
    - Neither the name of the Xiph.org Foundation nor the names of its
    contributors may be used to endorse or promote products derived from
    contributors may be used to endorse or promote products derived from
    this software without specific prior written permission.
    this software without specific prior written permission.
-   
+
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -101,7 +101,7 @@
 #endif
 #endif
 
 
 #if defined(VAR_ARRAYS)
 #if defined(VAR_ARRAYS)
-#define VARDECL(var) 
+#define VARDECL(var)
 #define ALLOC(var, size, type) type var[size]
 #define ALLOC(var, size, type) type var[size]
 #elif defined(USE_ALLOCA)
 #elif defined(USE_ALLOCA)
 #define VARDECL(var) var
 #define VARDECL(var) var

+ 4 - 4
libspeex/vbr.h

@@ -7,18 +7,18 @@
    Redistribution and use in source and binary forms, with or without
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
    modification, are permitted provided that the following conditions
    are met:
    are met:
-   
+
    - Redistributions of source code must retain the above copyright
    - Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
    notice, this list of conditions and the following disclaimer.
-   
+
    - Redistributions in binary form must reproduce the above copyright
    - Redistributions in binary form must reproduce the above copyright
    notice, this list of conditions and the following disclaimer in the
    notice, this list of conditions and the following disclaimer in the
    documentation and/or other materials provided with the distribution.
    documentation and/or other materials provided with the distribution.
-   
+
    - Neither the name of the Xiph.org Foundation nor the names of its
    - Neither the name of the Xiph.org Foundation nor the names of its
    contributors may be used to endorse or promote products derived from
    contributors may be used to endorse or promote products derived from
    this software without specific prior written permission.
    this software without specific prior written permission.
-   
+
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

+ 5 - 5
libspeex/vorbis_psy.h

@@ -4,18 +4,18 @@
    Redistribution and use in source and binary forms, with or without
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
    modification, are permitted provided that the following conditions
    are met:
    are met:
-   
+
    - Redistributions of source code must retain the above copyright
    - Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
    notice, this list of conditions and the following disclaimer.
-   
+
    - Redistributions in binary form must reproduce the above copyright
    - Redistributions in binary form must reproduce the above copyright
    notice, this list of conditions and the following disclaimer in the
    notice, this list of conditions and the following disclaimer in the
    documentation and/or other materials provided with the distribution.
    documentation and/or other materials provided with the distribution.
-   
+
    - Neither the name of the Xiph.org Foundation nor the names of its
    - Neither the name of the Xiph.org Foundation nor the names of its
    contributors may be used to endorse or promote products derived from
    contributors may be used to endorse or promote products derived from
    this software without specific prior written permission.
    this software without specific prior written permission.
-   
+
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -40,7 +40,7 @@
 
 
 
 
 #define todB(x)   ((x)>1e-13?log((x)*(x))*4.34294480f:-30)
 #define todB(x)   ((x)>1e-13?log((x)*(x))*4.34294480f:-30)
-#define fromdB(x) (exp((x)*.11512925f))  
+#define fromdB(x) (exp((x)*.11512925f))
 
 
 /* The bark scale equations are approximations, since the original
 /* The bark scale equations are approximations, since the original
    table was somewhat hand rolled.  The below are chosen to have the
    table was somewhat hand rolled.  The below are chosen to have the

+ 4 - 4
libspeex/vq.h

@@ -7,18 +7,18 @@
    Redistribution and use in source and binary forms, with or without
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
    modification, are permitted provided that the following conditions
    are met:
    are met:
-   
+
    - Redistributions of source code must retain the above copyright
    - Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
    notice, this list of conditions and the following disclaimer.
-   
+
    - Redistributions in binary form must reproduce the above copyright
    - Redistributions in binary form must reproduce the above copyright
    notice, this list of conditions and the following disclaimer in the
    notice, this list of conditions and the following disclaimer in the
    documentation and/or other materials provided with the distribution.
    documentation and/or other materials provided with the distribution.
-   
+
    - Neither the name of the Xiph.org Foundation nor the names of its
    - Neither the name of the Xiph.org Foundation nor the names of its
    contributors may be used to endorse or promote products derived from
    contributors may be used to endorse or promote products derived from
    this software without specific prior written permission.
    this software without specific prior written permission.
-   
+
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

+ 4 - 4
libspeex/vq_arm4.h

@@ -7,18 +7,18 @@
    Redistribution and use in source and binary forms, with or without
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
    modification, are permitted provided that the following conditions
    are met:
    are met:
-   
+
    - Redistributions of source code must retain the above copyright
    - Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
    notice, this list of conditions and the following disclaimer.
-   
+
    - Redistributions in binary form must reproduce the above copyright
    - Redistributions in binary form must reproduce the above copyright
    notice, this list of conditions and the following disclaimer in the
    notice, this list of conditions and the following disclaimer in the
    documentation and/or other materials provided with the distribution.
    documentation and/or other materials provided with the distribution.
-   
+
    - Neither the name of the Xiph.org Foundation nor the names of its
    - Neither the name of the Xiph.org Foundation nor the names of its
    contributors may be used to endorse or promote products derived from
    contributors may be used to endorse or promote products derived from
    this software without specific prior written permission.
    this software without specific prior written permission.
-   
+
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

+ 5 - 5
libspeex/vq_bfin.h

@@ -1,25 +1,25 @@
 /* Copyright (C) 2005 Analog Devices */
 /* Copyright (C) 2005 Analog Devices */
 /**
 /**
    @file vq_bfin.h
    @file vq_bfin.h
-   @author Jean-Marc Valin 
+   @author Jean-Marc Valin
    @brief Blackfin-optimized vq routine
    @brief Blackfin-optimized vq routine
 */
 */
 /*
 /*
    Redistribution and use in source and binary forms, with or without
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
    modification, are permitted provided that the following conditions
    are met:
    are met:
-   
+
    - Redistributions of source code must retain the above copyright
    - Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
    notice, this list of conditions and the following disclaimer.
-   
+
    - Redistributions in binary form must reproduce the above copyright
    - Redistributions in binary form must reproduce the above copyright
    notice, this list of conditions and the following disclaimer in the
    notice, this list of conditions and the following disclaimer in the
    documentation and/or other materials provided with the distribution.
    documentation and/or other materials provided with the distribution.
-   
+
    - Neither the name of the Xiph.org Foundation nor the names of its
    - Neither the name of the Xiph.org Foundation nor the names of its
    contributors may be used to endorse or promote products derived from
    contributors may be used to endorse or promote products derived from
    this software without specific prior written permission.
    this software without specific prior written permission.
-   
+
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

+ 2 - 2
speexclient/alsa_device.h

@@ -2,7 +2,7 @@
    Copyright (C) 2004-2006 Jean-Marc Valin
    Copyright (C) 2004-2006 Jean-Marc Valin
    Copyright (C) 2006 Commonwealth Scientific and Industrial Research
    Copyright (C) 2006 Commonwealth Scientific and Industrial Research
                       Organisation (CSIRO) Australia
                       Organisation (CSIRO) Australia
-   
+
    Redistribution and use in source and binary forms, with or without
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions are
    modification, are permitted provided that the following conditions are
    met:
    met:
@@ -28,7 +28,7 @@
    STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
    STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
    ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
    ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
    POSSIBILITY OF SUCH DAMAGE.
    POSSIBILITY OF SUCH DAMAGE.
- 
+
 */
 */
 
 
 #ifndef ALSA_DEVICE_H
 #ifndef ALSA_DEVICE_H

+ 2 - 2
speexclient/speex_jitter_buffer.h

@@ -27,8 +27,8 @@ typedef struct SpeexJitter {
    spx_int32_t frame_size;           /**< Frame size of Speex decoder */
    spx_int32_t frame_size;           /**< Frame size of Speex decoder */
 } SpeexJitter;
 } SpeexJitter;
 
 
-/** Initialise jitter buffer 
- * 
+/** Initialise jitter buffer
+ *
  * @param jitter State of the Speex jitter buffer
  * @param jitter State of the Speex jitter buffer
  * @param decoder Speex decoder to call
  * @param decoder Speex decoder to call
  * @param sampling_rate Sampling rate used by the decoder
  * @param sampling_rate Sampling rate used by the decoder

+ 5 - 5
ti/os_support_custom.h

@@ -1,23 +1,23 @@
 /* Copyright (C) 2007 Psi Systems, Inc.
 /* Copyright (C) 2007 Psi Systems, Inc.
-   Author:  Jean-Marc Valin 
+   Author:  Jean-Marc Valin
    File: os_support_custom.h
    File: os_support_custom.h
    Memory Allocation overrides to allow user control rather than C alloc/free.
    Memory Allocation overrides to allow user control rather than C alloc/free.
 
 
    Redistribution and use in source and binary forms, with or without
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
    modification, are permitted provided that the following conditions
    are met:
    are met:
-   
+
    - Redistributions of source code must retain the above copyright
    - Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
    notice, this list of conditions and the following disclaimer.
-   
+
    - Redistributions in binary form must reproduce the above copyright
    - Redistributions in binary form must reproduce the above copyright
    notice, this list of conditions and the following disclaimer in the
    notice, this list of conditions and the following disclaimer in the
    documentation and/or other materials provided with the distribution.
    documentation and/or other materials provided with the distribution.
-   
+
    - Neither the name of the Xiph.org Foundation nor the names of its
    - Neither the name of the Xiph.org Foundation nor the names of its
    contributors may be used to endorse or promote products derived from
    contributors may be used to endorse or promote products derived from
    this software without specific prior written permission.
    this software without specific prior written permission.
-   
+
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

+ 4 - 4
tmv/_kiss_fft_guts_tm.h

@@ -8,18 +8,18 @@
    Redistribution and use in source and binary forms, with or without
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
    modification, are permitted provided that the following conditions
    are met:
    are met:
-   
+
    - Redistributions of source code must retain the above copyright
    - Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
    notice, this list of conditions and the following disclaimer.
-   
+
    - Redistributions in binary form must reproduce the above copyright
    - Redistributions in binary form must reproduce the above copyright
    notice, this list of conditions and the following disclaimer in the
    notice, this list of conditions and the following disclaimer in the
    documentation and/or other materials provided with the distribution.
    documentation and/or other materials provided with the distribution.
-   
+
    - Neither the name of the Xiph.org Foundation nor the names of its
    - Neither the name of the Xiph.org Foundation nor the names of its
    contributors may be used to endorse or promote products derived from
    contributors may be used to endorse or promote products derived from
    this software without specific prior written permission.
    this software without specific prior written permission.
-   
+
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR