make dist works OK, removed pitch directory

git-svn-id: https://svn.code.sf.net/p/freetel/code@204 01035d8c-6547-0410-b346-abe4f91aad63

diff --git a/codec2/Makefile.am b/codec2/Makefile.am
index 9c471ec333c8bc8f0804e5e690058cf977c7c426..f4b1bfb68efcbbc9eb73b18eeaf9b2e04469b5ca 100644 (file)
--- a/codec2/Makefile.am
+++ b/codec2/Makefile.am
@@ -3,9 +3,7 @@ AUTOMAKE_OPTS = gnu
 NAME = codec2
 AM_CPPFLAGS = $(AM_CFLAGS)
 
-EXTRA_DIST = pitch/hts1a.p \
-pitch/hts2a.p \
-octave/glottal.m \
+EXTRA_DIST = octave/glottal.m \
 octave/lsp_pdf.m \
 octave/phase.m \
 octave/pl2.m \
@@ -68,11 +66,6 @@ wav/hts2a_g729a.wav \
 wav/m2400.wav \
 wav/morig_speex_8k.wav \
 src/globals.c \
-doc/A_m.gif \
-doc/omega_0.gif \
-doc/phi_m.gif \
-doc/s_n.gif \
-doc/s_n.txt \
 unittest/lsp2.txt \
 unittest/lsp7.txt \
 unittest/lspd78.txt \
@@ -86,6 +79,16 @@ unittest/lsp5.txt \
 unittest/lspd123.txt \
 unittest/lsp1.txt \
 unittest/lsp6.txt \
-unittest/lspd456.txt  
+unittest/lspd456.txt \
+src/codebook/lsp1.txt \
+src/codebook/lsp2.txt \
+src/codebook/lsp3.txt \
+src/codebook/lsp4.txt \
+src/codebook/lsp5.txt \
+src/codebook/lsp6.txt \
+src/codebook/lsp7.txt \
+src/codebook/lsp8.txt \
+src/codebook/lsp9.txt \
+src/codebook/lsp10.txt
 
 SUBDIRS = src unittest

diff --git a/codec2/Makefile.in b/codec2/Makefile.in
index 3118bac790469ef8f30ee562949af1f03755c1c3..ae9bb67618c51ab40594b4f80e06f331bcf0aebf 100644 (file)
--- a/codec2/Makefile.in
+++ b/codec2/Makefile.in
@@ -178,9 +178,7 @@ AM_CFLAGS = -Isrc -fPIC -Wall -O3 -lm
 AUTOMAKE_OPTS = gnu
 NAME = codec2
 AM_CPPFLAGS = $(AM_CFLAGS)
-EXTRA_DIST = pitch/hts1a.p \
-pitch/hts2a.p \
-octave/glottal.m \
+EXTRA_DIST = octave/glottal.m \
 octave/lsp_pdf.m \
 octave/phase.m \
 octave/pl2.m \
@@ -243,11 +241,6 @@ wav/hts2a_g729a.wav \
 wav/m2400.wav \
 wav/morig_speex_8k.wav \
 src/globals.c \
-doc/A_m.gif \
-doc/omega_0.gif \
-doc/phi_m.gif \
-doc/s_n.gif \
-doc/s_n.txt \
 unittest/lsp2.txt \
 unittest/lsp7.txt \
 unittest/lspd78.txt \
@@ -261,7 +254,17 @@ unittest/lsp5.txt \
 unittest/lspd123.txt \
 unittest/lsp1.txt \
 unittest/lsp6.txt \
-unittest/lspd456.txt  
+unittest/lspd456.txt \
+src/codebook/lsp1.txt \
+src/codebook/lsp2.txt \
+src/codebook/lsp3.txt \
+src/codebook/lsp4.txt \
+src/codebook/lsp5.txt \
+src/codebook/lsp6.txt \
+src/codebook/lsp7.txt \
+src/codebook/lsp8.txt \
+src/codebook/lsp9.txt \
+src/codebook/lsp10.txt
 
 SUBDIRS = src unittest
 all: all-recursive
@@ -446,7 +449,7 @@ distclean-tags:
 distdir: $(DISTFILES)
        $(am__remove_distdir)
        mkdir $(distdir)
