From: drowe67 Date: Sat, 2 Oct 2010 02:42:35 +0000 (+0000) Subject: make dist works OK, removed pitch directory X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=357af0069a873b0cceaea5c0b3c41ae873fb1675;p=freetel-svn-tracking.git 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 9c471ec3..f4b1bfb6 100644 --- 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 3118bac7..ae9bb676 100644 --- 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 f5e2fec5..2490fcf1 100644 --- 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 index c11b8e90..00000000 --- a/codec2/pitch/hts1a.p +++ /dev/null @@ -1,298 +0,0 @@ -111.627907 -97.959183 -97.959183 -97.959183 -87.272736 -78.048775 -112.280701 -120.000008 -61.538464 -68.817207 -84.210526 -90.140846 -90.140846 -90.140846 -101.587303 -80.000000 -72.727272 -95.522392 -90.140846 -90.140846 -101.587303 -90.140846 -85.333336 -86.486488 -91.428574 -91.428574 -91.428574 -91.428574 -91.428574 -90.140846 -86.486488 -86.486488 -85.333336 -85.333336 -85.333336 -81.012657 -74.418610 -71.111115 -71.111115 -71.111115 -71.111115 -68.085106 -68.085106 -67.368423 -67.368423 -70.329674 -70.329674 -70.329674 -71.111115 -74.418610 -74.418610 -75.294121 -79.012352 -85.333336 -96.969704 -111.627907 -111.627907 -120.000008 -111.627907 -104.347832 -104.347832 -97.959183 -104.347832 -104.347832 -104.347832 -104.347832 -104.347832 -104.347832 -104.347832 -104.347832 -97.959183 -97.959183 -112.280701 -112.280701 -96.969704 -96.969704 -96.969704 -110.344841 -104.347832 -97.959183 -97.959183 -104.347832 -97.959183 -104.347832 -120.000008 -104.347832 -120.000008 -120.000008 -97.959183 -83.116882 -75.294121 -71.910118 -71.910110 -71.910110 -71.910110 -75.294121 -76.190483 -80.000008 -80.000008 -84.210526 -85.333336 -90.140846 -101.587303 -108.474571 -104.347832 -120.000008 -120.000008 -104.347832 -104.347832 -71.111115 -88.888893 -75.294121 -111.627907 -120.000008 -120.000008 -97.959183 -111.627907 -111.627907 -111.627907 -97.959183 -92.307693 -92.307693 -92.307693 -92.307693 -120.000008 -111.627907 -111.627907 -86.486488 -85.333336 -85.333336 -90.140846 -95.522392 -101.587311 -101.587311 -104.918037 -104.347832 -104.347832 -111.627907 -120.000008 -97.959183 -104.347832 -111.627907 -88.888893 -80.000000 -81.012657 -85.333336 -85.333336 -86.486488 -91.428574 -90.140846 -91.428574 -96.969704 -96.969704 -95.522392 -95.522392 -95.522392 -96.969704 -96.969704 -98.461533 -104.918022 -97.959183 -97.959183 -97.959183 -104.347832 -120.000008 -120.000008 -92.307693 -92.307693 -77.108429 -79.012344 -75.294121 -75.294121 -76.190483 -76.190483 -80.000008 -81.012657 -85.333336 -85.333336 -85.333336 -85.333336 -85.333336 -90.140846 -90.140846 -91.428574 -96.969704 -98.461533 -120.000008 -120.000008 -104.347832 -97.959183 -97.959183 -104.918037 -120.000008 -120.000008 -120.000008 -104.347832 -92.307693 -72.727272 -72.727272 -76.190483 -84.210533 -88.888901 -120.000008 -104.347832 -120.000008 -120.000008 -111.627907 -92.307693 -97.959183 -97.959183 -111.627907 -120.000008 -120.000008 -97.959183 -97.959183 -104.347832 -104.347832 -104.347832 -111.627907 -120.000008 -97.959183 -104.347832 -97.959183 -97.959183 -84.210526 -94.117653 -96.969704 -110.344841 -120.000008 -97.959183 -97.959183 -104.347832 -97.959183 -104.347832 -97.959183 -97.959183 -111.627907 -120.000008 -92.307693 -92.307693 -98.461533 -98.461533 -104.918022 -111.627907 -111.627907 -92.307693 -97.959183 -92.307693 -92.307693 -92.307693 -92.307693 -92.307693 -57.657658 -90.140846 -90.140846 -95.522392 -101.587311 -101.587311 -108.474586 -111.627907 -97.959183 -111.627907 -120.000008 -92.307693 -74.418610 -74.418610 -74.418610 -74.418610 -76.190483 -72.727280 -76.190483 -76.190483 -69.565224 -66.666672 -54.700855 -56.637169 -56.637169 -71.910110 -90.140846 -90.140846 -72.727272 -72.727272 -72.727272 -72.727272 -55.172413 -57.142857 -55.172413 -90.140846 -95.522392 -101.587311 -101.587311 -71.910110 -74.418610 -46.376812 -40.000000 -95.522392 -0 -0 diff --git a/codec2/pitch/hts2a.p b/codec2/pitch/hts2a.p deleted file mode 100644 index 20e26804..00000000 --- a/codec2/pitch/hts2a.p +++ /dev/null @@ -1,300 +0,0 @@ - 0.0000000e+000 - 9.2753623e+001 - 5.4237288e+001 - 8.5906040e+001 - 7.0329670e+001 - 5.5652174e+001 - 5.4237288e+001 - 5.4935622e+001 - 5.4700855e+001 - 7.5739645e+001 - 7.3563218e+001 - 1.2307692e+002 - 1.1428571e+002 - 7.3563218e+001 - 7.7108434e+001 - 1.8550725e+002 - 1.2673267e+002 - 1.0847458e+002 - 7.8527607e+001 - 8.8888889e+001 - 8.3116883e+001 - 8.1012658e+001 - 1.0756303e+002 - 1.3061224e+002 - 4.8301887e+001 - 4.7940075e+001 - 4.8120301e+001 - 4.9230769e+001 - 4.9420849e+001 - 4.6886447e+001 - 4.2953020e+001 - 3.9263804e+001 - 3.7869822e+001 - 3.5457064e+001 - 3.4224599e+001 - 3.3333333e+001 - 3.2820513e+001 - 3.2000000e+001 - 3.1295844e+001 - 2.9906542e+001 - 2.9493088e+001 - 2.9090909e+001 - 2.8699552e+001 - 2.8131868e+001 - 2.7826087e+001 - 2.7826087e+001 - 2.7826087e+001 - 2.8193833e+001 - 2.7467811e+001 - 2.6890756e+001 - 5.4468085e+001 - 5.4237288e+001 - 6.4974619e+001 - 1.0756303e+002 - 8.8888889e+001 - 1.0406504e+002 - 4.4599303e+001 - 5.4468085e+001 - 3.6260623e+001 - 3.6260623e+001 - 8.1012658e+001 - 7.0329670e+001 - 1.2929293e+002 - 9.9224806e+001 - 4.3097643e+001 - 4.4137931e+001 - 4.5714286e+001 - 4.7407407e+001 - 4.8301887e+001 - 4.9230769e+001 - 4.9420849e+001 - 5.0996016e+001 - 5.1405622e+001 - 5.1405622e+001 - 5.2244898e+001 - 5.2459016e+001 - 5.2459016e+001 - 5.2244898e+001 - 5.3333333e+001 - 5.2459016e+001 - 5.2244898e+001 - 5.1405622e+001 - 5.1405622e+001 - 5.1200000e+001 - 5.0996016e+001 - 5.0196078e+001 - 4.9230769e+001 - 4.9230769e+001 - 4.9230769e+001 - 4.9420849e+001 - 4.9230769e+001 - 4.9042146e+001 - 9.8461538e+001 - 1.0158730e+002 - 5.1821862e+001 - 9.0140845e+001 - 1.0491803e+002 - 1.4382022e+002 - 5.2459016e+001 - 5.2459016e+001 - 1.2929293e+002 - 1.6410256e+002 - 8.0000000e+001 - 7.3563218e+001 - 1.0158730e+002 - 9.9224806e+001 - 4.9042146e+001 - 4.9042146e+001 - 4.9042146e+001 - 5.9259259e+001 - 1.4382022e+002 - 7.2316384e+001 - 1.0847458e+002 - 1.1228070e+002 - 1.6202532e+002 - 8.1528662e+001 - 7.2727273e+001 - 1.8550725e+002 - 6.0093897e+001 - 1.0847458e+002 - 8.9510490e+001 - 7.1508380e+001 - 4.0125392e+001 - 4.0634921e+001 - 4.0634921e+001 - 4.0251572e+001 - 4.0506329e+001 - 4.3986254e+001 - 4.0506329e+001 - 9.8461538e+001 - 5.6140351e+001 - 6.5641026e+001 - 5.4237288e+001 - 1.1636364e+002 - 3.4316354e+001 - 3.4972678e+001 - 3.7758112e+001 - 4.0634921e+001 - 4.0506329e+001 - 4.1290323e+001 - 4.2524917e+001 - 4.3389831e+001 - 4.4599303e+001 - 4.4912281e+001 - 4.6545455e+001 - 4.7232472e+001 - 4.8301887e+001 - 4.9230769e+001 - 4.9420849e+001 - 5.0393701e+001 - 5.1405622e+001 - 5.3333333e+001 - 5.3112033e+001 - 1.1034483e+002 - 9.7709924e+001 - 1.4382022e+002 - 5.0996016e+001 - 5.1821862e+001 - 5.0996016e+001 - 5.2032520e+001 - 5.3112033e+001 - 5.3556485e+001 - 5.4468085e+001 - 5.5652174e+001 - 5.4700855e+001 - 5.4700855e+001 - 5.4935622e+001 - 5.4700855e+001 - 5.4700855e+001 - 5.4468085e+001 - 5.4468085e+001 - 5.4468085e+001 - 5.4468085e+001 - 5.3333333e+001 - 5.1405622e+001 - 5.0996016e+001 - 5.0000000e+001 - 4.8120301e+001 - 4.8669202e+001 - 4.7058824e+001 - 4.6376812e+001 - 4.5070423e+001 - 4.4912281e+001 - 4.4137931e+001 - 4.2809365e+001 - 4.2666667e+001 - 4.2105263e+001 - 4.1423948e+001 - 4.1290323e+001 - 4.1290323e+001 - 4.1290323e+001 - 4.0634921e+001 - 4.0634921e+001 - 4.0634921e+001 - 4.0634921e+001 - 4.0764331e+001 - 4.1423948e+001 - 4.2953020e+001 - 4.5551601e+001 - 1.7534247e+002 - 4.7232472e+001 - 1.3763441e+002 - 1.3061224e+002 - 4.5551601e+001 - 4.3686007e+001 - 4.8669202e+001 - 9.4117647e+001 - 8.1012658e+001 - 1.1228070e+002 - 1.3617021e+002 - 4.3097643e+001 - 4.3835616e+001 - 4.6376812e+001 - 4.6545455e+001 - 4.6043165e+001 - 4.8301887e+001 - 4.9042146e+001 - 4.9420849e+001 - 5.1200000e+001 - 5.1405622e+001 - 5.2244898e+001 - 1.2929293e+002 - 1.2929293e+002 - 1.5238095e+002 - 1.5238095e+002 - 1.3913043e+002 - 9.0140845e+001 - 1.0940171e+002 - 9.0140845e+001 - 1.2307692e+002 - 8.9510490e+001 - 6.9565217e+001 - 7.3142857e+001 - 1.1034483e+002 - 7.8048780e+001 - 7.2727273e+001 - 1.0078740e+002 - 1.0940171e+002 - 1.1743119e+002 - 8.7074830e+001 - 1.8550725e+002 - 6.5306122e+001 - 1.3617021e+002 - 5.2674897e+001 - 1.0940171e+002 - 1.5238095e+002 - 1.4065934e+002 - 1.0756303e+002 - 1.0406504e+002 - 5.0793651e+001 - 4.9420849e+001 - 4.4444444e+001 - 7.0329670e+001 - 7.2727273e+001 - 7.4418605e+001 - 1.1636364e+002 - 1.0406504e+002 - 1.2307692e+002 - 1.2549020e+002 - 1.7297297e+002 - 4.5878136e+001 - 4.9805447e+001 - 6.2745098e+001 - 9.2086331e+001 - 9.1428571e+001 - 5.7142857e+001 - 4.8484848e+001 - 4.1157556e+001 - 2.2857143e+001 - 3.0046948e+001 - 9.4814815e+001 - 5.7918552e+001 - 9.0140845e+001 - 7.4418605e+001 - 7.4418605e+001 - 5.4700855e+001 - 9.5522388e+001 - 7.4853801e+001 - 9.4117647e+001 - 9.5522388e+001 - 9.9224806e+001 - 8.1012658e+001 - 1.1851852e+002 - 6.8817204e+001 - 8.5906040e+001 - 6.7015707e+001 - 4.3537415e+001 - 6.5306122e+001 - 3.1295844e+001 - 7.5739645e+001 - 6.2135922e+001 - 9.9224806e+001 - 5.7657658e+001 - 5.2244898e+001 - 5.8447489e+001 - 0.0000000e+000 - 0.0000000e+000 - 0.0000000e+000 - 0.0000000e+000 - 0.0000000e+000