ietf doc: cleaning up the build
authorJean-Marc Valin <jean-marc.valin@octasic.com>
Thu, 2 Jul 2009 14:59:07 +0000 (10:59 -0400)
committerJean-Marc Valin <jean-marc.valin@octasic.com>
Thu, 2 Jul 2009 14:59:07 +0000 (10:59 -0400)
doc/ietf/Makefile.ietf
doc/ietf/config.h
doc/ietf/convert_source.sh
doc/ietf/draft-valin-celt-codec.xml

index de762f3..a748985 100644 (file)
@@ -1,5 +1,5 @@
 CC = gcc
-CFLAGS = -c -O2 -g -Dfloat2int=rintf -DHAVE_CONFIG_H
+CFLAGS = -c -O2 -g
 LIBS = -lm
 
 OBJS = bands.o celt.o cwrs.o entcode.o entdec.o entenc.o kiss_fft.o \
index e45bef4..1552faa 100644 (file)
@@ -17,7 +17,7 @@
 #define CELT_MINOR_VERSION 5
 
 /* Complete version string */
-#define CELT_VERSION "0.5.2"
+#define CELT_VERSION "0.6.0"
 
 
 #define restrict 
index 48c859f..91b514f 100755 (executable)
@@ -40,6 +40,7 @@ cat tata.c > source/$i
 
 done
 
+cp ../../libcelt/float_cast.h source/float_cast.h
 cp arch.h source/arch.h
 cp celt_types.h source/celt_types.h
 cp config.h source/config.h
index 01e5761..30390c9 100644 (file)
@@ -2,7 +2,7 @@
 <!DOCTYPE rfc SYSTEM 'rfc2629.dtd'>
 <?rfc toc="yes" symrefs="yes" ?>
 
-<rfc ipr="trust200902" category="info" docName="draft-valin-celt-codec-00">
+<rfc ipr="trust200902" category="std" docName="draft-valin-celt-codec-00">
 
 <front>
 <title abbrev="CELT codec">Constrained-Energy Lapped Transform (CELT) Codec</title>
@@ -659,27 +659,27 @@ observed in the decoder block diagram in <xref target="decoder-diagram"></xref>.
 <figure anchor="decoder-diagram">
 <artwork>
 <![CDATA[
-                            +--+
-                            |Q1|-------------+
-                            +--+             |
-                                             v
-                            +--+  +-----+  +---+  +-----+
-                            |Q3|->| Mix |->| * |->|IMDCT|-+
-                            +--+  +-----+  +---+  +-----+ |
-                              ^      ^                    |
-                              +------+                    |
-                                     |                    |
-                            +--+   +-+-+                  |
-                            |Q2|-->| * |                  |
-                            +--+   +---+                  |
-                                     ^                    |
-                                     |                    |
-                              +------+-----+              |
-              +------------+  |Delay, MDCT,|              |
-              |Pitch period|->|  Normalize |              |
-              +------------+  +------------+              |
-                                     ^                    |
-                                     +--------------------+
+                       +--+
+                       |Q1|-------------+
+                       +--+             |
+                                        v
+                       +--+  +-----+  +---+  +-----+
+                       |Q3|->| Mix |->| * |->|IMDCT|-+-> output
+                       +--+  +-----+  +---+  +-----+ |
+                         ^      ^                    |
+                         +------+                    |
+                                |                    |
+                       +--+   +-+-+                  |
+                       |Q2|-->| * |                  |
+                       +--+   +---+                  |
+                                ^                    |
+                                |                    |
+                         +------+-----+              |
+         +------------+  |Delay, MDCT,|              |
+         |Pitch period|->|  Normalize |              |
+         +------------+  +------------+              |
+                                ^                    |
+                                +--------------------+
 ]]>
 </artwork>
 <postamble>Block diagram of the CELT decoder</postamble>
@@ -943,6 +943,7 @@ can select the quality vs complexity tradeoff (0-10) and the "packet loss rate"
 argument simulates random packet loss (argument is in tenths or a percent).
 </t>
 
+<?rfc include="xml_source/Makefile"?>
 <?rfc include="xml_source/testcelt.c"?>
 <?rfc include="xml_source/celt.h"?>
 <?rfc include="xml_source/celt.c"?>
@@ -989,7 +990,7 @@ argument simulates random packet loss (argument is in tenths or a percent).
 <?rfc include="xml_source/kiss_fftr.c"?>
 <?rfc include="xml_source/kfft_single.h"?>
 <?rfc include="xml_source/kfft_double.h"?>
-<?rfc include="xml_source/Makefile"?>
+<?rfc include="xml_source/config.h"?>
 
 </section>