[xiph-cvs] cvs commit: speex/src speexdec.c
Jean-Marc Valin
jm at xiph.org
Fri Oct 25 21:51:10 PDT 2002
jm 02/10/26 00:51:10
Modified: . configure.in
doc manual.lyx
libspeex misc.h
src speexdec.c
Log:
Getting ready for beta2
Revision Changes Path
1.34 +1 -3 speex/configure.in
Index: configure.in
===================================================================
RCS file: /usr/local/cvsroot/speex/configure.in,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- configure.in 11 Oct 2002 21:17:53 -0000 1.33
+++ configure.in 26 Oct 2002 04:51:10 -0000 1.34
@@ -5,7 +5,7 @@
SPEEX_MAJOR_VERSION=0
SPEEX_MINOR_VERSION=99
SPEEX_MICRO_VERSION=0
-SPEEX_VERSION=1.0beta2-cvs
+SPEEX_VERSION=1.0beta2
SPEEX_BINARY_AGE=0
SPEEX_INTERFACE_AGE=0
@@ -27,8 +27,6 @@
AM_MAINTAINER_MODE
AC_CANONICAL_HOST
-AC_DISABLE_SHARED
-dnl AC_DISABLE_STATIC
AM_PROG_LIBTOOL
AC_C_BIGENDIAN
<p><p>1.30 +144 -3 speex/doc/manual.lyx
Index: manual.lyx
===================================================================
RCS file: /usr/local/cvsroot/speex/doc/manual.lyx,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- manual.lyx 21 Oct 2002 20:50:29 -0000 1.29
+++ manual.lyx 26 Oct 2002 04:51:10 -0000 1.30
@@ -29,7 +29,7 @@
The Speex Codec Manual
\newline
-(draft for Speex 1.0beta1)
+(draft for Speex 1.0beta2)
\layout Author
Jean-Marc Valin
@@ -1687,6 +1687,10 @@
another) when it comes to subjective evaluation.
Last thing, it should be noted that for most codecs (including Speex) encoding
quality sometimes varies depending on the input.
+ Note that the complexity is only approximate (withing 0.5 mflops and using
+ the lowers complexity setting).
+ Decoding requires approximately 0.5 mflops in most modes (1 mflops with
+ perceptual enhancement).
\layout Standard
@@ -1699,10 +1703,11 @@
\begin_inset Tabular
-<lyxtabular version="3" rows="17" columns="3">
+<lyxtabular version="3" rows="17" columns="4">
<features>
<column alignment="center" valignment="top" leftline="true" width="0pt">
<column alignment="center" valignment="top" leftline="true" width="0pt">
+<column alignment="center" valignment="top" leftline="true" width="0pt">
<column alignment="center" valignment="top" leftline="true" rightline="true" width="0pt">
<row topline="true" bottomline="true">
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
@@ -1721,6 +1726,14 @@
Bitrate (bps)
\end_inset
</cell>
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\layout Standard
+
+mflops
+\end_inset
+</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
\begin_inset Text
@@ -1747,6 +1760,14 @@
250
\end_inset
</cell>
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\layout Standard
+
+N/A
+\end_inset
+</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
\begin_inset Text
@@ -1773,12 +1794,20 @@
2,150
\end_inset
</cell>
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\layout Standard
+
+6
+\end_inset
+</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
\begin_inset Text
\layout Standard
-Comfort noise only (VBR only)
+Vocoder (mostly for comfort noise)
\end_inset
</cell>
</row>
@@ -1799,6 +1828,14 @@
5,950
\end_inset
</cell>
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\layout Standard
+
+9
+\end_inset
+</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
\begin_inset Text
@@ -1825,6 +1862,14 @@
8,000
\end_inset
</cell>
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\layout Standard
+
+10
+\end_inset
+</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
\begin_inset Text
@@ -1851,6 +1896,14 @@
11,000
\end_inset
</cell>
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\layout Standard
+
+14
+\end_inset
+</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
\begin_inset Text
@@ -1877,6 +1930,14 @@
15,000
\end_inset
</cell>
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\layout Standard
+
+11
+\end_inset
+</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
\begin_inset Text
@@ -1903,6 +1964,14 @@
18,200
\end_inset
</cell>
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\layout Standard
+
+17.5
+\end_inset
+</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
\begin_inset Text
@@ -1929,6 +1998,14 @@
24,600
\end_inset
</cell>
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\layout Standard
+
+14.5
+\end_inset
+</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
\begin_inset Text
@@ -1955,6 +2032,14 @@
N/A
\end_inset
</cell>
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\layout Standard
+
+N/A
+\end_inset
+</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
\begin_inset Text
@@ -1981,6 +2066,14 @@
N/A
\end_inset
</cell>
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\layout Standard
+
+N/A
+\end_inset
+</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
\begin_inset Text
@@ -2007,6 +2100,14 @@
N/A
\end_inset
</cell>
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\layout Standard
+
+N/A
+\end_inset
+</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
\begin_inset Text
@@ -2033,6 +2134,14 @@
N/A
\end_inset
</cell>
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\layout Standard
+
+N/A
+\end_inset
+</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
\begin_inset Text
@@ -2059,6 +2168,14 @@
N/A
\end_inset
</cell>
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\layout Standard
+
+N/A
+\end_inset
+</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
\begin_inset Text
@@ -2085,6 +2202,14 @@
N/A
\end_inset
</cell>
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\layout Standard
+
+N/A
+\end_inset
+</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
\begin_inset Text
@@ -2111,6 +2236,14 @@
N/A
\end_inset
</cell>
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\layout Standard
+
+N/A
+\end_inset
+</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
\begin_inset Text
@@ -2127,6 +2260,14 @@
\layout Standard
15
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\layout Standard
+
+N/A
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
<p><p>1.8 +1 -1 speex/libspeex/misc.h
Index: misc.h
===================================================================
RCS file: /usr/local/cvsroot/speex/libspeex/misc.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- misc.h 11 Oct 2002 03:39:34 -0000 1.7
+++ misc.h 26 Oct 2002 04:51:10 -0000 1.8
@@ -36,7 +36,7 @@
#define MISC_H
#ifndef VERSION
-#define VERSION "unknown version"
+#define VERSION "Speex-1.0beta2"
#endif
unsigned int be_int(unsigned int i);
<p><p>1.51 +4 -4 speex/src/speexdec.c
Index: speexdec.c
===================================================================
RCS file: /usr/local/cvsroot/speex/src/speexdec.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- speexdec.c 11 Oct 2002 03:39:35 -0000 1.50
+++ speexdec.c 26 Oct 2002 04:51:10 -0000 1.51
@@ -477,10 +477,10 @@
/*PCM saturation (just in case)*/
for (i=0;i<frame_size;i++)
{
- if (output[i]>32000)
- output[i]=32000;
- else if (output[i]<-32000)
- output[i]=-32000;
+ if (output[i]>32000.0)
+ output[i]=32000.0;
+ else if (output[i]<-32000.0)
+ output[i]=-32000.0;
}
/*Convert to short and save to output file*/
for (i=0;i<frame_size;i++)
<p><p>--- >8 ----
List archives: http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body. No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.
More information about the commits
mailing list