[xiph-cvs] cvs commit: vorbis/lib/modes mode_A.h mode_AA.h mode_B.h mode_C.h mode_D.h mode_E.h modes.h
Monty
xiphmont at xiph.org
Wed Jan 31 17:03:32 PST 2001
xiphmont 01/01/31 17:03:31
Modified: lib info.c os.h
lib/modes mode_A.h mode_AA.h mode_B.h mode_C.h mode_D.h
mode_E.h modes.h
Log:
Increase preecho trigger sensitivity, even at low bitrate
Update vendor version string
Revision Changes Path
1.36 +2 -2 vorbis/lib/info.c
Index: info.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/info.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- info.c 2001/01/22 01:38:24 1.35
+++ info.c 2001/02/01 01:03:29 1.36
@@ -12,7 +12,7 @@
********************************************************************
function: maintain the info structure, info <-> header packets
- last mod: $Id: info.c,v 1.35 2001/01/22 01:38:24 xiphmont Exp $
+ last mod: $Id: info.c,v 1.36 2001/02/01 01:03:29 xiphmont Exp $
********************************************************************/
@@ -409,7 +409,7 @@
}
static int _vorbis_pack_comment(oggpack_buffer *opb,vorbis_comment *vc){
- char temp[]="Xiphophorus libVorbis I 20010119";
+ char temp[]="Xiphophorus libVorbis I 20010201";
/* preamble */
oggpack_write(opb,0x03,8);
1.21 +43 -47 vorbis/lib/os.h
Index: os.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/os.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- os.h 2001/01/30 09:40:11 1.20
+++ os.h 2001/02/01 01:03:29 1.21
@@ -14,7 +14,7 @@
********************************************************************
function: #ifdef jail to whip a few platforms into the UNIX ideal.
- last mod: $Id: os.h,v 1.20 2001/01/30 09:40:11 msmith Exp $
+ last mod: $Id: os.h,v 1.21 2001/02/01 01:03:29 xiphmont Exp $
********************************************************************/
@@ -22,46 +22,55 @@
#include <ogg/os_types.h>
#ifndef _V_IFDEFJAIL_H_
-#define _V_IFDEFJAIL_H_
+# define _V_IFDEFJAIL_H_
+# ifdef __GNUC__
+# define STIN static inline
+# elif _WIN32
+# define STIN static __inline
+#else
+# define STIN static
+#endif
+
#ifndef M_PI
-#define M_PI (3.1415926536f)
+# define M_PI (3.1415926536f)
#endif
-#ifndef __GNUC__
#ifdef _WIN32
# include <malloc.h>
# define rint(x) (floor((x)+0.5f))
+# define NO_FLOAT_MATH_LIB
+# define FAST_HYPOT(a, b) sqrt((a)*(a) + (b)*(b))
#endif
-#define STIN static
-#else
-#define STIN static inline
-#define sqrt sqrtf
-#define log logf
-#define exp expf
-#define pow powf
-#define acos acosf
-#define atan atanf
-#define frexp frexpf
-#define rint rintf
+#ifdef DARWIN
+# define NO_FLOAT_MATH_LIB
#endif
+#ifndef NO_FLOAT_MATH_LIB
+# define sqrt sqrtf
+# define log logf
+# define exp expf
+# define pow powf
+# define acos acosf
+# define atan atanf
+# define frexp frexpf
+# define rint rintf
+#endif
-#ifdef _WIN32
-# define FAST_HYPOT(a, b) sqrt((a)*(a) + (b)*(b))
-#else /* if not _WIN32 */
+
+#ifndef FAST_HYPOT
# define FAST_HYPOT hypot
#endif
#endif
#ifdef HAVE_ALLOCA_H
-#include <alloca.h>
+# include <alloca.h>
#endif
#ifdef USE_MEMORY_H
-#include <memory.h>
+# include <memory.h>
#endif
#ifndef min
@@ -72,11 +81,8 @@
# define max(x,y) ((x)<(y)?(y):(x))
#endif
-
-#if defined(__i386__) && defined(__GNUC__)
-
-#ifndef __BEOS__
-
+#if defined(__i386__) && defined(__GNUC__) && !defined(__BEOS__)
+# define VORBIS_FPU_CONTROL
/* both GCC and MSVC are kinda stupid about rounding/casting to int.
Because of encapsulation constraints (GCC can't see inside the asm
block and so we end up doing stupid things like a store/load that
@@ -109,28 +115,14 @@
__asm__("fistl %0": "=m"(i) : "t"(f));
return(i);
}
-
-#else
-/* this is for beos */
-
-typedef int vorbis_fpu_control;
-static int vorbis_ftoi(double f){
- return (int)(f+.5);
-}
-
-/* We don't have special code for this compiler/arch, so do it the slow way */
-#define vorbis_fpu_setround(vorbis_fpu_control) {}
-#define vorbis_fpu_restore(vorbis_fpu_control) {}
-
#endif
-#else
+#if defined(_WIN32) && !defined(__GNUC__)
+# define VORBIS_FPU_CONTROL
-typedef int vorbis_fpu_control;
+typedef ogg_int16_t vorbis_fpu_control;
-#ifdef _MSC_VER
-/* MSVC++ */
static __inline int vorbis_ftoi(double f){
int i;
__asm{
@@ -145,17 +137,21 @@
static __inline void vorbis_fpu_restore(vorbis_fpu_control fpu){
}
-#else
+#endif
+
+
+#ifndef VORBIS_FPU_CONTROL
+
+typedef int vorbis_fpu_control;
+
static int vorbis_ftoi(double f){
return (int)(f+.5);
}
/* We don't have special code for this compiler/arch, so do it the slow way */
-#define vorbis_fpu_setround(vorbis_fpu_control) {}
-#define vorbis_fpu_restore(vorbis_fpu_control) {}
-
-#endif
+# define vorbis_fpu_setround(vorbis_fpu_control) {}
+# define vorbis_fpu_restore(vorbis_fpu_control) {}
#endif
1.9 +2 -2 vorbis/lib/modes/mode_A.h
Index: mode_A.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/modes/mode_A.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mode_A.h 2001/01/22 01:38:50 1.8
+++ mode_A.h 2001/02/01 01:03:30 1.9
@@ -12,7 +12,7 @@
********************************************************************
function: predefined encoding modes
- last mod: $Id: mode_A.h,v 1.8 2001/01/22 01:38:50 xiphmont Exp $
+ last mod: $Id: mode_A.h,v 1.9 2001/02/01 01:03:30 xiphmont Exp $
********************************************************************/
@@ -312,7 +312,7 @@
/* psy */
{&_psy_set_A0,&_psy_set_A},
/* thresh sample period, preecho clamp trigger threshhold, range, minenergy */
- 256, 30.f, -30.f, -96.f,
+ 256, 20.f, -20.f, -96.f,
-10.,
1.5 +2 -2 vorbis/lib/modes/mode_AA.h
Index: mode_AA.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/modes/mode_AA.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mode_AA.h 2001/01/22 01:38:50 1.4
+++ mode_AA.h 2001/02/01 01:03:30 1.5
@@ -12,7 +12,7 @@
********************************************************************
function: predefined encoding modes
- last mod: $Id: mode_AA.h,v 1.4 2001/01/22 01:38:50 xiphmont Exp $
+ last mod: $Id: mode_AA.h,v 1.5 2001/02/01 01:03:30 xiphmont Exp $
********************************************************************/
@@ -312,7 +312,7 @@
/* psy */
{&_psy_set_AA0,&_psy_set_AA},
/* thresh sample period, preecho clamp trigger threshhold, range, minenergy */
- 256, 30.f, -30.f, -96.f,
+ 256, 22.f, -22.f, -96.f,
-10.,
1.8 +2 -2 vorbis/lib/modes/mode_B.h
Index: mode_B.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/modes/mode_B.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mode_B.h 2001/01/22 01:38:50 1.7
+++ mode_B.h 2001/02/01 01:03:30 1.8
@@ -12,7 +12,7 @@
********************************************************************
function: predefined encoding modes
- last mod: $Id: mode_B.h,v 1.7 2001/01/22 01:38:50 xiphmont Exp $
+ last mod: $Id: mode_B.h,v 1.8 2001/02/01 01:03:30 xiphmont Exp $
********************************************************************/
@@ -312,7 +312,7 @@
/* psy */
{&_psy_set_B0,&_psy_set_B},
/* thresh sample period, preecho clamp trigger threshhold, range, minenergy */
- 256, 30.f, -30.f, -96.f,
+ 256, 20.f, -20.f, -96.f,
-10.,
1.8 +2 -2 vorbis/lib/modes/mode_C.h
Index: mode_C.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/modes/mode_C.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mode_C.h 2001/01/22 01:38:50 1.7
+++ mode_C.h 2001/02/01 01:03:30 1.8
@@ -12,7 +12,7 @@
********************************************************************
function: predefined encoding modes
- last mod: $Id: mode_C.h,v 1.7 2001/01/22 01:38:50 xiphmont Exp $
+ last mod: $Id: mode_C.h,v 1.8 2001/02/01 01:03:30 xiphmont Exp $
********************************************************************/
@@ -312,7 +312,7 @@
/* psy */
{&_psy_set_C0,&_psy_set_C},
/* thresh sample period, preecho clamp trigger threshhold, range, minenergy */
- 256, 26.f, -26.f, -96.f,
+ 256, 20.f, -20.f, -96.f,
-15.,
1.9 +2 -2 vorbis/lib/modes/mode_D.h
Index: mode_D.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/modes/mode_D.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mode_D.h 2001/01/22 01:38:50 1.8
+++ mode_D.h 2001/02/01 01:03:30 1.9
@@ -12,7 +12,7 @@
********************************************************************
function: predefined encoding modes
- last mod: $Id: mode_D.h,v 1.8 2001/01/22 01:38:50 xiphmont Exp $
+ last mod: $Id: mode_D.h,v 1.9 2001/02/01 01:03:30 xiphmont Exp $
********************************************************************/
@@ -309,7 +309,7 @@
/* psy */
{&_psy_set_D0,&_psy_set_D},
/* thresh sample period, preecho clamp trigger threshhold, range, minenergy */
- 256, 20.f, -20.f, -96.f,
+ 256, 18.f, -18.f, -96.f,
-15.,
1.6 +4 -4 vorbis/lib/modes/mode_E.h
Index: mode_E.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/modes/mode_E.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mode_E.h 2001/01/22 01:38:50 1.5
+++ mode_E.h 2001/02/01 01:03:30 1.6
@@ -12,7 +12,7 @@
********************************************************************
function: predefined encoding modes
- last mod: $Id: mode_E.h,v 1.5 2001/01/22 01:38:50 xiphmont Exp $
+ last mod: $Id: mode_E.h,v 1.6 2001/02/01 01:03:30 xiphmont Exp $
********************************************************************/
@@ -59,7 +59,7 @@
/* x: 63 88 125 175 250 350 500 700 1k 1.4k 2k 2.8k 4k 5.6k 8k 11.5k 16k Hz */
/* y: 0 10 20 30 40 50 60 70 80 90 100 dB */
- 1,/* tonemaskp */
+ 0,/* tonemaskp */
/* 0 10 20 30 40 50 60 70 80 90 100 */
{
{-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.,-999.}, /*63*/
@@ -147,7 +147,7 @@
/* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 */
/* x: 63 88 125 175 250 350 500 700 1k 1.4k 2k 2.8k 4k 5.6k 8k 11.5k 16k Hz */
/* y: 0 10 20 30 40 50 60 70 80 90 100 dB */
- 1,/* tonemaskp */
+ 0,/* tonemaskp */
/* 0 10 20 30 40 50 60 70 80 90 100 */
{
{-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f,-999.f}, /*63*/
@@ -307,7 +307,7 @@
/* psy */
{&_psy_set_E0,&_psy_set_E},
/* thresh sample period, preecho clamp trigger threshhold, range, minenergy */
- 256, 20.f, -20.f, -96.f,
+ 256, 18.f, -18.f, -96.f,
-15.,
1.4 +1 -2 vorbis/lib/modes/modes.h
Index: modes.h
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/modes/modes.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- modes.h 2000/11/08 06:08:17 1.3
+++ modes.h 2001/02/01 01:03:30 1.4
@@ -12,14 +12,13 @@
********************************************************************
function: predefined encoding modes
- last mod: $Id: modes.h,v 1.3 2000/11/08 06:08:17 xiphmont Exp $
+ last mod: $Id: modes.h,v 1.4 2001/02/01 01:03:30 xiphmont Exp $
********************************************************************/
#ifndef _V_MODES_H_
#define _V_MODES_H_
-#include "modes/mode_AA.h"
#include "modes/mode_A.h"
#include "modes/mode_B.h"
#include "modes/mode_C.h"
--- >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