From 0bd2171b0ed6ffa591ec3d153fd53c42a42e9b94 Mon Sep 17 00:00:00 2001
From: Volker Fischer <corrados@users.noreply.github.com>
Date: Wed, 13 Feb 2013 18:48:36 +0000
Subject: [PATCH] rename files

---
 libs/celt/cc6__kiss_fft.c      |   6 +-
 libs/celt/cc6__kiss_fft_guts.h |   4 +-
 libs/celt/cc6__kiss_fftr.c     |   6 +-
 libs/celt/cc6_bands.c          |  12 ++--
 libs/celt/cc6_bands.h          |   4 +-
 libs/celt/cc6_celt.c           |  20 +++----
 libs/celt/cc6_cwrs.c           |   4 +-
 libs/celt/cc6_cwrs.h           |   2 +-
 libs/celt/cc6_entdec.c         |   2 +-
 libs/celt/cc6_entenc.c         |   2 +-
 libs/celt/cc6_header.c         |   4 +-
 libs/celt/cc6_kfft_double.h    |   2 +-
 libs/celt/cc6_kfft_single.h    |   4 +-
 libs/celt/cc6_mathops.h        |   4 +-
 libs/celt/cc6_mdct.c           |   4 +-
 libs/celt/cc6_pitch.c          |   4 +-
 libs/celt/cc6_pitch.h          | 106 ++++++++++++++++-----------------
 libs/celt/cc6_psy.c            |   2 +-
 libs/celt/cc6_quant_bands.c    |   2 +-
 libs/celt/cc6_quant_bands.h    |   2 +-
 libs/celt/cc6_rangedec.c       |   2 +-
 libs/celt/cc6_rangeenc.c       |   2 +-
 libs/celt/cc6_rate.c           |   2 +-
 23 files changed, 101 insertions(+), 101 deletions(-)

diff --git a/libs/celt/cc6__kiss_fft.c b/libs/celt/cc6__kiss_fft.c
index 4407b9a5..a8c39f5b 100755
--- a/libs/celt/cc6__kiss_fft.c
+++ b/libs/celt/cc6__kiss_fft.c
@@ -23,9 +23,9 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 
 #include "cc6__kiss_fft_guts.h"
 #include "cc6_arch.h"
-#include "os_support.h"
-#include "mathops.h"
-#include "stack_alloc.h"
+#include "cc6_os_support.h"
+#include "cc6_mathops.h"
+#include "cc6_stack_alloc.h"
 
 /* The guts header contains all the multiplication and addition macros that are defined for
    complex numbers.  It also delares the kf_ internal functions.
diff --git a/libs/celt/cc6__kiss_fft_guts.h b/libs/celt/cc6__kiss_fft_guts.h
index 055d3a39..b25b8a02 100755
--- a/libs/celt/cc6__kiss_fft_guts.h
+++ b/libs/celt/cc6__kiss_fft_guts.h
@@ -18,11 +18,11 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 #define MIN(a,b) ((a)<(b) ? (a):(b))
 #define MAX(a,b) ((a)>(b) ? (a):(b))
 
-/* kiss_fft.h
+/* cc6_kiss_fft.h
    defines kiss_fft_scalar as either short or a float type
    and defines
    typedef struct { kiss_fft_scalar r; kiss_fft_scalar i; }kiss_fft_cpx; */
