ref: fa562fc1cbe5d332273f38b6af63015faba08ed0
parent: cb73e5ca62f93f530e65b244cf52f905a727d04d
author: Jean-Marc Valin <jean-marc.valin@octasic.com>
date: Thu Apr 28 11:06:25 EDT 2011
Leaving just libcelt
--- a/COPYING
+++ /dev/null
@@ -1,25 +1,0 @@
-Copyright 2001-2009 Jean-Marc Valin, Timothy B. Terriberry,
- CSIRO, and other contributors
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-- Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--- a/Doxyfile
+++ /dev/null
@@ -1,283 +1,0 @@
-# Doxyfile 1.5.3
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-DOXYFILE_ENCODING = UTF-8
-PROJECT_NAME = CELT
-PROJECT_NUMBER = 0.11.4
-OUTPUT_DIRECTORY = doc/API
-CREATE_SUBDIRS = NO
-OUTPUT_LANGUAGE = English
-BRIEF_MEMBER_DESC = YES
-REPEAT_BRIEF = YES
-ABBREVIATE_BRIEF = "The $name class " \
- "The $name widget " \
- "The $name file " \
- is \
- provides \
- specifies \
- contains \
- represents \
- a \
- an \
- the
-ALWAYS_DETAILED_SEC = NO
-INLINE_INHERITED_MEMB = NO
-FULL_PATH_NAMES = YES
-STRIP_FROM_PATH =
-STRIP_FROM_INC_PATH =
-SHORT_NAMES = NO
-JAVADOC_AUTOBRIEF = NO
-QT_AUTOBRIEF = NO
-MULTILINE_CPP_IS_BRIEF = NO
-DETAILS_AT_TOP = NO
-INHERIT_DOCS = YES
-SEPARATE_MEMBER_PAGES = NO
-TAB_SIZE = 8
-ALIASES =
-OPTIMIZE_OUTPUT_FOR_C = YES
-OPTIMIZE_OUTPUT_JAVA = NO
-BUILTIN_STL_SUPPORT = NO
-CPP_CLI_SUPPORT = NO
-DISTRIBUTE_GROUP_DOC = NO
-SUBGROUPING = YES
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-EXTRACT_ALL = NO
-EXTRACT_PRIVATE = NO
-EXTRACT_STATIC = NO
-EXTRACT_LOCAL_CLASSES = YES
-EXTRACT_LOCAL_METHODS = NO
-EXTRACT_ANON_NSPACES = NO
-HIDE_UNDOC_MEMBERS = YES
-HIDE_UNDOC_CLASSES = YES
-HIDE_FRIEND_COMPOUNDS = NO
-HIDE_IN_BODY_DOCS = NO
-INTERNAL_DOCS = NO
-CASE_SENSE_NAMES = YES
-HIDE_SCOPE_NAMES = NO
-SHOW_INCLUDE_FILES = YES
-INLINE_INFO = YES
-SORT_MEMBER_DOCS = YES
-SORT_BRIEF_DOCS = NO
-SORT_BY_SCOPE_NAME = NO
-GENERATE_TODOLIST = YES
-GENERATE_TESTLIST = YES
-GENERATE_BUGLIST = YES
-GENERATE_DEPRECATEDLIST= YES
-ENABLED_SECTIONS =
-MAX_INITIALIZER_LINES = 30
-SHOW_USED_FILES = YES
-SHOW_DIRECTORIES = NO
-FILE_VERSION_FILTER =
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-QUIET = NO
-WARNINGS = YES
-WARN_IF_UNDOCUMENTED = YES
-WARN_IF_DOC_ERROR = YES
-WARN_NO_PARAMDOC = NO
-WARN_FORMAT = "$file:$line: $text "
-WARN_LOGFILE =
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-INPUT = libcelt/celt.h \
- libcelt/celt_types.h \
- libcelt/celt_header.h
-INPUT_ENCODING = UTF-8
-FILE_PATTERNS = *.c \
- *.cc \
- *.cxx \
- *.cpp \
- *.c++ \
- *.d \
- *.java \
- *.ii \
- *.ixx \
- *.ipp \
- *.i++ \
- *.inl \
- *.h \
- *.hh \
- *.hxx \
- *.hpp \
- *.h++ \
- *.idl \
- *.odl \
- *.cs \
- *.php \
- *.php3 \
- *.inc \
- *.m \
- *.mm \
- *.dox \
- *.py \
- *.C \
- *.CC \
- *.C++ \
- *.II \
- *.I++ \
- *.H \
- *.HH \
- *.H++ \
- *.CS \
- *.PHP \
- *.PHP3 \
- *.M \
- *.MM \
- *.PY
-RECURSIVE = NO
-EXCLUDE =
-EXCLUDE_SYMLINKS = NO
-EXCLUDE_PATTERNS = *.c
-EXCLUDE_SYMBOLS =
-EXAMPLE_PATH =
-EXAMPLE_PATTERNS = *
-EXAMPLE_RECURSIVE = NO
-IMAGE_PATH =
-INPUT_FILTER =
-FILTER_PATTERNS =
-FILTER_SOURCE_FILES = NO
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-SOURCE_BROWSER = YES
-INLINE_SOURCES = NO
-STRIP_CODE_COMMENTS = YES
-REFERENCED_BY_RELATION = YES
-REFERENCES_RELATION = YES
-REFERENCES_LINK_SOURCE = YES
-USE_HTAGS = NO
-VERBATIM_HEADERS = YES
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-ALPHABETICAL_INDEX = NO
-COLS_IN_ALPHA_INDEX = 5
-IGNORE_PREFIX =
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-GENERATE_HTML = YES
-HTML_OUTPUT = html
-HTML_FILE_EXTENSION = .html
-HTML_HEADER =
-HTML_FOOTER =
-HTML_STYLESHEET =
-HTML_ALIGN_MEMBERS = YES
-GENERATE_HTMLHELP = NO
-HTML_DYNAMIC_SECTIONS = NO
-CHM_FILE =
-HHC_LOCATION =
-GENERATE_CHI = NO
-BINARY_TOC = NO
-TOC_EXPAND = NO
-DISABLE_INDEX = NO
-ENUM_VALUES_PER_LINE = 4
-GENERATE_TREEVIEW = NO
-TREEVIEW_WIDTH = 250
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-GENERATE_LATEX = YES
-LATEX_OUTPUT = latex
-LATEX_CMD_NAME = latex
-MAKEINDEX_CMD_NAME = makeindex
-COMPACT_LATEX = NO
-PAPER_TYPE = a4wide
-EXTRA_PACKAGES =
-LATEX_HEADER =
-PDF_HYPERLINKS = YES
-USE_PDFLATEX = YES
-LATEX_BATCHMODE = NO
-LATEX_HIDE_INDICES = NO
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-GENERATE_RTF = NO
-RTF_OUTPUT = rtf
-COMPACT_RTF = NO
-RTF_HYPERLINKS = NO
-RTF_STYLESHEET_FILE =
-RTF_EXTENSIONS_FILE =
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-GENERATE_MAN = YES
-MAN_OUTPUT = man
-MAN_EXTENSION = .3
-MAN_LINKS = NO
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-GENERATE_XML = NO
-XML_OUTPUT = xml
-XML_SCHEMA =
-XML_DTD =
-XML_PROGRAMLISTING = YES
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-GENERATE_AUTOGEN_DEF = NO
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-GENERATE_PERLMOD = NO
-PERLMOD_LATEX = NO
-PERLMOD_PRETTY = YES
-PERLMOD_MAKEVAR_PREFIX =
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-ENABLE_PREPROCESSING = YES
-MACRO_EXPANSION = NO
-EXPAND_ONLY_PREDEF = NO
-SEARCH_INCLUDES = YES
-INCLUDE_PATH =
-INCLUDE_FILE_PATTERNS =
-PREDEFINED =
-EXPAND_AS_DEFINED =
-SKIP_FUNCTION_MACROS = YES
-#---------------------------------------------------------------------------
-# Configuration::additions related to external references
-#---------------------------------------------------------------------------
-TAGFILES =
-GENERATE_TAGFILE =
-ALLEXTERNALS = NO
-EXTERNAL_GROUPS = YES
-PERL_PATH = /usr/bin/perl
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-CLASS_DIAGRAMS = NO
-MSCGEN_PATH =
-HIDE_UNDOC_RELATIONS = YES
-HAVE_DOT = YES
-CLASS_GRAPH = YES
-COLLABORATION_GRAPH = YES
-GROUP_GRAPHS = YES
-UML_LOOK = NO
-TEMPLATE_RELATIONS = NO
-INCLUDE_GRAPH = NO
-INCLUDED_BY_GRAPH = NO
-CALL_GRAPH = NO
-CALLER_GRAPH = NO
-GRAPHICAL_HIERARCHY = YES
-DIRECTORY_GRAPH = YES
-DOT_IMAGE_FORMAT = png
-DOT_PATH =
-DOTFILE_DIRS =
-DOT_GRAPH_MAX_NODES = 50
-MAX_DOT_GRAPH_DEPTH = 1000
-DOT_TRANSPARENT = NO
-DOT_MULTI_TARGETS = NO
-GENERATE_LEGEND = YES
-DOT_CLEANUP = YES
-#---------------------------------------------------------------------------
-# Configuration::additions related to the search engine
-#---------------------------------------------------------------------------
-SEARCHENGINE = NO
--- a/Doxyfile.devel
+++ /dev/null
@@ -1,281 +1,0 @@
-# Doxyfile 1.5.3
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-DOXYFILE_ENCODING = UTF-8
-PROJECT_NAME = CELT
-PROJECT_NUMBER = 0.11.4
-OUTPUT_DIRECTORY = doc/devel
-CREATE_SUBDIRS = NO
-OUTPUT_LANGUAGE = English
-BRIEF_MEMBER_DESC = YES
-REPEAT_BRIEF = YES
-ABBREVIATE_BRIEF = "The $name class " \
- "The $name widget " \
- "The $name file " \
- is \
- provides \
- specifies \
- contains \
- represents \
- a \
- an \
- the
-ALWAYS_DETAILED_SEC = NO
-INLINE_INHERITED_MEMB = NO
-FULL_PATH_NAMES = YES
-STRIP_FROM_PATH =
-STRIP_FROM_INC_PATH =
-SHORT_NAMES = NO
-JAVADOC_AUTOBRIEF = NO
-QT_AUTOBRIEF = NO
-MULTILINE_CPP_IS_BRIEF = NO
-DETAILS_AT_TOP = NO
-INHERIT_DOCS = YES
-SEPARATE_MEMBER_PAGES = NO
-TAB_SIZE = 8
-ALIASES =
-OPTIMIZE_OUTPUT_FOR_C = YES
-OPTIMIZE_OUTPUT_JAVA = NO
-BUILTIN_STL_SUPPORT = NO
-CPP_CLI_SUPPORT = NO
-DISTRIBUTE_GROUP_DOC = NO
-SUBGROUPING = YES
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-EXTRACT_ALL = YES
-EXTRACT_PRIVATE = NO
-EXTRACT_STATIC = NO
-EXTRACT_LOCAL_CLASSES = YES
-EXTRACT_LOCAL_METHODS = NO
-EXTRACT_ANON_NSPACES = NO
-HIDE_UNDOC_MEMBERS = YES
-HIDE_UNDOC_CLASSES = YES
-HIDE_FRIEND_COMPOUNDS = NO
-HIDE_IN_BODY_DOCS = NO
-INTERNAL_DOCS = NO
-CASE_SENSE_NAMES = YES
-HIDE_SCOPE_NAMES = NO
-SHOW_INCLUDE_FILES = YES
-INLINE_INFO = YES
-SORT_MEMBER_DOCS = YES
-SORT_BRIEF_DOCS = NO
-SORT_BY_SCOPE_NAME = NO
-GENERATE_TODOLIST = YES
-GENERATE_TESTLIST = YES
-GENERATE_BUGLIST = YES
-GENERATE_DEPRECATEDLIST= YES
-ENABLED_SECTIONS =
-MAX_INITIALIZER_LINES = 30
-SHOW_USED_FILES = YES
-SHOW_DIRECTORIES = NO
-FILE_VERSION_FILTER =
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-QUIET = NO
-WARNINGS = YES
-WARN_IF_UNDOCUMENTED = YES
-WARN_IF_DOC_ERROR = YES
-WARN_NO_PARAMDOC = NO
-WARN_FORMAT = "$file:$line: $text "
-WARN_LOGFILE =
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-INPUT = libcelt
-INPUT_ENCODING = UTF-8
-FILE_PATTERNS = *.c \
- *.cc \
- *.cxx \
- *.cpp \
- *.c++ \
- *.d \
- *.java \
- *.ii \
- *.ixx \
- *.ipp \
- *.i++ \
- *.inl \
- *.h \
- *.hh \
- *.hxx \
- *.hpp \
- *.h++ \
- *.idl \
- *.odl \
- *.cs \
- *.php \
- *.php3 \
- *.inc \
- *.m \
- *.mm \
- *.dox \
- *.py \
- *.C \
- *.CC \
- *.C++ \
- *.II \
- *.I++ \
- *.H \
- *.HH \
- *.H++ \
- *.CS \
- *.PHP \
- *.PHP3 \
- *.M \
- *.MM \
- *.PY
-RECURSIVE = NO
-EXCLUDE =
-EXCLUDE_SYMLINKS = NO
-EXCLUDE_PATTERNS =
-EXCLUDE_SYMBOLS =
-EXAMPLE_PATH =
-EXAMPLE_PATTERNS = *
-EXAMPLE_RECURSIVE = NO
-IMAGE_PATH =
-INPUT_FILTER =
-FILTER_PATTERNS =
-FILTER_SOURCE_FILES = NO
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-SOURCE_BROWSER = YES
-INLINE_SOURCES = NO
-STRIP_CODE_COMMENTS = YES
-REFERENCED_BY_RELATION = YES
-REFERENCES_RELATION = YES
-REFERENCES_LINK_SOURCE = YES
-USE_HTAGS = NO
-VERBATIM_HEADERS = YES
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-ALPHABETICAL_INDEX = NO
-COLS_IN_ALPHA_INDEX = 5
-IGNORE_PREFIX =
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-GENERATE_HTML = YES
-HTML_OUTPUT = html
-HTML_FILE_EXTENSION = .html
-HTML_HEADER =
-HTML_FOOTER =
-HTML_STYLESHEET =
-HTML_ALIGN_MEMBERS = YES
-GENERATE_HTMLHELP = NO
-HTML_DYNAMIC_SECTIONS = NO
-CHM_FILE =
-HHC_LOCATION =
-GENERATE_CHI = NO
-BINARY_TOC = NO
-TOC_EXPAND = NO
-DISABLE_INDEX = NO
-ENUM_VALUES_PER_LINE = 4
-GENERATE_TREEVIEW = NO
-TREEVIEW_WIDTH = 250
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-GENERATE_LATEX = YES
-LATEX_OUTPUT = latex
-LATEX_CMD_NAME = latex
-MAKEINDEX_CMD_NAME = makeindex
-COMPACT_LATEX = NO
-PAPER_TYPE = a4wide
-EXTRA_PACKAGES =
-LATEX_HEADER =
-PDF_HYPERLINKS = YES
-USE_PDFLATEX = YES
-LATEX_BATCHMODE = NO
-LATEX_HIDE_INDICES = NO
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-GENERATE_RTF = NO
-RTF_OUTPUT = rtf
-COMPACT_RTF = NO
-RTF_HYPERLINKS = NO
-RTF_STYLESHEET_FILE =
-RTF_EXTENSIONS_FILE =
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-GENERATE_MAN = YES
-MAN_OUTPUT = man
-MAN_EXTENSION = .3
-MAN_LINKS = NO
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-GENERATE_XML = NO
-XML_OUTPUT = xml
-XML_SCHEMA =
-XML_DTD =
-XML_PROGRAMLISTING = YES
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-GENERATE_AUTOGEN_DEF = NO
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-GENERATE_PERLMOD = NO
-PERLMOD_LATEX = NO
-PERLMOD_PRETTY = YES
-PERLMOD_MAKEVAR_PREFIX =
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-ENABLE_PREPROCESSING = YES
-MACRO_EXPANSION = NO
-EXPAND_ONLY_PREDEF = NO
-SEARCH_INCLUDES = YES
-INCLUDE_PATH =
-INCLUDE_FILE_PATTERNS =
-PREDEFINED =
-EXPAND_AS_DEFINED =
-SKIP_FUNCTION_MACROS = YES
-#---------------------------------------------------------------------------
-# Configuration::additions related to external references
-#---------------------------------------------------------------------------
-TAGFILES =
-GENERATE_TAGFILE =
-ALLEXTERNALS = NO
-EXTERNAL_GROUPS = YES
-PERL_PATH = /usr/bin/perl
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-CLASS_DIAGRAMS = NO
-MSCGEN_PATH =
-HIDE_UNDOC_RELATIONS = YES
-HAVE_DOT = YES
-CLASS_GRAPH = YES
-COLLABORATION_GRAPH = YES
-GROUP_GRAPHS = YES
-UML_LOOK = NO
-TEMPLATE_RELATIONS = NO
-INCLUDE_GRAPH = NO
-INCLUDED_BY_GRAPH = NO
-CALL_GRAPH = NO
-CALLER_GRAPH = NO
-GRAPHICAL_HIERARCHY = YES
-DIRECTORY_GRAPH = YES
-DOT_IMAGE_FORMAT = png
-DOT_PATH =
-DOTFILE_DIRS =
-DOT_GRAPH_MAX_NODES = 50
-MAX_DOT_GRAPH_DEPTH = 1000
-DOT_TRANSPARENT = NO
-DOT_MULTI_TARGETS = NO
-GENERATE_LEGEND = YES
-DOT_CLEANUP = YES
-#---------------------------------------------------------------------------
-# Configuration::additions related to the search engine
-#---------------------------------------------------------------------------
-SEARCHENGINE = NO
--- a/INSTALL
+++ /dev/null
@@ -1,5 +1,0 @@
-To compile:
-
-./configure
-make
-
--- a/Makefile.am
+++ /dev/null
@@ -1,18 +1,0 @@
-## Process this file with automake to produce Makefile.in. -*-Makefile-*-
-
-# To disable automatic dependency tracking if using other tools than
-# gcc and gmake, add the option 'no-dependencies'
-AUTOMAKE_OPTIONS = 1.6
-
-#Fools KDevelop into including all files
-SUBDIRS = libcelt tests @tools@
-
-DIST_SUBDIRS = libcelt tests tools
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = celt.pc
-
-EXTRA_DIST = celt.pc.in Doxyfile Doxyfile.devel msvc/config.h
-
-rpm: dist
- rpmbuild -ta ${PACKAGE}-${VERSION}.tar.gz--- a/README
+++ /dev/null
@@ -1,88 +1,0 @@
-CELT is a very low delay audio codec designed for high-quality communications.
-
-Traditional full-bandwidth codecs such as Vorbis and AAC can offer high
-quality but they require codec delays of hundreds of milliseconds, which
-makes them unsuitable for real-time interactive applications like tele-
-conferencing. Speech targeted codecs, such as Speex or G.722, have lower
-20-40ms delays but their speech focus and limited sampling rates
-restricts their quality, especially for music.
-
-Additionally, the other mandatory components of a full network audio system—
-audio interfaces, routers, jitter buffers— each add their own delay. For lower
-speed networks the time it takes to serialize a packet onto the network cable
-takes considerable time, and over the long distances the speed of light
-imposes a significant delay.
-
-In teleconferencing— it is important to keep delay low so that the participants
-can communicate fluidly without talking on top of each other and so that their
-own voices don't return after a round trip as an annoying echo.
-
-For network music performance— research has show that the total one way delay
-must be kept under 25ms to avoid degrading the musicians performance.
-
-Since many of the sources of delay in a complete system are outside of the
-user's control (such as the speed of light) it is often only possible to
-reduce the total delay by reducing the codec delay.
-
-Low delay has traditionally been considered a challenging area in audio codec
-design, because as a codec is forced to work on the smaller chunks of audio
-required for low delay it has access to less redundancy and less perceptual
-information which it can use to reduce the size of the transmitted audio.
-
-CELT is designed to bridge the gap between "music" and "speech" codecs,
-permitting new very high quality teleconferencing applications, and to go
-further, permitting latencies much lower than speech codecs normally provide
-to enable applications such as remote musical collaboration even over long
-distances.
-
-In keeping with the Xiph.Org mission— CELT is also designed to accomplish
-this without copyright or patent encumbrance. Only by keeping the formats
-that drive our Internet communication free and unencumbered can we maximize
-innovation, collaboration, and interoperability. Fortunately, CELT is ahead
-of the adoption curve in its target application space, so there should be
-no reason for someone who needs what CELT provides to go with a proprietary
-codec.
-
-CELT has been tested on x86, x86_64, ARM, and the TI C55x DSPs, and should
-be portable to any platform with a working C compiler and on the order of
-100 MIPS of processing power.
-
-The code is still in early stage, so it may be broken from time to time, and
-the bit-stream is not frozen yet, so it is different from one version to
-another. Oh, and don't complain if it sets your house on fire.
-
-Complaints and accolades can be directed to the CELT mailing list:
-http://lists.xiph.org/mailman/listinfo/celt-dev/
-
-To compile:
-% ./configure
-% make
-
-For platforms without fast floating point support (such as ARM) use the
---enable-fixed argument to configure to build a fixed-point version of CELT.
-
-There are Ogg-based encode/decode tools in tools/. These are quite similar to
-the speexenc/speexdec tools. Use the --help option for details.
-
-There is also a basic tool for testing the encoder and decoder called
-"testcelt" located in libcelt/:
-
-% testcelt <rate> <channels> <frame size> <bytes per packet> input.sw output.sw
-
-where input.sw is a 16-bit (machine endian) audio file sampled at 32000 Hz to
-96000 Hz. The output file is already decompressed.
-
-For example, for a 44.1 kHz mono stream at ~64kbit/sec and with 256 sample
-frames:
-
-% testcelt 44100 1 256 46 intput.sw output.sw
-
-Since 44100/256*46*8 = 63393.74 bits/sec.
-
-All even frame sizes from 64 to 512 are currently supported, although
-power-of-two sizes are recommended and most CELT development is done
-using a size of 256. The delay imposed by CELT is 1.25x - 1.5x the
-frame duration depending on the frame size and some details of CELT's
-internal operation. For 256 sample frames the delay is 1.5x or 384
-samples, so the total codec delay in the above example is 8.70ms
-(1000/(44100/384)).
--- a/README.Win32
+++ /dev/null
@@ -1,10 +1,0 @@
-Here are a few tips for building on Windows:
-
-1) Create a config.h file that defines out things that defines out all the
- features that your compiler doesn't understand (e.g. inline, restrict).
- It also needs to define the CELT_BUILD macro
-
-2) Define the HAVE_CONFIG_H macro in the project build options (NOT in config.h)
-
-3) If you want things to be a lot easier, just use a compiler that supports
- C99, such as gcc
--- a/TODO
+++ /dev/null
@@ -1,20 +1,0 @@
-- Check minimum width of bands
-- Revisit energy resolution based on the bit-rate
-- Revisit static bit allocation (as a function of frame size and channels)
-- Dynamic adjustment of energy quantisation
-- Psychacoustics
- * Error shaping within each band
- * Decisions on the rate
-- Intensity stereo decisions
-- Dynamic (intra-frame) bit allocation
-- Joint encoding of stereo energy
-
-- Encode band shape (or just tilt)?
-- Make energy encoding more robust to losses?
-
-
-Misc:
-Detect uint decoding and flag them in the decoder directly
-If we attempt to write too many bits on the encoder side, set a flag instead of
-aborting
-Save "raw bytes" at the end of the stream
--- a/autogen.sh
+++ /dev/null
@@ -1,111 +1,0 @@
-#!/bin/sh
-# Run this to set up the build system: configure, makefiles, etc.
-# (based on the version in enlightenment's cvs)
-
-package="celt"
-
-olddir=`pwd`
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-cd "$srcdir"
-DIE=0
-
-echo "checking for autoconf... "
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {- echo
- echo "You must have autoconf installed to compile $package."
- echo "Download the appropriate package for your distribution,"
- echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
- DIE=1
-}
-
-VERSIONGREP="sed -e s/.*[^0-9\.]\([0-9]\.[0-9]*\).*/\1/"
-VERSIONMKINT="sed -e s/[^0-9]//"
-
-# do we need automake?
-if test -r Makefile.am; then
- AM_NEEDED=`fgrep AUTOMAKE_OPTIONS Makefile.am | $VERSIONGREP`
- if test -z $AM_NEEDED; then
- echo -n "checking for automake... "
- AUTOMAKE=automake
- ACLOCAL=aclocal
- if ($AUTOMAKE --version < /dev/null > /dev/null 2>&1); then
- echo "no"
- AUTOMAKE=
- else
- echo "yes"
- fi
- else
- echo -n "checking for automake $AM_NEEDED or later... "
- for am in automake-$AM_NEEDED automake$AM_NEEDED automake; do
- ($am --version < /dev/null > /dev/null 2>&1) || continue
- ver=`$am --version < /dev/null | head -n 1 | $VERSIONGREP | $VERSIONMKINT`
- verneeded=`echo $AM_NEEDED | $VERSIONMKINT`
- if test $ver -ge $verneeded; then
- AUTOMAKE=$am
- echo $AUTOMAKE
- break
- fi
- done
- test -z $AUTOMAKE && echo "no"
- echo -n "checking for aclocal $AM_NEEDED or later... "
- for ac in aclocal-$AM_NEEDED aclocal$AM_NEEDED aclocal; do
- ($ac --version < /dev/null > /dev/null 2>&1) || continue
- ver=`$ac --version < /dev/null | head -n 1 | $VERSIONGREP | $VERSIONMKINT`
- verneeded=`echo $AM_NEEDED | $VERSIONMKINT`
- if test $ver -ge $verneeded; then
- ACLOCAL=$ac
- echo $ACLOCAL
- break
- fi
- done
- test -z $ACLOCAL && echo "no"
- fi
- test -z $AUTOMAKE || test -z $ACLOCAL && {- echo
- echo "You must have automake installed to compile $package."
- echo "Download the appropriate package for your distribution,"
- echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
- exit 1
- }
-fi
-
-echo -n "checking for libtool... "
-for LIBTOOLIZE in libtoolize glibtoolize nope; do
- ($LIBTOOLIZE --version) < /dev/null > /dev/null 2>&1 && break
-done
-if test x$LIBTOOLIZE = xnope; then
- echo "nope."
- LIBTOOLIZE=libtoolize
-else
- echo $LIBTOOLIZE
-fi
-($LIBTOOLIZE --version) < /dev/null > /dev/null 2>&1 || {- echo
- echo "You must have libtool installed to compile $package."
- echo "Download the appropriate package for your system,"
- echo "or get the source from one of the GNU ftp sites"
- echo "listed in http://www.gnu.org/order/ftp.html"
- DIE=1
-}
-
-if test "$DIE" -eq 1; then
- exit 1
-fi
-
-echo "Generating configuration files for $package, please wait...."
-
-echo " $ACLOCAL $ACLOCAL_FLAGS"
-$ACLOCAL $ACLOCAL_FLAGS || exit 1
-echo " autoheader"
-autoheader || exit 1
-echo " $LIBTOOLIZE --automake"
-$LIBTOOLIZE --automake || exit 1
-echo " $AUTOMAKE --add-missing $AUTOMAKE_FLAGS"
-$AUTOMAKE --add-missing $AUTOMAKE_FLAGS || exit 1
-echo " autoconf"
-autoconf || exit 1
-
-cd $olddir
-#$srcdir/configure "$@" && echo
--- a/celt.kdevelop
+++ /dev/null
@@ -1,205 +1,0 @@
-<?xml version = '1.0'?>
-<kdevelop>
- <general>
- <author>Jean-Marc Valin</author>
- <email>Jean-Marc.Valin@USherbrooke.ca</email>
- <version>$VERSION</version>
- <projectmanagement>KDevAutoProject</projectmanagement>
- <primarylanguage>C</primarylanguage>
- <ignoreparts/>
- <projectname>celt</projectname>
- <projectdirectory>.</projectdirectory>
- <absoluteprojectpath>false</absoluteprojectpath>
- <description></description>
- <defaultencoding></defaultencoding>
- </general>
- <kdevautoproject>
- <general>
- <useconfiguration>default</useconfiguration>
- <activetarget>libcelt/libcelt.la</activetarget>
- </general>
- <run>
- <mainprogram/>
- <programargs/>
- <globaldebugarguments/>
- <globalcwd/>
- <useglobalprogram>true</useglobalprogram>
- <terminal>false</terminal>
- <autocompile>false</autocompile>
- <autoinstall>false</autoinstall>
- <autokdesu>false</autokdesu>
- <envvars/>
- </run>
- <configurations>
- <optimized>
- <builddir>optimized</builddir>
- <ccompiler>GccOptions</ccompiler>
- <cxxcompiler>GppOptions</cxxcompiler>
- <f77compiler>G77Options</f77compiler>
- <cflags>-O2 -g0</cflags>
- </optimized>
- <debug>
- <configargs>--enable-debug=full</configargs>
- <builddir>debug</builddir>
- <ccompiler>GccOptions</ccompiler>
- <cxxcompiler>GppOptions</cxxcompiler>
- <f77compiler>G77Options</f77compiler>
- <cflags>-O0 -g3</cflags>
- </debug>
- </configurations>
- <make>
- <envvars>
- <envvar value="1" name="WANT_AUTOCONF_2_5" />
- <envvar value="1" name="WANT_AUTOMAKE_1_6" />
- </envvars>
- <abortonerror>true</abortonerror>
- <runmultiplejobs>true</runmultiplejobs>
- <numberofjobs>4</numberofjobs>
- <dontact>false</dontact>
- <makebin></makebin>
- <prio>0</prio>
- </make>
- </kdevautoproject>
- <kdevdebugger>
- <general>
- <dbgshell>libtool</dbgshell>
- <gdbpath></gdbpath>
- <configGdbScript></configGdbScript>
- <runShellScript></runShellScript>
- <runGdbScript></runGdbScript>
- <breakonloadinglibs>true</breakonloadinglibs>
- <separatetty>false</separatetty>
- <floatingtoolbar>false</floatingtoolbar>
- <raiseGDBOnStart>false</raiseGDBOnStart>
- </general>
- <display>
- <staticmembers>false</staticmembers>
- <demanglenames>true</demanglenames>
- <outputradix>10</outputradix>
- </display>
- </kdevdebugger>
- <kdevdoctreeview>
- <ignoretocs>
- <toc>ada</toc>
- <toc>ada_bugs_gcc</toc>
- <toc>bash</toc>
- <toc>bash_bugs</toc>
- <toc>clanlib</toc>
- <toc>fortran_bugs_gcc</toc>
- <toc>gnome1</toc>
- <toc>gnustep</toc>
- <toc>gtk</toc>
- <toc>gtk_bugs</toc>
- <toc>haskell</toc>
- <toc>haskell_bugs_ghc</toc>
- <toc>java_bugs_gcc</toc>
- <toc>java_bugs_sun</toc>
- <toc>kde2book</toc>
- <toc>libstdc++</toc>
- <toc>opengl</toc>
- <toc>pascal_bugs_fp</toc>
- <toc>php</toc>
- <toc>php_bugs</toc>
- <toc>perl</toc>
- <toc>perl_bugs</toc>
- <toc>python</toc>
- <toc>python_bugs</toc>
- <toc>qt-kdev3</toc>
- <toc>ruby</toc>
- <toc>ruby_bugs</toc>
- <toc>sdl</toc>
- <toc>stl</toc>
- <toc>sw</toc>
- <toc>w3c-dom-level2-html</toc>
- <toc>w3c-svg</toc>
- <toc>w3c-uaag10</toc>
- <toc>wxwidgets_bugs</toc>
- </ignoretocs>
- <ignoreqt_xml>
- <toc>Guide to the Qt Translation Tools</toc>
- <toc>Qt Assistant Manual</toc>
- <toc>Qt Designer Manual</toc>
- <toc>Qt Reference Documentation</toc>
- <toc>qmake User Guide</toc>
- </ignoreqt_xml>
- <ignoredoxygen>
- <toc>KDE Libraries (Doxygen)</toc>
- </ignoredoxygen>
- </kdevdoctreeview>
- <kdevfilecreate>
- <filetypes/>
- <useglobaltypes>
- <type ext="c" />
- <type ext="h" />
- </useglobaltypes>
- </kdevfilecreate>
- <kdevcppsupport>
- <qt>
- <used>false</used>
- <version>3</version>
- <includestyle>3</includestyle>
- <root></root>
- <designerintegration>EmbeddedKDevDesigner</designerintegration>
- <qmake></qmake>
- <designer></designer>
- <designerpluginpaths/>
- </qt>
- <codecompletion>
- <automaticCodeCompletion>false</automaticCodeCompletion>
- <automaticArgumentsHint>true</automaticArgumentsHint>
- <automaticHeaderCompletion>true</automaticHeaderCompletion>
- <codeCompletionDelay>250</codeCompletionDelay>
- <argumentsHintDelay>400</argumentsHintDelay>
- <headerCompletionDelay>250</headerCompletionDelay>
- <showOnlyAccessibleItems>false</showOnlyAccessibleItems>
- <completionBoxItemOrder>0</completionBoxItemOrder>
- <howEvaluationContextMenu>true</howEvaluationContextMenu>
- <showCommentWithArgumentHint>true</showCommentWithArgumentHint>
- <statusBarTypeEvaluation>false</statusBarTypeEvaluation>
- <namespaceAliases>std=_GLIBCXX_STD;__gnu_cxx=std</namespaceAliases>
- <processPrimaryTypes>true</processPrimaryTypes>
- <processFunctionArguments>false</processFunctionArguments>
- <preProcessAllHeaders>false</preProcessAllHeaders>
- <parseMissingHeadersExperimental>false</parseMissingHeadersExperimental>
- <resolveIncludePathsUsingMakeExperimental>false</resolveIncludePathsUsingMakeExperimental>
- <alwaysParseInBackground>true</alwaysParseInBackground>
- <usePermanentCaching>true</usePermanentCaching>
- <alwaysIncludeNamespaces>false</alwaysIncludeNamespaces>
- <includePaths>.;</includePaths>
- </codecompletion>
- <creategettersetter>
- <prefixGet></prefixGet>
- <prefixSet>set</prefixSet>
- <prefixVariable>m_,_</prefixVariable>
- <parameterName>theValue</parameterName>
- <inlineGet>true</inlineGet>
- <inlineSet>true</inlineSet>
- </creategettersetter>
- <splitheadersource>
- <enabled>true</enabled>
- <synchronize>true</synchronize>
- <orientation>Horizontal</orientation>
- </splitheadersource>
- <references/>
- </kdevcppsupport>
- <cppsupportpart>
- <filetemplates>
- <interfacesuffix>.h</interfacesuffix>
- <implementationsuffix>.cpp</implementationsuffix>
- </filetemplates>
- </cppsupportpart>
- <kdevfileview>
- <groups/>
- <tree>
- <hidepatterns>*.o,*.lo,CVS</hidepatterns>
- <hidenonprojectfiles>false</hidenonprojectfiles>
- </tree>
- </kdevfileview>
- <kdevdocumentation>
- <projectdoc>
- <docsystem/>
- <docurl/>
- <usermanualurl/>
- </projectdoc>
- </kdevdocumentation>
-</kdevelop>
--- a/celt.pc.in
+++ /dev/null
@@ -1,15 +1,0 @@
-# libcelt pkg-config source file
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: celt
-Description: CELT is a low-delay audio codec
-Version: @CELT_VERSION@
-Requires:
-Conflicts:
-Libs: -L${libdir} -lcelt@LIBCELT_SUFFIX@-Libs.private: -lm
-Cflags: -I${includedir}--- a/configure.ac
+++ /dev/null
@@ -1,241 +1,0 @@
-dnl Process this file with autoconf to produce a configure script. -*-m4-*-
-
-AC_INIT(libcelt/arch.h)
-
-AM_CONFIG_HEADER([config.h])
-
-CELT_MAJOR_VERSION=0
-CELT_MINOR_VERSION=11
-CELT_MICRO_VERSION=4
-CELT_EXTRA_VERSION=
-CELT_VERSION=$CELT_MAJOR_VERSION.$CELT_MINOR_VERSION.$CELT_MICRO_VERSION$CELT_EXTRA_VERSION
-LIBCELT_SUFFIX=0
-
-CELT_LT_CURRENT=2
-CELT_LT_REVISION=0
-CELT_LT_AGE=0
-
-AC_SUBST(CELT_LT_CURRENT)
-AC_SUBST(CELT_LT_REVISION)
-AC_SUBST(CELT_LT_AGE)
-AC_SUBST(LIBCELT_SUFFIX)
-
-# For automake.
-VERSION=$CELT_VERSION
-PACKAGE=celt
-
-AC_SUBST(CELT_VERSION)
-
-AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
-AM_MAINTAINER_MODE
-
-AC_CANONICAL_HOST
-AM_PROG_LIBTOOL
-
-AC_PROG_CC_C99
-AC_C_BIGENDIAN
-AC_C_CONST
-AC_C_INLINE
-AC_C_RESTRICT
-
-AC_DEFINE([CELT_BUILD], [], [This is a build of CELT])
-
-AC_MSG_CHECKING(for C99 variable-size arrays)
-AC_TRY_COMPILE( , [
-int foo=10;
-int array[foo];
-],
-[has_var_arrays=yes;AC_DEFINE([VAR_ARRAYS], [], [Use C99 variable-size arrays])
-],
-has_var_arrays=no
-)
-AC_MSG_RESULT($has_var_arrays)
-
-AC_CHECK_HEADERS([alloca.h getopt.h])
-AC_MSG_CHECKING(for alloca)
-AC_TRY_COMPILE( [#include <alloca.h>], [
-int foo=10;
-int *array = alloca(foo);
-],
-[
-has_alloca=yes;
-if test x$has_var_arrays = "xno" ; then
-AC_DEFINE([USE_ALLOCA], [], [Make use of alloca])
-fi
-],
-has_alloca=no
-)
-AC_MSG_RESULT($has_alloca)
-
-AC_CHECK_HEADERS(sys/soundcard.h sys/audioio.h)
-
-AS_IF([test "x$with_ogg" != xno],
- [XIPH_PATH_OGG([tools="tools"], [tools=""])],
- [tools=""])
-AC_SUBST(tools)
-
-AC_CHECK_LIB(m, sin)
-
-# Check for getopt_long; if not found, use included source.
-AC_CHECK_FUNCS([getopt_long],,
-[# FreeBSD has a gnugetopt library.
- AC_CHECK_LIB([gnugetopt],[getopt_long],
-[AC_DEFINE([HAVE_GETOPT_LONG])],
-[# Use the GNU replacement.
-AC_LIBOBJ(getopt)
-AC_LIBOBJ(getopt1)])])
-
-AC_CHECK_LIB(winmm, main)
-
-AC_DEFINE_UNQUOTED(CELT_VERSION, "${CELT_VERSION}", [Complete version string])-AC_DEFINE_UNQUOTED(CELT_MAJOR_VERSION, ${CELT_MAJOR_VERSION}, [Version major])-AC_DEFINE_UNQUOTED(CELT_MINOR_VERSION, ${CELT_MINOR_VERSION}, [Version minor])-AC_DEFINE_UNQUOTED(CELT_MICRO_VERSION, ${CELT_MICRO_VERSION}, [Version micro])-AC_DEFINE_UNQUOTED(CELT_EXTRA_VERSION, "${CELT_EXTRA_VERSION}", [Version extra])-
-has_float_approx=no
-#case "$host_cpu" in
-#i[[3456]]86 | x86_64 | powerpc64 | powerpc32 | ia64)
-# has_float_approx=yes
-# ;;
-#esac
-
-ac_enable_fixed="no";
-AC_ARG_ENABLE(fixed-point, [ --enable-fixed-point compile as fixed-point],
-[if test "$enableval" = yes; then
- ac_enable_fixed="yes";
- AC_DEFINE([FIXED_POINT], , [Compile as fixed-point])
-else
- AC_DEFINE([FLOATING_POINT], , [Compile as floating-point])
-fi],
-AC_DEFINE([FLOATING_POINT], , [Compile as floating-point]))
-
-ac_enable_fixed_debug="no"
-AC_ARG_ENABLE(fixed-point-debug, [ --enable-fixed-point-debug debug fixed-point implementation],
-[if test "$enableval" = yes; then
- ac_enable_fixed_debug="yes"
- AC_DEFINE([FIXED_DEBUG], , [Debug fixed-point implementation])
-fi])
-
-ac_enable_experimental_postfilter="no"
-AC_ARG_ENABLE(experimental-postfilter, [ --enable-experimental-postfilter Enable this for testing only if you know what you're doing ],
-[if test "$enableval" = yes; then
- ac_enable_experimental_postfilter="yes"
- AC_DEFINE([ENABLE_POSTFILTER], , [Postfilter])
-fi])
-
-ac_enable_custom_modes="no"
-AC_ARG_ENABLE(custom-modes, [ --enable-custom-modes Enable non-Opus modes, like 44.1 kHz and powers of two ],
-[if test "$enableval" = yes; then
- ac_enable_custom_modes="yes"
- AC_DEFINE([CUSTOM_MODES], , [Custom modes])
-fi])
-
-float_approx=$has_float_approx
-AC_ARG_ENABLE(float-approx, [ --enable-float-approx enable fast approximations for floating point],
- [ if test "$enableval" = yes; then
- AC_WARN([Floating point approximations are not supported on all platforms.])
- float_approx=yes
- else
- float_approx=no
- fi], [ float_approx=$has_float_approx ])
-
-if test "x${float_approx}" = "xyes"; then- AC_DEFINE([FLOAT_APPROX], , [Float approximations])
-fi
-
-ac_enable_assertions="no"
-AC_ARG_ENABLE(assertions, [ --enable-assertions enable additional software error checking],
-[if test "$enableval" = yes; then
- ac_enable_assertions="yes"
- AC_DEFINE([ENABLE_ASSERTIONS], , [Assertions])
-fi])
-
-if test "$OPUS_BUILD" != "true" ; then
-saved_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -fvisibility=hidden"
-AC_MSG_CHECKING([if ${CXX} supports -fvisibility=hidden])-AC_COMPILE_IFELSE([char foo;],
- [ AC_MSG_RESULT([yes])
- SYMBOL_VISIBILITY="-fvisibility=hidden" ],
- AC_MSG_RESULT([no]))
-CFLAGS="$saved_CFLAGS $SYMBOL_VISIBILITY"
-AC_SUBST(SYMBOL_VISIBILITY)
-fi
-
-if test $ac_cv_c_compiler_gnu = yes ; then
- CFLAGS="$CFLAGS -W -Wstrict-prototypes -Wall -Wextra -Wcast-align -Wnested-externs -Wshadow -Wno-parentheses -Wno-unused-parameter -Wno-sign-compare"
-fi
-
-AC_CHECK_FUNCS([lrintf])
-AC_CHECK_FUNCS([lrint])
-
-AC_CHECK_SIZEOF(short)
-AC_CHECK_SIZEOF(int)
-AC_CHECK_SIZEOF(long)
-AC_CHECK_SIZEOF(long long)
-
-if test x$has_char16 = "xyes" ; then
- case 1 in
- $ac_cv_sizeof_short) SIZE16="short";;
- $ac_cv_sizeof_int) SIZE16="int";;
- esac
-else
- case 2 in
- $ac_cv_sizeof_short) SIZE16="short";;
- $ac_cv_sizeof_int) SIZE16="int";;
- esac
-fi
-
-if test x$has_char16 = "xyes" ; then
- case 2 in
- $ac_cv_sizeof_int) SIZE32="int";;
- $ac_cv_sizeof_long) SIZE32="long";;
- $ac_cv_sizeof_short) SIZE32="short";;
- esac
-else
- case 4 in
- $ac_cv_sizeof_int) SIZE32="int";;
- $ac_cv_sizeof_long) SIZE32="long";;
- $ac_cv_sizeof_short) SIZE32="short";;
- esac
-fi
-
-AC_SUBST(SIZE16)
-AC_SUBST(SIZE32)
-
-if test "$OPUS_BUILD" = "true" ; then
-AC_DEFINE(OPUS_BUILD, [], [We're part of Opus])
-fi
-
-AC_OUTPUT([Makefile libcelt/Makefile tests/Makefile
- celt.pc tools/Makefile libcelt.spec ])
-
-AC_MSG_RESULT([
-------------------------------------------------------------------------
- $PACKAGE $VERSION: Automatic configuration OK.
-
- Compiler support:
-
- C99 var arrays: ................ ${has_var_arrays}- C99 lrintf: .................... ${ac_cv_func_lrintf}- Alloca: ........................ ${has_alloca}-
- General configuration:
-
- Fast float approximations: ..... ${float_approx}- Fixed point support: ........... ${ac_enable_fixed}- Fixed point debugging: ......... ${ac_enable_fixed_debug}- Custom modes: .................. ${ac_enable_custom_modes}- Assertion checking: ............ ${ac_enable_assertions}-------------------------------------------------------------------------
-])
-
-if test "x$tools" = "x"; then
-echo "**IMPORTANT**"
-echo "You don't seem to have the development package for libogg (libogg-devel) available. Only the library will be built (no encoder/decoder executable)"
-echo "You can download libogg from http://www.vorbis.com/download.psp"
-fi
-
-echo "Type \"make; make install\" to compile and install";
-echo "Type \"make check\" to run the test suite";
--- a/doc/ietf/Makefile.ietf
+++ /dev/null
@@ -1,16 +1,0 @@
-CC = gcc
-CFLAGS = -c -O2 -g
-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 \
- quant_bands.o rangedec.o rangeenc.o rate.o testcelt.o vq.o plc.o
-
-.c.o:
- $(CC) $(CFLAGS) $<
-
-testcelt: $(OBJS)
- $(CC) -o $@ $(OBJS) $(LIBS)
-
-clean:
- rm -f testcelt *.o
--- a/doc/ietf/arch.h
+++ /dev/null
@@ -1,77 +1,0 @@
-/* Copyright (C) 2003-2008 Jean-Marc Valin */
-/**
- @file arch.h
- @brief Various architecture definitions for CELT
-*/
-/*
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-- Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-- Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-- Neither the name of the Xiph.org Foundation nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION
-OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#ifndef ARCH_H
-#define ARCH_H
-
-#include "celt_types.h"
-
-#define CELT_SIG_SCALE 32768.
-
-#define celt_fatal(str) _celt_fatal(str, __FILE__, __LINE__);
-#ifdef ENABLE_ASSERTIONS
-#define celt_assert(cond) {if (!(cond)) \- {celt_fatal("assertion failed: " #cond);}}-#define celt_assert2(cond, message) {if (!(cond)) \- {celt_fatal("assertion failed: " #cond "\n" message);}}-#else
-#define celt_assert(cond)
-#define celt_assert2(cond, message)
-#endif
-
-
-#define ABS(x) ((x) < 0 ? (-(x)) : (x))
-#define ABS16(x) ((x) < 0 ? (-(x)) : (x))
-#define MIN16(a,b) ((a) < (b) ? (a) : (b))
-#define MAX16(a,b) ((a) > (b) ? (a) : (b))
-#define ABS32(x) ((x) < 0 ? (-(x)) : (x))
-#define MIN32(a,b) ((a) < (b) ? (a) : (b))
-#define MAX32(a,b) ((a) > (b) ? (a) : (b))
-#define IMIN(a,b) ((a) < (b) ? (a) : (b))
-#define IMAX(a,b) ((a) > (b) ? (a) : (b))
-
-#define float2int(flt) ((int)(floor(.5+flt)))
-
-#define SCALEIN(a) ((a)*CELT_SIG_SCALE)
-#define SCALEOUT(a) ((a)*(1/CELT_SIG_SCALE))
-
-#ifndef GLOBAL_STACK_SIZE
-#ifdef FIXED_POINT
-#define GLOBAL_STACK_SIZE 25000
-#else
-#define GLOBAL_STACK_SIZE 40000
-#endif
-#endif
-
-#endif /* ARCH_H */
--- a/doc/ietf/build_drafts.sh
+++ /dev/null
@@ -1,15 +1,0 @@
-#!/bin/sh
-
-./convert_source.sh
-
-./ietf_source.sh
-
-#codec draft
-xml2rfc draft-valin-celt-codec.xml draft-valin-celt-codec.html
-
-xml2rfc draft-valin-celt-codec.xml draft-valin-celt-codec.txt
-
-#RTP draft
-xml2rfc draft-valin-celt-rtp-profile.xml draft-valin-celt-rtp-profile.html
-
-xml2rfc draft-valin-celt-rtp-profile.xml draft-valin-celt-rtp-profile.txt
--- a/doc/ietf/celt_types.h
+++ /dev/null
@@ -1,11 +1,0 @@
-#ifndef _CELT_TYPES_H
-#define _CELT_TYPES_H
-
-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/config.h
+++ /dev/null
@@ -1,23 +1,0 @@
-/* config.h. Generated from config.h.in by configure. */
-/* config.h.in. Generated from configure.ac by autoheader. */
-
-/* This is a build of CELT */
-#define CELT_BUILD /**/
-
-/* Version extra */
-#define CELT_EXTRA_VERSION ""
-
-/* Version major */
-#define CELT_MAJOR_VERSION 0
-
-/* Version micro */
-#define CELT_MICRO_VERSION 2
-
-/* Version minor */
-#define CELT_MINOR_VERSION 5
-
-/* Complete version string */
-#define CELT_VERSION "0.6.0"
-
-
-#define restrict
--- a/doc/ietf/convert_source.sh
+++ /dev/null
@@ -1,53 +1,0 @@
-#!/bin/sh
-
-mkdir -p source
-
-for i in `ls ../../libcelt | grep '\.[ch]$'`
-do
-
-#echo "<section anchor=\"$i\" title=\"$i\">" > source/$i
-#echo '<t>' >> source/$i
-#echo '<figure><artwork><![CDATA[' >> source/$i
-
-echo '#include "substitutions.h"' > tata.c
-echo 'SOURCE_CODE_BEGIN' >> tata.c
-
-if echo $i | grep '\.h' > /dev/null; then
- cat ../../libcelt/$i | sed -e 's/=\*/= \*/' -e 's/=-/= -/' -e 's/\t/ /g' -e 's/^#/\/\/PREPROCESS_REMOVE#/' >> tata.c
-else
- cat ../../libcelt/$i | sed -e 's/=\*/= \*/' -e 's/=-/= -/' -e 's/\t/ /g' -e 's/^#include/\/\/PREPROCESS_REMOVE#include/' | sed 's/^#define/\/\/PREPROCESS_REMOVE#define/'>> tata.c
-fi
-
-#cat ../../libcelt/$i | sed 's/^#/\/\/PREPROCESS_REMOVE#/' >> tata.c
-#cat ../../libcelt/$i | sed 's/^#include/\/\/PREPROCESS_REMOVE#include/' | sed 's/^#define/\/\/PREPROCESS_REMOVE#define/'>> tata.c
-gcc -DHAVE_CONFIG_H -C -E -nostdinc tata.c | grep -v '^#' | sed 's/\/\/PREPROCESS_REMOVE//' | perl -ne 'if ($begin) {print $_} if (/SOURCE_CODE_BEGIN/) {$begin=1}' > tata2.c-
-#cat ../../libcelt/$i >> tata.c
-#gcc -C -E -nostdinc tata.c -fdirectives-only | perl -ne 'if ($begin) {print $_} if (/SOURCE_CODE_BEGIN/) {$begin=1}' > tata2.c-
-indent -nsc -ncdb -original -sob -i2 -bl -bli0 --no-tabs -l69 --format-all-comments tata2.c -o tata.c
-cat tata.c | grep -v 'include.*float_cast' | ./wrap_lines > source/$i
-#cat tata.c > source/$i
-
-
-
-#indent --no-tabs -l72 --format-all-comments ../../libcelt/$i -o tata.c
-#cat tata.c >> source/$i
-
-
-#echo ']]></artwork></figure>' >> source/$i
-#echo '</t>' >> source/$i
-#echo '</section>' >> source/$i
-
-done
-
-cp arch.h source/arch.h
-cp celt_types.h source/celt_types.h
-cp config.h source/config.h
-cp Makefile.ietf source/Makefile
-
-rm source/mfrng*.c
-rm source/dump_modes*
-rm source/header*
-rm source/fixed*
-
--- a/doc/ietf/draft-valin-celt-codec.xml
+++ /dev/null
@@ -1,1383 +1,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE rfc SYSTEM 'rfc2629.dtd'>
-<?rfc toc="yes" symrefs="yes" ?>
-
-<rfc ipr="trust200902" category="std" docName="draft-valin-celt-codec-02">
-
-<front>
-<title abbrev="CELT codec">Constrained-Energy Lapped Transform (CELT) Codec</title>
-
-
-
-<author initials="J-M" surname="Valin" fullname="Jean-Marc Valin">
-<organization>Octasic Semiconductor</organization>
-<address>
-<postal>
-<street>4101, Molson Street, suite 300</street>
-<city>Montreal</city>
-<region>Quebec</region>
-<code>H1Y 3L1</code>
-<country>Canada</country>
-</postal>
-<email>jean-marc.valin@octasic.com</email>
-</address>
-</author>
-
-<author initials="T" surname="Terriberry" fullname="Timothy B. Terriberry">
-<organization>Xiph.Org Foundation</organization>
-<address>
-<postal>
-<street></street>
-<city></city>
-<region></region>
-<code></code>
-<country></country>
-</postal>
-<email>tterribe@xiph.org</email>
-</address>
-</author>
-
-<author initials="G" surname="Maxwell" fullname="Gregory Maxwell">
-<organization>Juniper Networks</organization>
-<address>
-<postal>
-<street>2251 Corporate Park Drive, Suite 100</street>
-<city>Herndon</city>
-<region>VA</region>
-<code>20171-1817</code>
-<country>USA</country>
-</postal>
-<email>gmaxwell@juniper.net</email>
-</address>
-</author>
-
-<author initials="C" surname="Montgomery" fullname="Christopher Montgomery">
-<organization>Xiph.Org Foundation</organization>
-<address>
-<postal>
-<street></street>
-<city></city>
-<region></region>
-<code></code>
-<country></country>
-</postal>
-<email>xiphmont@xiph.org</email>
-</address>
-</author>
-
-<date day="8" month="July" year="2010" />
-
-<area>General</area>
-
-<workgroup>AVT Working Group</workgroup>
-<keyword>audio codec</keyword>
-<keyword>low delay</keyword>
-<keyword>Internet-Draft</keyword>
-<keyword>CELT</keyword>
-
-<abstract>
-<t>
-CELT <xref target="celt-website"/> is an open-source voice codec suitable for use in very low delay
-Voice over IP (VoIP) type applications. This document describes the encoding
-and decoding process.
-</t>
-</abstract>
-</front>
-
-<middle>
-
-<section anchor="Introduction" title="Introduction">
-<t>
-This document describes the CELT codec, which is designed for transmitting full-bandwidth
-audio with very low delay. It is suitable for encoding both
-speech and music at rates starting at 32 kbit/s. It is primarily designed for transmission
-over the Internet and protocols such as RTP <xref target="rfc3550"/>, but also includes
-a certain amount of robustness to bit errors, where this could be done at no significant
-cost.
-</t>
-
-<t>The novel aspect of CELT compared to most other codecs is its very low delay,
-below 10 ms. There are two main advantages to having a very low delay audio link.
-The lower delay itself is important for some interactions, such as playing music
-remotely. Another advantage is its behavior in the presence of acoustic echo. When
-the round-trip audio delay is sufficiently low, acoustic echo is no longer
-perceived as a distinct repetition, but rather as extra reverberation. Applications
-of CELT include:</t>
-<t>
-<list style="symbols">
-<t>Collaborative network music performance</t>
-<t>High-quality teleconferencing</t>
-<t>Wireless audio equipment</t>
-<t>Low-delay links for broadcast applications</t>
-</list>
-</t>
-
-<t>The source code for the reference implementation of the CELT codec is provided in <xref target="ref-implementation"/>. This source code is the normative specification
-of the codec. The corresponding text description in this document is provided
-for informative purposes. </t>
-
-<t>
-The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT",
-"SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this
-document are to be interpreted as described in RFC 2119 <xref target="rfc2119"/>.
-</t>
-
-</section>
-
-<section anchor="overview" title="Overview of the CELT Codec">
-
-<t>
-CELT stands for <spanx style="emph">Constrained Energy Lapped Transform</spanx>. This is
-the fundamental principle of the codec: the quantization process is designed in such a way
-as to preserve the energy in a certain number of bands. The theoretical aspects of the
-codec are described in greater detail <xref target="celt-tasl"/> and
-<xref target="celt-eusipco"/>. Although these papers describe slightly older versions of
-the codec (version 0.3.2 and 0.5.1, respectively), the principles remain the same.
-</t>
-
-<t>CELT is a transform codec, based on the Modified Discrete Cosine Transform
-(MDCT). The MDCT is derived from the DCT-IV by adding an overlap with time-domain
-aliasing cancellation <xref target="mdct"/>.
-The main characteristics of CELT are as follows:
-
-<list style="symbols">
-<t>Ultra-low algorithmic delay (scalable, typically 4 to 9 ms)</t>
-<t>Sampling rates from 32 kHz to 48 kHz and above (full audio bandwidth)</t>
-<t>Applicability to both speech and music</t>
-<t>Support for mono and stereo</t>
-<t>Adaptive bit-rate from 32 kbit/s to 128 kbit/s per channel and above</t>
-<t>Scalable complexity</t>
-<t>Robustness to packet loss (scalable trade-off between quality and loss-robustness)</t>
-<t>Open source implementation (floating-point and fixed-point)</t>
-<t>No known intellectual property issues</t>
-</list>
-</t>
-
-<section anchor="bitstream" title="Bit-stream definition">
-
-<t>
-This document contains a detailed description of both the encoder and the decoder, along with a reference implementation. In most circumstances, and unless otherwise stated, the calculations
-do <spanx style="strong">not</spanx> need to produce results that are bit-identical with the reference implementation, so alternate algorithms can sometimes be used. However, there are a few (clearly identified) cases, such as the bit allocation, where bit-exactness with the reference
-implementation is required. An implementation is considered to be compatible if, for any valid bit-stream, the decoder's output is perceptually indistinguishable from the output produced by the reference decoder.
-</t>
-
-<t>
-The CELT codec does not use a standard <spanx style="emph">bit-packer</spanx>,
-but rather uses a range coder to pack both integers and entropy-coded symbols.
-In mono mode, the bit-stream generated by the encoder contains the
-following parameters (in order):
-</t>
-
-<t>
-<list style="symbols">
-<t>Feature flags I, P, S, F (2-4 bits)</t>
-<t>if P=1
- <list style="symbols">
- <t>Pitch period</t>
- </list></t>
-<t>if S=1
- <list style="symbols">
- <t>Transient scalefactor</t>
- <t>if scalefactor=(1 or 2) AND more than 2 short MDCTs
- <list style="symbols">
- <t>ID of block before transient</t>
- </list></t>
- <t>if scalefactor=3
- <list style="symbols">
- <t>Transient time</t>
- </list></t>
- </list></t>
-<t>Coarse energy encoding (for each band)</t>
-<t>Fine energy encoding (for each band)</t>
-<t>For each band
- <list style="symbols">
- <t>if P=1 and band is at the beginning of a pitch band
- <list>
- <t>Pitch gain bit</t>
- </list></t>
- <t>PVQ indices</t>
- </list></t>
-<t>More fine energy (using all remaining bits)</t>
-</list>
-</t>
-
-<t>Note that due to the use of a range coder, all of the parameters have to be encoded and decoded in order. </t>
-
-<t>
-The CELT bit-stream is "octet-based" in the sense that the encoder always produces an
-integer number of octets when encoding a frame. Also, the bit-rate used by the CELT encoder can
-<spanx style="strong">only</spanx> be determined by the number of octets produced.
-In many cases (e.g. UDP/RTP), the transport layer already encodes the data length, so
-no extra information is necessary to signal the bit-rate. In cases where this is not true,
-or when there are multiple compressed frames per packet, the size of each compressed
-frame MUST be signalled in some way.
-</t>
-
-
-</section>
-
-</section>
-
-<section anchor="CELT Modes" title="CELT Modes">
-<t>
-The operation of both the encoder and decoder depends on the mode data. A mode
-definition can be created by celt_create_mode() (<xref target="modes.c">modes.c</xref>)
-based on three parameters:
-<list style="symbols">
-<t>frame size (number of samples)</t>
-<t>sampling rate (samples per second)</t>
-<t>number of channels (1 or 2)</t>
-</list>
-</t>
-
-<t>The frame size can be any even number of samples from 64 to 1024, inclusively.
-The sampling rate must be between 32000 Hz and 96000 Hz. The mode data that is
-created defines how the encoder and the decoder operate. More specifically, the
-following information is contained in the mode object:
-
-<list style="symbols">
-<t>Frame size</t>
-<t>Sampling rate</t>
-<t>Windowing overlap</t>
-<t>Number of channels</t>
-<t>Definition of the bands</t>
-<t>Definition of the <spanx style="emph">pitch bands</spanx></t>
-<t>Decay coefficients of the Laplace distributions for coarse energy</t>
-<t>Bit allocation matrix</t>
-</list>
-</t>
-
-<t>
-The windowing overlap is the amount of overlap between the frames. CELT uses a low-overlap window that is typically half of the frame size. For a frame size of 256 samples, the overlap is 128 samples, so the total algorithmic delay is 256+128=384. CELT divides the audio into frequency bands, for which the energy is preserved. These bands are chosen to follow the ear's critical bands, with the exception that each band has to contain at least 3 frequency bins.
-</t>
-
-<t>
-The energy bands are based on the Bark scale. The Bark band edges (in Hz) are defined as
-[0, 100, 200, 300, 400, 510, 630, 770, 920, 1080, 1270, 1480, 1720, 2000, 2320,
-2700, 3150, 3700, 4400, 5300, 6400, 7700, 9500, 12000, 15500, 20000]. The actual bands used by the codec
-depend on the sampling rate and the frame size being used. The mapping from Hz to MDCT bins is done by
-multiplying by sampling_rate/(2*frame_size) and rounding to the nearest value. An exception is made for
-the lower frequencies to ensure that all bands contain at least 3 MDCT bins. The definition of the Bark
-bands is computed in compute_ebands() (<xref target="modes.c">modes.c</xref>).
-</t>
-
-<t>
-CELT includes a pitch predictor for which the gains are defined over
-a set of <spanx style="emph">pitch bands</spanx>. The pitch bands are defined
-(in Hz) as [0, 345, 689, 1034, 1378, 2067, 3273, 5340, 6374]. The Hz values
-are mapped to MDCT bins in the same was as the energy bands. The pitch
-band boundaries are aligned to energy band boundaries. The definition of the pitch
-bands is computed in compute_pbands() (<xref target="modes.c">modes.c</xref>).
-</t>
-
-<t>
-The mode contains a bit allocation table that is derived from a prototype allocation table,
-specified in the band_allocation matrix (<xref
-target="modes.c">modes.c</xref>). Each row of the table is a single prototype allocation,
-in bits per Bark band, and assuming 256-sample frames. These rows must be projected onto the actual band layout in use at the
-current frame size and sample rate, using exact integer calculations. The reference
-implementation
-pre-computes these projections in compute_allocation_table() (<xref
-target="modes.c">modes.c</xref>) and any other implementation
-MUST produces bit-identical allocation results.
-</t>
-
-<t>
-Every entry in the allocation table is multiplied by the current number of channels and
-the current frame size. Each prototype allocation is projected
-independently using the following process: the upper band frequencies (in Hz) from the current Bark band and current CELT band are compared. (When the process begins, these will each be the first band, but will increment independently.) If the current Bark band's upper edge frequency
-is less than the current CELT band's upper edge frequency, the entire value of the Bark band plus any carried remainder is assigned to the current CELT
-band, and the process continues with the next
-Bark band in sequence and zero remainder. If the current Bark band's upper edge frequency is equal to or greater than that of
-the current CELT band, the CELT band will receive only part of this Bark band's allocation.
-This portion allocated to the CELT band is then calculated by multiplying the Bark band's allocation by the
-difference in Hz between the Bark band's upper frequency and the current
-CELT band's lower frequency, adding the width of the current Bark band
-divided by two, and then dividing this total by the width of the current Bark
-band in Hz. The partial value plus any carried remainder is added to the current
-CELT band, and the difference between the partial value and the Bark target is
-taken as the new carried remainder. The process begins then again starting at the
-next CELT band and next Bark band. Once all bands in a prototype allocation have been considered, any
-remainder is added to the last CELT band. All of the resulting values are
-rescaled by adding 128 and dividing by 256.
-</t>
-
-</section>
-
-<section anchor="CELT Encoder" title="CELT Encoder">
-
-<t>
-The top-level function for encoding a CELT frame in the reference implementation is
-celt_encode() (<xref target="celt.c">celt.c</xref>).
-The basic block diagram of the CELT encoder is illustrated in <xref target="encoder-diagram"></xref>.
-The encoder contains most of the building blocks of the decoder and can,
-with very little extra computation, compute the signal that would be decoded by the decoder.
-CELT has three main quantizers denoted Q1, Q2 and Q3. These apply to band energies
-(<xref target="energy-quantization"></xref>), pitch gains (<xref target="pitch-prediction"></xref>)
-and normalized MDCT bins (<xref target="pvq"></xref>), respectively.
-</t>
-
-<figure anchor="encoder-diagram">
-<artwork>
-<![CDATA[
- +-----------+ +--+
- +--| Energy |-+----->|Q1|------+
- | |computation| | +--+ |
- | +-----------+ | |
- | +-----+ |
- | v v
- +------+ +-+--+ +-+ +-+ +-+ +--+ +---+ +-+ +-----+ +-+
-->|Window|->|MDCT|->|-|->|/|->|-|->|Q3|->|Mix|->|*|->|IMDCT|->|+|-+->
- +---+--+ +----+ +-+ +-+ +-+ +--+ +---+ +-+ +-----+ +-+ |
- | ^ |
- | +--------------------------+ |
- +-+ | |
- | +----------+ +--+ +-+-+ |
- +------------->|pitch gain|-->|Q2|-->| * | |
- | +----------+ +--+ +---+ |
- | ^ ^ |
- | +-----------------+ |
- v | |
- +------------+ +------+-----+ |
- |Pitch period| |Delay, MDCT,| |
- |estimation |----------------------->| Normalize | |
- +------------+ +------------+ |
- ^ ^ |
- +--------------------------------------+-----------------+
-]]>
-</artwork>
-<postamble>Block diagram of the CELT encoder</postamble>
-</figure>
-
-
-<t>The input audio first goes through a pre-emphasis filter
-(just before the windowing in <xref target="encoder-diagram"></xref>), which attenuates the
-<spanx style="emph">spectral tilt</spanx>. The filter is has the transfer function A(z)=1-alpha_p*z^-1, with
-alpha_p=0.8. The inverse of the pre-emphasis is applied at the decoder.</t>
-
-
-<section anchor="range-encoder" title="Range Coder">
-<t>
-CELT uses an entropy coder based upon <xref target="range-coding"></xref>,
-which is itself a rediscovery of the FIFO arithmetic code introduced by <xref target="coding-thesis"></xref>.
-It is very similar to arithmetic encoding, except that encoding is done with
-digits in any base instead of with bits,
-so it is faster when using larger bases (i.e.: an octet). All of the
-calculations in the range coder must use bit-exact integer arithmetic.
-</t>
-
-<t>
-The range coder also acts as the bit-packer for CELT. It is
-used in three different ways, to encode:
-<list style="symbols">
-<t>entropy-coded symbols with a fixed probability model using ec_encode(), (<xref target="rangeenc.c">rangeenc.c</xref>)</t>
-<t>integers from 0 to 2^M-1 using ec_enc_uint() or ec_enc_bits(), (<xref target="entenc.c">entenc.c</xref>)</t>
-<t>integers from 0 to N-1 (where N is not a power of two) using ec_enc_uint(). (<xref target="entenc.c">entenc.c</xref>)</t>
-</list>
-</t>
-
-<t>
-The range encoder maintains an internal state vector composed of the
-four-tuple (low,rng,rem,ext), representing the low end of the current
-range, the size of the current range, a single buffered output octet,
-and a count of additional carry-propagating output octets. Both rng
-and low are 32-bit unsigned integer values, rem is an octet value or
-the special value -1, and ext is an integer with at least 16 bits.
-This state vector is initialized at the start of each each frame to
-the value (0,2^31,-1,0).
-</t>
-
-<t>
-Each symbol is drawn from a finite alphabet and coded in a separate
-context which describes the size of the alphabet and the relative
-frequency of each symbol in that alphabet. CELT only uses static
-contexts; they are not adapted to the statistics of the data that is
-coded.
-</t>
-
-<section anchor="encoding-symbols" title="Encoding Symbols">
-<t>
- The main encoding function is ec_encode() (<xref target="rangeenc.c">rangeenc.c</xref>),
- which takes as an argument a three-tuple (fl,fh,ft)
- describing the range of the symbol to be encoded in the current
- context, with 0 <= fl < fh <= ft <= 65535. The values of this tuple
- are derived from the probability model for the symbol. Let f(i) be
- the frequency of the ith symbol in the current context. Then the
- three-tuple corresponding to the kth symbol is given by
- <![CDATA[
-fl=sum(f(i),i<k), fh=fl+f(i), and ft=sum(f(i)).
-]]>
-</t>
-<t>
- ec_encode() updates the state of the encoder as follows. If fl is
- greater than zero, then low = low + rng - (rng/ft)*(ft-fl) and
- rng = (rng/ft)*(fh-fl). Otherwise, low is unchanged and
- rng = rng - (rng/ft)*(fh-fl). The divisions here are exact integer
- division. After this update, the range is normalized.
-</t>
-<t>
- To normalize the range, the following process is repeated until
- rng > 2^23. First, the top 9 bits of low, (low>>23), are placed into
- a carry buffer. Then, low is set to <![CDATA[(low << 8 & 0x7FFFFFFF) and rng
- is set to (rng<<8)]]>. This process is carried out by
- ec_enc_normalize() (<xref target="rangeenc.c">rangeenc.c</xref>).
-</t>
-<t>
- The 9 bits produced in each iteration of the normalization loop
- consist of 8 data bits and a carry flag. The final value of the
- output bits is not determined until carry propagation is accounted
- for. Therefore the reference implementation buffers a single
- (non-propagating) output octet and keeps a count of additional
- propagating (0xFF) output octets. An implementation MAY choose to use
- any mathematically equivalent scheme to perform carry propagation.
-</t>
-<t>
- The function ec_enc_carry_out() (<xref target="rangeenc.c">rangeenc.c</xref>) performs
- this buffering. It takes a 9-bit input value, c, from the normalization
- 8-bit output and a carry bit. If c is 0xFF, then ext is incremented
- and no octets are output. Otherwise, if rem is not the special value
- -1, then the octet (rem+(c>>8)) is output. Then ext octets are output
- with the value 0 if the carry bit is set, or 0xFF if it is not, and
- rem is set to the lower 8 bits of c. After this, ext is set to zero.
-</t>
-<t>
- In the reference implementation, a special version of ec_encode()
- called ec_encode_bin() (<xref target="rangeenc.c">rangeenc.c</xref>) is defined to
- take a two-tuple (fl,ftb), where <![CDATA[0 <= fl < 2^ftb and ftb < 16. It is
- mathematically equivalent to calling ec_encode() with the three-tuple
- (fl,fl+1,1<<ftb)]]>, but avoids using division.
-
-</t>
-</section>
-
-<section anchor="encoding-ints" title="Encoding Uniformly Distributed Integers">
-<t>
- Functions ec_enc_uint() or ec_enc_bits() are based on ec_encode() and
- encode one of N equiprobable symbols, each with a frequency of 1,
- where N may be as large as 2^32-1. Because ec_encode() is limited to
- a total frequency of 2^16-1, this is done by encoding a series of
- symbols in smaller contexts.
-</t>
-<t>
- ec_enc_bits() (<xref target="entenc.c">entenc.c</xref>) is defined, like
- ec_encode_bin(), to take a two-tuple (fl,ftb), with <![CDATA[0 <= fl < 2^ftb
- and ftb < 32. While ftb is greater than 8, it encodes bits (ftb-8) to
- (ftb-1) of fl, e.g., (fl>>ftb-8&0xFF) using ec_encode_bin() and
- subtracts 8 from ftb. Then, it encodes the remaining bits of fl, e.g.,
- (fl&(1<<ftb)-1)]]>, again using ec_encode_bin().
-</t>
-<t>
- ec_enc_uint() (<xref target="entenc.c">entenc.c</xref>) takes a two-tuple (fl,ft),
- where ft is not necessarily a power of two. Let ftb be the location
- of the highest 1 bit in the two's-complement representation of
- (ft-1), or -1 if no bits are set. If ftb>8, then the top 8 bits of fl
- are encoded using ec_encode() with the three-tuple
- (fl>>ftb-8,(fl>>ftb-8)+1,(ft-1>>ftb-8)+1), and the remaining bits
- are encoded with ec_enc_bits using the two-tuple
- <![CDATA[(fl&(1<<ftb-8)-1,ftb-8). Otherwise, fl is encoded with ec_encode()
- directly using the three-tuple (fl,fl+1,ft)]]>.
-</t>
-</section>
-
-<section anchor="encoder-finalizing" title="Finalizing the Stream">
-<t>
- After all symbols are encoded, the stream must be finalized by
- outputting a value inside the current range. Let end be the integer
- in the interval [low,low+rng) with the largest number of trailing
- zero bits. Then while end is not zero, the top 9 bits of end, e.g.,
- <![CDATA[(end>>23), are sent to the carry buffer, and end is replaced by
- (end<<8&0x7FFFFFFF). Finally, if the value in carry buffer, rem, is]]>
- neither zero nor the special value -1, or the carry count, ext, is
- greater than zero, then 9 zero bits are sent to the carry buffer.
- After the carry buffer is finished outputting octets, the rest of the
- output buffer is padded with zero octets. Finally, rem is set to the
- special value -1. This process is implemented by ec_enc_done()
- (<xref target="rangeenc.c">rangeenc.c</xref>).
-</t>
-</section>
-
-<section anchor="encoder-tell" title="Current Bit Usage">
-<t>
- The bit allocation routines in CELT need to be able to determine a
- conservative upper bound on the number of bits that have been used
- to encode the current frame thus far. This drives allocation
- decisions and ensures that the range code will not overflow the
- output buffer. This is computed in the reference implementation to
- fractional bit precision by the function ec_enc_tell()
- (<xref target="rangeenc.c">rangeenc.c</xref>).
- Like all operations in the range encoder, it must
- be implemented in a bit-exact manner.
-</t>
-</section>
-
-</section>
-
-<section anchor="Encoder Feature Selection" title="Encoder Feature Selection">
-
-<t>
-The CELT codec has several optional features that can be switched on or off in each frame, some of which are mutually exclusive. The four main flags are intra-frame energy (I), pitch (P), short blocks (S), and folding (F). Those are described in more detail below. There are eight valid combinations of these four features, and they are encoded into the stream first using a variable length code (<xref target="flags-encoding"></xref>). It is left to the implementor to choose when to enable each of the flags, with the only restriction that the combination of the four flags MUST correspond to a valid entry in <xref target="flags-encoding"></xref>.
-</t>
-
-<texttable anchor="flags-encoding">
- <preamble>Encoding of the feature flags</preamble>
- <ttcol align='center'>I</ttcol>
- <ttcol align='center'>P</ttcol>
- <ttcol align='center'>S</ttcol>
- <ttcol align='center'>F</ttcol>
- <ttcol align='right'>Encoding</ttcol>
- <c>0</c><c>0</c><c>0</c><c>1</c><c>00</c>
- <c>0</c><c>1</c><c>0</c><c>1</c><c>01</c>
- <c>1</c><c>0</c><c>0</c><c>1</c><c>110</c>
- <c>1</c><c>0</c><c>1</c><c>1</c><c>111</c>
-
- <c>0</c><c>0</c><c>0</c><c>0</c><c>1000</c>
- <c>0</c><c>0</c><c>1</c><c>1</c><c>1001</c>
- <c>0</c><c>1</c><c>0</c><c>0</c><c>1010</c>
- <c>1</c><c>0</c><c>0</c><c>0</c><c>1011</c>
-</texttable>
-
-<section anchor="intra" title="Intra-frame energy (I)">
-<t>
-CELT uses prediction to encode the energy in each frequency band. In order to make frames independent, however, it is possible to disable the part of the prediction that depends on previous frames. This is called <spanx style="emph">intra-frame energy</spanx> and requires around 12 more bits per frame. It is enabled with the <spanx style="emph">I</spanx> bit (Table. <xref target="flags-encoding">flags-encoding</xref>). The use of intra energy is OPTIONAL and the decision method is left to the implementor. The reference code describes one way of deciding which frames would benefit most from having their energy encoded without prediction. The intra_decision() (<xref target="quant_bands.c">quant_bands.c</xref>) function looks for frames where the log-spectral distance between consecutive frames is more than 9 dB. When such a difference is found between two frames, the next frame (not the one for which the difference is detected) is marked encoded with intra energy. The one-frame delay is to ensure that when a frame containing a transient is lost, then the next frame will be decoded without accumulating error from the lost frame.
-</t>
-</section>
-
-<section anchor="pitch" title="Pitch prediction (P)">
-<t>
-CELT can use a pitch predictor (also known as long-term predictor) to improve the voice quality at lower bit-rates. When the <spanx style="emph">P</spanx> bit is set, the pitch period is encoded after the flag bits. The value encoded is an integer in the range [0, 1024-N-overlap-1].
-</t>
-</section>
-
-<section anchor="short-blocks" title="Short blocks (S)">
-<t>
-To improve audio quality during transients, CELT can use a <spanx style="emph">short block</spanx> multiple-MDCT transform. Unlike other transform codecs, the multiple MDCTs are jointly quantized as if the coefficients were obtained from a single MDCT. For that reason, it is better to consider the short block case as using a different transform of the same length rather than as multiple independent MDCTs. In the reference implementation, the decision to use short blocks is made by transient_analysis() (<xref target="celt.c">celt.c</xref>) based on the pre-emphasized signal's peak values, but other methods can be used. When the <spanx style="emph">S</spanx> bit is set, a 2-bit transient scalefactor is encoded directly after the flag bits. If the scalefactor is 0, then the multiple-MDCT output is unmodified. If the scalefactor is 1 or 2, then the output of the MDCTs that follow the transient is scaled down by 2^scalefactor. If the scalefactor is equal to 3, then a time-domain pre-emphasis window is applied <spanx style="strong">before</spanx> computing the MDCTs and no further scaling is applied to the MDCTs output. The window value is 1 from the beginning of the frame to 16 samples before the transient time. It is a Hanning window from there to the transient time, and then the value is 1/8 up to the end of the frame. The Hanning window part is defined as:
-</t>
-
-<t>
-static const float transientWindow[16] = {- 0.0085135, 0.0337639, 0.0748914, 0.1304955,
- 0.1986827, 0.2771308, 0.3631685, 0.4538658,
- 0.5461342, 0.6368315, 0.7228692, 0.8013173,
- 0.8695045, 0.9251086, 0.9662361, 0.9914865};
-</t>
-
-<t>When the scalefactor is 3, the transient time is the exact time of the transient
-determined by the encoder and encoded as an integer number of samples with the range
-[0, N+overlap-1] directly after the scalefactor.</t>
-
-
-<t>
-In the case where the scalefactor is 1 or 2 and the mode is defined to use more than 2 MDCTs, the last MDCT to which the scaling is <spanx style="strong">not</spanx> applied is encoded using an integer in the range [0, B-2], where B is the number of short MDCTs used for the mode.
-</t>
-</section>
-
-<section anchor="folding" title="Spectral folding (F)">
-<t>
-The last encoding feature in CELT is spectral folding. It is designed to prevent <spanx style="emph">birdie</spanx> artifacts caused by the sparse spectra often generated by low-bitrate transform codecs. When folding is enabled, a copy of the low-frequency spectrum is added to the higher-frequency bands (above ~6400 Hz). The folding operation is described in more detail in <xref target="pvq"></xref>.
-</t>
-</section>
-
-</section>
-
-<section anchor="forward-mdct" title="Forward MDCT">
-
-<t>The MDCT implementation has no special characteristics. The
-input is a windowed signal (after pre-emphasis) of 2*N samples and the output is N
-frequency-domain samples. A <spanx style="emph">low-overlap</spanx> window is used to reduce the algorithmic delay.
-It is derived from a basic (full overlap) window that is the same as the one used in the Vorbis codec: W(n)=[sin(pi/2*sin(pi/2*(n+.5)/L))]^2. The low-overlap window is created by zero-padding the basic window and inserting ones in the middle, such that the resulting window still satisfies power complementarity. The MDCT is computed in mdct_forward() (<xref target="mdct.c">mdct.c</xref>), which includes the windowing operation and a scaling of 2/N.
-</t>
-</section>
-
-<section anchor="normalization" title="Bands and Normalization">
-<t>
-The MDCT output is divided into bands that are designed to match the ear's critical bands,
-with the exception that each band has to be at least 3 bins wide. For each band, the encoder
-computes the energy that will later be encoded. Each band is then normalized by the
-square root of the <spanx style="strong">non-quantized</spanx> energy, such that each band now forms a unit vector X.
-The energy and the normalization are computed by compute_band_energies()
-and normalise_bands() (<xref target="bands.c">bands.c</xref>), respectively.
-</t>
-</section>
-
-<section anchor="energy-quantization" title="Energy Envelope Quantization">
-
-<t>
-It is important to quantize the energy with sufficient resolution because
-any energy quantization error cannot be compensated for at a later
-stage. Regardless of the resolution used for encoding the shape of a band,
-it is perceptually important to preserve the energy in each band. CELT uses a
-coarse-fine strategy for encoding the energy in the base-2 log domain,
-as implemented in <xref target="quant_bands.c">quant_bands.c</xref></t>
-
-<section anchor="coarse-energy" title="Coarse energy quantization">
-<t>
-The coarse quantization of the energy uses a fixed resolution of
-6 dB and is the only place where entropy coding is used.
-To minimize the bitrate, prediction is applied both in time (using the previous frame)
-and in frequency (using the previous bands). The 2-D z-transform of
-the prediction filter is: A(z_l, z_b)=(1-a*z_l^-1)*(1-z_b^-1)/(1-b*z_b^-1)
-where b is the band index and l is the frame index. The prediction coefficients are
-a=0.8 and b=0.7 when not using intra energy and a=b=0 when using intra energy.
-The time-domain prediction is based on the final fine quantization of the previous
-frame, while the frequency domain (within the current frame) prediction is based
-on coarse quantization only (because the fine quantization has not been computed
-yet). We approximate the ideal
-probability distribution of the prediction error using a Laplace distribution. The
-coarse energy quantization is performed by quant_coarse_energy() and
-quant_coarse_energy() (<xref target="quant_bands.c">quant_bands.c</xref>).
-</t>
-
-<t>
-The Laplace distribution for each band is defined by a 16-bit (Q15) decay parameter.
-Thus, the value 0 has a frequency count of p[0]=2*(16384*(16384-decay)/(16384+decay)). The
-values +/- i each have a frequency count p[i] = (p[i-1]*decay)>>14. The value of p[i] is always
-rounded down (to avoid exceeding 32768 as the sum of all frequency counts), so it is possible
-for the sum to be less than 32768. In that case additional values with a frequency count of 1 are encoded. The signed values corresponding to symbols 0, 1, 2, 3, 4, ...
-are [0, +1, -1, +2, -2, ...]. The encoding of the Laplace-distributed values is
-implemented in ec_laplace_encode() (<xref target="laplace.c">laplace.c</xref>).
-</t>
-<!-- FIXME: bit budget consideration -->
-</section> <!-- coarse energy -->
-
-<section anchor="fine-energy" title="Fine energy quantization">
-<t>
-After the coarse energy quantization and encoding, the bit allocation is computed
-(<xref target="allocation"></xref>) and the number of bits to use for refining the
-energy quantization is determined for each band. Let B_i be the number of fine energy bits
-for band i; the refinement is an integer f in the range [0,2^B_i-1]. The mapping between f
-and the correction applied to the coarse energy is equal to (f+1/2)/2^B_i - 1/2. Fine
-energy quantization is implemented in quant_fine_energy()
-(<xref target="quant_bands.c">quant_bands.c</xref>).
-</t>
-
-<t>
-If any bits are unused at the end of the encoding process, these bits are used to
-increase the resolution of the fine energy encoding in some bands. Priority is given
-to the bands for which the allocation (<xref target="allocation"></xref>) was rounded
-down. At the same level of priority, lower bands are encoded first. Refinement bits
-are added until there are no unused bits. This is implemented in quant_energy_finalise()
-(<xref target="quant_bands.c">quant_bands.c</xref>).
-</t>
-
-</section> <!-- fine energy -->
-
-
-</section> <!-- Energy quant -->
-
-<section anchor="allocation" title="Bit Allocation">
-<t>Bit allocation is performed based only on information available to both
-the encoder and decoder. The same calculations are performed in a bit-exact
-manner in both the encoder and decoder to ensure that the result is always
-exactly the same. Any mismatch would cause an error in the decoded output.
-The allocation is computed by compute_allocation() (<xref target="rate.c">rate.c</xref>),
-which is used in both the encoder and the decoder.</t>
-
-<t>For a given band, the bit allocation is nearly constant across
-frames that use the same number of bits for Q1, yielding a
-pre-defined signal-to-mask ratio (SMR) for each band. Because the
-bands each have a width of one Bark, this is equivalent to modeling the
-masking occurring within each critical band, while ignoring inter-band
-masking and tone-vs-noise characteristics. While this is not an
-optimal bit allocation, it provides good results without requiring the
-transmission of any allocation information.
-</t>
-
-
-<t>
-For every encoded or decoded frame, a target allocation must be computed
-using the projected allocation. In the reference implementation this is
-performed by compute_allocation() (<xref target="rate.c">rate.c</xref>).
-The target computation begins by calculating the available space as the
-number of whole bits which can be fit in the frame after Q1 is stored according
-to the range coder (ec_[enc/dec]_tell()) and then multiplying by 8.
-Then the two projected prototype allocations whose sums multiplied by 8 are nearest
-to that value are determined. These two projected prototype allocations are then interpolated
-by finding the highest integer interpolation coefficient in the range 0-8
-such that the sum of the higher prototype times the coefficient, plus the
-sum of the lower prototype multiplied by
-the difference of 16 and the coefficient, is less than or equal to the
-available sixteenth-bits.
-The reference implementation performs this step using a binary search in
-interp_bits2pulses() (<xref target="rate.c">rate.c</xref>). The target
-allocation is the interpolation coefficient times the higher prototype, plus
-the lower prototype multiplied by the difference of 16 and the coefficient,
-for each of the CELT bands.
-</t>
-
-<t>
-Because the computed target will sometimes be somewhat smaller than the
-available space, the excess space is divided by the number of bands, and this amount
-is added equally to each band. Any remaining space is added to the target one
-sixteenth-bit at a time, starting from the first band. The new target now
-matches the available space, in sixteenth-bits, exactly.
-</t>
-
-<t>
-The allocation target is separated into a portion used for fine energy
-and a portion used for the Spherical Vector Quantizer (PVQ). The fine energy
-quantizer operates in whole-bit steps. For each band the number of bits per
-channel used for fine energy is calculated by 50 minus the log2_frac(), with
-1/16 bit precision, of the number of MDCT bins in the band. That result is multiplied
-by the number of bins in the band and again by twice the number of
-channels, and then the value is set to zero if it is less than zero. Added
-to that result is 16 times the number of MDCT bins times the number of
-channels, and it is finally divided by 32 times the number of MDCT bins times the
-number of channels. If the result times the number of channels is greater than than the
-target divided by 16, the result is set to the target divided by the number of
-channels divided by 16. Then if the value is greater than 7 it is reset to 7 because a
-larger amount of fine energy resolution was determined not to be make an improvement in
-perceived quality. The resulting number of fine energy bits per channel is
-then multiplied by the number of channels and then by 16, and subtracted
-from the target allocation. This final target allocation is what is used for the
-PVQ.
-</t>
-
-</section>
-
-<section anchor="pitch-prediction" title="Pitch Prediction">
-<t>
-This section needs to be updated.
-</t>
-
-</section>
-
-<section anchor="pvq" title="Spherical Vector Quantization">
-<t>CELT uses a Pyramid Vector Quantization (PVQ) <xref target="PVQ"></xref>
-codebook for quantizing the details of the spectrum in each band that have not
-been predicted by the pitch predictor. The PVQ codebook consists of all sums
-of K signed pulses in a vector of N samples, where two pulses at the same position
-are required to have the same sign. Thus the codebook includes
-all integer codevectors y of N dimensions that satisfy sum(abs(y(j))) = K.
-</t>
-
-<t>
-In bands where neither pitch nor folding is used, the PVQ is used to encode
-the unit vector that results from the normalization in
-<xref target="normalization"></xref> directly. Given a PVQ codevector y,
-the unit vector X is obtained as X = y/||y||, where ||.|| denotes the
-L2 norm.
-</t>
-
-<section anchor="bits-pulses" title="Bits to Pulses">
-<t>
-Although the allocation is performed in 1/16 bit units, the quantization requires
-an integer number of pulses K. To do this, the encoder searches for the value
-of K that produces the number of bits that is the nearest to the allocated value
-(rounding down if exactly half-way between two values), subject to not exceeding
-the total number of bits available. The computation is performed in 1/16 of
-bits using log2_frac() and ec_enc_tell(). The number of codebooks entries can
-be computed as explained in <xref target="cwrs-encoding"></xref>. The difference
-between the number of bits allocated and the number of bits used is accumulated to a
-<spanx style="emph">balance</spanx> (initialised to zero) that helps adjusting the
-allocation for the next bands. One third of the balance is subtracted from the
-bit allocation of the next band to help achieving the target allocation. The only
-exceptions are the band before the last and the last band, for which half the balance
-and the whole balance are subtracted, respectively.
-</t>
-</section>
-
-<section anchor="pvq-search" title="PVQ Search">
-
-<t>
-The search for the best codevector y is performed by alg_quant()
-(<xref target="vq.c">vq.c</xref>). There are several possible approaches to the
-search with a tradeoff between quality and complexity. The method used in the reference
-implementation computes an initial codeword y1 by projecting the residual signal
-R = X - p' onto the codebook pyramid of K-1 pulses:
-</t>
-<t>
-y0 = round_towards_zero( (K-1) * R / sum(abs(R)))
-</t>
-
-<t>
-Depending on N, K and the input data, the initial codeword y0 may contain from
-0 to K-1 non-zero values. All the remaining pulses, with the exception of the last one,
-are found iteratively with a greedy search that minimizes the normalized correlation
-between y and R:
-</t>
-
-<t>
-J = -R^T*y / ||y||
-</t>
-
-<t>
-The search described above is considered to be a good trade-off between quality
-and computational cost. However, there are other possible ways to search the PVQ
-codebook and the implementors MAY use any other search methods.
-</t>
-</section>
-
-
-<section anchor="cwrs-encoding" title="Index Encoding">
-<t>
-The best PVQ codeword is encoded as a uniformly-distributed integer value
-by encode_pulses() (<xref target="cwrs.c">cwrs.c</xref>).
-The codeword is converted to a unique index in the same way as specified in
-<xref target="PVQ"></xref>. The indexing is based on the calculation of V(N,K) (denoted N(L,K) in <xref target="PVQ"></xref>), which is the number of possible combinations of K pulses
-in N samples. The number of combinations can be computed recursively as
-V(N,K) = V(N+1,K) + V(N,K+1) + V(N+1,K+1), with V(N,0) = 1 and V(0,K) = 0, K != 0.
-There are many different ways to compute V(N,K), including pre-computed tables and direct
-use of the recursive formulation. The reference implementation applies the recursive
-formulation one line (or column) at a time to save on memory use,
-along with an alternate,
-univariate recurrence to initialise an arbitrary line, and direct
-polynomial solutions for small N. All of these methods are
-equivalent, and have different trade-offs in speed, memory usage, and
-code size. Implementations MAY use any methods they like, as long as
-they are equivalent to the mathematical definition.
-</t>
-
-<t>
-The indexing computations are performed using 32-bit unsigned integers. For large codebooks,
-32-bit integers are not sufficient. Instead of using 64-bit integers (or more), the encoding
-is made slightly sub-optimal by splitting each band into two equal (or near-equal) vectors of
-size (N+1)/2 and N/2, respectively. The number of pulses in the first half, K1, is first encoded as an
-integer in the range [0,K]. Then, two codebooks are encoded with V((N+1)/2, K1) and V(N/2, K-K1).
-The split operation is performed recursively, in case one (or both) of the split vectors
-still requires more than 32 bits. For compatibility reasons, the handling of codebooks of more
-than 32 bits MUST be implemented with the splitting method, even if 64-bit arithmetic is available.
-</t>
-</section>
-
-</section>
-
-
-<section anchor="stereo" title="Stereo support">
-<t>
-When encoding a stereo stream, some parameters are shared across the left and right channels, while others are transmitted separately for each channel, or jointly encoded. Only one copy of the flags for the features, transients and pitch (pitch period and gains) are transmitted. The coarse and fine energy parameters are transmitted separately for each channel. Both the coarse energy and fine energy (including the remaining fine bits at the end of the stream) have the left and right bands interleaved in the stream, with the left band encoded first.
-</t>
-
-<t>
-The main difference between mono and stereo coding is the PVQ coding of the normalized vectors. In stereo mode, a normalized mid-side (M-S) encoding is used. Let L and R be the normalized vector of a certain band for the left and right channels, respectively. The mid and side vectors are computed as M=L+R and S=L-R and no longer have unit norm.
-</t>
-
-<t>
-From M and S, an angular parameter theta=2/pi*atan2(||S||, ||M||) is computed. The theta parameter is converted to a Q14 fixed-point parameter itheta, which is quantized on a scale from 0 to 1 with an interval of 2^-qb, where qb = (b-2*(N-1)*(40-log2_frac(N,4)))/(32*(N-1)), b is the number of bits allocated to the band, and log2_frac() is defined in <xref target="cwrs.c">cwrs.c</xref>. From here on, the value of itheta MUST be treated in a bit-exact manner since
-both the encoder and decoder rely on it to infer the bit allocation.
-</t>
-<t>
-Let m=M/||M|| and s=S/||S||; m and s are separately encoded with the PVQ encoder described in <xref target="pvq"></xref>. The number of bits allocated to m and s depends on the value of itheta. The number of bits allocated to coding m is obtained by:
-</t>
-
-<t>
-<list>
-<t>imid = bitexact_cos(itheta);</t>
-<t>iside = bitexact_cos(16384-itheta);</t>
-<t>delta = (N-1)*(log2_frac(iside,6)-log2_frac(imid,6))>>2;</t>
-<t>qalloc = log2_frac((1<<qb)+1,4);</t>
-<t>mbits = (b-qalloc/2-delta)/2;</t>
-</list>
-</t>
-
-<t>where bitexact_cos() is a fixed-point cosine approximation that MUST be bit-exact with the reference implementation
-in <xref target="mathops.h">mathops.h</xref>. The spectral folding operation is performed independently for the mid and side vectors.</t>
-</section>
-
-
-<section anchor="synthesis" title="Synthesis">
-<t>
-After all the quantization is completed, the quantized energy is used along with the
-quantized normalized band data to resynthesize the MDCT spectrum. The inverse MDCT (<xref target="inverse-mdct"></xref>) and the weighted overlap-add are applied and the signal is stored in the <spanx style="emph">synthesis buffer</spanx> so it can be used for pitch prediction.
-The encoder MAY omit this step of the processing if it knows that it will not be using
-the pitch predictor for the next few frames. If the de-emphasis filter (<xref target="inverse-mdct"></xref>) is applied to this resynthesized
-signal, then the output will be the same (within numerical precision) as the decoder's output.
-</t>
-</section>
-
-<section anchor="vbr" title="Variable Bitrate (VBR)">
-<t>
-Each CELT frame can be encoded in a different number of octets, making it possible to vary the bitrate at will. This property can be used to implement source-controlled variable bitrate (VBR). Support for VBR is OPTIONAL for the encoder, but a decoder MUST be prepared to decode a stream that changes its bit-rate dynamically. The method used to vary the bit-rate in VBR mode is left to the implementor, as long as each frame can be decoded by the reference decoder.
-</t>
-</section>
-
-</section>
-
-<section anchor="CELT-decoder" title="CELT Decoder">
-
-<t>
-Like most audio codecs, the CELT decoder is less complex than the encoder, as can be
-observed in the decoder block diagram in <xref target="decoder-diagram"></xref>. In
-fact, most of the operations performed by the decoder are also performed by the
-encoder.
-</t>
-
-<figure anchor="decoder-diagram">
-<artwork>
-<![CDATA[
- +--+
- |Q1|-------------+
- +--+ |
- v
- +--+ +-----+ +---+ +-----+
- |Q3|->| Mix |->| * |->|IMDCT|-+-> output
- +--+ +-----+ +---+ +-----+ |
- ^ ^ |
- +------+ |
- | |
- +--+ +-+-+ |
- |Q2|-->| * | |
- +--+ +---+ |
- ^ |
- | |
- +------+-----+ |
- +------------+ |Delay, MDCT,| |
- |Pitch period|->| Normalize | |
- +------------+ +------------+ |
- ^ |
- +--------------------+
-]]>
-</artwork>
-<postamble>Block diagram of the CELT decoder</postamble>
-</figure>
-
-<t>
-The decoder extracts information from the range-coded bit-stream in the same order
-as it was encoded by the encoder. In some circumstances, it is
-possible for a decoded value to be out of range due to a very small amount of redundancy
-in the encoding of large integers by the range coder.
-In that case, the decoder should assume there has been an error in the coding,
-decoding, or transmission and SHOULD take measures to conceal the error and/or report
-to the application that a problem has occurred.
-</t>
-
-<section anchor="range-decoder" title="Range Decoder">
-<t>
-The range decoder extracts the symbols and integers encoded using the range encoder in
-<xref target="range-encoder"></xref>. The range decoder maintains an internal
-state vector composed of the two-tuple (dif,rng), representing the
-difference between the high end of the current range and the actual
-coded value, and the size of the current range, respectively. Both
-dif and rng are 32-bit unsigned integer values. rng is initialized to
-2^7. dif is initialized to rng minus the top 7 bits of the first
-input octet. Then the range is immediately normalized, using the
-procedure described in the following section.
-</t>
-
-<section anchor="decoding-symbols" title="Decoding Symbols">
-<t>
- Decoding symbols is a two-step process. The first step determines
- a value fs that lies within the range of some symbol in the current
- context. The second step updates the range decoder state with the
- three-tuple (fl,fh,ft) corresponding to that symbol, as defined in
- <xref target="encoding-symbols"></xref>.
-</t>
-<t>
- The first step is implemented by ec_decode()
- (<xref target="rangedec.c">rangedec.c</xref>),
- and computes fs = ft-min((dif-1)/(rng/ft)+1,ft), where ft is
- the sum of the frequency counts in the current context, as described
- in <xref target="encoding-symbols"></xref>. The divisions here are exact integer division.
-</t>
-<t>
- In the reference implementation, a special version of ec_decode()
- called ec_decode_bin() (<xref target="rangeenc.c">rangeenc.c</xref>) is defined using
- the parameter ftb instead of ft. It is mathematically equivalent to
- calling ec_decode() with ft = (1<<ftb), but avoids one of the
- divisions.
-</t>
-<t>
- The decoder then identifies the symbol in the current context
- corresponding to fs; i.e., the one whose three-tuple (fl,fh,ft)
- satisfies fl <= fs < fh. This tuple is used to update the decoder
- state according to dif = dif - (rng/ft)*(ft-fh), and if fl is greater
- than zero, rng = (rng/ft)*(fh-fl), or otherwise rng = rng - (rng/ft)*(ft-fh). After this update, the range is normalized.
-</t>
-<t>
- To normalize the range, the following process is repeated until
- rng > 2^23. First, rng is set to (rng<8)&0xFFFFFFFF. Then the next
- 8 bits of input are read into sym, using the remaining bit from the
- previous input octet as the high bit of sym, and the top 7 bits of the
- next octet for the remaining bits of sym. If no more input octets
- remain, zero bits are used instead. Then, dif is set to
- (dif<<8)-sym&0xFFFFFFFF (i.e., using wrap-around if the subtraction
- overflows a 32-bit register). Finally, if dif is larger than 2^31,
- dif is then set to dif - 2^31. This process is carried out by
- ec_dec_normalize() (<xref target="rangedec.c">rangedec.c</xref>).
-</t>
-</section>
-
-<section anchor="decoding-ints" title="Decoding Uniformly Distributed Integers">
-<t>
- Functions ec_dec_uint() or ec_dec_bits() are based on ec_decode() and
- decode one of N equiprobable symbols, each with a frequency of 1,
- where N may be as large as 2^32-1. Because ec_decode() is limited to
- a total frequency of 2^16-1, this is done by decoding a series of
- symbols in smaller contexts.
-</t>
-<t>
- ec_dec_bits() (<xref target="entdec.c">entdec.c</xref>) is defined, like
- ec_decode_bin(), to take a single parameter ftb, with ftb < 32.
- and ftb < 32, and produces an ftb-bit decoded integer value, t,
- initialized to zero. While ftb is greater than 8, it decodes the next
- 8 most significant bits of the integer, s = ec_decode_bin(8), updates
- the decoder state with the 3-tuple (s,s+1,256), adds those bits to
- the current value of t, t = t<<8 | s, and subtracts 8 from ftb. Then
- it decodes the remaining bits of the integer, s = ec_decode_bin(ftb),
- updates the decoder state with the 3 tuple (s,s+1,1<<ftb), and adds
- those bits to the final values of t, t = t<<ftb | s.
-</t>
-<t>
- ec_dec_uint() (<xref target="entdec.c">entdec.c</xref>) takes a single parameter,
- ft, which is not necessarily a power of two, and returns an integer,
- t, with a value between 0 and ft-1, inclusive, which is initialized to zero. Let
- ftb be the location of the highest 1 bit in the two's-complement
- representation of (ft-1), or -1 if no bits are set. If ftb>8, then
- the top 8 bits of t are decoded using t = ec_decode((ft-1>>ftb-8)+1),
- the decoder state is updated with the three-tuple
- (s,s+1,(ft-1>>ftb-8)+1), and the remaining bits are decoded with
- t = t<<ftb-8|ec_dec_bits(ftb-8). If, at this point, t >= ft, then
- the current frame is corrupt, and decoding should stop. If the
- original value of ftb was not greater than 8, then t is decoded with
- t = ec_decode(ft), and the decoder state is updated with the
- three-tuple (t,t+1,ft).
-</t>
-</section>
-
-<section anchor="decoder-tell" title="Current Bit Usage">
-<t>
- The bit allocation routines in CELT need to be able to determine a
- conservative upper bound on the number of bits that have been used
- to decode from the current frame thus far. This drives allocation
- decisions which must match those made in the encoder. This is
- computed in the reference implementation to fractional bit precision
- by the function ec_dec_tell() (<xref target="rangedec.c">rangedec.c</xref>). Like all
- operations in the range decoder, it must be implemented in a
- bit-exact manner, and must produce exactly the same value returned by
- ec_enc_tell() after encoding the same symbols.
-</t>
-</section>
-
-</section>
-
-<section anchor="energy-decoding" title="Energy Envelope Decoding">
-<t>
-The energy of each band is extracted from the bit-stream in two steps according
-to the same coarse-fine strategy used in the encoder. First, the coarse energy is
-decoded in unquant_coarse_energy() (<xref target="quant_bands.c">quant_bands.c</xref>)
-based on the probability of the Laplace model used by the encoder.
-</t>
-
-<t>
-After the coarse energy is decoded, the same allocation function as used in the
-encoder is called (<xref target="allocation"></xref>). This determines the number of
-bits to decode for the fine energy quantization. The decoding of the fine energy bits
-is performed by unquant_fine_energy() (<xref target="quant_bands.c">quant_bands.c</xref>).
-Finally, like the encoder, the remaining bits in the stream (that would otherwise go unused)
-are decoded using unquant_energy_finalise() (<xref target="quant_bands.c">quant_bands.c</xref>).
-</t>
-</section>
-
-<section anchor="pitch-decoding" title="Pitch prediction decoding">
-<t>
-If the pitch bit is set, then the pitch period is extracted from the bit-stream. The pitch
-gain bits are extracted within the PVQ decoding as encoded by the encoder. When the folding
-bit is set, the folding prediction is computed in exactly the same way as the encoder,
-with the same gain, by the function intra_fold() (<xref target="vq.c">vq.c</xref>).
-</t>
-
-</section>
-
-<section anchor="PVQ-decoder" title="Spherical VQ Decoder">
-<t>
-In order to correctly decode the PVQ codewords, the decoder must perform exactly the same
-bits to pulses conversion as the encoder (see <xref target="bits-pulses"></xref>).
-</t>
-
-<section anchor="cwrs-decoder" title="Index Decoding">
-<t>
-The decoding of the codeword from the index is performed as specified in
-<xref target="PVQ"></xref>, as implemented in function
-decode_pulses() (<xref target="cwrs.c">cwrs.c</xref>).
-</t>
-</section>
-
-<section anchor="normalised-decoding" title="Normalised Vector Decoding">
-<t>
-The spherical codebook is decoded by alg_unquant() (<xref target="vq.c">vq.c</xref>).
-The index of the PVQ entry is obtained from the range coder and converted to
-a pulse vector by decode_pulses() (<xref target="cwrs.c">cwrs.c</xref>).
-</t>
-
-<t>The decoded normalized vector for each band is equal to</t>
-<t>X' = y/||y||,</t>
-
-<t>
-This operation is implemented in mix_pitch_and_residual() (<xref target="vq.c">vq.c</xref>),
-which is the same function as used in the encoder.
-</t>
-</section>
-
-
-</section>
-
-<section anchor="denormalization" title="Denormalization">
-<t>
-Just like each band was normalized in the encoder, the last step of the decoder before
-the inverse MDCT is to denormalize the bands. Each decoded normalized band is
-multiplied by the square root of the decoded energy. This is done by denormalise_bands()
-(<xref target="bands.c">bands.c</xref>).
-</t>
-</section>
-
-<section anchor="inverse-mdct" title="Inverse MDCT">
-<t>The inverse MDCT implementation has no special characteristics. The
-input is N frequency-domain samples and the output is 2*N time-domain
-samples, while scaling by 1/2. The output is windowed using the same
-<spanx style="emph">low-overlap</spanx> window
-as the encoder. The IMDCT and windowing are performed by mdct_backward
-(<xref target="mdct.c">mdct.c</xref>). If a time-domain pre-emphasis
-window was applied in the encoder, the (inverse) time-domain de-emphasis window
-is applied on the IMDCT result. After the overlap-add process,
-the signal is de-emphasized using the inverse of the pre-emphasis filter
-used in the encoder: 1/A(z)=1/(1-alpha_p*z^-1).
-</t>
-
-</section>
-
-<section anchor="Packet Loss Concealment" title="Packet Loss Concealment (PLC)">
-<t>
-Packet loss concealment (PLC) is an optional decoder-side feature which
-SHOULD be included when transmitting over an unreliable channel. Because
-PLC is not part of the bit-stream, there are several possible ways to
-implement PLC with different complexity/quality trade-offs. The PLC in
-the reference implementation finds a periodicity in the decoded
-signal and repeats the windowed waveform using the pitch offset. The windowed
-waveform is overlapped in such a way as to preserve the time-domain aliasing
-cancellation with the previous frame and the next frame. This is implemented
-in celt_decode_lost() (<xref target="celt.c">mdct.c</xref>).
-</t>
-</section>
-
-</section>
-
-
-
-<section anchor="Security Considerations" title="Security Considerations">
-
-<t>
-A potential denial-of-service threat exists for data encodings using
-compression techniques that have non-uniform receiver-end
-computational load. The attacker can inject pathological datagrams
-into the stream which are complex to decode and cause the receiver to
-become overloaded. However, this encoding does not exhibit any
-significant non-uniformity.
-</t>
-
-<t>
-With the exception of the first four bits, the bit-stream produced by
-CELT for an unknown audio stream is not easily predictable, due to the
-use of entropy coding. This should make CELT less vulnerable to attacks
-based on plaintext guessing when encryption is used. Also, since almost
-all possible bit combinations can be interpreted as a valid bit-stream,
-it is likely more difficult to determine from the decrypted bit-stream
-whether a guessed decryption key is valid.
-</t>
-
-<t>
-When operating CELT in variable-bitrate (VBR) mode, some of the
-properties described above no longer hold. More specifically, the size
-of the packet leaks a very small, but non-zero, amount of information
-about both the original signal and the bit-stream plaintext.
-</t>
-</section>
-
-
-<section title="IANA Considerations ">
-<t>
-This document has no actions for IANA.
-</t>
-</section>
-
-
-<section anchor="Acknowledgments" title="Acknowledgments">
-
-<t>
-The authors would also like to thank the CELT users who contributed patches, bug reports, feature requests, suggestions or comments.
-</t>
-</section>
-
-</middle>
-
-<back>
-
-<references title="Normative References">
-
-<reference anchor="rfc2119">
-<front>
-<title>Key words for use in RFCs to Indicate Requirement Levels </title>
-<author initials="S." surname="Bradner" fullname="Scott Bradner"><organization/></author>
-</front>
-<seriesInfo name="RFC" value="2119" />
-</reference>
-
-<reference anchor="rfc3550">
-<front>
-<title>RTP: A Transport Protocol for real-time applications</title>
-<author initials="H." surname="Schulzrinne" fullname=""><organization/></author>
-<author initials="S." surname="Casner" fullname=""><organization/></author>
-<author initials="R." surname="Frederick" fullname=""><organization/></author>
-<author initials="V." surname="Jacobson" fullname=""><organization/></author>
-</front>
-<seriesInfo name="RFC" value="3550" />
-</reference>
-
-
-</references>
-
-<references title="Informative References">
-
-<reference anchor="celt-tasl">
-<front>
-<title>A High-Quality Speech and Audio Codec With Less Than 10 ms delay</title>
-<author initials="JM" surname="Valin" fullname="Jean-Marc Valin"><organization/></author>
-<author initials="T. B." surname="Terriberry" fullname="Timothy Terriberry"><organization/></author>
-<author initials="C." surname="Montgomery" fullname="Christopher Montgomery"><organization/></author>
-<author initials="G." surname="Maxwell" fullname="Gregory Maxwell"><organization/></author>
-</front>
-<seriesInfo name="To appear in IEEE Transactions on Audio, Speech and Language Processing" value="2009" />
-</reference>
-
-<reference anchor="celt-eusipco">
-<front>
-<title>A Full-Bandwidth Audio Codec with Low Complexity and Very Low Delay</title>
-<author initials="JM" surname="Valin" fullname="Jean-Marc Valin"><organization/></author>
-<author initials="T. B." surname="Terriberry" fullname="Timothy Terriberry"><organization/></author>
-<author initials="G." surname="Maxwell" fullname="Gregory Maxwell"><organization/></author>
-</front>
-<seriesInfo name="Accepted for EUSIPCO" value="2009" />
-</reference>
-
-<reference anchor="celt-website">
-<front>
-<title>The CELT ultra-low delay audio codec</title>
-<author><organization/></author>
-</front>
-<seriesInfo name="CELT website" value="http://www.celt-codec.org/" />
-</reference>
-
-<reference anchor="mdct">
-<front>
-<title>Modified Discrete Cosine Transform</title>
-<author><organization/></author>
-</front>
-<seriesInfo name="MDCT" value="http://en.wikipedia.org/wiki/Modified_discrete_cosine_transform" />
-</reference>
-
-<reference anchor="range-coding">
-<front>
-<title>Range encoding: An algorithm for removing redundancy from a digitised message</title>
-<author initials="G." surname="Nigel" fullname=""><organization/></author>
-<author initials="N." surname="Martin" fullname=""><organization/></author>
-<date year="1979" />
-</front>
-<seriesInfo name="Proc. Institution of Electronic and Radio Engineers International Conference on Video and Data Recording" value="" />
-</reference>
-
-<reference anchor="coding-thesis">
-<front>
-<title>Source coding algorithms for fast data compression</title>
-<author initials="R." surname="Pasco" fullname=""><organization/></author>
-<date month="May" year="1976" />
-</front>
-<seriesInfo name="Ph.D. thesis" value="Dept. of Electrical Engineering, Stanford University" />
-</reference>
-
-<reference anchor="PVQ">
-<front>
-<title>A Pyramid Vector Quantizer</title>
-<author initials="T." surname="Fischer" fullname=""><organization/></author>
-<date month="July" year="1986" />
-</front>
-<seriesInfo name="IEEE Trans. on Information Theory, Vol. 32" value="pp. 568-583" />
-</reference>
-
-</references>
-
-<section anchor="ref-implementation" title="Reference Implementation">
-
-<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.8.1 of the implementation available on the
-<xref target="celt-website"></xref>, which can be compiled for
-either floating-point or fixed-point architectures.
-</t>
-
-<t>The implementation can be compiled with either a C89 or a C99
-compiler. It is reasonably optimized for most platforms such that
-only architecture-specific optimizations are likely to be useful.
-The FFT used is a slightly modified version of the KISS-FFT package,
-but it is easy to substitute any other FFT library.
-</t>
-
-<t>
-The testcelt executable can be used to test the encoding and decoding
-process:
-<list style="empty">
-<t><![CDATA[
-testcelt <rate> <channels> <frame size> <octets per packet>
- [<complexity> [packet loss rate]] <input> <output>
-]]></t>
-</list>
-where "rate" is the sampling rate in Hz, "channels" is the number of
-channels (1 or 2), "frame size" is the number of samples in a frame
-(64 to 1024) and "octets per packet" is the number of octets desired for each
-compressed frame. The input and output files are assumed to be a 16-bit
-PCM file in the machine native endianness. The optional "complexity" argument
-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"?>
-<?rfc include="xml_source/modes.h"?>
-<?rfc include="xml_source/modes.c"?>
-<?rfc include="xml_source/bands.h"?>
-<?rfc include="xml_source/bands.c"?>
-<?rfc include="xml_source/cwrs.h"?>
-<?rfc include="xml_source/cwrs.c"?>
-<?rfc include="xml_source/vq.h"?>
-<?rfc include="xml_source/vq.c"?>
-<?rfc include="xml_source/pitch.h"?>
-<?rfc include="xml_source/pitch.c"?>
-<?rfc include="xml_source/rate.h"?>
-<?rfc include="xml_source/rate.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"?>
-<?rfc include="xml_source/entcode.h"?>
-<?rfc include="xml_source/entcode.c"?>
-<?rfc include="xml_source/entenc.h"?>
-<?rfc include="xml_source/entenc.c"?>
-<?rfc include="xml_source/entdec.h"?>
-<?rfc include="xml_source/entdec.c"?>
-<?rfc include="xml_source/mfrngcod.h"?>
-<?rfc include="xml_source/rangeenc.c"?>
-<?rfc include="xml_source/rangedec.c"?>
-<?rfc include="xml_source/laplace.h"?>
-<?rfc include="xml_source/laplace.c"?>
-<?rfc include="xml_source/quant_bands.h"?>
-<?rfc include="xml_source/quant_bands.c"?>
-<?rfc include="xml_source/arch.h"?>
-<?rfc include="xml_source/mathops.h"?>
-<?rfc include="xml_source/os_support.h"?>
-<?rfc include="xml_source/stack_alloc.h"?>
-<?rfc include="xml_source/celt_types.h"?>
-<?rfc include="xml_source/_kiss_fft_guts.h"?>
-<?rfc include="xml_source/kiss_fft.h"?>
-<?rfc include="xml_source/kiss_fft.c"?>
-<?rfc include="xml_source/kiss_fftr.h"?>
-<?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/config.h"?>
-
-</section>
-
-
-</back>
-
-</rfc>
--- a/doc/ietf/draft-valin-celt-rtp-profile-01.txt
+++ /dev/null
@@ -1,1120 +1,0 @@
-
-
-
-AVT Working Group J-M. Valin
-Internet-Draft Octasic Semiconductor
-Expires: November 12, 2009 G. Maxwell
- Juniper Networks
- May 11, 2009
-
-
- draft-valin-celt-rtp-profile-01
- RTP Payload Format for the CELT Codec
-
-Status of this Memo
-
- This Internet-Draft is submitted to IETF in full conformance with the
- provisions of BCP 78 and BCP 79.
-
- Internet-Drafts are working documents of the Internet Engineering
- Task Force (IETF), its areas, and its working groups. Note that
- other groups may also distribute working documents as Internet-
- Drafts.
-
- Internet-Drafts are draft documents valid for a maximum of six months
- and may be updated, replaced, or obsoleted by other documents at any
- time. It is inappropriate to use Internet-Drafts as reference
- material or to cite them other than as "work in progress."
-
- The list of current Internet-Drafts can be accessed at
- http://www.ietf.org/ietf/1id-abstracts.txt.
-
- The list of Internet-Draft Shadow Directories can be accessed at
- http://www.ietf.org/shadow.html.
-
- This Internet-Draft will expire on November 12, 2009.
-
-Copyright Notice
-
- Copyright (c) 2009 IETF Trust and the persons identified as the
- document authors. All rights reserved.
-
- This document is subject to BCP 78 and the IETF Trust's Legal
- Provisions Relating to IETF Documents in effect on the date of
- publication of this document (http://trustee.ietf.org/license-info).
- Please review these documents carefully, as they describe your rights
- and restrictions with respect to this document.
-
-
-
-
-
-
-
-
-Valin & Maxwell Expires November 12, 2009 [Page 1]
-
-Internet-Draft draft-valin-celt-rtp-profile-01 May 2009
-
-
-Abstract
-
- CELT is an open-source voice codec suitable for use in very low delay
- audio communication applications, including Voice over IP (VoIP).
- This document describes the payload format for CELT generated bit
- streams within an RTP packet. Also included here are the necessary
- details for the use of CELT with the Session Description Protocol
- (SDP). At the time of this writing, the CELT bit-stream has NOT been
- finalized yet, and compatibility is usually broken with every new
- release of the codec.
-
-
-Table of Contents
-
- 1. Conventions used in this document . . . . . . . . . . . . . . 3
- 2. Overview of the CELT Codec . . . . . . . . . . . . . . . . . . 4
- 3. RTP payload format for CELT . . . . . . . . . . . . . . . . . 5
- 3.1. RTP Header . . . . . . . . . . . . . . . . . . . . . . . . 5
- 3.2. CELT payload . . . . . . . . . . . . . . . . . . . . . . . 6
- 3.3. Multiple CELT frames in a RTP packet . . . . . . . . . . . 7
- 3.4. Multiple channels . . . . . . . . . . . . . . . . . . . . 8
- 4. MIME registration of CELT . . . . . . . . . . . . . . . . . . 10
- 5. SDP usage of CELT . . . . . . . . . . . . . . . . . . . . . . 12
- 5.1. Multichannel Mapping . . . . . . . . . . . . . . . . . . . 13
- 5.2. Low-Overhead Mode . . . . . . . . . . . . . . . . . . . . 15
- 6. Congestion Control . . . . . . . . . . . . . . . . . . . . . . 16
- 7. Security Considerations . . . . . . . . . . . . . . . . . . . 17
- 8. Acknowledgments . . . . . . . . . . . . . . . . . . . . . . . 18
- 9. References . . . . . . . . . . . . . . . . . . . . . . . . . . 19
- 9.1. Normative References . . . . . . . . . . . . . . . . . . . 19
- 9.2. Informative References . . . . . . . . . . . . . . . . . . 19
- Authors' Addresses . . . . . . . . . . . . . . . . . . . . . . . . 20
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Valin & Maxwell Expires November 12, 2009 [Page 2]
-
-Internet-Draft draft-valin-celt-rtp-profile-01 May 2009
-
-
-1. Conventions used in this document
-
- The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT",
- "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this
- document are to be interpreted as described in RFC 2119 [rfc2119].
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Valin & Maxwell Expires November 12, 2009 [Page 3]
-
-Internet-Draft draft-valin-celt-rtp-profile-01 May 2009
-
-
-2. Overview of the CELT Codec
-
- CELT stands for "Constrained Energy Lapped Transform". It applies
- some of the CELP principles, but does everything in the frequency
- domain, which removes some of the limitations of CELP. CELT is
- suitable for both speech and music and currently features:
-
- o Ultra-low algorithmic delay (as low as 2 ms)
-
- o Full audio bandwidth (up to 20 kHz audio bandwidth)
-
- o Support for both voice and music
-
- o Stereo support
-
- o Packet loss concealment
-
- o Constant bitrates from under 32 kbps to 128 kbps and above
-
- o Free software/open-source
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Valin & Maxwell Expires November 12, 2009 [Page 4]
-
-Internet-Draft draft-valin-celt-rtp-profile-01 May 2009
-
-
-3. RTP payload format for CELT
-
- For RTP based transportation of CELT encoded audio the standard RTP
- header [rfc3550] is followed by one or more payload data blocks. An
- optional padding terminator may also be used.
-
-
- 0 1 2 3
- 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- | RTP Header |
- +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
- | one or more frames of CELT .... |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- | .... |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-3.1. RTP Header
-
-
- 0 1 2 3
- 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- |V=2|P|X| CC |M| PT | sequence number |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- | timestamp |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- | synchronization source (SSRC) identifier |
- +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
- | contributing source (CSRC) identifiers |
- | ... |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
- The RTP header is defined in the RTP specification [rfc3550]. This
- section defines how fields in the RTP header are used.
-
- Padding (P): 1 bit
-
- If the padding bit is set, the packet contains one or more additional
- padding octets at the end which are not part of the payload. The
- last octet of the padding contains a count of how many padding octets
- should be ignored, including itself. Padding may be needed by some
- encryption algorithms with fixed block sizes or for carrying several
- RTP packets in a lower-layer protocol data unit.
-
- Extension (X): 1 bit
-
- If the extension, X, bit is set, the fixed header MUST be followed by
-
-
-
-Valin & Maxwell Expires November 12, 2009 [Page 5]
-
-Internet-Draft draft-valin-celt-rtp-profile-01 May 2009
-
-
- exactly one header extension, with a format defined in Section 5.3.1.
- of [rfc3550].
-
- Marker (M): 1 bit
-
- The M bit MUST be set to zero in all packets. The receiver MUST
- ignore the M bit.
-
- Payload Type (PT): 7 bits
-
- Payload Type (PT): The assignment of an RTP payload type for this
- packet format is outside the scope of this document; it is specified
- by the RTP profile under which this payload format is used, or
- signaled dynamically out-of-band (e.g., using SDP).
-
- Timestamp: 32 bits
-
- A timestamp representing the sampling time of the first sample of the
- first CELT frame in the RTP payload. The clock frequency MUST be set
- to the sample rate of the encoded audio data and is conveyed out-of-
- band (e.g., as an SDP parameter).
-
-3.2. CELT payload
-
- For the purposes of packetizing the bit stream in RTP, it is only
- necessary to consider the sequence of bits as output by the CELT
- encoder [celt-website], and present the same sequence to the decoder.
- The payload format described here maintains this sequence.
-
- A typical CELT frame, encoded at a high bitrate, is approx. 128
- octets and the total size of the CELT frames SHOULD be kept below the
- path MTU to prevent fragmentation. CELT frames MUST NOT be split
- across multiple RTP packets,
-
- An RTP packet MAY contain CELT frames of the same bit rate or of
- varying bit rates, since the bitrate for the frames is explicitly
- conveyed in band with the signal. The encoding and decoding
- algorithm can change the bit rate at any frame boundary, with the bit
- rate change notification provided in-band. No out-of-band
- notification is required for the decoder to process changes in the
- bit rate sent by the encoder.
-
- It is RECOMMENDED that sampling rates 32000, 44100, or 48000 Hz be
- used for most applications, unless a specific reason exists -- such
- as requirements for a very specific packetization time. For example,
- 51200 Hz sampling may be useful to obtain a 5 ms packetization time
- with 256-sample frames. For compatibility reasons, the sender and
- receiver MUST support 48000 Hz sampling rate.
-
-
-
-Valin & Maxwell Expires November 12, 2009 [Page 6]
-
-Internet-Draft draft-valin-celt-rtp-profile-01 May 2009
-
-
- The CELT codec always produces an integer number of bytes and can
- produce any integer number of bytes, so no padding is ever required.
- Bitrate adjustment SHOULD be used instead of padding.
-
-3.3. Multiple CELT frames in a RTP packet
-
- The bitrate used by CELT is implicitly determined by the size of the
- compressed data. When more than one frame is encoded in the same
- packet, it is not possible to determine the size of each encoded
- frame, so the information MUST be explicitly encoded. If N frames
- are present in a packet, N compressed frame sizes need to be encoded
- at the beginning of the packet. Each size that is less than 255
- bytes is encoded in one byte (unsigned 8-bit integer). For sizes
- greater or equal to 255, a 0xff byte is encoded, followed by the
- size-255. Multiple 0xff bytes are allowed if there are more than 510
- bytes transmitted. The length is always the size of the CELT frame
- excluding the length byte itself. The payload MUST NOT be padded,
- except in accordance with the padding bit definition in the RTP
- header.
-
- Below is an example of two CELT frames contained within one RTP
- packet.
-
-
- 0 1 2 3
- 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- |V=2|P|X| CC |M| PT | sequence number |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- | timestamp |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- | synchronization source (SSRC) identifier |
- +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
- | contributing source (CSRC) identifiers |
- | ... |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- | length frame 1| length frame 2| CELT frame 1... |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- | (frame 1) | CELT frame 2... |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- | (frame 2) |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
- The following is an example of C code that interprets the length
- bytes:
-
-
-
-
-
-Valin & Maxwell Expires November 12, 2009 [Page 7]
-
-Internet-Draft draft-valin-celt-rtp-profile-01 May 2009
-
-
- int i, N, pos;
- int sizes[MAX_FRAMES][channels];
- unsigned int total_size;
- total_size=0;
- N = 0;
- pos = 0;
- while (total_size < payload_size) {- for (i=0;i<channels;i++) {- int s;
- int sum;
- sum = 0;
- do {- s = payload[pos++];
- sum += s;
- total_size += s+1;
- } while (s == 255);
- sizes[N][i] = sum;
- }
- N++;
- }
-
-3.4. Multiple channels
-
- CELT supports both mono streams and stereo streams. If more than two
- channels are desired, it is possible to use transmit multiple streams
- in the same packet. In this case, the number of streams S and the
- pairing must be agreed with out-of-band negotiation such as SDP.
- Each stream can be either mono or stereo, depending on whether the
- channels are assumed to be correlated. For example, a 5.1 surround
- could have the front-left and front-right channels in a stereo
- stream, the rear-left and rear-right channels in a separate stereo
- stream, while the center and low-frequency channels would be in
- separate mono streams. In that example, the RTP packet would be:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Valin & Maxwell Expires November 12, 2009 [Page 8]
-
-Internet-Draft draft-valin-celt-rtp-profile-01 May 2009
-
-
- 0 1 2 3
- 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- |V=2|P|X| CC |M| PT | sequence number |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- | timestamp |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- | synchronization source (SSRC) identifier |
- +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
- | contributing source (CSRC) identifiers |
- | ... |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- | Front length | rear length | center length | LFE length |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- | Front stereo |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- | ... |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- | ... | Rear stereo data... |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- | ... |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- | Center mono data... |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- | ... |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- | | LFE mono data... |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- | ... |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
- In the case where streams for multiple channels are used with
- multiple frames of the same streams per packet, then all streams for
- a certain timestamp are encoded before all streams for the following
- timestamp. In the case of the 5.1 example above with two frames per
- packet, the number of compressed length fields would be S*N = 8.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Valin & Maxwell Expires November 12, 2009 [Page 9]
-
-Internet-Draft draft-valin-celt-rtp-profile-01 May 2009
-
-
-4. MIME registration of CELT
-
- Full definition of the MIME [rfc2045] type for CELT will be part of
- the Ogg Vorbis MIME type definition application [rfc3534].
-
- MIME media type name: audio
-
- MIME subtype: celt
-
- Optional parameters:
-
- Required parameters: to be included in the Ogg MIME specification.
-
- Encoding considerations:
-
- Security Considerations:
-
- See Section 6 of RFC 3047.
-
- Interoperability considerations: none
-
- Published specification:
-
- Applications which use this media type:
-
- Additional information: none
-
- Person & email address to contact for further information:
-
-
- Jean-Marc Valin <jean-marc.valin@octasic.com>
-
- Intended usage: COMMON
-
- Author/Change controller:
-
- Author: Jean-Marc Valin <jean-marc.valin@octasic.com>
-
- Change controller: Jean-Marc Valin <jean-marc.valin@octasic.com>
-
- Change controller: IETF AVT Working Group
-
- This transport type signifies that the content is to be interpreted
- according to this document if the contents are transmitted over RTP.
- Should this transport type appear over a lossless streaming protocol
- such as TCP, the content encapsulation should be interpreted as an
- Ogg Stream in accordance with [rfc3534], with the exception that the
- content of the Ogg Stream may be assumed to be CELT audio and CELT
-
-
-
-Valin & Maxwell Expires November 12, 2009 [Page 10]
-
-Internet-Draft draft-valin-celt-rtp-profile-01 May 2009
-
-
- audio only.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Valin & Maxwell Expires November 12, 2009 [Page 11]
-
-Internet-Draft draft-valin-celt-rtp-profile-01 May 2009
-
-
-5. SDP usage of CELT
-
- When conveying information by SDP [rfc4566], the encoding name MUST
- be set to "CELT". The sampling frequency is typically between 32000
- and 48000 Hz. Implementations MUST support 48000 Hz and SHOULD also
- support 44100 Hz.
-
- The SDP parameters have the following interpretation with respect to
- CELT:
-
- ptime: The desired packetization time. The sender SHOULD choose a
- number of frames per packet that corresponds to the smallest
- packetization time greater or equal to the specified ptime for the
- selected frame size. The default is 20 ms as specified in
- [rfc3551]
-
- maxptime: The maximum packetization time desired. As specified in
- [rfc4566], if the maximum is lower than the smallest packetization
- time determined from the chosen frame size (as described above),
- then that packtization time SHOULD be used despite the maxptime
- value. The default is "no maximum".
-
- CELT-specific parameters can be given via the "a=fmtp:" directive.
- Several parameters can be given in a single a=fmtp line provided that
- they are separated by a semi-colon. The following parameters are
- defined for use in this way:
-
- bitrate: The desired bit-rate in kbit/s for the codec only
- (excluding headers and the length bytes). The value MUST be
- rounded to an integer number of bytes per frame. The round-to-
- nearest method is RECOMMENDED. The default bit-rate value is 64
- kbit/s per channel.
-
- frame-size: The frame size is the duration of each frame in
- samples and has to be even. The default is 480.
-
- mapping: Optional string describing the multi-channel mapping.
-
- The selected frame-size values MUST be even. For quality and
- complexity reasons, they SHOULD also be divisible by 8 and have a
- prime factorization which consists only of 2, 3, or 5 factors. For
- example, powers-of-two and values such as 160, 320, 240, and 480 are
- recommended. Implementations MUST support receiving and sending the
- default value of 480. Implementations SHOULD also support frame
- sizes of 256 and 512 since these are the ones that lead to the lowest
- complexity. When frame sizes that are powers-of-two are supported,
- they SHOULD be listed first in the offer and chosen over non-powers-
- of-two in the answer.
-
-
-
-Valin & Maxwell Expires November 12, 2009 [Page 12]
-
-Internet-Draft draft-valin-celt-rtp-profile-01 May 2009
-
-
- Care must be taken when setting the value of ptime: and bitrate: so
- that the RTP packet size does not exceed the path MTU.
-
- An example of the media representation in SDP for offering a single
- channel of CELT at 48000 samples per second might be:
-
-
- m=audio 8088 RTP/AVP 97
-
- a=rtpmap:97 CELT/48000/1
-
- Note that the RTP payload type code of 97 is defined in this media
- definition to be 'mapped' to the CELT codec at a 48 kHz sampling
- frequency using the 'a=rtpmap' line. Any number from 96 to 127 could
- have been chosen (the allowed range for dynamic types). If there is
- more than one channel being encoded the rtpmap MUST specify the
- channel count. When no channel count is included, the default is one
- channel.
-
- The following example demonstrates the use of the a=fmtp: parameters:
-
-
- m=audio 8008 RTP/AVP 97
-
- a=ptime: 25
-
- a=rtpmap:97 CELT/44100
-
- a=fmtp:97 frame-size=512;bitrate=48
-
- This examples illustrate an offerer that wishes to receive a CELT
- stream at 44100 Hz, by packing two 512-sample frames in each packet
- (less than 25 ms) at around 48 kbps (70 bytes per frame).
-
-5.1. Multichannel Mapping
-
- When more than two channels are used, a mapping parameter MUST be
- provided. The mapping parameter is defined as comma separated list
- of integers which specify the number of channels contained in each
- CELT stream, OPTIONALLY followed by a '/' and a comma separated list
- of channel identifiers, then OPTIONALLY another '/' and a string
- which provides an application specific elaboration on any speaker-
- feed definitions. The channels per stream entries MUST be either 1
- or 2. The total number of channels is indicated by the sum of the
- channels per stream entries. The sum of the channel counts MUST be
- equal to the total number of channels.
-
- Channel identifiers are short alphanumeric strings. Each identifier
-
-
-
-Valin & Maxwell Expires November 12, 2009 [Page 13]
-
-Internet-Draft draft-valin-celt-rtp-profile-01 May 2009
-
-
- MUST begin with a letter indicating the type of channel. 'A' MUST be
- used to indicate an ambisonic channel, 'S' to indicate a speaker-feed
- channel, or 'O' indicating other usage.
-
- A channel identifier MAY be repeated, but the meaning of such
- repetition is application specific. Applications SHOULD attempt to
- utilize channel identifiers such that mixing all identical
- identifiers would produce a reasonable result.
-
- Non-surround usage such as individual performer tracks, effect send,
- "order wire", or other administrative channels may be given
- application specific identifiers which MUST not conflict with the
- identifiers defined in this draft. These identifiers SHOULD begin
- with S if it would be sensible to include them in a mono-downmix, or
- O if it would be most sensible to exclude them from a mono-downmix.
- An example usage might be mapping=2,1,2,1,1/
- SLguitar,SRguitar,OheadsetG,SLkeyboard,SRkeyboard,OheadsetK,SMbass,Oh
- eadsetB"
-
- Ambisonic channels MUST follow the Furse-Malham naming and weighing
- conventions for up to third order spherical[Ambisonic]. Higher order
- ambisonic support is application defined but MUST NOT reuse any of
- WXYZRSTUVKLMNOPQ for higher order components. For example, second
- order spherical ambisonics SHOULD use the mapping
- "mapping=1,1,1,1,1,1,1,1,1/AW,AX,AY,AZ,AR,AS,AT,AU,AV". Any set of
- Ambisonic channels MUST contain at least one "AW" channel.
-
- Speaker-feed identifiers are named based on the intended speaker
- locations. "L", "R" for the left and right speakers, respectively,
- in conventional stereo or the front left and right in 4, 5, 5.1, or
- 7.1 channel surround. "LR", "RR" for the left and right rear
- speakers in 4,5 or 5.1 channel surround. C" is used for a center
- channel, "MLFE" for a low frequency extension channel. "LS", "RS"
- for the side channels in 7.1 channel surround. Additional speaker-
- feeds are application specific but should not reuse the prior
- identifiers. For 5.1 surround in non-ambisonic form the mapping
- SHOULD be "mapping=2,2,1,1/L,R,LR,RR,C,MLFE/ITU-RBS.775-1". When
- only one or two channels are used, the mapping parameter MAY be
- omitted, in which case the default mapping is used. For one channel,
- the default is "mapping=1/C", while for two channels, the default is
- "mapping=2/L,R".
-
- For example a stereo configuration might signal:
-
-
- m=audio 8008 RTP/AVP 97
-
-
-
-
-
-Valin & Maxwell Expires November 12, 2009 [Page 14]
-
-Internet-Draft draft-valin-celt-rtp-profile-01 May 2009
-
-
- a=ptime: 5
-
- a=rtpmap:97 CELT/44100/2
-
- a=fmtp:97 frame-size=256
-
- Which specifies a single two-channel CELT stream according to the
- default mapping.
-
-5.2. Low-Overhead Mode
-
- A low-overhead mode is defined to make more efficient use of
- bandwidth when transmitting CELT frames. In that mode none of the
- length values need to be transmitted. One the a=fmtp: parameter low-
- overhead: is defined and contains a single frame size, followed by a
- '/', followed by a comma-separated list of the number of bytes per
- frame for each stream defined in the channel mapping. The number of
- frames per channel can thus be computed as the payload size divided
- by the sum of the bytes-per-frame values. The frame-size: parameter
- MUST not be specified and SHOULD be ignored if encountered in an SDP
- offer or answer. The bitrate: parameter MUST also be ignored since
- the low-overhead: parameter makes it redundant. When the low-
- overhead: parameter is specified, the length of each frame MUST NOT
- be encoded in the payload and the bit-rate MUST NOT be changed during
- the session.
-
- For example a low-overhead surround configuration could be signaled
- as:
-
- m=audio 8008 RTP/AVP 97
-
- a=ptime: 5
-
- a=rtpmap:97 CELT/48000/6
-
- a=fmtp:97 low-overhead=256/1/86,86,43,30;mapping=2,2,1,1/
- L,R,LR,RR,C,MLFE/ITU-RBS.775-1
-
- In this example, 4 bytes per packet would be saved. This corresponds
- to a 6 kbit/s reduction in the overhead, although the 60 kbit/s
- overhead of the IP, UDP and RTP headers is still present.
-
-
-
-
-
-
-
-
-
-
-Valin & Maxwell Expires November 12, 2009 [Page 15]
-
-Internet-Draft draft-valin-celt-rtp-profile-01 May 2009
-
-
-6. Congestion Control
-
- CELT allows any bitrate, with a one byte per frame resolution,
- without any signaling requirement or overhead. Applications SHOULD
- utilize congestion control to regulate the transmitted bitrate. In
- some applications it may make sense to increase the packetization
- interval rather than decreasing the codec bitrate. Congestion
- control implementations should consider the users differential
- tolerance for high latency and low quality.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Valin & Maxwell Expires November 12, 2009 [Page 16]
-
-Internet-Draft draft-valin-celt-rtp-profile-01 May 2009
-
-
-7. Security Considerations
-
- RTP packets using the payload format defined in this specification
- are subject to the security considerations discussed in the RTP
- specification [rfc3550], and in any applicable RTP profile. The main
- security considerations for the RTP packet carrying the RTP payload
- format defined within this memo are confidentiality, integrity and
- source authenticity. Confidentiality is achieved by encryption of
- the RTP payload. Integrity of the RTP packets through suitable
- cryptographic integrity protection mechanism. Cryptographic system
- may also allow the authentication of the source of the payload. A
- suitable security mechanism for this RTP payload format should
- provide confidentiality, integrity protection and at least source
- authentication capable of determining if an RTP packet is from a
- member of the RTP session or not.
-
- Note that the appropriate mechanism to provide security to RTP and
- payloads following this memo may vary. It is dependent on the
- application, the transport, and the signalling protocol employed.
- Therefore a single mechanism is not sufficient, although if suitable
- the usage of SRTP [rfc3711] is recommended. Other mechanism that may
- be used are IPsec [rfc4301] and TLS [rfc5246] (RTP over TCP), but
- also other alternatives may exist.
-
- This RTP payload format and its media decoder do not exhibit any
- significant non-uniformity in the receiver-side computational
- complexity for packet processing, and thus are unlikely to pose a
- denial-of-service threat due to the receipt of pathological data.
- Nor does the RTP payload format contain any active content.
-
- Because this format supports VBR operation small amounts of
- information about the transmitted audio may be leaked by a length
- preserving cryptographic transport. Accordingly, when CELT is used
- inside a secure transport the sender SHOULD restrict the use of VBR
- to congestion control purposes.
-
- CELT implementations will typically exhibit tiny content-sensitive
- encoding time variances. Since transmission is usually triggered by
- an accurate hardware clock and the encoded data is typically
- transmitted as soon as encoding is complete this variance may result
- in a small amount of additional frame to frame jitter which could be
- measured by a third-party. Encrypted implementations SHOULD transmit
- packets at fixed intervals to avoid the possible information leak.
-
-
-
-
-
-
-
-
-Valin & Maxwell Expires November 12, 2009 [Page 17]
-
-Internet-Draft draft-valin-celt-rtp-profile-01 May 2009
-
-
-8. Acknowledgments
-
- The authors would also like to thank the following people for their
- input: Timothy B. Terriberry, Ben Schwartz, Alexander Carot, Thorvald
- Natvig, Brian West, Steve Underwood, and Anthony Minessale.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Valin & Maxwell Expires November 12, 2009 [Page 18]
-
-Internet-Draft draft-valin-celt-rtp-profile-01 May 2009
-
-
-9. References
-
-9.1. Normative References
-
- [rfc2119] Bradner, S., "Key words for use in RFCs to Indicate
- Requirement Levels", RFC 2119.
-
- [rfc3550] Schulzrinne, H., Casner, S., Frederick, R., and V.
- Jacobson, "RTP: A Transport Protocol for real-time
- applications", RFC 3550.
-
- [rfc2045] "Multipurpose Internet Mail Extensions (MIME) Part One:
- Format of Internet Message Bodies", RFC 2045,
- November 1998.
-
- [rfc4566] Handley, M., Jacobson, V., and C. Perkins, "SDP: Session
- Description Protocol", RFC 4566, July 2006.
-
- [rfc3551] Schulzrinne, H. and S. Casner, "RTP Profile for Audio and
- Video Conferences with Minimal Control.", RFC 3551,
- July 2003.
-
- [rfc3534] Walleij, L., "The application/ogg Media Type", RFC 3534,
- May 2003.
-
- [rfc3711] Baugher, M., McGrew, D., Naslund, M., Carrara, E., and K.
- Norrman, "The Secure Real-time Transport Protocol (SRTP)",
- RFC 3711, March 2004.
-
- [rfc4301] Kent, S. and K. Seo, "Security Architecture for the
- Internet Protocol", RFC 4301, December 2005.
-
- [rfc5246] Dierks, T. and E. Rescorla, "The Transport Layer Security
- (TLS) Protocol Version 1.2", RFC 5246, August 2008.
-
-9.2. Informative References
-
- [celt-website]
- Xiph.Org Foundation, "The CELT ultra-low delay audio
- codec", CELT website http://www.celt-codec.org/.
-
- [Ambisonic]
- Malham, D., "Higher order Ambisonic systems", Paper http:/
- /www.york.ac.uk/inst/mustech/3d_audio/
- higher_order_ambisonics.pdf, December 2003.
-
-
-
-
-
-
-Valin & Maxwell Expires November 12, 2009 [Page 19]
-
-Internet-Draft draft-valin-celt-rtp-profile-01 May 2009
-
-
-Authors' Addresses
-
- Jean-Marc Valin
- Octasic Semiconductor
- 4101, Molson Street, suite 300
- Montreal, Quebec H1Y 3L1
- Canada
-
- Email: jean-marc.valin@octasic.com
-
-
- Gregory Maxwell
- Juniper Networks
- 2251 Corporate Park Drive, Suite 100
- Herndon, VA 20171-1817
- USA
-
- Email: gmaxwell@juniper.net
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Valin & Maxwell Expires November 12, 2009 [Page 20]
-
--- a/doc/ietf/draft-valin-celt-rtp-profile.xml
+++ /dev/null
@@ -1,816 +1,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE rfc SYSTEM 'rfc2629.dtd'>
-<?rfc symrefs="yes" toc="yes" ?>
-
-<rfc ipr="trust200902" docName="RTP Payload Format for the CELT Codec">
-
-<front>
-<title>draft-valin-celt-rtp-profile-02</title>
-
-
-
-<author initials="J-M" surname="Valin" fullname="Jean-Marc Valin">
-<organization>Octasic Semiconductor</organization>
-<address>
-<postal>
-<street>4101, Molson Street, suite 300</street>
-<city>Montreal</city>
-<region>Quebec</region>
-<code>H1Y 3L1</code>
-<country>Canada</country>
-</postal>
-<email>jean-marc.valin@octasic.com</email>
-</address>
-</author>
-
-
-<author initials="G" surname="Maxwell" fullname="Gregory Maxwell">
-<organization>Juniper Networks</organization>
-<address>
-<postal>
-<street>2251 Corporate Park Drive, Suite 100</street>
-<city>Herndon</city>
-<region>VA</region>
-<code>20171-1817</code>
-<country>USA</country>
-</postal>
-<email>gmaxwell@juniper.net</email>
-</address>
-</author>
-
-<date day="13" month="July" year="2009" />
-
-<area>General</area>
-<workgroup>AVT Working Group</workgroup>
-<keyword>I-D</keyword>
-
-<keyword>Internet-Draft</keyword>
-<keyword>CELT</keyword>
-<keyword>RTP</keyword>
-<abstract>
-<t>
-CELT is an open-source voice codec suitable for use in very low delay
-audio communication applications, including Voice over IP (VoIP).
-This document describes the payload format for CELT generated bit
-streams within an RTP packet. Also included here are the necessary
-details for the use of CELT with the Session Description Protocol
-(SDP). At the time of this writing, the CELT bit-stream has NOT
-been finalized yet, and compatibility is usually broken with
-every new release of the codec.
-</t>
-</abstract>
-</front>
-
-<middle>
-
-<section anchor="Conventions used in this document" title="Conventions used in this document">
-<t>
-The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT",
-"SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this
-document are to be interpreted as described in RFC 2119 <xref target="rfc2119"></xref>.
-</t>
-</section>
-
-<section anchor="Overview of the CELT Codec" title="Overview of the CELT Codec">
-
-<t>
-CELT stands for "Constrained Energy Lapped Transform". It applies some of the CELP principles, but does everything in the frequency domain, which removes some of the limitations of CELP. CELT is suitable for both speech and music and currently features:
-</t>
-
-<t>
-<list style="symbols">
-<t>Ultra-low algorithmic delay (as low as 2 ms)</t>
-<t>Full audio bandwidth (up to 20 kHz audio bandwidth)</t>
-<t>Support for both voice and music</t>
-<t>Stereo support</t>
-<t>Packet loss concealment</t>
-<t>Constant bitrates from under 32 kbps to 128 kbps and above</t>
-<t>Free software/open-source</t>
-</list>
-</t>
-
-</section>
-
-<section anchor="RTP payload format for CELT" title="RTP payload format for CELT">
-
-<t>
-For RTP based transportation of CELT encoded audio the standard
-RTP header <xref target="rfc3550"></xref> is followed by one or more payload data blocks.
-An optional padding terminator may also be used.
-</t>
-
-<section anchor="RTP Header" title="RTP Header">
-
-<t>
-<figure>
-<artwork><![CDATA[
- 0 1 2 3
- 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- |V=2|P|X| CC |M| PT | sequence number |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- | timestamp |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- | synchronization source (SSRC) identifier |
- +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
- | contributing source (CSRC) identifiers |
- | ... |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-]]></artwork>
-</figure>
-</t>
-
-<t>
-The RTP header is defined in the RTP specification <xref target="rfc3550"></xref>. This
- section defines how fields in the RTP header are used.
-</t>
-
-<t>Padding (P): 1 bit</t><t>
- If the padding bit is set, the packet contains one or more
- additional padding octets at the end which are not part of the
- payload. The last octet of the padding contains a count of how
- many padding octets should be ignored, including itself. Padding
- may be needed by some encryption algorithms with fixed block sizes
- or for carrying several RTP packets in a lower-layer protocol data
- unit.
-</t>
-
-<t>Extension (X): 1 bit</t><t>
- If the extension, X, bit is set, the fixed header MUST be
- followed by exactly one header extension, with a format defined
- in Section 5.3.1. of <xref target="rfc3550"></xref>.
-</t>
-
-<t>Marker (M): 1 bit</t><t>
- The M bit MUST be set to zero in all packets. The receiver MUST
- ignore the M bit.
-</t>
-
-<t>Payload Type (PT): 7 bits</t><t>
- Payload Type (PT): The assignment of an RTP payload type for this
- packet format is outside the scope of this document; it is
- specified by the RTP profile under which this payload format is
- used, or signaled dynamically out-of-band (e.g., using SDP).
-</t>
-
-<t>Timestamp: 32 bits</t><t>
- A timestamp representing the sampling time of the first sample of
- the first CELT frame in the RTP payload. The clock frequency
- MUST be set to the sample rate of the encoded audio data and is
- conveyed out-of-band (e.g., as an SDP parameter).
-</t>
-
-
-</section>
-
-<section anchor="celt--payload" title="CELT payload">
-
-<t>
-For the purposes of packetizing the bit stream in RTP, it is only
-necessary to consider the sequence of bits as output by the CELT
-encoder <xref target="celt-website"></xref>, and present the same
-sequence to the decoder. The payload format described here maintains
-this sequence.
-</t>
-
-<t>
-A typical CELT frame, encoded at a high bitrate, is approx.
-128 octets and the total size of the CELT frames SHOULD be kept
-below the path MTU to prevent fragmentation. CELT frames MUST
-NOT be split across multiple RTP packets,
-</t>
-
-<t>
-An RTP packet MAY contain CELT frames of the same bit rate or of
-varying bit rates, since the bitrate for the frames is explicitly
-conveyed in band with the signal. The encoding and decoding algorithm
-can change the bit rate at any frame boundary, with the bit rate
-change notification provided in-band. No out-of-band notification
-is required for the decoder to process changes in the bit rate
-sent by the encoder.
-</t>
-
-<t>
-More than one frame may be encoded in the same RTP packet, and for
-the decoder it is not possible to determine the compressed size (bit-rate)
-of each encoded frame. Thus the compressed size information MUST be explicitly
-transmitted. There are two modes for conveying this information:
-either the compressed size(s) are encoded for each frame at the
-beginning of the RTP payload <xref target="multiple-frames"/>, or it is conveyed in the
-signaling and then fixed for the duration of the session
-(Low-Overhead Mode, <xref target="low-overhead"/>). Note that the compressed frame size
-information must be present either way even if only single frames
-are transmitted per RTP packet.
-</t>
-
-<t>
-It is RECOMMENDED that sampling rates 32000, 44100, or 48000 Hz be used
-for most applications, unless a specific reason exists -- such as
-requirements for a very specific packetization time. For example,
-51200 Hz sampling may be useful to obtain a 5 ms packetization time
-with 256-sample frames. For compatibility reasons, the sender and
-receiver MUST support 48000 Hz sampling rate.
-</t>
-
-<t>
-The CELT codec always produces an integer number of bytes and can
-produce any integer number of bytes, so no padding is ever required.
-Bitrate adjustment SHOULD be used instead of padding.
-</t>
-
-</section>
-
-<section anchor="multiple-frames" title="Multiple CELT frames in a RTP packet">
-
-<t>
-The bitrate used by CELT is implicitly determined by the size of the
-compressed data. When more than one frame is encoded in the same packet,
-it is not possible to determine the size of each encoded frame, so the
-information MUST be explicitly encoded. If N frames are present in a
-packet, N compressed frame sizes need to be encoded at the beginning of
-the packet. Each size that is less than 255 bytes is encoded in one byte
-(unsigned 8-bit integer). For sizes greater or equal to 255, a 0xff byte
-is encoded, followed by the size-255. Multiple 0xff bytes are allowed if
-there are more than 510 bytes transmitted. The length is always the size
-of the CELT frame excluding the length byte itself. The payload MUST NOT
-be padded, except in accordance with the padding bit definition in the
-RTP header.
-</t>
-
-<t>
-Below is an example of two CELT frames contained within one RTP
-packet.
-</t>
-
-<t><figure>
-<artwork><![CDATA[
- 0 1 2 3
- 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- |V=2|P|X| CC |M| PT | sequence number |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- | timestamp |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- | synchronization source (SSRC) identifier |
- +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
- | contributing source (CSRC) identifiers |
- | ... |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- | length frame 1| length frame 2| CELT frame 1... |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- | (frame 1) | CELT frame 2... |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- | (frame 2) |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-]]></artwork>
-</figure></t>
-
-<t>The following is an example of C code that interprets the length bytes:
-</t>
-
-<t><figure>
-<artwork><![CDATA[
- int i, N, pos;
- int sizes[MAX_FRAMES][channels];
- unsigned int total_size;
- total_size=0;
- N = 0;
- pos = 0;
- while (total_size < payload_size) {- for (i=0;i<channels;i++) {- int s;
- int sum;
- sum = 0;
- do {- s = payload[pos++];
- sum += s;
- total_size += s+1;
- } while (s == 255);
- sizes[N][i] = sum;
- }
- N++;
- }
-]]></artwork>
-</figure></t>
-
-</section>
-
-<section anchor="Multiple channels" title="Multiple channels">
-
-<t>CELT supports both mono streams and stereo streams. If more than two channels are desired, it is possible to use transmit multiple streams in the same packet. In this case, the number of streams S and the pairing must be agreed with out-of-band negotiation such as SDP. Each stream can be either mono or stereo, depending on whether the channels are assumed to be correlated. For example, a 5.1 surround could have the front-left and front-right channels in a stereo stream, the rear-left and rear-right channels in a separate stereo stream, while the center and low-frequency channels would be in separate mono streams. In that example, the RTP packet would be:</t>
-
-<t><figure>
-<artwork><![CDATA[
- 0 1 2 3
- 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- |V=2|P|X| CC |M| PT | sequence number |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- | timestamp |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- | synchronization source (SSRC) identifier |
- +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
- | contributing source (CSRC) identifiers |
- | ... |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- | Front length | rear length | center length | LFE length |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- | Front stereo |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- | ... |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- | ... | Rear stereo data... |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- | ... |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- | Center mono data... |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- | ... |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- | | LFE mono data... |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- | ... |
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-]]></artwork>
-</figure></t>
-
-<t>In the case where streams for multiple channels are used with multiple frames of the same streams per packet, then all streams for a certain timestamp are encoded before all streams for the following timestamp. In the case of the 5.1 example above with two frames per packet, the number of compressed length fields would be S*N = 8.</t>
-
-</section>
-
-</section>
-
-<section anchor="MIME registration of CELT" title="MIME registration of CELT">
-
-<t>
-Full definition of the MIME <xref target="rfc2045"></xref> type for CELT will be part of the Ogg
-Vorbis MIME type definition application <xref target="rfc3534"></xref>.
-</t>
-
-<t>MIME media type name: audio</t>
-
-<t>MIME subtype: celt</t>
-
-<t>Optional parameters:</t>
-
-<t>Required parameters: to be included in the Ogg MIME specification.</t>
-
-<t>Encoding considerations:</t>
-
-<t>Security Considerations:</t>
-<t>See Section 6 of RFC 3047.</t>
-
-<t>Interoperability considerations: none</t>
-
-<t>Published specification: </t>
-
-<t>Applications which use this media type:</t>
-
-<t>Additional information: none</t>
-
-<t>Person & email address to contact for further information:<vspace blankLines="1" />
-<list style="empty">
-<t>Jean-Marc Valin <jean-marc.valin@octasic.com></t>
-</list>
-</t>
-
-<t>Intended usage: COMMON</t>
-
-<t>Author/Change controller:</t>
-
-<t>
-<list style="empty">
-<t>Author: Jean-Marc Valin <jean-marc.valin@octasic.com></t>
-<t>Change controller: Jean-Marc Valin <jean-marc.valin@octasic.com></t>
-<t>Change controller: IETF AVT Working Group</t>
-</list>
-</t>
-
-<t>
-This transport type signifies that the content is to be interpreted
-according to this document if the contents are transmitted over RTP.
-Should this transport type appear over a lossless streaming protocol
-such as TCP, the content encapsulation should be interpreted as an
-Ogg Stream in accordance with <xref target="rfc3534"></xref>, with the exception that the
-content of the Ogg Stream may be assumed to be CELT audio and
-CELT audio only.
-</t>
-
-</section>
-
-<section anchor="SDP usage of CELT" title="SDP usage of CELT">
-
-<t>
-When conveying information by SDP <xref target="rfc4566"></xref>, the encoding name MUST be
-set to "CELT". The sampling frequency is typically between 32000 and 48000 Hz.
-Implementations MUST support 48000 Hz and SHOULD also support 44100 Hz.
-</t>
-
-<t>
-The SDP parameters have the following interpretation with respect to CELT:
-</t>
-
-<t>
-<list style="empty">
-<t>ptime: The desired packetization time. The sender SHOULD choose a number of frames per packet that corresponds to the smallest packetization time greater or equal to the specified ptime for the selected frame size. The default is 20 ms as specified in <xref target="rfc3551"></xref></t>
-
-<t>maxptime: The maximum packetization time desired. As specified in <xref target="rfc4566"></xref>, if the maximum is lower than the smallest packetization time determined from the chosen frame size (as described above), then that packtization time SHOULD be used despite the maxptime value. The default is "no maximum".</t>
-
-</list>
-</t>
-
-<t>
-CELT-specific parameters can be given via the "a=fmtp:" directive.
-Several parameters can be given in a single a=fmtp line provided
-that they are separated by a semi-colon. The following parameters
-are defined for use in this way:
-</t>
-
-<t>
-<list style="empty">
-<t>bitrate: The desired bit-rate in kbit/s for the codec only (excluding
-headers and the length bytes). The value MUST be rounded to an integer number
-of bytes per frame. The round-to-nearest method is RECOMMENDED. The default
-bit-rate value is 64 kbit/s per channel.</t>
-
-<t>frame-size: The frame size is the duration of each frame in samples and has to be even.
-The default is 480.</t>
-
-<t>mapping: Optional string describing the multi-channel mapping.</t>
-</list>
-</t>
-
-<t>
-The selected frame-size values MUST be even. For quality and complexity
-reasons, they SHOULD also be divisible by 8 and have a prime factorization
-which consists only of 2, 3, or 5 factors.
-For example, powers-of-two and values such as 160, 320, 240, and 480 are
-recommended. Implementations MUST support receiving and sending the default
-value of 480. Implementations
-SHOULD also support frame sizes of 256 and 512 since these are the ones that lead
-to the lowest complexity. When frame sizes that are powers-of-two are supported,
-they SHOULD be listed first in the offer and chosen over non-powers-of-two in the
-answer.
-</t>
-
-<t>
-Care must be taken when setting the value of ptime: and bitrate: so that the
-RTP packet size does not exceed the path MTU.
-</t>
-
-<t>An example of the media representation in SDP for offering a single
-channel of CELT at 48000 samples per second might be:
-</t>
-
-<t>
-<vspace blankLines="1" />
-<list style="empty">
-<t>m=audio 8088 RTP/AVP 97</t>
-<t>a=rtpmap:97 CELT/48000/1</t>
-</list>
-</t>
-
-<t>
-Note that the RTP payload type code of 97 is defined in this media
-definition to be 'mapped' to the CELT codec at a 48 kHz sampling
-frequency using the 'a=rtpmap' line. Any number from 96 to 127
-could have been chosen (the allowed range for dynamic types). If there
-is more than one channel being encoded the rtpmap MUST specify the channel
-count. When no channel count is included, the default is one channel.
-</t>
-
-
-<t>The following example demonstrates the use of the a=fmtp: parameters:</t>
-
-<t>
-<vspace blankLines="1" />
-<list style="empty">
- <t>m=audio 8008 RTP/AVP 97</t>
- <t>a=ptime: 25</t>
- <t>a=rtpmap:97 CELT/44100</t>
- <t>a=fmtp:97 frame-size=512;bitrate=48</t>
-</list>
-</t>
-
-<t>
-This examples illustrate an offerer that wishes to receive a CELT stream at
-44100 Hz, by packing two 512-sample frames in each packet (less than 25 ms)
-at around 48 kbps (70 bytes per frame).
-</t>
-
-<section anchor="Multichannel Mapping" title="Multichannel Mapping">
-<t>
-When more than two channels are used, a mapping parameter MUST be provided.
-The mapping parameter is defined as comma separated list of integers which specify the
-number of channels contained in each CELT stream, OPTIONALLY followed by a '/' and a
-comma separated list of channel identifiers, then OPTIONALLY another '/' and a string
-which provides an application specific elaboration on any speaker-feed definitions.
-The channels per stream entries MUST be either 1 or 2. The total number of
-channels is indicated by the sum of the channels per stream entries. The sum
-of the channel counts MUST be equal to the total number of channels.
-</t>
-
-<t>
-Channel identifiers are short alphanumeric strings.
-Each identifier MUST begin with a letter indicating the type of channel. 'A' MUST be
-used to indicate an ambisonic channel, 'S' to indicate a speaker-feed channel, or 'O'
-indicating other usage.
-</t>
-
-<t>
-A channel identifier MAY be repeated, but the meaning of such repetition is application specific.
-Applications SHOULD attempt to utilize channel identifiers such that mixing all identical identifiers
-would produce a reasonable result.
-</t>
-
-<t>
-Non-surround usage such as individual performer tracks, effect send, "order wire", or
-other administrative channels may be given application specific identifiers
-which MUST not conflict with the identifiers defined in this draft. These
-identifiers SHOULD begin with S if it would be sensible to include them in a
-mono-downmix, or O if it would be most sensible to exclude them from a
-mono-downmix.
-An example usage might be
-mapping=2,1,2,1,1/SLguitar,SRguitar,OheadsetG,SLkeyboard,SRkeyboard,OheadsetK,SMbass,OheadsetB"
-</t>
-
-<t>
-Ambisonic channels MUST follow the Furse-Malham naming and weighing
-conventions for up to third order spherical<xref target="Ambisonic"></xref>.
-Higher order ambisonic support is application defined but MUST NOT reuse any of WXYZRSTUVKLMNOPQ
-for higher order components. For example, second order spherical ambisonics SHOULD use the
-mapping "mapping=1,1,1,1,1,1,1,1,1/AW,AX,AY,AZ,AR,AS,AT,AU,AV". Any set of Ambisonic channels
-MUST contain at least one "AW" channel.
-</t>
-
-<t>
-Speaker-feed identifiers are named based on the intended speaker locations. "L", "R" for the left and
-right speakers, respectively, in conventional stereo or the front left and right in 4, 5,
-5.1, or 7.1 channel surround. "LR", "RR" for the left and right rear speakers in 4,5 or 5.1 channel surround. C" is used for a center channel, "MLFE" for a low frequency extension channel. "LS", "RS" for the side
-channels in 7.1 channel surround. Additional speaker-feeds are application specific but should not
-reuse the prior identifiers.
-For 5.1 surround in non-ambisonic form the mapping SHOULD be "mapping=2,2,1,1/L,R,LR,RR,C,MLFE/ITU-RBS.775-1".
-When only one or two channels are used, the mapping parameter MAY be omitted, in which case the
-default mapping is used. For one channel, the default is "mapping=1/C", while for two channels,
-the default is "mapping=2/L,R".
-</t>
-
-<t>
-For example a stereo configuration might signal:
-<vspace blankLines="1" />
-<list style="empty">
-<t>m=audio 8008 RTP/AVP 97</t>
-<t>a=ptime: 5</t>
-<t>a=rtpmap:97 CELT/44100/2</t>
-<t>a=fmtp:97 frame-size=256</t>
-</list>
-Which specifies a single two-channel CELT stream according to the default
-mapping.
-</t>
-
-</section>
-
-<section anchor="low-overhead" title="Low-Overhead Mode">
-
-<t>A low-overhead mode is defined to make more efficient use of bandwidth
-when transmitting CELT frames. In that mode none of the length values need to be transmitted.
-One the a=fmtp: parameter low-overhead:
-is defined and contains a single frame size, followed by a '/', followed by a comma-separated
-list of the number of bytes per frame for each stream defined in the channel mapping. The number of frames per channel can thus be computed as the payload size divided by the sum of the bytes-per-frame values.
-The frame-size: parameter MUST not be specified and SHOULD be ignored if encountered
-in an SDP offer or answer. The bitrate: parameter MUST also be
-ignored since the low-overhead: parameter makes it redundant. When the low-overhead:
-parameter is specified, the length of each frame MUST NOT be encoded in the payload and
-the bit-rate MUST NOT be changed during the session.
-</t>
-
-<t>
-For example a low-overhead 64 kbit/s mono stream could be signaled as:
-<list style="empty">
-<t>m=audio 8008 RTP/AVP 97</t>
-<t>a=ptime: 5</t>
-<t>a=rtpmap:97 CELT/48000/1</t>
-<t>a=fmtp:97 low-overhead=256/43</t>
-</list>
-
-and a low-overhead 360 kbit/s 5.1 surround configuration could be signaled as:
-<list style="empty">
-<t>m=audio 8008 RTP/AVP 97</t>
-<t>a=ptime: 5</t>
-<t>a=rtpmap:97 CELT/48000/6</t>
-<t>a=fmtp:97 low-overhead=256/86,86,43,25;mapping=2,2,1,1/L,R,LR,RR,C,MLFE/ITU-RBS.775-1</t>
-</list>
-
-In this last example, 4 bytes per packet would be saved. This corresponds to a 6 kbit/s
-reduction in the overhead, although the 60 kbit/s overhead of the IP, UDP and RTP
-headers is still present.
-</t>
-
-</section>
-
-</section>
-
-<section anchor="Congestion Control" title="Congestion Control">
-
-<t>
-CELT allows any bitrate, with a one byte per frame
-resolution, without any signaling requirement or overhead.
-Applications SHOULD utilize congestion control to regulate the transmitted bitrate.
-In some applications it may make sense to increase the packetization
-interval rather than decreasing the codec bitrate. Congestion control
-implementations should consider the users differential tolerance for high
-latency and low quality.
-</t>
-</section>
-
-<section anchor="Security Considerations" title="Security Considerations">
-
-<t>
-RTP packets using the payload format defined in this specification
-are subject to the security considerations discussed in the RTP
-specification <xref target="rfc3550"></xref>, and in any applicable RTP profile. The
-main security considerations for the RTP packet carrying the RTP
-payload format defined within this memo are confidentiality,
-integrity and source authenticity. Confidentiality is achieved by
-encryption of the RTP payload. Integrity of the RTP packets through
-suitable cryptographic integrity protection mechanism. Cryptographic
-system may also allow the authentication of the source of the
-payload. A suitable security mechanism for this RTP payload format
-should provide confidentiality, integrity protection and at least
-source authentication capable of determining if an RTP packet is from
-a member of the RTP session or not.
-</t>
-
-<t>
-Note that the appropriate mechanism to provide security to RTP and
-payloads following this memo may vary. It is dependent on the
-application, the transport, and the signalling protocol employed.
-Therefore a single mechanism is not sufficient, although if suitable
-the usage of SRTP <xref target="rfc3711"></xref> is recommended. Other mechanism that may
-be used are IPsec <xref target="rfc4301"></xref> and TLS <xref target="rfc5246"></xref> (RTP over TCP), but also other alternatives may exist.
-</t>
-
-<t>
-This RTP payload format and its media decoder do not exhibit any
-significant non-uniformity in the receiver-side computational
-complexity for packet processing, and thus are unlikely to pose a
-denial-of-service threat due to the receipt of pathological data.
-Nor does the RTP payload format contain any active content.
-</t>
-
-<t>
-Because this format supports VBR operation small amounts of information
-about the transmitted audio may be leaked by a length preserving
-cryptographic transport. Accordingly, when CELT is used inside a secure
-transport the sender SHOULD restrict the use of VBR to congestion control purposes.
-</t>
-
-<t>
-CELT implementations will typically exhibit tiny content-sensitive encoding
-time variances. Since transmission is usually triggered by an accurate
-hardware clock and the encoded data is typically transmitted as soon as
-encoding is complete this variance may result in a small amount of
-additional frame to frame jitter which could be measured by a third-party.
-Encrypted implementations SHOULD transmit packets at fixed intervals to
-avoid the possible information leak.
-</t>
-
-</section>
-
-<section anchor="Acknowledgments" title="Acknowledgments">
-
-<t>
-The authors would also like to thank the following people for their input:
-Timothy B. Terriberry, Ben Schwartz, Alexander Carot, Thorvald Natvig,
-Brian West, Steve Underwood, and Anthony Minessale.
-
-</t>
-</section>
-
-</middle>
-
-<back>
-
-<references title="Normative References">
-
-<reference anchor="rfc2119">
-<front>
-<title>Key words for use in RFCs to Indicate Requirement Levels </title>
-<author initials="S." surname="Bradner" fullname="Scott Bradner"><organization/></author>
-</front>
-<seriesInfo name="RFC" value="2119" />
-</reference>
-
-<reference anchor="rfc3550">
-<front>
-<title>RTP: A Transport Protocol for real-time applications</title>
-<author initials="H." surname="Schulzrinne" fullname=""><organization/></author>
-<author initials="S." surname="Casner" fullname=""><organization/></author>
-<author initials="R." surname="Frederick" fullname=""><organization/></author>
-<author initials="V." surname="Jacobson" fullname=""><organization/></author>
-</front>
-<seriesInfo name="RFC" value="3550" />
-</reference>
-
-<reference anchor="rfc2045">
-<front>
-<title>Multipurpose Internet Mail Extensions (MIME) Part One: Format of Internet Message Bodies</title>
-<author initials="" surname="" fullname=""><organization/></author>
-<date month="November" year="1998" />
-</front>
-<seriesInfo name="RFC" value="2045" />
-</reference>
-
-<reference anchor="rfc4566">
-<front>
-<title>SDP: Session Description Protocol</title>
-<author initials="M." surname="Handley" fullname=""><organization/></author>
-<author initials="V." surname="Jacobson" fullname=""><organization/></author>
-<author initials="C." surname="Perkins" fullname=""><organization/></author>
-<date month="July" year="2006" />
-</front>
-<seriesInfo name="RFC" value="4566" />
-</reference>
-
-<reference anchor="rfc3551">
-<front>
-<title>RTP Profile for Audio and Video Conferences with Minimal Control.</title>
-<author initials="H." surname="Schulzrinne" fullname=""><organization/></author>
-<author initials="S." surname="Casner" fullname=""><organization/></author>
-<date month="July" year="2003" />
-</front>
-<seriesInfo name="RFC" value="3551" />
-</reference>
-
-<reference anchor="rfc3534">
-<front>
-<title>The application/ogg Media Type</title>
-<author initials="L." surname="Walleij" fullname=""><organization/></author>
-<date month="May" year="2003" />
-</front>
-<seriesInfo name="RFC" value="3534" />
-</reference>
-
-<reference anchor="rfc3711">
-<front>
-<title>The Secure Real-time Transport Protocol (SRTP)</title>
-<author initials="M." surname="Baugher" fullname=""><organization/></author>
-<author initials="D." surname="McGrew" fullname=""><organization/></author>
-<author initials="M." surname="Naslund" fullname=""><organization/></author>
-<author initials="E." surname="Carrara" fullname=""><organization/></author>
-<author initials="K." surname="Norrman" fullname=""><organization/></author>
-<date month="March" year="2004" />
-</front>
-<seriesInfo name="RFC" value="3711" />
-</reference>
-
-<reference anchor="rfc4301">
-<front>
-<title>Security Architecture for the Internet Protocol</title>
-<author initials="S." surname="Kent" fullname=""><organization/></author>
-<author initials="K." surname="Seo" fullname=""><organization/></author>
-<date month="December" year="2005" />
-</front>
-<seriesInfo name="RFC" value="4301" />
-</reference>
-
-<reference anchor="rfc5246">
-<front>
-<title>The Transport Layer Security (TLS) Protocol Version 1.2</title>
-<author initials="T." surname="Dierks" fullname=""><organization/></author>
-<author initials="E." surname="Rescorla" fullname=""><organization/></author>
-<date month="August" year="2008" />
-</front>
-<seriesInfo name="RFC" value="5246" />
-</reference>
-
-
-</references>
-
-<references title="Informative References">
-
-<reference anchor="celt-website">
-<front>
-<title>The CELT ultra-low delay audio codec</title>
-<author initials="" surname="Xiph.Org Foundation" fullname="Xiph.Org Foundation"><organization/></author>
-</front>
-<seriesInfo name="CELT website" value="http://www.celt-codec.org/" />
-</reference>
-
-<reference anchor="Ambisonic">
-<front>
-<title>Higher order Ambisonic systems</title>
-<author initials="D." surname="Malham" fullname="Dave
-Malham"><organization/></author>
-<date month="December" year="2003" />
-</front>
-<seriesInfo name="Paper"
-value="http://www.york.ac.uk/inst/mustech/3d_audio/higher_order_ambisonics.pdf" />
-</reference>
-
-</references>
-
-</back>
-</rfc>
--- a/doc/ietf/ietf_source.sh
+++ /dev/null
@@ -1,18 +1,0 @@
-#!/bin/sh
-
-mkdir -p xml_source
-
-for i in `ls source/ | grep '\.[ch]$'` Makefile
-do
-
-echo "<section anchor=\"$i\" title=\"$i\">" > xml_source/$i
-echo '<t>' >> xml_source/$i
-echo '<figure><artwork><![CDATA[' >> xml_source/$i
-
-cat source/$i >> xml_source/$i
-
-echo ']]></artwork></figure>' >> xml_source/$i
-echo '</t>' >> xml_source/$i
-echo '</section>' >> xml_source/$i
-
-done
\ No newline at end of file
--- a/doc/ietf/substitutions.h
+++ /dev/null
@@ -1,99 +1,0 @@
-#define IMUL32(a,b) ((a)*(b))
-#define UMUL32(a,b) ((a)*(b))
-#define UMUL16_16(a,b) ((a)*(b))
-
-#define celt_word16 float
-#define celt_word32 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))
-
-
-#define Q15ONE 1.0f
-#define Q30ONE 1.0f
-
-#define NORM_SCALING 1.f
-#define NORM_SCALING_1 1.f
-#define ENER_SCALING 1.f
-#define ENER_SCALING_1 1.f
-#define PGAIN_SCALING 1.f
-#define PGAIN_SCALING_1 1.f
-
-#define DB_SCALING 1.f
-#define DB_SCALING_1 1.f
-
-#define EPSILON 1e-15f
-#define VERY_SMALL 1e-15f
-#define VERY_LARGE32 1e15f
-#define VERY_LARGE16 1e15f
-#define Q15_ONE 1.f
-#define Q15_ONE_1 1.f
-
-#define QCONST16(x,bits) (x)
-#define QCONST32(x,bits) (x)
-
-#define NEG16(x) (-(x))
-#define NEG32(x) (-(x))
-#define EXTRACT16(x) (x)
-#define EXTEND32(x) (x)
-#define SHR16(a,shift) (a)
-#define SHL16(a,shift) (a)
-#define SHR32(a,shift) (a)
-#define SHL32(a,shift) (a)
-#define PSHR16(a,shift) (a)
-#define PSHR32(a,shift) (a)
-#define VSHR32(a,shift) (a)
-#define SATURATE16(x,a) (x)
-#define SATURATE32(x,a) (x)
-
-#define PSHR(a,shift) (a)
-#define SHR(a,shift) (a)
-#define SHL(a,shift) (a)
-#define SATURATE(x,a) (x)
-
-#define ROUND16(a,shift) (a)
-#define HALF32(x) (.5f*(x))
-
-#define ADD16(a,b) ((a)+(b))
-#define SUB16(a,b) ((a)-(b))
-#define ADD32(a,b) ((a)+(b))
-#define SUB32(a,b) ((a)-(b))
-#define MULT16_16_16(a,b) ((a)*(b))
-#define MULT16_16(a,b) ((a)*(b))
-#define MAC16_16(c,a,b) ((c)+(a)*(b))
-
-#define MULT16_32_Q11(a,b) ((a)*(b))
-#define MULT16_32_Q13(a,b) ((a)*(b))
-#define MULT16_32_Q14(a,b) ((a)*(b))
-#define MULT16_32_Q15(a,b) ((a)*(b))
-#define MULT16_32_Q16(a,b) ((a)*(b))
-#define MULT16_32_P15(a,b) ((a)*(b))
-
-#define MULT32_32_Q31(a,b) ((a)*(b))
-
-#define MAC16_32_Q11(c,a,b) ((c)+(a)*(b))
-#define MAC16_32_Q15(c,a,b) ((c)+(a)*(b))
-
-#define MAC16_16_Q11(c,a,b) ((c)+(a)*(b))
-#define MAC16_16_Q13(c,a,b) ((c)+(a)*(b))
-#define MAC16_16_P13(c,a,b) ((c)+(a)*(b))
-#define MULT16_16_Q11_32(a,b) ((a)*(b))
-#define MULT16_16_Q13(a,b) ((a)*(b))
-#define MULT16_16_Q14(a,b) ((a)*(b))
-#define MULT16_16_Q15(a,b) ((a)*(b))
-#define MULT16_16_P15(a,b) ((a)*(b))
-#define MULT16_16_P13(a,b) ((a)*(b))
-#define MULT16_16_P14(a,b) ((a)*(b))
-
-#define DIV32_16(a,b) ((a)/(b))
-#define PDIV32_16(a,b) ((a)/(b))
-#define DIV32(a,b) ((a)/(b))
-#define PDIV32(a,b) ((a)/(b))
-
-#define PRINT_MIPS(x)
--- a/doc/ietf/wrap_lines.c
+++ /dev/null
@@ -1,34 +1,0 @@
-#include <string.h>
-#include <stdio.h>
-
-int main()
-{- int comment = 0;
- int col = 0;
- char c0, c1;
- c0 = getchar();
- while (!feof(stdin))
- {- c1 = getchar();
- if (c1==9)
- c1 = 32;
- if (col < 71 || c0 == 10) {- putchar(c0);
- } else {- if (c1 == 10 || c1 == 13)
- {- putchar(c0);
- } else {- putchar ('\\');- /*printf ("%d %d %d", col, c0, c1);*/- putchar (10);
- putchar (c0);
- col=0;
- }
- }
- col++;
- if (c0 == 10)
- col=0;
- c0 = c1;
- }
-}
\ No newline at end of file
--- a/libcelt.spec.in
+++ /dev/null
@@ -1,84 +1,0 @@
-Summary: The CELT Low-Latency Audio Compression Codec.
-Name: libcelt
-Version: @CELT_VERSION@
-Release: 0%{?dist}-Epoch: 0
-Group: System Environment/Libraries
-License: BSD
-URL: http://www.xiph.org/
-Source: http://downloads.xiph.org/releases/celt/celt-%{version}.tar.gz-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libogg-devel >= 2:1.1
-Requires: pkg-config
-
-%description
-CELT is a fully open, non-proprietary, patent- and royalty-free,
-low-latency compressed audio format for voice and music.
-
-The libcelt package contains runtime libraries for use in programs
-that support Ogg CELT.
-
-%package devel
-Summary: Files for CELT application development.
-Group: Development/Libraries
-Requires: libogg-devel >= 2:1.1
-Requires: libcelt = %{epoch}:%{version}-%{release}-
-%description devel
-The libcelt-devel package contains the header files and documentation
-needed to develop applications with Ogg CELT.
-
-%package utils
-Summary: CELT codec utilities.
-Group: Applications/Multimedia
-Requires: libcelt = %{epoch}:%{version}-%{release}-
-%description utils
-Basic utilities for encoding, decoding and manipulating Ogg CELT streams.
-
-%prep
-
-%setup -q -n celt-%{version}-
-%build
-%configure --with-ogg-libraries=%{_libdir}-make
-
-%check
-make check
-
-%install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
-
-# remove unpackaged files from the buildroot
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la-rm -f $RPM_BUILD_ROOT%{_libdir}/*.a-
-
-%files
-%defattr(-,root,root)
-%doc AUTHORS COPYING README
-%{_libdir}/libcelt.so.*-
-%files devel
-%defattr(-,root,root)
-%{_includedir}/celt-%{_libdir}/libcelt.so-%{_libdir}/pkgconfig/*.pc-
-%files utils
-%defattr(-,root,root)
-%{_bindir}/celtenc-%{_bindir}/celtdec-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-%changelog
-* Mon Dec 22 2008 Monty Montgomery <monty@xiph.org> 0.5.1-0
-- initial spec file created
--- /dev/null
+++ b/libcelt/tests/Makefile.am
@@ -1,0 +1,17 @@
+INCLUDES = -I$(top_srcdir)/libcelt
+METASOURCES = AUTO
+
+TESTS = type-test ectest cwrs32-test dft-test laplace-test mdct-test mathops-test tandem-test
+
+noinst_PROGRAMS = type-test ectest cwrs32-test dft-test laplace-test mdct-test mathops-test tandem-test
+
+type_test_SOURCES = type-test.c
+ectest_SOURCES = ectest.c
+cwrs32_test_SOURCES = cwrs32-test.c
+dft_test_SOURCES = dft-test.c
+laplace_test_SOURCES = laplace-test.c
+mdct_test_SOURCES = mdct-test.c
+#rotation_test_SOURCES = rotation-test.c
+mathops_test_SOURCES = mathops-test.c
+tandem_test_SOURCES = tandem-test.c
+tandem_test_LDADD = $(top_builddir)/libcelt/libcelt@LIBCELT_SUFFIX@.la
--- /dev/null
+++ b/libcelt/tests/cwrs32-test.c
@@ -1,0 +1,176 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdio.h>
+#include <string.h>
+
+#define CELT_C
+#include "../libcelt/stack_alloc.h"
+#include "../libcelt/entenc.c"
+#include "../libcelt/entdec.c"
+#include "../libcelt/entcode.c"
+#include "../libcelt/cwrs.c"
+#include "../libcelt/mathops.c"
+
+#define NMAX (14)
+#define KMAX (32767)
+
+static const int kmax[15]={+ 32767,32767,32767,32767, 1172,
+ 238, 95, 53, 36, 27,
+ 22, 18, 16, 15, 13
+};
+
+
+int main(int _argc,char **_argv){+ int n;
+ ALLOC_STACK;
+ for(n=2;n<=NMAX;n++){+ int dk;
+ int k;
+ dk=kmax[n]>7?kmax[n]/7:1;
+ k=1-dk;
+ do{+ celt_uint32 uu[KMAX+2U];
+ celt_uint32 inc;
+ celt_uint32 nc;
+ celt_uint32 i;
+ k=kmax[n]-dk<k?kmax[n]:k+dk;
+ printf("Testing CWRS with N=%i, K=%i...\n",n,k);+ nc=ncwrs_urow(n,k,uu);
+ inc=nc/10000;
+ if(inc<1)inc=1;
+ for(i=0;i<nc;i+=inc){+ celt_uint32 u[KMAX+2U];
+ int y[NMAX];
+ int yy[5];
+ celt_uint32 v;
+ celt_uint32 ii;
+ int kk;
+ int j;
+ memcpy(u,uu,(k+2U)*sizeof(*u));
+ cwrsi(n,k,i,y,u);
+ /*printf("%6u of %u:",i,nc);+ for(j=0;j<n;j++)printf(" %+3i",y[j]);+ printf(" ->");*/+ ii=icwrs(n,k,&v,y,u);
+ if(ii!=i){+ fprintf(stderr,"Combination-index mismatch (%lu!=%lu).\n",
+ (long)ii,(long)i);
+ return 1;
+ }
+ if(v!=nc){+ fprintf(stderr,"Combination count mismatch (%lu!=%lu).\n",
+ (long)v,(long)nc);
+ return 2;
+ }
+#ifndef SMALL_FOOTPRINT
+ if(n==2){+ cwrsi2(k,i,yy);
+ for(j=0;j<2;j++)if(yy[j]!=y[j]){+ fprintf(stderr,"N=2 pulse vector mismatch ({%i,%i}!={%i,%i}).\n",+ yy[0],yy[1],y[0],y[1]);
+ return 3;
+ }
+ ii=icwrs2(yy,&kk);
+ if(ii!=i){+ fprintf(stderr,"N=2 combination-index mismatch (%lu!=%lu).\n",
+ (long)ii,(long)i);
+ return 4;
+ }
+ if(kk!=k){+ fprintf(stderr,"N=2 pulse count mismatch (%i,%i).\n",kk,k);
+ return 5;
+ }
+ v=ncwrs2(k);
+ if(v!=nc){+ fprintf(stderr,"N=2 combination count mismatch (%lu,%lu).\n",
+ (long)v,(long)nc);
+ return 6;
+ }
+ }
+ else if(n==3){+ cwrsi3(k,i,yy);
+ for(j=0;j<3;j++)if(yy[j]!=y[j]){+ fprintf(stderr,"N=3 pulse vector mismatch "
+ "({%i,%i,%i}!={%i,%i,%i}).\n",yy[0],yy[1],yy[2],y[0],y[1],y[2]);+ return 7;
+ }
+ ii=icwrs3(yy,&kk);
+ if(ii!=i){+ fprintf(stderr,"N=3 combination-index mismatch (%lu!=%lu).\n",
+ (long)ii,(long)i);
+ return 8;
+ }
+ if(kk!=k){+ fprintf(stderr,"N=3 pulse count mismatch (%i!=%i).\n",kk,k);
+ return 9;
+ }
+ v=ncwrs3(k);
+ if(v!=nc){+ fprintf(stderr,"N=3 combination count mismatch (%lu!=%lu).\n",
+ (long)v,(long)nc);
+ return 10;
+ }
+ }
+ else if(n==4){+ cwrsi4(k,i,yy);
+ for(j=0;j<4;j++)if(yy[j]!=y[j]){+ fprintf(stderr,"N=4 pulse vector mismatch "
+ "({%i,%i,%i,%i}!={%i,%i,%i,%i}.\n",+ yy[0],yy[1],yy[2],yy[3],y[0],y[1],y[2],y[3]);
+ return 11;
+ }
+ ii=icwrs4(yy,&kk);
+ if(ii!=i){+ fprintf(stderr,"N=4 combination-index mismatch (%lu!=%lu).\n",
+ (long)ii,(long)i);
+ return 12;
+ }
+ if(kk!=k){+ fprintf(stderr,"N=4 pulse count mismatch (%i!=%i).\n",kk,k);
+ return 13;
+ }
+ v=ncwrs4(k);
+ if(v!=nc){+ fprintf(stderr,"N=4 combination count mismatch (%lu!=%lu).\n",
+ (long)v,(long)nc);
+ return 14;
+ }
+ }
+ else if(n==5){+ cwrsi5(k,i,yy);
+ for(j=0;j<5;j++)if(yy[j]!=y[j]){+ fprintf(stderr,"N=5 pulse vector mismatch "
+ "({%i,%i,%i,%i,%i}!={%i,%i,%i,%i,%i}).\n",+ yy[0],yy[1],yy[2],yy[3],yy[4],y[0],y[1],y[2],y[3],y[4]);
+ return 15;
+ }
+ ii=icwrs5(yy,&kk);
+ if(ii!=i){+ fprintf(stderr,"N=5 combination-index mismatch (%lu!=%lu).\n",
+ (long)ii,(long)i);
+ return 16;
+ }
+ if(kk!=k){+ fprintf(stderr,"N=5 pulse count mismatch (%i!=%i).\n",kk,k);
+ return 17;
+ }
+ v=ncwrs5(k);
+ if(v!=nc){+ fprintf(stderr,"N=5 combination count mismatch (%lu!=%lu).\n",
+ (long)v,(long)nc);
+ return 18;
+ }
+ }
+#endif /* SMALL_FOOTPRINT */
+
+ /*printf(" %6u\n",i);*/+ }
+ /*printf("\n");*/+ }
+ while(k<kmax[n]);
+ }
+ return 0;
+}
--- /dev/null
+++ b/libcelt/tests/dft-test.c
@@ -1,0 +1,142 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#define SKIP_CONFIG_H
+
+#ifndef CUSTOM_MODES
+#define CUSTOM_MODES
+#endif
+
+#include <stdio.h>
+#include "kiss_fft.h"
+
+#define CELT_C
+#include "../libcelt/stack_alloc.h"
+#include "../libcelt/kiss_fft.c"
+#include "../libcelt/mathops.c"
+#include "../libcelt/entcode.c"
+
+
+#ifndef M_PI
+#define M_PI 3.141592653
+#endif
+
+#ifdef FIXED_DEBUG
+long long celt_mips=0;
+#endif
+int ret = 0;
+
+void check(kiss_fft_cpx * in,kiss_fft_cpx * out,int nfft,int isinverse)
+{+ int bin,k;
+ double errpow=0,sigpow=0, snr;
+
+ for (bin=0;bin<nfft;++bin) {+ double ansr = 0;
+ double ansi = 0;
+ double difr;
+ double difi;
+
+ for (k=0;k<nfft;++k) {+ double phase = -2*M_PI*bin*k/nfft;
+ double re = cos(phase);
+ double im = sin(phase);
+ if (isinverse)
+ im = -im;
+
+ if (!isinverse)
+ {+ re /= nfft;
+ im /= nfft;
+ }
+
+ ansr += in[k].r * re - in[k].i * im;
+ ansi += in[k].r * im + in[k].i * re;
+ }
+ /*printf ("%d %d ", (int)ansr, (int)ansi);*/+ difr = ansr - out[bin].r;
+ difi = ansi - out[bin].i;
+ errpow += difr*difr + difi*difi;
+ sigpow += ansr*ansr+ansi*ansi;
+ }
+ snr = 10*log10(sigpow/errpow);
+ printf("nfft=%d inverse=%d,snr = %f\n",nfft,isinverse,snr );+ if (snr<60) {+ printf( "** poor snr: %f ** \n", snr);
+ ret = 1;
+ }
+}
+
+void test1d(int nfft,int isinverse)
+{+ size_t buflen = sizeof(kiss_fft_cpx)*nfft;
+
+ kiss_fft_cpx * in = (kiss_fft_cpx*)malloc(buflen);
+ kiss_fft_cpx * out= (kiss_fft_cpx*)malloc(buflen);
+ kiss_fft_state *cfg = kiss_fft_alloc(nfft,0,0);
+ int k;
+
+ for (k=0;k<nfft;++k) {+ in[k].r = (rand() % 32767) - 16384;
+ in[k].i = (rand() % 32767) - 16384;
+ }
+
+#ifdef DOUBLE_PRECISION
+ for (k=0;k<nfft;++k) {+ in[k].r *= 32768;
+ in[k].i *= 32768;
+ }
+#endif
+
+ if (isinverse)
+ {+ for (k=0;k<nfft;++k) {+ in[k].r /= nfft;
+ in[k].i /= nfft;
+ }
+ }
+
+ /*for (k=0;k<nfft;++k) printf("%d %d ", in[k].r, in[k].i);printf("\n");*/+
+ if (isinverse)
+ kiss_ifft(cfg,in,out);
+ else
+ kiss_fft(cfg,in,out);
+
+ /*for (k=0;k<nfft;++k) printf("%d %d ", out[k].r, out[k].i);printf("\n");*/+
+ check(in,out,nfft,isinverse);
+
+ free(in);
+ free(out);
+ free(cfg);
+}
+
+int main(int argc,char ** argv)
+{+ ALLOC_STACK;
+ if (argc>1) {+ int k;
+ for (k=1;k<argc;++k) {+ test1d(atoi(argv[k]),0);
+ test1d(atoi(argv[k]),1);
+ }
+ }else{+ test1d(32,0);
+ test1d(32,1);
+ test1d(128,0);
+ test1d(128,1);
+ test1d(256,0);
+ test1d(256,1);
+#ifndef RADIX_TWO_ONLY
+ test1d(36,0);
+ test1d(36,1);
+ test1d(50,0);
+ test1d(50,1);
+ test1d(120,0);
+ test1d(120,1);
+#endif
+ }
+ return ret;
+}
--- /dev/null
+++ b/libcelt/tests/ectest.c
@@ -1,0 +1,265 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <math.h>
+#include <time.h>
+#include "entcode.h"
+#include "entenc.h"
+#include "entdec.h"
+#include <string.h>
+
+#include "../libcelt/entenc.c"
+#include "../libcelt/entdec.c"
+#include "../libcelt/entcode.c"
+
+#ifndef M_LOG2E
+# define M_LOG2E 1.4426950408889634074
+#endif
+#define DATA_SIZE 10000000
+#define DATA_SIZE2 10000
+
+int main(int _argc,char **_argv){+ ec_enc enc;
+ ec_dec dec;
+ long nbits;
+ long nbits2;
+ double entropy;
+ int ft;
+ int ftb;
+ int sym;
+ int sz;
+ int i;
+ int ret;
+ unsigned int seed;
+ unsigned char *ptr;
+ ret=0;
+ entropy=0;
+ if (_argc > 2) {+ fprintf(stderr, "Usage: %s [<seed>]\n", _argv[0]);
+ return 1;
+ }
+ if (_argc > 1)
+ seed = atoi(_argv[1]);
+ else
+ seed = time(NULL);
+ /*Testing encoding of raw bit values.*/
+ ptr = malloc(DATA_SIZE);
+ ec_enc_init(&enc,ptr, DATA_SIZE);
+ for(ft=2;ft<1024;ft++){+ for(i=0;i<ft;i++){+ entropy+=log(ft)*M_LOG2E;
+ ec_enc_uint(&enc,i,ft);
+ }
+ }
+ /*Testing encoding of raw bit values.*/
+ for(ftb=0;ftb<16;ftb++){+ for(i=0;i<(1<<ftb);i++){+ entropy+=ftb;
+ nbits=ec_tell(&enc);
+ ec_enc_bits(&enc,i,ftb);
+ nbits2=ec_tell(&enc);
+ if(nbits2-nbits!=ftb){+ fprintf(stderr,"Used %li bits to encode %i bits directly.\n",
+ nbits2-nbits,ftb);
+ ret=-1;
+ }
+ }
+ }
+ nbits=ec_tell_frac(&enc);
+ ec_enc_done(&enc);
+ fprintf(stderr,
+ "Encoded %0.2lf bits of entropy to %0.2lf bits (%0.3lf%% wasted).\n",
+ entropy,ldexp(nbits,-3),100*(nbits-ldexp(entropy,3))/nbits);
+ fprintf(stderr,"Packed to %li bytes.\n",(long)ec_range_bytes(&enc));
+ ec_dec_init(&dec,ptr,DATA_SIZE);
+ for(ft=2;ft<1024;ft++){+ for(i=0;i<ft;i++){+ sym=ec_dec_uint(&dec,ft);
+ if(sym!=i){+ fprintf(stderr,"Decoded %i instead of %i with ft of %i.\n",sym,i,ft);
+ ret=-1;
+ }
+ }
+ }
+ for(ftb=0;ftb<16;ftb++){+ for(i=0;i<(1<<ftb);i++){+ sym=ec_dec_bits(&dec,ftb);
+ if(sym!=i){+ fprintf(stderr,"Decoded %i instead of %i with ftb of %i.\n",sym,i,ftb);
+ ret=-1;
+ }
+ }
+ }
+ nbits2=ec_tell_frac(&dec);
+ if(nbits!=nbits2){+ fprintf(stderr,
+ "Reported number of bits used was %0.2lf, should be %0.2lf.\n",
+ ldexp(nbits2,-3),ldexp(nbits,-3));
+ ret=-1;
+ }
+ srand(seed);
+ fprintf(stderr,"Testing random streams... Random seed: %u (%.4X)\n", seed, rand() % 65536);
+ for(i=0;i<409600;i++){+ unsigned *data;
+ unsigned *tell;
+ int j;
+ int tell_bits;
+ int zeros;
+ ft=rand()/((RAND_MAX>>(rand()%11))+1)+10;
+ sz=rand()/((RAND_MAX>>(rand()%9))+1);
+ data=(unsigned *)malloc(sz*sizeof(*data));
+ tell=(unsigned *)malloc((sz+1)*sizeof(*tell));
+ ec_enc_init(&enc,ptr,DATA_SIZE2);
+ zeros = rand()%13==0;
+ tell[0]=ec_tell_frac(&enc);
+ for(j=0;j<sz;j++){+ if (zeros)
+ data[j]=0;
+ else
+ data[j]=rand()%ft;
+ ec_enc_uint(&enc,data[j],ft);
+ tell[j+1]=ec_tell_frac(&enc);
+ }
+ if (rand()%2==0)
+ while(ec_tell(&enc)%8 != 0)
+ ec_enc_uint(&enc, rand()%2, 2);
+ tell_bits = ec_tell(&enc);
+ ec_enc_done(&enc);
+ if(tell_bits!=ec_tell(&enc)){+ fprintf(stderr,"ec_tell() changed after ec_enc_done(): %i instead of %i (Random seed: %u)\n",
+ ec_tell(&enc),tell_bits,seed);
+ ret=-1;
+ }
+ if ((tell_bits+7)/8 < ec_range_bytes(&enc))
+ {+ fprintf (stderr, "ec_tell() lied, there's %i bytes instead of %d (Random seed: %u)\n",
+ ec_range_bytes(&enc), (tell_bits+7)/8,seed);
+ ret=-1;
+ }
+ tell_bits -= 8*ec_range_bytes(&enc);
+ ec_dec_init(&dec,ptr,DATA_SIZE2);
+ if(ec_tell_frac(&dec)!=tell[0]){+ fprintf(stderr,
+ "Tell mismatch between encoder and decoder at symbol %i: %i instead of %i (Random seed: %u).\n",
+ 0,ec_tell_frac(&dec),tell[0],seed);
+ }
+ for(j=0;j<sz;j++){+ sym=ec_dec_uint(&dec,ft);
+ if(sym!=data[j]){+ fprintf(stderr,
+ "Decoded %i instead of %i with ft of %i at position %i of %i (Random seed: %u).\n",
+ sym,data[j],ft,j,sz,seed);
+ ret=-1;
+ }
+ if(ec_tell_frac(&dec)!=tell[j+1]){+ fprintf(stderr,
+ "Tell mismatch between encoder and decoder at symbol %i: %i instead of %i (Random seed: %u).\n",
+ j+1,ec_tell_frac(&dec),tell[j+1],seed);
+ }
+ }
+ free(tell);
+ free(data);
+ }
+ /*Test compatibility between multiple different encode/decode routines.*/
+ for(i=0;i<409600;i++){+ unsigned *logp1;
+ unsigned *data;
+ unsigned *tell;
+ unsigned *enc_method;
+ int j;
+ sz=rand()/((RAND_MAX>>(rand()%9))+1);
+ logp1=(unsigned *)malloc(sz*sizeof(*logp1));
+ data=(unsigned *)malloc(sz*sizeof(*data));
+ tell=(unsigned *)malloc((sz+1)*sizeof(*tell));
+ enc_method=(unsigned *)malloc(sz*sizeof(*enc_method));
+ ec_enc_init(&enc,ptr,DATA_SIZE2);
+ tell[0]=ec_tell_frac(&enc);
+ for(j=0;j<sz;j++){+ data[j]=rand()/((RAND_MAX>>1)+1);
+ logp1[j]=(rand()%15)+1;
+ enc_method[j]=rand()/((RAND_MAX>>2)+1);
+ switch(enc_method[j]){+ case 0:{+ ec_encode(&enc,data[j]?(1<<logp1[j])-1:0,
+ (1<<logp1[j])-(data[j]?0:1),1<<logp1[j]);
+ }break;
+ case 1:{+ ec_encode_bin(&enc,data[j]?(1<<logp1[j])-1:0,
+ (1<<logp1[j])-(data[j]?0:1),logp1[j]);
+ }break;
+ case 2:{+ ec_enc_bit_logp(&enc,data[j],logp1[j]);
+ }break;
+ case 3:{+ unsigned char icdf[2];
+ icdf[0]=1;
+ icdf[1]=0;
+ ec_enc_icdf(&enc,data[j],icdf,logp1[j]);
+ }break;
+ }
+ tell[j+1]=ec_tell_frac(&enc);
+ }
+ ec_enc_done(&enc);
+ if((ec_tell(&enc)+7)/8<ec_range_bytes(&enc)){+ fprintf(stderr,"tell() lied, there's %i bytes instead of %d (Random seed: %u)\n",
+ ec_range_bytes(&enc),(ec_tell(&enc)+7)/8,seed);
+ ret=-1;
+ }
+ ec_dec_init(&dec,ptr,DATA_SIZE2);
+ if(ec_tell_frac(&dec)!=tell[0]){+ fprintf(stderr,
+ "Tell mismatch between encoder and decoder at symbol %i: %i instead of %i (Random seed: %u).\n",
+ 0,ec_tell_frac(&dec),tell[0],seed);
+ }
+ for(j=0;j<sz;j++){+ int fs;
+ int dec_method;
+ dec_method=rand()/((RAND_MAX>>2)+1);
+ switch(dec_method){+ case 0:{+ fs=ec_decode(&dec,1<<logp1[j]);
+ sym=fs>=(1<<logp1[j])-1;
+ ec_dec_update(&dec,sym?(1<<logp1[j])-1:0,
+ (1<<logp1[j])-(sym?0:1),1<<logp1[j]);
+ }break;
+ case 1:{+ fs=ec_decode_bin(&dec,logp1[j]);
+ sym=fs>=(1<<logp1[j])-1;
+ ec_dec_update(&dec,sym?(1<<logp1[j])-1:0,
+ (1<<logp1[j])-(sym?0:1),1<<logp1[j]);
+ }break;
+ case 2:{+ sym=ec_dec_bit_logp(&dec,logp1[j]);
+ }break;
+ case 3:{+ unsigned char icdf[2];
+ icdf[0]=1;
+ icdf[1]=0;
+ sym=ec_dec_icdf(&dec,icdf,logp1[j]);
+ }break;
+ }
+ if(sym!=data[j]){+ fprintf(stderr,
+ "Decoded %i instead of %i with logp1 of %i at position %i of %i (Random seed: %u).\n",
+ sym,data[j],logp1[j],j,sz,seed);
+ fprintf(stderr,"Encoding method: %i, decoding method: %i\n",
+ enc_method[j],dec_method);
+ ret=-1;
+ }
+ if(ec_tell_frac(&dec)!=tell[j+1]){+ fprintf(stderr,
+ "Tell mismatch between encoder and decoder at symbol %i: %i instead of %i (Random seed: %u).\n",
+ j+1,ec_tell_frac(&dec),tell[j+1],seed);
+ }
+ }
+ free(enc_method);
+ free(tell);
+ free(data);
+ free(logp1);
+ }
+ free(ptr);
+ return ret;
+}
--- /dev/null
+++ b/libcelt/tests/laplace-test.c
@@ -1,0 +1,65 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include "laplace.h"
+#define CELT_C
+#include "../libcelt/stack_alloc.h"
+
+#include "../libcelt/entenc.c"
+#include "../libcelt/entdec.c"
+#include "../libcelt/entcode.c"
+#include "../libcelt/laplace.c"
+
+#define DATA_SIZE 40000
+
+int ec_laplace_get_start_freq(int decay)
+{+ celt_uint32 ft = 32768 - LAPLACE_MINP*(2*LAPLACE_NMIN+1);
+ int fs = (ft*(16384-decay))/(16384+decay);
+ return fs+LAPLACE_MINP;
+}
+
+int main(void)
+{+ int i;
+ int ret = 0;
+ ec_enc enc;
+ ec_dec dec;
+ unsigned char *ptr;
+ int val[10000], decay[10000];
+ ALLOC_STACK;
+ ptr = malloc(DATA_SIZE);
+ ec_enc_init(&enc,ptr,DATA_SIZE);
+
+ val[0] = 3; decay[0] = 6000;
+ val[1] = 0; decay[1] = 5800;
+ val[2] = -1; decay[2] = 5600;
+ for (i=3;i<10000;i++)
+ {+ val[i] = rand()%15-7;
+ decay[i] = rand()%11000+5000;
+ }
+ for (i=0;i<10000;i++)
+ ec_laplace_encode(&enc, &val[i],
+ ec_laplace_get_start_freq(decay[i]), decay[i]);
+
+ ec_enc_done(&enc);
+
+ ec_dec_init(&dec,ec_get_buffer(&enc),ec_range_bytes(&enc));
+
+ for (i=0;i<10000;i++)
+ {+ int d = ec_laplace_decode(&dec,
+ ec_laplace_get_start_freq(decay[i]), decay[i]);
+ if (d != val[i])
+ {+ fprintf (stderr, "Got %d instead of %d\n", d, val[i]);
+ ret = 1;
+ }
+ }
+
+ return ret;
+}
--- /dev/null
+++ b/libcelt/tests/mathops-test.c
@@ -1,0 +1,172 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "mathops.c"
+#include "entcode.c"
+#include <stdio.h>
+#include <math.h>
+
+#ifdef FIXED_POINT
+#define WORD "%d"
+#else
+#define WORD "%f"
+#endif
+
+#ifdef FIXED_DEBUG
+long long celt_mips=0;
+#endif
+int ret = 0;
+
+void testdiv(void)
+{+ celt_int32 i;
+ for (i=1;i<=327670;i++)
+ {+ double prod;
+ celt_word32 val;
+ val = celt_rcp(i);
+#ifdef FIXED_POINT
+ prod = (1./32768./65526.)*val*i;
+#else
+ prod = val*i;
+#endif
+ if (fabs(prod-1) > .00025)
+ {+ fprintf (stderr, "div failed: 1/%d="WORD" (product = %f)\n", i, val, prod);
+ ret = 1;
+ }
+ }
+}
+
+void testsqrt(void)
+{+ celt_int32 i;
+ for (i=1;i<=1000000000;i++)
+ {+ double ratio;
+ celt_word16 val;
+ val = celt_sqrt(i);
+ ratio = val/sqrt(i);
+ if (fabs(ratio - 1) > .0005 && fabs(val-sqrt(i)) > 2)
+ {+ fprintf (stderr, "sqrt failed: sqrt(%d)="WORD" (ratio = %f)\n", i, val, ratio);
+ ret = 1;
+ }
+ i+= i>>10;
+ }
+}
+
+#ifndef FIXED_POINT
+void testlog2(void)
+{+ float x;
+ for (x=0.001;x<1677700.0;x+=(x/8.0))
+ {+ float error = fabs((1.442695040888963387*log(x))-celt_log2(x));
+ if (error>0.0009)
+ {+ fprintf (stderr, "celt_log2 failed: fabs((1.442695040888963387*log(x))-celt_log2(x))>0.001 (x = %f, error = %f)\n", x,error);
+ ret = 1;
+ }
+ }
+}
+
+void testexp2(void)
+{+ float x;
+ for (x=-11.0;x<24.0;x+=0.0007)
+ {+ float error = fabs(x-(1.442695040888963387*log(celt_exp2(x))));
+ if (error>0.0002)
+ {+ fprintf (stderr, "celt_exp2 failed: fabs(x-(1.442695040888963387*log(celt_exp2(x))))>0.0005 (x = %f, error = %f)\n", x,error);
+ ret = 1;
+ }
+ }
+}
+
+void testexp2log2(void)
+{+ float x;
+ for (x=-11.0;x<24.0;x+=0.0007)
+ {+ float error = fabs(x-(celt_log2(celt_exp2(x))));
+ if (error>0.001)
+ {+ fprintf (stderr, "celt_log2/celt_exp2 failed: fabs(x-(celt_log2(celt_exp2(x))))>0.001 (x = %f, error = %f)\n", x,error);
+ ret = 1;
+ }
+ }
+}
+#else
+void testlog2(void)
+{+ celt_word32 x;
+ for (x=8;x<1073741824;x+=(x>>3))
+ {+ float error = fabs((1.442695040888963387*log(x/16384.0))-celt_log2(x)/1024.0);
+ if (error>0.003)
+ {+ fprintf (stderr, "celt_log2 failed: x = %ld, error = %f\n", (long)x,error);
+ ret = 1;
+ }
+ }
+}
+
+void testexp2(void)
+{+ celt_word16 x;
+ for (x=-32768;x<-30720;x++)
+ {+ float error1 = fabs(x/2048.0-(1.442695040888963387*log(celt_exp2(x)/65536.0)));
+ float error2 = fabs(exp(0.6931471805599453094*x/2048.0)-celt_exp2(x)/65536.0);
+ if (error1>0.0002&&error2>0.00004)
+ {+ fprintf (stderr, "celt_exp2 failed: x = "WORD", error1 = %f, error2 = %f\n", x,error1,error2);
+ ret = 1;
+ }
+ }
+}
+
+void testexp2log2(void)
+{+ celt_word32 x;
+ for (x=8;x<65536;x+=(x>>3))
+ {+ float error = fabs(x-0.25*celt_exp2(celt_log2(x)<<1))/16384;
+ if (error>0.004)
+ {+ fprintf (stderr, "celt_log2/celt_exp2 failed: fabs(x-(celt_exp2(celt_log2(x))))>0.001 (x = %ld, error = %f)\n", (long)x,error);
+ ret = 1;
+ }
+ }
+}
+
+void testilog2(void)
+{+ celt_word32 x;
+ for (x=1;x<=268435455;x+=127)
+ {+ celt_word32 error = abs(celt_ilog2(x)-(int)floor(log2(x)));
+ if (error!=0)
+ {+ printf("celt_ilog2 failed: celt_ilog2(x)!=floor(log2(x)) (x = %d, error = %d)\n",x,error);+ ret = 1;
+ }
+ }
+}
+#endif
+
+int main(void)
+{+ testdiv();
+ testsqrt();
+ testlog2();
+ testexp2();
+ testexp2log2();
+#ifdef FIXED_POINT
+ testilog2();
+#endif
+ return ret;
+}
--- /dev/null
+++ b/libcelt/tests/mdct-test.c
@@ -1,0 +1,169 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#define SKIP_CONFIG_H
+
+#ifndef CUSTOM_MODES
+#define CUSTOM_MODES
+#endif
+
+#include <stdio.h>
+#include "mdct.h"
+#define CELT_C
+#include "../libcelt/stack_alloc.h"
+
+#include "../libcelt/kiss_fft.c"
+#include "../libcelt/mdct.c"
+#include "../libcelt/mathops.c"
+#include "../libcelt/entcode.c"
+
+#ifndef M_PI
+#define M_PI 3.141592653
+#endif
+
+#ifdef FIXED_DEBUG
+long long celt_mips=0;
+#endif
+int ret = 0;
+void check(kiss_fft_scalar * in,kiss_fft_scalar * out,int nfft,int isinverse)
+{+ int bin,k;
+ double errpow=0,sigpow=0;
+ double snr;
+ for (bin=0;bin<nfft/2;++bin) {+ double ansr = 0;
+ double difr;
+
+ for (k=0;k<nfft;++k) {+ double phase = 2*M_PI*(k+.5+.25*nfft)*(bin+.5)/nfft;
+ double re = cos(phase);
+
+ re /= nfft/4;
+
+ ansr += in[k] * re;
+ }
+ /*printf ("%f %f\n", ansr, out[bin]);*/+ difr = ansr - out[bin];
+ errpow += difr*difr;
+ sigpow += ansr*ansr;
+ }
+ snr = 10*log10(sigpow/errpow);
+ printf("nfft=%d inverse=%d,snr = %f\n",nfft,isinverse,snr );+ if (snr<60) {+ printf( "** poor snr: %f **\n", snr);
+ ret = 1;
+ }
+}
+
+void check_inv(kiss_fft_scalar * in,kiss_fft_scalar * out,int nfft,int isinverse)
+{+ int bin,k;
+ double errpow=0,sigpow=0;
+ double snr;
+ for (bin=0;bin<nfft;++bin) {+ double ansr = 0;
+ double difr;
+
+ for (k=0;k<nfft/2;++k) {+ double phase = 2*M_PI*(bin+.5+.25*nfft)*(k+.5)/nfft;
+ double re = cos(phase);
+
+ //re *= 2;
+
+ ansr += in[k] * re;
+ }
+ /*printf ("%f %f\n", ansr, out[bin]);*/+ difr = ansr - out[bin];
+ errpow += difr*difr;
+ sigpow += ansr*ansr;
+ }
+ snr = 10*log10(sigpow/errpow);
+ printf("nfft=%d inverse=%d,snr = %f\n",nfft,isinverse,snr );+ if (snr<60) {+ printf( "** poor snr: %f **\n", snr);
+ ret = 1;
+ }
+}
+
+
+void test1d(int nfft,int isinverse)
+{+ mdct_lookup cfg;
+ size_t buflen = sizeof(kiss_fft_scalar)*nfft;
+
+ kiss_fft_scalar * in = (kiss_fft_scalar*)malloc(buflen);
+ kiss_fft_scalar * out= (kiss_fft_scalar*)malloc(buflen);
+ celt_word16 * window= (celt_word16*)malloc(sizeof(celt_word16)*nfft/2);
+ int k;
+
+ clt_mdct_init(&cfg, nfft, 0);
+ for (k=0;k<nfft;++k) {+ in[k] = (rand() % 32768) - 16384;
+ }
+
+ for (k=0;k<nfft/2;++k) {+ window[k] = Q15ONE;
+ }
+#ifdef DOUBLE_PRECISION
+ for (k=0;k<nfft;++k) {+ in[k] *= 32768;
+ }
+#endif
+
+ if (isinverse)
+ {+ for (k=0;k<nfft;++k) {+ in[k] /= nfft;
+ }
+ }
+
+ /*for (k=0;k<nfft;++k) printf("%d %d ", in[k].r, in[k].i);printf("\n");*/+
+ if (isinverse)
+ {+ for (k=0;k<nfft;++k)
+ out[k] = 0;
+ clt_mdct_backward(&cfg,in,out, window, nfft/2, 0);
+ check_inv(in,out,nfft,isinverse);
+ } else {+ clt_mdct_forward(&cfg,in,out,window, nfft/2, 0);
+ check(in,out,nfft,isinverse);
+ }
+ /*for (k=0;k<nfft;++k) printf("%d %d ", out[k].r, out[k].i);printf("\n");*/+
+
+ free(in);
+ free(out);
+ clt_mdct_clear(&cfg);
+}
+
+int main(int argc,char ** argv)
+{+ ALLOC_STACK;
+ if (argc>1) {+ int k;
+ for (k=1;k<argc;++k) {+ test1d(atoi(argv[k]),0);
+ test1d(atoi(argv[k]),1);
+ }
+ }else{+ test1d(32,0);
+ test1d(32,1);
+ test1d(256,0);
+ test1d(256,1);
+ test1d(512,0);
+ test1d(512,1);
+#ifndef RADIX_TWO_ONLY
+ test1d(40,0);
+ test1d(40,1);
+ test1d(120,0);
+ test1d(120,1);
+ test1d(240,0);
+ test1d(240,1);
+ test1d(480,0);
+ test1d(480,1);
+#endif
+ }
+ return ret;
+}
--- /dev/null
+++ b/libcelt/tests/real-fft-test.c
@@ -1,0 +1,171 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "kiss_fftr.h"
+#include "_kiss_fft_guts.h"
+#include <stdio.h>
+#include <string.h>
+
+#define CELT_C
+#include "../libcelt/stack_alloc.h"
+#include "../libcelt/kiss_fft.c"
+#include "../libcelt/kiss_fftr.c"
+
+#ifdef FIXED_DEBUG
+long long celt_mips=0;
+#endif
+int ret=0;
+
+static
+kiss_fft_scalar rand_scalar(void)
+{+ return (rand()%32767)-16384;
+}
+
+static
+double snr_compare( kiss_fft_cpx * vec1,kiss_fft_scalar * vec2, int n)
+{+ int k;
+ double sigpow=1e-10, noisepow=1e-10, err,snr;
+
+ vec1[0].i = vec1[n].r;
+ for (k=0;k<n;++k) {+ sigpow += (double)vec1[k].r * (double)vec1[k].r +
+ (double)vec1[k].i * (double)vec1[k].i;
+ err = (double)vec1[k].r - (double)vec2[2*k];
+ /*printf ("%f %f\n", (double)vec1[k].r, (double)vec2[2*k]);*/+ noisepow += err * err;
+ err = (double)vec1[k].i - (double)vec2[2*k+1];
+ /*printf ("%f %f\n", (double)vec1[k].i, (double)vec2[2*k+1]);*/+ noisepow += err * err;
+
+ }
+ snr = 10*log10( sigpow / noisepow );
+ if (snr<60) {+ printf( "** poor snr: %f **\n", snr);
+ ret = 1;
+ }
+ return snr;
+}
+
+static
+double snr_compare_scal( kiss_fft_scalar * vec1,kiss_fft_scalar * vec2, int n)
+{+ int k;
+ double sigpow=1e-10, noisepow=1e-10, err,snr;
+
+ for (k=0;k<n;++k) {+ sigpow += (double)vec1[k] * (double)vec1[k];
+ err = (double)vec1[k] - (double)vec2[k];
+ noisepow += err * err;
+ }
+ snr = 10*log10( sigpow / noisepow );
+ if (snr<60) {+ printf( "\npoor snr: %f\n", snr);
+ ret = 1;
+ }
+ return snr;
+}
+#ifdef RADIX_TWO_ONLY
+#define NFFT 1024
+#else
+#define NFFT 8*3*5
+#endif
+
+#ifndef NUMFFTS
+#define NUMFFTS 10000
+#endif
+
+
+int main(void)
+{+ int i;
+ kiss_fft_cpx cin[NFFT];
+ kiss_fft_cpx cout[NFFT];
+ kiss_fft_scalar fin[NFFT];
+ kiss_fft_scalar sout[NFFT];
+ kiss_fft_cfg kiss_fft_state;
+ kiss_fftr_cfg kiss_fftr_state;
+
+ kiss_fft_scalar rin[NFFT+2];
+ kiss_fft_scalar rout[NFFT+2];
+ kiss_fft_scalar zero;
+ ALLOC_STACK;
+ memset(&zero,0,sizeof(zero) ); // ugly way of setting short,int,float,double, or __m128 to zero
+
+ for (i=0;i<NFFT;++i) {+ rin[i] = rand_scalar();
+#if defined(FIXED_POINT) && defined(DOUBLE_PRECISION)
+ rin[i] *= 32768;
+#endif
+ cin[i].r = rin[i];
+ cin[i].i = zero;
+ }
+
+ kiss_fft_state = kiss_fft_alloc(NFFT,0,0);
+ kiss_fftr_state = kiss_fftr_alloc(NFFT,0,0);
+ kiss_fft(kiss_fft_state,cin,cout);
+ kiss_fftr(kiss_fftr_state,rin,sout);
+
+ printf( "nfft=%d, inverse=%d, snr=%g\n",
+ NFFT,0, snr_compare(cout,sout,(NFFT/2)) );
+
+ memset(cin,0,sizeof(cin));
+ cin[0].r = rand_scalar();
+ cin[NFFT/2].r = rand_scalar();
+ for (i=1;i< NFFT/2;++i) {+ //cin[i].r = (kiss_fft_scalar)(rand()-RAND_MAX/2);
+ cin[i].r = rand_scalar();
+ cin[i].i = rand_scalar();
+ }
+
+ // conjugate symmetry of real signal
+ for (i=1;i< NFFT/2;++i) {+ cin[NFFT-i].r = cin[i].r;
+ cin[NFFT-i].i = - cin[i].i;
+ }
+
+
+#ifdef FIXED_POINT
+#ifdef DOUBLE_PRECISION
+ for (i=0;i< NFFT;++i) {+ cin[i].r *= 32768;
+ cin[i].i *= 32768;
+ }
+#endif
+ for (i=0;i< NFFT;++i) {+ cin[i].r /= NFFT;
+ cin[i].i /= NFFT;
+ }
+#endif
+
+ fin[0] = cin[0].r;
+ fin[1] = cin[NFFT/2].r;
+ for (i=1;i< NFFT/2;++i)
+ {+ fin[2*i] = cin[i].r;
+ fin[2*i+1] = cin[i].i;
+ }
+
+ kiss_ifft(kiss_fft_state,cin,cout);
+ kiss_fftri(kiss_fftr_state,fin,rout);
+ /*
+ printf(" results from inverse kiss_fft : (%f,%f), (%f,%f), (%f,%f), (%f,%f), (%f,%f) ...\n "+ , (float)cout[0].r , (float)cout[0].i , (float)cout[1].r , (float)cout[1].i , (float)cout[2].r , (float)cout[2].i , (float)cout[3].r , (float)cout[3].i , (float)cout[4].r , (float)cout[4].i
+ );
+
+ printf(" results from inverse kiss_fftr: %f,%f,%f,%f,%f ... \n"+ ,(float)rout[0] ,(float)rout[1] ,(float)rout[2] ,(float)rout[3] ,(float)rout[4]);
+*/
+ for (i=0;i<NFFT;++i) {+ sout[i] = cout[i].r;
+ }
+
+ printf( "nfft=%d, inverse=%d, snr=%g\n",
+ NFFT,1, snr_compare_scal(rout,sout,NFFT) );
+ free(kiss_fft_state);
+ free(kiss_fftr_state);
+
+ return ret;
+}
--- /dev/null
+++ b/libcelt/tests/rotation-test.c
@@ -1,0 +1,49 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include "celt_types.h"
+#include "bands.h"
+#include <math.h>
+#define MAX_SIZE 100
+
+int ret=0;
+void test_rotation(int N, int K)
+{+ int i;
+ double err = 0, ener = 0, snr, snr0;
+ celt_word16 x0[MAX_SIZE];
+ celt_word16 x1[MAX_SIZE];
+ int nb_rotations = (N+4*K)/(8*K);
+ for (i=0;i<N;i++)
+ x1[i] = x0[i] = rand()%32767-16384;
+ exp_rotation(x1, N, 1, 1, nb_rotations);
+ for (i=0;i<N;i++)
+ {+ err += (x0[i]-(double)x1[i])*(x0[i]-(double)x1[i]);
+ ener += x0[i]*(double)x0[i];
+ }
+ snr0 = 20*log10(ener/err);
+ err = ener = 0;
+ exp_rotation(x1, N, -1, 1, nb_rotations);
+ for (i=0;i<N;i++)
+ {+ err += (x0[i]-(double)x1[i])*(x0[i]-(double)x1[i]);
+ ener += x0[i]*(double)x0[i];
+ }
+ snr = 20*log10(ener/err);
+ printf ("SNR for size %d (%d pulses) is %f (was %f without inverse)\n", N, K, snr, snr0);+ if (snr < 60 || snr0 > 20)
+ ret = 1;
+}
+
+int main(void)
+{+ test_rotation(15, 3);
+ test_rotation(23, 5);
+ test_rotation(50, 3);
+ test_rotation(80, 1);
+ return ret;
+}
--- /dev/null
+++ b/libcelt/tests/tandem-test.c
@@ -1,0 +1,204 @@
+/* (C) 2009 Gregory Maxwell
+
+ This test runs pink noise through the encoder and decoder many times
+ while feeding the output back into the input. It checks that after
+ a number of cycles the energy has not increased or decreased by too
+ large an amount.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "celt.h"
+#include "arch.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <time.h>
+#include <math.h>
+#include <string.h>
+
+#ifndef _MSC_VER
+#include <unistd.h>
+#endif
+
+int async_tandem(int rate, int frame_size, int channels, int bitrate_min,
+ int bitrate_max)
+{+ int error;
+ unsigned char data[648];
+ CELTMode *mode = NULL;
+ CELTEncoder *enc;
+ short carry[2];
+ short pcm[960 * 2];
+ CELTDecoder *dec;
+ int bmin, bmax;
+ float ms;
+ int ret, i, j, bytes_per_frame;
+ int increment = 1;
+
+ bmin = floor((bitrate_min / (rate / (float) frame_size)) / 8.0);
+ bmax = ceil((bitrate_max / (rate / (float) frame_size)) / 8.0);
+ if (bmin < 8)
+ bmin = 8;
+ if (bmax > 640)
+ bmax = 640;
+ if (bmin >= bmax)
+ bmax = bmin + 8;
+
+ increment += (bmax - bmin) / 128;
+
+ printf ("Testing asynchronous tandeming (%dHz, %dch, %d samples, %d - %d bytes).\n",+ rate, channels, frame_size, bmin, bmax);
+
+ mode = celt_mode_create(rate, frame_size, &error);
+ if (mode == NULL || error) {+ fprintf(stderr, "Error: failed to create a mode: %s\n", celt_strerror(error));
+ exit(1);
+ }
+
+ dec = celt_decoder_create_custom(mode, channels, &error);
+ if (error){+ fprintf(stderr, "Error: celt_decoder_create returned %s\n", celt_strerror(error));
+ exit(1);
+ }
+ enc = celt_encoder_create_custom(mode, channels, &error);
+ if (error){+ fprintf(stderr, "Error: celt_encoder_create returned %s\n", celt_strerror(error));
+ exit(1);
+ }
+
+ for (j = 0; j < frame_size * channels; j++)
+ pcm[j] = 0;
+
+ for (bytes_per_frame = bmin; bytes_per_frame <= bmax;
+ bytes_per_frame += increment) {+ /*Prime the encoder and decoder */
+ for (i = 0; i < (1024 + (frame_size >> 1)) / frame_size + 2; i++) {+
+ for (j = 0; j < channels; j++)
+ pcm[j] = pcm[frame_size * channels - (channels - j + 1)];
+ for (j = channels; j < frame_size * channels - 1; j++)
+ pcm[j] = ((rand() % 4096) - 2048) + .9 * pcm[j - channels];
+
+ ret = celt_encode(enc, pcm, frame_size, data, bytes_per_frame);
+ if (ret != bytes_per_frame) {+ fprintf(stderr, "Error: celt_encode returned %s\n", celt_strerror(ret));
+ exit(1);
+ }
+
+ ret = celt_decode(dec, data, ret, pcm, frame_size);
+ if (ret < 0) {+ fprintf(stderr, "Error: celt_decode returned %s\n", celt_strerror(ret));
+ }
+ }
+
+ for (j = 0; j < channels; j++)
+ pcm[j] = pcm[frame_size * channels - (channels - j)];
+ for (j = channels; j < frame_size * channels - 1; j++)
+ pcm[j] = ((rand() % 4096) - 2048) + .9 * pcm[j - channels];
+
+ for (i = 0; i < 8; i++) {+ for (j = 0; j < channels; j++)
+ carry[j] = pcm[frame_size * channels - (channels - j)];
+ memmove(pcm + channels, pcm, sizeof(short) * frame_size * channels);
+ for (j = 0; j < channels; j++)
+ pcm[j] = carry[j];
+
+ ret = celt_encode(enc, pcm, frame_size, data, bytes_per_frame);
+ if (ret != bytes_per_frame) {+ fprintf(stderr, "Error: at %d bytes_per_frame celt_encode returned %s\n",
+ bytes_per_frame, celt_strerror(ret));
+ exit(1);
+ }
+
+ ret = celt_decode(dec, data, ret, pcm, frame_size);
+ if (ret < 0) {+ fprintf(stderr, "Error: at %d bytes_per_frame celt_decode returned %s\n",
+ bytes_per_frame, celt_strerror(ret));
+ exit(1);
+ }
+ }
+ ms = 0;
+ for (j = 0; j < frame_size * channels; j++)
+ ms += pcm[j] * pcm[j];
+ ms = sqrt(ms / (frame_size * channels));
+ if (ms > 7000 || ms < 1000) {+ fprintf(stderr, "Error: Signal out of expected range. %d %d %d %d %f\n",
+ rate, channels, frame_size, bytes_per_frame, ms);
+ exit(1);
+ }
+ }
+
+ celt_encoder_destroy(enc);
+ celt_decoder_destroy(dec);
+ celt_mode_destroy(mode);
+
+ return 0;
+}
+
+int main(int argc, char *argv[])
+{+#ifdef CUSTOM_MODES
+ int sizes[8]={960,512,480,256,240,128,120,64};+#else
+ int sizes[4]={960,480,240,120};+#endif
+ unsigned int seed;
+ int ch, n;
+
+ if (argc > 2) {+ fprintf(stderr, "Usage: %s [<seed>]\n", argv[0]);
+ return 1;
+ }
+
+ if (argc > 1)
+ seed = atoi(argv[1]);
+ else
+ seed = (time(NULL) ^ ((getpid() % 65536) << 16));
+
+ srand(seed);
+ printf("CELT codec tests. Random seed: %u (%.4X)\n", seed, rand() % 65536);+
+#ifdef CUSTOM_MODES
+ for (n = 0; n < 8; n++) {+ for (ch = 1; ch <= 2; ch++) {+ async_tandem(48000, sizes[n], ch, 12000 * ch, 128000 * ch);
+ async_tandem(44100, sizes[n], ch, 12000 * ch, 128000 * ch);
+ if(n>0)async_tandem(32000, sizes[n], ch, 12000 * ch, 128000 * ch);
+ if(n>2)async_tandem(16000, sizes[n], ch, 12000 * ch, 64000 * ch);
+ }
+ }
+#else
+ for (n = 0; n < 4; n++) {+ for (ch = 1; ch <= 2; ch++) {+ async_tandem(48000, sizes[n], ch, 12000 * ch, 128000 * ch);
+ }
+ }
+#endif
+ return 0;
+}
--- /dev/null
+++ b/libcelt/tests/type-test.c
@@ -1,0 +1,23 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "celt_types.h"
+#include <stdio.h>
+
+int main(void)
+{+ celt_int16 i = 1;
+ i <<= 14;
+ if (i>>14 != 1)
+ {+ fprintf(stderr, "celt_int16 isn't 16 bits\n");
+ return 1;
+ }
+ if (sizeof(celt_int16)*2 != sizeof(celt_int32))
+ {+ fprintf(stderr, "16*2 != 32\n");
+ return 1;
+ }
+ return 0;
+}
--- a/msvc/config.h
+++ /dev/null
@@ -1,27 +1,0 @@
-#ifndef CONFIG_H
-#define CONFIG_H
-
-#define CELT_BUILD 1
-
-#define restrict
-#define inline __inline
-
-#define USE_ALLOCA 1
-
-/* Comment out the next line for floating-point code */
-//#define FIXED_POINT 1
-
-#define OPUS_BUILD 1
-
-/* Get rid of the CELT VS compile warnings */
-#if 1
-#pragma warning(disable : 4018)// signed/unsigned mismatch
-#pragma warning(disable : 4244)// conversion from 'double' to 'celt_word16', possible loss of data
-#pragma warning(disable : 4267)// conversion from 'size_t' to 'int', possible loss of data
-#pragma warning(disable : 4305)// truncation from 'double' to 'const float'
-#pragma warning(disable : 4311)// pointer truncation from 'char *' to 'long'
-#pragma warning(disable : 4554)// check operator precedence for possible error; use parentheses to clarify precedence
-#pragma warning(disable : 4996)// This function or variable may be unsafe. Consider using fopen_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
-#endif
-
-#endif CONFIG_H
--- a/tests/Makefile.am
+++ /dev/null
@@ -1,17 +1,0 @@
-INCLUDES = -I$(top_srcdir)/libcelt
-METASOURCES = AUTO
-
-TESTS = type-test ectest cwrs32-test dft-test laplace-test mdct-test mathops-test tandem-test
-
-noinst_PROGRAMS = type-test ectest cwrs32-test dft-test laplace-test mdct-test mathops-test tandem-test
-
-type_test_SOURCES = type-test.c
-ectest_SOURCES = ectest.c
-cwrs32_test_SOURCES = cwrs32-test.c
-dft_test_SOURCES = dft-test.c
-laplace_test_SOURCES = laplace-test.c
-mdct_test_SOURCES = mdct-test.c
-#rotation_test_SOURCES = rotation-test.c
-mathops_test_SOURCES = mathops-test.c
-tandem_test_SOURCES = tandem-test.c
-tandem_test_LDADD = $(top_builddir)/libcelt/libcelt@LIBCELT_SUFFIX@.la
--- a/tests/cwrs32-test.c
+++ /dev/null
@@ -1,176 +1,0 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <stdio.h>
-#include <string.h>
-
-#define CELT_C
-#include "../libcelt/stack_alloc.h"
-#include "../libcelt/entenc.c"
-#include "../libcelt/entdec.c"
-#include "../libcelt/entcode.c"
-#include "../libcelt/cwrs.c"
-#include "../libcelt/mathops.c"
-
-#define NMAX (14)
-#define KMAX (32767)
-
-static const int kmax[15]={- 32767,32767,32767,32767, 1172,
- 238, 95, 53, 36, 27,
- 22, 18, 16, 15, 13
-};
-
-
-int main(int _argc,char **_argv){- int n;
- ALLOC_STACK;
- for(n=2;n<=NMAX;n++){- int dk;
- int k;
- dk=kmax[n]>7?kmax[n]/7:1;
- k=1-dk;
- do{- celt_uint32 uu[KMAX+2U];
- celt_uint32 inc;
- celt_uint32 nc;
- celt_uint32 i;
- k=kmax[n]-dk<k?kmax[n]:k+dk;
- printf("Testing CWRS with N=%i, K=%i...\n",n,k);- nc=ncwrs_urow(n,k,uu);
- inc=nc/10000;
- if(inc<1)inc=1;
- for(i=0;i<nc;i+=inc){- celt_uint32 u[KMAX+2U];
- int y[NMAX];
- int yy[5];
- celt_uint32 v;
- celt_uint32 ii;
- int kk;
- int j;
- memcpy(u,uu,(k+2U)*sizeof(*u));
- cwrsi(n,k,i,y,u);
- /*printf("%6u of %u:",i,nc);- for(j=0;j<n;j++)printf(" %+3i",y[j]);- printf(" ->");*/- ii=icwrs(n,k,&v,y,u);
- if(ii!=i){- fprintf(stderr,"Combination-index mismatch (%lu!=%lu).\n",
- (long)ii,(long)i);
- return 1;
- }
- if(v!=nc){- fprintf(stderr,"Combination count mismatch (%lu!=%lu).\n",
- (long)v,(long)nc);
- return 2;
- }
-#ifndef SMALL_FOOTPRINT
- if(n==2){- cwrsi2(k,i,yy);
- for(j=0;j<2;j++)if(yy[j]!=y[j]){- fprintf(stderr,"N=2 pulse vector mismatch ({%i,%i}!={%i,%i}).\n",- yy[0],yy[1],y[0],y[1]);
- return 3;
- }
- ii=icwrs2(yy,&kk);
- if(ii!=i){- fprintf(stderr,"N=2 combination-index mismatch (%lu!=%lu).\n",
- (long)ii,(long)i);
- return 4;
- }
- if(kk!=k){- fprintf(stderr,"N=2 pulse count mismatch (%i,%i).\n",kk,k);
- return 5;
- }
- v=ncwrs2(k);
- if(v!=nc){- fprintf(stderr,"N=2 combination count mismatch (%lu,%lu).\n",
- (long)v,(long)nc);
- return 6;
- }
- }
- else if(n==3){- cwrsi3(k,i,yy);
- for(j=0;j<3;j++)if(yy[j]!=y[j]){- fprintf(stderr,"N=3 pulse vector mismatch "
- "({%i,%i,%i}!={%i,%i,%i}).\n",yy[0],yy[1],yy[2],y[0],y[1],y[2]);- return 7;
- }
- ii=icwrs3(yy,&kk);
- if(ii!=i){- fprintf(stderr,"N=3 combination-index mismatch (%lu!=%lu).\n",
- (long)ii,(long)i);
- return 8;
- }
- if(kk!=k){- fprintf(stderr,"N=3 pulse count mismatch (%i!=%i).\n",kk,k);
- return 9;
- }
- v=ncwrs3(k);
- if(v!=nc){- fprintf(stderr,"N=3 combination count mismatch (%lu!=%lu).\n",
- (long)v,(long)nc);
- return 10;
- }
- }
- else if(n==4){- cwrsi4(k,i,yy);
- for(j=0;j<4;j++)if(yy[j]!=y[j]){- fprintf(stderr,"N=4 pulse vector mismatch "
- "({%i,%i,%i,%i}!={%i,%i,%i,%i}.\n",- yy[0],yy[1],yy[2],yy[3],y[0],y[1],y[2],y[3]);
- return 11;
- }
- ii=icwrs4(yy,&kk);
- if(ii!=i){- fprintf(stderr,"N=4 combination-index mismatch (%lu!=%lu).\n",
- (long)ii,(long)i);
- return 12;
- }
- if(kk!=k){- fprintf(stderr,"N=4 pulse count mismatch (%i!=%i).\n",kk,k);
- return 13;
- }
- v=ncwrs4(k);
- if(v!=nc){- fprintf(stderr,"N=4 combination count mismatch (%lu!=%lu).\n",
- (long)v,(long)nc);
- return 14;
- }
- }
- else if(n==5){- cwrsi5(k,i,yy);
- for(j=0;j<5;j++)if(yy[j]!=y[j]){- fprintf(stderr,"N=5 pulse vector mismatch "
- "({%i,%i,%i,%i,%i}!={%i,%i,%i,%i,%i}).\n",- yy[0],yy[1],yy[2],yy[3],yy[4],y[0],y[1],y[2],y[3],y[4]);
- return 15;
- }
- ii=icwrs5(yy,&kk);
- if(ii!=i){- fprintf(stderr,"N=5 combination-index mismatch (%lu!=%lu).\n",
- (long)ii,(long)i);
- return 16;
- }
- if(kk!=k){- fprintf(stderr,"N=5 pulse count mismatch (%i!=%i).\n",kk,k);
- return 17;
- }
- v=ncwrs5(k);
- if(v!=nc){- fprintf(stderr,"N=5 combination count mismatch (%lu!=%lu).\n",
- (long)v,(long)nc);
- return 18;
- }
- }
-#endif /* SMALL_FOOTPRINT */
-
- /*printf(" %6u\n",i);*/- }
- /*printf("\n");*/- }
- while(k<kmax[n]);
- }
- return 0;
-}
--- a/tests/dft-test.c
+++ /dev/null
@@ -1,142 +1,0 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#define SKIP_CONFIG_H
-
-#ifndef CUSTOM_MODES
-#define CUSTOM_MODES
-#endif
-
-#include <stdio.h>
-#include "kiss_fft.h"
-
-#define CELT_C
-#include "../libcelt/stack_alloc.h"
-#include "../libcelt/kiss_fft.c"
-#include "../libcelt/mathops.c"
-#include "../libcelt/entcode.c"
-
-
-#ifndef M_PI
-#define M_PI 3.141592653
-#endif
-
-#ifdef FIXED_DEBUG
-long long celt_mips=0;
-#endif
-int ret = 0;
-
-void check(kiss_fft_cpx * in,kiss_fft_cpx * out,int nfft,int isinverse)
-{- int bin,k;
- double errpow=0,sigpow=0, snr;
-
- for (bin=0;bin<nfft;++bin) {- double ansr = 0;
- double ansi = 0;
- double difr;
- double difi;
-
- for (k=0;k<nfft;++k) {- double phase = -2*M_PI*bin*k/nfft;
- double re = cos(phase);
- double im = sin(phase);
- if (isinverse)
- im = -im;
-
- if (!isinverse)
- {- re /= nfft;
- im /= nfft;
- }
-
- ansr += in[k].r * re - in[k].i * im;
- ansi += in[k].r * im + in[k].i * re;
- }
- /*printf ("%d %d ", (int)ansr, (int)ansi);*/- difr = ansr - out[bin].r;
- difi = ansi - out[bin].i;
- errpow += difr*difr + difi*difi;
- sigpow += ansr*ansr+ansi*ansi;
- }
- snr = 10*log10(sigpow/errpow);
- printf("nfft=%d inverse=%d,snr = %f\n",nfft,isinverse,snr );- if (snr<60) {- printf( "** poor snr: %f ** \n", snr);
- ret = 1;
- }
-}
-
-void test1d(int nfft,int isinverse)
-{- size_t buflen = sizeof(kiss_fft_cpx)*nfft;
-
- kiss_fft_cpx * in = (kiss_fft_cpx*)malloc(buflen);
- kiss_fft_cpx * out= (kiss_fft_cpx*)malloc(buflen);
- kiss_fft_state *cfg = kiss_fft_alloc(nfft,0,0);
- int k;
-
- for (k=0;k<nfft;++k) {- in[k].r = (rand() % 32767) - 16384;
- in[k].i = (rand() % 32767) - 16384;
- }
-
-#ifdef DOUBLE_PRECISION
- for (k=0;k<nfft;++k) {- in[k].r *= 32768;
- in[k].i *= 32768;
- }
-#endif
-
- if (isinverse)
- {- for (k=0;k<nfft;++k) {- in[k].r /= nfft;
- in[k].i /= nfft;
- }
- }
-
- /*for (k=0;k<nfft;++k) printf("%d %d ", in[k].r, in[k].i);printf("\n");*/-
- if (isinverse)
- kiss_ifft(cfg,in,out);
- else
- kiss_fft(cfg,in,out);
-
- /*for (k=0;k<nfft;++k) printf("%d %d ", out[k].r, out[k].i);printf("\n");*/-
- check(in,out,nfft,isinverse);
-
- free(in);
- free(out);
- free(cfg);
-}
-
-int main(int argc,char ** argv)
-{- ALLOC_STACK;
- if (argc>1) {- int k;
- for (k=1;k<argc;++k) {- test1d(atoi(argv[k]),0);
- test1d(atoi(argv[k]),1);
- }
- }else{- test1d(32,0);
- test1d(32,1);
- test1d(128,0);
- test1d(128,1);
- test1d(256,0);
- test1d(256,1);
-#ifndef RADIX_TWO_ONLY
- test1d(36,0);
- test1d(36,1);
- test1d(50,0);
- test1d(50,1);
- test1d(120,0);
- test1d(120,1);
-#endif
- }
- return ret;
-}
--- a/tests/ectest.c
+++ /dev/null
@@ -1,265 +1,0 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <math.h>
-#include <time.h>
-#include "entcode.h"
-#include "entenc.h"
-#include "entdec.h"
-#include <string.h>
-
-#include "../libcelt/entenc.c"
-#include "../libcelt/entdec.c"
-#include "../libcelt/entcode.c"
-
-#ifndef M_LOG2E
-# define M_LOG2E 1.4426950408889634074
-#endif
-#define DATA_SIZE 10000000
-#define DATA_SIZE2 10000
-
-int main(int _argc,char **_argv){- ec_enc enc;
- ec_dec dec;
- long nbits;
- long nbits2;
- double entropy;
- int ft;
- int ftb;
- int sym;
- int sz;
- int i;
- int ret;
- unsigned int seed;
- unsigned char *ptr;
- ret=0;
- entropy=0;
- if (_argc > 2) {- fprintf(stderr, "Usage: %s [<seed>]\n", _argv[0]);
- return 1;
- }
- if (_argc > 1)
- seed = atoi(_argv[1]);
- else
- seed = time(NULL);
- /*Testing encoding of raw bit values.*/
- ptr = malloc(DATA_SIZE);
- ec_enc_init(&enc,ptr, DATA_SIZE);
- for(ft=2;ft<1024;ft++){- for(i=0;i<ft;i++){- entropy+=log(ft)*M_LOG2E;
- ec_enc_uint(&enc,i,ft);
- }
- }
- /*Testing encoding of raw bit values.*/
- for(ftb=0;ftb<16;ftb++){- for(i=0;i<(1<<ftb);i++){- entropy+=ftb;
- nbits=ec_tell(&enc);
- ec_enc_bits(&enc,i,ftb);
- nbits2=ec_tell(&enc);
- if(nbits2-nbits!=ftb){- fprintf(stderr,"Used %li bits to encode %i bits directly.\n",
- nbits2-nbits,ftb);
- ret=-1;
- }
- }
- }
- nbits=ec_tell_frac(&enc);
- ec_enc_done(&enc);
- fprintf(stderr,
- "Encoded %0.2lf bits of entropy to %0.2lf bits (%0.3lf%% wasted).\n",
- entropy,ldexp(nbits,-3),100*(nbits-ldexp(entropy,3))/nbits);
- fprintf(stderr,"Packed to %li bytes.\n",(long)ec_range_bytes(&enc));
- ec_dec_init(&dec,ptr,DATA_SIZE);
- for(ft=2;ft<1024;ft++){- for(i=0;i<ft;i++){- sym=ec_dec_uint(&dec,ft);
- if(sym!=i){- fprintf(stderr,"Decoded %i instead of %i with ft of %i.\n",sym,i,ft);
- ret=-1;
- }
- }
- }
- for(ftb=0;ftb<16;ftb++){- for(i=0;i<(1<<ftb);i++){- sym=ec_dec_bits(&dec,ftb);
- if(sym!=i){- fprintf(stderr,"Decoded %i instead of %i with ftb of %i.\n",sym,i,ftb);
- ret=-1;
- }
- }
- }
- nbits2=ec_tell_frac(&dec);
- if(nbits!=nbits2){- fprintf(stderr,
- "Reported number of bits used was %0.2lf, should be %0.2lf.\n",
- ldexp(nbits2,-3),ldexp(nbits,-3));
- ret=-1;
- }
- srand(seed);
- fprintf(stderr,"Testing random streams... Random seed: %u (%.4X)\n", seed, rand() % 65536);
- for(i=0;i<409600;i++){- unsigned *data;
- unsigned *tell;
- int j;
- int tell_bits;
- int zeros;
- ft=rand()/((RAND_MAX>>(rand()%11))+1)+10;
- sz=rand()/((RAND_MAX>>(rand()%9))+1);
- data=(unsigned *)malloc(sz*sizeof(*data));
- tell=(unsigned *)malloc((sz+1)*sizeof(*tell));
- ec_enc_init(&enc,ptr,DATA_SIZE2);
- zeros = rand()%13==0;
- tell[0]=ec_tell_frac(&enc);
- for(j=0;j<sz;j++){- if (zeros)
- data[j]=0;
- else
- data[j]=rand()%ft;
- ec_enc_uint(&enc,data[j],ft);
- tell[j+1]=ec_tell_frac(&enc);
- }
- if (rand()%2==0)
- while(ec_tell(&enc)%8 != 0)
- ec_enc_uint(&enc, rand()%2, 2);
- tell_bits = ec_tell(&enc);
- ec_enc_done(&enc);
- if(tell_bits!=ec_tell(&enc)){- fprintf(stderr,"ec_tell() changed after ec_enc_done(): %i instead of %i (Random seed: %u)\n",
- ec_tell(&enc),tell_bits,seed);
- ret=-1;
- }
- if ((tell_bits+7)/8 < ec_range_bytes(&enc))
- {- fprintf (stderr, "ec_tell() lied, there's %i bytes instead of %d (Random seed: %u)\n",
- ec_range_bytes(&enc), (tell_bits+7)/8,seed);
- ret=-1;
- }
- tell_bits -= 8*ec_range_bytes(&enc);
- ec_dec_init(&dec,ptr,DATA_SIZE2);
- if(ec_tell_frac(&dec)!=tell[0]){- fprintf(stderr,
- "Tell mismatch between encoder and decoder at symbol %i: %i instead of %i (Random seed: %u).\n",
- 0,ec_tell_frac(&dec),tell[0],seed);
- }
- for(j=0;j<sz;j++){- sym=ec_dec_uint(&dec,ft);
- if(sym!=data[j]){- fprintf(stderr,
- "Decoded %i instead of %i with ft of %i at position %i of %i (Random seed: %u).\n",
- sym,data[j],ft,j,sz,seed);
- ret=-1;
- }
- if(ec_tell_frac(&dec)!=tell[j+1]){- fprintf(stderr,
- "Tell mismatch between encoder and decoder at symbol %i: %i instead of %i (Random seed: %u).\n",
- j+1,ec_tell_frac(&dec),tell[j+1],seed);
- }
- }
- free(tell);
- free(data);
- }
- /*Test compatibility between multiple different encode/decode routines.*/
- for(i=0;i<409600;i++){- unsigned *logp1;
- unsigned *data;
- unsigned *tell;
- unsigned *enc_method;
- int j;
- sz=rand()/((RAND_MAX>>(rand()%9))+1);
- logp1=(unsigned *)malloc(sz*sizeof(*logp1));
- data=(unsigned *)malloc(sz*sizeof(*data));
- tell=(unsigned *)malloc((sz+1)*sizeof(*tell));
- enc_method=(unsigned *)malloc(sz*sizeof(*enc_method));
- ec_enc_init(&enc,ptr,DATA_SIZE2);
- tell[0]=ec_tell_frac(&enc);
- for(j=0;j<sz;j++){- data[j]=rand()/((RAND_MAX>>1)+1);
- logp1[j]=(rand()%15)+1;
- enc_method[j]=rand()/((RAND_MAX>>2)+1);
- switch(enc_method[j]){- case 0:{- ec_encode(&enc,data[j]?(1<<logp1[j])-1:0,
- (1<<logp1[j])-(data[j]?0:1),1<<logp1[j]);
- }break;
- case 1:{- ec_encode_bin(&enc,data[j]?(1<<logp1[j])-1:0,
- (1<<logp1[j])-(data[j]?0:1),logp1[j]);
- }break;
- case 2:{- ec_enc_bit_logp(&enc,data[j],logp1[j]);
- }break;
- case 3:{- unsigned char icdf[2];
- icdf[0]=1;
- icdf[1]=0;
- ec_enc_icdf(&enc,data[j],icdf,logp1[j]);
- }break;
- }
- tell[j+1]=ec_tell_frac(&enc);
- }
- ec_enc_done(&enc);
- if((ec_tell(&enc)+7)/8<ec_range_bytes(&enc)){- fprintf(stderr,"tell() lied, there's %i bytes instead of %d (Random seed: %u)\n",
- ec_range_bytes(&enc),(ec_tell(&enc)+7)/8,seed);
- ret=-1;
- }
- ec_dec_init(&dec,ptr,DATA_SIZE2);
- if(ec_tell_frac(&dec)!=tell[0]){- fprintf(stderr,
- "Tell mismatch between encoder and decoder at symbol %i: %i instead of %i (Random seed: %u).\n",
- 0,ec_tell_frac(&dec),tell[0],seed);
- }
- for(j=0;j<sz;j++){- int fs;
- int dec_method;
- dec_method=rand()/((RAND_MAX>>2)+1);
- switch(dec_method){- case 0:{- fs=ec_decode(&dec,1<<logp1[j]);
- sym=fs>=(1<<logp1[j])-1;
- ec_dec_update(&dec,sym?(1<<logp1[j])-1:0,
- (1<<logp1[j])-(sym?0:1),1<<logp1[j]);
- }break;
- case 1:{- fs=ec_decode_bin(&dec,logp1[j]);
- sym=fs>=(1<<logp1[j])-1;
- ec_dec_update(&dec,sym?(1<<logp1[j])-1:0,
- (1<<logp1[j])-(sym?0:1),1<<logp1[j]);
- }break;
- case 2:{- sym=ec_dec_bit_logp(&dec,logp1[j]);
- }break;
- case 3:{- unsigned char icdf[2];
- icdf[0]=1;
- icdf[1]=0;
- sym=ec_dec_icdf(&dec,icdf,logp1[j]);
- }break;
- }
- if(sym!=data[j]){- fprintf(stderr,
- "Decoded %i instead of %i with logp1 of %i at position %i of %i (Random seed: %u).\n",
- sym,data[j],logp1[j],j,sz,seed);
- fprintf(stderr,"Encoding method: %i, decoding method: %i\n",
- enc_method[j],dec_method);
- ret=-1;
- }
- if(ec_tell_frac(&dec)!=tell[j+1]){- fprintf(stderr,
- "Tell mismatch between encoder and decoder at symbol %i: %i instead of %i (Random seed: %u).\n",
- j+1,ec_tell_frac(&dec),tell[j+1],seed);
- }
- }
- free(enc_method);
- free(tell);
- free(data);
- free(logp1);
- }
- free(ptr);
- return ret;
-}
--- a/tests/laplace-test.c
+++ /dev/null
@@ -1,65 +1,0 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include "laplace.h"
-#define CELT_C
-#include "../libcelt/stack_alloc.h"
-
-#include "../libcelt/entenc.c"
-#include "../libcelt/entdec.c"
-#include "../libcelt/entcode.c"
-#include "../libcelt/laplace.c"
-
-#define DATA_SIZE 40000
-
-int ec_laplace_get_start_freq(int decay)
-{- celt_uint32 ft = 32768 - LAPLACE_MINP*(2*LAPLACE_NMIN+1);
- int fs = (ft*(16384-decay))/(16384+decay);
- return fs+LAPLACE_MINP;
-}
-
-int main(void)
-{- int i;
- int ret = 0;
- ec_enc enc;
- ec_dec dec;
- unsigned char *ptr;
- int val[10000], decay[10000];
- ALLOC_STACK;
- ptr = malloc(DATA_SIZE);
- ec_enc_init(&enc,ptr,DATA_SIZE);
-
- val[0] = 3; decay[0] = 6000;
- val[1] = 0; decay[1] = 5800;
- val[2] = -1; decay[2] = 5600;
- for (i=3;i<10000;i++)
- {- val[i] = rand()%15-7;
- decay[i] = rand()%11000+5000;
- }
- for (i=0;i<10000;i++)
- ec_laplace_encode(&enc, &val[i],
- ec_laplace_get_start_freq(decay[i]), decay[i]);
-
- ec_enc_done(&enc);
-
- ec_dec_init(&dec,ec_get_buffer(&enc),ec_range_bytes(&enc));
-
- for (i=0;i<10000;i++)
- {- int d = ec_laplace_decode(&dec,
- ec_laplace_get_start_freq(decay[i]), decay[i]);
- if (d != val[i])
- {- fprintf (stderr, "Got %d instead of %d\n", d, val[i]);
- ret = 1;
- }
- }
-
- return ret;
-}
--- a/tests/mathops-test.c
+++ /dev/null
@@ -1,172 +1,0 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "mathops.c"
-#include "entcode.c"
-#include <stdio.h>
-#include <math.h>
-
-#ifdef FIXED_POINT
-#define WORD "%d"
-#else
-#define WORD "%f"
-#endif
-
-#ifdef FIXED_DEBUG
-long long celt_mips=0;
-#endif
-int ret = 0;
-
-void testdiv(void)
-{- celt_int32 i;
- for (i=1;i<=327670;i++)
- {- double prod;
- celt_word32 val;
- val = celt_rcp(i);
-#ifdef FIXED_POINT
- prod = (1./32768./65526.)*val*i;
-#else
- prod = val*i;
-#endif
- if (fabs(prod-1) > .00025)
- {- fprintf (stderr, "div failed: 1/%d="WORD" (product = %f)\n", i, val, prod);
- ret = 1;
- }
- }
-}
-
-void testsqrt(void)
-{- celt_int32 i;
- for (i=1;i<=1000000000;i++)
- {- double ratio;
- celt_word16 val;
- val = celt_sqrt(i);
- ratio = val/sqrt(i);
- if (fabs(ratio - 1) > .0005 && fabs(val-sqrt(i)) > 2)
- {- fprintf (stderr, "sqrt failed: sqrt(%d)="WORD" (ratio = %f)\n", i, val, ratio);
- ret = 1;
- }
- i+= i>>10;
- }
-}
-
-#ifndef FIXED_POINT
-void testlog2(void)
-{- float x;
- for (x=0.001;x<1677700.0;x+=(x/8.0))
- {- float error = fabs((1.442695040888963387*log(x))-celt_log2(x));
- if (error>0.0009)
- {- fprintf (stderr, "celt_log2 failed: fabs((1.442695040888963387*log(x))-celt_log2(x))>0.001 (x = %f, error = %f)\n", x,error);
- ret = 1;
- }
- }
-}
-
-void testexp2(void)
-{- float x;
- for (x=-11.0;x<24.0;x+=0.0007)
- {- float error = fabs(x-(1.442695040888963387*log(celt_exp2(x))));
- if (error>0.0002)
- {- fprintf (stderr, "celt_exp2 failed: fabs(x-(1.442695040888963387*log(celt_exp2(x))))>0.0005 (x = %f, error = %f)\n", x,error);
- ret = 1;
- }
- }
-}
-
-void testexp2log2(void)
-{- float x;
- for (x=-11.0;x<24.0;x+=0.0007)
- {- float error = fabs(x-(celt_log2(celt_exp2(x))));
- if (error>0.001)
- {- fprintf (stderr, "celt_log2/celt_exp2 failed: fabs(x-(celt_log2(celt_exp2(x))))>0.001 (x = %f, error = %f)\n", x,error);
- ret = 1;
- }
- }
-}
-#else
-void testlog2(void)
-{- celt_word32 x;
- for (x=8;x<1073741824;x+=(x>>3))
- {- float error = fabs((1.442695040888963387*log(x/16384.0))-celt_log2(x)/1024.0);
- if (error>0.003)
- {- fprintf (stderr, "celt_log2 failed: x = %ld, error = %f\n", (long)x,error);
- ret = 1;
- }
- }
-}
-
-void testexp2(void)
-{- celt_word16 x;
- for (x=-32768;x<-30720;x++)
- {- float error1 = fabs(x/2048.0-(1.442695040888963387*log(celt_exp2(x)/65536.0)));
- float error2 = fabs(exp(0.6931471805599453094*x/2048.0)-celt_exp2(x)/65536.0);
- if (error1>0.0002&&error2>0.00004)
- {- fprintf (stderr, "celt_exp2 failed: x = "WORD", error1 = %f, error2 = %f\n", x,error1,error2);
- ret = 1;
- }
- }
-}
-
-void testexp2log2(void)
-{- celt_word32 x;
- for (x=8;x<65536;x+=(x>>3))
- {- float error = fabs(x-0.25*celt_exp2(celt_log2(x)<<1))/16384;
- if (error>0.004)
- {- fprintf (stderr, "celt_log2/celt_exp2 failed: fabs(x-(celt_exp2(celt_log2(x))))>0.001 (x = %ld, error = %f)\n", (long)x,error);
- ret = 1;
- }
- }
-}
-
-void testilog2(void)
-{- celt_word32 x;
- for (x=1;x<=268435455;x+=127)
- {- celt_word32 error = abs(celt_ilog2(x)-(int)floor(log2(x)));
- if (error!=0)
- {- printf("celt_ilog2 failed: celt_ilog2(x)!=floor(log2(x)) (x = %d, error = %d)\n",x,error);- ret = 1;
- }
- }
-}
-#endif
-
-int main(void)
-{- testdiv();
- testsqrt();
- testlog2();
- testexp2();
- testexp2log2();
-#ifdef FIXED_POINT
- testilog2();
-#endif
- return ret;
-}
--- a/tests/mdct-test.c
+++ /dev/null
@@ -1,169 +1,0 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#define SKIP_CONFIG_H
-
-#ifndef CUSTOM_MODES
-#define CUSTOM_MODES
-#endif
-
-#include <stdio.h>
-#include "mdct.h"
-#define CELT_C
-#include "../libcelt/stack_alloc.h"
-
-#include "../libcelt/kiss_fft.c"
-#include "../libcelt/mdct.c"
-#include "../libcelt/mathops.c"
-#include "../libcelt/entcode.c"
-
-#ifndef M_PI
-#define M_PI 3.141592653
-#endif
-
-#ifdef FIXED_DEBUG
-long long celt_mips=0;
-#endif
-int ret = 0;
-void check(kiss_fft_scalar * in,kiss_fft_scalar * out,int nfft,int isinverse)
-{- int bin,k;
- double errpow=0,sigpow=0;
- double snr;
- for (bin=0;bin<nfft/2;++bin) {- double ansr = 0;
- double difr;
-
- for (k=0;k<nfft;++k) {- double phase = 2*M_PI*(k+.5+.25*nfft)*(bin+.5)/nfft;
- double re = cos(phase);
-
- re /= nfft/4;
-
- ansr += in[k] * re;
- }
- /*printf ("%f %f\n", ansr, out[bin]);*/- difr = ansr - out[bin];
- errpow += difr*difr;
- sigpow += ansr*ansr;
- }
- snr = 10*log10(sigpow/errpow);
- printf("nfft=%d inverse=%d,snr = %f\n",nfft,isinverse,snr );- if (snr<60) {- printf( "** poor snr: %f **\n", snr);
- ret = 1;
- }
-}
-
-void check_inv(kiss_fft_scalar * in,kiss_fft_scalar * out,int nfft,int isinverse)
-{- int bin,k;
- double errpow=0,sigpow=0;
- double snr;
- for (bin=0;bin<nfft;++bin) {- double ansr = 0;
- double difr;
-
- for (k=0;k<nfft/2;++k) {- double phase = 2*M_PI*(bin+.5+.25*nfft)*(k+.5)/nfft;
- double re = cos(phase);
-
- //re *= 2;
-
- ansr += in[k] * re;
- }
- /*printf ("%f %f\n", ansr, out[bin]);*/- difr = ansr - out[bin];
- errpow += difr*difr;
- sigpow += ansr*ansr;
- }
- snr = 10*log10(sigpow/errpow);
- printf("nfft=%d inverse=%d,snr = %f\n",nfft,isinverse,snr );- if (snr<60) {- printf( "** poor snr: %f **\n", snr);
- ret = 1;
- }
-}
-
-
-void test1d(int nfft,int isinverse)
-{- mdct_lookup cfg;
- size_t buflen = sizeof(kiss_fft_scalar)*nfft;
-
- kiss_fft_scalar * in = (kiss_fft_scalar*)malloc(buflen);
- kiss_fft_scalar * out= (kiss_fft_scalar*)malloc(buflen);
- celt_word16 * window= (celt_word16*)malloc(sizeof(celt_word16)*nfft/2);
- int k;
-
- clt_mdct_init(&cfg, nfft, 0);
- for (k=0;k<nfft;++k) {- in[k] = (rand() % 32768) - 16384;
- }
-
- for (k=0;k<nfft/2;++k) {- window[k] = Q15ONE;
- }
-#ifdef DOUBLE_PRECISION
- for (k=0;k<nfft;++k) {- in[k] *= 32768;
- }
-#endif
-
- if (isinverse)
- {- for (k=0;k<nfft;++k) {- in[k] /= nfft;
- }
- }
-
- /*for (k=0;k<nfft;++k) printf("%d %d ", in[k].r, in[k].i);printf("\n");*/-
- if (isinverse)
- {- for (k=0;k<nfft;++k)
- out[k] = 0;
- clt_mdct_backward(&cfg,in,out, window, nfft/2, 0);
- check_inv(in,out,nfft,isinverse);
- } else {- clt_mdct_forward(&cfg,in,out,window, nfft/2, 0);
- check(in,out,nfft,isinverse);
- }
- /*for (k=0;k<nfft;++k) printf("%d %d ", out[k].r, out[k].i);printf("\n");*/-
-
- free(in);
- free(out);
- clt_mdct_clear(&cfg);
-}
-
-int main(int argc,char ** argv)
-{- ALLOC_STACK;
- if (argc>1) {- int k;
- for (k=1;k<argc;++k) {- test1d(atoi(argv[k]),0);
- test1d(atoi(argv[k]),1);
- }
- }else{- test1d(32,0);
- test1d(32,1);
- test1d(256,0);
- test1d(256,1);
- test1d(512,0);
- test1d(512,1);
-#ifndef RADIX_TWO_ONLY
- test1d(40,0);
- test1d(40,1);
- test1d(120,0);
- test1d(120,1);
- test1d(240,0);
- test1d(240,1);
- test1d(480,0);
- test1d(480,1);
-#endif
- }
- return ret;
-}
--- a/tests/real-fft-test.c
+++ /dev/null
@@ -1,171 +1,0 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "kiss_fftr.h"
-#include "_kiss_fft_guts.h"
-#include <stdio.h>
-#include <string.h>
-
-#define CELT_C
-#include "../libcelt/stack_alloc.h"
-#include "../libcelt/kiss_fft.c"
-#include "../libcelt/kiss_fftr.c"
-
-#ifdef FIXED_DEBUG
-long long celt_mips=0;
-#endif
-int ret=0;
-
-static
-kiss_fft_scalar rand_scalar(void)
-{- return (rand()%32767)-16384;
-}
-
-static
-double snr_compare( kiss_fft_cpx * vec1,kiss_fft_scalar * vec2, int n)
-{- int k;
- double sigpow=1e-10, noisepow=1e-10, err,snr;
-
- vec1[0].i = vec1[n].r;
- for (k=0;k<n;++k) {- sigpow += (double)vec1[k].r * (double)vec1[k].r +
- (double)vec1[k].i * (double)vec1[k].i;
- err = (double)vec1[k].r - (double)vec2[2*k];
- /*printf ("%f %f\n", (double)vec1[k].r, (double)vec2[2*k]);*/- noisepow += err * err;
- err = (double)vec1[k].i - (double)vec2[2*k+1];
- /*printf ("%f %f\n", (double)vec1[k].i, (double)vec2[2*k+1]);*/- noisepow += err * err;
-
- }
- snr = 10*log10( sigpow / noisepow );
- if (snr<60) {- printf( "** poor snr: %f **\n", snr);
- ret = 1;
- }
- return snr;
-}
-
-static
-double snr_compare_scal( kiss_fft_scalar * vec1,kiss_fft_scalar * vec2, int n)
-{- int k;
- double sigpow=1e-10, noisepow=1e-10, err,snr;
-
- for (k=0;k<n;++k) {- sigpow += (double)vec1[k] * (double)vec1[k];
- err = (double)vec1[k] - (double)vec2[k];
- noisepow += err * err;
- }
- snr = 10*log10( sigpow / noisepow );
- if (snr<60) {- printf( "\npoor snr: %f\n", snr);
- ret = 1;
- }
- return snr;
-}
-#ifdef RADIX_TWO_ONLY
-#define NFFT 1024
-#else
-#define NFFT 8*3*5
-#endif
-
-#ifndef NUMFFTS
-#define NUMFFTS 10000
-#endif
-
-
-int main(void)
-{- int i;
- kiss_fft_cpx cin[NFFT];
- kiss_fft_cpx cout[NFFT];
- kiss_fft_scalar fin[NFFT];
- kiss_fft_scalar sout[NFFT];
- kiss_fft_cfg kiss_fft_state;
- kiss_fftr_cfg kiss_fftr_state;
-
- kiss_fft_scalar rin[NFFT+2];
- kiss_fft_scalar rout[NFFT+2];
- kiss_fft_scalar zero;
- ALLOC_STACK;
- memset(&zero,0,sizeof(zero) ); // ugly way of setting short,int,float,double, or __m128 to zero
-
- for (i=0;i<NFFT;++i) {- rin[i] = rand_scalar();
-#if defined(FIXED_POINT) && defined(DOUBLE_PRECISION)
- rin[i] *= 32768;
-#endif
- cin[i].r = rin[i];
- cin[i].i = zero;
- }
-
- kiss_fft_state = kiss_fft_alloc(NFFT,0,0);
- kiss_fftr_state = kiss_fftr_alloc(NFFT,0,0);
- kiss_fft(kiss_fft_state,cin,cout);
- kiss_fftr(kiss_fftr_state,rin,sout);
-
- printf( "nfft=%d, inverse=%d, snr=%g\n",
- NFFT,0, snr_compare(cout,sout,(NFFT/2)) );
-
- memset(cin,0,sizeof(cin));
- cin[0].r = rand_scalar();
- cin[NFFT/2].r = rand_scalar();
- for (i=1;i< NFFT/2;++i) {- //cin[i].r = (kiss_fft_scalar)(rand()-RAND_MAX/2);
- cin[i].r = rand_scalar();
- cin[i].i = rand_scalar();
- }
-
- // conjugate symmetry of real signal
- for (i=1;i< NFFT/2;++i) {- cin[NFFT-i].r = cin[i].r;
- cin[NFFT-i].i = - cin[i].i;
- }
-
-
-#ifdef FIXED_POINT
-#ifdef DOUBLE_PRECISION
- for (i=0;i< NFFT;++i) {- cin[i].r *= 32768;
- cin[i].i *= 32768;
- }
-#endif
- for (i=0;i< NFFT;++i) {- cin[i].r /= NFFT;
- cin[i].i /= NFFT;
- }
-#endif
-
- fin[0] = cin[0].r;
- fin[1] = cin[NFFT/2].r;
- for (i=1;i< NFFT/2;++i)
- {- fin[2*i] = cin[i].r;
- fin[2*i+1] = cin[i].i;
- }
-
- kiss_ifft(kiss_fft_state,cin,cout);
- kiss_fftri(kiss_fftr_state,fin,rout);
- /*
- printf(" results from inverse kiss_fft : (%f,%f), (%f,%f), (%f,%f), (%f,%f), (%f,%f) ...\n "- , (float)cout[0].r , (float)cout[0].i , (float)cout[1].r , (float)cout[1].i , (float)cout[2].r , (float)cout[2].i , (float)cout[3].r , (float)cout[3].i , (float)cout[4].r , (float)cout[4].i
- );
-
- printf(" results from inverse kiss_fftr: %f,%f,%f,%f,%f ... \n"- ,(float)rout[0] ,(float)rout[1] ,(float)rout[2] ,(float)rout[3] ,(float)rout[4]);
-*/
- for (i=0;i<NFFT;++i) {- sout[i] = cout[i].r;
- }
-
- printf( "nfft=%d, inverse=%d, snr=%g\n",
- NFFT,1, snr_compare_scal(rout,sout,NFFT) );
- free(kiss_fft_state);
- free(kiss_fftr_state);
-
- return ret;
-}
--- a/tests/rotation-test.c
+++ /dev/null
@@ -1,49 +1,0 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include "celt_types.h"
-#include "bands.h"
-#include <math.h>
-#define MAX_SIZE 100
-
-int ret=0;
-void test_rotation(int N, int K)
-{- int i;
- double err = 0, ener = 0, snr, snr0;
- celt_word16 x0[MAX_SIZE];
- celt_word16 x1[MAX_SIZE];
- int nb_rotations = (N+4*K)/(8*K);
- for (i=0;i<N;i++)
- x1[i] = x0[i] = rand()%32767-16384;
- exp_rotation(x1, N, 1, 1, nb_rotations);
- for (i=0;i<N;i++)
- {- err += (x0[i]-(double)x1[i])*(x0[i]-(double)x1[i]);
- ener += x0[i]*(double)x0[i];
- }
- snr0 = 20*log10(ener/err);
- err = ener = 0;
- exp_rotation(x1, N, -1, 1, nb_rotations);
- for (i=0;i<N;i++)
- {- err += (x0[i]-(double)x1[i])*(x0[i]-(double)x1[i]);
- ener += x0[i]*(double)x0[i];
- }
- snr = 20*log10(ener/err);
- printf ("SNR for size %d (%d pulses) is %f (was %f without inverse)\n", N, K, snr, snr0);- if (snr < 60 || snr0 > 20)
- ret = 1;
-}
-
-int main(void)
-{- test_rotation(15, 3);
- test_rotation(23, 5);
- test_rotation(50, 3);
- test_rotation(80, 1);
- return ret;
-}
--- a/tests/tandem-test.c
+++ /dev/null
@@ -1,204 +1,0 @@
-/* (C) 2009 Gregory Maxwell
-
- This test runs pink noise through the encoder and decoder many times
- while feeding the output back into the input. It checks that after
- a number of cycles the energy has not increased or decreased by too
- large an amount.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- - Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- - Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "celt.h"
-#include "arch.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <time.h>
-#include <math.h>
-#include <string.h>
-
-#ifndef _MSC_VER
-#include <unistd.h>
-#endif
-
-int async_tandem(int rate, int frame_size, int channels, int bitrate_min,
- int bitrate_max)
-{- int error;
- unsigned char data[648];
- CELTMode *mode = NULL;
- CELTEncoder *enc;
- short carry[2];
- short pcm[960 * 2];
- CELTDecoder *dec;
- int bmin, bmax;
- float ms;
- int ret, i, j, bytes_per_frame;
- int increment = 1;
-
- bmin = floor((bitrate_min / (rate / (float) frame_size)) / 8.0);
- bmax = ceil((bitrate_max / (rate / (float) frame_size)) / 8.0);
- if (bmin < 8)
- bmin = 8;
- if (bmax > 640)
- bmax = 640;
- if (bmin >= bmax)
- bmax = bmin + 8;
-
- increment += (bmax - bmin) / 128;
-
- printf ("Testing asynchronous tandeming (%dHz, %dch, %d samples, %d - %d bytes).\n",- rate, channels, frame_size, bmin, bmax);
-
- mode = celt_mode_create(rate, frame_size, &error);
- if (mode == NULL || error) {- fprintf(stderr, "Error: failed to create a mode: %s\n", celt_strerror(error));
- exit(1);
- }
-
- dec = celt_decoder_create_custom(mode, channels, &error);
- if (error){- fprintf(stderr, "Error: celt_decoder_create returned %s\n", celt_strerror(error));
- exit(1);
- }
- enc = celt_encoder_create_custom(mode, channels, &error);
- if (error){- fprintf(stderr, "Error: celt_encoder_create returned %s\n", celt_strerror(error));
- exit(1);
- }
-
- for (j = 0; j < frame_size * channels; j++)
- pcm[j] = 0;
-
- for (bytes_per_frame = bmin; bytes_per_frame <= bmax;
- bytes_per_frame += increment) {- /*Prime the encoder and decoder */
- for (i = 0; i < (1024 + (frame_size >> 1)) / frame_size + 2; i++) {-
- for (j = 0; j < channels; j++)
- pcm[j] = pcm[frame_size * channels - (channels - j + 1)];
- for (j = channels; j < frame_size * channels - 1; j++)
- pcm[j] = ((rand() % 4096) - 2048) + .9 * pcm[j - channels];
-
- ret = celt_encode(enc, pcm, frame_size, data, bytes_per_frame);
- if (ret != bytes_per_frame) {- fprintf(stderr, "Error: celt_encode returned %s\n", celt_strerror(ret));
- exit(1);
- }
-
- ret = celt_decode(dec, data, ret, pcm, frame_size);
- if (ret < 0) {- fprintf(stderr, "Error: celt_decode returned %s\n", celt_strerror(ret));
- }
- }
-
- for (j = 0; j < channels; j++)
- pcm[j] = pcm[frame_size * channels - (channels - j)];
- for (j = channels; j < frame_size * channels - 1; j++)
- pcm[j] = ((rand() % 4096) - 2048) + .9 * pcm[j - channels];
-
- for (i = 0; i < 8; i++) {- for (j = 0; j < channels; j++)
- carry[j] = pcm[frame_size * channels - (channels - j)];
- memmove(pcm + channels, pcm, sizeof(short) * frame_size * channels);
- for (j = 0; j < channels; j++)
- pcm[j] = carry[j];
-
- ret = celt_encode(enc, pcm, frame_size, data, bytes_per_frame);
- if (ret != bytes_per_frame) {- fprintf(stderr, "Error: at %d bytes_per_frame celt_encode returned %s\n",
- bytes_per_frame, celt_strerror(ret));
- exit(1);
- }
-
- ret = celt_decode(dec, data, ret, pcm, frame_size);
- if (ret < 0) {- fprintf(stderr, "Error: at %d bytes_per_frame celt_decode returned %s\n",
- bytes_per_frame, celt_strerror(ret));
- exit(1);
- }
- }
- ms = 0;
- for (j = 0; j < frame_size * channels; j++)
- ms += pcm[j] * pcm[j];
- ms = sqrt(ms / (frame_size * channels));
- if (ms > 7000 || ms < 1000) {- fprintf(stderr, "Error: Signal out of expected range. %d %d %d %d %f\n",
- rate, channels, frame_size, bytes_per_frame, ms);
- exit(1);
- }
- }
-
- celt_encoder_destroy(enc);
- celt_decoder_destroy(dec);
- celt_mode_destroy(mode);
-
- return 0;
-}
-
-int main(int argc, char *argv[])
-{-#ifdef CUSTOM_MODES
- int sizes[8]={960,512,480,256,240,128,120,64};-#else
- int sizes[4]={960,480,240,120};-#endif
- unsigned int seed;
- int ch, n;
-
- if (argc > 2) {- fprintf(stderr, "Usage: %s [<seed>]\n", argv[0]);
- return 1;
- }
-
- if (argc > 1)
- seed = atoi(argv[1]);
- else
- seed = (time(NULL) ^ ((getpid() % 65536) << 16));
-
- srand(seed);
- printf("CELT codec tests. Random seed: %u (%.4X)\n", seed, rand() % 65536);-
-#ifdef CUSTOM_MODES
- for (n = 0; n < 8; n++) {- for (ch = 1; ch <= 2; ch++) {- async_tandem(48000, sizes[n], ch, 12000 * ch, 128000 * ch);
- async_tandem(44100, sizes[n], ch, 12000 * ch, 128000 * ch);
- if(n>0)async_tandem(32000, sizes[n], ch, 12000 * ch, 128000 * ch);
- if(n>2)async_tandem(16000, sizes[n], ch, 12000 * ch, 64000 * ch);
- }
- }
-#else
- for (n = 0; n < 4; n++) {- for (ch = 1; ch <= 2; ch++) {- async_tandem(48000, sizes[n], ch, 12000 * ch, 128000 * ch);
- }
- }
-#endif
- return 0;
-}
--- a/tests/type-test.c
+++ /dev/null
@@ -1,23 +1,0 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "celt_types.h"
-#include <stdio.h>
-
-int main(void)
-{- celt_int16 i = 1;
- i <<= 14;
- if (i>>14 != 1)
- {- fprintf(stderr, "celt_int16 isn't 16 bits\n");
- return 1;
- }
- if (sizeof(celt_int16)*2 != sizeof(celt_int32))
- {- fprintf(stderr, "16*2 != 32\n");
- return 1;
- }
- return 0;
-}
--- a/tools/Makefile.am
+++ /dev/null
@@ -1,21 +1,0 @@
-## Process this file with automake to produce Makefile.in. -*-Makefile-*-
-
-# $Id: Makefile.am,v 1.11 2004/02/18 06:59:40 jm Exp $
-
-# Disable automatic dependency tracking if using other tools than gcc and gmake
-#AUTOMAKE_OPTIONS = no-dependencies
-
-INCLUDES = -I$(top_srcdir)/libcelt -I$(top_builddir)/ @OGG_CFLAGS@
-
-EXTRA_DIST = getopt_win.h getopt.c getopt1.c wave_out.c wave_out.h skeleton.h
-
-include_HEADERS =
-noinst_HEADERS = wav_io.h
-
-bin_PROGRAMS = celtenc celtdec
-
-celtenc_SOURCES = celtenc.c wav_io.c skeleton.c
-celtenc_LDADD = $(top_builddir)/libcelt/libcelt@LIBCELT_SUFFIX@.la $(OGG_LIBS)
-
-celtdec_SOURCES = celtdec.c wav_io.c
-celtdec_LDADD = $(top_builddir)/libcelt/libcelt@LIBCELT_SUFFIX@.la $(OGG_LIBS)
--- a/tools/alsa_device.c
+++ /dev/null
@@ -1,429 +1,0 @@
-/*
- Copyright (C) 2004-2006 Jean-Marc Valin
- Copyright (C) 2006 Commonwealth Scientific and Industrial Research
- Organisation (CSIRO) Australia
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#include "alsa_device.h"
-#include <stdlib.h>
-#include <alsa/asoundlib.h>
-
-struct AlsaDevice_ {- char *device_name;
- int channels;
- int period;
- snd_pcm_t *capture_handle;
- snd_pcm_t *playback_handle;
- int readN, writeN;
- struct pollfd *read_fd, *write_fd;
-};
-
-#define PERIODS 3
-AlsaDevice *alsa_device_open(char *device_name, unsigned int rate, int channels, int period)
-{- int dir;
- int err;
- snd_pcm_hw_params_t *hw_params;
- snd_pcm_sw_params_t *sw_params;
- snd_pcm_uframes_t period_size = period;
- snd_pcm_uframes_t buffer_size = PERIODS*period;
- static snd_output_t *jcd_out;
- AlsaDevice *dev = malloc(sizeof(*dev));
- if (!dev)
- return NULL;
- dev->device_name = malloc(1+strlen(device_name));
- if (!dev->device_name)
- {- free(dev);
- return NULL;
- }
- strcpy(dev->device_name, device_name);
- dev->channels = channels;
- dev->period = period;
- err = snd_output_stdio_attach(&jcd_out, stdout, 0);
-
- if ((err = snd_pcm_open (&dev->capture_handle, dev->device_name, SND_PCM_STREAM_CAPTURE, 0)) < 0) {- fprintf (stderr, "cannot open audio device %s (%s)\n",
- dev->device_name,
- snd_strerror (err));
- assert(0);
- }
-
- if ((err = snd_pcm_hw_params_malloc (&hw_params)) < 0) {- fprintf (stderr, "cannot allocate hardware parameter structure (%s)\n",
- snd_strerror (err));
- assert(0);
- }
-
- if ((err = snd_pcm_hw_params_any (dev->capture_handle, hw_params)) < 0) {- fprintf (stderr, "cannot initialize hardware parameter structure (%s)\n",
- snd_strerror (err));
- assert(0);
- }
-
- if ((err = snd_pcm_hw_params_set_access (dev->capture_handle, hw_params, SND_PCM_ACCESS_RW_INTERLEAVED)) < 0) {- fprintf (stderr, "cannot set access type (%s)\n",
- snd_strerror (err));
- assert(0);
- }
-
- if ((err = snd_pcm_hw_params_set_format (dev->capture_handle, hw_params, SND_PCM_FORMAT_S16_LE)) < 0) {- fprintf (stderr, "cannot set sample format (%s)\n",
- snd_strerror (err));
- assert(0);
- }
-
- if ((err = snd_pcm_hw_params_set_rate_near (dev->capture_handle, hw_params, &rate, 0)) < 0) {- fprintf (stderr, "cannot set sample rate (%s)\n",
- snd_strerror (err));
- assert(0);
- }
- /*fprintf (stderr, "rate = %d\n", rate);*/
-
- if ((err = snd_pcm_hw_params_set_channels (dev->capture_handle, hw_params, channels)) < 0) {- fprintf (stderr, "cannot set channel count (%s)\n",
- snd_strerror (err));
- assert(0);
- }
-
- period_size = period;
- dir = 0;
- if ((err = snd_pcm_hw_params_set_period_size_near (dev->capture_handle, hw_params, &period_size, &dir)) < 0) {- fprintf (stderr, "cannot set period size (%s)\n",
- snd_strerror (err));
- assert(0);
- }
-
- if ((err = snd_pcm_hw_params_set_periods (dev->capture_handle, hw_params, PERIODS, 0)) < 0) {- fprintf (stderr, "cannot set number of periods (%s)\n",
- snd_strerror (err));
- assert(0);
- }
-
- buffer_size = period_size * PERIODS;
- dir=0;
- if ((err = snd_pcm_hw_params_set_buffer_size_near (dev->capture_handle, hw_params, &buffer_size)) < 0) {- fprintf (stderr, "cannot set buffer time (%s)\n",
- snd_strerror (err));
- assert(0);
- }
-
- if ((err = snd_pcm_hw_params (dev->capture_handle, hw_params)) < 0) {- fprintf (stderr, "cannot set capture parameters (%s)\n",
- snd_strerror (err));
- assert(0);
- }
- /*snd_pcm_dump_setup(dev->capture_handle, jcd_out);*/
- snd_pcm_hw_params_free (hw_params);
-
- if ((err = snd_pcm_sw_params_malloc (&sw_params)) < 0) {- fprintf (stderr, "cannot allocate software parameters structure (%s)\n",
- snd_strerror (err));
- assert(0);
- }
- if ((err = snd_pcm_sw_params_current (dev->capture_handle, sw_params)) < 0) {- fprintf (stderr, "cannot initialize software parameters structure (%s)\n",
- snd_strerror (err));
- assert(0);
- }
- if ((err = snd_pcm_sw_params_set_avail_min (dev->capture_handle, sw_params, period)) < 0) {- fprintf (stderr, "cannot set minimum available count (%s)\n",
- snd_strerror (err));
- assert(0);
- }
- if ((err = snd_pcm_sw_params (dev->capture_handle, sw_params)) < 0) {- fprintf (stderr, "cannot set software parameters (%s)\n",
- snd_strerror (err));
- assert(0);
- }
-
-
- if ((err = snd_pcm_open (&dev->playback_handle, dev->device_name, SND_PCM_STREAM_PLAYBACK, 0)) < 0) {- fprintf (stderr, "cannot open audio device %s (%s)\n",
- dev->device_name,
- snd_strerror (err));
- assert(0);
- }
-
- if ((err = snd_pcm_hw_params_malloc (&hw_params)) < 0) {- fprintf (stderr, "cannot allocate hardware parameter structure (%s)\n",
- snd_strerror (err));
- assert(0);
- }
-
- if ((err = snd_pcm_hw_params_any (dev->playback_handle, hw_params)) < 0) {- fprintf (stderr, "cannot initialize hardware parameter structure (%s)\n",
- snd_strerror (err));
- assert(0);
- }
-
- if ((err = snd_pcm_hw_params_set_access (dev->playback_handle, hw_params, SND_PCM_ACCESS_RW_INTERLEAVED)) < 0) {- fprintf (stderr, "cannot set access type (%s)\n",
- snd_strerror (err));
- assert(0);
- }
-
- if ((err = snd_pcm_hw_params_set_format (dev->playback_handle, hw_params, SND_PCM_FORMAT_S16_LE)) < 0) {- fprintf (stderr, "cannot set sample format (%s)\n",
- snd_strerror (err));
- assert(0);
- }
-
- if ((err = snd_pcm_hw_params_set_rate_near (dev->playback_handle, hw_params, &rate, 0)) < 0) {- fprintf (stderr, "cannot set sample rate (%s)\n",
- snd_strerror (err));
- assert(0);
- }
- /*fprintf (stderr, "rate = %d\n", rate);*/
-
- if ((err = snd_pcm_hw_params_set_channels (dev->playback_handle, hw_params, channels)) < 0) {- fprintf (stderr, "cannot set channel count (%s)\n",
- snd_strerror (err));
- assert(0);
- }
-
- period_size = period;
- dir = 0;
- if ((err = snd_pcm_hw_params_set_period_size_near (dev->playback_handle, hw_params, &period_size, &dir)) < 0) {- fprintf (stderr, "cannot set period size (%s)\n",
- snd_strerror (err));
- assert(0);
- }
- if ((err = snd_pcm_hw_params_set_periods (dev->playback_handle, hw_params, PERIODS, 0)) < 0) {- fprintf (stderr, "cannot set number of periods (%s)\n",
- snd_strerror (err));
- assert(0);
- }
- buffer_size = period_size * PERIODS;
- dir=0;
- if ((err = snd_pcm_hw_params_set_buffer_size_near (dev->playback_handle, hw_params, &buffer_size)) < 0) {- fprintf (stderr, "cannot set buffer time (%s)\n",
- snd_strerror (err));
- assert(0);
- }
-
-
- if ((err = snd_pcm_hw_params (dev->playback_handle, hw_params)) < 0) {- fprintf (stderr, "cannot set playback parameters (%s)\n",
- snd_strerror (err));
- assert(0);
- }
-
- /*snd_pcm_dump_setup(dev->playback_handle, jcd_out);*/
- snd_pcm_hw_params_free (hw_params);
-
-
- if ((err = snd_pcm_sw_params_malloc (&sw_params)) < 0) {- fprintf (stderr, "cannot allocate software parameters structure (%s)\n",
- snd_strerror (err));
- assert(0);
- }
- if ((err = snd_pcm_sw_params_current (dev->playback_handle, sw_params)) < 0) {- fprintf (stderr, "cannot initialize software parameters structure (%s)\n",
- snd_strerror (err));
- assert(0);
- }
- if ((err = snd_pcm_sw_params_set_avail_min (dev->playback_handle, sw_params, period)) < 0) {- fprintf (stderr, "cannot set minimum available count (%s)\n",
- snd_strerror (err));
- assert(0);
- }
- if ((err = snd_pcm_sw_params_set_start_threshold (dev->playback_handle, sw_params, period)) < 0) {- fprintf (stderr, "cannot set start mode (%s)\n",
- snd_strerror (err));
- assert(0);
- }
- if ((err = snd_pcm_sw_params (dev->playback_handle, sw_params)) < 0) {- fprintf (stderr, "cannot set software parameters (%s)\n",
- snd_strerror (err));
- assert(0);
- }
-
-
- snd_pcm_link(dev->capture_handle, dev->playback_handle);
- if ((err = snd_pcm_prepare (dev->capture_handle)) < 0) {- fprintf (stderr, "cannot prepare audio interface for use (%s)\n",
- snd_strerror (err));
- assert(0);
- }
- if ((err = snd_pcm_prepare (dev->playback_handle)) < 0) {- fprintf (stderr, "cannot prepare audio interface for use (%s)\n",
- snd_strerror (err));
- assert(0);
- }
-
- dev->readN = snd_pcm_poll_descriptors_count(dev->capture_handle);
- dev->writeN = snd_pcm_poll_descriptors_count(dev->playback_handle);
-
- dev->read_fd = malloc(dev->readN*sizeof(*dev->read_fd));
- /*printf ("descriptors: %d %d\n", dev->readN, dev->writeN);*/- if (snd_pcm_poll_descriptors(dev->capture_handle, dev->read_fd, dev->readN) != dev->readN)
- {- fprintf (stderr, "cannot obtain capture file descriptors (%s)\n",
- snd_strerror (err));
- assert(0);
- }
-
- dev->write_fd = malloc(dev->writeN*sizeof(*dev->read_fd));
- if (snd_pcm_poll_descriptors(dev->playback_handle, dev->write_fd, dev->writeN) != dev->writeN)
- {- fprintf (stderr, "cannot obtain playback file descriptors (%s)\n",
- snd_strerror (err));
- assert(0);
- }
- return dev;
-}
-
-void alsa_device_close(AlsaDevice *dev)
-{- snd_pcm_close(dev->capture_handle);
- snd_pcm_close(dev->playback_handle);
- free(dev->device_name);
- free(dev);
-}
-
-int alsa_device_read(AlsaDevice *dev, short *pcm, int len)
-{- int err;
- /*fprintf (stderr, "-");*/
- if ((err = snd_pcm_readi (dev->capture_handle, pcm, len)) != len)
- {- if (err<0)
- {- //fprintf(stderr, "error %d, EPIPE = %d\n", err, EPIPE);
- if (err == -EPIPE)
- {- fprintf (stderr, "An overrun has occured, reseting capture\n");
- } else
- {- fprintf (stderr, "read from audio interface failed (%s)\n",
- snd_strerror (err));
- }
- if ((err = snd_pcm_prepare (dev->capture_handle)) < 0)
- {- fprintf (stderr, "cannot prepare audio interface for use (%s)\n",
- snd_strerror (err));
- }
- if ((err = snd_pcm_start (dev->capture_handle)) < 0)
- {- fprintf (stderr, "cannot prepare audio interface for use (%s)\n",
- snd_strerror (err));
- }
- /*alsa_device_read(dev,pcm,len);*/
- } else {- fprintf (stderr, "Couldn't read as many samples as I wanted (%d instead of %d)\n", err, len);
- }
- return 1;
- }
- return 0;
-}
-
-int alsa_device_write(AlsaDevice *dev, const short *pcm, int len)
-{- int err;
- /*fprintf (stderr, "+");*/
- if ((err = snd_pcm_writei (dev->playback_handle, pcm, len)) != len)
- {- if (err<0)
- {- if (err == -EPIPE)
- {- fprintf (stderr, "An underrun has occured, reseting playback, len=%d\n", len);
- } else
- {- fprintf (stderr, "write to audio interface failed (%s)\n",
- snd_strerror (err));
- }
- if ((err = snd_pcm_prepare (dev->playback_handle)) < 0)
- {- fprintf (stderr, "cannot prepare audio interface for use (%s)\n",
- snd_strerror (err));
- }
- } else {- fprintf (stderr, "Couldn't write as many samples as I wanted (%d instead of %d)\n", err, len);
- }
- /*alsa_device_write(dev,pcm,len);*/
- return 1;
- }
- return 0;
-}
-
-int alsa_device_capture_ready(AlsaDevice *dev, struct pollfd *pfds, unsigned int nfds)
-{- unsigned short revents=0;
- int err;
- if ((err = snd_pcm_poll_descriptors_revents(dev->capture_handle, pfds, dev->readN, &revents)) < 0)
- {- //cerr << "error in snd_pcm_poll_descriptors_revents for capture: " << snd_strerror (err) << endl;
- //FIXME: This is a kludge
- fprintf (stderr, "error in alsa_device_capture_ready: %s\n", snd_strerror (err));
- return pfds[0].revents & POLLIN;
- }
- //cerr << (revents & POLLERR) << endl;
- return revents & POLLIN;
-}
-
-int alsa_device_playback_ready(AlsaDevice *dev, struct pollfd *pfds, unsigned int nfds)
-{- unsigned short revents=0;
- int err;
- if ((err = snd_pcm_poll_descriptors_revents(dev->playback_handle, pfds+dev->readN, dev->writeN, &revents)) < 0)
- {- //cerr << "error in snd_pcm_poll_descriptors_revents for playback: " << snd_strerror (err) << endl;
- //FIXME: This is a kludge
- fprintf (stderr, "error in alsa_device_playback_ready: %s\n", snd_strerror (err));
- return pfds[1].revents & POLLOUT;
- }
- //cerr << (revents & POLLERR) << endl;
- return revents & POLLOUT;
-}
-
-void alsa_device_start(AlsaDevice *dev)
-{- int i;
- short pcm[dev->period*dev->channels];
- for (i=0;i<dev->period*dev->channels;i++)
- pcm[i] = 0;
- alsa_device_write(dev, pcm, dev->period);
- alsa_device_write(dev, pcm, dev->period);
- snd_pcm_start(dev->capture_handle);
- snd_pcm_start(dev->playback_handle);
-}
-
-int alsa_device_nfds(AlsaDevice *dev)
-{- return dev->writeN+dev->readN;
-}
-
-void alsa_device_getfds(AlsaDevice *dev, struct pollfd *pfds, unsigned int nfds)
-{- int i;
- assert (nfds >= dev->writeN+dev->readN);
- for (i=0;i<dev->readN;i++)
- pfds[i] = dev->read_fd[i];
- for (i=0;i<dev->writeN;i++)
- pfds[i+dev->readN] = dev->write_fd[i];
-}
--- a/tools/alsa_device.h
+++ /dev/null
@@ -1,66 +1,0 @@
-/*
- Copyright (C) 2004-2006 Jean-Marc Valin
- Copyright (C) 2006 Commonwealth Scientific and Industrial Research
- Organisation (CSIRO) Australia
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
-
-*/
-
-#ifndef ALSA_DEVICE_H
-#define ALSA_DEVICE_H
-
-#include <sys/poll.h>
-
-#ifdef __cplusplus
-extern "C" {-#endif
-
-struct AlsaDevice_;
-
-typedef struct AlsaDevice_ AlsaDevice;
-
-AlsaDevice *alsa_device_open(char *device_name, unsigned int rate, int channels, int period);
-
-void alsa_device_close(AlsaDevice *dev);
-
-int alsa_device_read(AlsaDevice *dev, short *pcm, int len);
-
-int alsa_device_write(AlsaDevice *dev, const short *pcm, int len);
-
-int alsa_device_capture_ready(AlsaDevice *dev, struct pollfd *pfds, unsigned int nfds);
-
-int alsa_device_playback_ready(AlsaDevice *dev, struct pollfd *pfds, unsigned int nfds);
-
-void alsa_device_start(AlsaDevice *dev);
-
-int alsa_device_nfds(AlsaDevice *dev);
-
-void alsa_device_getfds(AlsaDevice *dev, struct pollfd *pfds, unsigned int nfds);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
--- a/tools/celtclient.c
+++ /dev/null
@@ -1,256 +1,0 @@
-/***************************************************************************
- Copyright (C) 2004-2006 by Jean-Marc Valin
- Copyright (C) 2006 Commonwealth Scientific and Industrial Research
- Organisation (CSIRO) Australia
- Copyright (C) 2008-2009 Gregory Maxwell
- Copyright (c) 2007-2009 Xiph.Org Foundation
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- - Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- - Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-****************************************************************************/
-
-/* Compile with something like:
- * gcc -oceltclient celtclient.c alsa_device.c -I../libcelt/ -lspeexdsp -lasound -lcelt -lm
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <unistd.h> /* close() */
-#include <string.h> /* memset() */
-
-#include "alsa_device.h"
-#include <celt.h>
-#include <speex/speex_jitter.h>
-
-#include <sched.h>
-
-#define MAX_MSG 1500
-#define SAMPLING_RATE 48000
-#define FRAME_SIZE 256
-#define PACKETSIZE 43
-#define CHANNELS 1
-#define HAS_SPEEX_AEC
-
-#if CHANNELS == 2
-/* FIXME: The Speex AEC has multichannel support; but that API isn't being
- used here yet. */
-#undef HAS_SPEEX_AEC
-#endif
-
-#ifdef HAS_SPEEX_AEC
-#include <speex/speex_echo.h>
-#endif
-
-int main(int argc, char *argv[])
-{-
- int sd, rc, n;
- int i;
- struct sockaddr_in cliAddr, remoteAddr;
- char msg[MAX_MSG];
- struct hostent *h;
- int local_port, remote_port;
- int nfds;
- struct pollfd *pfds;
- AlsaDevice *audio_dev;
- int tmp;
-
- if (argc != 5)
- {- fprintf(stderr, "Usage %s plughw:0,0 remote_host local_udp_port remote_udp_port\n",argv[0]);
- exit(1);
- }
-
- h = gethostbyname(argv[2]);
- if(h==NULL) {- fprintf(stderr, "%s: unknown host '%s' \n", argv[0], argv[2]);
- exit(1);
- }
-
- local_port = atoi(argv[3]);
- remote_port = atoi(argv[4]);
-
- printf("%s: sending data to '%s' (IP : %s) \n", argv[0], h->h_name,- inet_ntoa(*(struct in_addr *)h->h_addr_list[0]));
-
- {- remoteAddr.sin_family = h->h_addrtype;
- memcpy((char *) &remoteAddr.sin_addr.s_addr,
- h->h_addr_list[0], h->h_length);
- remoteAddr.sin_port = htons(remote_port);
- }
- /* socket creation */
- sd=socket(AF_INET, SOCK_DGRAM, 0);
- if(sd<0) {- printf("%s: cannot open socket \n",argv[0]);- exit(1);
- }
-
- /* bind any port */
- cliAddr.sin_family = AF_INET;
- cliAddr.sin_addr.s_addr = htonl(INADDR_ANY);
- cliAddr.sin_port = htons(local_port);
-
- rc = bind(sd, (struct sockaddr *) &cliAddr, sizeof(cliAddr));
- if(rc<0) {- printf("%s: cannot bind port\n", argv[0]);- exit(1);
- }
-
- /* Setup audio device */
- audio_dev = alsa_device_open(argv[1], SAMPLING_RATE, CHANNELS, FRAME_SIZE);
-
- /* Setup the encoder and decoder in wideband */
- CELTEncoder *enc_state;
- CELTDecoder *dec_state;
- CELTMode *mode = celt_mode_create(SAMPLING_RATE, FRAME_SIZE, NULL);
- enc_state = celt_encoder_create_custom(mode, CHANNELS, NULL);
- dec_state = celt_decoder_create_custom(mode, CHANNELS, NULL);
- struct sched_param param;
- /*param.sched_priority = 40; */
- param.sched_priority = sched_get_priority_min(SCHED_FIFO);
- if (sched_setscheduler(0,SCHED_FIFO,¶m))
- perror("sched_setscheduler");-
- int send_timestamp = 0;
- int recv_started=0;
-
- /* Setup all file descriptors for poll()ing */
- nfds = alsa_device_nfds(audio_dev);
- pfds = malloc(sizeof(*pfds)*(nfds+1));
- alsa_device_getfds(audio_dev, pfds, nfds);
- pfds[nfds].fd = sd;
- pfds[nfds].events = POLLIN;
-
- /* Setup jitter buffer using decoder */
- JitterBuffer *jitter;
- jitter = jitter_buffer_init(FRAME_SIZE);
- tmp = FRAME_SIZE;
- jitter_buffer_ctl(jitter, JITTER_BUFFER_SET_MARGIN, &tmp);
-#ifdef HAS_SPEEX_AEC
- /* Echo canceller with 200 ms tail length */
- SpeexEchoState *echo_state = speex_echo_state_init(FRAME_SIZE, 10*FRAME_SIZE);
- tmp = SAMPLING_RATE;
- speex_echo_ctl(echo_state, SPEEX_ECHO_SET_SAMPLING_RATE, &tmp);
-#endif
- alsa_device_start(audio_dev);
-
- /* Infinite loop on capture, playback and receiving packets */
- while (1)
- {- /* Wait for either 1) capture 2) playback 3) socket data */
- poll(pfds, nfds+1, -1);
- /* Received packets */
- if (pfds[nfds].revents & POLLIN)
- {- n = recv(sd, msg, MAX_MSG, 0);
- int recv_timestamp = ((int*)msg)[0];
-
- JitterBufferPacket packet;
- packet.data = msg+4;
- packet.len = n-4;
- packet.timestamp = recv_timestamp;
- packet.span = FRAME_SIZE;
- packet.sequence = 0;
- /* Put content of the packet into the jitter buffer, except for the pseudo-header */
- jitter_buffer_put(jitter, &packet);
- recv_started = 1;
-
- }
- /* Ready to play a frame (playback) */
- if (alsa_device_playback_ready(audio_dev, pfds, nfds))
- {- short pcm[FRAME_SIZE*CHANNELS];
- if (recv_started)
- {- JitterBufferPacket packet;
- /* Get audio from the jitter buffer */
- packet.data = msg;
- packet.len = MAX_MSG;
- jitter_buffer_tick(jitter);
- jitter_buffer_get(jitter, &packet, FRAME_SIZE, NULL);
- if (packet.len==0)
- packet.data=NULL;
- celt_decode(dec_state, packet.data, packet.len, pcm, FRAME_SIZE);
- } else {- for (i=0;i<FRAME_SIZE*CHANNELS;i++)
- pcm[i] = 0;
- }
- /* Playback the audio and reset the echo canceller if we got an underrun */
-
-#ifdef HAS_SPEEX_AEC
- if (alsa_device_write(audio_dev, pcm, FRAME_SIZE))
- speex_echo_state_reset(echo_state);
- /* Put frame into playback buffer */
- speex_echo_playback(echo_state, pcm);
-#else
- alsa_device_write(audio_dev, pcm, FRAME_SIZE);
-#endif
- }
- /* Audio available from the soundcard (capture) */
- if (alsa_device_capture_ready(audio_dev, pfds, nfds))
- {- short pcm[FRAME_SIZE*CHANNELS], pcm2[FRAME_SIZE*CHANNELS];
- char outpacket[MAX_MSG];
- /* Get audio from the soundcard */
- alsa_device_read(audio_dev, pcm, FRAME_SIZE);
-
-#ifdef HAS_SPEEX_AEC
- /* Perform echo cancellation */
- speex_echo_capture(echo_state, pcm, pcm2);
- for (i=0;i<FRAME_SIZE*CHANNELS;i++)
- pcm[i] = pcm2[i];
-#endif
- /* Encode */
- celt_encode(enc_state, pcm, FRAME_SIZE, outpacket+4, PACKETSIZE);
-
- /* Pseudo header: four null bytes and a 32-bit timestamp */
- ((int*)outpacket)[0] = send_timestamp;
- send_timestamp += FRAME_SIZE;
- rc = sendto(sd, outpacket, PACKETSIZE+4, 0,
- (struct sockaddr *) &remoteAddr,
- sizeof(remoteAddr));
-
- if(rc<0) {- perror("cannot send to socket");- close(sd);
- exit(1);
- }
- }
-
-
- }
-
-
- return 0;
-}
--- a/tools/celtdec.c
+++ /dev/null
@@ -1,673 +1,0 @@
-/* Copyright (c) 2002-2007 Jean-Marc Valin
- Copyright (c) 2008 CSIRO
- Copyright (c) 2007-2009 Xiph.Org Foundation
- File: celtdec.c
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- - Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- - Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <stdio.h>
-#if !defined WIN32 && !defined _WIN32
-#include <unistd.h>
-#endif
-#ifdef HAVE_GETOPT_H
-#include <getopt.h>
-#endif
-#ifndef HAVE_GETOPT_LONG
-#include "getopt_win.h"
-#endif
-#include <stdlib.h>
-#include <string.h>
-
-#include <celt.h>
-#include <ogg/ogg.h>
-
-#if defined WIN32 || defined _WIN32
-#include "wave_out.h"
-/* We need the following two to set stdout to binary */
-#include <io.h>
-#include <fcntl.h>
-#endif
-#include <math.h>
-
-#ifdef __MINGW32__
-#include "wave_out.c"
-#endif
-
-#ifdef HAVE_SYS_SOUNDCARD_H
-#include <sys/soundcard.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <sys/ioctl.h>
-
-#elif defined HAVE_SYS_AUDIOIO_H
-#include <sys/types.h>
-#include <fcntl.h>
-#include <sys/ioctl.h>
-#include <sys/audioio.h>
-#ifndef AUDIO_ENCODING_SLINEAR
-#define AUDIO_ENCODING_SLINEAR AUDIO_ENCODING_LINEAR /* Solaris */
-#endif
-
-#endif
-
-#include <string.h>
-#include "wav_io.h"
-#include <celt_header.h>
-
-#define MAX_FRAME_SIZE 2048
-
-#define readint(buf, base) (((buf[base+3]<<24)&0xff000000)| \
- ((buf[base+2]<<16)&0xff0000)| \
- ((buf[base+1]<<8)&0xff00)| \
- (buf[base]&0xff))
-
-static void print_comments(char *comments, int length)
-{- char *c=comments;
- int len, i, nb_fields;
- char *end;
-
- if (length<8)
- {- fprintf (stderr, "Invalid/corrupted comments\n");
- return;
- }
- end = c+length;
- len=readint(c, 0);
- c+=4;
- if (len < 0 || c+len>end)
- {- fprintf (stderr, "Invalid/corrupted comments\n");
- return;
- }
- fwrite(c, 1, len, stderr);
- c+=len;
- fprintf (stderr, "\n");
- if (c+4>end)
- {- fprintf (stderr, "Invalid/corrupted comments\n");
- return;
- }
- nb_fields=readint(c, 0);
- c+=4;
- for (i=0;i<nb_fields;i++)
- {- if (c+4>end)
- {- fprintf (stderr, "Invalid/corrupted comments\n");
- return;
- }
- len=readint(c, 0);
- c+=4;
- if (len < 0 || c+len>end)
- {- fprintf (stderr, "Invalid/corrupted comments\n");
- return;
- }
- fwrite(c, 1, len, stderr);
- c+=len;
- fprintf (stderr, "\n");
- }
-}
-
-FILE *out_file_open(char *outFile, int rate, int *channels)
-{- FILE *fout=NULL;
- /*Open output file*/
- if (strlen(outFile)==0)
- {-#if defined HAVE_SYS_SOUNDCARD_H
- int audio_fd, format, stereo;
- audio_fd=open("/dev/dsp", O_WRONLY);- if (audio_fd<0)
- {- perror("Cannot open /dev/dsp");- exit(1);
- }
-
- format=AFMT_S16_NE;
- if (ioctl(audio_fd, SNDCTL_DSP_SETFMT, &format)==-1)
- {- perror("SNDCTL_DSP_SETFMT");- close(audio_fd);
- exit(1);
- }
-
- stereo=0;
- if (*channels==2)
- stereo=1;
- if (ioctl(audio_fd, SNDCTL_DSP_STEREO, &stereo)==-1)
- {- perror("SNDCTL_DSP_STEREO");- close(audio_fd);
- exit(1);
- }
- if (stereo!=0)
- {- if (*channels==1)
- fprintf (stderr, "Cannot set mono mode, will decode in stereo\n");
- *channels=2;
- }
-
- if (ioctl(audio_fd, SNDCTL_DSP_SPEED, &rate)==-1)
- {- perror("SNDCTL_DSP_SPEED");- close(audio_fd);
- exit(1);
- }
- fout = fdopen(audio_fd, "w");
-#elif defined HAVE_SYS_AUDIOIO_H
- audio_info_t info;
- int audio_fd;
-
- audio_fd = open("/dev/audio", O_WRONLY);- if (audio_fd<0)
- {- perror("Cannot open /dev/audio");- exit(1);
- }
-
- AUDIO_INITINFO(&info);
-#ifdef AUMODE_PLAY /* NetBSD/OpenBSD */
- info.mode = AUMODE_PLAY;
-#endif
- info.play.encoding = AUDIO_ENCODING_SLINEAR;
- info.play.precision = 16;
- info.play.sample_rate = rate;
- info.play.channels = *channels;
-
- if (ioctl(audio_fd, AUDIO_SETINFO, &info) < 0)
- {- perror ("AUDIO_SETINFO");- exit(1);
- }
- fout = fdopen(audio_fd, "w");
-#elif defined WIN32 || defined _WIN32
- {- unsigned int celt_channels = *channels;
- if (Set_WIN_Params (INVALID_FILEDESC, rate, SAMPLE_SIZE, celt_channels))
- {- fprintf (stderr, "Can't access %s\n", "WAVE OUT");
- exit(1);
- }
- }
-#else
- fprintf (stderr, "No soundcard support\n");
- exit(1);
-#endif
- } else {- if (strcmp(outFile,"-")==0)
- {-#if defined WIN32 || defined _WIN32
- _setmode(_fileno(stdout), _O_BINARY);
-#endif
- fout=stdout;
- }
- else
- {- fout = fopen(outFile, "wb");
- if (!fout)
- {- perror(outFile);
- exit(1);
- }
- if (strcmp(outFile+strlen(outFile)-4,".wav")==0 || strcmp(outFile+strlen(outFile)-4,".WAV")==0)
- write_wav_header(fout, rate, *channels, 0, 0);
- }
- }
- return fout;
-}
-
-void usage(void)
-{- printf ("Usage: celtdec [options] input_file.oga [output_file]\n");- printf ("\n");- printf ("Decodes a CELT file and produce a WAV file or raw file\n");- printf ("\n");- printf ("input_file can be:\n");- printf (" filename.oga regular CELT file\n");- printf (" - stdin\n");- printf ("\n"); - printf ("output_file can be:\n");- printf (" filename.wav Wav file\n");- printf (" filename.* Raw PCM file (any extension other that .wav)\n");- printf (" - stdout\n");- printf (" (nothing) Will be played to soundcard\n");- printf ("\n"); - printf ("Options:\n");- printf (" --mono Force decoding in mono\n");- printf (" --stereo Force decoding in stereo\n");- printf (" --rate n Force decoding at sampling rate n Hz\n");- printf (" --packet-loss n Simulate n %% random packet loss\n");- printf (" -V Verbose mode (show bit-rate)\n"); - printf (" -h, --help This help\n");- printf (" -v, --version Version information\n");- printf ("\n");-}
-
-void version(void)
-{- printf ("celtenc (CELT %s encoder)\n",CELT_VERSION);- printf ("Copyright (C) 2008 Jean-Marc Valin\n");-}
-
-void version_short(void)
-{- printf ("celtenc (CELT %s encoder)\n",CELT_VERSION);- printf ("Copyright (C) 2008 Jean-Marc Valin\n");-}
-
-static CELTDecoder *process_header(ogg_packet *op, celt_int32 enh_enabled, celt_int32 *frame_size, int *granule_frame_size, celt_int32 *rate, int *nframes, int forceMode, int *channels, int *overlap, int *extra_headers, int quiet, CELTMode **mode)
-{- CELTDecoder *st;
- CELTHeader header;
- int bitstream;
-
- celt_header_from_packet(op->packet, op->bytes, &header);
-
- if (header.nb_channels>2 || header.nb_channels<1)
- {- fprintf (stderr, "Unsupported number of channels: %d\n", header.nb_channels);
- return NULL;
- }
- *mode = celt_mode_create(header.sample_rate, header.frame_size, NULL);
- if (*mode == NULL)
- {- fprintf (stderr, "Mode initialization failed.\n");
- return NULL;
- }
-
- /* FIXME: Set that to zero when we freeze */
- bitstream = 0x80001000;
- if (bitstream!=header.version_id)
- fprintf(stderr, "WARNING: Input was encoded with a CELT bitstream version %d. This decoder uses %d. Output will probably be corrupted.\n",header.version_id,bitstream);
-
- *channels = header.nb_channels;
- *overlap=header.overlap;
- st = celt_decoder_create_custom(*mode, header.nb_channels, NULL);
- if (!st)
- {- fprintf (stderr, "Decoder initialization failed.\n");
- return NULL;
- }
-
- /*celt_mode_info(*mode, CELT_GET_FRAME_SIZE, frame_size);*/
- *frame_size = header.frame_size;
- *granule_frame_size = *frame_size;
-
- if (!*rate)
- *rate = header.sample_rate;
-
- *nframes = 1;
-
- if (!quiet)
- {- fprintf (stderr, "Decoding %d Hz audio in", *rate);
-
- if (*channels==1)
- fprintf (stderr, " (mono");
- else
- fprintf (stderr, " (stereo");
- fprintf(stderr, ")\n");
- }
-
- *extra_headers = header.extra_headers;
-
- return st;
-}
-
-int main(int argc, char **argv)
-{- int c;
- int option_index = 0;
- char *inFile, *outFile;
- FILE *fin, *fout=NULL;
- short out[MAX_FRAME_SIZE];
- short output[MAX_FRAME_SIZE];
- int frame_size=0, granule_frame_size=0;
- void *st=NULL;
- CELTMode *mode=NULL;
- int packet_count=0;
- int stream_init = 0;
- int quiet = 0;
- ogg_int64_t page_granule=0, last_granule=0;
- int skip_samples=0, page_nb_packets;
- struct option long_options[] =
- {- {"help", no_argument, NULL, 0},- {"quiet", no_argument, NULL, 0},- {"version", no_argument, NULL, 0},- {"version-short", no_argument, NULL, 0},- {"rate", required_argument, NULL, 0},- {"mono", no_argument, NULL, 0},- {"stereo", no_argument, NULL, 0},- {"packet-loss", required_argument, NULL, 0},- {0, 0, 0, 0}- };
- ogg_sync_state oy;
- ogg_page og;
- ogg_packet op;
- ogg_stream_state os;
- int enh_enabled;
- int nframes=2;
- int print_bitrate=0;
- int close_in=0;
- int eos=0;
- int forceMode=-1;
- int audio_size=0;
- float loss_percent=-1;
- int channels=-1;
- int rate=0;
- int extra_headers=0;
- int wav_format=0;
- int lookahead=0;
- int celt_serialno = -1;
- int firstpacket = 1;
-
- enh_enabled = 1;
-
- /*Process options*/
- while(1)
- {- c = getopt_long (argc, argv, "hvV",
- long_options, &option_index);
- if (c==-1)
- break;
-
- switch(c)
- {- case 0:
- if (strcmp(long_options[option_index].name,"help")==0)
- {- usage();
- exit(0);
- } else if (strcmp(long_options[option_index].name,"quiet")==0)
- {- quiet = 1;
- } else if (strcmp(long_options[option_index].name,"version")==0)
- {- version();
- exit(0);
- } else if (strcmp(long_options[option_index].name,"version-short")==0)
- {- version_short();
- exit(0);
- } else if (strcmp(long_options[option_index].name,"mono")==0)
- {- channels=1;
- } else if (strcmp(long_options[option_index].name,"stereo")==0)
- {- channels=2;
- } else if (strcmp(long_options[option_index].name,"rate")==0)
- {- rate=atoi (optarg);
- } else if (strcmp(long_options[option_index].name,"packet-loss")==0)
- {- loss_percent = atof(optarg);
- }
- break;
- case 'h':
- usage();
- exit(0);
- break;
- case 'v':
- version();
- exit(0);
- break;
- case 'V':
- print_bitrate=1;
- break;
- case '?':
- usage();
- exit(1);
- break;
- }
- }
- if (argc-optind!=2 && argc-optind!=1)
- {- usage();
- exit(1);
- }
- inFile=argv[optind];
-
- if (argc-optind==2)
- outFile=argv[optind+1];
- else
- outFile = "";
- wav_format = strlen(outFile)>=4 && (
- strcmp(outFile+strlen(outFile)-4,".wav")==0
- || strcmp(outFile+strlen(outFile)-4,".WAV")==0);
- /*Open input file*/
- if (strcmp(inFile, "-")==0)
- {-#if defined WIN32 || defined _WIN32
- _setmode(_fileno(stdin), _O_BINARY);
-#endif
- fin=stdin;
- }
- else
- {- fin = fopen(inFile, "rb");
- if (!fin)
- {- perror(inFile);
- exit(1);
- }
- close_in=1;
- }
-
-
- /*Init Ogg data struct*/
- ogg_sync_init(&oy);
-
- /*Main decoding loop*/
-
- while (1)
- {- char *data;
- int i, nb_read;
- /*Get the ogg buffer for writing*/
- data = ogg_sync_buffer(&oy, 200);
- /*Read bitstream from input file*/
- nb_read = fread(data, sizeof(char), 200, fin);
- ogg_sync_wrote(&oy, nb_read);
-
- /*Loop for all complete pages we got (most likely only one)*/
- while (ogg_sync_pageout(&oy, &og)==1)
- {- if (stream_init == 0) {- ogg_stream_init(&os, ogg_page_serialno(&og));
- stream_init = 1;
- }
- if (ogg_page_serialno(&og) != os.serialno) {- /* so all streams are read. */
- ogg_stream_reset_serialno(&os, ogg_page_serialno(&og));
- }
- /*Add page to the bitstream*/
- ogg_stream_pagein(&os, &og);
- page_granule = ogg_page_granulepos(&og);
- page_nb_packets = ogg_page_packets(&og);
- if (page_granule>0 && frame_size)
- {- /* FIXME: shift the granule values if --force-* is specified */
- skip_samples = frame_size*(page_nb_packets*granule_frame_size*nframes - (page_granule-last_granule))/granule_frame_size;
- if (ogg_page_eos(&og))
- skip_samples = -skip_samples;
- /*else if (!ogg_page_bos(&og))
- skip_samples = 0;*/
- } else
- {- skip_samples = 0;
- }
- /*printf ("page granulepos: %d %d %d\n", skip_samples, page_nb_packets, (int)page_granule);*/- last_granule = page_granule;
- /*Extract all available packets*/
- while (!eos && ogg_stream_packetout(&os, &op) == 1)
- {- if (op.bytes>=8 && !memcmp(op.packet, "CELT ", 8)) {- celt_serialno = os.serialno;
- }
- if (celt_serialno == -1 || os.serialno != celt_serialno)
- break;
- /*If first packet, process as CELT header*/
- if (packet_count==0)
- {- st = process_header(&op, enh_enabled, &frame_size, &granule_frame_size, &rate, &nframes, forceMode, &channels, &lookahead, &extra_headers, quiet, &mode);
- if (!st)
- exit(1);
- if (!nframes)
- nframes=1;
- fout = out_file_open(outFile, rate, &channels);
-
- } else if (packet_count==1)
- {- if (!quiet)
- print_comments((char*)op.packet, op.bytes);
- } else if (packet_count<=1+extra_headers)
- {- /* Ignore extra headers */
- } else {- int lost=0;
- if (loss_percent>0 && 100*((float)rand())/RAND_MAX<loss_percent)
- lost=1;
-
- /*End of stream condition*/
- if (op.e_o_s && os.serialno == celt_serialno) /* don't care for anything except celt eos */
- eos=1;
-
- {- int ret;
- /*Decode frame*/
- if (!lost)
- ret = celt_decode(st, (unsigned char*)op.packet, op.bytes, output, frame_size);
- else
- ret = celt_decode(st, NULL, 0, output, frame_size);
-
- /*for (i=0;i<frame_size*channels;i++)
- printf ("%d\n", (int)output[i]);*/-
- if (ret<0)
- {- fprintf (stderr, "Decoding error: %s\n", celt_strerror(ret));
- break;
- }
-
- if (print_bitrate) {- celt_int32 tmp=op.bytes;
- char ch=13;
- fputc (ch, stderr);
- fprintf (stderr, "Bitrate in use: %d bytes/packet ", tmp);
- }
- /*Convert to short and save to output file*/
- if (strlen(outFile)!=0)
- {- for (i=0;i<frame_size*channels;i++)
- out[i]=le_short(output[i]);
- } else {- for (i=0;i<frame_size*channels;i++)
- out[i]=output[i];
- }
- {- int frame_offset = 0;
- int new_frame_size = frame_size;
- /*printf ("packet %d %d\n", packet_no, skip_samples);*/- /*fprintf (stderr, "packet %d %d %d\n", packet_no, skip_samples, lookahead);*/
- if (firstpacket == 1)
- {- /*printf ("chopping first packet\n");*/- new_frame_size -= lookahead;
- frame_offset = lookahead;
- firstpacket = 0;
- }
- if (new_frame_size>0)
- { -#if defined WIN32 || defined _WIN32
- if (strlen(outFile)==0)
- WIN_Play_Samples (out+frame_offset*channels, sizeof(short) * new_frame_size*channels);
- else
-#endif
- fwrite(out+frame_offset*channels, sizeof(short), new_frame_size*channels, fout);
-
- audio_size+=sizeof(short)*new_frame_size*channels;
- }
- }
- }
- }
- packet_count++;
- }
- }
- if (feof(fin))
- break;
-
- }
-
- if (fout && wav_format)
- {- if (fseek(fout,4,SEEK_SET)==0)
- {- int tmp;
- tmp = le_int(audio_size+36);
- fwrite(&tmp,4,1,fout);
- if (fseek(fout,32,SEEK_CUR)==0)
- {- tmp = le_int(audio_size);
- fwrite(&tmp,4,1,fout);
- } else
- {- fprintf (stderr, "First seek worked, second didn't\n");
- }
- } else {- fprintf (stderr, "Cannot seek on wave file, size will be incorrect\n");
- }
- }
-
- if (st)
- {- celt_decoder_destroy(st);
- celt_mode_destroy(mode);
- } else {- fprintf (stderr, "This doesn't look like a CELT file\n");
- }
- if (stream_init)
- ogg_stream_clear(&os);
- ogg_sync_clear(&oy);
-
-#if defined WIN32 || defined _WIN32
- if (strlen(outFile)==0)
- WIN_Audio_close ();
-#endif
-
- if (close_in)
- fclose(fin);
- if (fout != NULL)
- fclose(fout);
-
- return 0;
-}
--- a/tools/celtenc.c
+++ /dev/null
@@ -1,818 +1,0 @@
-/* Copyright (c) 2002-2010 Jean-Marc Valin
- Copyright (c) 2007-2010 Xiph.Org Foundation
- Copyright (c) 2008-2010 Gregory Maxwell
- File: celtenc.c
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- - Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- - Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <stdio.h>
-#if !defined WIN32 && !defined _WIN32
-#include <unistd.h>
-#endif
-
-#ifdef HAVE_GETOPT_H
-#include <getopt.h>
-#endif
-
-#ifndef HAVE_GETOPT_LONG
-#include "getopt_win.h"
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-
-#ifdef _MSC_VER
-#define snprintf _snprintf
-#endif
-
-#include "celt.h"
-#include "celt_header.h"
-#include <ogg/ogg.h>
-#include "wav_io.h"
-
-#if defined WIN32 || defined _WIN32
-/* We need the following two to set stdout to binary */
-#include <io.h>
-#include <fcntl.h>
-#endif
-
-#include "skeleton.h"
-
-
-void comment_init(char **comments, int* length, char *vendor_string);
-void comment_add(char **comments, int* length, char *tag, char *val);
-
-
-/*Write an Ogg page to a file pointer*/
-int oe_write_page(ogg_page *page, FILE *fp)
-{- int written;
- written = fwrite(page->header,1,page->header_len, fp);
- written += fwrite(page->body,1,page->body_len, fp);
-
- return written;
-}
-
-#define MAX_FRAME_SIZE 2048
-#define MAX_FRAME_BYTES 1275
-#define IMIN(a,b) ((a) < (b) ? (a) : (b)) /**< Minimum int value. */
-#define IMAX(a,b) ((a) > (b) ? (a) : (b)) /**< Maximum int value. */
-
-/* Convert input audio bits, endians and channels */
-static int read_samples(FILE *fin,int frame_size, int bits, int channels, int lsb, short * input, char *buff, celt_int32 *size)
-{ - short s[MAX_FRAME_SIZE];
- unsigned char *in = (unsigned char*)s;
- int i;
- int nb_read;
-
- if (size && *size<=0)
- {- return 0;
- }
- /*Read input audio*/
- if (size)
- *size -= bits/8*channels*frame_size;
- if (buff)
- {- for (i=0;i<12;i++)
- in[i]=buff[i];
- nb_read = fread(in+12,1,bits/8*channels*frame_size-12, fin) + 12;
- if (size)
- *size += 12;
- } else {- nb_read = fread(in,1,bits/8*channels* frame_size, fin);
- }
- nb_read /= bits/8*channels;
-
- /*fprintf (stderr, "%d\n", nb_read);*/
- if (nb_read==0)
- return 0;
-
- if(bits==8)
- {- /* Convert 8->16 bits */
- for(i=frame_size*channels-1;i>=0;i--)
- {- s[i]=(in[i]<<8)^0x8000;
- }
- } else
- {- /* convert to our endian format */
- for(i=0;i<frame_size*channels;i++)
- {- if(lsb)
- s[i]=le_short(s[i]);
- else
- s[i]=be_short(s[i]);
- }
- }
-
- /* FIXME: This is probably redundent now */
- /* copy to float input buffer */
- for (i=0;i<frame_size*channels;i++)
- {- input[i]=s[i];
- }
-
- for (i=nb_read*channels;i<frame_size*channels;i++)
- {- input[i]=0;
- }
-
-
- return nb_read;
-}
-
-void add_fishead_packet (ogg_stream_state *os) {-
- fishead_packet fp;
-
- memset(&fp, 0, sizeof(fp));
- fp.ptime_n = 0;
- fp.ptime_d = 1000;
- fp.btime_n = 0;
- fp.btime_d = 1000;
-
- add_fishead_to_stream(os, &fp);
-}
-
-/*
- * Adds the fishead packets in the skeleton output stream along with the e_o_s packet
- */
-void add_fisbone_packet (ogg_stream_state *os, celt_int32 serialno, CELTHeader *header) {-
- fisbone_packet fp;
-
- memset(&fp, 0, sizeof(fp));
- fp.serial_no = serialno;
- fp.nr_header_packet = 2 + header->extra_headers;
- fp.granule_rate_n = header->sample_rate;
- fp.granule_rate_d = 1;
- fp.start_granule = 0;
- fp.preroll = 3;
- fp.granule_shift = 0;
-
- add_message_header_field(&fp, "Content-Type", "audio/x-celt");
-
- add_fisbone_to_stream(os, &fp);
-}
-
-void version(void)
-{- printf ("celtenc (CELT %s encoder)\n",CELT_VERSION);- printf ("Copyright (C) 2008-2010 Xiph.Org Foundation (written by Jean-Marc Valin)\n");-}
-
-void version_short(void)
-{- printf ("celtenc (CELT %s encoder)\n",CELT_VERSION);- printf ("Copyright (C) 2008-2010 Xiph.Org Foundation (written by Jean-Marc Valin)\n");-}
-
-void usage(void)
-{- printf ("Usage: celtenc [options] input_file output_file.oga\n");- printf ("\n");- printf ("Encodes input_file using CELT. It can read the WAV or raw files.\n");- printf ("\n");- printf ("input_file can be:\n");- printf (" filename.wav wav file\n");- printf (" filename.* Raw PCM file (any extension other than .wav)\n");- printf (" - stdin\n");- printf ("\n"); - printf ("output_file can be:\n");- printf (" filename.oga compressed file\n");- printf (" - stdout\n");- printf ("\n"); - printf ("Options:\n");- printf (" --bitrate n Encoding bit-rate in kbit/sec\n"); - printf (" --cbr Use constant bitrate encoding\n");- printf (" --comp n Encoding complexity (0-10)\n");- printf (" --framesize n Frame size (Default: 960)\n");- printf (" --nopf Do not use the prefilter/postfilter\n");- printf (" --independent Encode frames independently (implies nopf)\n");- printf (" --skeleton Outputs ogg skeleton metadata (may cause incompatibilities)\n");- printf (" --comment Add the given string as an extra comment. This may be\n");- printf (" used multiple times\n");- printf (" --author Author of this track\n");- printf (" --title Title for this track\n");- printf (" -h, --help This help\n"); - printf (" -v, --version Version information\n"); - printf (" -V Verbose mode (show bit-rate)\n"); - printf ("Raw input options:\n");- printf (" --rate n Sampling rate for raw input\n"); - printf (" --mono Consider raw input as mono\n"); - printf (" --stereo Consider raw input as stereo\n"); - printf (" --le Raw input is little-endian\n"); - printf (" --be Raw input is big-endian\n"); - printf (" --8bit Raw input is 8-bit unsigned\n"); - printf (" --16bit Raw input is 16-bit signed\n"); - printf ("Default raw PCM input is 48kHz, 16-bit, little-endian, stereo\n");-}
-
-
-int main(int argc, char **argv)
-{- int nb_samples, total_samples=0, nb_encoded;
- int c;
- int option_index = 0;
- char *inFile, *outFile;
- FILE *fin, *fout;
- short input[MAX_FRAME_SIZE];
- celt_int32 frame_size = 960;
- int quiet=0;
- int nbBytes;
- CELTMode *mode;
- void *st;
- unsigned char bits[MAX_FRAME_BYTES];
- int with_cbr = 0;
- int with_cvbr = 0;
- int with_skeleton = 0;
- int total_bytes = 0;
- int peak_bytes = 0;
- struct option long_options[] =
- {- {"bitrate", required_argument, NULL, 0},- {"cbr",no_argument,NULL, 0},- {"cvbr",no_argument,NULL, 0},- {"comp", required_argument, NULL, 0},- {"nopf", no_argument, NULL, 0},- {"independent", no_argument, NULL, 0},- {"framesize", required_argument, NULL, 0},- {"skeleton",no_argument,NULL, 0},- {"help", no_argument, NULL, 0},- {"quiet", no_argument, NULL, 0},- {"le", no_argument, NULL, 0},- {"be", no_argument, NULL, 0},- {"8bit", no_argument, NULL, 0},- {"16bit", no_argument, NULL, 0},- {"mono", no_argument, NULL, 0},- {"stereo", no_argument, NULL, 0},- {"rate", required_argument, NULL, 0},- {"version", no_argument, NULL, 0},- {"version-short", no_argument, NULL, 0},- {"comment", required_argument, NULL, 0},- {"author", required_argument, NULL, 0},- {"title", required_argument, NULL, 0},- {0, 0, 0, 0}- };
- int print_bitrate=0;
- celt_int32 rate=48000;
- celt_int32 size;
- int chan=1;
- int fmt=16;
- int lsb=1;
- ogg_stream_state os;
- ogg_stream_state so; /* ogg stream for skeleton bitstream */
- ogg_page og;
- ogg_packet op;
- int bytes_written=0, ret, result;
- int id=-1;
- CELTHeader header;
- char vendor_string[64];
- char *comments;
- int comments_length;
- int close_in=0, close_out=0;
- int eos=0;
- float bitrate=-1;
- char first_bytes[12];
- int wave_input=0;
- celt_int32 lookahead = 0;
- int bytes_per_packet=-1;
- int complexity=-127;
- int prediction=2;
-
-
- /*Process command-line options*/
- while(1)
- {- c = getopt_long (argc, argv, "hvV",
- long_options, &option_index);
- if (c==-1)
- break;
-
- switch(c)
- {- case 0:
- if (strcmp(long_options[option_index].name,"bitrate")==0)
- {- bitrate = atof (optarg);
- } else if (strcmp(long_options[option_index].name,"cbr")==0)
- {- with_cbr=1;
- } else if (strcmp(long_options[option_index].name,"cvbr")==0)
- {- with_cvbr=1;
- } else if (strcmp(long_options[option_index].name,"skeleton")==0)
- {- with_skeleton=1;
- } else if (strcmp(long_options[option_index].name,"help")==0)
- {- usage();
- exit(0);
- } else if (strcmp(long_options[option_index].name,"quiet")==0)
- {- quiet = 1;
- } else if (strcmp(long_options[option_index].name,"version")==0)
- {- version();
- exit(0);
- } else if (strcmp(long_options[option_index].name,"version-short")==0)
- {- version_short();
- exit(0);
- } else if (strcmp(long_options[option_index].name,"le")==0)
- {- lsb=1;
- } else if (strcmp(long_options[option_index].name,"be")==0)
- {- lsb=0;
- } else if (strcmp(long_options[option_index].name,"8bit")==0)
- {- fmt=8;
- } else if (strcmp(long_options[option_index].name,"16bit")==0)
- {- fmt=16;
- } else if (strcmp(long_options[option_index].name,"stereo")==0)
- {- chan=2;
- } else if (strcmp(long_options[option_index].name,"mono")==0)
- {- chan=1;
- } else if (strcmp(long_options[option_index].name,"rate")==0)
- {- rate=atoi (optarg);
- } else if (strcmp(long_options[option_index].name,"comp")==0)
- {- complexity=atoi (optarg);
- } else if (strcmp(long_options[option_index].name,"framesize")==0)
- {- frame_size=atoi (optarg);
- } else if (strcmp(long_options[option_index].name,"nopf")==0)
- {- if (prediction>1)
- prediction=1;
- } else if (strcmp(long_options[option_index].name,"independent")==0)
- {- prediction=0;
- } else if (strcmp(long_options[option_index].name,"comment")==0)
- {- if (!strchr(optarg, '='))
- {- fprintf (stderr, "Invalid comment: %s\n", optarg);
- fprintf (stderr, "Comments must be of the form name=value\n");
- exit(1);
- }
- comment_add(&comments, &comments_length, NULL, optarg);
- } else if (strcmp(long_options[option_index].name,"author")==0)
- {- comment_add(&comments, &comments_length, "author=", optarg);
- } else if (strcmp(long_options[option_index].name,"title")==0)
- {- comment_add(&comments, &comments_length, "title=", optarg);
- }
-
- break;
- case 'h':
- usage();
- exit(0);
- break;
- case 'v':
- version();
- exit(0);
- break;
- case 'V':
- print_bitrate=1;
- break;
- case '?':
- usage();
- exit(1);
- break;
- }
- }
- if (argc-optind!=2)
- {- usage();
- exit(1);
- }
- inFile=argv[optind];
- outFile=argv[optind+1];
-
- /*Initialize Ogg stream struct*/
- srand(time(NULL));
- if (ogg_stream_init(&os, rand())==-1)
- {- fprintf(stderr,"Error: stream init failed\n");
- exit(1);
- }
- if (with_skeleton && ogg_stream_init(&so, rand())==-1)
- {- fprintf(stderr,"Error: stream init failed\n");
- exit(1);
- }
-
- if (strcmp(inFile, "-")==0)
- {-#if defined WIN32 || defined _WIN32
- _setmode(_fileno(stdin), _O_BINARY);
-#elif defined OS2
- _fsetmode(stdin,"b");
-#endif
- fin=stdin;
- }
- else
- {- fin = fopen(inFile, "rb");
- if (!fin)
- {- perror(inFile);
- exit(1);
- }
- close_in=1;
- }
-
- {- fread(first_bytes, 1, 12, fin);
- if (strncmp(first_bytes,"RIFF",4)==0 && strncmp(first_bytes,"RIFF",4)==0)
- {- if (read_wav_header(fin, &rate, &chan, &fmt, &size)==-1)
- exit(1);
- wave_input=1;
- lsb=1; /* CHECK: exists big-endian .wav ?? */
- }
- }
-
- if (bitrate<=0.005)
- if (chan==1)
- bitrate=64.0;
- else
- bitrate=128.0;
-
- bytes_per_packet = MAX_FRAME_BYTES;
-
- mode = celt_mode_create(rate, frame_size, NULL);
- if (!mode)
- return 1;
-
- snprintf(vendor_string, sizeof(vendor_string), "Encoded with CELT %s\n",CELT_VERSION);
- comment_init(&comments, &comments_length, vendor_string);
-
- /*celt_mode_info(mode, CELT_GET_FRAME_SIZE, &frame_size);*/
-
- celt_header_init(&header, mode, frame_size, chan);
- header.nb_channels = chan;
-
- {- char *st_string="mono";
- if (chan==2)
- st_string="stereo";
- if (!quiet)
- if (with_cbr)
- fprintf (stderr, "Encoding %.0f kHz %s audio in %.0fms packets at %0.3fkbit/sec (%d bytes per packet, CBR)\n",
- header.sample_rate/1000., st_string, frame_size/(float)header.sample_rate*1000., bitrate, bytes_per_packet);
- else
- fprintf (stderr, "Encoding %.0f kHz %s audio in %.0fms packets at %0.3fkbit/sec (%d bytes per packet maximum)\n",
- header.sample_rate/1000., st_string, frame_size/(float)header.sample_rate*1000., bitrate, bytes_per_packet);
- }
-
- /*Initialize CELT encoder*/
- st = celt_encoder_create_custom(mode, chan, NULL);
-
- {- int tmp = (bitrate*1000);
- if (celt_encoder_ctl(st, CELT_SET_BITRATE(tmp)) != CELT_OK)
- {- fprintf (stderr, "bitrate request failed\n");
- return 1;
- }
- }
- if (!with_cbr)
- {- if (celt_encoder_ctl(st, CELT_SET_VBR(1)) != CELT_OK)
- {- fprintf (stderr, "VBR request failed\n");
- return 1;
- }
- if (!with_cvbr)
- {- if (celt_encoder_ctl(st, CELT_SET_VBR_CONSTRAINT(0)) != CELT_OK)
- {- fprintf (stderr, "VBR constraint failed\n");
- return 1;
- }
- }
- }
-
- if (celt_encoder_ctl(st, CELT_SET_PREDICTION(prediction)) != CELT_OK)
- {- fprintf (stderr, "Prediction request failed\n");
- return 1;
- }
-
- if (complexity!=-127) {- if (celt_encoder_ctl(st, CELT_SET_COMPLEXITY(complexity)) != CELT_OK)
- {- fprintf (stderr, "Only complexity 0 through 10 is supported\n");
- return 1;
- }
- }
-
- if (strcmp(outFile,"-")==0)
- {-#if defined WIN32 || defined _WIN32
- _setmode(_fileno(stdout), _O_BINARY);
-#endif
- fout=stdout;
- }
- else
- {- fout = fopen(outFile, "wb");
- if (!fout)
- {- perror(outFile);
- exit(1);
- }
- close_out=1;
- }
-
- if (with_skeleton) {- fprintf (stderr, "Warning: Enabling skeleton output may cause some decoders to fail.\n");
- }
-
- /* first packet should be the skeleton header. */
- if (with_skeleton) {- add_fishead_packet(&so);
- if ((ret = flush_ogg_stream_to_file(&so, fout))) {- fprintf (stderr,"Error: failed skeleton (fishead) header to output stream\n");
- exit(1);
- } else
- bytes_written += ret;
- }
-
- /*Write header*/
- {- unsigned char header_data[100];
- int packet_size = celt_header_to_packet(&header, header_data, 100);
- op.packet = header_data;
- op.bytes = packet_size;
- op.b_o_s = 1;
- op.e_o_s = 0;
- op.granulepos = 0;
- op.packetno = 0;
- ogg_stream_packetin(&os, &op);
-
- while((result = ogg_stream_flush(&os, &og)))
- {- if(!result) break;
- ret = oe_write_page(&og, fout);
- if(ret != og.header_len + og.body_len)
- {- fprintf (stderr,"Error: failed writing header to output stream\n");
- exit(1);
- }
- else
- bytes_written += ret;
- }
-
- op.packet = (unsigned char *)comments;
- op.bytes = comments_length;
- op.b_o_s = 0;
- op.e_o_s = 0;
- op.granulepos = 0;
- op.packetno = 1;
- ogg_stream_packetin(&os, &op);
- }
-
- /* fisbone packet should be write after all bos pages */
- if (with_skeleton) {- add_fisbone_packet(&so, os.serialno, &header);
- if ((ret = flush_ogg_stream_to_file(&so, fout))) {- fprintf (stderr,"Error: failed writing skeleton (fisbone )header to output stream\n");
- exit(1);
- } else
- bytes_written += ret;
- }
-
- /* writing the rest of the celt header packets */
- while((result = ogg_stream_flush(&os, &og)))
- {- if(!result) break;
- ret = oe_write_page(&og, fout);
- if(ret != og.header_len + og.body_len)
- {- fprintf (stderr,"Error: failed writing header to output stream\n");
- exit(1);
- }
- else
- bytes_written += ret;
- }
-
- free(comments);
-
- /* write the skeleton eos packet */
- if (with_skeleton) {- add_eos_packet_to_stream(&so);
- if ((ret = flush_ogg_stream_to_file(&so, fout))) {- fprintf (stderr,"Error: failed writing skeleton header to output stream\n");
- exit(1);
- } else
- bytes_written += ret;
- }
-
-
- if (!wave_input)
- {- nb_samples = read_samples(fin,frame_size,fmt,chan,lsb,input, first_bytes, NULL);
- } else {- nb_samples = read_samples(fin,frame_size,fmt,chan,lsb,input, NULL, &size);
- }
- if (nb_samples==0)
- eos=1;
- total_samples += nb_samples;
- nb_encoded = -lookahead;
- /*Main encoding loop (one frame per iteration)*/
- while (!eos || total_samples>nb_encoded)
- {- id++;
- /*Encode current frame*/
-
- nbBytes = celt_encode(st, input, frame_size, bits, bytes_per_packet);
- if (nbBytes<0)
- {- fprintf(stderr, "Got error %d while encoding. Aborting.\n", nbBytes);
- break;
- }
- nb_encoded += frame_size;
- total_bytes += nbBytes;
- peak_bytes=IMAX(nbBytes,peak_bytes);
-
- if (wave_input)
- {- nb_samples = read_samples(fin,frame_size,fmt,chan,lsb,input, NULL, &size);
- } else {- nb_samples = read_samples(fin,frame_size,fmt,chan,lsb,input, NULL, NULL);
- }
- if (nb_samples==0)
- {- eos=1;
- }
- if (eos && total_samples<=nb_encoded)
- op.e_o_s = 1;
- else
- op.e_o_s = 0;
- total_samples += nb_samples;
-
- op.packet = (unsigned char *)bits;
- op.bytes = nbBytes;
- op.b_o_s = 0;
- /*Is this redundent?*/
- if (eos && total_samples<=nb_encoded)
- op.e_o_s = 1;
- else
- op.e_o_s = 0;
- op.granulepos = (id+1)*frame_size-lookahead;
- if (op.granulepos>total_samples)
- op.granulepos = total_samples;
- /*printf ("granulepos: %d %d %d %d %d %d\n", (int)op.granulepos, id, nframes, lookahead, 5, 6);*/- op.packetno = 2+id;
- ogg_stream_packetin(&os, &op);
-
- /*Write all new pages (most likely 0 or 1)*/
- while (ogg_stream_pageout(&os,&og))
- {- ret = oe_write_page(&og, fout);
- if(ret != og.header_len + og.body_len)
- {- fprintf (stderr,"Error: failed writing header to output stream\n");
- exit(1);
- }
- else
- bytes_written += ret;
- }
- }
- /*Flush all pages left to be written*/
- while (ogg_stream_flush(&os, &og))
- {- ret = oe_write_page(&og, fout);
- if(ret != og.header_len + og.body_len)
- {- fprintf (stderr,"Error: failed writing header to output stream\n");
- exit(1);
- }
- else
- bytes_written += ret;
- }
-
- if (!with_cbr && !quiet)
- fprintf (stderr, "Average rate %0.3fkbit/sec, %d peak bytes per packet\n", (total_bytes*8.0/((float)nb_encoded/header.sample_rate))/1000.0, peak_bytes);
-
- celt_encoder_destroy(st);
- celt_mode_destroy(mode);
- ogg_stream_clear(&os);
-
- if (close_in)
- fclose(fin);
- if (close_out)
- fclose(fout);
- return 0;
-}
-
-/*
- Comments will be stored in the Vorbis style.
- It is describled in the "Structure" section of
- http://www.xiph.org/ogg/vorbis/doc/v-comment.html
-
-The comment header is decoded as follows:
- 1) [vendor_length] = read an unsigned integer of 32 bits
- 2) [vendor_string] = read a UTF-8 vector as [vendor_length] octets
- 3) [user_comment_list_length] = read an unsigned integer of 32 bits
- 4) iterate [user_comment_list_length] times {- 5) [length] = read an unsigned integer of 32 bits
- 6) this iteration's user comment = read a UTF-8 vector as [length] octets
- }
- 7) [framing_bit] = read a single bit as boolean
- 8) if ( [framing_bit] unset or end of packet ) then ERROR
- 9) done.
-
- If you have troubles, please write to ymnk@jcraft.com.
- */
-
-#define readint(buf, base) (((buf[base+3]<<24)&0xff000000)| \
- ((buf[base+2]<<16)&0xff0000)| \
- ((buf[base+1]<<8)&0xff00)| \
- (buf[base]&0xff))
-#define writeint(buf, base, val) do{ buf[base+3]=((val)>>24)&0xff; \- buf[base+2]=((val)>>16)&0xff; \
- buf[base+1]=((val)>>8)&0xff; \
- buf[base]=(val)&0xff; \
- }while(0)
-
-void comment_init(char **comments, int* length, char *vendor_string)
-{- int vendor_length=strlen(vendor_string);
- int user_comment_list_length=0;
- int len=4+vendor_length+4;
- char *p=(char*)malloc(len);
- if(p==NULL){- fprintf (stderr, "malloc failed in comment_init()\n");
- exit(1);
- }
- writeint(p, 0, vendor_length);
- memcpy(p+4, vendor_string, vendor_length);
- writeint(p, 4+vendor_length, user_comment_list_length);
- *length=len;
- *comments=p;
-}
-void comment_add(char **comments, int* length, char *tag, char *val)
-{- char* p=*comments;
- int vendor_length=readint(p, 0);
- int user_comment_list_length=readint(p, 4+vendor_length);
- int tag_len=(tag?strlen(tag):0);
- int val_len=strlen(val);
- int len=(*length)+4+tag_len+val_len;
-
- p=(char*)realloc(p, len);
- if(p==NULL){- fprintf (stderr, "realloc failed in comment_add()\n");
- exit(1);
- }
-
- writeint(p, *length, tag_len+val_len); /* length of comment */
- if(tag) memcpy(p+*length+4, tag, tag_len); /* comment */
- memcpy(p+*length+4+tag_len, val, val_len); /* comment */
- writeint(p, 4+vendor_length, user_comment_list_length+1);
-
- *comments=p;
- *length=len;
-}
-#undef readint
-#undef writeint
--- a/tools/getopt.c
+++ /dev/null
@@ -1,1047 +1,0 @@
-/* Getopt for GNU.
- NOTE: getopt is now part of the C library, so if you don't know what
- "Keep this file name-space clean" means, talk to drepper@gnu.org
- before changing it!
-
- Copyright (C) 1987, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99
- Free Software Foundation, Inc.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with the GNU C Library; see the file COPYING.LIB. If not,
- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
-
-/* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>.
- Ditto for AIX 3.2 and <stdlib.h>. */
-#ifndef _NO_PROTO
-# define _NO_PROTO
-#endif
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#if !defined __STDC__ || !__STDC__
-/* This is a separate conditional since some stdc systems
- reject `defined (const)'. */
-# ifndef const
-# define const
-# endif
-#endif
-
-#include <stdio.h>
-
-/* Comment out all this code if we are using the GNU C Library, and are not
- actually compiling the library itself. This code is part of the GNU C
- Library, but also included in many other GNU distributions. Compiling
- and linking in this code is a waste when using the GNU C library
- (especially if it is a shared library). Rather than having every GNU
- program understand `configure --with-gnu-libc' and omit the object files,
- it is simpler to just do this in the source for each such file. */
-
-#define GETOPT_INTERFACE_VERSION 2
-#if !defined _LIBC && defined __GLIBC__ && __GLIBC__ >= 2
-# include <gnu-versions.h>
-# if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION
-# define ELIDE_CODE
-# endif
-#endif
-
-#ifndef ELIDE_CODE
-
-
-/* This needs to come after some library #include
- to get __GNU_LIBRARY__ defined. */
-#ifdef __GNU_LIBRARY__
-/* Don't include stdlib.h for non-GNU C libraries because some of them
- contain conflicting prototypes for getopt. */
-# include <stdlib.h>
-# include <unistd.h>
-#endif /* GNU C library. */
-
-#ifdef VMS
-# include <unixlib.h>
-# if HAVE_STRING_H - 0
-# include <string.h>
-# endif
-#endif
-
-#ifndef _
-/* This is for other GNU distributions with internationalized messages.
- When compiling libc, the _ macro is predefined. */
-# ifdef HAVE_LIBINTL_H
-# include <libintl.h>
-# define _(msgid) gettext (msgid)
-# else
-# define _(msgid) (msgid)
-# endif
-#endif
-
-/* This version of `getopt' appears to the caller like standard Unix `getopt'
- but it behaves differently for the user, since it allows the user
- to intersperse the options with the other arguments.
-
- As `getopt' works, it permutes the elements of ARGV so that,
- when it is done, all the options precede everything else. Thus
- all application programs are extended to handle flexible argument order.
-
- Setting the environment variable POSIXLY_CORRECT disables permutation.
- Then the behavior is completely standard.
-
- GNU application programs can use a third alternative mode in which
- they can distinguish the relative order of options and other arguments. */
-
-#include "getopt_win.h"
-
-/* For communication from `getopt' to the caller.
- When `getopt' finds an option that takes an argument,
- the argument value is returned here.
- Also, when `ordering' is RETURN_IN_ORDER,
- each non-option ARGV-element is returned here. */
-
-char *optarg;
-
-/* Index in ARGV of the next element to be scanned.
- This is used for communication to and from the caller
- and for communication between successive calls to `getopt'.
-
- On entry to `getopt', zero means this is the first call; initialize.
-
- When `getopt' returns -1, this is the index of the first of the
- non-option elements that the caller should itself scan.
-
- Otherwise, `optind' communicates from one call to the next
- how much of ARGV has been scanned so far. */
-
-/* 1003.2 says this must be 1 before any call. */
-int optind = 1;
-
-/* Formerly, initialization of getopt depended on optind==0, which
- causes problems with re-calling getopt as programs generally don't
- know that. */
-
-int __getopt_initialized;
-
-/* The next char to be scanned in the option-element
- in which the last option character we returned was found.
- This allows us to pick up the scan where we left off.
-
- If this is zero, or a null string, it means resume the scan
- by advancing to the next ARGV-element. */
-
-static char *nextchar;
-
-/* Callers store zero here to inhibit the error message
- for unrecognized options. */
-
-int opterr = 1;
-
-/* Set to an option character which was unrecognized.
- This must be initialized on some systems to avoid linking in the
- system's own getopt implementation. */
-
-int optopt = '?';
-
-/* Describe how to deal with options that follow non-option ARGV-elements.
-
- If the caller did not specify anything,
- the default is REQUIRE_ORDER if the environment variable
- POSIXLY_CORRECT is defined, PERMUTE otherwise.
-
- REQUIRE_ORDER means don't recognize them as options;
- stop option processing when the first non-option is seen.
- This is what Unix does.
- This mode of operation is selected by either setting the environment
- variable POSIXLY_CORRECT, or using `+' as the first character
- of the list of option characters.
-
- PERMUTE is the default. We permute the contents of ARGV as we scan,
- so that eventually all the non-options are at the end. This allows options
- to be given in any order, even with programs that were not written to
- expect this.
-
- RETURN_IN_ORDER is an option available to programs that were written
- to expect options and other ARGV-elements in any order and that care about
- the ordering of the two. We describe each non-option ARGV-element
- as if it were the argument of an option with character code 1.
- Using `-' as the first character of the list of option characters
- selects this mode of operation.
-
- The special argument `--' forces an end of option-scanning regardless
- of the value of `ordering'. In the case of RETURN_IN_ORDER, only
- `--' can cause `getopt' to return -1 with `optind' != ARGC. */
-
-static enum
-{
- REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER
-} ordering;
-
-/* Value of POSIXLY_CORRECT environment variable. */
-static char *posixly_correct;
-
-#ifdef __GNU_LIBRARY__
-/* We want to avoid inclusion of string.h with non-GNU libraries
- because there are many ways it can cause trouble.
- On some systems, it contains special magic macros that don't work
- in GCC. */
-# include <string.h>
-# define my_index strchr
-#else
-
-#include <string.h>
-
-/* Avoid depending on library functions or files
- whose names are inconsistent. */
-
-#ifndef getenv
-extern char *getenv ();
-#endif
-
-static char *
-my_index (str, chr)
- const char *str;
- int chr;
-{
- while (*str)
- {
- if (*str == chr)
- return (char *) str;
- str++;
- }
- return 0;
-}
-
-/* If using GCC, we can safely declare strlen this way.
- If not using GCC, it is ok not to declare it. */
-#ifdef __GNUC__
-/* Note that Motorola Delta 68k R3V7 comes with GCC but not stddef.h.
- That was relevant to code that was here before. */
-# if (!defined __STDC__ || !__STDC__) && !defined strlen
-/* gcc with -traditional declares the built-in strlen to return int,
- and has done so at least since version 2.4.5. -- rms. */
-extern int strlen (const char *);
-# endif /* not __STDC__ */
-#endif /* __GNUC__ */
-
-#endif /* not __GNU_LIBRARY__ */
-
-/* Handle permutation of arguments. */
-
-/* Describe the part of ARGV that contains non-options that have
- been skipped. `first_nonopt' is the index in ARGV of the first of them;
- `last_nonopt' is the index after the last of them. */
-
-static int first_nonopt;
-static int last_nonopt;
-
-#ifdef _LIBC
-/* Bash 2.0 gives us an environment variable containing flags
- indicating ARGV elements that should not be considered arguments. */
-
-/* Defined in getopt_init.c */
-extern char *__getopt_nonoption_flags;
-
-static int nonoption_flags_max_len;
-static int nonoption_flags_len;
-
-static int original_argc;
-static char *const *original_argv;
-
-/* Make sure the environment variable bash 2.0 puts in the environment
- is valid for the getopt call we must make sure that the ARGV passed
- to getopt is that one passed to the process. */
-static void
-__attribute__ ((unused))
-store_args_and_env (int argc, char *const *argv)
-{
- /* XXX This is no good solution. We should rather copy the args so
- that we can compare them later. But we must not use malloc(3). */
- original_argc = argc;
- original_argv = argv;
-}
-# ifdef text_set_element
-text_set_element (__libc_subinit, store_args_and_env);
-# endif /* text_set_element */
-
-# define SWAP_FLAGS(ch1, ch2) \
- if (nonoption_flags_len > 0) \
- { \
- char __tmp = __getopt_nonoption_flags[ch1]; \
- __getopt_nonoption_flags[ch1] = __getopt_nonoption_flags[ch2]; \
- __getopt_nonoption_flags[ch2] = __tmp; \
- }
-#else /* !_LIBC */
-# define SWAP_FLAGS(ch1, ch2)
-#endif /* _LIBC */
-
-/* Exchange two adjacent subsequences of ARGV.
- One subsequence is elements [first_nonopt,last_nonopt)
- which contains all the non-options that have been skipped so far.
- The other is elements [last_nonopt,optind), which contains all
- the options processed since those non-options were skipped.
-
- `first_nonopt' and `last_nonopt' are relocated so that they describe
- the new indices of the non-options in ARGV after they are moved. */
-
-#if defined __STDC__ && __STDC__
-static void exchange (char **);
-#endif
-
-static void
-exchange (argv)
- char **argv;
-{
- int bottom = first_nonopt;
- int middle = last_nonopt;
- int top = optind;
- char *tem;
-
- /* Exchange the shorter segment with the far end of the longer segment.
- That puts the shorter segment into the right place.
- It leaves the longer segment in the right place overall,
- but it consists of two parts that need to be swapped next. */
-
-#ifdef _LIBC
- /* First make sure the handling of the `__getopt_nonoption_flags'
- string can work normally. Our top argument must be in the range
- of the string. */
- if (nonoption_flags_len > 0 && top >= nonoption_flags_max_len)
- {
- /* We must extend the array. The user plays games with us and
- presents new arguments. */
- char *new_str = malloc (top + 1);
- if (new_str == NULL)
- nonoption_flags_len = nonoption_flags_max_len = 0;
- else
- {
- memset (__mempcpy (new_str, __getopt_nonoption_flags,
- nonoption_flags_max_len),
- '\0', top + 1 - nonoption_flags_max_len);
- nonoption_flags_max_len = top + 1;
- __getopt_nonoption_flags = new_str;
- }
- }
-#endif
-
- while (top > middle && middle > bottom)
- {
- if (top - middle > middle - bottom)
- {
- /* Bottom segment is the short one. */
- int len = middle - bottom;
- register int i;
-
- /* Swap it with the top part of the top segment. */
- for (i = 0; i < len; i++)
- {
- tem = argv[bottom + i];
- argv[bottom + i] = argv[top - (middle - bottom) + i];
- argv[top - (middle - bottom) + i] = tem;
- SWAP_FLAGS (bottom + i, top - (middle - bottom) + i);
- }
- /* Exclude the moved bottom segment from further swapping. */
- top -= len;
- }
- else
- {
- /* Top segment is the short one. */
- int len = top - middle;
- register int i;
-
- /* Swap it with the bottom part of the bottom segment. */
- for (i = 0; i < len; i++)
- {
- tem = argv[bottom + i];
- argv[bottom + i] = argv[middle + i];
- argv[middle + i] = tem;
- SWAP_FLAGS (bottom + i, middle + i);
- }
- /* Exclude the moved top segment from further swapping. */
- bottom += len;
- }
- }
-
- /* Update records for the slots the non-options now occupy. */
-
- first_nonopt += (optind - last_nonopt);
- last_nonopt = optind;
-}
-
-/* Initialize the internal data when the first call is made. */
-
-#if defined __STDC__ && __STDC__
-static const char *_getopt_initialize (int, char *const *, const char *);
-#endif
-static const char *
-_getopt_initialize (argc, argv, optstring)
- int argc;
- char *const *argv;
- const char *optstring;
-{
- /* Start processing options with ARGV-element 1 (since ARGV-element 0
- is the program name); the sequence of previously skipped
- non-option ARGV-elements is empty. */
-
- first_nonopt = last_nonopt = optind;
-
- nextchar = NULL;
-
- posixly_correct = getenv ("POSIXLY_CORRECT");
-
- /* Determine how to handle the ordering of options and nonoptions. */
-
- if (optstring[0] == '-')
- {
- ordering = RETURN_IN_ORDER;
- ++optstring;
- }
- else if (optstring[0] == '+')
- {
- ordering = REQUIRE_ORDER;
- ++optstring;
- }
- else if (posixly_correct != NULL)
- ordering = REQUIRE_ORDER;
- else
- ordering = PERMUTE;
-
-#ifdef _LIBC
- if (posixly_correct == NULL
- && argc == original_argc && argv == original_argv)
- {
- if (nonoption_flags_max_len == 0)
- {
- if (__getopt_nonoption_flags == NULL
- || __getopt_nonoption_flags[0] == '\0')
- nonoption_flags_max_len = -1;
- else
- {
- const char *orig_str = __getopt_nonoption_flags;
- int len = nonoption_flags_max_len = strlen (orig_str);
- if (nonoption_flags_max_len < argc)
- nonoption_flags_max_len = argc;
- __getopt_nonoption_flags =
- (char *) malloc (nonoption_flags_max_len);
- if (__getopt_nonoption_flags == NULL)
- nonoption_flags_max_len = -1;
- else
- memset (__mempcpy (__getopt_nonoption_flags, orig_str, len),
- '\0', nonoption_flags_max_len - len);
- }
- }
- nonoption_flags_len = nonoption_flags_max_len;
- }
- else
- nonoption_flags_len = 0;
-#endif
-
- return optstring;
-}
-
-/* Scan elements of ARGV (whose length is ARGC) for option characters
- given in OPTSTRING.
-
- If an element of ARGV starts with '-', and is not exactly "-" or "--",
- then it is an option element. The characters of this element
- (aside from the initial '-') are option characters. If `getopt'
- is called repeatedly, it returns successively each of the option characters
- from each of the option elements.
-
- If `getopt' finds another option character, it returns that character,
- updating `optind' and `nextchar' so that the next call to `getopt' can
- resume the scan with the following option character or ARGV-element.
-
- If there are no more option characters, `getopt' returns -1.
- Then `optind' is the index in ARGV of the first ARGV-element
- that is not an option. (The ARGV-elements have been permuted
- so that those that are not options now come last.)
-
- OPTSTRING is a string containing the legitimate option characters.
- If an option character is seen that is not listed in OPTSTRING,
- return '?' after printing an error message. If you set `opterr' to
- zero, the error message is suppressed but we still return '?'.
-
- If a char in OPTSTRING is followed by a colon, that means it wants an arg,
- so the following text in the same ARGV-element, or the text of the following
- ARGV-element, is returned in `optarg'. Two colons mean an option that
- wants an optional arg; if there is text in the current ARGV-element,
- it is returned in `optarg', otherwise `optarg' is set to zero.
-
- If OPTSTRING starts with `-' or `+', it requests different methods of
- handling the non-option ARGV-elements.
- See the comments about RETURN_IN_ORDER and REQUIRE_ORDER, above.
-
- Long-named options begin with `--' instead of `-'.
- Their names may be abbreviated as long as the abbreviation is unique
- or is an exact match for some defined option. If they have an
- argument, it follows the option name in the same ARGV-element, separated
- from the option name by a `=', or else the in next ARGV-element.
- When `getopt' finds a long-named option, it returns 0 if that option's
- `flag' field is nonzero, the value of the option's `val' field
- if the `flag' field is zero.
-
- The elements of ARGV aren't really const, because we permute them.
- But we pretend they're const in the prototype to be compatible
- with other systems.
-
- LONGOPTS is a vector of `struct option' terminated by an
- element containing a name which is zero.
-
- LONGIND returns the index in LONGOPT of the long-named option found.
- It is only valid when a long-named option has been found by the most
- recent call.
-
- If LONG_ONLY is nonzero, '-' as well as '--' can introduce
- long-named options. */
-
-int
-_getopt_internal (argc, argv, optstring, longopts, longind, long_only)
- int argc;
- char *const *argv;
- const char *optstring;
- const struct option *longopts;
- int *longind;
- int long_only;
-{
- optarg = NULL;
-
- if (optind == 0 || !__getopt_initialized)
- {
- if (optind == 0)
- optind = 1; /* Don't scan ARGV[0], the program name. */
- optstring = _getopt_initialize (argc, argv, optstring);
- __getopt_initialized = 1;
- }
-
- /* Test whether ARGV[optind] points to a non-option argument.
- Either it does not have option syntax, or there is an environment flag
- from the shell indicating it is not an option. The later information
- is only used when the used in the GNU libc. */
-#ifdef _LIBC
-# define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0' \
- || (optind < nonoption_flags_len \
- && __getopt_nonoption_flags[optind] == '1'))
-#else
-# define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0')
-#endif
-
- if (nextchar == NULL || *nextchar == '\0')
- {
- /* Advance to the next ARGV-element. */
-
- /* Give FIRST_NONOPT & LAST_NONOPT rational values if OPTIND has been
- moved back by the user (who may also have changed the arguments). */
- if (last_nonopt > optind)
- last_nonopt = optind;
- if (first_nonopt > optind)
- first_nonopt = optind;
-
- if (ordering == PERMUTE)
- {
- /* If we have just processed some options following some non-options,
- exchange them so that the options come first. */
-
- if (first_nonopt != last_nonopt && last_nonopt != optind)
- exchange ((char **) argv);
- else if (last_nonopt != optind)
- first_nonopt = optind;
-
- /* Skip any additional non-options
- and extend the range of non-options previously skipped. */
-
- while (optind < argc && NONOPTION_P)
- optind++;
- last_nonopt = optind;
- }
-
- /* The special ARGV-element `--' means premature end of options.
- Skip it like a null option,
- then exchange with previous non-options as if it were an option,
- then skip everything else like a non-option. */
-
- if (optind != argc && !strcmp (argv[optind], "--"))
- {
- optind++;
-
- if (first_nonopt != last_nonopt && last_nonopt != optind)
- exchange ((char **) argv);
- else if (first_nonopt == last_nonopt)
- first_nonopt = optind;
- last_nonopt = argc;
-
- optind = argc;
- }
-
- /* If we have done all the ARGV-elements, stop the scan
- and back over any non-options that we skipped and permuted. */
-
- if (optind == argc)
- {
- /* Set the next-arg-index to point at the non-options
- that we previously skipped, so the caller will digest them. */
- if (first_nonopt != last_nonopt)
- optind = first_nonopt;
- return -1;
- }
-
- /* If we have come to a non-option and did not permute it,
- either stop the scan or describe it to the caller and pass it by. */
-
- if (NONOPTION_P)
- {
- if (ordering == REQUIRE_ORDER)
- return -1;
- optarg = argv[optind++];
- return 1;
- }
-
- /* We have found another option-ARGV-element.
- Skip the initial punctuation. */
-
- nextchar = (argv[optind] + 1
- + (longopts != NULL && argv[optind][1] == '-'));
- }
-
- /* Decode the current option-ARGV-element. */
-
- /* Check whether the ARGV-element is a long option.
-
- If long_only and the ARGV-element has the form "-f", where f is
- a valid short option, don't consider it an abbreviated form of
- a long option that starts with f. Otherwise there would be no
- way to give the -f short option.
-
- On the other hand, if there's a long option "fubar" and
- the ARGV-element is "-fu", do consider that an abbreviation of
- the long option, just like "--fu", and not "-f" with arg "u".
-
- This distinction seems to be the most useful approach. */
-
- if (longopts != NULL
- && (argv[optind][1] == '-'
- || (long_only && (argv[optind][2] || !my_index (optstring, argv[optind][1])))))
- {
- char *nameend;
- const struct option *p;
- const struct option *pfound = NULL;
- int exact = 0;
- int ambig = 0;
- int indfound = -1;
- int option_index;
-
- for (nameend = nextchar; *nameend && *nameend != '='; nameend++)
- /* Do nothing. */ ;
-
- /* Test all long options for either exact match
- or abbreviated matches. */
- for (p = longopts, option_index = 0; p->name; p++, option_index++)
- if (!strncmp (p->name, nextchar, nameend - nextchar))
- {
- if ((unsigned int) (nameend - nextchar)
- == (unsigned int) strlen (p->name))
- {
- /* Exact match found. */
- pfound = p;
- indfound = option_index;
- exact = 1;
- break;
- }
- else if (pfound == NULL)
- {
- /* First nonexact match found. */
- pfound = p;
- indfound = option_index;
- }
- else
- /* Second or later nonexact match found. */
- ambig = 1;
- }
-
- if (ambig && !exact)
- {
- if (opterr)
- fprintf (stderr, _("%s: option `%s' is ambiguous\n"),
- argv[0], argv[optind]);
- nextchar += strlen (nextchar);
- optind++;
- optopt = 0;
- return '?';
- }
-
- if (pfound != NULL)
- {
- option_index = indfound;
- optind++;
- if (*nameend)
- {
- /* Don't test has_arg with >, because some C compilers don't
- allow it to be used on enums. */
- if (pfound->has_arg)
- optarg = nameend + 1;
- else
- {
- if (opterr)
- {
- if (argv[optind - 1][1] == '-')
- /* --option */
- fprintf (stderr,
- _("%s: option `--%s' doesn't allow an argument\n"),
- argv[0], pfound->name);
- else
- /* +option or -option */
- fprintf (stderr,
- _("%s: option `%c%s' doesn't allow an argument\n"),
- argv[0], argv[optind - 1][0], pfound->name);
- }
-
- nextchar += strlen (nextchar);
-
- optopt = pfound->val;
- return '?';
- }
- }
- else if (pfound->has_arg == 1)
- {
- if (optind < argc)
- optarg = argv[optind++];
- else
- {
- if (opterr)
- fprintf (stderr,
- _("%s: option `%s' requires an argument\n"),
- argv[0], argv[optind - 1]);
- nextchar += strlen (nextchar);
- optopt = pfound->val;
- return optstring[0] == ':' ? ':' : '?';
- }
- }
- nextchar += strlen (nextchar);
- if (longind != NULL)
- *longind = option_index;
- if (pfound->flag)
- {
- *(pfound->flag) = pfound->val;
- return 0;
- }
- return pfound->val;
- }
-
- /* Can't find it as a long option. If this is not getopt_long_only,
- or the option starts with '--' or is not a valid short
- option, then it's an error.
- Otherwise interpret it as a short option. */
- if (!long_only || argv[optind][1] == '-'
- || my_index (optstring, *nextchar) == NULL)
- {
- if (opterr)
- {
- if (argv[optind][1] == '-')
- /* --option */
- fprintf (stderr, _("%s: unrecognized option `--%s'\n"),
- argv[0], nextchar);
- else
- /* +option or -option */
- fprintf (stderr, _("%s: unrecognized option `%c%s'\n"),
- argv[0], argv[optind][0], nextchar);
- }
- nextchar = (char *) "";
- optind++;
- optopt = 0;
- return '?';
- }
- }
-
- /* Look at and handle the next short option-character. */
-
- {
- char c = *nextchar++;
- char *temp = my_index (optstring, c);
-
- /* Increment `optind' when we start to process its last character. */
- if (*nextchar == '\0')
- ++optind;
-
- if (temp == NULL || c == ':')
- {
- if (opterr)
- {
- if (posixly_correct)
- /* 1003.2 specifies the format of this message. */
- fprintf (stderr, _("%s: illegal option -- %c\n"),
- argv[0], c);
- else
- fprintf (stderr, _("%s: invalid option -- %c\n"),
- argv[0], c);
- }
- optopt = c;
- return '?';
- }
- /* Convenience. Treat POSIX -W foo same as long option --foo */
- if (temp[0] == 'W' && temp[1] == ';')
- {
- char *nameend;
- const struct option *p;
- const struct option *pfound = NULL;
- int exact = 0;
- int ambig = 0;
- int indfound = 0;
- int option_index;
-
- /* This is an option that requires an argument. */
- if (*nextchar != '\0')
- {
- optarg = nextchar;
- /* If we end this ARGV-element by taking the rest as an arg,
- we must advance to the next element now. */
- optind++;
- }
- else if (optind == argc)
- {
- if (opterr)
- {
- /* 1003.2 specifies the format of this message. */
- fprintf (stderr, _("%s: option requires an argument -- %c\n"),
- argv[0], c);
- }
- optopt = c;
- if (optstring[0] == ':')
- c = ':';
- else
- c = '?';
- return c;
- }
- else
- /* We already incremented `optind' once;
- increment it again when taking next ARGV-elt as argument. */
- optarg = argv[optind++];
-
- /* optarg is now the argument, see if it's in the
- table of longopts. */
-
- for (nextchar = nameend = optarg; *nameend && *nameend != '='; nameend++)
- /* Do nothing. */ ;
-
- /* Test all long options for either exact match
- or abbreviated matches. */
- for (p = longopts, option_index = 0; p->name; p++, option_index++)
- if (!strncmp (p->name, nextchar, nameend - nextchar))
- {
- if ((unsigned int) (nameend - nextchar) == strlen (p->name))
- {
- /* Exact match found. */
- pfound = p;
- indfound = option_index;
- exact = 1;
- break;
- }
- else if (pfound == NULL)
- {
- /* First nonexact match found. */
- pfound = p;
- indfound = option_index;
- }
- else
- /* Second or later nonexact match found. */
- ambig = 1;
- }
- if (ambig && !exact)
- {
- if (opterr)
- fprintf (stderr, _("%s: option `-W %s' is ambiguous\n"),
- argv[0], argv[optind]);
- nextchar += strlen (nextchar);
- optind++;
- return '?';
- }
- if (pfound != NULL)
- {
- option_index = indfound;
- if (*nameend)
- {
- /* Don't test has_arg with >, because some C compilers don't
- allow it to be used on enums. */
- if (pfound->has_arg)
- optarg = nameend + 1;
- else
- {
- if (opterr)
- fprintf (stderr, _("\
-%s: option `-W %s' doesn't allow an argument\n"),
- argv[0], pfound->name);
-
- nextchar += strlen (nextchar);
- return '?';
- }
- }
- else if (pfound->has_arg == 1)
- {
- if (optind < argc)
- optarg = argv[optind++];
- else
- {
- if (opterr)
- fprintf (stderr,
- _("%s: option `%s' requires an argument\n"),
- argv[0], argv[optind - 1]);
- nextchar += strlen (nextchar);
- return optstring[0] == ':' ? ':' : '?';
- }
- }
- nextchar += strlen (nextchar);
- if (longind != NULL)
- *longind = option_index;
- if (pfound->flag)
- {
- *(pfound->flag) = pfound->val;
- return 0;
- }
- return pfound->val;
- }
- nextchar = NULL;
- return 'W'; /* Let the application handle it. */
- }
- if (temp[1] == ':')
- {
- if (temp[2] == ':')
- {
- /* This is an option that accepts an argument optionally. */
- if (*nextchar != '\0')
- {
- optarg = nextchar;
- optind++;
- }
- else
- optarg = NULL;
- nextchar = NULL;
- }
- else
- {
- /* This is an option that requires an argument. */
- if (*nextchar != '\0')
- {
- optarg = nextchar;
- /* If we end this ARGV-element by taking the rest as an arg,
- we must advance to the next element now. */
- optind++;
- }
- else if (optind == argc)
- {
- if (opterr)
- {
- /* 1003.2 specifies the format of this message. */
- fprintf (stderr,
- _("%s: option requires an argument -- %c\n"),
- argv[0], c);
- }
- optopt = c;
- if (optstring[0] == ':')
- c = ':';
- else
- c = '?';
- }
- else
- /* We already incremented `optind' once;
- increment it again when taking next ARGV-elt as argument. */
- optarg = argv[optind++];
- nextchar = NULL;
- }
- }
- return c;
- }
-}
-
-int
-getopt (argc, argv, optstring)
- int argc;
- char *const *argv;
- const char *optstring;
-{
- return _getopt_internal (argc, argv, optstring,
- (const struct option *) 0,
- (int *) 0,
- 0);
-}
-
-#endif /* Not ELIDE_CODE. */
-
-#ifdef TEST
-
-/* Compile with -DTEST to make an executable for use in testing
- the above definition of `getopt'. */
-
-int
-main (argc, argv)
- int argc;
- char **argv;
-{
- int c;
- int digit_optind = 0;
-
- while (1)
- {
- int this_option_optind = optind ? optind : 1;
-
- c = getopt (argc, argv, "abc:d:0123456789");
- if (c == -1)
- break;
-
- switch (c)
- {
- case '0':
- case '1':
- case '2':
- case '3':
- case '4':
- case '5':
- case '6':
- case '7':
- case '8':
- case '9':
- if (digit_optind != 0 && digit_optind != this_option_optind)
- printf ("digits occur in two different argv-elements.\n");
- digit_optind = this_option_optind;
- printf ("option %c\n", c);
- break;
-
- case 'a':
- printf ("option a\n");
- break;
-
- case 'b':
- printf ("option b\n");
- break;
-
- case 'c':
- printf ("option c with value `%s'\n", optarg);
- break;
-
- case '?':
- break;
-
- default:
- printf ("?? getopt returned character code 0%o ??\n", c);
- }
- }
-
- if (optind < argc)
- {
- printf ("non-option ARGV-elements: ");
- while (optind < argc)
- printf ("%s ", argv[optind++]);
- printf ("\n");
- }
-
- exit (0);
-}
-
-#endif /* TEST */
--- a/tools/getopt1.c
+++ /dev/null
@@ -1,188 +1,0 @@
-/* getopt_long and getopt_long_only entry points for GNU getopt.
- Copyright (C) 1987,88,89,90,91,92,93,94,96,97,98
- Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with the GNU C Library; see the file COPYING.LIB. If not,
- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "getopt_win.h"
-
-#if !defined __STDC__ || !__STDC__
-/* This is a separate conditional since some stdc systems
- reject `defined (const)'. */
-#ifndef const
-#define const
-#endif
-#endif
-
-#include <stdio.h>
-
-/* Comment out all this code if we are using the GNU C Library, and are not
- actually compiling the library itself. This code is part of the GNU C
- Library, but also included in many other GNU distributions. Compiling
- and linking in this code is a waste when using the GNU C library
- (especially if it is a shared library). Rather than having every GNU
- program understand `configure --with-gnu-libc' and omit the object files,
- it is simpler to just do this in the source for each such file. */
-
-#define GETOPT_INTERFACE_VERSION 2
-#if !defined _LIBC && defined __GLIBC__ && __GLIBC__ >= 2
-#include <gnu-versions.h>
-#if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION
-#define ELIDE_CODE
-#endif
-#endif
-
-#ifndef ELIDE_CODE
-
-
-/* This needs to come after some library #include
- to get __GNU_LIBRARY__ defined. */
-#ifdef __GNU_LIBRARY__
-#include <stdlib.h>
-#endif
-
-#ifndef NULL
-#define NULL 0
-#endif
-
-int
-getopt_long (argc, argv, options, long_options, opt_index)
- int argc;
- char *const *argv;
- const char *options;
- const struct option *long_options;
- int *opt_index;
-{
- return _getopt_internal (argc, argv, options, long_options, opt_index, 0);
-}
-
-/* Like getopt_long, but '-' as well as '--' can indicate a long option.
- If an option that starts with '-' (not '--') doesn't match a long option,
- but does match a short option, it is parsed as a short option
- instead. */
-
-int
-getopt_long_only (argc, argv, options, long_options, opt_index)
- int argc;
- char *const *argv;
- const char *options;
- const struct option *long_options;
- int *opt_index;
-{
- return _getopt_internal (argc, argv, options, long_options, opt_index, 1);
-}
-
-
-#endif /* Not ELIDE_CODE. */
-
-#ifdef TEST
-
-#include <stdio.h>
-
-int
-main (argc, argv)
- int argc;
- char **argv;
-{
- int c;
- int digit_optind = 0;
-
- while (1)
- {
- int this_option_optind = optind ? optind : 1;
- int option_index = 0;
- static struct option long_options[] =
- {
- {"add", 1, 0, 0},
- {"append", 0, 0, 0},
- {"delete", 1, 0, 0},
- {"verbose", 0, 0, 0},
- {"create", 0, 0, 0},
- {"file", 1, 0, 0},
- {0, 0, 0, 0}
- };
-
- c = getopt_long (argc, argv, "abc:d:0123456789",
- long_options, &option_index);
- if (c == -1)
- break;
-
- switch (c)
- {
- case 0:
- printf ("option %s", long_options[option_index].name);
- if (optarg)
- printf (" with arg %s", optarg);
- printf ("\n");
- break;
-
- case '0':
- case '1':
- case '2':
- case '3':
- case '4':
- case '5':
- case '6':
- case '7':
- case '8':
- case '9':
- if (digit_optind != 0 && digit_optind != this_option_optind)
- printf ("digits occur in two different argv-elements.\n");
- digit_optind = this_option_optind;
- printf ("option %c\n", c);
- break;
-
- case 'a':
- printf ("option a\n");
- break;
-
- case 'b':
- printf ("option b\n");
- break;
-
- case 'c':
- printf ("option c with value `%s'\n", optarg);
- break;
-
- case 'd':
- printf ("option d with value `%s'\n", optarg);
- break;
-
- case '?':
- break;
-
- default:
- printf ("?? getopt returned character code 0%o ??\n", c);
- }
- }
-
- if (optind < argc)
- {
- printf ("non-option ARGV-elements: ");
- while (optind < argc)
- printf ("%s ", argv[optind++]);
- printf ("\n");
- }
-
- exit (0);
-}
-
-#endif /* TEST */
--- a/tools/getopt_win.h
+++ /dev/null
@@ -1,169 +1,0 @@
-/* Declarations for getopt.
- Copyright (C) 1989,90,91,92,93,94,96,97,98 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with the GNU C Library; see the file COPYING.LIB. If not,
- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
-
-#ifndef _GETOPT_H
-
-#ifndef __need_getopt
-# define _GETOPT_H 1
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* For communication from `getopt' to the caller.
- When `getopt' finds an option that takes an argument,
- the argument value is returned here.
- Also, when `ordering' is RETURN_IN_ORDER,
- each non-option ARGV-element is returned here. */
-
-extern char *optarg;
-
-/* Index in ARGV of the next element to be scanned.
- This is used for communication to and from the caller
- and for communication between successive calls to `getopt'.
-
- On entry to `getopt', zero means this is the first call; initialize.
-
- When `getopt' returns -1, this is the index of the first of the
- non-option elements that the caller should itself scan.
-
- Otherwise, `optind' communicates from one call to the next
- how much of ARGV has been scanned so far. */
-
-extern int optind;
-
-/* Callers store zero here to inhibit the error message `getopt' prints
- for unrecognized options. */
-
-extern int opterr;
-
-/* Set to an option character which was unrecognized. */
-
-extern int optopt;
-
-#ifndef __need_getopt
-/* Describe the long-named options requested by the application.
- The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector
- of `struct option' terminated by an element containing a name which is
- zero.
-
- The field `has_arg' is:
- no_argument (or 0) if the option does not take an argument,
- required_argument (or 1) if the option requires an argument,
- optional_argument (or 2) if the option takes an optional argument.
-
- If the field `flag' is not NULL, it points to a variable that is set
- to the value given in the field `val' when the option is found, but
- left unchanged if the option is not found.
-
- To have a long-named option do something other than set an `int' to
- a compiled-in constant, such as set a value from `optarg', set the
- option's `flag' field to zero and its `val' field to a nonzero
- value (the equivalent single-letter option character, if there is
- one). For long options that have a zero `flag' field, `getopt'
- returns the contents of the `val' field. */
-
-struct option
-{
-# if defined __STDC__ && __STDC__
- const char *name;
-# else
- char *name;
-# endif
- /* has_arg can't be an enum because some compilers complain about
- type mismatches in all the code that assumes it is an int. */
- int has_arg;
- int *flag;
- int val;
-};
-
-/* Names for the values of the `has_arg' field of `struct option'. */
-
-# define no_argument 0
-# define required_argument 1
-# define optional_argument 2
-#endif /* need getopt */
-
-
-/* Get definitions and prototypes for functions to process the
- arguments in ARGV (ARGC of them, minus the program name) for
- options given in OPTS.
-
- Return the option character from OPTS just read. Return -1 when
- there are no more options. For unrecognized options, or options
- missing arguments, `optopt' is set to the option letter, and '?' is
- returned.
-
- The OPTS string is a list of characters which are recognized option
- letters, optionally followed by colons, specifying that that letter
- takes an argument, to be placed in `optarg'.
-
- If a letter in OPTS is followed by two colons, its argument is
- optional. This behavior is specific to the GNU `getopt'.
-
- The argument `--' causes premature termination of argument
- scanning, explicitly telling `getopt' that there are no more
- options.
-
- If OPTS begins with `--', then non-option arguments are treated as
- arguments to the option '\0'. This behavior is specific to the GNU
- `getopt'. */
-
-#if defined __STDC__ && __STDC__
-# ifdef __GNU_LIBRARY__
-/* Many other libraries have conflicting prototypes for getopt, with
- differences in the consts, in stdlib.h. To avoid compilation
- errors, only prototype getopt for the GNU C library. */
-extern int getopt (int __argc, char *const *__argv, const char *__shortopts);
-# else /* not __GNU_LIBRARY__ */
-extern int getopt ();
-# endif /* __GNU_LIBRARY__ */
-
-# ifndef __need_getopt
-extern int getopt_long (int __argc, char *const *__argv, const char *__shortopts,
- const struct option *__longopts, int *__longind);
-extern int getopt_long_only (int __argc, char *const *__argv,
- const char *__shortopts,
- const struct option *__longopts, int *__longind);
-
-/* Internal only. Users should not call this directly. */
-extern int _getopt_internal (int __argc, char *const *__argv,
- const char *__shortopts,
- const struct option *__longopts, int *__longind,
- int __long_only);
-# endif
-#else /* not __STDC__ */
-extern int getopt ();
-# ifndef __need_getopt
-extern int getopt_long ();
-extern int getopt_long_only ();
-
-extern int _getopt_internal ();
-# endif
-#endif /* __STDC__ */
-
-#ifdef __cplusplus
-}
-#endif
-
-/* Make sure we later can get all the definitions and declarations. */
-#undef __need_getopt
-
-#endif /* getopt.h */
--- a/tools/opus_compare.m
+++ /dev/null
@@ -1,79 +1,0 @@
-%% Tests bit-stream compliance for the Opus codec
-%% x: Signal from the Opus reference implementation (float or fixed)
-%% y: Signal from the decoder under test
-%% stereo: 0 for mono, 1 for stereo
-function [err, NMR] = opus_compare(x, y, stereo)
-
-% Bands on which we compute the pseudo-NMR (Bark-derived CELT bands)
-b = 2*[0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 14, 16, 20, 24, 28, 34, 40, 48, 60, 78, 100];
-d = diff(b);
-
-% Per-band SNR threshold
-T = 50-.7*[1:21];
-
-% Noise floor
-N = 10 .^ ((10-0.6*[1:21])/10);
-
-% Error signal
-e=x-y;
-
-%Add a +/- 1 dead zone on the error
-e = e - min(1, max(-1, e));
-
-% Compute spectrum of original and error
-if (stereo)
- X=(abs(specgram(x(1:2:end),480))+abs(specgram(x(2:2:end),480)))/2;
- E=(abs(specgram(e(1:2:end),480))+abs(specgram(e(2:2:end),480)))/2;
-else
- X=abs(specgram(x,480));
- E=abs(specgram(e,480));
-endif
-
-% Group energy per band
-for k=1:21
- Xb(k,:) = sum(X(b(k)+1:b(k+1),:).^2)/d(k)+1;
- Eb(k,:) = sum(E(b(k)+1:b(k+1),:).^2)/d(k)+1;
-end
-
-% Frequency masking (low to high) with 10 dB/Bark slope
-Xb = filter(1, [1, -.1], Xb);
-% Frequency masking (high to low) with 15 dB/Bark slope
-Xb(end:-1:1,:) = filter(1, [1, -.03], Xb(end:-1:1,:));
-
-% Temporal masking with 5 dB/5 ms slope
-Xb = filter(1, [1, -.3], Xb')';
-
-% NMR threshold
-T0 = ones(length(Eb), 1)*(10.^((T)/10));
-
-% Time-frequency SNR
-NMR = (Xb./Eb)';
-
-%Picking only errors in the 90th percentile
-tmp = Eb(:);
-thresh = sort(tmp)(round(.90*length(tmp)));
-weight = Eb'>thresh;
-
-printf("Average pseudo-NMR: %3.2f dB\n", mean(mean(10*log10(NMR))));-
-if (sum(sum(weight))<1)
- printf("Mismatch level: below noise floor\n");- err = -100;
-else
- M = (T0./NMR) .* weight;
-
- err = 10*log10(sum(sum(M)) / sum(sum(weight)));
-
- printf("Weighted mismatch: %3.2f dB\n", err);-endif
-
-printf("\n");-
-if (err < 0)
- printf("**Decoder PASSES test (mismatch < 0 dB)\n");-else
- printf("**Decoder FAILS test (mismatch >= 0 dB)\n");-endif
-
-
-
--- a/tools/skeleton.c
+++ /dev/null
@@ -1,218 +1,0 @@
-/*
- * skeleton.c
- * author: Tahseen Mohammad
- */
-
-/* This file depends on WORDS_BIGENDIAN being defined to 1 if the host
- * processor stores words with the most significant byte first (like Motorola
- * and SPARC, unlike Intel and VAX).
- * On little endian systems, WORDS_BIGENDIAN should be undefined.
- *
- * When using GNU Autotools, the correct value will be written into config.h
- * if the autoconf macro AC_C_BIGENDIAN is called in configure.ac.
- */
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-
-#include <ogg/ogg.h>
-
-#include "skeleton.h"
-
-#ifdef WIN32
-#define snprintf _snprintf
-#endif
-
-static unsigned short
-_le_16 (unsigned short s)
-{ - unsigned short ret=s;
-#ifdef WORDS_BIGENDIAN
- ret = (s>>8) & 0x00ffU;
- ret += (s<<8) & 0xff00U;
-#endif
- return ret;
-}
-
-static ogg_uint32_t
-_le_32 (ogg_uint32_t i)
-{ - ogg_uint32_t ret=i;
-#ifdef WORDS_BIGENDIAN
- ret = (i>>24);
- ret += (i>>8) & 0x0000ff00;
- ret += (i<<8) & 0x00ff0000;
- ret += (i<<24);
-#endif
- return ret;
-}
-
-static ogg_int64_t
-_le_64 (ogg_int64_t l)
-{ - ogg_int64_t ret=l;
- unsigned char *ucptr = (unsigned char *)&ret;
-#ifdef WORDS_BIGENDIAN
- unsigned char temp;
-
- temp = ucptr [0] ;
- ucptr [0] = ucptr [7] ;
- ucptr [7] = temp ;
-
- temp = ucptr [1] ;
- ucptr [1] = ucptr [6] ;
- ucptr [6] = temp ;
-
- temp = ucptr [2] ;
- ucptr [2] = ucptr [5] ;
- ucptr [5] = temp ;
-
- temp = ucptr [3] ;
- ucptr [3] = ucptr [4] ;
- ucptr [4] = temp ;
-
-#endif
- return (*(ogg_int64_t *)ucptr);
-}
-
-/* write an ogg_page to a file pointer */
-int write_ogg_page_to_file(ogg_page *og, FILE *out) {- int written;
-
- written = fwrite(og->header,1, og->header_len, out);
- written += fwrite(og->body,1, og->body_len, out);
-
- return written;
-}
-
-int add_message_header_field(fisbone_packet *fp,
- char *header_key,
- char *header_value) {-
- /* size of both key and value + ': ' + CRLF */
- int this_message_size = strlen(header_key) + strlen(header_value) + 4;
- if (fp->message_header_fields == NULL) {- fp->message_header_fields = _ogg_calloc(this_message_size+1, sizeof(char));
- } else {- int new_size = (fp->current_header_size + this_message_size+1) * sizeof(char);
- fp->message_header_fields = _ogg_realloc(fp->message_header_fields, new_size);
- }
- snprintf(fp->message_header_fields + fp->current_header_size,
- this_message_size+1,
- "%s: %s\r\n",
- header_key,
- header_value);
- fp->current_header_size += this_message_size;
-
- return 0;
-}
-
-/* create a ogg_packet from a fishead_packet structure */
-ogg_packet ogg_from_fishead(fishead_packet *fp) {-
- ogg_packet op;
-
- memset(&op, 0, sizeof(op));
- op.packet = _ogg_calloc(FISHEAD_SIZE, sizeof(unsigned char));
- memset(op.packet, 0, FISHEAD_SIZE);
-
- memcpy (op.packet, FISHEAD_IDENTIFIER, 8); /* identifier */
- *((ogg_uint16_t*)(op.packet+8)) = _le_16 (SKELETON_VERSION_MAJOR); /* version major */
- *((ogg_uint16_t*)(op.packet+10)) = _le_16 (SKELETON_VERSION_MINOR); /* version minor */
- *((ogg_int64_t*)(op.packet+12)) = _le_64 (fp->ptime_n); /* presentationtime numerator */
- *((ogg_int64_t*)(op.packet+20)) = _le_64 (fp->ptime_d); /* presentationtime denominator */
- *((ogg_int64_t*)(op.packet+28)) = _le_64 (fp->btime_n); /* basetime numerator */
- *((ogg_int64_t*)(op.packet+36)) = _le_64 (fp->btime_d); /* basetime denominator */
- /* TODO: UTC time, set to zero for now */
-
- op.b_o_s = 1; /* its the first packet of the stream */
- op.e_o_s = 0; /* its not the last packet of the stream */
- op.bytes = FISHEAD_SIZE; /* length of the packet in bytes */
-
- return op;
-}
-
-/* create a ogg_packet from a fisbone_packet structure.
- * call this method after the fisbone_packet is filled and all message header fields are added
- * by calling add_message_header_field method.
- */
-ogg_packet ogg_from_fisbone(fisbone_packet *fp) {-
- ogg_packet op;
- int packet_size = FISBONE_SIZE + fp->current_header_size;
-
- memset (&op, 0, sizeof (op));
- op.packet = _ogg_calloc (packet_size, sizeof(unsigned char));
- memset (op.packet, 0, packet_size);
- memcpy (op.packet, FISBONE_IDENTIFIER, 8); /* identifier */
- *((ogg_uint32_t*)(op.packet+8)) = _le_32 (FISBONE_MESSAGE_HEADER_OFFSET); /* offset of the message header fields */
- *((ogg_uint32_t*)(op.packet+12)) = _le_32 (fp->serial_no); /* serialno of the respective stream */
- *((ogg_uint32_t*)(op.packet+16)) = _le_32 (fp->nr_header_packet); /* number of header packets */
- *((ogg_int64_t*)(op.packet+20)) = _le_64 (fp->granule_rate_n); /* granulrate numerator */
- *((ogg_int64_t*)(op.packet+28)) = _le_64 (fp->granule_rate_d); /* granulrate denominator */
- *((ogg_int64_t*)(op.packet+36)) = _le_64 (fp->start_granule); /* start granule */
- *((ogg_uint32_t*)(op.packet+44)) = _le_32 (fp->preroll); /* preroll, for theora its 0 */
- *(op.packet+48) = fp->granule_shift; /* granule shift */
- memcpy((op.packet+FISBONE_SIZE), fp->message_header_fields, fp->current_header_size);
-
- op.b_o_s = 0;
- op.e_o_s = 0;
- op.bytes = packet_size; /* size of the packet in bytes */
-
- return op;
-}
-
-
-
-int add_fishead_to_stream(ogg_stream_state *os, fishead_packet *fp) {-
- ogg_packet op;
-
- op = ogg_from_fishead(fp);
- ogg_stream_packetin(os, &op);
- _ogg_free(op.packet);
-
- return 0;
-}
-
-int add_fisbone_to_stream(ogg_stream_state *os, fisbone_packet *fp) {-
- ogg_packet op;
-
- op = ogg_from_fisbone(fp);
- ogg_stream_packetin(os, &op);
- _ogg_free(op.packet);
-
- return 0;
-}
-
-int add_eos_packet_to_stream(ogg_stream_state *os) {-
- ogg_packet op;
-
- memset (&op, 0, sizeof(op));
- op.e_o_s = 1;
- ogg_stream_packetin(os, &op);
-
- return 0;
-}
-
-int flush_ogg_stream_to_file(ogg_stream_state *os, FILE *out) {-
- ogg_page og;
- int result;
-
- while((result = ogg_stream_flush(os, &og)))
- {- if(!result) break;
- result = write_ogg_page_to_file(&og, out);
- if(result != og.header_len + og.body_len)
- return 1;
- }
-
- return 0;
-}
--- a/tools/skeleton.h
+++ /dev/null
@@ -1,78 +1,0 @@
-/*
- * skeleton.h
- * author: Tahseen Mohammad
- */
-
-#ifndef _SKELETON_H
-#define _SKELETON_H
-
-#ifdef __cplusplus
-extern "C" {-#endif
-
-#ifdef WIN32
-#define snprintf _snprintf
-#endif
-
-#include <ogg/ogg.h>
-
-#define SKELETON_VERSION_MAJOR 3
-#define SKELETON_VERSION_MINOR 0
-#define FISHEAD_IDENTIFIER "fishead\0"
-#define FISBONE_IDENTIFIER "fisbone\0"
-#define FISHEAD_SIZE 64
-#define FISBONE_SIZE 52
-#define FISBONE_MESSAGE_HEADER_OFFSET 44
-
-/* fishead_packet holds a fishead header packet. */
-typedef struct {- ogg_uint16_t version_major; /* skeleton version major */
- ogg_uint16_t version_minor; /* skeleton version minor */
- /* Start time of the presentation
- * For a new stream presentationtime & basetime is same. */
- ogg_int64_t ptime_n; /* presentation time numerator */
- ogg_int64_t ptime_d; /* presentation time denominator */
- ogg_int64_t btime_n; /* basetime numerator */
- ogg_int64_t btime_d; /* basetime denominator */
- /* will holds the time of origin of the stream, a 20 bit field. */
- unsigned char UTC[20];
-} fishead_packet;
-
-/* fisbone_packet holds a fisbone header packet. */
-typedef struct {- ogg_uint32_t serial_no; /* serial no of the corresponding stream */
- ogg_uint32_t nr_header_packet; /* number of header packets */
- /* granule rate is the temporal resolution of the logical bitstream */
- ogg_int64_t granule_rate_n; /* granule rate numerator */
- ogg_int64_t granule_rate_d; /* granule rate denominator */
- ogg_int64_t start_granule; /* start granule value */
- ogg_uint32_t preroll; /* preroll */
- unsigned char granule_shift; /* 1 byte value holding the granule shift */
- char *message_header_fields; /* holds all the message header fields */
- /* current total size of the message header fields, for realloc purpose, initially zero */
- ogg_uint32_t current_header_size;
-} fisbone_packet;
-
-extern int write_ogg_page_to_file(ogg_page *og, FILE *out);
-extern int add_message_header_field(fisbone_packet *fp, char *header_key, char *header_value);
-/* remember to deallocate the returned ogg_packet properly */
-extern ogg_packet ogg_from_fishead(fishead_packet *fp);
-extern ogg_packet ogg_from_fisbone(fisbone_packet *fp);
-extern fishead_packet fishead_from_ogg(ogg_packet *op);
-extern fisbone_packet fisbone_from_ogg(ogg_packet *op);
-extern int add_fishead_to_stream(ogg_stream_state *os, fishead_packet *fp);
-extern int add_fisbone_to_stream(ogg_stream_state *os, fisbone_packet *fp);
-extern int add_eos_packet_to_stream(ogg_stream_state *os);
-extern int flush_ogg_stream_to_file(ogg_stream_state *os, FILE *out);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _SKELETON_H */
-
-
-
-
-
-
--- a/tools/wav_io.c
+++ /dev/null
@@ -1,223 +1,0 @@
-/* Copyright (C) 2002 Jean-Marc Valin
- File: wav_io.c
- Routines to handle wav (RIFF) headers
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- - Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- - Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <stdio.h>
-#include <string.h>
-#include "celt_types.h"
-#include "wav_io.h"
-
-
-int read_wav_header(FILE *file, int *rate, int *channels, int *format, celt_int32 *size)
-{- char ch[5];
- celt_int32 itmp;
- celt_int16 stmp;
- celt_int32 bpersec;
- celt_int16 balign;
- int skip_bytes;
- int i;
-
- ch[4]=0;
-#if 0
- fread(ch, 1, 4, file);
- if (strcmp(ch, "RIFF")!=0)
- {- fseek(file, 0, SEEK_SET);
- return 0;
- }
-
- fread(&itmp, 4, 1, file);
- *size = le_int(itmp-36);
-
- fread(ch, 1, 4, file);
- if (strcmp(ch, "WAVE")!=0)
- {- fprintf (stderr, "RIFF file is not a WAVE file\n");
- return -1;
- }
-#endif
- fread(ch, 1, 4, file);
- while (strcmp(ch, "fmt ")!=0)
- {- fread(&itmp, 4, 1, file);
- itmp = le_int(itmp);
- /*fprintf (stderr, "skip=%d\n", itmp);*/
- /*strange way of seeking, but it works even for pipes*/
- for (i=0;i<itmp;i++)
- fgetc(file);
- /*fseek(file, itmp, SEEK_CUR);*/
- fread(ch, 1, 4, file);
- if (feof(file))
- {- fprintf (stderr, "Corrupted WAVE file: no \"fmt \"\n");
- return -1;
- }
- }
- /*if (strcmp(ch, "fmt ")!=0)
- {- fprintf (stderr, "Corrupted WAVE file: no \"fmt \"\n");
- return -1;
- }*/
-
- fread(&itmp, 4, 1, file);
- itmp = le_int(itmp);
- skip_bytes=itmp-16;
- /*fprintf (stderr, "skip=%d\n", skip_bytes);*/
-
- fread(&stmp, 2, 1, file);
- stmp = le_short(stmp);
- if (stmp!=1)
- {- fprintf (stderr, "Only PCM encoding is supported\n");
- return -1;
- }
-
- fread(&stmp, 2, 1, file);
- stmp = le_short(stmp);
- *channels = stmp;
-
- if (stmp>2)
- {- fprintf (stderr, "Only mono and (intensity) stereo supported\n");
- return -1;
- }
-
- fread(&itmp, 4, 1, file);
- itmp = le_int(itmp);
- *rate = itmp;
-
- fread(&itmp, 4, 1, file);
- bpersec = le_int(itmp);
-
- fread(&stmp, 2, 1, file);
- balign = le_short(stmp);
-
- fread(&stmp, 2, 1, file);
- stmp = le_short(stmp);
- if (stmp!=16 && stmp!=8)
- {- fprintf (stderr, "Only 8/16-bit linear supported\n");
- return -1;
- }
- *format=stmp;
-
- if (bpersec!=*rate**channels*stmp/8)
- {- fprintf (stderr, "Corrupted header: ByteRate mismatch\n");
- return -1;
- }
-
- if (balign!=*channels*stmp/8)
- {- fprintf (stderr, "Corrupted header: BlockAlign mismatch\n");
- return -1;
- }
-
-
- /*strange way of seeking, but it works even for pipes*/
- if (skip_bytes>0)
- for (i=0;i<skip_bytes;i++)
- fgetc(file);
-
- /*fseek(file, skip_bytes, SEEK_CUR);*/
-
- fread(ch, 1, 4, file);
- while (strcmp(ch, "data")!=0)
- {- fread(&itmp, 4, 1, file);
- itmp = le_int(itmp);
- /*strange way of seeking, but it works even for pipes*/
- for (i=0;i<itmp;i++)
- fgetc(file);
- /*fseek(file, itmp, SEEK_CUR);*/
- fread(ch, 1, 4, file);
- if (feof(file))
- {- fprintf (stderr, "Corrupted WAVE file: no \"data\"\n");
- return -1;
- }
- }
-
- /*Ignore this for now*/
- fread(&itmp, 4, 1, file);
- itmp = le_int(itmp);
-
- *size=itmp;
-
- return 1;
-}
-
-
-
-void write_wav_header(FILE *file, int rate, int channels, int format, int size)
-{- char ch[5];
- celt_int32 itmp;
- celt_int16 stmp;
-
- ch[4]=0;
-
- fprintf (file, "RIFF");
-
- itmp = 0x7fffffff;
- fwrite(&itmp, 4, 1, file);
-
- fprintf (file, "WAVEfmt ");
-
- itmp = le_int(16);
- fwrite(&itmp, 4, 1, file);
-
- stmp = le_short(1);
- fwrite(&stmp, 2, 1, file);
-
- stmp = le_short(channels);
- fwrite(&stmp, 2, 1, file);
-
- itmp = le_int(rate);
- fwrite(&itmp, 4, 1, file);
-
- itmp = le_int(rate*channels*2);
- fwrite(&itmp, 4, 1, file);
-
- stmp = le_short(2*channels);
- fwrite(&stmp, 2, 1, file);
-
- stmp = le_short(16);
- fwrite(&stmp, 2, 1, file);
-
- fprintf (file, "data");
-
- itmp = le_int(0x7fffffff);
- fwrite(&itmp, 4, 1, file);
-
-
-}
--- a/tools/wav_io.h
+++ /dev/null
@@ -1,62 +1,0 @@
-/* Copyright (C) 2002 Jean-Marc Valin
- File: wav_io.h
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- - Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- - Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#ifndef WAV_IO_H
-#define WAV_IO_H
-
-#include <stdio.h>
-#include "celt_types.h"
-
-#if !defined(__LITTLE_ENDIAN__) && ( defined(WORDS_BIGENDIAN) || defined(__BIG_ENDIAN__) )
-#define le_short(s) ((short) ((unsigned short) (s) << 8) | ((unsigned short) (s) >> 8))
-#define be_short(s) ((short) (s))
-#else
-#define le_short(s) ((short) (s))
-#define be_short(s) ((short) ((unsigned short) (s) << 8) | ((unsigned short) (s) >> 8))
-#endif
-
-/** Convert little endian */
-static inline celt_int32 le_int(celt_int32 i)
-{-#if !defined(__LITTLE_ENDIAN__) && ( defined(WORDS_BIGENDIAN) || defined(__BIG_ENDIAN__) )
- celt_uint32 ui, ret;
- ui = i;
- ret = ui>>24;
- ret |= (ui>>8)&0x0000ff00;
- ret |= (ui<<8)&0x00ff0000;
- ret |= (ui<<24);
- return ret;
-#else
- return i;
-#endif
-}
-
-int read_wav_header(FILE *file, int *rate, int *channels, int *format, celt_int32 *size);
-
-void write_wav_header(FILE *file, int rate, int channels, int format, int size);
-
-#endif
--- a/tools/wave_out.c
+++ /dev/null
@@ -1,220 +1,0 @@
-/* Copyright (c) 2002, John Edwards
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- - Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- - Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
- - Neither the name of the Xiph.org Foundation nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-/* Set TABS = 4 */
-/********************************************************************
-
- function: To provide playback of 16 bit PCM wave data in Win32
- environments from decoded compressed files.
-
- ********************************************************************/
-
-#if defined WIN32 || defined _WIN32
-
-#include <string.h>
-#include <errno.h>
-#include "wave_out.h"
-
-#define MAXWAVESIZE 4294967040LU
-#define MAX_WAVEBLOCKS 32
-
-// This is modified for USE_WIN_AUDIO - ONLY 2002-02-27
-
-
-static CRITICAL_SECTION cs;
-static HWAVEOUT dev = NULL;
-static int ScheduledBlocks = 0;
-static int PlayedWaveHeadersCount = 0; // free index
-static WAVEHDR* PlayedWaveHeaders [MAX_WAVEBLOCKS];
-
-static int
-Box ( const char* msg )
-{
- MessageBox ( NULL, msg, " "VERSION_STRING": Error Message . . .", MB_OK | MB_ICONEXCLAMATION );
- return -1;
-}
-
-
-/*
- * This function registers already played WAVE chunks. Freeing is done by free_memory(),
- */
-
-static void CALLBACK
-wave_callback ( HWAVE hWave, UINT uMsg, DWORD dwInstance, DWORD dwParam1, DWORD dwParam2 )
-{
- if ( uMsg == WOM_DONE ) {
- EnterCriticalSection ( &cs );
- PlayedWaveHeaders [PlayedWaveHeadersCount++] = (WAVEHDR*) dwParam1;
- LeaveCriticalSection ( &cs );
- }
-}
-
-
-static void
-free_memory ( void )
-{
- WAVEHDR* wh;
- HGLOBAL hg;
-
- EnterCriticalSection ( &cs );
- wh = PlayedWaveHeaders [--PlayedWaveHeadersCount];
- ScheduledBlocks--; // decrease the number of USED blocks
- LeaveCriticalSection ( &cs );
-
- waveOutUnprepareHeader ( dev, wh, sizeof (WAVEHDR) );
-
- hg = GlobalHandle ( wh -> lpData ); // Deallocate the buffer memory
- GlobalUnlock (hg);
- GlobalFree (hg);
-
- hg = GlobalHandle ( wh ); // Deallocate the header memory
- GlobalUnlock (hg);
- GlobalFree (hg);
-}
-
-
-Int
-Set_WIN_Params ( FILE_T dummyFile ,
- Ldouble SampleFreq,
- Uint BitsPerSample,
- Uint Channels )
-{
- WAVEFORMATEX outFormat;
- UINT deviceID = WAVE_MAPPER;
-
- (void) dummyFile;
-
- if ( waveOutGetNumDevs () == 0 )
- return Box ( "No audio device present." );
-
- outFormat.wFormatTag = WAVE_FORMAT_PCM;
- outFormat.wBitsPerSample = BitsPerSample;
- outFormat.nChannels = Channels;
- outFormat.nSamplesPerSec = (unsigned long)(SampleFreq + 0.5);
- outFormat.nBlockAlign = (outFormat.wBitsPerSample + 7) / 8 * outFormat.nChannels;
- outFormat.nAvgBytesPerSec = outFormat.nSamplesPerSec * outFormat.nBlockAlign;
-
- switch ( waveOutOpen ( &dev, deviceID, &outFormat, (DWORD)wave_callback, 0, CALLBACK_FUNCTION ) )
- {
- case MMSYSERR_ALLOCATED: return Box ( "Device is already open." );
- case MMSYSERR_BADDEVICEID: return Box ( "The specified device is out of range." );
- case MMSYSERR_NODRIVER: return Box ( "There is no audio driver in this system." );
- case MMSYSERR_NOMEM: return Box ( "Unable to allocate sound memory." );
- case WAVERR_BADFORMAT: return Box ( "This audio format is not supported." );
- case WAVERR_SYNC: return Box ( "The device is synchronous." );
- default: return Box ( "Unknown media error." );
- case MMSYSERR_NOERROR: break;
- }
-
- waveOutReset ( dev );
- InitializeCriticalSection ( &cs );
- SetPriorityClass ( GetCurrentProcess (), HIGH_PRIORITY_CLASS );
- return 0;
-}
-
-
-int
-WIN_Play_Samples ( const void* data, size_t len )
-{
- HGLOBAL hg;
- HGLOBAL hg2;
- LPWAVEHDR wh;
- void* allocptr;
-
- do {
- while ( PlayedWaveHeadersCount > 0 ) // free used blocks ...
- free_memory ();
-
- if ( ScheduledBlocks < sizeof(PlayedWaveHeaders)/sizeof(*PlayedWaveHeaders) ) // wait for a free block ...
- break;
- Sleep (26);
- } while (1);
-
- if ( (hg2 = GlobalAlloc ( GMEM_MOVEABLE, len )) == NULL ) // allocate some memory for a copy of the buffer
- return Box ( "GlobalAlloc failed." );
-
- allocptr = GlobalLock (hg2);
- CopyMemory ( allocptr, data, len ); // Here we can call any modification output functions we want....
-
- if ( (hg = GlobalAlloc (GMEM_MOVEABLE | GMEM_ZEROINIT, sizeof (WAVEHDR))) == NULL ) // now make a header and WRITE IT!
- return -1;
-
- wh = GlobalLock (hg);
- wh -> dwBufferLength = len;
- wh -> lpData = allocptr;
-
- if ( waveOutPrepareHeader ( dev, wh, sizeof (WAVEHDR)) != MMSYSERR_NOERROR ) {
- GlobalUnlock (hg);
- GlobalFree (hg);
- return -1;
- }
-
- if ( waveOutWrite ( dev, wh, sizeof (WAVEHDR)) != MMSYSERR_NOERROR ) {
- GlobalUnlock (hg);
- GlobalFree (hg);
- return -1;
- }
-
- EnterCriticalSection ( &cs );
- ScheduledBlocks++;
- LeaveCriticalSection ( &cs );
-
- return len;
-}
-
-
-int
-WIN_Audio_close ( void )
-{
- if ( dev != NULL ) {
-
- while ( ScheduledBlocks > 0 ) {
- Sleep (ScheduledBlocks);
- while ( PlayedWaveHeadersCount > 0 ) // free used blocks ...
- free_memory ();
- }
-
- waveOutReset (dev); // reset the device
- waveOutClose (dev); // close the device
- dev = NULL;
- }
-
- DeleteCriticalSection ( &cs );
- ScheduledBlocks = 0;
- return 0;
-}
-
-#endif
-
-/* end of wave_out.c */
--- a/tools/wave_out.h
+++ /dev/null
@@ -1,71 +1,0 @@
-/* Copyright (c) 2002, John Edwards
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- - Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- - Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
- - Neither the name of the Xiph.org Foundation nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-// WAVE_OUT.H - Necessary stuff for WIN_AUDIO
-
-#ifndef WAVE_OUT_H
-#define WAVE_OUT_H
-
-#include <stdio.h>
-#include <windows.h>
-#ifdef __MINGW32__
-#include <mmsystem.h>
-#endif
-
-#define VERSION_STRING "\n 0.11.4\n"
-
-#define Cdecl __cdecl
-#define __attribute__(x)
-#define sleep(__sec) Sleep ((__sec) * 1000)
-#define inline __inline
-#define restrict
-
-//// constants /////////////////////////////////////////////////////
-
-#define CD_SAMPLE_FREQ 44.1e3
-#define SAMPLE_SIZE 16
-#define SAMPLE_SIZE_STRING ""
-#define WINAUDIO_FD ((FILE_T)-128)
-#define FILE_T FILE*
-#define INVALID_FILEDESC NULL
-
-//// Simple types //////////////////////////////////////////////////
-
-typedef signed int Int; // at least -32767...+32767, fast type
-typedef unsigned int Uint; // at least 0...65535, fast type
-typedef long double Ldouble; // most exact floating point format
-
-//// procedures/functions //////////////////////////////////////////
-// wave_out.c
-Int Set_WIN_Params ( FILE_T dummyFile , Ldouble SampleFreq, Uint BitsPerSample, Uint Channels);
-int WIN_Play_Samples ( const void* buff, size_t len );
-int WIN_Audio_close ( void );
-
-#endif /* WAVE_OUT_H */
--
⑨