[llvm-commits] CVS: llvm-test/MultiSource/Applications/oggenc/oggenc.c
Duraid Madina
duraid at octopus.com.au
Sun Jan 22 08:22:55 PST 2006
Changes in directory llvm-test/MultiSource/Applications/oggenc:
oggenc.c updated: 1.1 -> 1.2
---
Log message:
disable inline assembly
(TODO: rounding mode intrinsics for processors that have them?)
---
Diffs of the changes: (+71 -69)
oggenc.c | 140 +++++++++++++++++++++++++++++++--------------------------------
1 files changed, 71 insertions(+), 69 deletions(-)
Index: llvm-test/MultiSource/Applications/oggenc/oggenc.c
diff -u llvm-test/MultiSource/Applications/oggenc/oggenc.c:1.1 llvm-test/MultiSource/Applications/oggenc/oggenc.c:1.2
--- llvm-test/MultiSource/Applications/oggenc/oggenc.c:1.1 Sat Jan 21 08:50:01 2006
+++ llvm-test/MultiSource/Applications/oggenc/oggenc.c Sun Jan 22 10:22:34 2006
@@ -75,7 +75,7 @@
********************************************************************
function: libvorbis codec headers
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
@@ -94,7 +94,7 @@
********************************************************************
function: toplevel libogg include
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
#define _OGG_H
@@ -112,7 +112,7 @@
********************************************************************
function: #ifdef jail to whip a few platforms into the UNIX ideal.
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
#define _OS_TYPES_H
@@ -2492,7 +2492,7 @@
********************************************************************
function: vorbis encode-engine setup
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
@@ -4551,7 +4551,7 @@
********************************************************************
function: simple programmatic interface for encoder mode setup
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
@@ -4568,7 +4568,7 @@
********************************************************************
function: libvorbis codec headers
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
@@ -4587,7 +4587,7 @@
********************************************************************
function: PCM data envelope analysis and manipulation
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
@@ -4606,7 +4606,7 @@
********************************************************************
function: modified discrete cosine transform prototypes
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
@@ -4726,7 +4726,7 @@
********************************************************************
function: basic shared codebook operations
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
@@ -4911,7 +4911,7 @@
********************************************************************
function: random psychoacoustics (not including preecho)
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
@@ -4930,7 +4930,7 @@
********************************************************************
function: fft transform
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
@@ -4962,7 +4962,7 @@
function: libvorbis backend and mapping structures; needed for
static mode headers
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
@@ -5248,7 +5248,7 @@
********************************************************************
function: bitrate tracking and management
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
@@ -5268,7 +5268,7 @@
********************************************************************
function: #ifdef jail to whip a few platforms into the UNIX ideal.
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
@@ -5285,7 +5285,7 @@
********************************************************************
function: miscellaneous prototypes
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
@@ -5331,7 +5331,9 @@
# define max(x,y) ((x)<(y)?(y):(x))
#endif
-#if defined(__i386__) && defined(__GNUC__) && !defined(__BEOS__)
+#if 0
+/* XXX - no inline asm! */
+
# 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
@@ -5509,7 +5511,7 @@
********************************************************************
function: highlevel encoder setup struct seperated out for vorbisenc clarity
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
@@ -5733,7 +5735,7 @@
********************************************************************
function: toplevel settings for 44.1/48kHz
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
@@ -5750,7 +5752,7 @@
********************************************************************
function: key floor settings
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
/********************************************************************
@@ -5766,7 +5768,7 @@
********************************************************************
function: static codebooks autogenerated by huff/huffbuld
- last modified: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last modified: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
@@ -7425,7 +7427,7 @@
********************************************************************
function: toplevel residue templates for 32/44.1/48kHz
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
@@ -7442,7 +7444,7 @@
********************************************************************
function: static codebooks autogenerated by huff/huffbuld
- last modified: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last modified: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
@@ -26755,7 +26757,7 @@
********************************************************************
function: key psychoacoustic settings for 44.1/48kHz
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
@@ -27443,7 +27445,7 @@
********************************************************************
function: toplevel settings for 44.1/48kHz uncoupled modes
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
@@ -27460,7 +27462,7 @@
********************************************************************
function: toplevel residue templates for 32/44.1/48kHz uncoupled
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
@@ -27477,7 +27479,7 @@
********************************************************************
function: static codebooks autogenerated by huff/huffbuld
- last modified: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last modified: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
@@ -38771,7 +38773,7 @@
********************************************************************
function: toplevel settings for 32kHz
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
@@ -39018,7 +39020,7 @@
********************************************************************
function: 8kHz settings
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
@@ -39035,7 +39037,7 @@
********************************************************************
function: 8kHz psychoacoustic settings
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
@@ -39137,7 +39139,7 @@
********************************************************************
function: toplevel residue templates 8/11kHz
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
@@ -39359,7 +39361,7 @@
********************************************************************
function: 11kHz settings
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
@@ -39376,7 +39378,7 @@
********************************************************************
function: 11kHz settings
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
@@ -39549,7 +39551,7 @@
********************************************************************
function: 16kHz settings
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
@@ -39566,7 +39568,7 @@
********************************************************************
function: 16kHz settings
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
@@ -39693,7 +39695,7 @@
********************************************************************
function: toplevel residue templates 16/22kHz
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
@@ -39987,7 +39989,7 @@
********************************************************************
function: 22kHz settings
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
@@ -40116,7 +40118,7 @@
********************************************************************
function: catch-all toplevel settings for q modes only
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
@@ -41419,7 +41421,7 @@
********************************************************************
function: stdio-based convenience library for opening/seeking/decoding
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
@@ -41436,7 +41438,7 @@
********************************************************************
function: stdio-based convenience library for opening/seeking/decoding
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
@@ -43516,7 +43518,7 @@
********************************************************************
function: maintain the info structure, info <-> header packets
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
@@ -43536,7 +43538,7 @@
********************************************************************
function: registry for time, floor, res backends and channel mappings
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
@@ -43566,7 +43568,7 @@
********************************************************************
function: window functions
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
@@ -44161,7 +44163,7 @@
********************************************************************
function: PCM data vector blocking, windowing and dis/reassembly
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
Handle windowing, overlap-add, etc of the PCM vectors. This is made
more amusing by Vorbis' current two allowed block sizes.
@@ -44181,7 +44183,7 @@
********************************************************************
function: LPC low level routines
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
@@ -45135,7 +45137,7 @@
********************************************************************
function: single-block PCM analysis mode dispatch
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
@@ -45152,7 +45154,7 @@
********************************************************************
function: linear scale -> dB, Bark and Mel scales
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
@@ -45313,7 +45315,7 @@
********************************************************************
function: bitrate tracking and management
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
@@ -45833,7 +45835,7 @@
********************************************************************
function: single-block PCM synthesis
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
@@ -45995,7 +45997,7 @@
********************************************************************
function: basic shared codebook operations
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
@@ -46584,7 +46586,7 @@
********************************************************************
function: basic codebook pack/unpack/code/decode operations
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
@@ -47042,7 +47044,7 @@
********************************************************************
function: registry for time, floor, res backends and channel mappings
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
@@ -47085,7 +47087,7 @@
function: normalized modified discrete cosine transform
power of two length transform only [64 <= n ]
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
Original algorithm adapted long ago from _The use of multirate filter
banks for coding of high quality digital audio_, by T. Sporer,
@@ -47639,7 +47641,7 @@
********************************************************************
function: psychoacoustics not including preecho
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
@@ -47656,7 +47658,7 @@
********************************************************************
function: masking curve data for psychoacoustics
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
@@ -49555,7 +49557,7 @@
********************************************************************
function: *unnormalized* fft transform
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
@@ -50805,7 +50807,7 @@
********************************************************************
function: PCM data envelope analysis
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
@@ -51168,7 +51170,7 @@
********************************************************************
function: LPC low level routines
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
@@ -51304,7 +51306,7 @@
********************************************************************
function: window functions
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
@@ -53436,7 +53438,7 @@
********************************************************************
function: floor backend 0 implementation
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
@@ -53453,7 +53455,7 @@
********************************************************************
function: LSP (also called LSF) conversion routines
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
@@ -53666,7 +53668,7 @@
********************************************************************
function: LSP (also called LSF) conversion routines
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
The LSP generation code is taken (with minimal modification and a
few bugfixes) from "On the Computation of the LSP Frequencies" by
@@ -53700,7 +53702,7 @@
********************************************************************
function: lookup based functions
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
@@ -53744,7 +53746,7 @@
********************************************************************
function: lookup based functions
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
@@ -53761,7 +53763,7 @@
********************************************************************
function: lookup data; generated by lookups.pl; edit there
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
@@ -54409,7 +54411,7 @@
********************************************************************
function: floor backend 1 implementation
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
@@ -55472,7 +55474,7 @@
********************************************************************
function: residue backend 0, 1 and 2 implementation
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
@@ -56354,7 +56356,7 @@
********************************************************************
function: channel mapping 0 implementation
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
@@ -57077,7 +57079,7 @@
********************************************************************
function: packing variable sized words into an octet stream
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
********************************************************************/
@@ -57526,7 +57528,7 @@
function: code raw [Vorbis] packets into framed OggSquish stream and
decode Ogg streams back into raw packets
- last mod: $Id: oggenc.c,v 1.1 2006/01/21 14:50:01 duraid Exp $
+ last mod: $Id: oggenc.c,v 1.2 2006/01/22 16:22:34 duraid Exp $
note: The CRC code is directly derived from public domain code by
Ross Williams (ross at guest.adelaide.edu.au). See docs/framing.html
More information about the llvm-commits
mailing list