ref: d43d09587ae3233f89b6e06a31d21094e677aad2
parent: 72513f3cc75a2a4a5ab12c1d00acb1dbfb96ab73
author: Jean-Marc Valin <[email protected]>
date: Thu Jul 8 10:34:42 EDT 2010
ietf draft update (incomplete)
--- a/doc/ietf/Makefile.ietf
+++ b/doc/ietf/Makefile.ietf
@@ -3,8 +3,8 @@
LIBS = -lm
OBJS = bands.o celt.o cwrs.o entcode.o entdec.o entenc.o kiss_fft.o \
- kiss_fftr.o laplace.o mdct.o modes.o pitch.o psy.o \
- quant_bands.o rangedec.o rangeenc.o rate.o testcelt.o vq.o
+ kiss_fftr.o laplace.o mdct.o modes.o pitch.o \
+ quant_bands.o rangedec.o rangeenc.o rate.o testcelt.o vq.o plc.o
.c.o:
$(CC) $(CFLAGS) $<
--- a/doc/ietf/build_drafts.sh
+++ b/doc/ietf/build_drafts.sh
@@ -5,11 +5,11 @@
./ietf_source.sh
#codec draft
-xml2rfc.tcl draft-valin-celt-codec.xml draft-valin-celt-codec.html
+xml2rfc draft-valin-celt-codec.xml draft-valin-celt-codec.html
-xml2rfc.tcl draft-valin-celt-codec.xml draft-valin-celt-codec.txt
+xml2rfc draft-valin-celt-codec.xml draft-valin-celt-codec.txt
#RTP draft
-xml2rfc.tcl draft-valin-celt-rtp-profile.xml draft-valin-celt-rtp-profile.html
+xml2rfc draft-valin-celt-rtp-profile.xml draft-valin-celt-rtp-profile.html
-xml2rfc.tcl draft-valin-celt-rtp-profile.xml draft-valin-celt-rtp-profile.txt
+xml2rfc draft-valin-celt-rtp-profile.xml draft-valin-celt-rtp-profile.txt
--- a/doc/ietf/celt_types.h
+++ b/doc/ietf/celt_types.h
@@ -1,11 +1,11 @@
#ifndef _CELT_TYPES_H
#define _CELT_TYPES_H
-typedef short celt_int16_t;
-typedef unsigned short celt_uint16_t;
-typedef int celt_int32_t;
-typedef unsigned int celt_uint32_t;
-typedef long long celt_int64_t;
-typedef unsigned long long celt_uint64_t;
+typedef short celt_int16;
+typedef unsigned short celt_uint16;
+typedef int celt_int32;
+typedef unsigned int celt_uint32;
+typedef long long celt_int64;
+typedef unsigned long long celt_uint64;
#endif /* _CELT_TYPES_H */
--- a/doc/ietf/draft-valin-celt-codec.xml
+++ b/doc/ietf/draft-valin-celt-codec.xml
@@ -2,7 +2,7 @@
<!DOCTYPE rfc SYSTEM 'rfc2629.dtd'>
<?rfc toc="yes" symrefs="yes" ?>
-<rfc ipr="trust200902" category="std" docName="draft-valin-celt-codec-01">
+<rfc ipr="trust200902" category="std" docName="draft-valin-celt-codec-02">
<front>
<title abbrev="CELT codec">Constrained-Energy Lapped Transform (CELT) Codec</title>
@@ -65,7 +65,7 @@
</address>
</author>
-<date day="13" month="July" year="2009" />
+<date day="5" month="July" year="2010" />
<area>General</area>
@@ -1347,7 +1347,7 @@
<t>This appendix contains the complete source code for a floating-point
reference implementation of the CELT codec written in C. This
-implementation is derived from version 0.6.1 of the implementation available on the
+implementation is derived from version 0.8.0 of the implementation available on the
<xref target="celt-website"></xref>, which can be compiled for
either floating-point or fixed-point architectures.
</t>
@@ -1393,8 +1393,8 @@
<?rfc include="xml_source/pitch.c"?>
<?rfc include="xml_source/rate.h"?>
<?rfc include="xml_source/rate.c"?>
-<?rfc include="xml_source/psy.h"?>
-<?rfc include="xml_source/psy.c"?>
+<?rfc include="xml_source/plc.h"?>
+<?rfc include="xml_source/plc.c"?>
<?rfc include="xml_source/mdct.h"?>
<?rfc include="xml_source/mdct.c"?>
<?rfc include="xml_source/ecintrin.h"?>
--- a/doc/ietf/substitutions.h
+++ b/doc/ietf/substitutions.h
@@ -2,14 +2,14 @@
#define UMUL32(a,b) ((a)*(b))
#define UMUL16_16(a,b) ((a)*(b))
-#define celt_word16_t float
-#define celt_word32_t float
+#define celt_word16 float
+#define celt_word32 float
-#define celt_sig_t float
-#define celt_norm_t float
-#define celt_ener_t float
-#define celt_pgain_t float
-#define celt_mask_t float
+#define celt_sig float
+#define celt_norm float
+#define celt_ener float
+#define celt_pgain float
+#define celt_mask float
#define UADD32(a,b) ((a)+(b))
#define USUB32(a,b) ((a)-(b))
@@ -96,4 +96,4 @@
#define DIV32(a,b) ((a)/(b))
#define PDIV32(a,b) ((a)/(b))
-#define PRINT_MIPS(x)
\ No newline at end of file
+#define PRINT_MIPS(x)