Renamed to vorbis_psy, added header
authorjm <jm@0101bb08-14d6-0310-b084-bc0e0c8e3800>
Fri, 7 Oct 2005 01:12:04 +0000 (01:12 +0000)
committerjm <jm@0101bb08-14d6-0310-b084-bc0e0c8e3800>
Fri, 7 Oct 2005 01:12:04 +0000 (01:12 +0000)
git-svn-id: http://svn.xiph.org/trunk/speex@10138 0101bb08-14d6-0310-b084-bc0e0c8e3800

libspeex/Makefile.am
libspeex/vorbis_psy.c [moved from libspeex/curves.c with 99% similarity]
libspeex/vorbis_psy.h [new file with mode: 0644]

index 0955f57..749626d 100644 (file)
@@ -15,43 +15,14 @@ libspeex_la_SOURCES = nb_celp.c     sb_celp.c       lpc.c   ltp.c   lsp.c   quant_lsp.c \
                exc_5_256_table.c       exc_5_64_table.c        exc_8_128_table.c       exc_10_32_table.c \
                exc_10_16_table.c       exc_20_32_table.c       hexc_10_32_table.c      misc.c  speex_header.c \
                speex_callbacks.c       math_approx.c   stereo.c        preprocess.c    smallft.c       lbr_48k_tables.c \
-               jitter.c        mdf.c curves.c
-
-noinst_HEADERS = lsp.h \
-       nb_celp.h \
-       lpc.h \
-       lpc_bfin.h \
-       ltp.h \
-       quant_lsp.h \
-       cb_search.h \
-       filters.h \
-       stack_alloc.h \
-       vq.h \
-       vq_sse.h \
-       vq_arm4.h \
-       vq_bfin.h \
-       modes.h \
-       sb_celp.h \
-       vbr.h \
-       misc.h \
-       misc_bfin.h \
-       ltp_sse.h \
-       ltp_arm4.h \
-       ltp_bfin.h \
-       filters_sse.h \
-       filters_arm4.h \
-       filters_bfin.h \
-       math_approx.h \
-       smallft.h \
-       arch.h \
-       fixed_arm4.h \
-       fixed_arm5e.h \
-       fixed_bfin.h \
-       fixed_debug.h \
-       fixed_generic.h \
-       cb_search_sse.h \
-       cb_search_arm4.h \
-       cb_search_bfin.h
+               jitter.c        mdf.c vorbis_psy.c
+
+noinst_HEADERS = lsp.h         nb_celp.h       lpc.h   lpc_bfin.h      ltp.h   quant_lsp.h \
+               cb_search.h     filters.h       stack_alloc.h   vq.h    vq_sse.h        vq_arm4.h       vq_bfin.h \
+               modes.h         sb_celp.h       vbr.h   misc.h  misc_bfin.h     ltp_sse.h       ltp_arm4.h \
+               ltp_bfin.h      filters_sse.h   filters_arm4.h  filters_bfin.h  math_approx.h \
+               smallft.h       arch.h  fixed_arm4.h    fixed_arm5e.h   fixed_bfin.h    fixed_debug.h \
+               fixed_generic.h         cb_search_sse.h         cb_search_arm4.h        cb_search_bfin.h vorbis_psy.h
 
 
 libspeex_la_LDFLAGS = -version-info @SPEEX_LT_CURRENT@:@SPEEX_LT_REVISION@:@SPEEX_LT_AGE@
similarity index 99%
rename from libspeex/curves.c
rename to libspeex/vorbis_psy.c
index c8806f4..17ee557 100644 (file)
@@ -107,7 +107,7 @@ void curve_to_lpc(float *curve, int len, float *awk1, float *awk2, int ord)
 #endif
 }
 
-#if 0
+#if 1
 #include <stdio.h>
 #include <math.h>
 
diff --git a/libspeex/vorbis_psy.h b/libspeex/vorbis_psy.h
new file mode 100644 (file)
index 0000000..df561fa
--- /dev/null
@@ -0,0 +1,47 @@
+/* Copyright (C) 2005 Jean-Marc Valin, CSIRO, Christopher Montgomery
+   File: vorbis_psy.h
+
+   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 VORBIS_PSY_H
+#define VORBIS_PHY_H
+
+#ifdef VORBIS_PSYCHO
+
+
+
+typedef struct {
+
+} VorbisPsy;
+
+
+
+
+#endif
+#endif