-#include "kiss_fft.h"
+#include "cc6_kiss_fft.h"
 
 #define MAXFACTORS 32
 /* e.g. an fft of length 128 has 4 factors 
diff --git a/libs/celt/cc6__kiss_fftr.c b/libs/celt/cc6__kiss_fftr.c
index 37493f0d..870b2cf7 100755
--- a/libs/celt/cc6__kiss_fftr.c
+++ b/libs/celt/cc6__kiss_fftr.c
@@ -22,9 +22,9 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 #  endif
 #endif
 
-#include "os_support.h"
-#include "mathops.h"
-#include "kiss_fftr.h"
+#include "cc6_os_support.h"
+#include "cc6_mathops.h"
+#include "cc6_kiss_fftr.h"
 #include "cc6__kiss_fft_guts.h"
 
 
diff --git a/libs/celt/cc6_bands.c b/libs/celt/cc6_bands.c
index b1bba789..95c3d46d 100755
--- a/libs/celt/cc6_bands.c
+++ b/libs/celt/cc6_bands.c
@@ -35,13 +35,13 @@
 
 #include <math.h>
 #include "cc6_bands.h"
-#include "modes.h"
-#include "vq.h"
+#include "cc6_modes.h"
+#include "cc6_vq.h"
 #include "cc6_cwrs.h"
-#include "stack_alloc.h"
-#include "os_support.h"
-#include "mathops.h"
-#include "rate.h"
+#include "cc6_stack_alloc.h"
+#include "cc6_os_support.h"
+#include "cc6_mathops.h"
+#include "cc6_rate.h"
 
 const celt_word16_t sqrtC_1[2] = {QCONST16(1.f, 14), QCONST16(1.414214f, 14)};
 
diff --git a/libs/celt/cc6_bands.h b/libs/celt/cc6_bands.h
index 797fd978..4c9a9df3 100755
--- a/libs/celt/cc6_bands.h
+++ b/libs/celt/cc6_bands.h
@@ -33,10 +33,10 @@
 #define BANDS_H
 
 #include "cc6_arch.h"
-#include "modes.h"
+#include "cc6_modes.h"
 #include "cc6_entenc.h"
 #include "cc6_entdec.h"
-#include "rate.h"
+#include "cc6_rate.h"
 
 /** Compute the amplitude (sqrt energy) in each of the bands 
  * @param m Mode data 
diff --git a/libs/celt/cc6_celt.c b/libs/celt/cc6_celt.c
index 7f37f5d2..ff54b435 100755
--- a/libs/celt/cc6_celt.c
+++ b/libs/celt/cc6_celt.c
@@ -35,20 +35,20 @@
 
 #define CELT_C
 
-#include "os_support.h"
-#include "mdct.h"
+#include "cc6_os_support.h"
+#include "cc6_mdct.h"
 #include <math.h>
 #include "cc6_celt.h"
-#include "pitch.h"
-#include "kiss_fftr.h"
+#include "cc6_pitch.h"
+#include "cc6_kiss_fftr.h"
 #include "cc6_bands.h"
-#include "modes.h"
+#include "cc6_modes.h"
 #include "cc6_entcode.h"
-#include "quant_bands.h"
-#include "psy.h"
-#include "rate.h"
-#include "stack_alloc.h"
-#include "mathops.h"
+#include "cc6_quant_bands.h"
+#include "cc6_psy.h"
+#include "cc6_rate.h"
+#include "cc6_stack_alloc.h"
+#include "cc6_mathops.h"
 #include "cc6_float_cast.h"
 #include <stdarg.h>
 
diff --git a/libs/celt/cc6_cwrs.c b/libs/celt/cc6_cwrs.c
index d4208917..d13775b2 100755
--- a/libs/celt/cc6_cwrs.c
+++ b/libs/celt/cc6_cwrs.c
@@ -33,11 +33,11 @@
 #include "config.h"
 #endif
 
-#include "os_support.h"
+#include "cc6_os_support.h"
 #include <stdlib.h>
 #include <string.h>
 #include "cc6_cwrs.h"
-#include "mathops.h"
+#include "cc6_mathops.h"
 #include "cc6_arch.h"
 
 /*Guaranteed to return a conservatively large estimate of the binary logarithm
diff --git a/libs/celt/cc6_cwrs.h b/libs/celt/cc6_cwrs.h
index 699c5b79..79d4c2f2 100755
--- a/libs/celt/cc6_cwrs.h
+++ b/libs/celt/cc6_cwrs.h
@@ -32,7 +32,7 @@
 #define CWRS_H
 
 #include "cc6_arch.h"
-#include "stack_alloc.h"
+#include "cc6_stack_alloc.h"
 #include "cc6_entenc.h"
 #include "cc6_entdec.h"
 
diff --git a/libs/celt/cc6_entdec.c b/libs/celt/cc6_entdec.c
index 2efdba4e..c0150c79 100755
--- a/libs/celt/cc6_entdec.c
+++ b/libs/celt/cc6_entdec.c
@@ -35,7 +35,7 @@
 
 #include <stddef.h>
 #include "cc6_entdec.h"
-#include "os_support.h"
+#include "cc6_os_support.h"
 #include "cc6_arch.h"
 
 
diff --git a/libs/celt/cc6_entenc.c b/libs/celt/cc6_entenc.c
index 11c2178b..b0708152 100755
--- a/libs/celt/cc6_entenc.c
+++ b/libs/celt/cc6_entenc.c
@@ -33,7 +33,7 @@
 #include "config.h"
 #endif
 
-#include "os_support.h"
+#include "cc6_os_support.h"
 #include "cc6_entenc.h"
 #include "cc6_arch.h"
 
diff --git a/libs/celt/cc6_header.c b/libs/celt/cc6_header.c
index a24fa5ba..43a2b853 100755
--- a/libs/celt/cc6_header.c
+++ b/libs/celt/cc6_header.c
@@ -34,8 +34,8 @@
 #endif
 
 #include "cc6_celt_header.h"
-#include "os_support.h"
-#include "modes.h"
+#include "cc6_os_support.h"
+#include "cc6_modes.h"
 
 /*typedef struct {
    char         codec_id[8];
diff --git a/libs/celt/cc6_kfft_double.h b/libs/celt/cc6_kfft_double.h
index ab8452dd..d34a4b5a 100755
--- a/libs/celt/cc6_kfft_double.h
+++ b/libs/celt/cc6_kfft_double.h
@@ -55,7 +55,7 @@
 
 #else /* ENABLE_TI_DSPLIB */
 