-       $(mkdir_p) $(distdir)/doc $(distdir)/octave $(distdir)/pitch $(distdir)/raw $(distdir)/script $(distdir)/src $(distdir)/unittest $(distdir)/wav
+       $(mkdir_p) $(distdir)/octave $(distdir)/raw $(distdir)/script $(distdir)/src $(distdir)/src/codebook $(distdir)/unittest $(distdir)/wav
        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
        list='$(DISTFILES)'; for file in $$list; do \

diff --git a/codec2/README b/codec2/README
index f5e2fec50a08a1a7640a07d29989ca358402c163..2490fcf1fd54a6803a694bad0dc18e0241ee6d47 100644 (file)
--- a/codec2/README
+++ b/codec2/README
@@ -37,7 +37,6 @@ Directories
   src      - C source code
   octave   - Octave scripts used for visualising internal signals 
              during development
-  pitch    - pitch estimator output files
   raw      - speech files in raw format (16 bits signed linear 8 KHz)
   unittest - unit test source code
   wav      - speech files in wave file format

diff --git a/codec2/pitch/hts1a.p b/codec2/pitch/hts1a.p
deleted file mode 100644 (file)
index c11b8e9..0000000
--- a/codec2/pitch/hts1a.p
+++ /dev/null
@@ -1,298 +0,0 @@
-111.627907\r
-97.959183\r
-97.959183\r
-97.959183\r
-87.272736\r
-78.048775\r
-112.280701\r
-120.000008\r
-61.538464\r
-68.817207\r
-84.210526\r
-90.140846\r
-90.140846\r
-90.140846\r
-101.587303\r
-80.000000\r
-72.727272\r
-95.522392\r
-90.140846\r
-90.140846\r
-101.587303\r
-90.140846\r
-85.333336\r
-86.486488\r
-91.428574\r
-91.428574\r
-91.428574\r
-91.428574\r
-91.428574\r
-90.140846\r
-86.486488\r
-86.486488\r
-85.333336\r
-85.333336\r
-85.333336\r
-81.012657\r
-74.418610\r
-71.111115\r
-71.111115\r
-71.111115\r
-71.111115\r
-68.085106\r
-68.085106\r
-67.368423\r
-67.368423\r
-70.329674\r
-70.329674\r
-70.329674\r
-71.111115\r
-74.418610\r
-74.418610\r
-75.294121\r
-79.012352\r
-85.333336\r
-96.969704\r
-111.627907\r
-111.627907\r
-120.000008\r
-111.627907\r
-104.347832\r
-104.347832\r
-97.959183\r
-104.347832\r
-104.347832\r
-104.347832\r
-104.347832\r
-104.347832\r
-104.347832\r
-104.347832\r
-104.347832\r
-97.959183\r
-97.959183\r
-112.280701\r
-112.280701\r
-96.969704\r
-96.969704\r
-96.969704\r
-110.344841\r
-104.347832\r
-97.959183\r
-97.959183\r
-104.347832\r
-97.959183\r
-104.347832\r
-120.000008\r
-104.347832\r
-120.000008\r
-120.000008\r
-97.959183\r
-83.116882\r
-75.294121\r
-71.910118\r
-71.910110\r
-71.910110\r
-71.910110\r
-75.294121\r
-76.190483\r
-80.000008\r
-80.000008\r
-84.210526\r
-85.333336\r
-90.140846\r
-101.587303\r
-108.474571\r
-104.347832\r
-120.000008\r
-120.000008\r
-104.347832\r
-104.347832\r
-71.111115\r
-88.888893\r
-75.294121\r
-111.627907\r
-120.000008\r
-120.000008\r
-97.959183\r
-111.627907\r
-111.627907\r
-111.627907\r
-97.959183\r
-92.307693\r
-92.307693\r
-92.307693\r
-92.307693\r
-120.000008\r
-111.627907\r
-111.627907\r
-86.486488\r
-85.333336\r
-85.333336\r
-90.140846\r
-95.522392\r
-101.587311\r
-101.587311\r
-104.918037\r
-104.347832\r
-104.347832\r
-111.627907\r
-120.000008\r
-97.959183\r
-104.347832\r
-111.627907\r
-88.888893\r
-80.000000\r
-81.012657\r
-85.333336\r
-85.333336\r
-86.486488\r
-91.428574\r
-90.140846\r
-91.428574\r
-96.969704\r
-96.969704\r
-95.522392\r
-95.522392\r
-95.522392\r
-96.969704\r
-96.969704\r
-98.461533\r
-104.918022\r
-97.959183\r
-97.959183\r
-97.959183\r
-104.347832\r
-120.000008\r
-120.000008\r
-92.307693\r
-92.307693\r
-77.108429\r
-79.012344\r
-75.294121\r
-75.294121\r
-76.190483\r
-76.190483\r
-80.000008\r
-81.012657\r
-85.333336\r
-85.333336\r
-85.333336\r
-85.333336\r
-85.333336\r
-90.140846\r
-90.140846\r
-91.428574\r
-96.969704\r
-98.461533\r
-120.000008\r
-120.000008\r
-104.347832\r
-97.959183\r
-97.959183\r
-104.918037\r
-120.000008\r
-120.000008\r
-120.000008\r
-104.347832\r
-92.307693\r
-72.727272\r
-72.727272\r
-76.190483\r
-84.210533\r
-88.888901\r
-120.000008\r
-104.347832\r
-120.000008\r
-120.000008\r
-111.627907\r
-92.307693\r
-97.959183\r
-97.959183\r
-111.627907\r
-120.000008\r
-120.000008\r
-97.959183\r
-97.959183\r
-104.347832\r
-104.347832\r
-104.347832\r
-111.627907\r
-120.000008\r
-97.959183\r
-104.347832\r
-97.959183\r
-97.959183\r
-84.210526\r
-94.117653\r
-96.969704\r
-110.344841\r
-120.000008\r
-97.959183\r
-97.959183\r
-104.347832\r
-97.959183\r
-104.347832\r
-97.959183\r
-97.959183\r
-111.627907\r
-120.000008\r
-92.307693\r
-92.307693\r
-98.461533\r
-98.461533\r
-104.918022\r
-111.627907\r
-111.627907\r
-92.307693\r
-97.959183\r
-92.307693\r
-92.307693\r
-92.307693\r
-92.307693\r
-92.307693\r
-57.657658\r
-90.140846\r
-90.140846\r
-95.522392\r
-101.587311\r
-101.587311\r
-108.474586\r
-111.627907\r
-97.959183\r
-111.627907\r
-120.000008\r
-92.307693\r
-74.418610\r
-74.418610\r
-74.418610\r
-74.418610\r
-76.190483\r
-72.727280\r
-76.190483\r
-76.190483\r
-69.565224\r
-66.666672\r
-54.700855\r
-56.637169\r
-56.637169\r
-71.910110\r
-90.140846\r
-90.140846\r
-72.727272\r
-72.727272\r
-72.727272\r
-72.727272\r
-55.172413\r
-57.142857\r
-55.172413\r
-90.140846\r
-95.522392\r
-101.587311\r
-101.587311\r
-71.910110\r
-74.418610\r
-46.376812\r
-40.000000\r
-95.522392\r
-0\r
-0\r

