[xiph-commits] r7080 - in trunk/speex: . libspeex

[jm at dactyl.lonelymoon.com]

Author: jm
Date: Fri Jul  9 17:12:42 2004
New Revision: 7080

Modified:
trunk/speex/configure.in
trunk/speex/libspeex/mdf.c
trunk/speex/libspeex/misc.h
Log:
minor stuff for 1.1.6


Modified: trunk/speex/configure.in
===================================================================
--- trunk/speex/configure.in	2004-07-09 19:35:55 UTC (rev 7079)
+++ trunk/speex/configure.in	2004-07-10 00:12:41 UTC (rev 7080)
@@ -5,7 +5,7 @@
SPEEX_MAJOR_VERSION=1
SPEEX_MINOR_VERSION=1
SPEEX_MICRO_VERSION=6
-SPEEX_EXTRA_VERSION=-cvs
+SPEEX_EXTRA_VERSION=
#SPEEX_VERSION=1.1.6
SPEEX_VERSION=$SPEEX_MAJOR_VERSION.$SPEEX_MINOR_VERSION.$SPEEX_MICRO_VERSION$SPEEX_EXTRA_VERSION


Modified: trunk/speex/libspeex/mdf.c
===================================================================
--- trunk/speex/libspeex/mdf.c	2004-07-09 19:35:55 UTC (rev 7079)
+++ trunk/speex/libspeex/mdf.c	2004-07-10 00:12:41 UTC (rev 7080)
@@ -301,11 +301,11 @@
{
st->adapt_rate = .3f/(2+M);
} else {
-         if (spectral_dist > .6 || cos_dist > .8)
+         if (spectral_dist > .5 && cos_dist > .7)
st->adapt_rate = .4f/(2+M);
-         else if (spectral_dist > .4 || cos_dist > .6)
+         else if (spectral_dist > .3 && cos_dist > .5)
st->adapt_rate = .2f/(2+M);
-         else if (spectral_dist > .2 || cos_dist > .4)
+         else if (spectral_dist > .15 && cos_dist > .3)
st->adapt_rate = .1f/(2+M);
else if (cos_dist > .01)
st->adapt_rate = .05f/(2+M);

Modified: trunk/speex/libspeex/misc.h
===================================================================
--- trunk/speex/libspeex/misc.h	2004-07-09 19:35:55 UTC (rev 7079)
+++ trunk/speex/libspeex/misc.h	2004-07-10 00:12:41 UTC (rev 7080)
@@ -36,6 +36,10 @@
#define MISC_H

#ifndef SPEEX_VERSION
+#define SPEEX_MAJOR_VERSION 1
+#define SPEEX_MAJOR_VERSION 1
+#define SPEEX_MAJOR_VERSION 6
+#define SPEEX_EXTRA_VERSION ""
#define SPEEX_VERSION "speex-1.1.6"
#endif