-#include "kiss_fft.h"
+#include "cc6_kiss_fft.h"
 #include "cc6__kiss_fft_guts.h"
 
 #define cpx32_fft_alloc(length) kiss_fft_alloc(length, 0, 0);
diff --git a/libs/celt/cc6_kfft_single.h b/libs/celt/cc6_kfft_single.h
index 997b13c5..cef6a8ee 100755
--- a/libs/celt/cc6_kfft_single.h
+++ b/libs/celt/cc6_kfft_single.h
@@ -69,8 +69,8 @@
 
 #endif /* FIXED_POINT */
 
-#include "kiss_fft.h"
-#include "kiss_fftr.h"
+#include "cc6_kiss_fft.h"
+#include "cc6_kiss_fftr.h"
 #include "cc6__kiss_fft_guts.h"
 
 #define real16_fft_alloc(length) kiss_fftr_alloc_celt_single(length, 0, 0);
diff --git a/libs/celt/cc6_mathops.h b/libs/celt/cc6_mathops.h
index e1e1b534..0006cb12 100755
--- a/libs/celt/cc6_mathops.h
+++ b/libs/celt/cc6_mathops.h
@@ -37,7 +37,7 @@
 
 #include "cc6_arch.h"
 #include "cc6_entcode.h"
-#include "os_support.h"
+#include "cc6_os_support.h"
 
 #ifndef OVERRIDE_CELT_ILOG2
 /** Integer log in base2. Undefined for zero and negative numbers */
@@ -163,7 +163,7 @@ static inline float celt_exp2(float x)
 
 #ifdef FIXED_POINT
 
-#include "os_support.h"
+#include "cc6_os_support.h"
 
 #ifndef OVERRIDE_CELT_MAXABS16
 static inline celt_word16_t celt_maxabs16(celt_word16_t *x, int len)
diff --git a/libs/celt/cc6_mdct.c b/libs/celt/cc6_mdct.c
index 2da291b3..ed756e63 100755
--- a/libs/celt/cc6_mdct.c
+++ b/libs/celt/cc6_mdct.c
@@ -49,9 +49,9 @@
 #include "mdct.h"
 #include "cc6_kfft_double.h"
 #include <math.h>
-#include "os_support.h"
+#include "cc6_os_support.h"
 #include "mathops.h"
-#include "stack_alloc.h"
+#include "cc6_stack_alloc.h"
 
 #ifndef M_PI
 #define M_PI 3.141592653
diff --git a/libs/celt/cc6_pitch.c b/libs/celt/cc6_pitch.c
index 1343ad97..4c77a960 100755
--- a/libs/celt/cc6_pitch.c
+++ b/libs/celt/cc6_pitch.c
@@ -47,8 +47,8 @@
 #include "psy.h"
 #include "os_support.h"
 #include "mathops.h"