diff --git a/codec2/pitch/hts2a.p b/codec2/pitch/hts2a.p
deleted file mode 100644 (file)
index 20e2680..0000000
--- a/codec2/pitch/hts2a.p
+++ /dev/null
@@ -1,300 +0,0 @@
-  0.0000000e+000\r
-  9.2753623e+001\r
-  5.4237288e+001\r
-  8.5906040e+001\r
-  7.0329670e+001\r
-  5.5652174e+001\r
-  5.4237288e+001\r
-  5.4935622e+001\r
-  5.4700855e+001\r
-  7.5739645e+001\r
-  7.3563218e+001\r
-  1.2307692e+002\r
-  1.1428571e+002\r
-  7.3563218e+001\r
-  7.7108434e+001\r
-  1.8550725e+002\r
-  1.2673267e+002\r
-  1.0847458e+002\r
-  7.8527607e+001\r
-  8.8888889e+001\r
-  8.3116883e+001\r
-  8.1012658e+001\r
-  1.0756303e+002\r
-  1.3061224e+002\r
-  4.8301887e+001\r
-  4.7940075e+001\r
-  4.8120301e+001\r
-  4.9230769e+001\r
-  4.9420849e+001\r
-  4.6886447e+001\r
-  4.2953020e+001\r
-  3.9263804e+001\r
-  3.7869822e+001\r
-  3.5457064e+001\r
-  3.4224599e+001\r
-  3.3333333e+001\r
-  3.2820513e+001\r
-  3.2000000e+001\r
-  3.1295844e+001\r
-  2.9906542e+001\r
-  2.9493088e+001\r
-  2.9090909e+001\r
-  2.8699552e+001\r
-  2.8131868e+001\r
-  2.7826087e+001\r
-  2.7826087e+001\r
-  2.7826087e+001\r
-  2.8193833e+001\r
-  2.7467811e+001\r
-  2.6890756e+001\r
-  5.4468085e+001\r
-  5.4237288e+001\r
-  6.4974619e+001\r
-  1.0756303e+002\r
-  8.8888889e+001\r
-  1.0406504e+002\r
-  4.4599303e+001\r
-  5.4468085e+001\r
-  3.6260623e+001\r
-  3.6260623e+001\r
-  8.1012658e+001\r
-  7.0329670e+001\r
-  1.2929293e+002\r
-  9.9224806e+001\r
-  4.3097643e+001\r
-  4.4137931e+001\r
-  4.5714286e+001\r
-  4.7407407e+001\r
-  4.8301887e+001\r
-  4.9230769e+001\r
-  4.9420849e+001\r
-  5.0996016e+001\r
-  5.1405622e+001\r
-  5.1405622e+001\r
-  5.2244898e+001\r
-  5.2459016e+001\r
-  5.2459016e+001\r
-  5.2244898e+001\r
-  5.3333333e+001\r
-  5.2459016e+001\r
-  5.2244898e+001\r
-  5.1405622e+001\r
-  5.1405622e+001\r
-  5.1200000e+001\r
-  5.0996016e+001\r
-  5.0196078e+001\r
-  4.9230769e+001\r
-  4.9230769e+001\r
-  4.9230769e+001\r
-  4.9420849e+001\r
-  4.9230769e+001\r
-  4.9042146e+001\r
-  9.8461538e+001\r
-  1.0158730e+002\r
-  5.1821862e+001\r
-  9.0140845e+001\r
-  1.0491803e+002\r
-  1.4382022e+002\r
-  5.2459016e+001\r
-  5.2459016e+001\r
-  1.2929293e+002\r
-  1.6410256e+002\r
-  8.0000000e+001\r
-  7.3563218e+001\r
-  1.0158730e+002\r
-  9.9224806e+001\r
-  4.9042146e+001\r
-  4.9042146e+001\r
-  4.9042146e+001\r
-  5.9259259e+001\r
-  1.4382022e+002\r
-  7.2316384e+001\r
-  1.0847458e+002\r
-  1.1228070e+002\r
-  1.6202532e+002\r
-  8.1528662e+001\r
-  7.2727273e+001\r
-  1.8550725e+002\r
-  6.0093897e+001\r
-  1.0847458e+002\r
-  8.9510490e+001\r
-  7.1508380e+001\r
-  4.0125392e+001\r
-  4.0634921e+001\r
-  4.0634921e+001\r
-  4.0251572e+001\r
-  4.0506329e+001\r
-  4.3986254e+001\r
-  4.0506329e+001\r
-  9.8461538e+001\r
-  5.6140351e+001\r
-  6.5641026e+001\r
-  5.4237288e+001\r
-  1.1636364e+002\r
-  3.4316354e+001\r
-  3.4972678e+001\r
-  3.7758112e+001\r
-  4.0634921e+001\r
-  4.0506329e+001\r
-  4.1290323e+001\r
-  4.2524917e+001\r
-  4.3389831e+001\r
-  4.4599303e+001\r
-  4.4912281e+001\r
-  4.6545455e+001\r
-  4.7232472e+001\r
-  4.8301887e+001\r
-  4.9230769e+001\r
-  4.9420849e+001\r
-  5.0393701e+001\r
-  5.1405622e+001\r
-  5.3333333e+001\r
-  5.3112033e+001\r
-  1.1034483e+002\r
-  9.7709924e+001\r
-  1.4382022e+002\r
-  5.0996016e+001\r
-  5.1821862e+001\r
-  5.0996016e+001\r
-  5.2032520e+001\r
-  5.3112033e+001\r
-  5.3556485e+001\r
-  5.4468085e+001\r
-  5.5652174e+001\r
-  5.4700855e+001\r
-  5.4700855e+001\r
-  5.4935622e+001\r
-  5.4700855e+001\r
-  5.4700855e+001\r
-  5.4468085e+001\r
-  5.4468085e+001\r
-  5.4468085e+001\r
-  5.4468085e+001\r
-  5.3333333e+001\r
-  5.1405622e+001\r
-  5.0996016e+001\r
-  5.0000000e+001\r
-  4.8120301e+001\r
-  4.8669202e+001\r
-  4.7058824e+001\r
-  4.6376812e+001\r
-  4.5070423e+001\r
-  4.4912281e+001\r
-  4.4137931e+001\r
-  4.2809365e+001\r
-  4.2666667e+001\r
-  4.2105263e+001\r
-  4.1423948e+001\r
-  4.1290323e+001\r
-  4.1290323e+001\r
-  4.1290323e+001\r
-  4.0634921e+001\r
-  4.0634921e+001\r
-  4.0634921e+001\r
-  4.0634921e+001\r
-  4.0764331e+001\r
-  4.1423948e+001\r
-  4.2953020e+001\r
-  4.5551601e+001\r
-  1.7534247e+002\r
-  4.7232472e+001\r
-  1.3763441e+002\r
-  1.3061224e+002\r
-  4.5551601e+001\r
-  4.3686007e+001\r
-  4.8669202e+001\r
-  9.4117647e+001\r
-  8.1012658e+001\r
-  1.1228070e+002\r
-  1.3617021e+002\r
-  4.3097643e+001\r
-  4.3835616e+001\r
-  4.6376812e+001\r
-  4.6545455e+001\r
-  4.6043165e+001\r
-  4.8301887e+001\r
-  4.9042146e+001\r
-  4.9420849e+001\r
-  5.1200000e+001\r
-  5.1405622e+001\r
-  5.2244898e+001\r
-  1.2929293e+002\r
-  1.2929293e+002\r
-  1.5238095e+002\r
-  1.5238095e+002\r
-  1.3913043e+002\r
-  9.0140845e+001\r
-  1.0940171e+002\r
-  9.0140845e+001\r
-  1.2307692e+002\r
-  8.9510490e+001\r
-  6.9565217e+001\r
-  7.3142857e+001\r
-  1.1034483e+002\r
-  7.8048780e+001\r
-  7.2727273e+001\r
-  1.0078740e+002\r
-  1.0940171e+002\r
-  1.1743119e+002\r
-  8.7074830e+001\r
-  1.8550725e+002\r
-  6.5306122e+001\r
-  1.3617021e+002\r
-  5.2674897e+001\r
-  1.0940171e+002\r
-  1.5238095e+002\r
-  1.4065934e+002\r
-  1.0756303e+002\r
-  1.0406504e+002\r
-  5.0793651e+001\r
-  4.9420849e+001\r
-  4.4444444e+001\r
-  7.0329670e+001\r
-  7.2727273e+001\r
-  7.4418605e+001\r
-  1.1636364e+002\r
-  1.0406504e+002\r
-  1.2307692e+002\r
-  1.2549020e+002\r
-  1.7297297e+002\r
-  4.5878136e+001\r
-  4.9805447e+001\r
-  6.2745098e+001\r
-  9.2086331e+001\r
-  9.1428571e+001\r
-  5.7142857e+001\r
-  4.8484848e+001\r
-  4.1157556e+001\r
-  2.2857143e+001\r
-  3.0046948e+001\r
-  9.4814815e+001\r
-  5.7918552e+001\r
-  9.0140845e+001\r
-  7.4418605e+001\r
-  7.4418605e+001\r
-  5.4700855e+001\r
-  9.5522388e+001\r
-  7.4853801e+001\r
-  9.4117647e+001\r
-  9.5522388e+001\r
-  9.9224806e+001\r
-  8.1012658e+001\r
-  1.1851852e+002\r
-  6.8817204e+001\r
-  8.5906040e+001\r
-  6.7015707e+001\r
-  4.3537415e+001\r
-  6.5306122e+001\r
-  3.1295844e+001\r
-  7.5739645e+001\r
-  6.2135922e+001\r
-  9.9224806e+001\r
-  5.7657658e+001\r
-  5.2244898e+001\r
-  5.8447489e+001\r
-  0.0000000e+000\r
-  0.0000000e+000\r
-  0.0000000e+000\r
-  0.0000000e+000\r
-  0.0000000e+000\r