-#include "modes.h"
-#include "stack_alloc.h"
+#include "cc6_modes.h"
+#include "cc6_stack_alloc.h"
 
 kiss_fftr_cfg pitch_state_alloc(int max_lag)
 {
diff --git a/libs/celt/cc6_pitch.h b/libs/celt/cc6_pitch.h
index 70d436bf..ef5dc13b 100755
--- a/libs/celt/cc6_pitch.h
+++ b/libs/celt/cc6_pitch.h
@@ -1,53 +1,53 @@
-/* (C) 2007-2008 Jean-Marc Valin, CSIRO
-*/
-/**
-   @file pitch.h
-   @brief Pitch analysis
- */
-
-/*
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-   
-   - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-   
-   - Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-   
-   - Neither the name of the Xiph.org Foundation nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-   
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
-   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-
-#ifndef _PITCH_H
-#define _PITCH_H
-
-#include "kiss_fftr.h"
-#include "psy.h"
-#include "modes.h"
-
-kiss_fftr_cfg pitch_state_alloc(int max_lag);
-void pitch_state_free(kiss_fftr_cfg st);
-
-/** Find the optimal delay for the pitch prediction. Computation is
-    done in the frequency domain, both to save time and to make it
-    easier to apply psychoacoustic weighting */
-void find_spectral_pitch(const CELTMode *m, kiss_fftr_cfg fft, const struct PsyDecay *decay, const celt_sig_t *x, const celt_sig_t *y, const celt_word16_t *window, celt_word16_t * __restrict X, int len, int max_pitch, int *pitch);
-
-#endif
+/* (C) 2007-2008 Jean-Marc Valin, CSIRO
+*/
+/**
+   @file pitch.h
+   @brief Pitch analysis
+ */
+
+/*
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+   
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+   
+   - Neither the name of the Xiph.org Foundation nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+   
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+
+#ifndef _PITCH_H
+#define _PITCH_H
+
+#include "kiss_fftr.h"
+#include "psy.h"
+#include "cc6_modes.h"
+
+kiss_fftr_cfg pitch_state_alloc(int max_lag);
+void pitch_state_free(kiss_fftr_cfg st);
+
+/** Find the optimal delay for the pitch prediction. Computation is
+    done in the frequency domain, both to save time and to make it
+    easier to apply psychoacoustic weighting */
+void find_spectral_pitch(const CELTMode *m, kiss_fftr_cfg fft, const struct PsyDecay *decay, const celt_sig_t *x, const celt_sig_t *y, const celt_word16_t *window, celt_word16_t * __restrict X, int len, int max_pitch, int *pitch);
+
+#endif
diff --git a/libs/celt/cc6_psy.c b/libs/celt/cc6_psy.c
index 9550aef4..f8ff9ffd 100755
--- a/libs/celt/cc6_psy.c
+++ b/libs/celt/cc6_psy.c
@@ -37,7 +37,7 @@
 #include <math.h>
 #include "os_support.h"
 #include "cc6_arch.h"
-#include "stack_alloc.h"
+#include "cc6_stack_alloc.h"
 #include "mathops.h"
 
 /* The Vorbis freq<->Bark mapping */
diff --git a/libs/celt/cc6_quant_bands.c b/libs/celt/cc6_quant_bands.c
index 47bada86..12c3098d 100755
--- a/libs/celt/cc6_quant_bands.c
+++ b/libs/celt/cc6_quant_bands.c
@@ -39,7 +39,7 @@
 #include "os_support.h"
 #include "cc6_arch.h"
 #include "mathops.h"
-#include "stack_alloc.h"
+#include "cc6_stack_alloc.h"
 
 #ifdef FIXED_POINT
 const celt_word16_t eMeans[24] = {1920, -341, -512, -107, 43, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
diff --git a/libs/celt/cc6_quant_bands.h b/libs/celt/cc6_quant_bands.h
index 8e5f0783..856c5319 100755
--- a/libs/celt/cc6_quant_bands.h
+++ b/libs/celt/cc6_quant_bands.h
@@ -33,7 +33,7 @@
 #define QUANT_BANDS
 
 #include "cc6_arch.h"
-#include "modes.h"
+#include "cc6_modes.h"
 #include "cc6_entenc.h"
 #include "cc6_entdec.h"
 #include "mathops.h"
diff --git a/libs/celt/cc6_rangedec.c b/libs/celt/cc6_rangedec.c
index 6e93b8a2..58219216 100755
--- a/libs/celt/cc6_rangedec.c
+++ b/libs/celt/cc6_rangedec.c
@@ -35,7 +35,7 @@
 
 #include "cc6_arch.h"
 #include "cc6_entdec.h"
-#include "mfrngcod.h"
+#include "cc6_mfrngcod.h"
 
 
 
diff --git a/libs/celt/cc6_rangeenc.c b/libs/celt/cc6_rangeenc.c
index ba66e5df..8fd00ea7 100755
--- a/libs/celt/cc6_rangeenc.c
+++ b/libs/celt/cc6_rangeenc.c
@@ -35,7 +35,7 @@
 
 #include "cc6_arch.h"
 #include "cc6_entenc.h"
-#include "mfrngcod.h"
+#include "cc6_mfrngcod.h"
 
 
 
diff --git a/libs/celt/cc6_rate.c b/libs/celt/cc6_rate.c
index d00bcd03..bf7f98a6 100755
--- a/libs/celt/cc6_rate.c
+++ b/libs/celt/cc6_rate.c
@@ -34,7 +34,7 @@
 #endif
 
 #include <math.h>
-#include "modes.h"
+#include "cc6_modes.h"
 #include "cc6_cwrs.h"
 #include "cc6_arch.h"
 #include "os_support.h"