diff --git a/bundle.json b/bundle.json index 5332a58fbe61ef5ceb60e0ee9d044b2877034ef7..b6c3e6d27135ed9601744e2eb08caf18c2cc99ac 100644 --- a/bundle.json +++ b/bundle.json @@ -71,15 +71,6 @@ ] }, "name": "//third_party/pulseaudio/sonic:sonic" - }, - { - "header": { - "header_base": "//third_party/pulseaudio/speex/include/speex", - "header_files": [ - "speex_resampler.h" - ] - }, - "name": "//third_party/pulseaudio/speex:speexresampler" } ], "test": [] diff --git a/speex/AUTHORS b/speex/AUTHORS deleted file mode 100644 index 395c3fec238a9916f046c249e21fa1962f760bde..0000000000000000000000000000000000000000 --- a/speex/AUTHORS +++ /dev/null @@ -1,18 +0,0 @@ -Jean-Marc Valin - All the code except the following - -David Rowe - lsp.c lsp.h - Also ideas and feedback - -John Francis Edwards - wave_out.[ch], some #ifdefs for windows port and MSVC project files - -Segher Boessenkool - Misc. optimizations (for QMF in particular) - -Atsuhiko Yamanaka : - Patch to speexenc.c to add Vorbis comment format - -Radim Kolar : - Patch to speexenc.c for supporting more input formats diff --git a/speex/BUILD.gn b/speex/BUILD.gn deleted file mode 100644 index 523c0e2d49ac07000aa2e2b28c95a54b2e778200..0000000000000000000000000000000000000000 --- a/speex/BUILD.gn +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright (c) 2021-2022 Huawei Device Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import("//build/ohos.gni") - -config("speex_config") { - visibility = [ ":*" ] - - include_dirs = [ - "include", - "libspeexdsp", - ] - - cflags = [ - "-Wall", - "-Werror", - "-Wno-sign-compare", - "-Wno-unused-parameter", - ] -} - -ohos_source_set("speex_sources") { - sources = [ "libspeexdsp/resample.c" ] - - configs = [ ":speex_config" ] - subsystem_name = "thirdparty" - part_name = "pulseaudio" -} - -config("speexresampler_header") { - include_dirs = [ "//third_party/pulseaudio/speex/include" ] -} - -ohos_shared_library("speexresampler") { - deps = [ ":speex_sources" ] - innerapi_tags = [ - "chipsetsdk_indirect", - "platformsdk_indirect", - ] - - public_configs = [ ":speexresampler_header" ] - subsystem_name = "thirdparty" - part_name = "pulseaudio" -} diff --git a/speex/COPYING b/speex/COPYING deleted file mode 100644 index de6fbe2c9158bdbaccf76a8c3c1221bfaa0c9244..0000000000000000000000000000000000000000 --- a/speex/COPYING +++ /dev/null @@ -1,35 +0,0 @@ -Copyright 2002-2008 Xiph.org Foundation -Copyright 2002-2008 Jean-Marc Valin -Copyright 2005-2007 Analog Devices Inc. -Copyright 2005-2008 Commonwealth Scientific and Industrial Research - Organisation (CSIRO) -Copyright 1993, 2002, 2006 David Rowe -Copyright 2003 EpicGames -Copyright 1992-1994 Jutta Degener, Carsten Bormann - -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. diff --git a/speex/ChangeLog b/speex/ChangeLog deleted file mode 100644 index 9a6cd8af090be696e259fd756c119bdc38e8e2cf..0000000000000000000000000000000000000000 --- a/speex/ChangeLog +++ /dev/null @@ -1,21 +0,0 @@ -2005-09-07 Thomas Vander Stichele - - * libspeex/cb_search.c: (split_cb_search_shape_sign_N1): - add declaration for n, seems like an obvious build fix, slap - me down if it's not - -2004-02-18 Jean-Marc Valin - Patch for compiling with mingw32 sent by j@thing.net - -2004-02-18 Jean-Marc Valin - Integrated IRIX patch (getopt stuff) from Michael Pruett - -2004-02-18 Jean-Marc Valin - Changed the Makefile.am so that KDevelop can parse SUBDIRS correctly - -2002/03/27 Jean-Marc Valin: -Working encoder and decoder for both narrowband and wideband. - -2002/02/27 Jean-Marc Valin: -Got the basic encoder working as a demo with quantization only on some -parameters. diff --git a/speex/Doxyfile b/speex/Doxyfile deleted file mode 100644 index 772934fc3d29f12b572690792fe523ff848cc6a4..0000000000000000000000000000000000000000 --- a/speex/Doxyfile +++ /dev/null @@ -1,225 +0,0 @@ -# Doxyfile 1.5.1-KDevelop - -#--------------------------------------------------------------------------- -# Project related configuration options -#--------------------------------------------------------------------------- -PROJECT_NAME = Speex -PROJECT_NUMBER = 1.2-beta2 -OUTPUT_DIRECTORY = doc -CREATE_SUBDIRS = NO -OUTPUT_LANGUAGE = English -USE_WINDOWS_ENCODING = NO -BRIEF_MEMBER_DESC = YES -REPEAT_BRIEF = YES -ABBREVIATE_BRIEF = -ALWAYS_DETAILED_SEC = NO -INLINE_INHERITED_MEMB = NO -FULL_PATH_NAMES = NO -STRIP_FROM_PATH = -STRIP_FROM_INC_PATH = -SHORT_NAMES = NO -JAVADOC_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 = NO -OPTIMIZE_OUTPUT_JAVA = NO -BUILTIN_STL_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 -HIDE_UNDOC_MEMBERS = NO -HIDE_UNDOC_CLASSES = NO -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 = YES -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 = include/speex -FILE_PATTERNS = -RECURSIVE = NO -EXCLUDE = -EXCLUDE_SYMLINKS = NO -EXCLUDE_PATTERNS = speex_config_types.h -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 = NO -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 -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 = NO -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 = YES -HIDE_UNDOC_RELATIONS = YES -HAVE_DOT = NO -CLASS_GRAPH = YES -COLLABORATION_GRAPH = YES -GROUP_GRAPHS = YES -UML_LOOK = NO -TEMPLATE_RELATIONS = YES -INCLUDE_GRAPH = YES -INCLUDED_BY_GRAPH = YES -CALL_GRAPH = NO -CALLER_GRAPH = NO -GRAPHICAL_HIERARCHY = YES -DIRECTORY_GRAPH = YES -DOT_IMAGE_FORMAT = gif -DOT_PATH = -DOTFILE_DIRS = -MAX_DOT_GRAPH_WIDTH = 1024 -MAX_DOT_GRAPH_HEIGHT = 1024 -MAX_DOT_GRAPH_DEPTH = 0 -DOT_TRANSPARENT = NO -DOT_MULTI_TARGETS = NO -GENERATE_LEGEND = YES -DOT_CLEANUP = YES -#--------------------------------------------------------------------------- -# Configuration::additions related to the search engine -#--------------------------------------------------------------------------- -SEARCHENGINE = NO diff --git a/speex/INSTALL b/speex/INSTALL deleted file mode 100644 index 1920150e76f773f02cae8ded06dcb5813279e5ab..0000000000000000000000000000000000000000 --- a/speex/INSTALL +++ /dev/null @@ -1,8 +0,0 @@ -Installing SpeexDSP is as easy as: - -% ./configure [--prefix=] -% make -% make install - -Note that if you are using the code from git you will need to run "autogen.sh" -and then "configure". diff --git a/speex/Makefile.am b/speex/Makefile.am deleted file mode 100644 index 177ff1bafce7668247160bf3003806e7f859b250..0000000000000000000000000000000000000000 --- a/speex/Makefile.am +++ /dev/null @@ -1,19 +0,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.8 -ACLOCAL_AMFLAGS = -I m4 - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = speexdsp.pc - -EXTRA_DIST = SpeexDSP.spec SpeexDSP.spec.in SpeexDSP.kdevelop speexdsp.pc.in README.blackfin - -#Fools KDevelop into including all files -SUBDIRS = libspeexdsp include doc win32 symbian ti - -DIST_SUBDIRS = libspeexdsp include doc win32 symbian ti - -rpm: dist - rpmbuild -ta ${PACKAGE}-${VERSION}.tar.gz diff --git a/speex/NEWS b/speex/NEWS deleted file mode 100644 index 9a995291411909242261fab88d9c59a315f2fd8b..0000000000000000000000000000000000000000 --- a/speex/NEWS +++ /dev/null @@ -1 +0,0 @@ -2002/02/13: Creation of the "Speex" project diff --git a/speex/README b/speex/README deleted file mode 100644 index 8d10b1c2541a9428371b79393d308bb5139e12bb..0000000000000000000000000000000000000000 --- a/speex/README +++ /dev/null @@ -1,3 +0,0 @@ -See INSTALL file for instructions on how to install SpeexDSP. - -SpeexDSP is a patent-free, Open Source/Free Software DSP library. diff --git a/speex/README.Trimedia b/speex/README.Trimedia deleted file mode 100644 index de59c8460bd1678bb381755c8428748f0407422b..0000000000000000000000000000000000000000 --- a/speex/README.Trimedia +++ /dev/null @@ -1,103 +0,0 @@ -################# REMOVE warnings on trimedia compiler ############################## -################# Not critical to compilation ############################## - -1. Change the following statements to remove warning for constant expression -(i) mdf.c [if(0) --> #if 0] -(ii) preprocess.c [if(1) --> #if 1] - -2. add REMARK_ON macro to remove warning on not reference variable --- uses (void) to remove warning on not referenced variable --- #define REMARK_ON --- (void) --- #endif --- search for REMARK_ON on the following files -(i) jitter.c -(ii) mdf.c -(iii) filterbank.c -(iv) preprocess.c - -3. commented out the following in pseudofloat.h for unused variable -//static const spx_float_t FLOAT_HALF = {16384,-15}; - -################# Patches for trimedia compiler ############################## -################# Critical to compilation ############################## - --- added the #elif defined (TM_ASM) to the following files for optimized codes -(1) arch.h -(2) fftwrap.c -(3) filterbank.c -(4) kiss_fft.c -(5) kiss_fftr.c -(6) mdf.c -(7) preprocess.c - --- added macro PREPROCESS_MDF_FLOAT to allow using of floating point --- in mdf and preprocess while keeping fixed point in encoder/decoder --- This is due to the fact that preprocess/mdf run faster on floating --- point on trimedia --- added the following 3 lines to the files below -#ifdef PREPROCESS_MDF_FLOAT -#undef FIXED_POINT -#endif -(1) mdf.c -(2) preprocess.c -(3) filterbank.c -(4) fftwrap.c -(5) kiss_fft.c -(6) kiss_fftr.c - --- created a new USE_COMPACT_KISS_FFT for fftwrap.c and shifted defination --- to config file so that user configure the usage of fft on config.h --- TOEXPLORE:is it possible to share table between mdf/preprocess? --- Introducing this macro made the following changes in C code --- New macro to facilitate integration -(grouping real/complex for dc and nyquist frequency seems to require a large -amount of memory for mdf, therefore did not made the changes for that) -(1) modify preprocess.c on init and destroy -(2) modify mdf.c on init and destroy -(3) shifted power_spectrum to fftwrap.c to share optimised code between - preprocess.c and mdf.c - -################# NOTES ############################## -(1) fixed point encoding/decoding is tested on narrowband - - some of the QX fractions are packed together to - (frac1 * a + frac2 * a) >> X (should be more accurate in rounding) - instead of - ((frac1 * a) >> X) + ((frac2 * a) >> X) - will cause some different between optimized and unoptimized code. - tried decoding/encoding optimized code on some audio files retains - the clearity of the word - - - wideband/ultrawideband is not heavily tested yet - -(2) optimized fixed point code requires memory alignment - - used config to debug on functions where memory is not align - -(3) floating point optimization for preprocess/mdf is tested - fixed point is not tested yet (except fft/filterbank) - Note (1) also applies to sround in fft for fixed point - some optimization is provided for fixed point as it requires lesser - memory compared to floating point. - -(4) unroll configurations provided to reduce code size if required - -(5) use profile options only if compiler profiling fails to work - -(6) can't include the makefile as it is close proprietary - -################# TODO:For Trimedia ############################## -(1) Optimizations for fixed point in mdf/preprocess - -################# Added Files ############################## -- _kiss_fft_guts_tm.h -- fftwrap_tm.h -- filterbank_tm.h -- filters_tm.h -- fixed_tm.h -- kiss_fft_tm.h -- kiss_fftr_tm.h -- mdf_tm.h -- misc_tm.h -- preprocess_tm.h -- config.h -- speex_config_types.h diff --git a/speex/README.blackfin b/speex/README.blackfin deleted file mode 100644 index 4270d210f44752d98095c81b05611b1fa2097aa3..0000000000000000000000000000000000000000 --- a/speex/README.blackfin +++ /dev/null @@ -1,22 +0,0 @@ -SpeexDSP has been ported to the Blackfin DSP, for the STAMP development board. - -This port has been tested on the STAMP development board and requires the -toolchain available at http://blackfin.uclinux.org/ - -1/ In order to cross-compile for uClinux from the SpeexDSP tarball: - - ./configure --enable-blackfin-asm --enable-fixed-point --host=bfin-uclinux - cd libspeexdsp - make - -The --enable-blackfin-asm option is not required, but it speeds up Speex by -approximately a factor of two. - -2/ In order to cross-compile for uClinux from the SpeexDSP git: - - git clone git://git.xiph.org/speexdsp.git - cd speexdsp - ./autogen.sh - ./configure --enable-blackfin-asm --enable-fixed-point --host=bfin-uclinux - cd libspeexdsp - make diff --git a/speex/README.win32 b/speex/README.win32 deleted file mode 100644 index d9d4414f27c3a7236c0dcb5f1116b1e122badc09..0000000000000000000000000000000000000000 --- a/speex/README.win32 +++ /dev/null @@ -1,11 +0,0 @@ -Win32 Specific options - -In order to enable the following options within SpeexDSP, you will need to manually edit the project options for the appropriate VC configuration. These macros can be specified by adding them as "Preprocessor Definitions" under the appropriate Configuration's project options. If you don't know how to do this, please check your Visual C documentation. - -Feature: - -Intel Streaming SIMD Extensions - SSE - macro: USE_SSE -Fixed point - macro: FIXED_POINT -Epic 48 - macro: EPIC_48K - -Note: USE_SSE and FIXED_POINT are mutually exclusive. diff --git a/speex/SpeexDSP.kdevelop b/speex/SpeexDSP.kdevelop deleted file mode 100644 index 1b3d683b0778a535b8d622ef64a6cfc67076671a..0000000000000000000000000000000000000000 --- a/speex/SpeexDSP.kdevelop +++ /dev/null @@ -1,201 +0,0 @@ - - - - Jean-Marc Valin - jean-marc.valin@usherbrooke.ca - $VERSION$ - KDevAutoProject - C - - . - false - - - kdevsubversion - - Speex - - - - libspeex/libspeex.la - float - - - src/Speex - executable - / - - false - true - - false - false - - - - float - kdevgccoptions - kdevgppoptions - kdevpgf77options - -O2 -g -Wall - - --disable-shared - - - - - - - - - - - --enable-fixed-point --disable-shared - fixed - kdevgccoptions - kdevgppoptions - kdevpgf77options - -O2 -g -Wall - - - - - - - - - - - - - - - - - - - - false - 4 - false - - true - 0 - - - - - libtool - - - - - - true - false - false - - - false - true - 10 - - - - - - - - - - - - - true - true - true - false - true - true - true - 350 - 400 - 250 - false - 0 - true - true - false - std=_GLIBCXX_STD;__gnu_cxx=std - true - true - false - false - true - true - true - true - .; - false - false - - - false - 3 - /usr/share/qt3 - 3 - EmbeddedKDevDesigner - /usr/share/qt3/bin/qmake - /usr/bin/designer-qt3 - - - - - set - m_,_ - theValue - true - true - - - true - true - Horizontal - - - - - false - false - - - *.o,*.lo,CVS - true - false - - - - - html/ - html/ - - - - - - - - - - .h - .cpp - - - - - - - - - - diff --git a/speex/SpeexDSP.spec.in b/speex/SpeexDSP.spec.in deleted file mode 100644 index 440856bb0c1382c95a09737018a7d9ce05212448..0000000000000000000000000000000000000000 --- a/speex/SpeexDSP.spec.in +++ /dev/null @@ -1,67 +0,0 @@ -%define name @PACKAGE@ -%define ver @VERSION@ -%define rel 1 - -Summary: An open-source, patent-free speech codec -Name: %name -Version: %ver -Release: %rel -License: BSD -Group: Application/Devel -Source: http://www.speex.org/download/%{name}-%{ver}.tar.gz -URL: http://www.speex.org/ -Vendor: Speex -Packager: Jean-Marc Valin (jean-marc.valin@usherbrooke.ca) -BuildRoot: /var/tmp/%{name}-build-root -Docdir: /usr/share/doc - -%description -Speex is a patent-free audio codec designed especially for voice (unlike -Vorbis which targets general audio) signals and providing good narrowband -and wideband quality. This project aims to be complementary to the Vorbis -codec. - -%package devel -Summary: Speex development files -Group: Development/Libraries -Requires: %{name} = %{version} - -%description devel -Speex development files. - -%changelog -* Thu Oct 03 2002 Jean-Marc Valin -- Added devel package inspired from PLD spec file - -* Tue Jul 30 2002 Fredrik Rambris 0.5.2 -- Added buildroot and docdir and ldconfig. Makes it builadble by non-roots - and also doesn't write to actual library paths when building. - -%prep -%setup - -%build -export CFLAGS='-O3' -./configure --prefix=/usr --enable-shared --enable-static -make - -%install -rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT install - -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig - -%files -%defattr(644,root,root,755) -%doc COPYING AUTHORS ChangeLog NEWS README -%doc doc/manual.pdf -%attr(755,root,root) %{_bindir}/speex* -%attr(755,root,root) %{_libdir}/libspeex*.so* - -%files devel -%defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libspeex*.la -%{_includedir}/speex/speex*.h -%{_libdir}/pkgconfig/speexdsp.pc -%{_libdir}/libspeex*.a diff --git a/speex/TODO b/speex/TODO deleted file mode 100644 index ffca502001d253a12cb4a337d2c2e1f5b2653631..0000000000000000000000000000000000000000 --- a/speex/TODO +++ /dev/null @@ -1,32 +0,0 @@ -For 1.2: -Major points: -- Make documentation match the actual code (especially jitter buffer, AEC and preprocessor) -- Get AGC to work in fixed-point even if not totally converted -- Stabilise all APIs (need feedback) -- Short-term estimate in jitter buffer -- Control delay in new AEC API. -- NaN checks? -- Better error reporting -- Make kiss-fft 32-bit safe - -Post 1.2: -improve float<->int conversion -split encoder and decoder? -Merge TriMedia stuff -packet dump -Do VAD properly ---enable-{aec,preprocessor,jitter,resampler} - -Optimisations -- Add restrict in a few places? -- use __builtin_expect() (likely()/unlikely()) - -Allocator override (speex_lib_ctl?) -Fixed-point: - - VBR - - Jitter buffer - - AGC -Denoiser: - - Better noise adaptation -AGC: - - Use median filtering instead of "non-linear mean"? diff --git a/speex/acinclude.m4 b/speex/acinclude.m4 deleted file mode 100644 index 0e1f1abf591a15662acabb2a83ad5d304a54c98c..0000000000000000000000000000000000000000 --- a/speex/acinclude.m4 +++ /dev/null @@ -1,102 +0,0 @@ -# Configure paths for libogg -# Jack Moffitt 10-21-2000 -# Shamelessly stolen from Owen Taylor and Manish Singh - -dnl XIPH_PATH_OGG([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) -dnl Test for libogg, and define OGG_CFLAGS and OGG_LIBS -dnl -AC_DEFUN([XIPH_PATH_OGG], -[dnl -dnl Get the cflags and libraries -dnl -AC_ARG_WITH(ogg,[ --with-ogg=PFX Prefix where libogg is installed (optional)], ogg_prefix="$withval", ogg_prefix="") -AC_ARG_WITH(ogg-libraries,[ --with-ogg-libraries=DIR Directory where libogg library is installed (optional)], ogg_libraries="$withval", ogg_libraries="") -AC_ARG_WITH(ogg-includes,[ --with-ogg-includes=DIR Directory where libogg header files are installed (optional)], ogg_includes="$withval", ogg_includes="") -AC_ARG_ENABLE(oggtest, [ --disable-oggtest Do not try to compile and run a test Ogg program],, enable_oggtest=yes) - - if test "x$ogg_libraries" != "x" ; then - OGG_LIBS="-L$ogg_libraries" - elif test "x$ogg_prefix" != "x" ; then - OGG_LIBS="-L$ogg_prefix/lib" - elif test "x$prefix" != "xNONE" ; then - OGG_LIBS="-L$prefix/lib" - fi - - OGG_LIBS="$OGG_LIBS -logg" - - if test "x$ogg_includes" != "x" ; then - OGG_CFLAGS="-I$ogg_includes" - elif test "x$ogg_prefix" != "x" ; then - OGG_CFLAGS="-I$ogg_prefix/include" - elif test "x$prefix" != "xNONE"; then - OGG_CFLAGS="-I$prefix/include" - fi - - AC_MSG_CHECKING(for Ogg) - no_ogg="" - - - if test "x$enable_oggtest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $OGG_CFLAGS" - LIBS="$LIBS $OGG_LIBS" -dnl -dnl Now check if the installed Ogg is sufficiently new. -dnl - rm -f conf.oggtest - AC_TRY_RUN([ -#include -#include -#include -#include - -int main () -{ - system("touch conf.oggtest"); - return 0; -} - -],, no_ogg=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - - if test "x$no_ogg" = "x" ; then - AC_MSG_RESULT(yes) - ifelse([$1], , :, [$1]) - else - AC_MSG_RESULT(no) - if test -f conf.oggtest ; then - : - else - echo "*** Could not run Ogg test program, checking why..." - CFLAGS="$CFLAGS $OGG_CFLAGS" - LIBS="$LIBS $OGG_LIBS" - AC_TRY_LINK([ -#include -#include -], [ return 0; ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding Ogg or finding the wrong" - echo "*** version of Ogg. If it is not finding Ogg, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means Ogg was incorrectly installed" - echo "*** or that you have moved Ogg since it was installed." ]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - OGG_CFLAGS="" - OGG_LIBS="" - ifelse([$2], , :, [$2]) - fi - AC_SUBST(OGG_CFLAGS) - AC_SUBST(OGG_LIBS) - rm -f conf.oggtest -]) diff --git a/speex/configure.ac b/speex/configure.ac deleted file mode 100644 index eb280147398c667b883352c52732fe3f5cf38b58..0000000000000000000000000000000000000000 --- a/speex/configure.ac +++ /dev/null @@ -1,370 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. -*-m4-*- - -AC_INIT([speexdsp],[1.2.0],[speex-dev@xiph.org]) - -AC_CONFIG_SRCDIR([libspeexdsp/preprocess.c]) -AC_CONFIG_MACRO_DIR([m4]) - -dnl enable silent rules on automake 1.11 and later -m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) - - -SPEEXDSP_LT_CURRENT=6 -SPEEXDSP_LT_REVISION=1 -SPEEXDSP_LT_AGE=5 - - -AC_SUBST(SPEEXDSP_LT_CURRENT) -AC_SUBST(SPEEXDSP_LT_REVISION) -AC_SUBST(SPEEXDSP_LT_AGE) - -AM_INIT_AUTOMAKE([foreign no-define]) -AM_MAINTAINER_MODE([enable]) - -AC_CANONICAL_HOST -AC_LIBTOOL_WIN32_DLL -AM_PROG_LIBTOOL - -AC_C_BIGENDIAN -AC_C_CONST -AC_C_INLINE -AC_C_RESTRICT - - -AC_MSG_CHECKING(for C99 variable-size arrays) -AC_TRY_COMPILE( , [ -int foo; -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( [ -#ifdef HAVE_ALLOCA_H -# include -#endif -#include -], [ -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_MSG_CHECKING(for SSE in current arch/CFLAGS) -AC_LINK_IFELSE([ -AC_LANG_PROGRAM([[ -#include -__m128 testfunc(float *a, float *b) { - return _mm_add_ps(_mm_loadu_ps(a), _mm_loadu_ps(b)); -} -]])], -[ -has_sse=yes -], -[ -has_sse=no -] -) -AC_MSG_RESULT($has_sse) - -AC_MSG_CHECKING(for SSE2 in current arch/CFLAGS) -AC_LINK_IFELSE([ -AC_LANG_PROGRAM([[ -#include -__m128d testfunc(double *a, double *b) { - return _mm_add_pd(_mm_loadu_pd(a), _mm_loadu_pd(b)); -} -]])], -[ -has_sse2=yes -], -[ -has_sse2=no -] -) -AC_MSG_RESULT($has_sse2) - -AC_MSG_CHECKING(for NEON in current arch/CFLAGS) -AC_LINK_IFELSE([ -AC_LANG_PROGRAM([[ -#include -int32x4_t testfunc(int16_t *a, int16_t *b) { - return vmull_s16(vld1_s16(a), vld1_s16(b)); -} -]])], -[ -has_neon=yes -], -[ -has_neon=no -] -) -AC_MSG_RESULT($has_neon) - -SAVE_CFLAGS="$CFLAGS" -CFLAGS="$CFLAGS -fvisibility=hidden" -AC_MSG_CHECKING(for ELF visibility) -AC_COMPILE_IFELSE([ -AC_LANG_PROGRAM([[ -#pragma GCC visibility push(hidden) -__attribute__((visibility("default"))) -int var=10; -]])], -[ -has_visibility=yes -AC_DEFINE([EXPORT], [__attribute__((visibility("default")))], [Symbol visibility prefix]) -], -[ -has_visibility=no -AC_DEFINE([EXPORT], [], [Symbol visibility prefix]) -CFLAGS="$SAVE_CFLAGS" -] -) -AC_MSG_RESULT($has_visibility) - -AC_CHECK_HEADERS(sys/soundcard.h sys/audioio.h) - -AC_SUBST(src) - -LT_LIB_M - - -AC_ARG_ENABLE(valgrind, [ --enable-valgrind Enable valgrind extra checks], -[if test "$enableval" = yes; then - AC_DEFINE([ENABLE_VALGRIND], , [Enable valgrind extra checks]) -fi]) - -AC_ARG_ENABLE(sse, [ --enable-sse Enable SSE support], [ -if test "x$enableval" != xno; then -has_sse=yes -has_sse2=yes -CFLAGS="$CFLAGS -O3 -msse -msse2" -else -has_sse=no -has_sse2=no -fi -]) - -AC_ARG_ENABLE(neon, [ --enable-neon Enable NEON support], [ -if test "x$enableval" != xno; then -has_neon=yes -AS_CASE(["$host"], - [arm*], [CFLAGS="$CFLAGS -O3 -march=armv7-a -mfpu=neon"] -) -else -has_neon=no -fi -]) - - -FFT=smallft - -AC_ARG_ENABLE(fixed-point, [ --enable-fixed-point Compile as fixed-point], -[if test "$enableval" = yes; then - FFT=kiss - has_sse=no - 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])) - -if test "$has_sse" = yes; then - AC_DEFINE([USE_SSE], , [Enable SSE support]) -fi - -if test "$has_neon" = yes; then - AC_DEFINE([USE_NEON], , [Enable NEON support]) -fi - -if test "$has_sse2" = yes; then - AC_DEFINE([USE_SSE2], , [Enable SSE2 support]) -fi - -AC_ARG_ENABLE(float-api, [ --disable-float-api Disable the floating-point API], -[if test "$enableval" = no; then - AC_DEFINE([DISABLE_FLOAT_API], , [Disable all parts of the API that are using floats]) -fi]) - -AC_ARG_ENABLE(examples, [ --disable-examples Do not build example programs, only the library]) -if test "$enableval" != no; then - AM_CONDITIONAL([BUILD_EXAMPLES], true) -else - AM_CONDITIONAL([BUILD_EXAMPLES], false) -fi - -AC_ARG_ENABLE(arm4-asm, [ --enable-arm4-asm Make use of ARM4 assembly optimizations], -[if test "$enableval" = yes; then - AC_DEFINE([ARM4_ASM], , [Make use of ARM4 assembly optimizations]) -fi]) - -AC_ARG_ENABLE(arm5e-asm, [ --enable-arm5e-asm Make use of ARM5E assembly optimizations], -[if test "$enableval" = yes; then - AC_DEFINE([ARM5E_ASM], , [Make use of ARM5E assembly optimizations]) -fi]) - -AC_ARG_ENABLE(blackfin-asm, [ --enable-blackfin-asm Make use of Blackfin assembly optimizations], -[if test "$enableval" = yes; then - AC_DEFINE([BFIN_ASM], , [Make use of Blackfin assembly optimizations]) -fi]) -case $host_os in - uclinux) LDFLAGS="-Wl,-elf2flt=-s100000 $LDFLAGS";; -esac - -AC_ARG_ENABLE(fixed-point-debug, [ --enable-fixed-point-debug Debug fixed-point implementation], -[if test "$enableval" = yes; then - AC_DEFINE([FIXED_DEBUG], , [Debug fixed-point implementation]) -fi]) - -AC_ARG_ENABLE(resample-full-sinc-table, [ --enable-resample-full-sinc-table Resample full SINC table (no interpolation)], -[if test "$enableval" = yes; then - AC_DEFINE([RESAMPLE_FULL_SINC_TABLE], , [Resample with full SINC table (no interpolation)]) -fi]) - -AC_ARG_ENABLE(ti-c55x, [ --enable-ti-c55x Enable support for TI C55X DSP], -[if test "$enableval" = yes; then - has_char16=yes; - AC_DEFINE([TI_C55X], , [Enable support for TI C55X DSP]) -fi]) - -AC_ARG_WITH([fft], [AS_HELP_STRING([--with-fft=choice],[use an alternate FFT implementation. The available choices are -kiss (default fixed point), smallft (default floating point), gpl-fftw3 and proprietary-intel-mkl])], -[FFT=$withval] -) - -FFT_PKGCONFIG= -AS_CASE([$FFT], - [kiss], [ - AC_DEFINE([USE_KISS_FFT], [], [Use KISS Fast Fourier Transform]) - ], - [smallft], [ - AC_DEFINE([USE_SMALLFT], [], [Use FFT from OggVorbis]) - ], - [gpl-fftw3], [ - AC_DEFINE([USE_GPL_FFTW3], [], [Use FFTW3 for FFT]) - PKG_CHECK_MODULES([FFT], [fftw3f]) - ], - [proprietary-intel-mkl], [ - AC_DEFINE([USE_INTEL_MKL], [], [Use Intel Math Kernel Library for FFT]) - AC_MSG_CHECKING(for valid MKL) - AC_LINK_IFELSE([ - AC_LANG_PROGRAM([[ -#include -void func() { - DFTI_DESCRIPTOR_HANDLE h; - MKL_LONG result=DftiCreateDescriptor(&h, DFTI_SINGLE, DFTI_REAL, 0); -}]])], - [AC_MSG_RESULT(yes)], - [AC_MSG_FAILURE([Failed to compile MKL test program. Make sure you set CFLAGS to include the include directory and set LDFLAGS to include the library directory and all necesarry libraries.])] - ) - ], - [AC_MSG_FAILURE([Unknown FFT $FFT specified for --with-fft])] -) -AM_CONDITIONAL(BUILD_KISS_FFT, [test "$FFT" = "kiss"]) -AM_CONDITIONAL(BUILD_SMALLFT, [test "$FFT" = "smallft"]) -AC_SUBST(FFT_PKGCONFIG) - - -AC_CHECK_SIZEOF([int16_t]) -AC_CHECK_SIZEOF([uint16_t]) -AC_CHECK_SIZEOF([u_int16_t]) -AC_CHECK_SIZEOF([int32_t]) -AC_CHECK_SIZEOF([uint32_t]) -AC_CHECK_SIZEOF([u_int32_t]) -AC_CHECK_SIZEOF([short]) -AC_CHECK_SIZEOF([int]) -AC_CHECK_SIZEOF([long]) - -AS_IF([test "$has_char16" = "yes"], - [ - SIZEOF16=1 - SIZEOF32=2 - ],[ - SIZEOF16=2 - SIZEOF32=4 - ]) - -case $SIZEOF16 in - $ac_cv_sizeof_int16_t) SIZE16="int16_t";; - $ac_cv_sizeof_short) SIZE16="short";; - $ac_cv_sizeof_int) SIZE16="int";; -esac - -case $SIZEOF16 in - $ac_cv_sizeof_uint16_t) USIZE16="uint16_t";; - $ac_cv_sizeof_u_int16_t) USIZE16="u_int16_t";; - $ac_cv_sizeof_short) USIZE16="unsigned short";; - $ac_cv_sizeof_int) USIZE16="unsigned int";; -esac - -case $SIZEOF32 in - $ac_cv_sizeof_int32_t) SIZE32="int32_t";; - $ac_cv_sizeof_int) SIZE32="int";; - $ac_cv_sizeof_long) SIZE32="long";; - $ac_cv_sizeof_short) SIZE32="short";; -esac - -case $SIZEOF32 in - $ac_cv_sizeof_uint32_t) USIZE32="uint32_t";; - $ac_cv_sizeof_u_int32_t) USIZE32="u_int32_t";; - $ac_cv_sizeof_short) USIZE32="unsigned short";; - $ac_cv_sizeof_int) USIZE32="unsigned int";; - $ac_cv_sizeof_long) USIZE32="unsigned long";; -esac - -AS_IF([test -z "$SIZE16"],[AC_MSG_ERROR([No 16 bit type found on this platform!])]) -AS_IF([test -z "$SIZE32"],[AC_MSG_ERROR([No 32 bit type found on this platform!])]) -AS_IF([test -z "$USIZE16"],[AC_MSG_ERROR([No unsigned 16 bit type found on this platform!])]) -AS_IF([test -z "$USIZE32"],[AC_MSG_ERROR([No unsigned 32 bit type found on this platform!])]) - -AC_SUBST([SIZE16]) -AC_SUBST([USIZE16]) -AC_SUBST([SIZE32]) -AC_SUBST([USIZE32]) - -AS_IF([test "$ac_cv_header_stdint_h" = "yes"], [INCLUDE_STDINT="#include "], - [test "$ac_cv_header_inttypes_h" = "yes"], [INCLUDE_STDINT="#include "], - [test "$ac_cv_header_sys_types_h" = "yes"], [INCLUDE_STDINT="#include "]) - -AC_SUBST([INCLUDE_STDINT]) - -AC_CONFIG_FILES([ - Makefile libspeexdsp/Makefile doc/Makefile SpeexDSP.spec - include/Makefile include/speex/Makefile speexdsp.pc - win32/Makefile win32/libspeexdsp/Makefile - symbian/Makefile - - win32/VS2003/Makefile - win32/VS2003/libspeexdsp/Makefile - win32/VS2003/tests/Makefile - - win32/VS2005/Makefile - win32/VS2005/libspeexdsp/Makefile - win32/VS2005/tests/Makefile - - win32/VS2008/Makefile - win32/VS2008/libspeexdsp/Makefile - win32/VS2008/tests/Makefile - include/speex/speexdsp_config_types.h ti/Makefile - ti/speex_C54_test/Makefile ti/speex_C55_test/Makefile - ti/speex_C64_test/Makefile ]) - -AC_CONFIG_HEADERS([config.h]) - -AC_OUTPUT - -echo "Type \"make; make install\" to compile and install Speex"; diff --git a/speex/doc/.cvsignore b/speex/doc/.cvsignore deleted file mode 100644 index 282522db0342d8750454b3dc162493b5fc709cc8..0000000000000000000000000000000000000000 --- a/speex/doc/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/speex/doc/Makefile.am b/speex/doc/Makefile.am deleted file mode 100644 index d2896efabb3896b6a1589cf58b29b1c4005ffe1d..0000000000000000000000000000000000000000 --- a/speex/doc/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -doc_DATA = manual.pdf - -EXTRA_DIST = $(doc_DATA) diff --git a/speex/doc/celp_decoder.eps b/speex/doc/celp_decoder.eps deleted file mode 100644 index 87f0704468bad7f66e85211f746fa6001b8e1a1c..0000000000000000000000000000000000000000 --- a/speex/doc/celp_decoder.eps +++ /dev/null @@ -1,688 +0,0 @@ -%!PS-Adobe-3.0 EPSF-3.0 -%%BoundingBox: 0 0 442 315 -%%Pages: 0 -%%Creator: Sun Microsystems, Inc. -%%Title: none -%%CreationDate: none -%%LanguageLevel: 2 -%%EndComments -%%BeginProlog -%%BeginResource: SDRes -/b4_inc_state save def -/dict_count countdictstack def -/op_count count 1 sub def -userdict begin -0 setgray 0 setlinecap 1 setlinewidth 0 setlinejoin 10 setmiterlimit[] 0 setdash newpath -/languagelevel where {pop languagelevel 1 ne {false setstrokeadjust false setoverprint} if} if -/bdef {bind def} bind def -/c {setgray} bdef -/l {neg lineto} bdef -/rl {neg rlineto} bdef -/lc {setlinecap} bdef -/lj {setlinejoin} bdef -/lw {setlinewidth} bdef -/ml {setmiterlimit} bdef -/ld {setdash} bdef -/m {neg moveto} bdef -/ct {6 2 roll neg 6 2 roll neg 6 2 roll neg curveto} bdef -/r {rotate} bdef -/t {neg translate} bdef -/s {scale} bdef -/sw {show} bdef -/gs {gsave} bdef -/gr {grestore} bdef -/f {findfont dup length dict begin -{1 index /FID ne {def} {pop pop} ifelse} forall /Encoding ISOLatin1Encoding def -currentdict end /NFont exch definefont pop /NFont findfont} bdef -/p {closepath} bdef -/sf {scalefont setfont} bdef -/ef {eofill}bdef -/pc {closepath stroke}bdef -/ps {stroke}bdef -/pum {matrix currentmatrix}bdef -/pom {setmatrix}bdef -/bs {/aString exch def /nXOfs exch def /nWidth exch def currentpoint nXOfs 0 rmoveto pum nWidth aString stringwidth pop div 1 scale aString show pom moveto} bdef -%%EndResource -%%EndProlog -%%BeginSetup -%%EndSetup -%%Page: 1 1 -%%BeginPageSetup -%%EndPageSetup -pum -0.02836 0.02834 s -0 -11113 t -/tm matrix currentmatrix def -tm setmatrix --5152 -9418 t -1 1 s -0 lw 1 lj 0.000 c 6935 14318 m 5435 14318 l 5435 10318 l 8435 10318 l -8435 14318 l 6935 14318 l pc -11436 12317 m 10934 12818 l 10936 11817 l 11436 12317 l pc -5831 11966 m 8109 11966 l ps -6425 11966 m 6425 11636 l ps -6123 11966 m 6123 12366 l ps -6727 11966 m 6727 11707 l ps -7719 11966 m 7719 11872 l ps -7070 11966 m 7070 12248 l ps -7439 11966 m 7439 11636 l ps -5830 10920 m 8108 10920 l ps -6163 10920 m 6163 10590 l ps -6470 10920 m 6470 11320 l ps -6726 10920 m 6726 10661 l ps -7109 10920 m 7109 10826 l ps -7417 10920 m 7417 11202 l ps -7699 10920 m 7699 10590 l ps -5831 10921 m 8109 10921 l ps -6164 10921 m 6164 10591 l ps -6471 10921 m 6471 11321 l ps -6727 10921 m 6727 10662 l ps -7110 10921 m 7110 10827 l ps -7418 10921 m 7418 11203 l ps -7700 10921 m 7700 10591 l ps -5857 12918 m 8135 12918 l ps -6190 12918 m 6188 12729 l ps -6497 12918 m 6497 13318 l ps -6753 12918 m 6751 13247 l ps -7136 12918 m 7136 12824 l ps -7444 12918 m 7442 12611 l ps -7796 12919 m 7794 13248 l ps -6935 17818 m 5435 17818 l 5435 15818 l 8435 15818 l 8435 17818 l 6935 17818 l -pc -gs -pum -6263 17039 t -219 -104 m 214 -66 184 -39 147 -39 ct 120 -39 99 -51 85 -74 ct 74 -92 71 -110 69 -147 ct -268 -147 l 266 -213 260 -244 245 -277 ct 224 -321 193 -341 149 -341 ct 71 -341 20 -271 20 -160 ct -20 -55 68 9 146 9 ct 208 9 252 -32 264 -104 ct 219 -104 l p -69 -192 m 72 -252 104 -292 147 -292 ct 171 -292 191 -280 203 -260 ct 214 -243 218 -226 220 -192 ct -69 -192 l p ef -362 -412 m 418 -412 l 418 -458 l 321 -458 l 321 124 l 418 124 l 418 78 l -362 78 l 362 -412 l p ef -508 -332 m 465 -332 l 465 0 l 511 0 l 511 -180 l 511 -250 539 -292 586 -292 ct -625 -292 642 -265 642 -204 ct 642 0 l 687 0 l 687 -226 l 687 -299 653 -341 595 -341 ct -558 -341 532 -324 508 -283 ct 508 -332 l p ef -870 -204 m 742 -204 l 742 -147 l 870 -147 l 870 -204 l p ef -899 -400 m 1026 -400 l 1026 0 l 1077 0 l 1077 -400 l 1204 -400 l -1204 -455 l 899 -455 l 899 -400 l p ef -1281 78 m 1225 78 l 1225 124 l 1322 124 l 1322 -458 l 1225 -458 l -1225 -412 l 1281 -412 l 1281 78 l p ef -pom -gr -10410 12492 m 10410 12142 l 10935 12317 l 10410 12492 l p ef -1 lw 0 lj 8435 12318 m 9685 12318 l 9685 12317 l 10515 12317 l ps -0 lw 1 lj 11434 16817 m 10932 17318 l 10934 16317 l 11434 16817 l pc -10483 16967 m 10483 16667 l 10933 16817 l 10483 16967 l p ef -1 lw 0 lj 8435 16818 m 9684 16818 l 9684 16817 l 10573 16817 l ps -0 lw 1 lj 13085 14818 m 12947 14818 12835 14706 12835 14568 ct 12835 14430 12947 14318 13085 14318 ct -13223 14318 13335 14430 13335 14568 ct 13335 14706 13223 14818 13085 14818 ct -pc -gs -pum -12931 14791 t -133 -183 m 20 -183 l 20 -137 l 133 -137 l 133 0 l 171 0 l 171 -137 l -283 -137 l 283 -183 l 171 -183 l 171 -320 l 133 -320 l 133 -183 l -p ef -pom -gr -13234 15268 m 12934 15268 l 13084 14818 l 13234 15268 l p ef -1 lw 0 lj 11435 16817 m 13084 16817 l 13084 15178 l ps -12934 13868 m 13234 13868 l 13084 14318 l 12934 13868 l p ef -11437 12317 m 13084 12317 l 13084 13958 l ps -0 lw 1 lj 17835 15318 m 16335 15318 l 16335 13818 l 19335 13818 l 19335 15318 l -17835 15318 l pc -16668 15023 m 16778 14801 16891 14569 16925 14316 ct 16997 13766 17307 14273 17221 14551 ct -17165 14731 17523 15058 17694 14622 ct 17856 14213 18050 14912 18286 15000 ct -18489 15075 18680 14999 18878 15000 ct 18878 15000 18878 15000 19076 15047 ct -19076 15047 19076 15047 19135 15118 ct ps -15885 14718 m 15885 14418 l 16335 14568 l 15885 14718 l p ef -1 lw 0 lj 13335 14567 m 14935 14567 l 14935 14568 l 15975 14568 l ps -gs -pum -17085 13052 t -208 -214 m 206 -241 203 -254 195 -269 ct 180 -296 151 -311 114 -311 ct 84 -311 61 -302 46 -283 ct -33 -266 25 -243 25 -219 ct 25 -180 43 -156 78 -146 ct 129 -131 l 170 -120 182 -108 182 -79 ct -182 -46 158 -27 118 -27 ct 90 -27 69 -37 58 -56 ct 51 -68 49 -78 48 -98 ct 16 -98 l -17 -65 22 -48 35 -30 ct 54 -3 78 8 116 8 ct 177 8 214 -26 214 -83 ct 214 -126 195 -154 158 -164 ct -87 -184 l 67 -190 57 -202 57 -224 ct 57 -257 78 -276 114 -276 ct 137 -276 156 -267 166 -250 ct -172 -240 175 -231 176 -214 ct 208 -214 l p ef -319 -39 m 271 -221 l 236 -221 l 304 5 l 300 16 297 25 296 28 ct 289 51 284 57 271 57 ct -265 57 259 55 253 53 ct 253 87 l 255 87 l 261 90 263 90 268 90 ct 304 90 309 83 337 -4 ct -402 -221 l 368 -221 l 319 -39 l p ef -457 -221 m 428 -221 l 428 0 l 458 0 l 458 -120 l 458 -166 477 -194 508 -194 ct -534 -194 546 -176 546 -136 ct 546 0 l 576 0 l 576 -150 l 576 -199 553 -227 515 -227 ct -490 -227 472 -216 457 -188 ct 457 -221 l p ef -690 -190 m 690 -221 l 660 -221 l 660 -282 l 630 -282 l 630 -221 l -605 -221 l 605 -190 l 630 -190 l 630 -44 l 630 -12 641 2 665 2 ct 667 2 669 2 676 1 ct -678 1 683 0 689 0 ct 689 -29 l 679 -29 l 665 -29 660 -34 660 -46 ct 660 -190 l -690 -190 l p ef -751 -303 m 721 -303 l 721 0 l 751 0 l 751 -120 l 751 -167 770 -194 803 -194 ct -828 -194 839 -179 839 -144 ct 839 0 l 869 0 l 869 -150 l 869 -199 846 -227 808 -227 ct -784 -227 769 -218 751 -190 ct 751 -303 l p ef -1038 -69 m 1035 -44 1015 -26 991 -26 ct 973 -26 958 -34 950 -49 ct 942 -61 940 -73 939 -98 ct -1071 -98 l 1070 -142 1066 -162 1056 -184 ct 1042 -214 1022 -227 992 -227 ct -940 -227 906 -180 906 -106 ct 906 -36 938 6 990 6 ct 1032 6 1061 -21 1069 -69 ct -1038 -69 l p -939 -128 m 941 -167 962 -194 991 -194 ct 1007 -194 1020 -186 1028 -173 ct 1035 -162 1038 -151 1040 -128 ct -939 -128 l p ef -1242 -158 m 1240 -202 1215 -227 1174 -227 ct 1132 -227 1104 -200 1104 -157 ct -1104 -129 1118 -111 1146 -103 ct 1182 -92 l 1210 -84 1218 -77 1218 -60 ct 1218 -39 1202 -26 1175 -26 ct -1144 -26 1130 -39 1128 -71 ct 1099 -71 l 1100 -49 1102 -38 1108 -27 ct 1120 -5 1143 6 1173 6 ct -1219 6 1248 -22 1248 -66 ct 1248 -97 1234 -113 1197 -125 ct 1167 -134 l 1140 -142 1134 -148 1134 -163 ct -1134 -183 1148 -195 1172 -195 ct 1198 -195 1211 -183 1213 -158 ct 1242 -158 l -p ef -1315 -221 m 1285 -221 l 1285 0 l 1315 0 l 1315 -221 l p -1315 -261 m 1315 -303 l 1285 -303 l 1285 -261 l 1315 -261 l p ef -1492 -158 m 1490 -202 1465 -227 1424 -227 ct 1382 -227 1354 -200 1354 -157 ct -1354 -129 1368 -111 1396 -103 ct 1432 -92 l 1460 -84 1468 -77 1468 -60 ct 1468 -39 1452 -26 1425 -26 ct -1394 -26 1380 -39 1378 -71 ct 1349 -71 l 1350 -49 1352 -38 1358 -27 ct 1370 -5 1393 6 1423 6 ct -1469 6 1498 -22 1498 -66 ct 1498 -97 1484 -113 1447 -125 ct 1417 -134 l 1390 -142 1384 -148 1384 -163 ct -1384 -183 1398 -195 1422 -195 ct 1448 -195 1461 -183 1463 -158 ct 1492 -158 l -p ef -pom -pum -17085 13581 t -90 -190 m 90 -221 l 60 -221 l 60 -248 l 60 -266 65 -274 78 -274 ct 81 -274 85 -274 90 -273 ct -90 -307 l 81 -307 79 -307 76 -307 ct 46 -307 30 -291 30 -259 ct 30 -221 l 4 -221 l -4 -190 l 30 -190 l 30 0 l 60 0 l 60 -190 l 90 -190 l p ef -150 -221 m 120 -221 l 120 0 l 150 0 l 150 -221 l p -150 -261 m 150 -303 l 120 -303 l 120 -261 l 150 -261 l p ef -227 -303 m 197 -303 l 197 0 l 227 0 l 227 -303 l p ef -339 -190 m 339 -221 l 309 -221 l 309 -282 l 279 -282 l 279 -221 l -254 -221 l 254 -190 l 279 -190 l 279 -44 l 279 -12 290 2 314 2 ct 316 2 318 2 325 1 ct -327 1 332 0 338 0 ct 338 -29 l 328 -29 l 314 -29 309 -34 309 -46 ct 309 -190 l -339 -190 l p ef -492 -69 m 489 -44 469 -26 445 -26 ct 427 -26 412 -34 404 -49 ct 396 -61 394 -73 393 -98 ct -525 -98 l 524 -142 520 -162 510 -184 ct 496 -214 476 -227 446 -227 ct 394 -227 360 -180 360 -106 ct -360 -36 392 6 444 6 ct 486 6 515 -21 523 -69 ct 492 -69 l p -393 -128 m 395 -167 416 -194 445 -194 ct 461 -194 474 -186 482 -173 ct 489 -162 492 -151 494 -128 ct -393 -128 l p ef -657 -188 m 657 -226 l 654 -227 651 -227 649 -227 ct 627 -227 613 -215 597 -183 ct -597 -221 l 568 -221 l 568 0 l 599 0 l 599 -129 l 599 -163 618 -188 645 -188 ct -657 -188 l p ef -878 -297 m 854 -297 l 844 -253 834 -244 789 -240 ct 789 -211 l 845 -211 l -845 0 l 878 0 l 878 -297 l p ef -1050 -311 m 1027 -311 l 943 8 l 965 8 l 1050 -311 l p ef -1211 -88 m 1235 0 l 1272 0 l 1182 -303 l 1144 -303 l 1050 0 l 1085 0 l -1111 -88 l 1211 -88 l p -1121 -125 m 1161 -259 l 1199 -125 l 1121 -125 l p ef -1360 -310 m 1316 -231 1301 -179 1301 -110 ct 1301 -42 1314 1 1361 87 ct 1381 87 l -1343 -5 1334 -42 1334 -107 ct 1334 -182 1344 -225 1381 -310 ct 1360 -310 l p ef -1552 -190 m 1552 -221 l 1412 -221 l 1412 -190 l 1513 -190 l 1403 -29 l -1403 0 l 1555 0 l 1555 -30 l 1444 -30 l 1552 -190 l p ef -1599 87 m 1642 8 1657 -43 1657 -111 ct 1657 -179 1644 -223 1598 -310 ct 1577 -310 l -1616 -217 1625 -179 1625 -115 ct 1625 -40 1615 2 1578 87 ct 1599 87 l p ef -pom -gr -gs -pum -5708 9956 t -63 -137 m 185 -137 l 185 -174 l 63 -174 l 63 -266 l 202 -266 l 202 -303 l -30 -303 l 30 0 l 63 0 l 63 -137 l p ef -265 -221 m 235 -221 l 235 0 l 265 0 l 265 -221 l p -265 -261 m 265 -303 l 235 -303 l 235 -261 l 265 -261 l p ef -394 -113 m 455 -221 l 418 -221 l 375 -143 l 334 -221 l 294 -221 l -355 -113 l 291 0 l 330 0 l 373 -83 l 419 0 l 458 0 l 394 -113 l -p ef -606 -69 m 603 -44 583 -26 559 -26 ct 541 -26 526 -34 518 -49 ct 510 -61 508 -73 507 -98 ct -639 -98 l 638 -142 634 -162 624 -184 ct 610 -214 590 -227 560 -227 ct 508 -227 474 -180 474 -106 ct -474 -36 506 6 558 6 ct 600 6 629 -21 637 -69 ct 606 -69 l p -507 -128 m 509 -167 530 -194 559 -194 ct 575 -194 588 -186 596 -173 ct 603 -162 606 -151 608 -128 ct -507 -128 l p ef -829 -303 m 798 -303 l 798 -187 l 784 -216 768 -227 743 -227 ct 698 -227 668 -182 668 -115 ct -668 -41 699 6 747 6 ct 772 6 787 -4 800 -31 ct 800 0 l 829 0 l 829 -303 l -p -749 -194 m 780 -194 798 -162 798 -104 ct 798 -76 793 -57 782 -43 ct 773 -32 761 -26 748 -26 ct -717 -26 699 -58 699 -113 ct 699 -167 716 -194 749 -194 ct p ef -1113 -146 m 1107 -200 1085 -227 1044 -227 ct 991 -227 958 -180 958 -106 ct -958 -37 990 6 1039 6 ct 1081 6 1106 -22 1113 -78 ct 1083 -78 l 1077 -43 1062 -26 1039 -26 ct -1008 -26 991 -56 991 -109 ct 991 -163 1009 -194 1041 -194 ct 1065 -194 1078 -180 1083 -146 ct -1113 -146 l p ef -1219 -227 m 1168 -227 1134 -180 1134 -110 ct 1134 -41 1168 5 1218 5 ct 1268 5 1302 -41 1302 -110 ct -1302 -178 1268 -227 1219 -227 ct p -1219 -195 m 1250 -195 1270 -161 1270 -110 ct 1270 -59 1250 -26 1218 -26 ct -1186 -26 1165 -59 1165 -110 ct 1165 -162 1186 -195 1219 -195 ct p ef -1490 -303 m 1459 -303 l 1459 -187 l 1445 -216 1429 -227 1404 -227 ct 1359 -227 1329 -182 1329 -115 ct -1329 -41 1360 6 1408 6 ct 1433 6 1448 -4 1461 -31 ct 1461 0 l 1490 0 l 1490 -303 l -p -1410 -194 m 1441 -194 1459 -162 1459 -104 ct 1459 -76 1454 -57 1443 -43 ct -1434 -32 1422 -26 1409 -26 ct 1378 -26 1360 -58 1360 -113 ct 1360 -167 1377 -194 1410 -194 ct -p ef -1656 -69 m 1653 -44 1633 -26 1609 -26 ct 1591 -26 1576 -34 1568 -49 ct 1560 -61 1558 -73 1557 -98 ct -1689 -98 l 1688 -142 1684 -162 1674 -184 ct 1660 -214 1640 -227 1610 -227 ct -1558 -227 1524 -180 1524 -106 ct 1524 -36 1556 6 1608 6 ct 1650 6 1679 -21 1687 -69 ct -1656 -69 l p -1557 -128 m 1559 -167 1580 -194 1609 -194 ct 1625 -194 1638 -186 1646 -173 ct -1653 -162 1656 -151 1658 -128 ct 1557 -128 l p ef -1755 0 m 1755 -28 l 1768 -3 1782 6 1806 6 ct 1854 6 1885 -41 1885 -115 ct -1885 -182 1855 -227 1810 -227 ct 1788 -227 1772 -217 1756 -192 ct 1756 -303 l -1726 -303 l 1726 0 l 1755 0 l p -1805 -194 m 1837 -194 1853 -167 1853 -113 ct 1853 -58 1835 -26 1804 -26 ct -1792 -26 1780 -32 1771 -43 ct 1760 -57 1755 -76 1755 -105 ct 1755 -163 1772 -194 1805 -194 ct -p ef -1998 -227 m 1947 -227 1913 -180 1913 -110 ct 1913 -41 1947 5 1997 5 ct 2047 5 2081 -41 2081 -110 ct -2081 -178 2047 -227 1998 -227 ct p -1998 -195 m 2029 -195 2049 -161 2049 -110 ct 2049 -59 2029 -26 1997 -26 ct -1965 -26 1944 -59 1944 -110 ct 1944 -162 1965 -195 1998 -195 ct p ef -2193 -227 m 2142 -227 2108 -180 2108 -110 ct 2108 -41 2142 5 2192 5 ct 2242 5 2276 -41 2276 -110 ct -2276 -178 2242 -227 2193 -227 ct p -2193 -195 m 2224 -195 2244 -161 2244 -110 ct 2244 -59 2224 -26 2192 -26 ct -2160 -26 2139 -59 2139 -110 ct 2139 -162 2160 -195 2193 -195 ct p ef -2390 -138 m 2459 -221 l 2421 -221 l 2342 -127 l 2342 -303 l 2313 -303 l -2313 0 l 2342 0 l 2342 -83 l 2368 -111 l 2424 0 l 2463 0 l 2390 -138 l -p ef -pom -gr -gs -pum -5390 15539 t -165 -88 m 189 0 l 226 0 l 136 -303 l 98 -303 l 4 0 l 39 0 l 65 -88 l -165 -88 l p -75 -125 m 115 -259 l 153 -125 l 75 -125 l p ef -406 -303 m 375 -303 l 375 -187 l 361 -216 345 -227 320 -227 ct 275 -227 245 -182 245 -115 ct -245 -41 276 6 324 6 ct 349 6 364 -4 377 -31 ct 377 0 l 406 0 l 406 -303 l -p -326 -194 m 357 -194 375 -162 375 -104 ct 375 -76 370 -57 359 -43 ct 350 -32 338 -26 325 -26 ct -294 -26 276 -58 276 -113 ct 276 -167 293 -194 326 -194 ct p ef -477 -153 m 481 -184 493 -196 520 -196 ct 547 -196 562 -184 562 -159 ct 562 -143 557 -136 546 -134 ct -495 -126 l 460 -121 440 -96 440 -58 ct 440 -19 463 6 498 6 ct 524 6 543 -4 562 -29 ct -565 -5 573 4 594 4 ct 598 4 602 3 608 1 ct 610 0 610 0 612 0 ct 612 -27 l 605 -25 603 -25 601 -25 ct -595 -25 591 -30 591 -38 ct 591 -165 l 591 -204 565 -227 522 -227 ct 493 -227 472 -217 460 -198 ct -453 -186 450 -175 449 -153 ct 477 -153 l p -561 -76 m 561 -48 535 -24 504 -24 ct 484 -24 472 -38 472 -61 ct 472 -83 483 -94 511 -98 ct -546 -104 554 -107 561 -112 ct 561 -76 l p ef -642 87 m 672 87 l 672 -24 l 685 -2 699 6 722 6 ct 770 6 801 -42 801 -115 ct -801 -182 771 -227 726 -227 ct 701 -227 687 -217 671 -188 ct 671 -221 l 642 -221 l -642 87 l p -721 -194 m 752 -194 769 -166 769 -114 ct 769 -58 751 -26 720 -26 ct 690 -26 671 -55 671 -103 ct -671 -163 688 -194 721 -194 ct p ef -906 -190 m 906 -221 l 876 -221 l 876 -282 l 846 -282 l 846 -221 l -821 -221 l 821 -190 l 846 -190 l 846 -44 l 846 -12 857 2 881 2 ct 883 2 885 2 892 1 ct -894 1 899 0 905 0 ct 905 -29 l 895 -29 l 881 -29 876 -34 876 -46 ct 876 -190 l -906 -190 l p ef -967 -221 m 937 -221 l 937 0 l 967 0 l 967 -221 l p -967 -261 m 967 -303 l 937 -303 l 937 -261 l 967 -261 l p ef -1076 -39 m 1029 -221 l 993 -221 l 1059 0 l 1092 0 l 1161 -221 l 1128 -221 l -1076 -39 l p ef -1309 -69 m 1306 -44 1286 -26 1262 -26 ct 1244 -26 1229 -34 1221 -49 ct 1213 -61 1211 -73 1210 -98 ct -1342 -98 l 1341 -142 1337 -162 1327 -184 ct 1313 -214 1293 -227 1263 -227 ct -1211 -227 1177 -180 1177 -106 ct 1177 -36 1209 6 1261 6 ct 1303 6 1332 -21 1340 -69 ct -1309 -69 l p -1210 -128 m 1212 -167 1233 -194 1262 -194 ct 1278 -194 1291 -186 1299 -173 ct -1306 -162 1309 -151 1311 -128 ct 1210 -128 l p ef -1621 -146 m 1615 -200 1593 -227 1552 -227 ct 1499 -227 1466 -180 1466 -106 ct -1466 -37 1498 6 1547 6 ct 1589 6 1614 -22 1621 -78 ct 1591 -78 l 1585 -43 1570 -26 1547 -26 ct -1516 -26 1499 -56 1499 -109 ct 1499 -163 1517 -194 1549 -194 ct 1573 -194 1586 -180 1591 -146 ct -1621 -146 l p ef -1727 -227 m 1676 -227 1642 -180 1642 -110 ct 1642 -41 1676 5 1726 5 ct 1776 5 1810 -41 1810 -110 ct -1810 -178 1776 -227 1727 -227 ct p -1727 -195 m 1758 -195 1778 -161 1778 -110 ct 1778 -59 1758 -26 1726 -26 ct -1694 -26 1673 -59 1673 -110 ct 1673 -162 1694 -195 1727 -195 ct p ef -1998 -303 m 1967 -303 l 1967 -187 l 1953 -216 1937 -227 1912 -227 ct 1867 -227 1837 -182 1837 -115 ct -1837 -41 1868 6 1916 6 ct 1941 6 1956 -4 1969 -31 ct 1969 0 l 1998 0 l 1998 -303 l -p -1918 -194 m 1949 -194 1967 -162 1967 -104 ct 1967 -76 1962 -57 1951 -43 ct -1942 -32 1930 -26 1917 -26 ct 1886 -26 1868 -58 1868 -113 ct 1868 -167 1885 -194 1918 -194 ct -p ef -2164 -69 m 2161 -44 2141 -26 2117 -26 ct 2099 -26 2084 -34 2076 -49 ct 2068 -61 2066 -73 2065 -98 ct -2197 -98 l 2196 -142 2192 -162 2182 -184 ct 2168 -214 2148 -227 2118 -227 ct -2066 -227 2032 -180 2032 -106 ct 2032 -36 2064 6 2116 6 ct 2158 6 2187 -21 2195 -69 ct -2164 -69 l p -2065 -128 m 2067 -167 2088 -194 2117 -194 ct 2133 -194 2146 -186 2154 -173 ct -2161 -162 2164 -151 2166 -128 ct 2065 -128 l p ef -2263 0 m 2263 -28 l 2276 -3 2290 6 2314 6 ct 2362 6 2393 -41 2393 -115 ct -2393 -182 2363 -227 2318 -227 ct 2296 -227 2280 -217 2264 -192 ct 2264 -303 l -2234 -303 l 2234 0 l 2263 0 l p -2313 -194 m 2345 -194 2361 -167 2361 -113 ct 2361 -58 2343 -26 2312 -26 ct -2300 -26 2288 -32 2279 -43 ct 2268 -57 2263 -76 2263 -105 ct 2263 -163 2280 -194 2313 -194 ct -p ef -2506 -227 m 2455 -227 2421 -180 2421 -110 ct 2421 -41 2455 5 2505 5 ct 2555 5 2589 -41 2589 -110 ct -2589 -178 2555 -227 2506 -227 ct p -2506 -195 m 2537 -195 2557 -161 2557 -110 ct 2557 -59 2537 -26 2505 -26 ct -2473 -26 2452 -59 2452 -110 ct 2452 -162 2473 -195 2506 -195 ct p ef -2701 -227 m 2650 -227 2616 -180 2616 -110 ct 2616 -41 2650 5 2700 5 ct 2750 5 2784 -41 2784 -110 ct -2784 -178 2750 -227 2701 -227 ct p -2701 -195 m 2732 -195 2752 -161 2752 -110 ct 2752 -59 2732 -26 2700 -26 ct -2668 -26 2647 -59 2647 -110 ct 2647 -162 2668 -195 2701 -195 ct p ef -2898 -138 m 2967 -221 l 2929 -221 l 2850 -127 l 2850 -303 l 2821 -303 l -2821 0 l 2850 0 l 2850 -83 l 2876 -111 l 2932 0 l 2971 0 l 2898 -138 l -p ef -pom -gr -gs -pum -14016 13846 t -213 -36 m 63 -36 l 63 -137 l 199 -137 l 199 -174 l 63 -174 l 63 -266 l -211 -266 l 211 -303 l 30 -303 l 30 0 l 213 0 l 213 -36 l p ef -339 -113 m 400 -221 l 363 -221 l 320 -143 l 279 -221 l 239 -221 l -300 -113 l 236 0 l 275 0 l 318 -83 l 364 0 l 403 0 l 339 -113 l -p ef -571 -146 m 565 -200 543 -227 502 -227 ct 449 -227 416 -180 416 -106 ct 416 -37 448 6 497 6 ct -539 6 564 -22 571 -78 ct 541 -78 l 535 -43 520 -26 497 -26 ct 466 -26 449 -56 449 -109 ct -449 -163 467 -194 499 -194 ct 523 -194 536 -180 541 -146 ct 571 -146 l p ef -633 -221 m 603 -221 l 603 0 l 633 0 l 633 -221 l p -633 -261 m 633 -303 l 603 -303 l 603 -261 l 633 -261 l p ef -745 -190 m 745 -221 l 715 -221 l 715 -282 l 685 -282 l 685 -221 l -660 -221 l 660 -190 l 685 -190 l 685 -44 l 685 -12 696 2 720 2 ct 722 2 724 2 731 1 ct -733 1 738 0 744 0 ct 744 -29 l 734 -29 l 720 -29 715 -34 715 -46 ct 715 -190 l -745 -190 l p ef -803 -153 m 807 -184 819 -196 846 -196 ct 873 -196 888 -184 888 -159 ct 888 -143 883 -136 872 -134 ct -821 -126 l 786 -121 766 -96 766 -58 ct 766 -19 789 6 824 6 ct 850 6 869 -4 888 -29 ct -891 -5 899 4 920 4 ct 924 4 928 3 934 1 ct 936 0 936 0 938 0 ct 938 -27 l 931 -25 929 -25 927 -25 ct -921 -25 917 -30 917 -38 ct 917 -165 l 917 -204 891 -227 848 -227 ct 819 -227 798 -217 786 -198 ct -779 -186 776 -175 775 -153 ct 803 -153 l p -887 -76 m 887 -48 861 -24 830 -24 ct 810 -24 798 -38 798 -61 ct 798 -83 809 -94 837 -98 ct -872 -104 880 -107 887 -112 ct 887 -76 l p ef -1037 -190 m 1037 -221 l 1007 -221 l 1007 -282 l 977 -282 l 977 -221 l -952 -221 l 952 -190 l 977 -190 l 977 -44 l 977 -12 988 2 1012 2 ct 1014 2 1016 2 1023 1 ct -1025 1 1030 0 1036 0 ct 1036 -29 l 1026 -29 l 1012 -29 1007 -34 1007 -46 ct -1007 -190 l 1037 -190 l p ef -1099 -221 m 1069 -221 l 1069 0 l 1099 0 l 1099 -221 l p -1099 -261 m 1099 -303 l 1069 -303 l 1069 -261 l 1099 -261 l p ef -1219 -227 m 1168 -227 1134 -180 1134 -110 ct 1134 -41 1168 5 1218 5 ct 1268 5 1302 -41 1302 -110 ct -1302 -178 1268 -227 1219 -227 ct p -1219 -195 m 1250 -195 1270 -161 1270 -110 ct 1270 -59 1250 -26 1218 -26 ct -1186 -26 1165 -59 1165 -110 ct 1165 -162 1186 -195 1219 -195 ct p ef -1368 -221 m 1339 -221 l 1339 0 l 1369 0 l 1369 -120 l 1369 -166 1388 -194 1419 -194 ct -1445 -194 1457 -176 1457 -136 ct 1457 0 l 1487 0 l 1487 -150 l 1487 -199 1464 -227 1426 -227 ct -1401 -227 1383 -216 1368 -188 ct 1368 -221 l p ef -pom -pum -14480 14375 t -145 -69 m 142 -44 122 -26 98 -26 ct 80 -26 65 -34 57 -49 ct 49 -61 47 -73 46 -98 ct -178 -98 l 177 -142 173 -162 163 -184 ct 149 -214 129 -227 99 -227 ct 47 -227 13 -180 13 -106 ct -13 -36 45 6 97 6 ct 139 6 168 -21 176 -69 ct 145 -69 l p -46 -128 m 48 -167 69 -194 98 -194 ct 114 -194 127 -186 135 -173 ct 142 -162 145 -151 147 -128 ct -46 -128 l p ef -244 -274 m 281 -274 l 281 -305 l 217 -305 l 217 82 l 281 82 l 281 52 l -244 52 l 244 -274 l p ef -343 -221 m 314 -221 l 314 0 l 344 0 l 344 -120 l 344 -166 363 -194 394 -194 ct -420 -194 432 -176 432 -136 ct 432 0 l 462 0 l 462 -150 l 462 -199 439 -227 401 -227 ct -376 -227 358 -216 343 -188 ct 343 -221 l p ef -533 52 m 496 52 l 496 82 l 561 82 l 561 -305 l 496 -305 l 496 -274 l -533 -274 l 533 52 l p ef -pom -gr -gs -pum -9491 13237 t -63 -137 m 185 -137 l 185 -174 l 63 -174 l 63 -266 l 202 -266 l 202 -303 l -30 -303 l 30 0 l 63 0 l 63 -137 l p ef -265 -221 m 235 -221 l 235 0 l 265 0 l 265 -221 l p -265 -261 m 265 -303 l 235 -303 l 235 -261 l 265 -261 l p ef -394 -113 m 455 -221 l 418 -221 l 375 -143 l 334 -221 l 294 -221 l -355 -113 l 291 0 l 330 0 l 373 -83 l 419 0 l 458 0 l 394 -113 l -p ef -606 -69 m 603 -44 583 -26 559 -26 ct 541 -26 526 -34 518 -49 ct 510 -61 508 -73 507 -98 ct -639 -98 l 638 -142 634 -162 624 -184 ct 610 -214 590 -227 560 -227 ct 508 -227 474 -180 474 -106 ct -474 -36 506 6 558 6 ct 600 6 629 -21 637 -69 ct 606 -69 l p -507 -128 m 509 -167 530 -194 559 -194 ct 575 -194 588 -186 596 -173 ct 603 -162 606 -151 608 -128 ct -507 -128 l p ef -829 -303 m 798 -303 l 798 -187 l 784 -216 768 -227 743 -227 ct 698 -227 668 -182 668 -115 ct -668 -41 699 6 747 6 ct 772 6 787 -4 800 -31 ct 800 0 l 829 0 l 829 -303 l -p -749 -194 m 780 -194 798 -162 798 -104 ct 798 -76 793 -57 782 -43 ct 773 -32 761 -26 748 -26 ct -717 -26 699 -58 699 -113 ct 699 -167 716 -194 749 -194 ct p ef -1113 -146 m 1107 -200 1085 -227 1044 -227 ct 991 -227 958 -180 958 -106 ct -958 -37 990 6 1039 6 ct 1081 6 1106 -22 1113 -78 ct 1083 -78 l 1077 -43 1062 -26 1039 -26 ct -1008 -26 991 -56 991 -109 ct 991 -163 1009 -194 1041 -194 ct 1065 -194 1078 -180 1083 -146 ct -1113 -146 l p ef -1219 -227 m 1168 -227 1134 -180 1134 -110 ct 1134 -41 1168 5 1218 5 ct 1268 5 1302 -41 1302 -110 ct -1302 -178 1268 -227 1219 -227 ct p -1219 -195 m 1250 -195 1270 -161 1270 -110 ct 1270 -59 1250 -26 1218 -26 ct -1186 -26 1165 -59 1165 -110 ct 1165 -162 1186 -195 1219 -195 ct p ef -1490 -303 m 1459 -303 l 1459 -187 l 1445 -216 1429 -227 1404 -227 ct 1359 -227 1329 -182 1329 -115 ct -1329 -41 1360 6 1408 6 ct 1433 6 1448 -4 1461 -31 ct 1461 0 l 1490 0 l 1490 -303 l -p -1410 -194 m 1441 -194 1459 -162 1459 -104 ct 1459 -76 1454 -57 1443 -43 ct -1434 -32 1422 -26 1409 -26 ct 1378 -26 1360 -58 1360 -113 ct 1360 -167 1377 -194 1410 -194 ct -p ef -1656 -69 m 1653 -44 1633 -26 1609 -26 ct 1591 -26 1576 -34 1568 -49 ct 1560 -61 1558 -73 1557 -98 ct -1689 -98 l 1688 -142 1684 -162 1674 -184 ct 1660 -214 1640 -227 1610 -227 ct -1558 -227 1524 -180 1524 -106 ct 1524 -36 1556 6 1608 6 ct 1650 6 1679 -21 1687 -69 ct -1656 -69 l p -1557 -128 m 1559 -167 1580 -194 1609 -194 ct 1625 -194 1638 -186 1646 -173 ct -1653 -162 1656 -151 1658 -128 ct 1557 -128 l p ef -1755 0 m 1755 -28 l 1768 -3 1782 6 1806 6 ct 1854 6 1885 -41 1885 -115 ct -1885 -182 1855 -227 1810 -227 ct 1788 -227 1772 -217 1756 -192 ct 1756 -303 l -1726 -303 l 1726 0 l 1755 0 l p -1805 -194 m 1837 -194 1853 -167 1853 -113 ct 1853 -58 1835 -26 1804 -26 ct -1792 -26 1780 -32 1771 -43 ct 1760 -57 1755 -76 1755 -105 ct 1755 -163 1772 -194 1805 -194 ct -p ef -1998 -227 m 1947 -227 1913 -180 1913 -110 ct 1913 -41 1947 5 1997 5 ct 2047 5 2081 -41 2081 -110 ct -2081 -178 2047 -227 1998 -227 ct p -1998 -195 m 2029 -195 2049 -161 2049 -110 ct 2049 -59 2029 -26 1997 -26 ct -1965 -26 1944 -59 1944 -110 ct 1944 -162 1965 -195 1998 -195 ct p ef -2193 -227 m 2142 -227 2108 -180 2108 -110 ct 2108 -41 2142 5 2192 5 ct 2242 5 2276 -41 2276 -110 ct -2276 -178 2242 -227 2193 -227 ct p -2193 -195 m 2224 -195 2244 -161 2244 -110 ct 2244 -59 2224 -26 2192 -26 ct -2160 -26 2139 -59 2139 -110 ct 2139 -162 2160 -195 2193 -195 ct p ef -2390 -138 m 2459 -221 l 2421 -221 l 2342 -127 l 2342 -303 l 2313 -303 l -2313 0 l 2342 0 l 2342 -83 l 2368 -111 l 2424 0 l 2463 0 l 2390 -138 l -p ef -2734 -221 m 2705 -221 l 2705 -188 l 2688 -217 2674 -227 2649 -227 ct 2604 -227 2574 -182 2574 -115 ct -2574 -42 2606 6 2654 6 ct 2676 6 2691 -2 2703 -24 ct 2703 -15 l 2703 11 2701 25 2695 37 ct -2687 54 2673 62 2651 62 ct 2628 62 2616 52 2610 27 ct 2580 27 l 2585 55 2591 68 2605 79 ct -2617 88 2632 93 2650 93 ct 2681 93 2705 80 2719 57 ct 2729 39 2734 17 2734 -18 ct -2734 -221 l p -2656 -194 m 2687 -194 2704 -162 2704 -104 ct 2704 -55 2686 -26 2654 -26 ct -2624 -26 2606 -58 2606 -113 ct 2606 -167 2623 -194 2656 -194 ct p ef -2805 -153 m 2809 -184 2821 -196 2848 -196 ct 2875 -196 2890 -184 2890 -159 ct -2890 -143 2885 -136 2874 -134 ct 2823 -126 l 2788 -121 2768 -96 2768 -58 ct -2768 -19 2791 6 2826 6 ct 2852 6 2871 -4 2890 -29 ct 2893 -5 2901 4 2922 4 ct 2926 4 2930 3 2936 1 ct -2938 0 2938 0 2940 0 ct 2940 -27 l 2933 -25 2931 -25 2929 -25 ct 2923 -25 2919 -30 2919 -38 ct -2919 -165 l 2919 -204 2893 -227 2850 -227 ct 2821 -227 2800 -217 2788 -198 ct -2781 -186 2778 -175 2777 -153 ct 2805 -153 l p -2889 -76 m 2889 -48 2863 -24 2832 -24 ct 2812 -24 2800 -38 2800 -61 ct 2800 -83 2811 -94 2839 -98 ct -2874 -104 2882 -107 2889 -112 ct 2889 -76 l p ef -3004 -221 m 2974 -221 l 2974 0 l 3004 0 l 3004 -221 l p -3004 -261 m 3004 -303 l 2974 -303 l 2974 -261 l 3004 -261 l p ef -3078 -221 m 3049 -221 l 3049 0 l 3079 0 l 3079 -120 l 3079 -166 3098 -194 3129 -194 ct -3155 -194 3167 -176 3167 -136 ct 3167 0 l 3197 0 l 3197 -150 l 3197 -199 3174 -227 3136 -227 ct -3111 -227 3093 -216 3078 -188 ct 3078 -221 l p ef -pom -gr -gs -pum -9174 17762 t -165 -88 m 189 0 l 226 0 l 136 -303 l 98 -303 l 4 0 l 39 0 l 65 -88 l -165 -88 l p -75 -125 m 115 -259 l 153 -125 l 75 -125 l p ef -406 -303 m 375 -303 l 375 -187 l 361 -216 345 -227 320 -227 ct 275 -227 245 -182 245 -115 ct -245 -41 276 6 324 6 ct 349 6 364 -4 377 -31 ct 377 0 l 406 0 l 406 -303 l -p -326 -194 m 357 -194 375 -162 375 -104 ct 375 -76 370 -57 359 -43 ct 350 -32 338 -26 325 -26 ct -294 -26 276 -58 276 -113 ct 276 -167 293 -194 326 -194 ct p ef -477 -153 m 481 -184 493 -196 520 -196 ct 547 -196 562 -184 562 -159 ct 562 -143 557 -136 546 -134 ct -495 -126 l 460 -121 440 -96 440 -58 ct 440 -19 463 6 498 6 ct 524 6 543 -4 562 -29 ct -565 -5 573 4 594 4 ct 598 4 602 3 608 1 ct 610 0 610 0 612 0 ct 612 -27 l 605 -25 603 -25 601 -25 ct -595 -25 591 -30 591 -38 ct 591 -165 l 591 -204 565 -227 522 -227 ct 493 -227 472 -217 460 -198 ct -453 -186 450 -175 449 -153 ct 477 -153 l p -561 -76 m 561 -48 535 -24 504 -24 ct 484 -24 472 -38 472 -61 ct 472 -83 483 -94 511 -98 ct -546 -104 554 -107 561 -112 ct 561 -76 l p ef -642 87 m 672 87 l 672 -24 l 685 -2 699 6 722 6 ct 770 6 801 -42 801 -115 ct -801 -182 771 -227 726 -227 ct 701 -227 687 -217 671 -188 ct 671 -221 l 642 -221 l -642 87 l p -721 -194 m 752 -194 769 -166 769 -114 ct 769 -58 751 -26 720 -26 ct 690 -26 671 -55 671 -103 ct -671 -163 688 -194 721 -194 ct p ef -906 -190 m 906 -221 l 876 -221 l 876 -282 l 846 -282 l 846 -221 l -821 -221 l 821 -190 l 846 -190 l 846 -44 l 846 -12 857 2 881 2 ct 883 2 885 2 892 1 ct -894 1 899 0 905 0 ct 905 -29 l 895 -29 l 881 -29 876 -34 876 -46 ct 876 -190 l -906 -190 l p ef -967 -221 m 937 -221 l 937 0 l 967 0 l 967 -221 l p -967 -261 m 967 -303 l 937 -303 l 937 -261 l 967 -261 l p ef -1076 -39 m 1029 -221 l 993 -221 l 1059 0 l 1092 0 l 1161 -221 l 1128 -221 l -1076 -39 l p ef -1309 -69 m 1306 -44 1286 -26 1262 -26 ct 1244 -26 1229 -34 1221 -49 ct 1213 -61 1211 -73 1210 -98 ct -1342 -98 l 1341 -142 1337 -162 1327 -184 ct 1313 -214 1293 -227 1263 -227 ct -1211 -227 1177 -180 1177 -106 ct 1177 -36 1209 6 1261 6 ct 1303 6 1332 -21 1340 -69 ct -1309 -69 l p -1210 -128 m 1212 -167 1233 -194 1262 -194 ct 1278 -194 1291 -186 1299 -173 ct -1306 -162 1309 -151 1311 -128 ct 1210 -128 l p ef -1621 -146 m 1615 -200 1593 -227 1552 -227 ct 1499 -227 1466 -180 1466 -106 ct -1466 -37 1498 6 1547 6 ct 1589 6 1614 -22 1621 -78 ct 1591 -78 l 1585 -43 1570 -26 1547 -26 ct -1516 -26 1499 -56 1499 -109 ct 1499 -163 1517 -194 1549 -194 ct 1573 -194 1586 -180 1591 -146 ct -1621 -146 l p ef -1727 -227 m 1676 -227 1642 -180 1642 -110 ct 1642 -41 1676 5 1726 5 ct 1776 5 1810 -41 1810 -110 ct -1810 -178 1776 -227 1727 -227 ct p -1727 -195 m 1758 -195 1778 -161 1778 -110 ct 1778 -59 1758 -26 1726 -26 ct -1694 -26 1673 -59 1673 -110 ct 1673 -162 1694 -195 1727 -195 ct p ef -1998 -303 m 1967 -303 l 1967 -187 l 1953 -216 1937 -227 1912 -227 ct 1867 -227 1837 -182 1837 -115 ct -1837 -41 1868 6 1916 6 ct 1941 6 1956 -4 1969 -31 ct 1969 0 l 1998 0 l 1998 -303 l -p -1918 -194 m 1949 -194 1967 -162 1967 -104 ct 1967 -76 1962 -57 1951 -43 ct -1942 -32 1930 -26 1917 -26 ct 1886 -26 1868 -58 1868 -113 ct 1868 -167 1885 -194 1918 -194 ct -p ef -2164 -69 m 2161 -44 2141 -26 2117 -26 ct 2099 -26 2084 -34 2076 -49 ct 2068 -61 2066 -73 2065 -98 ct -2197 -98 l 2196 -142 2192 -162 2182 -184 ct 2168 -214 2148 -227 2118 -227 ct -2066 -227 2032 -180 2032 -106 ct 2032 -36 2064 6 2116 6 ct 2158 6 2187 -21 2195 -69 ct -2164 -69 l p -2065 -128 m 2067 -167 2088 -194 2117 -194 ct 2133 -194 2146 -186 2154 -173 ct -2161 -162 2164 -151 2166 -128 ct 2065 -128 l p ef -2263 0 m 2263 -28 l 2276 -3 2290 6 2314 6 ct 2362 6 2393 -41 2393 -115 ct -2393 -182 2363 -227 2318 -227 ct 2296 -227 2280 -217 2264 -192 ct 2264 -303 l -2234 -303 l 2234 0 l 2263 0 l p -2313 -194 m 2345 -194 2361 -167 2361 -113 ct 2361 -58 2343 -26 2312 -26 ct -2300 -26 2288 -32 2279 -43 ct 2268 -57 2263 -76 2263 -105 ct 2263 -163 2280 -194 2313 -194 ct -p ef -2506 -227 m 2455 -227 2421 -180 2421 -110 ct 2421 -41 2455 5 2505 5 ct 2555 5 2589 -41 2589 -110 ct -2589 -178 2555 -227 2506 -227 ct p -2506 -195 m 2537 -195 2557 -161 2557 -110 ct 2557 -59 2537 -26 2505 -26 ct -2473 -26 2452 -59 2452 -110 ct 2452 -162 2473 -195 2506 -195 ct p ef -2701 -227 m 2650 -227 2616 -180 2616 -110 ct 2616 -41 2650 5 2700 5 ct 2750 5 2784 -41 2784 -110 ct -2784 -178 2750 -227 2701 -227 ct p -2701 -195 m 2732 -195 2752 -161 2752 -110 ct 2752 -59 2732 -26 2700 -26 ct -2668 -26 2647 -59 2647 -110 ct 2647 -162 2668 -195 2701 -195 ct p ef -2898 -138 m 2967 -221 l 2929 -221 l 2850 -127 l 2850 -303 l 2821 -303 l -2821 0 l 2850 0 l 2850 -83 l 2876 -111 l 2932 0 l 2971 0 l 2898 -138 l -p ef -3242 -221 m 3213 -221 l 3213 -188 l 3196 -217 3182 -227 3157 -227 ct 3112 -227 3082 -182 3082 -115 ct -3082 -42 3114 6 3162 6 ct 3184 6 3199 -2 3211 -24 ct 3211 -15 l 3211 11 3209 25 3203 37 ct -3195 54 3181 62 3159 62 ct 3136 62 3124 52 3118 27 ct 3088 27 l 3093 55 3099 68 3113 79 ct -3125 88 3140 93 3158 93 ct 3189 93 3213 80 3227 57 ct 3237 39 3242 17 3242 -18 ct -3242 -221 l p -3164 -194 m 3195 -194 3212 -162 3212 -104 ct 3212 -55 3194 -26 3162 -26 ct -3132 -26 3114 -58 3114 -113 ct 3114 -167 3131 -194 3164 -194 ct p ef -3313 -153 m 3317 -184 3329 -196 3356 -196 ct 3383 -196 3398 -184 3398 -159 ct -3398 -143 3393 -136 3382 -134 ct 3331 -126 l 3296 -121 3276 -96 3276 -58 ct -3276 -19 3299 6 3334 6 ct 3360 6 3379 -4 3398 -29 ct 3401 -5 3409 4 3430 4 ct 3434 4 3438 3 3444 1 ct -3446 0 3446 0 3448 0 ct 3448 -27 l 3441 -25 3439 -25 3437 -25 ct 3431 -25 3427 -30 3427 -38 ct -3427 -165 l 3427 -204 3401 -227 3358 -227 ct 3329 -227 3308 -217 3296 -198 ct -3289 -186 3286 -175 3285 -153 ct 3313 -153 l p -3397 -76 m 3397 -48 3371 -24 3340 -24 ct 3320 -24 3308 -38 3308 -61 ct 3308 -83 3319 -94 3347 -98 ct -3382 -104 3390 -107 3397 -112 ct 3397 -76 l p ef -3512 -221 m 3482 -221 l 3482 0 l 3512 0 l 3512 -221 l p -3512 -261 m 3512 -303 l 3482 -303 l 3482 -261 l 3512 -261 l p ef -3586 -221 m 3557 -221 l 3557 0 l 3587 0 l 3587 -120 l 3587 -166 3606 -194 3637 -194 ct -3663 -194 3675 -176 3675 -136 ct 3675 0 l 3705 0 l 3705 -150 l 3705 -199 3682 -227 3644 -227 ct -3619 -227 3601 -216 3586 -188 ct 3586 -221 l p ef -pom -gr -0 lw 1 lj 11185 19818 m 9435 19818 l 9435 18318 l 12935 18318 l 12935 19818 l -11185 19818 l pc -gs -pum -10523 19288 t -41 0 m 191 0 l 234 0 272 -17 297 -48 ct 332 -92 351 -157 351 -233 ct 351 -368 289 -455 193 -455 ct -41 -455 l 41 0 l p -92 -403 m 187 -403 l 259 -403 299 -341 299 -227 ct 299 -119 257 -52 190 -52 ct -92 -52 l 92 -403 l p ef -596 -104 m 591 -66 561 -39 524 -39 ct 497 -39 476 -51 462 -74 ct 451 -92 448 -110 446 -147 ct -645 -147 l 643 -213 637 -244 622 -277 ct 601 -321 570 -341 526 -341 ct 448 -341 397 -271 397 -160 ct -397 -55 445 9 523 9 ct 585 9 629 -32 641 -104 ct 596 -104 l p -446 -192 m 449 -252 481 -292 524 -292 ct 548 -292 568 -280 580 -260 ct 591 -243 595 -226 597 -192 ct -446 -192 l p ef -745 -455 m 699 -455 l 699 0 l 745 0 l 745 -455 l p ef -853 -231 m 859 -277 877 -295 917 -295 ct 958 -295 980 -276 980 -240 ct 980 -215 973 -204 956 -201 ct -880 -190 l 827 -182 798 -145 798 -87 ct 798 -29 832 9 885 9 ct 923 9 951 -6 981 -44 ct -984 -8 997 6 1028 6 ct 1035 6 1040 5 1049 1 ct 1052 0 1053 0 1055 0 ct 1055 -40 l -1045 -38 1043 -38 1039 -38 ct 1029 -38 1024 -45 1024 -57 ct 1024 -248 l 1024 -306 985 -341 920 -341 ct -878 -341 845 -326 827 -297 ct 817 -280 813 -264 811 -231 ct 853 -231 l p -979 -114 m 979 -73 940 -36 894 -36 ct 863 -36 845 -57 845 -92 ct 845 -125 862 -141 904 -148 ct -956 -157 969 -160 979 -169 ct 979 -114 l p ef -1197 -59 m 1124 -332 l 1072 -332 l 1173 8 l 1168 24 1164 38 1162 43 ct -1152 76 1144 85 1125 85 ct 1115 85 1106 83 1097 80 ct 1097 130 l 1101 132 l -1109 135 1113 135 1119 135 ct 1174 135 1182 125 1223 -6 ct 1321 -332 l 1270 -332 l -1197 -59 l p ef -pom -gr -13385 18918 m 13385 19218 l 12935 19068 l 13385 18918 l p ef -1 lw 0 lj 14935 14567 m 14935 19068 l 13295 19068 l ps -7085 18268 m 6785 18268 l 6935 17818 l 7085 18268 l p ef -9435 19068 m 6935 19068 l 6935 18178 l ps -20025 14718 m 20031 14418 l 20478 14577 l 20025 14718 l p ef -19335 14568 m 20127 14568 l ps -gs -pum -10179 20249 t -63 -128 m 141 -128 l 186 -128 215 -163 215 -217 ct 215 -269 186 -303 141 -303 ct -30 -303 l 30 0 l 63 0 l 63 -128 l p -63 -268 m 131 -268 l 164 -268 181 -251 181 -216 ct 181 -181 164 -163 130 -163 ct -63 -163 l 63 -268 l p ef -282 -153 m 286 -184 298 -196 325 -196 ct 352 -196 367 -184 367 -159 ct 367 -143 362 -136 351 -134 ct -300 -126 l 265 -121 245 -96 245 -58 ct 245 -19 268 6 303 6 ct 329 6 348 -4 367 -29 ct -370 -5 378 4 399 4 ct 403 4 407 3 413 1 ct 415 0 415 0 417 0 ct 417 -27 l 410 -25 408 -25 406 -25 ct -400 -25 396 -30 396 -38 ct 396 -165 l 396 -204 370 -227 327 -227 ct 298 -227 277 -217 265 -198 ct -258 -186 255 -175 254 -153 ct 282 -153 l p -366 -76 m 366 -48 340 -24 309 -24 ct 289 -24 277 -38 277 -61 ct 277 -83 288 -94 316 -98 ct -351 -104 359 -107 366 -112 ct 366 -76 l p ef -582 -158 m 580 -202 555 -227 514 -227 ct 472 -227 444 -200 444 -157 ct 444 -129 458 -111 486 -103 ct -522 -92 l 550 -84 558 -77 558 -60 ct 558 -39 542 -26 515 -26 ct 484 -26 470 -39 468 -71 ct -439 -71 l 440 -49 442 -38 448 -27 ct 460 -5 483 6 513 6 ct 559 6 588 -22 588 -66 ct -588 -97 574 -113 537 -125 ct 507 -134 l 480 -142 474 -148 474 -163 ct 474 -183 488 -195 512 -195 ct -538 -195 551 -183 553 -158 ct 582 -158 l p ef -690 -190 m 690 -221 l 660 -221 l 660 -282 l 630 -282 l 630 -221 l -605 -221 l 605 -190 l 630 -190 l 630 -44 l 630 -12 641 2 665 2 ct 667 2 669 2 676 1 ct -678 1 683 0 689 0 ct 689 -29 l 679 -29 l 665 -29 660 -34 660 -46 ct 660 -190 l -690 -190 l p ef -950 -158 m 948 -202 923 -227 882 -227 ct 840 -227 812 -200 812 -157 ct 812 -129 826 -111 854 -103 ct -890 -92 l 918 -84 926 -77 926 -60 ct 926 -39 910 -26 883 -26 ct 852 -26 838 -39 836 -71 ct -807 -71 l 808 -49 810 -38 816 -27 ct 828 -5 851 6 881 6 ct 927 6 956 -22 956 -66 ct -956 -97 942 -113 905 -125 ct 875 -134 l 848 -142 842 -148 842 -163 ct 842 -183 856 -195 880 -195 ct -906 -195 919 -183 921 -158 ct 950 -158 l p ef -1138 0 m 1138 -221 l 1108 -221 l 1108 -99 l 1108 -54 1088 -26 1058 -26 ct -1034 -26 1023 -42 1023 -74 ct 1023 -221 l 992 -221 l 992 -62 l 992 -19 1015 6 1052 6 ct -1079 6 1093 -3 1109 -34 ct 1109 0 l 1138 0 l p ef -1213 0 m 1213 -28 l 1226 -3 1240 6 1264 6 ct 1312 6 1343 -41 1343 -115 ct -1343 -182 1313 -227 1268 -227 ct 1246 -227 1230 -217 1214 -192 ct 1214 -303 l -1184 -303 l 1184 0 l 1213 0 l p -1263 -194 m 1295 -194 1311 -167 1311 -113 ct 1311 -58 1293 -26 1262 -26 ct -1250 -26 1238 -32 1229 -43 ct 1218 -57 1213 -76 1213 -105 ct 1213 -163 1230 -194 1263 -194 ct -p ef -1449 -190 m 1449 -221 l 1419 -221 l 1419 -248 l 1419 -266 1424 -274 1437 -274 ct -1440 -274 1444 -274 1449 -273 ct 1449 -307 l 1440 -307 1438 -307 1435 -307 ct -1405 -307 1389 -291 1389 -259 ct 1389 -221 l 1363 -221 l 1363 -190 l 1389 -190 l -1389 0 l 1419 0 l 1419 -190 l 1449 -190 l p ef -1571 -188 m 1571 -226 l 1568 -227 1565 -227 1563 -227 ct 1541 -227 1527 -215 1511 -183 ct -1511 -221 l 1482 -221 l 1482 0 l 1513 0 l 1513 -129 l 1513 -163 1532 -188 1559 -188 ct -1571 -188 l p ef -1620 -153 m 1624 -184 1636 -196 1663 -196 ct 1690 -196 1705 -184 1705 -159 ct -1705 -143 1700 -136 1689 -134 ct 1638 -126 l 1603 -121 1583 -96 1583 -58 ct -1583 -19 1606 6 1641 6 ct 1667 6 1686 -4 1705 -29 ct 1708 -5 1716 4 1737 4 ct 1741 4 1745 3 1751 1 ct -1753 0 1753 0 1755 0 ct 1755 -27 l 1748 -25 1746 -25 1744 -25 ct 1738 -25 1734 -30 1734 -38 ct -1734 -165 l 1734 -204 1708 -227 1665 -227 ct 1636 -227 1615 -217 1603 -198 ct -1596 -186 1593 -175 1592 -153 ct 1620 -153 l p -1704 -76 m 1704 -48 1678 -24 1647 -24 ct 1627 -24 1615 -38 1615 -61 ct 1615 -83 1626 -94 1654 -98 ct -1689 -104 1697 -107 1704 -112 ct 1704 -76 l p ef -1787 0 m 1817 0 l 1817 -120 l 1817 -165 1836 -194 1866 -194 ct 1883 -194 1894 -179 1894 -153 ct -1894 0 l 1924 0 l 1924 -134 l 1924 -168 1943 -194 1968 -194 ct 1990 -194 2001 -177 2001 -142 ct -2001 0 l 2031 0 l 2031 -153 l 2031 -199 2009 -227 1974 -227 ct 1952 -227 1940 -219 1920 -191 ct -1908 -217 1894 -227 1872 -227 ct 1848 -227 1831 -216 1816 -188 ct 1816 -221 l -1787 -221 l 1787 0 l p ef -2198 -69 m 2195 -44 2175 -26 2151 -26 ct 2133 -26 2118 -34 2110 -49 ct 2102 -61 2100 -73 2099 -98 ct -2231 -98 l 2230 -142 2226 -162 2216 -184 ct 2202 -214 2182 -227 2152 -227 ct -2100 -227 2066 -180 2066 -106 ct 2066 -36 2098 6 2150 6 ct 2192 6 2221 -21 2229 -69 ct -2198 -69 l p -2099 -128 m 2101 -167 2122 -194 2151 -194 ct 2167 -194 2180 -186 2188 -173 ct -2195 -162 2198 -151 2200 -128 ct 2099 -128 l p ef -pom -gr -tm setmatrix -0 0 t -1 1 s -0 11113 t -pom -count op_count sub {pop} repeat countdictstack dict_count sub {end} repeat b4_inc_state restore -%%PageTrailer -%%Trailer -%%EOF diff --git a/speex/doc/celp_decoder.odg b/speex/doc/celp_decoder.odg deleted file mode 100644 index ed537ad440656d290004fd7184b869c70a205880..0000000000000000000000000000000000000000 Binary files a/speex/doc/celp_decoder.odg and /dev/null differ diff --git a/speex/doc/components.eps b/speex/doc/components.eps deleted file mode 100644 index 8ac53a4aea4285349430a33fedeca8a8d1420b63..0000000000000000000000000000000000000000 --- a/speex/doc/components.eps +++ /dev/null @@ -1,1361 +0,0 @@ -%!PS-Adobe-3.0 EPSF-3.0 -%%BoundingBox: 0 0 770 174 -%%Pages: 0 -%%Creator: Sun Microsystems, Inc. -%%Title: none -%%CreationDate: none -%%LanguageLevel: 2 -%%EndComments -%%BeginProlog -%%BeginResource: procset SDRes-Prolog 1.0 0 -/b4_inc_state save def -/dict_count countdictstack def -/op_count count 1 sub def -userdict begin -0 setgray 0 setlinecap 1 setlinewidth 0 setlinejoin 10 setmiterlimit[] 0 setdash newpath -/languagelevel where {pop languagelevel 1 ne {false setstrokeadjust false setoverprint} if} if -/bdef {bind def} bind def -/c {setrgbcolor} bdef -/l {neg lineto} bdef -/rl {neg rlineto} bdef -/lc {setlinecap} bdef -/lj {setlinejoin} bdef -/lw {setlinewidth} bdef -/ml {setmiterlimit} bdef -/ld {setdash} bdef -/m {neg moveto} bdef -/ct {6 2 roll neg 6 2 roll neg 6 2 roll neg curveto} bdef -/r {rotate} bdef -/t {neg translate} bdef -/s {scale} bdef -/sw {show} bdef -/gs {gsave} bdef -/gr {grestore} bdef -/f {findfont dup length dict begin -{1 index /FID ne {def} {pop pop} ifelse} forall /Encoding ISOLatin1Encoding def -currentdict end /NFont exch definefont pop /NFont findfont} bdef -/p {closepath} bdef -/sf {scalefont setfont} bdef -/ef {eofill}bdef -/pc {closepath stroke}bdef -/ps {stroke}bdef -/pum {matrix currentmatrix}bdef -/pom {setmatrix}bdef -/bs {/aString exch def /nXOfs exch def /nWidth exch def currentpoint nXOfs 0 rmoveto pum nWidth aString stringwidth pop div 1 scale aString show pom moveto} bdef -%%EndResource -%%EndProlog -%%BeginSetup -%%EndSetup -%%Page: 1 1 -%%BeginPageSetup -%%EndPageSetup -pum -0.02835 0.0284 s -0 -6126 t -/tm matrix currentmatrix def -tm setmatrix --450 -7975 t -1 1 s -50 lw 1 lj 0.003 0.003 0.003 c 4400 9500 m 2900 9500 l 2900 8000 l 5900 8000 l -5900 9500 l 4400 9500 l pc -gs -gs -pum -3380 8974 t -50 0 m 50 -455 l 251 -455 l 292 -455 323 -451 344 -443 ct 365 -435 382 -420 394 -399 ct -407 -379 413 -356 413 -331 ct 413 -299 403 -271 382 -249 ct 361 -227 329 -213 285 -207 ct -301 -199 313 -192 322 -184 ct 339 -168 356 -148 371 -124 ct 451 0 l 375 0 l -315 -95 l 297 -122 283 -143 271 -157 ct 260 -172 250 -182 241 -188 ct 232 -194 223 -198 213 -200 ct -207 -201 195 -202 180 -202 ct 110 -202 l 110 0 l 50 0 l p -110 -254 m 239 -254 l 267 -254 288 -257 304 -263 ct 319 -268 331 -277 339 -290 ct -347 -303 351 -316 351 -331 ct 351 -352 344 -370 328 -384 ct 312 -398 288 -405 254 -405 ct -110 -405 l 110 -254 l p ef -724 -107 m 782 -99 l 773 -66 756 -40 731 -21 ct 707 -2 675 7 637 7 ct 589 7 551 -8 523 -37 ct -494 -67 480 -109 480 -162 ct 480 -218 495 -261 523 -291 ct 552 -322 589 -337 634 -337 ct -678 -337 714 -322 742 -292 ct 770 -262 784 -220 784 -166 ct 784 -163 784 -158 783 -151 ct -538 -151 l 540 -115 550 -87 569 -68 ct 587 -49 610 -39 637 -39 ct 658 -39 675 -44 690 -55 ct -704 -66 716 -83 724 -107 ct p -541 -197 m 725 -197 l 722 -225 715 -245 704 -259 ct 686 -280 663 -291 635 -291 ct -609 -291 587 -283 570 -265 ct 553 -248 543 -226 541 -197 ct p ef -1066 -121 m 1121 -114 l 1115 -76 1099 -46 1075 -25 ct 1050 -4 1020 7 984 7 ct -939 7 902 -8 875 -37 ct 848 -67 834 -109 834 -164 ct 834 -199 840 -230 851 -257 ct -863 -284 881 -304 905 -317 ct 929 -330 956 -337 984 -337 ct 1020 -337 1049 -328 1072 -310 ct -1094 -292 1109 -266 1115 -233 ct 1061 -224 l 1056 -247 1047 -263 1034 -274 ct -1021 -286 1005 -291 986 -291 ct 958 -291 935 -281 918 -261 ct 900 -241 891 -209 891 -165 ct -891 -121 900 -89 917 -69 ct 934 -49 956 -39 983 -39 ct 1005 -39 1023 -46 1038 -59 ct -1053 -72 1062 -93 1066 -121 ct p ef -1147 -165 m 1147 -226 1164 -271 1198 -301 ct 1226 -325 1261 -337 1302 -337 ct -1347 -337 1384 -322 1412 -293 ct 1441 -263 1456 -222 1456 -170 ct 1456 -127 1449 -94 1437 -70 ct -1424 -45 1405 -27 1381 -13 ct 1357 0 1330 7 1302 7 ct 1255 7 1218 -8 1190 -37 ct -1161 -67 1147 -110 1147 -165 ct p -1204 -165 m 1204 -123 1214 -91 1232 -70 ct 1250 -49 1274 -39 1302 -39 ct 1329 -39 1352 -49 1371 -71 ct -1389 -92 1398 -124 1398 -167 ct 1398 -208 1389 -239 1370 -260 ct 1352 -281 1329 -291 1302 -291 ct -1274 -291 1250 -281 1232 -260 ct 1214 -239 1204 -207 1204 -165 ct p ef -1518 0 m 1518 -330 l 1568 -330 l 1568 -280 l 1581 -303 1593 -318 1604 -326 ct -1615 -333 1627 -337 1640 -337 ct 1659 -337 1678 -331 1697 -319 ct 1678 -267 l -1664 -275 1651 -279 1637 -279 ct 1625 -279 1614 -276 1604 -268 ct 1594 -261 1587 -251 1583 -238 ct -1577 -218 1574 -196 1574 -173 ct 1574 0 l 1518 0 l p ef -1944 0 m 1944 -42 l 1924 -9 1893 7 1852 7 ct 1826 7 1802 0 1780 -15 ct 1758 -29 1741 -49 1729 -75 ct -1717 -101 1711 -131 1711 -165 ct 1711 -198 1716 -228 1727 -254 ct 1738 -281 1755 -302 1776 -316 ct -1798 -330 1823 -337 1850 -337 ct 1870 -337 1887 -333 1903 -325 ct 1918 -316 1931 -305 1941 -292 ct -1941 -455 l 1996 -455 l 1996 0 l 1944 0 l p -1768 -165 m 1768 -123 1777 -91 1795 -70 ct 1813 -49 1833 -39 1858 -39 ct 1882 -39 1903 -49 1920 -69 ct -1937 -89 1945 -119 1945 -160 ct 1945 -205 1937 -238 1919 -259 ct 1902 -280 1881 -291 1855 -291 ct -1830 -291 1810 -281 1793 -261 ct 1776 -240 1768 -208 1768 -165 ct p ef -pom -gr -gr -12748 9525 m 12697 9525 l 12697 9475 l 12748 9475 l 12748 9525 l p ef -12646 9525 m 12595 9525 l 12595 9475 l 12646 9475 l 12646 9525 l p ef -12544 9525 m 12493 9525 l 12493 9475 l 12544 9475 l 12544 9525 l p ef -12442 9525 m 12391 9525 l 12391 9475 l 12442 9475 l 12442 9525 l p ef -12340 9525 m 12289 9525 l 12289 9475 l 12340 9475 l 12340 9525 l p ef -12238 9525 m 12187 9525 l 12187 9475 l 12238 9475 l 12238 9525 l p ef -12136 9525 m 12085 9525 l 12085 9475 l 12136 9475 l 12136 9525 l p ef -12034 9525 m 11983 9525 l 11983 9475 l 12034 9475 l 12034 9525 l p ef -11932 9525 m 11881 9525 l 11881 9475 l 11932 9475 l 11932 9525 l p ef -11830 9525 m 11779 9525 l 11779 9475 l 11830 9475 l 11830 9525 l p ef -11728 9525 m 11677 9525 l 11677 9475 l 11728 9475 l 11728 9525 l p ef -11626 9525 m 11575 9525 l 11575 9475 l 11626 9475 l 11626 9525 l p ef -11524 9525 m 11473 9525 l 11473 9475 l 11524 9475 l 11524 9525 l p ef -11422 9525 m 11400 9525 l 11400 9500 l 11400 9475 l 11422 9475 l 11422 9500 l -11422 9525 l p ef -11400 9500 m 11400 9525 l 11396 9525 l 11391 9523 l 11388 9522 l 11384 9519 l -11381 9516 l 11378 9513 l 11377 9509 l 11375 9504 l 11375 9500 l 11375 9500 l -11400 9500 l p ef -11375 9500 m 11375 9471 l 11400 9471 l 11425 9471 l 11425 9500 l 11400 9500 l -11375 9500 l p ef -11375 9420 m 11375 9369 l 11425 9369 l 11425 9420 l 11375 9420 l p ef -11375 9318 m 11375 9267 l 11425 9267 l 11425 9318 l 11375 9318 l p ef -11375 9216 m 11375 9165 l 11425 9165 l 11425 9216 l 11375 9216 l p ef -11375 9114 m 11375 9063 l 11425 9063 l 11425 9114 l 11375 9114 l p ef -11375 9012 m 11375 8961 l 11425 8961 l 11425 9012 l 11375 9012 l p ef -11375 8910 m 11375 8859 l 11425 8859 l 11425 8910 l 11375 8910 l p ef -11375 8808 m 11375 8757 l 11425 8757 l 11425 8808 l 11375 8808 l p ef -11375 8706 m 11375 8655 l 11425 8655 l 11425 8706 l 11375 8706 l p ef -11375 8604 m 11375 8553 l 11425 8553 l 11425 8604 l 11375 8604 l p ef -11375 8502 m 11375 8451 l 11425 8451 l 11425 8502 l 11375 8502 l p ef -11375 8400 m 11375 8349 l 11425 8349 l 11425 8400 l 11375 8400 l p ef -11375 8298 m 11375 8247 l 11425 8247 l 11425 8298 l 11375 8298 l p ef -11375 8196 m 11375 8145 l 11425 8145 l 11425 8196 l 11375 8196 l p ef -11375 8094 m 11375 8043 l 11425 8043 l 11425 8094 l 11375 8094 l p ef -11408 7975 m 11459 7975 l 11459 8025 l 11408 8025 l 11408 7975 l p ef -11510 7975 m 11561 7975 l 11561 8025 l 11510 8025 l 11510 7975 l p ef -11612 7975 m 11663 7975 l 11663 8025 l 11612 8025 l 11612 7975 l p ef -11714 7975 m 11765 7975 l 11765 8025 l 11714 8025 l 11714 7975 l p ef -11816 7975 m 11867 7975 l 11867 8025 l 11816 8025 l 11816 7975 l p ef -11918 7975 m 11969 7975 l 11969 8025 l 11918 8025 l 11918 7975 l p ef -12020 7975 m 12071 7975 l 12071 8025 l 12020 8025 l 12020 7975 l p ef -12122 7975 m 12173 7975 l 12173 8025 l 12122 8025 l 12122 7975 l p ef -12224 7975 m 12275 7975 l 12275 8025 l 12224 8025 l 12224 7975 l p ef -12326 7975 m 12377 7975 l 12377 8025 l 12326 8025 l 12326 7975 l p ef -12428 7975 m 12479 7975 l 12479 8025 l 12428 8025 l 12428 7975 l p ef -12530 7975 m 12581 7975 l 12581 8025 l 12530 8025 l 12530 7975 l p ef -12632 7975 m 12683 7975 l 12683 8025 l 12632 8025 l 12632 7975 l p ef -12734 7975 m 12785 7975 l 12785 8025 l 12734 8025 l 12734 7975 l p ef -12836 7975 m 12887 7975 l 12887 8025 l 12836 8025 l 12836 7975 l p ef -12938 7975 m 12989 7975 l 12989 8025 l 12938 8025 l 12938 7975 l p ef -13040 7975 m 13091 7975 l 13091 8025 l 13040 8025 l 13040 7975 l p ef -13142 7975 m 13193 7975 l 13193 8025 l 13142 8025 l 13142 7975 l p ef -13244 7975 m 13295 7975 l 13295 8025 l 13244 8025 l 13244 7975 l p ef -13346 7975 m 13397 7975 l 13397 8025 l 13346 8025 l 13346 7975 l p ef -13448 7975 m 13499 7975 l 13499 8025 l 13448 8025 l 13448 7975 l p ef -13550 7975 m 13601 7975 l 13601 8025 l 13550 8025 l 13550 7975 l p ef -13652 7975 m 13703 7975 l 13703 8025 l 13652 8025 l 13652 7975 l p ef -13754 7975 m 13805 7975 l 13805 8025 l 13754 8025 l 13754 7975 l p ef -13856 7975 m 13907 7975 l 13907 8025 l 13856 8025 l 13856 7975 l p ef -13958 7975 m 14009 7975 l 14009 8025 l 13958 8025 l 13958 7975 l p ef -14060 7975 m 14111 7975 l 14111 8025 l 14060 8025 l 14060 7975 l p ef -14162 7975 m 14213 7975 l 14213 8025 l 14162 8025 l 14162 7975 l p ef -14264 7975 m 14300 7975 l 14300 8000 l 14300 8025 l 14264 8025 l 14264 8000 l -14264 7975 l p ef -14300 8000 m 14300 7975 l 14304 7975 l 14309 7977 l 14312 7978 l 14316 7981 l -14319 7984 l 14322 7987 l 14323 7991 l 14325 7996 l 14325 8000 l 14325 8000 l -14300 8000 l p ef -14325 8000 m 14325 8015 l 14300 8015 l 14275 8015 l 14275 8000 l 14300 8000 l -14325 8000 l p ef -14325 8066 m 14325 8117 l 14275 8117 l 14275 8066 l 14325 8066 l p ef -14325 8168 m 14325 8219 l 14275 8219 l 14275 8168 l 14325 8168 l p ef -14325 8270 m 14325 8321 l 14275 8321 l 14275 8270 l 14325 8270 l p ef -14325 8372 m 14325 8423 l 14275 8423 l 14275 8372 l 14325 8372 l p ef -14325 8474 m 14325 8525 l 14275 8525 l 14275 8474 l 14325 8474 l p ef -14325 8576 m 14325 8627 l 14275 8627 l 14275 8576 l 14325 8576 l p ef -14325 8678 m 14325 8729 l 14275 8729 l 14275 8678 l 14325 8678 l p ef -14325 8780 m 14325 8831 l 14275 8831 l 14275 8780 l 14325 8780 l p ef -14325 8882 m 14325 8933 l 14275 8933 l 14275 8882 l 14325 8882 l p ef -14325 8984 m 14325 9035 l 14275 9035 l 14275 8984 l 14325 8984 l p ef -14325 9086 m 14325 9137 l 14275 9137 l 14275 9086 l 14325 9086 l p ef -14325 9188 m 14325 9239 l 14275 9239 l 14275 9188 l 14325 9188 l p ef -14325 9290 m 14325 9341 l 14275 9341 l 14275 9290 l 14325 9290 l p ef -14325 9392 m 14325 9443 l 14275 9443 l 14275 9392 l 14325 9392 l p ef -14325 9494 m 14325 9500 l 14300 9500 l 14275 9500 l 14275 9494 l 14300 9494 l -14325 9494 l p ef -14300 9500 m 14325 9500 l 14325 9504 l 14323 9509 l 14322 9512 l 14319 9516 l -14316 9519 l 14313 9522 l 14309 9523 l 14304 9525 l 14300 9525 l 14300 9525 l -14300 9500 l p ef -14300 9525 m 14255 9525 l 14255 9500 l 14255 9475 l 14300 9475 l 14300 9500 l -14300 9525 l p ef -14204 9525 m 14153 9525 l 14153 9475 l 14204 9475 l 14204 9525 l p ef -14102 9525 m 14051 9525 l 14051 9475 l 14102 9475 l 14102 9525 l p ef -14000 9525 m 13949 9525 l 13949 9475 l 14000 9475 l 14000 9525 l p ef -13898 9525 m 13847 9525 l 13847 9475 l 13898 9475 l 13898 9525 l p ef -13796 9525 m 13745 9525 l 13745 9475 l 13796 9475 l 13796 9525 l p ef -13694 9525 m 13643 9525 l 13643 9475 l 13694 9475 l 13694 9525 l p ef -13592 9525 m 13541 9525 l 13541 9475 l 13592 9475 l 13592 9525 l p ef -13490 9525 m 13439 9525 l 13439 9475 l 13490 9475 l 13490 9525 l p ef -13388 9525 m 13337 9525 l 13337 9475 l 13388 9475 l 13388 9525 l p ef -13286 9525 m 13235 9525 l 13235 9475 l 13286 9475 l 13286 9525 l p ef -13184 9525 m 13133 9525 l 13133 9475 l 13184 9475 l 13184 9525 l p ef -13082 9525 m 13031 9525 l 13031 9475 l 13082 9475 l 13082 9525 l p ef -12980 9525 m 12929 9525 l 12929 9475 l 12980 9475 l 12980 9525 l p ef -12878 9525 m 12850 9525 l 12850 9500 l 12850 9475 l 12878 9475 l 12878 9500 l -12878 9525 l p ef -12850 9525 m 12799 9525 l 12799 9500 l 12799 9475 l 12850 9475 l 12850 9500 l -12850 9525 l p ef -gs -gs -pum -12191 8974 t --1 0 m 174 -455 l 238 -455 l 424 0 l 356 0 l 303 -138 l 113 -138 l -63 0 l -1 0 l p -130 -187 m 284 -187 l 237 -313 l 222 -351 212 -383 205 -407 ct 199 -378 191 -349 180 -320 ct -130 -187 l p ef -473 0 m 473 -455 l 802 -455 l 802 -401 l 533 -401 l 533 -262 l 785 -262 l -785 -209 l 533 -209 l 533 -54 l 812 -54 l 812 0 l 473 0 l p ef -1220 -159 m 1280 -144 l 1268 -95 1245 -57 1212 -31 ct 1180 -5 1140 8 1092 8 ct -1043 8 1003 -2 973 -22 ct 942 -42 919 -71 903 -109 ct 887 -147 879 -187 879 -231 ct -879 -278 888 -319 906 -355 ct 924 -390 950 -417 983 -435 ct 1016 -453 1053 -463 1093 -463 ct -1139 -463 1177 -451 1208 -428 ct 1239 -405 1261 -372 1273 -330 ct 1213 -316 l -1203 -349 1188 -373 1168 -388 ct 1148 -403 1122 -411 1092 -411 ct 1057 -411 1028 -403 1004 -386 ct -981 -369 964 -347 955 -318 ct 945 -290 941 -261 941 -231 ct 941 -192 946 -159 958 -130 ct -969 -101 986 -79 1010 -65 ct 1034 -51 1060 -44 1087 -44 ct 1121 -44 1150 -53 1173 -73 ct -1196 -92 1212 -121 1220 -159 ct p ef -pom -gr -gr -17600 9525 m 17549 9525 l 17549 9475 l 17600 9475 l 17600 9525 l p ef -17498 9525 m 17447 9525 l 17447 9475 l 17498 9475 l 17498 9525 l p ef -17396 9525 m 17345 9525 l 17345 9475 l 17396 9475 l 17396 9525 l p ef -17294 9525 m 17243 9525 l 17243 9475 l 17294 9475 l 17294 9525 l p ef -17192 9525 m 17141 9525 l 17141 9475 l 17192 9475 l 17192 9525 l p ef -17090 9525 m 17039 9525 l 17039 9475 l 17090 9475 l 17090 9525 l p ef -16988 9525 m 16937 9525 l 16937 9475 l 16988 9475 l 16988 9525 l p ef -16886 9525 m 16835 9525 l 16835 9475 l 16886 9475 l 16886 9525 l p ef -16784 9525 m 16733 9525 l 16733 9475 l 16784 9475 l 16784 9525 l p ef -16682 9525 m 16631 9525 l 16631 9475 l 16682 9475 l 16682 9525 l p ef -16580 9525 m 16529 9525 l 16529 9475 l 16580 9475 l 16580 9525 l p ef -16478 9525 m 16427 9525 l 16427 9475 l 16478 9475 l 16478 9525 l p ef -16376 9525 m 16325 9525 l 16325 9475 l 16376 9475 l 16376 9525 l p ef -16274 9525 m 16223 9525 l 16223 9475 l 16274 9475 l 16274 9525 l p ef -16172 9525 m 16121 9525 l 16121 9475 l 16172 9475 l 16172 9525 l p ef -16070 9525 m 16019 9525 l 16019 9475 l 16070 9475 l 16070 9525 l p ef -15968 9525 m 15917 9525 l 15917 9475 l 15968 9475 l 15968 9525 l p ef -15866 9525 m 15815 9525 l 15815 9475 l 15866 9475 l 15866 9525 l p ef -15764 9525 m 15713 9525 l 15713 9475 l 15764 9475 l 15764 9525 l p ef -15662 9525 m 15611 9525 l 15611 9475 l 15662 9475 l 15662 9525 l p ef -15560 9525 m 15509 9525 l 15509 9475 l 15560 9475 l 15560 9525 l p ef -15458 9525 m 15407 9525 l 15407 9475 l 15458 9475 l 15458 9525 l p ef -15375 9456 m 15375 9405 l 15425 9405 l 15425 9456 l 15375 9456 l p ef -15375 9354 m 15375 9303 l 15425 9303 l 15425 9354 l 15375 9354 l p ef -15375 9252 m 15375 9201 l 15425 9201 l 15425 9252 l 15375 9252 l p ef -15375 9150 m 15375 9099 l 15425 9099 l 15425 9150 l 15375 9150 l p ef -15375 9048 m 15375 8997 l 15425 8997 l 15425 9048 l 15375 9048 l p ef -15375 8946 m 15375 8895 l 15425 8895 l 15425 8946 l 15375 8946 l p ef -15375 8844 m 15375 8793 l 15425 8793 l 15425 8844 l 15375 8844 l p ef -15375 8742 m 15375 8691 l 15425 8691 l 15425 8742 l 15375 8742 l p ef -15375 8640 m 15375 8589 l 15425 8589 l 15425 8640 l 15375 8640 l p ef -15375 8538 m 15375 8487 l 15425 8487 l 15425 8538 l 15375 8538 l p ef -15375 8436 m 15375 8385 l 15425 8385 l 15425 8436 l 15375 8436 l p ef -15375 8334 m 15375 8283 l 15425 8283 l 15425 8334 l 15375 8334 l p ef -15375 8232 m 15375 8181 l 15425 8181 l 15425 8232 l 15375 8232 l p ef -15375 8130 m 15375 8079 l 15425 8079 l 15425 8130 l 15375 8130 l p ef -15375 8028 m 15375 8000 l 15400 8000 l 15425 8000 l 15425 8028 l 15400 8028 l -15375 8028 l p ef -15400 8000 m 15375 8000 l 15375 7996 l 15377 7991 l 15378 7988 l 15381 7984 l -15384 7981 l 15387 7978 l 15391 7977 l 15396 7975 l 15400 7975 l 15400 7975 l -15400 8000 l p ef -15400 7975 m 15423 7975 l 15423 8000 l 15423 8025 l 15400 8025 l 15400 8000 l -15400 7975 l p ef -15474 7975 m 15525 7975 l 15525 8025 l 15474 8025 l 15474 7975 l p ef -15576 7975 m 15627 7975 l 15627 8025 l 15576 8025 l 15576 7975 l p ef -15678 7975 m 15729 7975 l 15729 8025 l 15678 8025 l 15678 7975 l p ef -15780 7975 m 15831 7975 l 15831 8025 l 15780 8025 l 15780 7975 l p ef -15882 7975 m 15933 7975 l 15933 8025 l 15882 8025 l 15882 7975 l p ef -15984 7975 m 16035 7975 l 16035 8025 l 15984 8025 l 15984 7975 l p ef -16086 7975 m 16137 7975 l 16137 8025 l 16086 8025 l 16086 7975 l p ef -16188 7975 m 16239 7975 l 16239 8025 l 16188 8025 l 16188 7975 l p ef -16290 7975 m 16341 7975 l 16341 8025 l 16290 8025 l 16290 7975 l p ef -16392 7975 m 16443 7975 l 16443 8025 l 16392 8025 l 16392 7975 l p ef -16494 7975 m 16545 7975 l 16545 8025 l 16494 8025 l 16494 7975 l p ef -16596 7975 m 16647 7975 l 16647 8025 l 16596 8025 l 16596 7975 l p ef -16698 7975 m 16749 7975 l 16749 8025 l 16698 8025 l 16698 7975 l p ef -16800 7975 m 16851 7975 l 16851 8025 l 16800 8025 l 16800 7975 l p ef -16902 7975 m 16953 7975 l 16953 8025 l 16902 8025 l 16902 7975 l p ef -17004 7975 m 17055 7975 l 17055 8025 l 17004 8025 l 17004 7975 l p ef -17106 7975 m 17157 7975 l 17157 8025 l 17106 8025 l 17106 7975 l p ef -17208 7975 m 17259 7975 l 17259 8025 l 17208 8025 l 17208 7975 l p ef -17310 7975 m 17361 7975 l 17361 8025 l 17310 8025 l 17310 7975 l p ef -17412 7975 m 17463 7975 l 17463 8025 l 17412 8025 l 17412 7975 l p ef -17514 7975 m 17565 7975 l 17565 8025 l 17514 8025 l 17514 7975 l p ef -17616 7975 m 17667 7975 l 17667 8025 l 17616 8025 l 17616 7975 l p ef -17718 7975 m 17769 7975 l 17769 8025 l 17718 8025 l 17718 7975 l p ef -17820 7975 m 17871 7975 l 17871 8025 l 17820 8025 l 17820 7975 l p ef -17922 7975 m 17973 7975 l 17973 8025 l 17922 8025 l 17922 7975 l p ef -18024 7975 m 18075 7975 l 18075 8025 l 18024 8025 l 18024 7975 l p ef -18126 7975 m 18177 7975 l 18177 8025 l 18126 8025 l 18126 7975 l p ef -18228 7975 m 18279 7975 l 18279 8025 l 18228 8025 l 18228 7975 l p ef -18330 7975 m 18381 7975 l 18381 8025 l 18330 8025 l 18330 7975 l p ef -18432 7975 m 18483 7975 l 18483 8025 l 18432 8025 l 18432 7975 l p ef -18534 7975 m 18585 7975 l 18585 8025 l 18534 8025 l 18534 7975 l p ef -18636 7975 m 18687 7975 l 18687 8025 l 18636 8025 l 18636 7975 l p ef -18738 7975 m 18789 7975 l 18789 8025 l 18738 8025 l 18738 7975 l p ef -18840 7975 m 18891 7975 l 18891 8025 l 18840 8025 l 18840 7975 l p ef -18942 7975 m 18993 7975 l 18993 8025 l 18942 8025 l 18942 7975 l p ef -19044 7975 m 19095 7975 l 19095 8025 l 19044 8025 l 19044 7975 l p ef -19146 7975 m 19197 7975 l 19197 8025 l 19146 8025 l 19146 7975 l p ef -19248 7975 m 19299 7975 l 19299 8025 l 19248 8025 l 19248 7975 l p ef -19350 7975 m 19401 7975 l 19401 8025 l 19350 8025 l 19350 7975 l p ef -19452 7975 m 19503 7975 l 19503 8025 l 19452 8025 l 19452 7975 l p ef -19554 7975 m 19605 7975 l 19605 8025 l 19554 8025 l 19554 7975 l p ef -19656 7975 m 19707 7975 l 19707 8025 l 19656 8025 l 19656 7975 l p ef -19758 7975 m 19800 7975 l 19800 8000 l 19800 8025 l 19758 8025 l 19758 8000 l -19758 7975 l p ef -19800 8000 m 19800 7975 l 19804 7975 l 19809 7977 l 19812 7978 l 19816 7981 l -19819 7984 l 19822 7987 l 19823 7991 l 19825 7996 l 19825 8000 l 19825 8000 l -19800 8000 l p ef -19825 8000 m 19825 8009 l 19800 8009 l 19775 8009 l 19775 8000 l 19800 8000 l -19825 8000 l p ef -19825 8060 m 19825 8111 l 19775 8111 l 19775 8060 l 19825 8060 l p ef -19825 8162 m 19825 8213 l 19775 8213 l 19775 8162 l 19825 8162 l p ef -19825 8264 m 19825 8315 l 19775 8315 l 19775 8264 l 19825 8264 l p ef -19825 8366 m 19825 8417 l 19775 8417 l 19775 8366 l 19825 8366 l p ef -19825 8468 m 19825 8519 l 19775 8519 l 19775 8468 l 19825 8468 l p ef -19825 8570 m 19825 8621 l 19775 8621 l 19775 8570 l 19825 8570 l p ef -19825 8672 m 19825 8723 l 19775 8723 l 19775 8672 l 19825 8672 l p ef -19825 8774 m 19825 8825 l 19775 8825 l 19775 8774 l 19825 8774 l p ef -19825 8876 m 19825 8927 l 19775 8927 l 19775 8876 l 19825 8876 l p ef -19825 8978 m 19825 9029 l 19775 9029 l 19775 8978 l 19825 8978 l p ef -19825 9080 m 19825 9131 l 19775 9131 l 19775 9080 l 19825 9080 l p ef -19825 9182 m 19825 9233 l 19775 9233 l 19775 9182 l 19825 9182 l p ef -19825 9284 m 19825 9335 l 19775 9335 l 19775 9284 l 19825 9284 l p ef -19825 9386 m 19825 9437 l 19775 9437 l 19775 9386 l 19825 9386 l p ef -19825 9488 m 19825 9500 l 19800 9500 l 19775 9500 l 19775 9488 l 19800 9488 l -19825 9488 l p ef -19800 9500 m 19825 9500 l 19825 9504 l 19823 9509 l 19822 9512 l 19819 9516 l -19816 9519 l 19813 9522 l 19809 9523 l 19804 9525 l 19800 9525 l 19800 9525 l -19800 9500 l p ef -19800 9525 m 19761 9525 l 19761 9500 l 19761 9475 l 19800 9475 l 19800 9500 l -19800 9525 l p ef -19710 9525 m 19659 9525 l 19659 9475 l 19710 9475 l 19710 9525 l p ef -19608 9525 m 19557 9525 l 19557 9475 l 19608 9475 l 19608 9525 l p ef -19506 9525 m 19455 9525 l 19455 9475 l 19506 9475 l 19506 9525 l p ef -19404 9525 m 19353 9525 l 19353 9475 l 19404 9475 l 19404 9525 l p ef -19302 9525 m 19251 9525 l 19251 9475 l 19302 9475 l 19302 9525 l p ef -19200 9525 m 19149 9525 l 19149 9475 l 19200 9475 l 19200 9525 l p ef -19098 9525 m 19047 9525 l 19047 9475 l 19098 9475 l 19098 9525 l p ef -18996 9525 m 18945 9525 l 18945 9475 l 18996 9475 l 18996 9525 l p ef -18894 9525 m 18843 9525 l 18843 9475 l 18894 9475 l 18894 9525 l p ef -18792 9525 m 18741 9525 l 18741 9475 l 18792 9475 l 18792 9525 l p ef -18690 9525 m 18639 9525 l 18639 9475 l 18690 9475 l 18690 9525 l p ef -18588 9525 m 18537 9525 l 18537 9475 l 18588 9475 l 18588 9525 l p ef -18486 9525 m 18435 9525 l 18435 9475 l 18486 9475 l 18486 9525 l p ef -18384 9525 m 18333 9525 l 18333 9475 l 18384 9475 l 18384 9525 l p ef -18282 9525 m 18231 9525 l 18231 9475 l 18282 9475 l 18282 9525 l p ef -18180 9525 m 18129 9525 l 18129 9475 l 18180 9475 l 18180 9525 l p ef -18078 9525 m 18027 9525 l 18027 9475 l 18078 9475 l 18078 9525 l p ef -17976 9525 m 17925 9525 l 17925 9475 l 17976 9475 l 17976 9525 l p ef -17874 9525 m 17823 9525 l 17823 9475 l 17874 9475 l 17874 9525 l p ef -17772 9525 m 17721 9525 l 17721 9475 l 17772 9475 l 17772 9525 l p ef -17670 9525 m 17619 9525 l 17619 9475 l 17670 9475 l 17670 9525 l p ef -gs -gs -pum -15705 8974 t -49 0 m 49 -455 l 220 -455 l 251 -455 274 -454 290 -451 ct 312 -447 331 -440 346 -429 ct -361 -419 373 -404 382 -385 ct 391 -367 396 -346 396 -323 ct 396 -285 384 -252 359 -225 ct -334 -198 290 -185 226 -185 ct 109 -185 l 109 0 l 49 0 l p -109 -239 m 227 -239 l 266 -239 293 -246 309 -260 ct 326 -275 334 -295 334 -322 ct -334 -341 329 -357 320 -370 ct 310 -384 297 -393 282 -397 ct 271 -400 253 -401 225 -401 ct -109 -401 l 109 -239 l p ef -464 0 m 464 -330 l 514 -330 l 514 -280 l 527 -303 539 -318 550 -326 ct -561 -333 573 -337 586 -337 ct 605 -337 624 -331 643 -319 ct 624 -267 l 610 -275 597 -279 583 -279 ct -571 -279 560 -276 550 -268 ct 540 -261 533 -251 529 -238 ct 523 -218 520 -196 520 -173 ct -520 0 l 464 0 l p ef -902 -107 m 960 -99 l 951 -66 934 -40 909 -21 ct 885 -2 853 7 815 7 ct 767 7 729 -8 701 -37 ct -672 -67 658 -109 658 -162 ct 658 -218 673 -261 701 -291 ct 730 -322 767 -337 812 -337 ct -856 -337 892 -322 920 -292 ct 948 -262 962 -220 962 -166 ct 962 -163 962 -158 961 -151 ct -716 -151 l 718 -115 728 -87 747 -68 ct 765 -49 788 -39 815 -39 ct 836 -39 853 -44 868 -55 ct -882 -66 894 -83 902 -107 ct p -719 -197 m 903 -197 l 900 -225 893 -245 882 -259 ct 864 -280 841 -291 813 -291 ct -787 -291 765 -283 748 -265 ct 731 -248 721 -226 719 -197 ct p ef -1028 126 m 1028 -330 l 1079 -330 l 1079 -287 l 1091 -304 1104 -316 1119 -324 ct -1134 -333 1153 -337 1174 -337 ct 1202 -337 1227 -330 1249 -315 ct 1270 -301 1286 -280 1297 -254 ct -1308 -228 1314 -199 1314 -167 ct 1314 -134 1308 -103 1296 -77 ct 1284 -50 1266 -29 1243 -15 ct -1220 0 1196 7 1170 7 ct 1152 7 1135 3 1120 -5 ct 1105 -13 1093 -23 1084 -35 ct -1084 126 l 1028 126 l p -1078 -163 m 1078 -121 1087 -90 1104 -69 ct 1121 -49 1142 -39 1166 -39 ct 1191 -39 1213 -49 1230 -70 ct -1248 -91 1257 -124 1257 -168 ct 1257 -210 1248 -241 1231 -262 ct 1214 -283 1193 -293 1169 -293 ct -1145 -293 1124 -282 1106 -260 ct 1088 -238 1078 -205 1078 -163 ct p ef -1379 0 m 1379 -330 l 1429 -330 l 1429 -280 l 1442 -303 1454 -318 1465 -326 ct -1476 -333 1488 -337 1501 -337 ct 1520 -337 1539 -331 1558 -319 ct 1539 -267 l -1525 -275 1512 -279 1498 -279 ct 1486 -279 1475 -276 1465 -268 ct 1455 -261 1448 -251 1444 -238 ct -1438 -218 1435 -196 1435 -173 ct 1435 0 l 1379 0 l p ef -1570 -165 m 1570 -226 1587 -271 1621 -301 ct 1649 -325 1684 -337 1725 -337 ct -1770 -337 1807 -322 1835 -293 ct 1864 -263 1879 -222 1879 -170 ct 1879 -127 1872 -94 1860 -70 ct -1847 -45 1828 -27 1804 -13 ct 1780 0 1753 7 1725 7 ct 1678 7 1641 -8 1613 -37 ct -1584 -67 1570 -110 1570 -165 ct p -1627 -165 m 1627 -123 1637 -91 1655 -70 ct 1673 -49 1697 -39 1725 -39 ct 1752 -39 1775 -49 1794 -71 ct -1812 -92 1821 -124 1821 -167 ct 1821 -208 1812 -239 1793 -260 ct 1775 -281 1752 -291 1725 -291 ct -1697 -291 1673 -281 1655 -260 ct 1637 -239 1627 -207 1627 -165 ct p ef -2158 -121 m 2213 -114 l 2207 -76 2191 -46 2167 -25 ct 2142 -4 2112 7 2076 7 ct -2031 7 1994 -8 1967 -37 ct 1940 -67 1926 -109 1926 -164 ct 1926 -199 1932 -230 1943 -257 ct -1955 -284 1973 -304 1997 -317 ct 2021 -330 2048 -337 2076 -337 ct 2112 -337 2141 -328 2164 -310 ct -2186 -292 2201 -266 2207 -233 ct 2153 -224 l 2148 -247 2139 -263 2126 -274 ct -2113 -286 2097 -291 2078 -291 ct 2050 -291 2027 -281 2010 -261 ct 1992 -241 1983 -209 1983 -165 ct -1983 -121 1992 -89 2009 -69 ct 2026 -49 2048 -39 2075 -39 ct 2097 -39 2115 -46 2130 -59 ct -2145 -72 2154 -93 2158 -121 ct p ef -2485 -107 m 2543 -99 l 2534 -66 2517 -40 2492 -21 ct 2468 -2 2436 7 2398 7 ct -2350 7 2312 -8 2284 -37 ct 2255 -67 2241 -109 2241 -162 ct 2241 -218 2256 -261 2284 -291 ct -2313 -322 2350 -337 2395 -337 ct 2439 -337 2475 -322 2503 -292 ct 2531 -262 2545 -220 2545 -166 ct -2545 -163 2545 -158 2544 -151 ct 2299 -151 l 2301 -115 2311 -87 2330 -68 ct -2348 -49 2371 -39 2398 -39 ct 2419 -39 2436 -44 2451 -55 ct 2465 -66 2477 -83 2485 -107 ct -p -2302 -197 m 2486 -197 l 2483 -225 2476 -245 2465 -259 ct 2447 -280 2424 -291 2396 -291 ct -2370 -291 2348 -283 2331 -265 ct 2314 -248 2304 -226 2302 -197 ct p ef -2590 -99 m 2645 -107 l 2648 -85 2656 -68 2671 -57 ct 2685 -45 2705 -39 2730 -39 ct -2756 -39 2775 -44 2787 -55 ct 2799 -65 2806 -77 2806 -91 ct 2806 -104 2800 -114 2789 -121 ct -2782 -126 2763 -132 2732 -140 ct 2691 -150 2663 -159 2647 -167 ct 2631 -174 2619 -185 2611 -198 ct -2603 -211 2599 -226 2599 -242 ct 2599 -257 2602 -270 2609 -283 ct 2616 -295 2625 -306 2636 -314 ct -2645 -320 2657 -326 2672 -330 ct 2687 -335 2703 -337 2720 -337 ct 2746 -337 2769 -333 2788 -326 ct -2808 -318 2822 -308 2831 -296 ct 2841 -283 2847 -266 2851 -245 ct 2796 -237 l -2794 -254 2786 -267 2774 -277 ct 2763 -286 2746 -291 2724 -291 ct 2698 -291 2680 -287 2669 -278 ct -2658 -270 2653 -260 2653 -249 ct 2653 -241 2655 -235 2660 -229 ct 2664 -223 2671 -218 2681 -214 ct -2687 -212 2703 -207 2730 -200 ct 2770 -189 2797 -181 2813 -174 ct 2829 -167 2841 -158 2850 -145 ct -2859 -132 2863 -116 2863 -97 ct 2863 -79 2858 -61 2847 -45 ct 2836 -28 2820 -15 2800 -6 ct -2779 3 2756 7 2730 7 ct 2688 7 2655 -2 2632 -20 ct 2610 -37 2596 -64 2590 -99 ct -p ef -2907 -99 m 2962 -107 l 2965 -85 2973 -68 2988 -57 ct 3002 -45 3022 -39 3047 -39 ct -3073 -39 3092 -44 3104 -55 ct 3116 -65 3123 -77 3123 -91 ct 3123 -104 3117 -114 3106 -121 ct -3099 -126 3080 -132 3049 -140 ct 3008 -150 2980 -159 2964 -167 ct 2948 -174 2936 -185 2928 -198 ct -2920 -211 2916 -226 2916 -242 ct 2916 -257 2919 -270 2926 -283 ct 2933 -295 2942 -306 2953 -314 ct -2962 -320 2974 -326 2989 -330 ct 3004 -335 3020 -337 3037 -337 ct 3063 -337 3086 -333 3105 -326 ct -3125 -318 3139 -308 3148 -296 ct 3158 -283 3164 -266 3168 -245 ct 3113 -237 l -3111 -254 3103 -267 3091 -277 ct 3080 -286 3063 -291 3041 -291 ct 3015 -291 2997 -287 2986 -278 ct -2975 -270 2970 -260 2970 -249 ct 2970 -241 2972 -235 2977 -229 ct 2981 -223 2988 -218 2998 -214 ct -3004 -212 3020 -207 3047 -200 ct 3087 -189 3114 -181 3130 -174 ct 3146 -167 3158 -158 3167 -145 ct -3176 -132 3180 -116 3180 -97 ct 3180 -79 3175 -61 3164 -45 ct 3153 -28 3137 -15 3117 -6 ct -3096 3 3073 7 3047 7 ct 3005 7 2972 -2 2949 -20 ct 2927 -37 2913 -64 2907 -99 ct -p ef -3226 -165 m 3226 -226 3243 -271 3277 -301 ct 3305 -325 3340 -337 3381 -337 ct -3426 -337 3463 -322 3491 -293 ct 3520 -263 3535 -222 3535 -170 ct 3535 -127 3528 -94 3516 -70 ct -3503 -45 3484 -27 3460 -13 ct 3436 0 3409 7 3381 7 ct 3334 7 3297 -8 3269 -37 ct -3240 -67 3226 -110 3226 -165 ct p -3283 -165 m 3283 -123 3293 -91 3311 -70 ct 3329 -49 3353 -39 3381 -39 ct 3408 -39 3431 -49 3450 -71 ct -3468 -92 3477 -124 3477 -167 ct 3477 -208 3468 -239 3449 -260 ct 3431 -281 3408 -291 3381 -291 ct -3353 -291 3329 -281 3311 -260 ct 3293 -239 3283 -207 3283 -165 ct p ef -3597 0 m 3597 -330 l 3647 -330 l 3647 -280 l 3660 -303 3672 -318 3683 -326 ct -3694 -333 3706 -337 3719 -337 ct 3738 -337 3757 -331 3776 -319 ct 3757 -267 l -3743 -275 3730 -279 3716 -279 ct 3704 -279 3693 -276 3683 -268 ct 3673 -261 3666 -251 3662 -238 ct -3656 -218 3653 -196 3653 -173 ct 3653 0 l 3597 0 l p ef -pom -gr -gr -4400 13500 m 2900 13500 l 2900 12000 l 5900 12000 l 5900 13500 l 4400 13500 l -pc -gs -gs -pum -3122 12970 t -49 0 m 49 -455 l 220 -455 l 251 -455 274 -454 290 -451 ct 312 -447 331 -440 346 -429 ct -361 -419 373 -404 382 -385 ct 391 -367 396 -346 396 -323 ct 396 -285 384 -252 359 -225 ct -334 -198 290 -185 226 -185 ct 109 -185 l 109 0 l 49 0 l p -109 -239 m 227 -239 l 266 -239 293 -246 309 -260 ct 326 -275 334 -295 334 -322 ct -334 -341 329 -357 320 -370 ct 310 -384 297 -393 282 -397 ct 271 -400 253 -401 225 -401 ct -109 -401 l 109 -239 l p ef -464 0 m 464 -455 l 519 -455 l 519 0 l 464 0 l p ef -820 -41 m 799 -24 779 -11 760 -4 ct 741 3 720 7 699 7 ct 662 7 635 -2 615 -20 ct -596 -37 586 -60 586 -87 ct 586 -103 590 -118 597 -131 ct 604 -145 614 -156 626 -164 ct -638 -172 651 -178 666 -182 ct 677 -185 693 -188 716 -190 ct 761 -196 794 -202 815 -209 ct -815 -217 815 -222 815 -224 ct 815 -247 810 -263 800 -272 ct 785 -285 764 -291 736 -291 ct -710 -291 690 -286 678 -277 ct 665 -268 656 -252 650 -228 ct 596 -236 l 601 -259 609 -278 620 -292 ct -631 -307 648 -318 669 -326 ct 691 -333 716 -337 744 -337 ct 772 -337 795 -334 813 -327 ct -830 -321 843 -312 851 -302 ct 860 -292 865 -280 869 -264 ct 871 -255 872 -238 872 -213 ct -872 -138 l 872 -87 873 -54 875 -40 ct 877 -26 882 -13 889 0 ct 831 0 l 825 -12 821 -26 820 -41 ct -p -815 -166 m 795 -157 764 -150 724 -145 ct 701 -141 685 -138 675 -133 ct 666 -129 658 -123 653 -115 ct -648 -107 645 -99 645 -89 ct 645 -74 651 -62 662 -52 ct 674 -42 690 -37 712 -37 ct -733 -37 752 -41 769 -51 ct 786 -60 798 -73 806 -89 ct 812 -102 815 -121 815 -145 ct -815 -166 l p ef -953 127 m 947 75 l 959 78 970 80 979 80 ct 992 80 1001 78 1009 73 ct 1016 69 1022 64 1027 56 ct -1031 51 1036 37 1044 15 ct 1045 11 1047 7 1049 1 ct 924 -330 l 984 -330 l 1053 -139 l -1062 -114 1070 -89 1077 -62 ct 1083 -88 1091 -113 1100 -137 ct 1170 -330 l 1226 -330 l -1101 6 l 1087 42 1077 67 1069 81 ct 1059 99 1048 113 1035 121 ct 1022 130 1007 134 989 134 ct -979 134 967 132 953 127 ct p ef -1316 0 m 1265 0 l 1265 -455 l 1320 -455 l 1320 -293 l 1344 -322 1374 -337 1411 -337 ct -1431 -337 1450 -333 1468 -325 ct 1486 -317 1501 -305 1513 -290 ct 1524 -276 1534 -258 1540 -237 ct -1547 -216 1550 -194 1550 -170 ct 1550 -114 1536 -70 1508 -39 ct 1480 -8 1447 7 1408 7 ct -1369 7 1338 -9 1316 -42 ct 1316 0 l p -1316 -167 m 1316 -128 1321 -100 1332 -82 ct 1349 -53 1373 -39 1403 -39 ct 1428 -39 1449 -50 1466 -71 ct -1484 -92 1493 -123 1493 -165 ct 1493 -208 1485 -240 1467 -260 ct 1450 -281 1430 -291 1406 -291 ct -1381 -291 1360 -281 1342 -259 ct 1325 -238 1316 -208 1316 -167 ct p ef -1832 -41 m 1811 -24 1791 -11 1772 -4 ct 1753 3 1732 7 1711 7 ct 1674 7 1647 -2 1627 -20 ct -1608 -37 1598 -60 1598 -87 ct 1598 -103 1602 -118 1609 -131 ct 1616 -145 1626 -156 1638 -164 ct -1650 -172 1663 -178 1678 -182 ct 1689 -185 1705 -188 1728 -190 ct 1773 -196 1806 -202 1827 -209 ct -1827 -217 1827 -222 1827 -224 ct 1827 -247 1822 -263 1812 -272 ct 1797 -285 1776 -291 1748 -291 ct -1722 -291 1702 -286 1690 -277 ct 1677 -268 1668 -252 1662 -228 ct 1608 -236 l -1613 -259 1621 -278 1632 -292 ct 1643 -307 1660 -318 1681 -326 ct 1703 -333 1728 -337 1756 -337 ct -1784 -337 1807 -334 1825 -327 ct 1842 -321 1855 -312 1863 -302 ct 1872 -292 1877 -280 1881 -264 ct -1883 -255 1884 -238 1884 -213 ct 1884 -138 l 1884 -87 1885 -54 1887 -40 ct -1889 -26 1894 -13 1901 0 ct 1843 0 l 1837 -12 1833 -26 1832 -41 ct p -1827 -166 m 1807 -157 1776 -150 1736 -145 ct 1713 -141 1697 -138 1687 -133 ct -1678 -129 1670 -123 1665 -115 ct 1660 -107 1657 -99 1657 -89 ct 1657 -74 1663 -62 1674 -52 ct -1686 -42 1702 -37 1724 -37 ct 1745 -37 1764 -41 1781 -51 ct 1798 -60 1810 -73 1818 -89 ct -1824 -102 1827 -121 1827 -145 ct 1827 -166 l p ef -2183 -121 m 2238 -114 l 2232 -76 2216 -46 2192 -25 ct 2167 -4 2137 7 2101 7 ct -2056 7 2019 -8 1992 -37 ct 1965 -67 1951 -109 1951 -164 ct 1951 -199 1957 -230 1968 -257 ct -1980 -284 1998 -304 2022 -317 ct 2046 -330 2073 -337 2101 -337 ct 2137 -337 2166 -328 2189 -310 ct -2211 -292 2226 -266 2232 -233 ct 2178 -224 l 2173 -247 2164 -263 2151 -274 ct -2138 -286 2122 -291 2103 -291 ct 2075 -291 2052 -281 2035 -261 ct 2017 -241 2008 -209 2008 -165 ct -2008 -121 2017 -89 2034 -69 ct 2051 -49 2073 -39 2100 -39 ct 2122 -39 2140 -46 2155 -59 ct -2170 -72 2179 -93 2183 -121 ct p ef -2286 0 m 2286 -455 l 2342 -455 l 2342 -196 l 2474 -330 l 2546 -330 l -2420 -207 l 2559 0 l 2490 0 l 2381 -169 l 2342 -131 l 2342 0 l 2286 0 l -p ef -pom -gr -gr -22600 9500 m 21100 9500 l 21100 8000 l 24100 8000 l 24100 9500 l 22600 9500 l -pc -gs -gs -pum -21425 8974 t -50 0 m 50 -455 l 379 -455 l 379 -401 l 110 -401 l 110 -262 l 362 -262 l -362 -209 l 110 -209 l 110 -54 l 389 -54 l 389 0 l 50 0 l p ef -465 0 m 465 -330 l 515 -330 l 515 -283 l 539 -319 574 -337 620 -337 ct -640 -337 658 -333 675 -326 ct 691 -319 704 -310 712 -298 ct 720 -287 726 -273 729 -257 ct -731 -247 732 -229 732 -203 ct 732 0 l 677 0 l 677 -200 l 677 -223 674 -240 670 -252 ct -666 -263 658 -272 647 -279 ct 636 -285 623 -289 608 -289 ct 584 -289 564 -281 547 -266 ct -529 -251 521 -222 521 -180 ct 521 0 l 465 0 l p ef -1032 -121 m 1087 -114 l 1081 -76 1065 -46 1041 -25 ct 1016 -4 986 7 950 7 ct -905 7 868 -8 841 -37 ct 814 -67 800 -109 800 -164 ct 800 -199 806 -230 817 -257 ct -829 -284 847 -304 871 -317 ct 895 -330 922 -337 950 -337 ct 986 -337 1015 -328 1038 -310 ct -1060 -292 1075 -266 1081 -233 ct 1027 -224 l 1022 -247 1013 -263 1000 -274 ct -987 -286 971 -291 952 -291 ct 924 -291 901 -281 884 -261 ct 866 -241 857 -209 857 -165 ct -857 -121 866 -89 883 -69 ct 900 -49 922 -39 949 -39 ct 971 -39 989 -46 1004 -59 ct -1019 -72 1028 -93 1032 -121 ct p ef -1113 -165 m 1113 -226 1130 -271 1164 -301 ct 1192 -325 1227 -337 1268 -337 ct -1313 -337 1350 -322 1378 -293 ct 1407 -263 1422 -222 1422 -170 ct 1422 -127 1415 -94 1403 -70 ct -1390 -45 1371 -27 1347 -13 ct 1323 0 1296 7 1268 7 ct 1221 7 1184 -8 1156 -37 ct -1127 -67 1113 -110 1113 -165 ct p -1170 -165 m 1170 -123 1180 -91 1198 -70 ct 1216 -49 1240 -39 1268 -39 ct 1295 -39 1318 -49 1337 -71 ct -1355 -92 1364 -124 1364 -167 ct 1364 -208 1355 -239 1336 -260 ct 1318 -281 1295 -291 1268 -291 ct -1240 -291 1216 -281 1198 -260 ct 1180 -239 1170 -207 1170 -165 ct p ef -1699 0 m 1699 -42 l 1679 -9 1648 7 1607 7 ct 1581 7 1557 0 1535 -15 ct 1513 -29 1496 -49 1484 -75 ct -1472 -101 1466 -131 1466 -165 ct 1466 -198 1471 -228 1482 -254 ct 1493 -281 1510 -302 1531 -316 ct -1553 -330 1578 -337 1605 -337 ct 1625 -337 1642 -333 1658 -325 ct 1673 -316 1686 -305 1696 -292 ct -1696 -455 l 1751 -455 l 1751 0 l 1699 0 l p -1523 -165 m 1523 -123 1532 -91 1550 -70 ct 1568 -49 1588 -39 1613 -39 ct 1637 -39 1658 -49 1675 -69 ct -1692 -89 1700 -119 1700 -160 ct 1700 -205 1692 -238 1674 -259 ct 1657 -280 1636 -291 1610 -291 ct -1585 -291 1565 -281 1548 -261 ct 1531 -240 1523 -208 1523 -165 ct p ef -2062 -107 m 2120 -99 l 2111 -66 2094 -40 2069 -21 ct 2045 -2 2013 7 1975 7 ct -1927 7 1889 -8 1861 -37 ct 1832 -67 1818 -109 1818 -162 ct 1818 -218 1833 -261 1861 -291 ct -1890 -322 1927 -337 1972 -337 ct 2016 -337 2052 -322 2080 -292 ct 2108 -262 2122 -220 2122 -166 ct -2122 -163 2122 -158 2121 -151 ct 1876 -151 l 1878 -115 1888 -87 1907 -68 ct -1925 -49 1948 -39 1975 -39 ct 1996 -39 2013 -44 2028 -55 ct 2042 -66 2054 -83 2062 -107 ct -p -1879 -197 m 2063 -197 l 2060 -225 2053 -245 2042 -259 ct 2024 -280 2001 -291 1973 -291 ct -1947 -291 1925 -283 1908 -265 ct 1891 -248 1881 -226 1879 -197 ct p ef -2187 0 m 2187 -330 l 2237 -330 l 2237 -280 l 2250 -303 2262 -318 2273 -326 ct -2284 -333 2296 -337 2309 -337 ct 2328 -337 2347 -331 2366 -319 ct 2347 -267 l -2333 -275 2320 -279 2306 -279 ct 2294 -279 2283 -276 2273 -268 ct 2263 -261 2256 -251 2252 -238 ct -2246 -218 2243 -196 2243 -173 ct 2243 0 l 2187 0 l p ef -pom -gr -gr -17400 13500 m 15900 13500 l 15900 12000 l 18900 12000 l 18900 13500 l -17400 13500 l pc -gs -gs -pum -16195 12970 t -49 0 m 49 -455 l 206 -455 l 241 -455 268 -453 287 -448 ct 313 -442 335 -432 353 -416 ct -377 -396 395 -370 407 -338 ct 419 -307 425 -271 425 -230 ct 425 -195 421 -165 413 -138 ct -405 -111 394 -89 382 -72 ct 369 -54 355 -41 340 -31 ct 325 -21 307 -13 286 -8 ct -265 -3 241 0 213 0 ct 49 0 l p -109 -54 m 206 -54 l 236 -54 260 -56 277 -62 ct 294 -68 307 -76 318 -86 ct -332 -100 343 -119 351 -143 ct 359 -167 363 -197 363 -231 ct 363 -279 355 -315 339 -341 ct -324 -366 305 -383 282 -392 ct 266 -398 240 -401 205 -401 ct 109 -401 l 109 -54 l -p ef -724 -107 m 782 -99 l 773 -66 756 -40 731 -21 ct 707 -2 675 7 637 7 ct 589 7 551 -8 523 -37 ct -494 -67 480 -109 480 -162 ct 480 -218 495 -261 523 -291 ct 552 -322 589 -337 634 -337 ct -678 -337 714 -322 742 -292 ct 770 -262 784 -220 784 -166 ct 784 -163 784 -158 783 -151 ct -538 -151 l 540 -115 550 -87 569 -68 ct 587 -49 610 -39 637 -39 ct 658 -39 675 -44 690 -55 ct -704 -66 716 -83 724 -107 ct p -541 -197 m 725 -197 l 722 -225 715 -245 704 -259 ct 686 -280 663 -291 635 -291 ct -609 -291 587 -283 570 -265 ct 553 -248 543 -226 541 -197 ct p ef -1066 -121 m 1121 -114 l 1115 -76 1099 -46 1075 -25 ct 1050 -4 1020 7 984 7 ct -939 7 902 -8 875 -37 ct 848 -67 834 -109 834 -164 ct 834 -199 840 -230 851 -257 ct -863 -284 881 -304 905 -317 ct 929 -330 956 -337 984 -337 ct 1020 -337 1049 -328 1072 -310 ct -1094 -292 1109 -266 1115 -233 ct 1061 -224 l 1056 -247 1047 -263 1034 -274 ct -1021 -286 1005 -291 986 -291 ct 958 -291 935 -281 918 -261 ct 900 -241 891 -209 891 -165 ct -891 -121 900 -89 917 -69 ct 934 -49 956 -39 983 -39 ct 1005 -39 1023 -46 1038 -59 ct -1053 -72 1062 -93 1066 -121 ct p ef -1147 -165 m 1147 -226 1164 -271 1198 -301 ct 1226 -325 1261 -337 1302 -337 ct -1347 -337 1384 -322 1412 -293 ct 1441 -263 1456 -222 1456 -170 ct 1456 -127 1449 -94 1437 -70 ct -1424 -45 1405 -27 1381 -13 ct 1357 0 1330 7 1302 7 ct 1255 7 1218 -8 1190 -37 ct -1161 -67 1147 -110 1147 -165 ct p -1204 -165 m 1204 -123 1214 -91 1232 -70 ct 1250 -49 1274 -39 1302 -39 ct 1329 -39 1352 -49 1371 -71 ct -1389 -92 1398 -124 1398 -167 ct 1398 -208 1389 -239 1370 -260 ct 1352 -281 1329 -291 1302 -291 ct -1274 -291 1250 -281 1232 -260 ct 1214 -239 1204 -207 1204 -165 ct p ef -1732 0 m 1732 -42 l 1712 -9 1681 7 1640 7 ct 1614 7 1590 0 1568 -15 ct 1546 -29 1529 -49 1517 -75 ct -1505 -101 1499 -131 1499 -165 ct 1499 -198 1504 -228 1515 -254 ct 1526 -281 1543 -302 1564 -316 ct -1586 -330 1611 -337 1638 -337 ct 1658 -337 1675 -333 1691 -325 ct 1706 -316 1719 -305 1729 -292 ct -1729 -455 l 1784 -455 l 1784 0 l 1732 0 l p -1556 -165 m 1556 -123 1565 -91 1583 -70 ct 1601 -49 1621 -39 1646 -39 ct 1670 -39 1691 -49 1708 -69 ct -1725 -89 1733 -119 1733 -160 ct 1733 -205 1725 -238 1707 -259 ct 1690 -280 1669 -291 1643 -291 ct -1618 -291 1598 -281 1581 -261 ct 1564 -240 1556 -208 1556 -165 ct p ef -2096 -107 m 2154 -99 l 2145 -66 2128 -40 2103 -21 ct 2079 -2 2047 7 2009 7 ct -1961 7 1923 -8 1895 -37 ct 1866 -67 1852 -109 1852 -162 ct 1852 -218 1867 -261 1895 -291 ct -1924 -322 1961 -337 2006 -337 ct 2050 -337 2086 -322 2114 -292 ct 2142 -262 2156 -220 2156 -166 ct -2156 -163 2156 -158 2155 -151 ct 1910 -151 l 1912 -115 1922 -87 1941 -68 ct -1959 -49 1982 -39 2009 -39 ct 2030 -39 2047 -44 2062 -55 ct 2076 -66 2088 -83 2096 -107 ct -p -1913 -197 m 2097 -197 l 2094 -225 2087 -245 2076 -259 ct 2058 -280 2035 -291 2007 -291 ct -1981 -291 1959 -283 1942 -265 ct 1925 -248 1915 -226 1913 -197 ct p ef -2221 0 m 2221 -330 l 2271 -330 l 2271 -280 l 2284 -303 2296 -318 2307 -326 ct -2318 -333 2330 -337 2343 -337 ct 2362 -337 2381 -331 2400 -319 ct 2381 -267 l -2367 -275 2354 -279 2340 -279 ct 2328 -279 2317 -276 2307 -268 ct 2297 -261 2290 -251 2286 -238 ct -2280 -218 2277 -196 2277 -173 ct 2277 0 l 2221 0 l p ef -pom -gr -gr -22600 13500 m 21100 13500 l 21100 12000 l 24100 12000 l 24100 13500 l -22600 13500 l pc -gs -gs -pum -21916 12626 t -18 -129 m 73 -136 l 74 -102 81 -78 92 -65 ct 104 -52 120 -46 140 -46 ct 155 -46 168 -49 179 -56 ct -190 -63 198 -72 202 -84 ct 206 -96 208 -115 208 -141 ct 208 -455 l 268 -455 l -268 -145 l 268 -107 264 -77 254 -56 ct 245 -35 231 -19 211 -8 ct 191 3 167 8 140 8 ct -101 8 70 -3 49 -26 ct 28 -49 17 -84 18 -129 ct p ef -360 -391 m 360 -455 l 416 -455 l 416 -391 l 360 -391 l p -360 0 m 360 -330 l 416 -330 l 416 0 l 360 0 l p ef -621 -50 m 629 -1 l 613 2 599 4 587 4 ct 566 4 551 1 539 -6 ct 528 -12 520 -20 516 -31 ct -511 -41 509 -63 509 -97 ct 509 -287 l 468 -287 l 468 -330 l 509 -330 l -509 -412 l 565 -445 l 565 -330 l 621 -330 l 621 -287 l 565 -287 l -565 -94 l 565 -78 566 -68 568 -63 ct 570 -58 573 -55 577 -52 ct 582 -49 588 -48 596 -48 ct -602 -48 611 -49 621 -50 ct p ef -799 -50 m 807 -1 l 791 2 777 4 765 4 ct 744 4 729 1 717 -6 ct 706 -12 698 -20 694 -31 ct -689 -41 687 -63 687 -97 ct 687 -287 l 646 -287 l 646 -330 l 687 -330 l -687 -412 l 743 -445 l 743 -330 l 799 -330 l 799 -287 l 743 -287 l -743 -94 l 743 -78 744 -68 746 -63 ct 748 -58 751 -55 755 -52 ct 760 -49 766 -48 774 -48 ct -780 -48 789 -49 799 -50 ct p ef -1080 -107 m 1138 -99 l 1129 -66 1112 -40 1087 -21 ct 1063 -2 1031 7 993 7 ct -945 7 907 -8 879 -37 ct 850 -67 836 -109 836 -162 ct 836 -218 851 -261 879 -291 ct -908 -322 945 -337 990 -337 ct 1034 -337 1070 -322 1098 -292 ct 1126 -262 1140 -220 1140 -166 ct -1140 -163 1140 -158 1139 -151 ct 894 -151 l 896 -115 906 -87 925 -68 ct 943 -49 966 -39 993 -39 ct -1014 -39 1031 -44 1046 -55 ct 1060 -66 1072 -83 1080 -107 ct p -897 -197 m 1081 -197 l 1078 -225 1071 -245 1060 -259 ct 1042 -280 1019 -291 991 -291 ct -965 -291 943 -283 926 -265 ct 909 -248 899 -226 897 -197 ct p ef -1205 0 m 1205 -330 l 1255 -330 l 1255 -280 l 1268 -303 1280 -318 1291 -326 ct -1302 -333 1314 -337 1327 -337 ct 1346 -337 1365 -331 1384 -319 ct 1365 -267 l -1351 -275 1338 -279 1324 -279 ct 1312 -279 1301 -276 1291 -268 ct 1281 -261 1274 -251 1270 -238 ct -1264 -218 1261 -196 1261 -173 ct 1261 0 l 1205 0 l p ef -pom -gr -gs -pum -21764 13337 t -47 0 m 47 -455 l 217 -455 l 252 -455 280 -450 301 -441 ct 322 -432 338 -418 350 -399 ct -362 -380 368 -359 368 -339 ct 368 -319 362 -301 352 -284 ct 341 -266 325 -253 304 -242 ct -332 -234 353 -220 368 -201 ct 382 -181 390 -158 390 -132 ct 390 -111 385 -91 376 -72 ct -367 -54 356 -40 343 -30 ct 330 -20 313 -13 293 -8 ct 273 -3 249 0 220 0 ct 47 0 l -p -107 -264 m 205 -264 l 232 -264 251 -265 262 -269 ct 278 -274 289 -281 297 -292 ct -305 -302 309 -315 309 -331 ct 309 -347 305 -360 298 -371 ct 290 -383 280 -391 267 -395 ct -253 -399 230 -401 198 -401 ct 107 -401 l 107 -264 l p -107 -54 m 220 -54 l 239 -54 253 -54 261 -56 ct 275 -58 286 -62 295 -68 ct -305 -74 312 -82 318 -94 ct 324 -105 327 -117 327 -132 ct 327 -149 323 -164 314 -176 ct -306 -189 294 -197 278 -202 ct 263 -207 241 -210 212 -210 ct 107 -210 l 107 -54 l -p ef -681 0 m 681 -49 l 655 -12 620 7 576 7 ct 557 7 539 3 522 -4 ct 505 -12 492 -21 484 -32 ct -476 -44 470 -57 467 -74 ct 465 -85 464 -102 464 -126 ct 464 -330 l 519 -330 l -519 -147 l 519 -118 521 -98 523 -88 ct 526 -74 534 -62 545 -54 ct 557 -45 571 -41 587 -41 ct -604 -41 620 -45 634 -54 ct 649 -63 660 -74 666 -89 ct 672 -104 675 -125 675 -153 ct -675 -330 l 731 -330 l 731 0 l 681 0 l p ef -830 0 m 830 -286 l 781 -286 l 781 -329 l 830 -329 l 830 -364 l 830 -387 832 -403 836 -414 ct -841 -428 851 -440 864 -449 ct 878 -458 897 -462 921 -462 ct 937 -462 954 -460 973 -457 ct -965 -408 l 953 -410 943 -411 932 -411 ct 915 -411 903 -407 896 -400 ct 889 -393 886 -379 886 -360 ct -886 -329 l 950 -329 l 950 -286 l 886 -286 l 886 0 l 830 0 l p ef -995 0 m 995 -286 l 946 -286 l 946 -329 l 995 -329 l 995 -364 l 995 -387 997 -403 1001 -414 ct -1006 -428 1016 -440 1029 -449 ct 1043 -458 1062 -462 1086 -462 ct 1102 -462 1119 -460 1138 -457 ct -1130 -408 l 1118 -410 1108 -411 1097 -411 ct 1080 -411 1068 -407 1061 -400 ct -1054 -393 1051 -379 1051 -360 ct 1051 -329 l 1115 -329 l 1115 -286 l 1051 -286 l -1051 0 l 995 0 l p ef -1385 -107 m 1443 -99 l 1434 -66 1417 -40 1392 -21 ct 1368 -2 1336 7 1298 7 ct -1250 7 1212 -8 1184 -37 ct 1155 -67 1141 -109 1141 -162 ct 1141 -218 1156 -261 1184 -291 ct -1213 -322 1250 -337 1295 -337 ct 1339 -337 1375 -322 1403 -292 ct 1431 -262 1445 -220 1445 -166 ct -1445 -163 1445 -158 1444 -151 ct 1199 -151 l 1201 -115 1211 -87 1230 -68 ct -1248 -49 1271 -39 1298 -39 ct 1319 -39 1336 -44 1351 -55 ct 1365 -66 1377 -83 1385 -107 ct -p -1202 -197 m 1386 -197 l 1383 -225 1376 -245 1365 -259 ct 1347 -280 1324 -291 1296 -291 ct -1270 -291 1248 -283 1231 -265 ct 1214 -248 1204 -226 1202 -197 ct p ef -1510 0 m 1510 -330 l 1560 -330 l 1560 -280 l 1573 -303 1585 -318 1596 -326 ct -1607 -333 1619 -337 1632 -337 ct 1651 -337 1670 -331 1689 -319 ct 1670 -267 l -1656 -275 1643 -279 1629 -279 ct 1617 -279 1606 -276 1596 -268 ct 1586 -261 1579 -251 1575 -238 ct -1569 -218 1566 -196 1566 -173 ct 1566 0 l 1510 0 l p ef -pom -gr -gr -7100 8750 m 6538 8938 l 6538 8563 l 7100 8750 l p ef -5900 8725 m 6650 8725 l 6650 8775 l 5900 8775 l 5900 8725 l p ef -15400 8750 m 14838 8938 l 14838 8563 l 15400 8750 l p ef -14300 8725 m 14950 8725 l 14950 8775 l 14300 8775 l 14300 8725 l p ef -21100 8750 m 20538 8938 l 20538 8563 l 21100 8750 l p ef -19800 8725 m 20650 8725 l 20650 8775 l 19800 8775 l 19800 8725 l p ef -10500 12750 m 11063 12563 l 11063 12938 l 10500 12750 l p ef -15900 12775 m 10950 12775 l 10950 12725 l 15900 12725 l 15900 12775 l -p ef -18900 12750 m 19463 12563 l 19463 12938 l 18900 12750 l p ef -21100 12775 m 19350 12775 l 19350 12725 l 21100 12725 l 21100 12775 l -p ef -12850 9500 m 13038 10063 l 12663 10063 l 12850 9500 l p ef -15900 12775 m 12850 12775 l 12850 12750 l 12850 12725 l 15900 12725 l -15900 12750 l 15900 12775 l p ef -12850 12750 m 12850 12775 l 12846 12775 l 12841 12773 l 12838 12772 l -12834 12769 l 12831 12766 l 12828 12763 l 12827 12759 l 12825 12754 l -12825 12750 l 12825 12750 l 12850 12750 l p ef -12825 12750 m 12825 9950 l 12850 9950 l 12875 9950 l 12875 12750 l -12850 12750 l 12825 12750 l p ef -1225 13350 m 1000 13350 l 1000 12150 l 1450 12150 l 1450 13350 l 1225 13350 l -pc -500 14050 m 500 11549 l 1001 12175 l 1001 13425 l 500 14050 l pc -1450 12750 m 2013 12563 l 2013 12938 l 1450 12750 l p ef -2900 12775 m 1900 12775 l 1900 12725 l 2900 12725 l 2900 12775 l p ef -24100 12750 m 24663 12563 l 24663 12938 l 24100 12750 l p ef -25100 12775 m 24550 12775 l 24550 12725 l 25100 12725 l 25100 12775 l -p ef -25100 8750 m 24538 8938 l 24538 8563 l 25100 8750 l p ef -24100 8725 m 24650 8725 l 24650 8775 l 24100 8775 l 24100 8725 l p ef -1000 9250 m 724 9250 500 9026 500 8750 ct 500 8474 724 8250 1000 8250 ct 1276 8250 1500 8474 1500 8750 ct -1500 9026 1276 9250 1000 9250 ct pc -500 8250 m 500 9250 l ps -2900 8750 m 2338 8938 l 2338 8563 l 2900 8750 l p ef -1500 8724 m 2200 8724 l 2200 8749 l 2200 8774 l 1500 8774 l 1500 8749 l -1500 8724 l p ef -2200 8749 m 2200 8724 l 2204 8724 l 2209 8726 l 2212 8727 l 2216 8730 l -2219 8733 l 2222 8736 l 2223 8740 l 2225 8745 l 2225 8749 l 2225 8749 l -2200 8749 l p ef -2225 8749 m 2225 8750 l 2200 8750 l 2175 8750 l 2175 8749 l 2200 8749 l -2225 8749 l p ef -2200 8750 m 2200 8775 l 2196 8775 l 2191 8773 l 2188 8772 l 2184 8769 l -2181 8766 l 2178 8763 l 2177 8759 l 2175 8754 l 2175 8750 l 2175 8750 l -2200 8750 l p ef -2200 8725 m 2450 8725 l 2450 8750 l 2450 8775 l 2200 8775 l 2200 8750 l -2200 8725 l p ef -4400 9500 m 4588 10063 l 4213 10063 l 4400 9500 l p ef -4400 12000 m 4213 11438 l 4588 11438 l 4400 12000 l p ef -4425 9950 m 4425 11550 l 4375 11550 l 4375 9950 l 4425 9950 l p ef -8698 9525 m 8647 9525 l 8647 9475 l 8698 9475 l 8698 9525 l p ef -8596 9525 m 8545 9525 l 8545 9475 l 8596 9475 l 8596 9525 l p ef -8494 9525 m 8443 9525 l 8443 9475 l 8494 9475 l 8494 9525 l p ef -8392 9525 m 8341 9525 l 8341 9475 l 8392 9475 l 8392 9525 l p ef -8290 9525 m 8239 9525 l 8239 9475 l 8290 9475 l 8290 9525 l p ef -8188 9525 m 8137 9525 l 8137 9475 l 8188 9475 l 8188 9525 l p ef -8086 9525 m 8035 9525 l 8035 9475 l 8086 9475 l 8086 9525 l p ef -7984 9525 m 7933 9525 l 7933 9475 l 7984 9475 l 7984 9525 l p ef -7882 9525 m 7831 9525 l 7831 9475 l 7882 9475 l 7882 9525 l p ef -7780 9525 m 7729 9525 l 7729 9475 l 7780 9475 l 7780 9525 l p ef -7678 9525 m 7627 9525 l 7627 9475 l 7678 9475 l 7678 9525 l p ef -7576 9525 m 7525 9525 l 7525 9475 l 7576 9475 l 7576 9525 l p ef -7474 9525 m 7423 9525 l 7423 9475 l 7474 9475 l 7474 9525 l p ef -7372 9525 m 7321 9525 l 7321 9475 l 7372 9475 l 7372 9525 l p ef -7270 9525 m 7219 9525 l 7219 9475 l 7270 9475 l 7270 9525 l p ef -7168 9525 m 7117 9525 l 7117 9475 l 7168 9475 l 7168 9525 l p ef -7075 9466 m 7075 9415 l 7125 9415 l 7125 9466 l 7075 9466 l p ef -7075 9364 m 7075 9313 l 7125 9313 l 7125 9364 l 7075 9364 l p ef -7075 9262 m 7075 9211 l 7125 9211 l 7125 9262 l 7075 9262 l p ef -7075 9160 m 7075 9109 l 7125 9109 l 7125 9160 l 7075 9160 l p ef -7075 9058 m 7075 9007 l 7125 9007 l 7125 9058 l 7075 9058 l p ef -7075 8956 m 7075 8905 l 7125 8905 l 7125 8956 l 7075 8956 l p ef -7075 8854 m 7075 8803 l 7125 8803 l 7125 8854 l 7075 8854 l p ef -7075 8752 m 7075 8701 l 7125 8701 l 7125 8752 l 7075 8752 l p ef -7075 8650 m 7075 8599 l 7125 8599 l 7125 8650 l 7075 8650 l p ef -7075 8548 m 7075 8497 l 7125 8497 l 7125 8548 l 7075 8548 l p ef -7075 8446 m 7075 8395 l 7125 8395 l 7125 8446 l 7075 8446 l p ef -7075 8344 m 7075 8293 l 7125 8293 l 7125 8344 l 7075 8344 l p ef -7075 8242 m 7075 8191 l 7125 8191 l 7125 8242 l 7075 8242 l p ef -7075 8140 m 7075 8089 l 7125 8089 l 7125 8140 l 7075 8140 l p ef -7075 8038 m 7075 8000 l 7100 8000 l 7125 8000 l 7125 8038 l 7100 8038 l -7075 8038 l p ef -7100 8000 m 7075 8000 l 7075 7996 l 7077 7991 l 7078 7988 l 7081 7984 l -7084 7981 l 7087 7978 l 7091 7977 l 7096 7975 l 7100 7975 l 7100 7975 l -7100 8000 l p ef -7100 7975 m 7113 7975 l 7113 8000 l 7113 8025 l 7100 8025 l 7100 8000 l -7100 7975 l p ef -7164 7975 m 7215 7975 l 7215 8025 l 7164 8025 l 7164 7975 l p ef -7266 7975 m 7317 7975 l 7317 8025 l 7266 8025 l 7266 7975 l p ef -7368 7975 m 7419 7975 l 7419 8025 l 7368 8025 l 7368 7975 l p ef -7470 7975 m 7521 7975 l 7521 8025 l 7470 8025 l 7470 7975 l p ef -7572 7975 m 7623 7975 l 7623 8025 l 7572 8025 l 7572 7975 l p ef -7674 7975 m 7725 7975 l 7725 8025 l 7674 8025 l 7674 7975 l p ef -7776 7975 m 7827 7975 l 7827 8025 l 7776 8025 l 7776 7975 l p ef -7878 7975 m 7929 7975 l 7929 8025 l 7878 8025 l 7878 7975 l p ef -7980 7975 m 8031 7975 l 8031 8025 l 7980 8025 l 7980 7975 l p ef -8082 7975 m 8133 7975 l 8133 8025 l 8082 8025 l 8082 7975 l p ef -8184 7975 m 8235 7975 l 8235 8025 l 8184 8025 l 8184 7975 l p ef -8286 7975 m 8337 7975 l 8337 8025 l 8286 8025 l 8286 7975 l p ef -8388 7975 m 8439 7975 l 8439 8025 l 8388 8025 l 8388 7975 l p ef -8490 7975 m 8541 7975 l 8541 8025 l 8490 8025 l 8490 7975 l p ef -8592 7975 m 8643 7975 l 8643 8025 l 8592 8025 l 8592 7975 l p ef -8694 7975 m 8745 7975 l 8745 8025 l 8694 8025 l 8694 7975 l p ef -8796 7975 m 8847 7975 l 8847 8025 l 8796 8025 l 8796 7975 l p ef -8898 7975 m 8949 7975 l 8949 8025 l 8898 8025 l 8898 7975 l p ef -9000 7975 m 9051 7975 l 9051 8025 l 9000 8025 l 9000 7975 l p ef -9102 7975 m 9153 7975 l 9153 8025 l 9102 8025 l 9102 7975 l p ef -9204 7975 m 9255 7975 l 9255 8025 l 9204 8025 l 9204 7975 l p ef -9306 7975 m 9357 7975 l 9357 8025 l 9306 8025 l 9306 7975 l p ef -9408 7975 m 9459 7975 l 9459 8025 l 9408 8025 l 9408 7975 l p ef -9510 7975 m 9561 7975 l 9561 8025 l 9510 8025 l 9510 7975 l p ef -9612 7975 m 9663 7975 l 9663 8025 l 9612 8025 l 9612 7975 l p ef -9714 7975 m 9765 7975 l 9765 8025 l 9714 8025 l 9714 7975 l p ef -9816 7975 m 9867 7975 l 9867 8025 l 9816 8025 l 9816 7975 l p ef -9918 7975 m 9969 7975 l 9969 8025 l 9918 8025 l 9918 7975 l p ef -10020 7975 m 10071 7975 l 10071 8025 l 10020 8025 l 10020 7975 l p ef -10122 7975 m 10173 7975 l 10173 8025 l 10122 8025 l 10122 7975 l p ef -10224 7975 m 10275 7975 l 10275 8025 l 10224 8025 l 10224 7975 l p ef -10326 7975 m 10377 7975 l 10377 8025 l 10326 8025 l 10326 7975 l p ef -10428 7975 m 10479 7975 l 10479 8025 l 10428 8025 l 10428 7975 l p ef -10525 8030 m 10525 8081 l 10475 8081 l 10475 8030 l 10525 8030 l p ef -10525 8132 m 10525 8183 l 10475 8183 l 10475 8132 l 10525 8132 l p ef -10525 8234 m 10525 8285 l 10475 8285 l 10475 8234 l 10525 8234 l p ef -10525 8336 m 10525 8387 l 10475 8387 l 10475 8336 l 10525 8336 l p ef -10525 8438 m 10525 8489 l 10475 8489 l 10475 8438 l 10525 8438 l p ef -10525 8540 m 10525 8591 l 10475 8591 l 10475 8540 l 10525 8540 l p ef -10525 8642 m 10525 8693 l 10475 8693 l 10475 8642 l 10525 8642 l p ef -10525 8744 m 10525 8795 l 10475 8795 l 10475 8744 l 10525 8744 l p ef -10525 8846 m 10525 8897 l 10475 8897 l 10475 8846 l 10525 8846 l p ef -10525 8948 m 10525 8999 l 10475 8999 l 10475 8948 l 10525 8948 l p ef -10525 9050 m 10525 9101 l 10475 9101 l 10475 9050 l 10525 9050 l p ef -10525 9152 m 10525 9203 l 10475 9203 l 10475 9152 l 10525 9152 l p ef -10525 9254 m 10525 9305 l 10475 9305 l 10475 9254 l 10525 9254 l p ef -10525 9356 m 10525 9407 l 10475 9407 l 10475 9356 l 10525 9356 l p ef -10525 9458 m 10525 9500 l 10500 9500 l 10475 9500 l 10475 9458 l 10500 9458 l -10525 9458 l p ef -10500 9500 m 10525 9500 l 10525 9504 l 10523 9509 l 10522 9512 l 10519 9516 l -10516 9519 l 10513 9522 l 10509 9523 l 10504 9525 l 10500 9525 l 10500 9525 l -10500 9500 l p ef -10500 9525 m 10491 9525 l 10491 9500 l 10491 9475 l 10500 9475 l 10500 9500 l -10500 9525 l p ef -10440 9525 m 10389 9525 l 10389 9475 l 10440 9475 l 10440 9525 l p ef -10338 9525 m 10287 9525 l 10287 9475 l 10338 9475 l 10338 9525 l p ef -10236 9525 m 10185 9525 l 10185 9475 l 10236 9475 l 10236 9525 l p ef -10134 9525 m 10083 9525 l 10083 9475 l 10134 9475 l 10134 9525 l p ef -10032 9525 m 9981 9525 l 9981 9475 l 10032 9475 l 10032 9525 l p ef -9930 9525 m 9879 9525 l 9879 9475 l 9930 9475 l 9930 9525 l p ef -9828 9525 m 9777 9525 l 9777 9475 l 9828 9475 l 9828 9525 l p ef -9726 9525 m 9675 9525 l 9675 9475 l 9726 9475 l 9726 9525 l p ef -9624 9525 m 9573 9525 l 9573 9475 l 9624 9475 l 9624 9525 l p ef -9522 9525 m 9471 9525 l 9471 9475 l 9522 9475 l 9522 9525 l p ef -9420 9525 m 9369 9525 l 9369 9475 l 9420 9475 l 9420 9525 l p ef -9318 9525 m 9267 9525 l 9267 9475 l 9318 9475 l 9318 9525 l p ef -9216 9525 m 9165 9525 l 9165 9475 l 9216 9475 l 9216 9525 l p ef -9114 9525 m 9063 9525 l 9063 9475 l 9114 9475 l 9114 9525 l p ef -9012 9525 m 8961 9525 l 8961 9475 l 9012 9475 l 9012 9525 l p ef -8910 9525 m 8859 9525 l 8859 9475 l 8910 9475 l 8910 9525 l p ef -8808 9525 m 8800 9525 l 8800 9500 l 8800 9475 l 8808 9475 l 8808 9500 l -8808 9525 l p ef -8800 9525 m 8749 9525 l 8749 9500 l 8749 9475 l 8800 9475 l 8800 9500 l -8800 9525 l p ef -gs -gs -pum -7276 8974 t -50 0 m 50 -455 l 251 -455 l 292 -455 323 -451 344 -443 ct 365 -435 382 -420 394 -399 ct -407 -379 413 -356 413 -331 ct 413 -299 403 -271 382 -249 ct 361 -227 329 -213 285 -207 ct -301 -199 313 -192 322 -184 ct 339 -168 356 -148 371 -124 ct 451 0 l 375 0 l -315 -95 l 297 -122 283 -143 271 -157 ct 260 -172 250 -182 241 -188 ct 232 -194 223 -198 213 -200 ct -207 -201 195 -202 180 -202 ct 110 -202 l 110 0 l 50 0 l p -110 -254 m 239 -254 l 267 -254 288 -257 304 -263 ct 319 -268 331 -277 339 -290 ct -347 -303 351 -316 351 -331 ct 351 -352 344 -370 328 -384 ct 312 -398 288 -405 254 -405 ct -110 -405 l 110 -254 l p ef -724 -107 m 782 -99 l 773 -66 756 -40 731 -21 ct 707 -2 675 7 637 7 ct 589 7 551 -8 523 -37 ct -494 -67 480 -109 480 -162 ct 480 -218 495 -261 523 -291 ct 552 -322 589 -337 634 -337 ct -678 -337 714 -322 742 -292 ct 770 -262 784 -220 784 -166 ct 784 -163 784 -158 783 -151 ct -538 -151 l 540 -115 550 -87 569 -68 ct 587 -49 610 -39 637 -39 ct 658 -39 675 -44 690 -55 ct -704 -66 716 -83 724 -107 ct p -541 -197 m 725 -197 l 722 -225 715 -245 704 -259 ct 686 -280 663 -291 635 -291 ct -609 -291 587 -283 570 -265 ct 553 -248 543 -226 541 -197 ct p ef -829 -99 m 884 -107 l 887 -85 895 -68 910 -57 ct 924 -45 944 -39 969 -39 ct -995 -39 1014 -44 1026 -55 ct 1038 -65 1045 -77 1045 -91 ct 1045 -104 1039 -114 1028 -121 ct -1021 -126 1002 -132 971 -140 ct 930 -150 902 -159 886 -167 ct 870 -174 858 -185 850 -198 ct -842 -211 838 -226 838 -242 ct 838 -257 841 -270 848 -283 ct 855 -295 864 -306 875 -314 ct -884 -320 896 -326 911 -330 ct 926 -335 942 -337 959 -337 ct 985 -337 1008 -333 1027 -326 ct -1047 -318 1061 -308 1070 -296 ct 1080 -283 1086 -266 1090 -245 ct 1035 -237 l -1033 -254 1025 -267 1013 -277 ct 1002 -286 985 -291 963 -291 ct 937 -291 919 -287 908 -278 ct -897 -270 892 -260 892 -249 ct 892 -241 894 -235 899 -229 ct 903 -223 910 -218 920 -214 ct -926 -212 942 -207 969 -200 ct 1009 -189 1036 -181 1052 -174 ct 1068 -167 1080 -158 1089 -145 ct -1098 -132 1102 -116 1102 -97 ct 1102 -79 1097 -61 1086 -45 ct 1075 -28 1059 -15 1039 -6 ct -1018 3 995 7 969 7 ct 927 7 894 -2 871 -20 ct 849 -37 835 -64 829 -99 ct p ef -1383 -41 m 1362 -24 1342 -11 1323 -4 ct 1304 3 1283 7 1262 7 ct 1225 7 1198 -2 1178 -20 ct -1159 -37 1149 -60 1149 -87 ct 1149 -103 1153 -118 1160 -131 ct 1167 -145 1177 -156 1189 -164 ct -1201 -172 1214 -178 1229 -182 ct 1240 -185 1256 -188 1279 -190 ct 1324 -196 1357 -202 1378 -209 ct -1378 -217 1378 -222 1378 -224 ct 1378 -247 1373 -263 1363 -272 ct 1348 -285 1327 -291 1299 -291 ct -1273 -291 1253 -286 1241 -277 ct 1228 -268 1219 -252 1213 -228 ct 1159 -236 l -1164 -259 1172 -278 1183 -292 ct 1194 -307 1211 -318 1232 -326 ct 1254 -333 1279 -337 1307 -337 ct -1335 -337 1358 -334 1376 -327 ct 1393 -321 1406 -312 1414 -302 ct 1423 -292 1428 -280 1432 -264 ct -1434 -255 1435 -238 1435 -213 ct 1435 -138 l 1435 -87 1436 -54 1438 -40 ct -1440 -26 1445 -13 1452 0 ct 1394 0 l 1388 -12 1384 -26 1383 -41 ct p -1378 -166 m 1358 -157 1327 -150 1287 -145 ct 1264 -141 1248 -138 1238 -133 ct -1229 -129 1221 -123 1216 -115 ct 1211 -107 1208 -99 1208 -89 ct 1208 -74 1214 -62 1225 -52 ct -1237 -42 1253 -37 1275 -37 ct 1296 -37 1315 -41 1332 -51 ct 1349 -60 1361 -73 1369 -89 ct -1375 -102 1378 -121 1378 -145 ct 1378 -166 l p ef -1519 0 m 1519 -330 l 1569 -330 l 1569 -283 l 1579 -299 1593 -312 1610 -322 ct -1627 -332 1647 -337 1669 -337 ct 1693 -337 1713 -332 1729 -322 ct 1744 -312 1755 -297 1762 -279 ct -1788 -318 1822 -337 1863 -337 ct 1896 -337 1921 -328 1939 -310 ct 1956 -292 1965 -264 1965 -226 ct -1965 0 l 1910 0 l 1910 -208 l 1910 -230 1908 -246 1904 -256 ct 1901 -266 1894 -274 1884 -280 ct -1875 -286 1864 -289 1851 -289 ct 1828 -289 1809 -281 1793 -265 ct 1778 -250 1770 -225 1770 -191 ct -1770 0 l 1715 0 l 1715 -214 l 1715 -239 1710 -258 1701 -270 ct 1692 -282 1677 -289 1656 -289 ct -1641 -289 1626 -284 1613 -276 ct 1599 -268 1590 -256 1584 -240 ct 1578 -224 1575 -201 1575 -171 ct -1575 0 l 1519 0 l p ef -2049 126 m 2049 -330 l 2100 -330 l 2100 -287 l 2112 -304 2125 -316 2140 -324 ct -2155 -333 2174 -337 2195 -337 ct 2223 -337 2248 -330 2270 -315 ct 2291 -301 2307 -280 2318 -254 ct -2329 -228 2335 -199 2335 -167 ct 2335 -134 2329 -103 2317 -77 ct 2305 -50 2287 -29 2264 -15 ct -2241 0 2217 7 2191 7 ct 2173 7 2156 3 2141 -5 ct 2126 -13 2114 -23 2105 -35 ct -2105 126 l 2049 126 l p -2099 -163 m 2099 -121 2108 -90 2125 -69 ct 2142 -49 2163 -39 2187 -39 ct 2212 -39 2234 -49 2251 -70 ct -2269 -91 2278 -124 2278 -168 ct 2278 -210 2269 -241 2252 -262 ct 2235 -283 2214 -293 2190 -293 ct -2166 -293 2145 -282 2127 -260 ct 2109 -238 2099 -205 2099 -163 ct p ef -2399 0 m 2399 -455 l 2454 -455 l 2454 0 l 2399 0 l p ef -2765 -107 m 2823 -99 l 2814 -66 2797 -40 2772 -21 ct 2748 -2 2716 7 2678 7 ct -2630 7 2592 -8 2564 -37 ct 2535 -67 2521 -109 2521 -162 ct 2521 -218 2536 -261 2564 -291 ct -2593 -322 2630 -337 2675 -337 ct 2719 -337 2755 -322 2783 -292 ct 2811 -262 2825 -220 2825 -166 ct -2825 -163 2825 -158 2824 -151 ct 2579 -151 l 2581 -115 2591 -87 2610 -68 ct -2628 -49 2651 -39 2678 -39 ct 2699 -39 2716 -44 2731 -55 ct 2745 -66 2757 -83 2765 -107 ct -p -2582 -197 m 2766 -197 l 2763 -225 2756 -245 2745 -259 ct 2727 -280 2704 -291 2676 -291 ct -2650 -291 2628 -283 2611 -265 ct 2594 -248 2584 -226 2582 -197 ct p ef -2890 0 m 2890 -330 l 2940 -330 l 2940 -280 l 2953 -303 2965 -318 2976 -326 ct -2987 -333 2999 -337 3012 -337 ct 3031 -337 3050 -331 3069 -319 ct 3050 -267 l -3036 -275 3023 -279 3009 -279 ct 2997 -279 2986 -276 2976 -268 ct 2966 -261 2959 -251 2955 -238 ct -2949 -218 2946 -196 2946 -173 ct 2946 0 l 2890 0 l p ef -pom -gr -gr -11400 8750 m 10838 8938 l 10838 8563 l 11400 8750 l p ef -10500 8725 m 10950 8725 l 10950 8775 l 10500 8775 l 10500 8725 l p ef -8698 13525 m 8647 13525 l 8647 13475 l 8698 13475 l 8698 13525 l p ef -8596 13525 m 8545 13525 l 8545 13475 l 8596 13475 l 8596 13525 l p ef -8494 13525 m 8443 13525 l 8443 13475 l 8494 13475 l 8494 13525 l p ef -8392 13525 m 8341 13525 l 8341 13475 l 8392 13475 l 8392 13525 l p ef -8290 13525 m 8239 13525 l 8239 13475 l 8290 13475 l 8290 13525 l p ef -8188 13525 m 8137 13525 l 8137 13475 l 8188 13475 l 8188 13525 l p ef -8086 13525 m 8035 13525 l 8035 13475 l 8086 13475 l 8086 13525 l p ef -7984 13525 m 7933 13525 l 7933 13475 l 7984 13475 l 7984 13525 l p ef -7882 13525 m 7831 13525 l 7831 13475 l 7882 13475 l 7882 13525 l p ef -7780 13525 m 7729 13525 l 7729 13475 l 7780 13475 l 7780 13525 l p ef -7678 13525 m 7627 13525 l 7627 13475 l 7678 13475 l 7678 13525 l p ef -7576 13525 m 7525 13525 l 7525 13475 l 7576 13475 l 7576 13525 l p ef -7474 13525 m 7423 13525 l 7423 13475 l 7474 13475 l 7474 13525 l p ef -7372 13525 m 7321 13525 l 7321 13475 l 7372 13475 l 7372 13525 l p ef -7270 13525 m 7219 13525 l 7219 13475 l 7270 13475 l 7270 13525 l p ef -7168 13525 m 7117 13525 l 7117 13475 l 7168 13475 l 7168 13525 l p ef -7075 13466 m 7075 13415 l 7125 13415 l 7125 13466 l 7075 13466 l p ef -7075 13364 m 7075 13313 l 7125 13313 l 7125 13364 l 7075 13364 l p ef -7075 13262 m 7075 13211 l 7125 13211 l 7125 13262 l 7075 13262 l p ef -7075 13160 m 7075 13109 l 7125 13109 l 7125 13160 l 7075 13160 l p ef -7075 13058 m 7075 13007 l 7125 13007 l 7125 13058 l 7075 13058 l p ef -7075 12956 m 7075 12905 l 7125 12905 l 7125 12956 l 7075 12956 l p ef -7075 12854 m 7075 12803 l 7125 12803 l 7125 12854 l 7075 12854 l p ef -7075 12752 m 7075 12701 l 7125 12701 l 7125 12752 l 7075 12752 l p ef -7075 12650 m 7075 12599 l 7125 12599 l 7125 12650 l 7075 12650 l p ef -7075 12548 m 7075 12497 l 7125 12497 l 7125 12548 l 7075 12548 l p ef -7075 12446 m 7075 12395 l 7125 12395 l 7125 12446 l 7075 12446 l p ef -7075 12344 m 7075 12293 l 7125 12293 l 7125 12344 l 7075 12344 l p ef -7075 12242 m 7075 12191 l 7125 12191 l 7125 12242 l 7075 12242 l p ef -7075 12140 m 7075 12089 l 7125 12089 l 7125 12140 l 7075 12140 l p ef -7075 12038 m 7075 12000 l 7100 12000 l 7125 12000 l 7125 12038 l 7100 12038 l -7075 12038 l p ef -7100 12000 m 7075 12000 l 7075 11996 l 7077 11991 l 7078 11988 l 7081 11984 l -7084 11981 l 7087 11978 l 7091 11977 l 7096 11975 l 7100 11975 l 7100 11975 l -7100 12000 l p ef -7100 11975 m 7113 11975 l 7113 12000 l 7113 12025 l 7100 12025 l 7100 12000 l -7100 11975 l p ef -7164 11975 m 7215 11975 l 7215 12025 l 7164 12025 l 7164 11975 l p ef -7266 11975 m 7317 11975 l 7317 12025 l 7266 12025 l 7266 11975 l p ef -7368 11975 m 7419 11975 l 7419 12025 l 7368 12025 l 7368 11975 l p ef -7470 11975 m 7521 11975 l 7521 12025 l 7470 12025 l 7470 11975 l p ef -7572 11975 m 7623 11975 l 7623 12025 l 7572 12025 l 7572 11975 l p ef -7674 11975 m 7725 11975 l 7725 12025 l 7674 12025 l 7674 11975 l p ef -7776 11975 m 7827 11975 l 7827 12025 l 7776 12025 l 7776 11975 l p ef -7878 11975 m 7929 11975 l 7929 12025 l 7878 12025 l 7878 11975 l p ef -7980 11975 m 8031 11975 l 8031 12025 l 7980 12025 l 7980 11975 l p ef -8082 11975 m 8133 11975 l 8133 12025 l 8082 12025 l 8082 11975 l p ef -8184 11975 m 8235 11975 l 8235 12025 l 8184 12025 l 8184 11975 l p ef -8286 11975 m 8337 11975 l 8337 12025 l 8286 12025 l 8286 11975 l p ef -8388 11975 m 8439 11975 l 8439 12025 l 8388 12025 l 8388 11975 l p ef -8490 11975 m 8541 11975 l 8541 12025 l 8490 12025 l 8490 11975 l p ef -8592 11975 m 8643 11975 l 8643 12025 l 8592 12025 l 8592 11975 l p ef -8694 11975 m 8745 11975 l 8745 12025 l 8694 12025 l 8694 11975 l p ef -8796 11975 m 8847 11975 l 8847 12025 l 8796 12025 l 8796 11975 l p ef -8898 11975 m 8949 11975 l 8949 12025 l 8898 12025 l 8898 11975 l p ef -9000 11975 m 9051 11975 l 9051 12025 l 9000 12025 l 9000 11975 l p ef -9102 11975 m 9153 11975 l 9153 12025 l 9102 12025 l 9102 11975 l p ef -9204 11975 m 9255 11975 l 9255 12025 l 9204 12025 l 9204 11975 l p ef -9306 11975 m 9357 11975 l 9357 12025 l 9306 12025 l 9306 11975 l p ef -9408 11975 m 9459 11975 l 9459 12025 l 9408 12025 l 9408 11975 l p ef -9510 11975 m 9561 11975 l 9561 12025 l 9510 12025 l 9510 11975 l p ef -9612 11975 m 9663 11975 l 9663 12025 l 9612 12025 l 9612 11975 l p ef -9714 11975 m 9765 11975 l 9765 12025 l 9714 12025 l 9714 11975 l p ef -9816 11975 m 9867 11975 l 9867 12025 l 9816 12025 l 9816 11975 l p ef -9918 11975 m 9969 11975 l 9969 12025 l 9918 12025 l 9918 11975 l p ef -10020 11975 m 10071 11975 l 10071 12025 l 10020 12025 l 10020 11975 l -p ef -10122 11975 m 10173 11975 l 10173 12025 l 10122 12025 l 10122 11975 l -p ef -10224 11975 m 10275 11975 l 10275 12025 l 10224 12025 l 10224 11975 l -p ef -10326 11975 m 10377 11975 l 10377 12025 l 10326 12025 l 10326 11975 l -p ef -10428 11975 m 10479 11975 l 10479 12025 l 10428 12025 l 10428 11975 l -p ef -10525 12030 m 10525 12081 l 10475 12081 l 10475 12030 l 10525 12030 l -p ef -10525 12132 m 10525 12183 l 10475 12183 l 10475 12132 l 10525 12132 l -p ef -10525 12234 m 10525 12285 l 10475 12285 l 10475 12234 l 10525 12234 l -p ef -10525 12336 m 10525 12387 l 10475 12387 l 10475 12336 l 10525 12336 l -p ef -10525 12438 m 10525 12489 l 10475 12489 l 10475 12438 l 10525 12438 l -p ef -10525 12540 m 10525 12591 l 10475 12591 l 10475 12540 l 10525 12540 l -p ef -10525 12642 m 10525 12693 l 10475 12693 l 10475 12642 l 10525 12642 l -p ef -10525 12744 m 10525 12795 l 10475 12795 l 10475 12744 l 10525 12744 l -p ef -10525 12846 m 10525 12897 l 10475 12897 l 10475 12846 l 10525 12846 l -p ef -10525 12948 m 10525 12999 l 10475 12999 l 10475 12948 l 10525 12948 l -p ef -10525 13050 m 10525 13101 l 10475 13101 l 10475 13050 l 10525 13050 l -p ef -10525 13152 m 10525 13203 l 10475 13203 l 10475 13152 l 10525 13152 l -p ef -10525 13254 m 10525 13305 l 10475 13305 l 10475 13254 l 10525 13254 l -p ef -10525 13356 m 10525 13407 l 10475 13407 l 10475 13356 l 10525 13356 l -p ef -10525 13458 m 10525 13500 l 10500 13500 l 10475 13500 l 10475 13458 l -10500 13458 l 10525 13458 l p ef -10500 13500 m 10525 13500 l 10525 13504 l 10523 13509 l 10522 13512 l -10519 13516 l 10516 13519 l 10513 13522 l 10509 13523 l 10504 13525 l -10500 13525 l 10500 13525 l 10500 13500 l p ef -10500 13525 m 10491 13525 l 10491 13500 l 10491 13475 l 10500 13475 l -10500 13500 l 10500 13525 l p ef -10440 13525 m 10389 13525 l 10389 13475 l 10440 13475 l 10440 13525 l -p ef -10338 13525 m 10287 13525 l 10287 13475 l 10338 13475 l 10338 13525 l -p ef -10236 13525 m 10185 13525 l 10185 13475 l 10236 13475 l 10236 13525 l -p ef -10134 13525 m 10083 13525 l 10083 13475 l 10134 13475 l 10134 13525 l -p ef -10032 13525 m 9981 13525 l 9981 13475 l 10032 13475 l 10032 13525 l -p ef -9930 13525 m 9879 13525 l 9879 13475 l 9930 13475 l 9930 13525 l p ef -9828 13525 m 9777 13525 l 9777 13475 l 9828 13475 l 9828 13525 l p ef -9726 13525 m 9675 13525 l 9675 13475 l 9726 13475 l 9726 13525 l p ef -9624 13525 m 9573 13525 l 9573 13475 l 9624 13475 l 9624 13525 l p ef -9522 13525 m 9471 13525 l 9471 13475 l 9522 13475 l 9522 13525 l p ef -9420 13525 m 9369 13525 l 9369 13475 l 9420 13475 l 9420 13525 l p ef -9318 13525 m 9267 13525 l 9267 13475 l 9318 13475 l 9318 13525 l p ef -9216 13525 m 9165 13525 l 9165 13475 l 9216 13475 l 9216 13525 l p ef -9114 13525 m 9063 13525 l 9063 13475 l 9114 13475 l 9114 13525 l p ef -9012 13525 m 8961 13525 l 8961 13475 l 9012 13475 l 9012 13525 l p ef -8910 13525 m 8859 13525 l 8859 13475 l 8910 13475 l 8910 13525 l p ef -8808 13525 m 8800 13525 l 8800 13500 l 8800 13475 l 8808 13475 l 8808 13500 l -8808 13525 l p ef -8800 13525 m 8749 13525 l 8749 13500 l 8749 13475 l 8800 13475 l 8800 13500 l -8800 13525 l p ef -gs -gs -pum -7276 12970 t -50 0 m 50 -455 l 251 -455 l 292 -455 323 -451 344 -443 ct 365 -435 382 -420 394 -399 ct -407 -379 413 -356 413 -331 ct 413 -299 403 -271 382 -249 ct 361 -227 329 -213 285 -207 ct -301 -199 313 -192 322 -184 ct 339 -168 356 -148 371 -124 ct 451 0 l 375 0 l -315 -95 l 297 -122 283 -143 271 -157 ct 260 -172 250 -182 241 -188 ct 232 -194 223 -198 213 -200 ct -207 -201 195 -202 180 -202 ct 110 -202 l 110 0 l 50 0 l p -110 -254 m 239 -254 l 267 -254 288 -257 304 -263 ct 319 -268 331 -277 339 -290 ct -347 -303 351 -316 351 -331 ct 351 -352 344 -370 328 -384 ct 312 -398 288 -405 254 -405 ct -110 -405 l 110 -254 l p ef -724 -107 m 782 -99 l 773 -66 756 -40 731 -21 ct 707 -2 675 7 637 7 ct 589 7 551 -8 523 -37 ct -494 -67 480 -109 480 -162 ct 480 -218 495 -261 523 -291 ct 552 -322 589 -337 634 -337 ct -678 -337 714 -322 742 -292 ct 770 -262 784 -220 784 -166 ct 784 -163 784 -158 783 -151 ct -538 -151 l 540 -115 550 -87 569 -68 ct 587 -49 610 -39 637 -39 ct 658 -39 675 -44 690 -55 ct -704 -66 716 -83 724 -107 ct p -541 -197 m 725 -197 l 722 -225 715 -245 704 -259 ct 686 -280 663 -291 635 -291 ct -609 -291 587 -283 570 -265 ct 553 -248 543 -226 541 -197 ct p ef -829 -99 m 884 -107 l 887 -85 895 -68 910 -57 ct 924 -45 944 -39 969 -39 ct -995 -39 1014 -44 1026 -55 ct 1038 -65 1045 -77 1045 -91 ct 1045 -104 1039 -114 1028 -121 ct -1021 -126 1002 -132 971 -140 ct 930 -150 902 -159 886 -167 ct 870 -174 858 -185 850 -198 ct -842 -211 838 -226 838 -242 ct 838 -257 841 -270 848 -283 ct 855 -295 864 -306 875 -314 ct -884 -320 896 -326 911 -330 ct 926 -335 942 -337 959 -337 ct 985 -337 1008 -333 1027 -326 ct -1047 -318 1061 -308 1070 -296 ct 1080 -283 1086 -266 1090 -245 ct 1035 -237 l -1033 -254 1025 -267 1013 -277 ct 1002 -286 985 -291 963 -291 ct 937 -291 919 -287 908 -278 ct -897 -270 892 -260 892 -249 ct 892 -241 894 -235 899 -229 ct 903 -223 910 -218 920 -214 ct -926 -212 942 -207 969 -200 ct 1009 -189 1036 -181 1052 -174 ct 1068 -167 1080 -158 1089 -145 ct -1098 -132 1102 -116 1102 -97 ct 1102 -79 1097 -61 1086 -45 ct 1075 -28 1059 -15 1039 -6 ct -1018 3 995 7 969 7 ct 927 7 894 -2 871 -20 ct 849 -37 835 -64 829 -99 ct p ef -1383 -41 m 1362 -24 1342 -11 1323 -4 ct 1304 3 1283 7 1262 7 ct 1225 7 1198 -2 1178 -20 ct -1159 -37 1149 -60 1149 -87 ct 1149 -103 1153 -118 1160 -131 ct 1167 -145 1177 -156 1189 -164 ct -1201 -172 1214 -178 1229 -182 ct 1240 -185 1256 -188 1279 -190 ct 1324 -196 1357 -202 1378 -209 ct -1378 -217 1378 -222 1378 -224 ct 1378 -247 1373 -263 1363 -272 ct 1348 -285 1327 -291 1299 -291 ct -1273 -291 1253 -286 1241 -277 ct 1228 -268 1219 -252 1213 -228 ct 1159 -236 l -1164 -259 1172 -278 1183 -292 ct 1194 -307 1211 -318 1232 -326 ct 1254 -333 1279 -337 1307 -337 ct -1335 -337 1358 -334 1376 -327 ct 1393 -321 1406 -312 1414 -302 ct 1423 -292 1428 -280 1432 -264 ct -1434 -255 1435 -238 1435 -213 ct 1435 -138 l 1435 -87 1436 -54 1438 -40 ct -1440 -26 1445 -13 1452 0 ct 1394 0 l 1388 -12 1384 -26 1383 -41 ct p -1378 -166 m 1358 -157 1327 -150 1287 -145 ct 1264 -141 1248 -138 1238 -133 ct -1229 -129 1221 -123 1216 -115 ct 1211 -107 1208 -99 1208 -89 ct 1208 -74 1214 -62 1225 -52 ct -1237 -42 1253 -37 1275 -37 ct 1296 -37 1315 -41 1332 -51 ct 1349 -60 1361 -73 1369 -89 ct -1375 -102 1378 -121 1378 -145 ct 1378 -166 l p ef -1519 0 m 1519 -330 l 1569 -330 l 1569 -283 l 1579 -299 1593 -312 1610 -322 ct -1627 -332 1647 -337 1669 -337 ct 1693 -337 1713 -332 1729 -322 ct 1744 -312 1755 -297 1762 -279 ct -1788 -318 1822 -337 1863 -337 ct 1896 -337 1921 -328 1939 -310 ct 1956 -292 1965 -264 1965 -226 ct -1965 0 l 1910 0 l 1910 -208 l 1910 -230 1908 -246 1904 -256 ct 1901 -266 1894 -274 1884 -280 ct -1875 -286 1864 -289 1851 -289 ct 1828 -289 1809 -281 1793 -265 ct 1778 -250 1770 -225 1770 -191 ct -1770 0 l 1715 0 l 1715 -214 l 1715 -239 1710 -258 1701 -270 ct 1692 -282 1677 -289 1656 -289 ct -1641 -289 1626 -284 1613 -276 ct 1599 -268 1590 -256 1584 -240 ct 1578 -224 1575 -201 1575 -171 ct -1575 0 l 1519 0 l p ef -2049 126 m 2049 -330 l 2100 -330 l 2100 -287 l 2112 -304 2125 -316 2140 -324 ct -2155 -333 2174 -337 2195 -337 ct 2223 -337 2248 -330 2270 -315 ct 2291 -301 2307 -280 2318 -254 ct -2329 -228 2335 -199 2335 -167 ct 2335 -134 2329 -103 2317 -77 ct 2305 -50 2287 -29 2264 -15 ct -2241 0 2217 7 2191 7 ct 2173 7 2156 3 2141 -5 ct 2126 -13 2114 -23 2105 -35 ct -2105 126 l 2049 126 l p -2099 -163 m 2099 -121 2108 -90 2125 -69 ct 2142 -49 2163 -39 2187 -39 ct 2212 -39 2234 -49 2251 -70 ct -2269 -91 2278 -124 2278 -168 ct 2278 -210 2269 -241 2252 -262 ct 2235 -283 2214 -293 2190 -293 ct -2166 -293 2145 -282 2127 -260 ct 2109 -238 2099 -205 2099 -163 ct p ef -2399 0 m 2399 -455 l 2454 -455 l 2454 0 l 2399 0 l p ef -2765 -107 m 2823 -99 l 2814 -66 2797 -40 2772 -21 ct 2748 -2 2716 7 2678 7 ct -2630 7 2592 -8 2564 -37 ct 2535 -67 2521 -109 2521 -162 ct 2521 -218 2536 -261 2564 -291 ct -2593 -322 2630 -337 2675 -337 ct 2719 -337 2755 -322 2783 -292 ct 2811 -262 2825 -220 2825 -166 ct -2825 -163 2825 -158 2824 -151 ct 2579 -151 l 2581 -115 2591 -87 2610 -68 ct -2628 -49 2651 -39 2678 -39 ct 2699 -39 2716 -44 2731 -55 ct 2745 -66 2757 -83 2765 -107 ct -p -2582 -197 m 2766 -197 l 2763 -225 2756 -245 2745 -259 ct 2727 -280 2704 -291 2676 -291 ct -2650 -291 2628 -283 2611 -265 ct 2594 -248 2584 -226 2582 -197 ct p ef -2890 0 m 2890 -330 l 2940 -330 l 2940 -280 l 2953 -303 2965 -318 2976 -326 ct -2987 -333 2999 -337 3012 -337 ct 3031 -337 3050 -331 3069 -319 ct 3050 -267 l -3036 -275 3023 -279 3009 -279 ct 2997 -279 2986 -276 2976 -268 ct 2966 -261 2959 -251 2955 -238 ct -2949 -218 2946 -196 2946 -173 ct 2946 0 l 2890 0 l p ef -pom -gr -gr -5900 12750 m 6463 12563 l 6463 12938 l 5900 12750 l p ef -7100 12775 m 6350 12775 l 6350 12725 l 7100 12725 l 7100 12775 l p ef -gs -gs -pum -25603 12626 t -52 -1 m 52 -455 l 359 -455 l 359 -401 l 112 -401 l 112 -261 l 326 -261 l -326 -207 l 112 -207 l 112 -1 l 52 -1 l p ef -430 0 m 430 -330 l 480 -330 l 480 -280 l 493 -303 505 -318 516 -326 ct -527 -333 539 -337 552 -337 ct 571 -337 590 -331 609 -319 ct 590 -267 l 576 -275 563 -279 549 -279 ct -537 -279 526 -276 516 -268 ct 506 -261 499 -251 495 -238 ct 489 -218 486 -196 486 -173 ct -486 0 l 430 0 l p ef -622 -165 m 622 -226 639 -271 673 -301 ct 701 -325 736 -337 777 -337 ct 822 -337 859 -322 887 -293 ct -916 -263 931 -222 931 -170 ct 931 -127 924 -94 912 -70 ct 899 -45 880 -27 856 -13 ct -832 0 805 7 777 7 ct 730 7 693 -8 665 -37 ct 636 -67 622 -110 622 -165 ct p -679 -165 m 679 -123 689 -91 707 -70 ct 725 -49 749 -39 777 -39 ct 804 -39 827 -49 846 -71 ct -864 -92 873 -124 873 -167 ct 873 -208 864 -239 845 -260 ct 827 -281 804 -291 777 -291 ct -749 -291 725 -281 707 -260 ct 689 -239 679 -207 679 -165 ct p ef -995 0 m 995 -330 l 1045 -330 l 1045 -283 l 1055 -299 1069 -312 1086 -322 ct -1103 -332 1123 -337 1145 -337 ct 1169 -337 1189 -332 1205 -322 ct 1220 -312 1231 -297 1238 -279 ct -1264 -318 1298 -337 1339 -337 ct 1372 -337 1397 -328 1415 -310 ct 1432 -292 1441 -264 1441 -226 ct -1441 0 l 1386 0 l 1386 -208 l 1386 -230 1384 -246 1380 -256 ct 1377 -266 1370 -274 1360 -280 ct -1351 -286 1340 -289 1327 -289 ct 1304 -289 1285 -281 1269 -265 ct 1254 -250 1246 -225 1246 -191 ct -1246 0 l 1191 0 l 1191 -214 l 1191 -239 1186 -258 1177 -270 ct 1168 -282 1153 -289 1132 -289 ct -1117 -289 1102 -284 1089 -276 ct 1075 -268 1066 -256 1060 -240 ct 1054 -224 1051 -201 1051 -171 ct -1051 0 l 995 0 l p ef -pom -gr -gs -pum -25241 13337 t -42 0 m 42 -330 l 92 -330 l 92 -283 l 116 -319 151 -337 197 -337 ct 217 -337 235 -333 252 -326 ct -268 -319 281 -310 289 -298 ct 297 -287 303 -273 306 -257 ct 308 -247 309 -229 309 -203 ct -309 0 l 254 0 l 254 -200 l 254 -223 251 -240 247 -252 ct 243 -263 235 -272 224 -279 ct -213 -285 200 -289 185 -289 ct 161 -289 141 -281 124 -266 ct 106 -251 98 -222 98 -180 ct -98 0 l 42 0 l p ef -618 -107 m 676 -99 l 667 -66 650 -40 625 -21 ct 601 -2 569 7 531 7 ct 483 7 445 -8 417 -37 ct -388 -67 374 -109 374 -162 ct 374 -218 389 -261 417 -291 ct 446 -322 483 -337 528 -337 ct -572 -337 608 -322 636 -292 ct 664 -262 678 -220 678 -166 ct 678 -163 678 -158 677 -151 ct -432 -151 l 434 -115 444 -87 463 -68 ct 481 -49 504 -39 531 -39 ct 552 -39 569 -44 584 -55 ct -598 -66 610 -83 618 -107 ct p -435 -197 m 619 -197 l 616 -225 609 -245 598 -259 ct 580 -280 557 -291 529 -291 ct -503 -291 481 -283 464 -265 ct 447 -248 437 -226 435 -197 ct p ef -867 -50 m 875 -1 l 859 2 845 4 833 4 ct 812 4 797 1 785 -6 ct 774 -12 766 -20 762 -31 ct -757 -41 755 -63 755 -97 ct 755 -287 l 714 -287 l 714 -330 l 755 -330 l -755 -412 l 811 -445 l 811 -330 l 867 -330 l 867 -287 l 811 -287 l -811 -94 l 811 -78 812 -68 814 -63 ct 816 -58 819 -55 823 -52 ct 828 -49 834 -48 842 -48 ct -848 -48 857 -49 867 -50 ct p ef -984 0 m 883 -330 l 941 -330 l 993 -139 l 1012 -69 l 1013 -72 1019 -95 1030 -137 ct -1082 -330 l 1139 -330 l 1189 -138 l 1205 -75 l 1224 -139 l 1280 -330 l -1335 -330 l 1232 0 l 1174 0 l 1121 -197 l 1109 -253 l 1042 0 l 984 0 l -p ef -1346 -165 m 1346 -226 1363 -271 1397 -301 ct 1425 -325 1460 -337 1501 -337 ct -1546 -337 1583 -322 1611 -293 ct 1640 -263 1655 -222 1655 -170 ct 1655 -127 1648 -94 1636 -70 ct -1623 -45 1604 -27 1580 -13 ct 1556 0 1529 7 1501 7 ct 1454 7 1417 -8 1389 -37 ct -1360 -67 1346 -110 1346 -165 ct p -1403 -165 m 1403 -123 1413 -91 1431 -70 ct 1449 -49 1473 -39 1501 -39 ct 1528 -39 1551 -49 1570 -71 ct -1588 -92 1597 -124 1597 -167 ct 1597 -208 1588 -239 1569 -260 ct 1551 -281 1528 -291 1501 -291 ct -1473 -291 1449 -281 1431 -260 ct 1413 -239 1403 -207 1403 -165 ct p ef -1717 0 m 1717 -330 l 1767 -330 l 1767 -280 l 1780 -303 1792 -318 1803 -326 ct -1814 -333 1826 -337 1839 -337 ct 1858 -337 1877 -331 1896 -319 ct 1877 -267 l -1863 -275 1850 -279 1836 -279 ct 1824 -279 1813 -276 1803 -268 ct 1793 -261 1786 -251 1782 -238 ct -1776 -218 1773 -196 1773 -173 ct 1773 0 l 1717 0 l p ef -1930 0 m 1930 -455 l 1986 -455 l 1986 -196 l 2118 -330 l 2190 -330 l -2064 -207 l 2203 0 l 2134 0 l 2025 -169 l 1986 -131 l 1986 0 l 1930 0 l -p ef -pom -gr -gr -gs -gs -pum -26008 8604 t -165 0 m 165 -401 l 15 -401 l 15 -455 l 375 -455 l 375 -401 l 225 -401 l -225 0 l 165 0 l p ef -343 -165 m 343 -226 360 -271 394 -301 ct 422 -325 457 -337 498 -337 ct 543 -337 580 -322 608 -293 ct -637 -263 652 -222 652 -170 ct 652 -127 645 -94 633 -70 ct 620 -45 601 -27 577 -13 ct -553 0 526 7 498 7 ct 451 7 414 -8 386 -37 ct 357 -67 343 -110 343 -165 ct p -400 -165 m 400 -123 410 -91 428 -70 ct 446 -49 470 -39 498 -39 ct 525 -39 548 -49 567 -71 ct -585 -92 594 -124 594 -167 ct 594 -208 585 -239 566 -260 ct 548 -281 525 -291 498 -291 ct -470 -291 446 -281 428 -260 ct 410 -239 400 -207 400 -165 ct p ef -pom -gr -gs -pum -25241 9315 t -42 0 m 42 -330 l 92 -330 l 92 -283 l 116 -319 151 -337 197 -337 ct 217 -337 235 -333 252 -326 ct -268 -319 281 -310 289 -298 ct 297 -287 303 -273 306 -257 ct 308 -247 309 -229 309 -203 ct -309 0 l 254 0 l 254 -200 l 254 -223 251 -240 247 -252 ct 243 -263 235 -272 224 -279 ct -213 -285 200 -289 185 -289 ct 161 -289 141 -281 124 -266 ct 106 -251 98 -222 98 -180 ct -98 0 l 42 0 l p ef -618 -107 m 676 -99 l 667 -66 650 -40 625 -21 ct 601 -2 569 7 531 7 ct 483 7 445 -8 417 -37 ct -388 -67 374 -109 374 -162 ct 374 -218 389 -261 417 -291 ct 446 -322 483 -337 528 -337 ct -572 -337 608 -322 636 -292 ct 664 -262 678 -220 678 -166 ct 678 -163 678 -158 677 -151 ct -432 -151 l 434 -115 444 -87 463 -68 ct 481 -49 504 -39 531 -39 ct 552 -39 569 -44 584 -55 ct -598 -66 610 -83 618 -107 ct p -435 -197 m 619 -197 l 616 -225 609 -245 598 -259 ct 580 -280 557 -291 529 -291 ct -503 -291 481 -283 464 -265 ct 447 -248 437 -226 435 -197 ct p ef -867 -50 m 875 -1 l 859 2 845 4 833 4 ct 812 4 797 1 785 -6 ct 774 -12 766 -20 762 -31 ct -757 -41 755 -63 755 -97 ct 755 -287 l 714 -287 l 714 -330 l 755 -330 l -755 -412 l 811 -445 l 811 -330 l 867 -330 l 867 -287 l 811 -287 l -811 -94 l 811 -78 812 -68 814 -63 ct 816 -58 819 -55 823 -52 ct 828 -49 834 -48 842 -48 ct -848 -48 857 -49 867 -50 ct p ef -984 0 m 883 -330 l 941 -330 l 993 -139 l 1012 -69 l 1013 -72 1019 -95 1030 -137 ct -1082 -330 l 1139 -330 l 1189 -138 l 1205 -75 l 1224 -139 l 1280 -330 l -1335 -330 l 1232 0 l 1174 0 l 1121 -197 l 1109 -253 l 1042 0 l 984 0 l -p ef -1346 -165 m 1346 -226 1363 -271 1397 -301 ct 1425 -325 1460 -337 1501 -337 ct -1546 -337 1583 -322 1611 -293 ct 1640 -263 1655 -222 1655 -170 ct 1655 -127 1648 -94 1636 -70 ct -1623 -45 1604 -27 1580 -13 ct 1556 0 1529 7 1501 7 ct 1454 7 1417 -8 1389 -37 ct -1360 -67 1346 -110 1346 -165 ct p -1403 -165 m 1403 -123 1413 -91 1431 -70 ct 1449 -49 1473 -39 1501 -39 ct 1528 -39 1551 -49 1570 -71 ct -1588 -92 1597 -124 1597 -167 ct 1597 -208 1588 -239 1569 -260 ct 1551 -281 1528 -291 1501 -291 ct -1473 -291 1449 -281 1431 -260 ct 1413 -239 1403 -207 1403 -165 ct p ef -1717 0 m 1717 -330 l 1767 -330 l 1767 -280 l 1780 -303 1792 -318 1803 -326 ct -1814 -333 1826 -337 1839 -337 ct 1858 -337 1877 -331 1896 -319 ct 1877 -267 l -1863 -275 1850 -279 1836 -279 ct 1824 -279 1813 -276 1803 -268 ct 1793 -261 1786 -251 1782 -238 ct -1776 -218 1773 -196 1773 -173 ct 1773 0 l 1717 0 l p ef -1930 0 m 1930 -455 l 1986 -455 l 1986 -196 l 2118 -330 l 2190 -330 l -2064 -207 l 2203 0 l 2134 0 l 2025 -169 l 1986 -131 l 1986 0 l 1930 0 l -p ef -pom -gr -gr -gs -gs -pum -4551 10959 t -29 -146 m 85 -151 l 88 -128 94 -109 104 -95 ct 114 -80 129 -68 150 -59 ct -170 -51 194 -46 220 -46 ct 242 -46 263 -49 280 -56 ct 298 -63 311 -72 320 -84 ct -328 -96 332 -109 332 -123 ct 332 -137 328 -150 320 -161 ct 312 -171 298 -180 279 -187 ct -267 -192 240 -200 198 -210 ct 156 -220 127 -229 110 -238 ct 89 -249 73 -263 62 -280 ct -51 -297 46 -316 46 -337 ct 46 -360 52 -381 65 -401 ct 78 -421 97 -436 122 -447 ct -147 -457 175 -462 206 -462 ct 240 -462 269 -457 295 -446 ct 321 -435 341 -419 354 -398 ct -368 -377 376 -353 377 -326 ct 319 -322 l 316 -351 305 -372 288 -387 ct 270 -402 243 -409 208 -409 ct -172 -409 145 -402 129 -389 ct 112 -376 104 -360 104 -341 ct 104 -324 110 -311 122 -301 ct -133 -290 163 -279 212 -268 ct 261 -257 295 -247 313 -239 ct 339 -227 359 -211 371 -193 ct -384 -174 390 -153 390 -128 ct 390 -104 383 -81 370 -60 ct 356 -38 336 -22 310 -10 ct -284 2 255 8 222 8 ct 181 8 147 2 119 -10 ct 91 -22 69 -40 53 -64 ct 38 -88 29 -115 29 -146 ct -p ef -680 -41 m 659 -24 639 -11 620 -4 ct 601 3 580 7 559 7 ct 522 7 495 -2 475 -20 ct -456 -37 446 -60 446 -87 ct 446 -103 450 -118 457 -131 ct 464 -145 474 -156 486 -164 ct -498 -172 511 -178 526 -182 ct 537 -185 553 -188 576 -190 ct 621 -196 654 -202 675 -209 ct -675 -217 675 -222 675 -224 ct 675 -247 670 -263 660 -272 ct 645 -285 624 -291 596 -291 ct -570 -291 550 -286 538 -277 ct 525 -268 516 -252 510 -228 ct 456 -236 l 461 -259 469 -278 480 -292 ct -491 -307 508 -318 529 -326 ct 551 -333 576 -337 604 -337 ct 632 -337 655 -334 673 -327 ct -690 -321 703 -312 711 -302 ct 720 -292 725 -280 729 -264 ct 731 -255 732 -238 732 -213 ct -732 -138 l 732 -87 733 -54 735 -40 ct 737 -26 742 -13 749 0 ct 691 0 l 685 -12 681 -26 680 -41 ct -p -675 -166 m 655 -157 624 -150 584 -145 ct 561 -141 545 -138 535 -133 ct 526 -129 518 -123 513 -115 ct -508 -107 505 -99 505 -89 ct 505 -74 511 -62 522 -52 ct 534 -42 550 -37 572 -37 ct -593 -37 612 -41 629 -51 ct 646 -60 658 -73 666 -89 ct 672 -102 675 -121 675 -145 ct -675 -166 l p ef -817 0 m 817 -330 l 867 -330 l 867 -283 l 877 -299 891 -312 908 -322 ct -925 -332 945 -337 967 -337 ct 991 -337 1011 -332 1027 -322 ct 1042 -312 1053 -297 1060 -279 ct -1086 -318 1120 -337 1161 -337 ct 1194 -337 1219 -328 1237 -310 ct 1254 -292 1263 -264 1263 -226 ct -1263 0 l 1208 0 l 1208 -208 l 1208 -230 1206 -246 1202 -256 ct 1199 -266 1192 -274 1182 -280 ct -1173 -286 1162 -289 1149 -289 ct 1126 -289 1107 -281 1091 -265 ct 1076 -250 1068 -225 1068 -191 ct -1068 0 l 1013 0 l 1013 -214 l 1013 -239 1008 -258 999 -270 ct 990 -282 975 -289 954 -289 ct -939 -289 924 -284 911 -276 ct 897 -268 888 -256 882 -240 ct 876 -224 873 -201 873 -171 ct -873 0 l 817 0 l p ef -1571 -107 m 1629 -99 l 1620 -66 1603 -40 1578 -21 ct 1554 -2 1522 7 1484 7 ct -1436 7 1398 -8 1370 -37 ct 1341 -67 1327 -109 1327 -162 ct 1327 -218 1342 -261 1370 -291 ct -1399 -322 1436 -337 1481 -337 ct 1525 -337 1561 -322 1589 -292 ct 1617 -262 1631 -220 1631 -166 ct -1631 -163 1631 -158 1630 -151 ct 1385 -151 l 1387 -115 1397 -87 1416 -68 ct -1434 -49 1457 -39 1484 -39 ct 1505 -39 1522 -44 1537 -55 ct 1551 -66 1563 -83 1571 -107 ct -p -1388 -197 m 1572 -197 l 1569 -225 1562 -245 1551 -259 ct 1533 -280 1510 -291 1482 -291 ct -1456 -291 1434 -283 1417 -265 ct 1400 -248 1390 -226 1388 -197 ct p ef -2090 -121 m 2145 -114 l 2139 -76 2123 -46 2099 -25 ct 2074 -4 2044 7 2008 7 ct -1963 7 1926 -8 1899 -37 ct 1872 -67 1858 -109 1858 -164 ct 1858 -199 1864 -230 1875 -257 ct -1887 -284 1905 -304 1929 -317 ct 1953 -330 1980 -337 2008 -337 ct 2044 -337 2073 -328 2096 -310 ct -2118 -292 2133 -266 2139 -233 ct 2085 -224 l 2080 -247 2071 -263 2058 -274 ct -2045 -286 2029 -291 2010 -291 ct 1982 -291 1959 -281 1942 -261 ct 1924 -241 1915 -209 1915 -165 ct -1915 -121 1924 -89 1941 -69 ct 1958 -49 1980 -39 2007 -39 ct 2029 -39 2047 -46 2062 -59 ct -2077 -72 2086 -93 2090 -121 ct p ef -2192 0 m 2192 -455 l 2247 -455 l 2247 0 l 2192 0 l p ef -2311 -165 m 2311 -226 2328 -271 2362 -301 ct 2390 -325 2425 -337 2466 -337 ct -2511 -337 2548 -322 2576 -293 ct 2605 -263 2620 -222 2620 -170 ct 2620 -127 2613 -94 2601 -70 ct -2588 -45 2569 -27 2545 -13 ct 2521 0 2494 7 2466 7 ct 2419 7 2382 -8 2354 -37 ct -2325 -67 2311 -110 2311 -165 ct p -2368 -165 m 2368 -123 2378 -91 2396 -70 ct 2414 -49 2438 -39 2466 -39 ct 2493 -39 2516 -49 2535 -71 ct -2553 -92 2562 -124 2562 -167 ct 2562 -208 2553 -239 2534 -260 ct 2516 -281 2493 -291 2466 -291 ct -2438 -291 2414 -281 2396 -260 ct 2378 -239 2368 -207 2368 -165 ct p ef -2899 -121 m 2954 -114 l 2948 -76 2932 -46 2908 -25 ct 2883 -4 2853 7 2817 7 ct -2772 7 2735 -8 2708 -37 ct 2681 -67 2667 -109 2667 -164 ct 2667 -199 2673 -230 2684 -257 ct -2696 -284 2714 -304 2738 -317 ct 2762 -330 2789 -337 2817 -337 ct 2853 -337 2882 -328 2905 -310 ct -2927 -292 2942 -266 2948 -233 ct 2894 -224 l 2889 -247 2880 -263 2867 -274 ct -2854 -286 2838 -291 2819 -291 ct 2791 -291 2768 -281 2751 -261 ct 2733 -241 2724 -209 2724 -165 ct -2724 -121 2733 -89 2750 -69 ct 2767 -49 2789 -39 2816 -39 ct 2838 -39 2856 -46 2871 -59 ct -2886 -72 2895 -93 2899 -121 ct p ef -3001 0 m 3001 -455 l 3057 -455 l 3057 -196 l 3189 -330 l 3261 -330 l -3135 -207 l 3274 0 l 3205 0 l 3096 -169 l 3057 -131 l 3057 0 l 3001 0 l -p ef -pom -gr -gr -0 6126 t -pom -count op_count sub {pop} repeat countdictstack dict_count sub {end} repeat b4_inc_state restore -%%PageTrailer -%%Trailer -%%EOF diff --git a/speex/doc/components.odg b/speex/doc/components.odg deleted file mode 100644 index 28aa86c9de9f0d78855920e013ef1535257729e3..0000000000000000000000000000000000000000 Binary files a/speex/doc/components.odg and /dev/null differ diff --git a/speex/doc/echo_path.eps b/speex/doc/echo_path.eps deleted file mode 100644 index c5a458c5343ae7cba678bf443f91b5cc8c874c9e..0000000000000000000000000000000000000000 --- a/speex/doc/echo_path.eps +++ /dev/null @@ -1,1298 +0,0 @@ -%!PS-Adobe-3.0 EPSF-3.0 -%%BoundingBox: 0 0 415 235 -%%Pages: 0 -%%Creator: Sun Microsystems, Inc. -%%Title: none -%%CreationDate: none -%%LanguageLevel: 2 -%%EndComments -%%BeginProlog -%%BeginResource: procset SDRes-Prolog 1.0 0 -/b4_inc_state save def -/dict_count countdictstack def -/op_count count 1 sub def -userdict begin -0 setgray 0 setlinecap 1 setlinewidth 0 setlinejoin 10 setmiterlimit[] 0 setdash newpath -/languagelevel where {pop languagelevel 1 ne {false setstrokeadjust false setoverprint} if} if -/bdef {bind def} bind def -/c {setgray} bdef -/l {neg lineto} bdef -/rl {neg rlineto} bdef -/lc {setlinecap} bdef -/lj {setlinejoin} bdef -/lw {setlinewidth} bdef -/ml {setmiterlimit} bdef -/ld {setdash} bdef -/m {neg moveto} bdef -/ct {6 2 roll neg 6 2 roll neg 6 2 roll neg curveto} bdef -/r {rotate} bdef -/t {neg translate} bdef -/s {scale} bdef -/sw {show} bdef -/gs {gsave} bdef -/gr {grestore} bdef -/f {findfont dup length dict begin -{1 index /FID ne {def} {pop pop} ifelse} forall /Encoding ISOLatin1Encoding def -currentdict end /NFont exch definefont pop /NFont findfont} bdef -/p {closepath} bdef -/sf {scalefont setfont} bdef -/ef {eofill}bdef -/pc {closepath stroke}bdef -/ps {stroke}bdef -/pum {matrix currentmatrix}bdef -/pom {setmatrix}bdef -/bs {/aString exch def /nXOfs exch def /nWidth exch def currentpoint nXOfs 0 rmoveto pum nWidth aString stringwidth pop div 1 scale aString show pom moveto} bdef -%%EndResource -%%EndProlog -%%BeginSetup -%%EndSetup -%%Page: 1 1 -%%BeginPageSetup -%%EndPageSetup -pum -0.02836 0.02836 s -0 -8286 t -/tm matrix currentmatrix def -tm setmatrix --3900 -8857 t -1 1 s -0.000 c 10000 12000 m 9581 12419 l 9413 12084 l 10000 12000 l p ef -6989 13478 m 9586 12179 l 9609 12224 l 7011 13522 l 6989 13478 l p ef -0.996 c 8500 13800 m 7500 13800 l 7500 11800 l 9500 11800 l 9500 13800 l -8500 13800 l p ef -50 lw 1 lj 0.000 c 8500 13800 m 7500 13800 l 7500 11800 l 9500 11800 l -9500 13800 l 8500 13800 l pc -gs -gs -pum -8080 12960 t -103 -334 m 103 -334 103 -334 8 -334 ct 8 -334 8 -334 8 -323 ct 31 -318 34 -314 34 -294 ct -34 -294 34 -294 34 -42 ct 34 -21 30 -16 8 -12 ct 8 -12 8 -12 8 0 ct 8 0 8 0 127 0 ct -127 0 127 0 127 -12 ct 109 -14 103 -22 103 -40 ct 103 -40 103 -40 103 -172 ct 103 -174 106 -179 111 -184 ct -122 -195 134 -201 145 -201 ct 163 -201 171 -188 171 -160 ct 171 -160 171 -160 171 -40 ct -171 -22 165 -14 148 -12 ct 148 -12 148 -12 148 0 ct 148 0 148 0 264 0 ct 264 0 264 0 264 -12 ct -246 -13 240 -21 240 -42 ct 240 -42 240 -42 240 -164 ct 240 -207 213 -234 173 -234 ct -147 -234 128 -224 103 -195 ct 103 -195 103 -195 103 -334 ct p ef -pom -gr -gs -pum -8351 12960 t -143 -334 m 107 -310 92 -297 75 -274 ct 40 -231 23 -182 23 -124 ct 23 -62 41 -13 84 37 ct -104 61 116 72 141 87 ct 141 87 141 87 147 79 ct 108 48 95 31 82 -6 ct 70 -39 65 -76 65 -126 ct -65 -178 71 -218 84 -249 ct 98 -279 112 -297 147 -326 ct 147 -326 147 -326 143 -334 ct -p ef -pom -gr -gs -pum -8516 12960 t -227 -58 m 227 -58 227 -58 217 -45 ct 203 -27 194 -19 187 -19 ct 183 -19 179 -23 179 -27 ct -179 -31 179 -31 186 -58 ct 186 -58 186 -58 214 -160 ct 216 -170 218 -181 218 -188 ct -218 -206 205 -218 186 -218 ct 154 -218 123 -189 72 -110 ct 72 -110 72 -110 105 -217 ct -105 -217 105 -217 104 -218 ct 77 -213 67 -211 24 -203 ct 24 -203 24 -203 24 -195 ct -49 -195 55 -192 55 -182 ct 55 -179 55 -176 54 -173 ct 54 -173 54 -173 7 0 ct 7 0 7 0 44 0 ct -67 -78 72 -89 93 -123 ct 123 -168 148 -193 166 -193 ct 174 -193 178 -188 178 -179 ct -178 -173 175 -156 171 -141 ct 171 -141 171 -141 150 -60 ct 143 -35 142 -28 142 -23 ct -142 -4 149 4 165 4 ct 187 4 200 -6 234 -52 ct 234 -52 234 -52 227 -58 ct p ef -pom -gr -gs -pum -8766 12960 t -18 87 m 54 64 69 51 87 28 ct 121 -15 138 -64 138 -122 ct 138 -185 120 -233 77 -283 ct -58 -307 45 -318 20 -334 ct 20 -334 20 -334 14 -326 ct 53 -295 66 -277 79 -240 ct -91 -207 96 -170 96 -120 ct 96 -69 90 -28 77 2 ct 63 33 49 51 14 79 ct 14 79 14 79 18 87 ct -p ef -pom -gr -gr -14100 16000 m 13824 16000 13600 15776 13600 15500 ct 13600 15224 13824 15000 14100 15000 ct -14376 15000 14600 15224 14600 15500 ct 14600 15776 14376 16000 14100 16000 ct -pc -gs -gs -pum -13954 15668 t -121 -141 m 15 -141 l 15 -108 l 121 -108 l 121 0 l 153 0 l 153 -108 l -259 -108 l 259 -141 l 153 -141 l 153 -250 l 121 -250 l 121 -141 l -p ef -pom -gr -gr -8500 16000 m 8224 16000 8000 15776 8000 15500 ct 8000 15224 8224 15000 8500 15000 ct -8776 15000 9000 15224 9000 15500 ct 9000 15776 8776 16000 8500 16000 ct pc -8500 15000 m 8313 14438 l 8688 14438 l 8500 15000 l p ef -8525 13800 m 8525 14550 l 8475 14550 l 8475 13800 l 8525 13800 l p ef -9000 15500 m 9563 15313 l 9563 15688 l 9000 15500 l p ef -13600 15525 m 9450 15525 l 9450 15475 l 13600 15475 l 13600 15525 l -p ef -14100 13800 m 13100 13800 l 13100 11800 l 15100 11800 l 15100 13800 l -14100 13800 l pc -gs -gs -pum -13663 12960 t -103 -334 m 103 -334 103 -334 8 -334 ct 8 -334 8 -334 8 -323 ct 31 -318 34 -314 34 -294 ct -34 -294 34 -294 34 -42 ct 34 -21 30 -16 8 -12 ct 8 -12 8 -12 8 0 ct 8 0 8 0 127 0 ct -127 0 127 0 127 -12 ct 109 -14 103 -22 103 -40 ct 103 -40 103 -40 103 -172 ct 103 -174 106 -179 111 -184 ct -122 -195 134 -201 145 -201 ct 163 -201 171 -188 171 -160 ct 171 -160 171 -160 171 -40 ct -171 -22 165 -14 148 -12 ct 148 -12 148 -12 148 0 ct 148 0 148 0 264 0 ct 264 0 264 0 264 -12 ct -246 -13 240 -21 240 -42 ct 240 -42 240 -42 240 -164 ct 240 -207 213 -234 173 -234 ct -147 -234 128 -224 103 -195 ct 103 -195 103 -195 103 -334 ct p ef -pom -gr -gs -pum -13934 12960 t -143 -334 m 107 -310 92 -297 75 -274 ct 40 -231 23 -182 23 -124 ct 23 -62 41 -13 84 37 ct -104 61 116 72 141 87 ct 141 87 141 87 147 79 ct 108 48 95 31 82 -6 ct 70 -39 65 -76 65 -126 ct -65 -178 71 -218 84 -249 ct 98 -279 112 -297 147 -326 ct 147 -326 147 -326 143 -334 ct -p ef -pom -gr -gs -pum -14099 12960 t -227 -58 m 227 -58 227 -58 217 -45 ct 203 -27 194 -19 187 -19 ct 183 -19 179 -23 179 -27 ct -179 -31 179 -31 186 -58 ct 186 -58 186 -58 214 -160 ct 216 -170 218 -181 218 -188 ct -218 -206 205 -218 186 -218 ct 154 -218 123 -189 72 -110 ct 72 -110 72 -110 105 -217 ct -105 -217 105 -217 104 -218 ct 77 -213 67 -211 24 -203 ct 24 -203 24 -203 24 -195 ct -49 -195 55 -192 55 -182 ct 55 -179 55 -176 54 -173 ct 54 -173 54 -173 7 0 ct 7 0 7 0 44 0 ct -67 -78 72 -89 93 -123 ct 123 -168 148 -193 166 -193 ct 174 -193 178 -188 178 -179 ct -178 -173 175 -156 171 -141 ct 171 -141 171 -141 150 -60 ct 143 -35 142 -28 142 -23 ct -142 -4 149 4 165 4 ct 187 4 200 -6 234 -52 ct 234 -52 234 -52 227 -58 ct p ef -pom -gr -gs -pum -14349 12960 t -18 87 m 54 64 69 51 87 28 ct 121 -15 138 -64 138 -122 ct 138 -185 120 -233 77 -283 ct -58 -307 45 -318 20 -334 ct 20 -334 20 -334 14 -326 ct 53 -295 66 -277 79 -240 ct -91 -207 96 -170 96 -120 ct 96 -69 90 -28 77 2 ct 63 33 49 51 14 79 ct 14 79 14 79 18 87 ct -p ef -pom -gr -gr -14100 15000 m 13913 14438 l 14288 14438 l 14100 15000 l p ef -14125 13800 m 14125 14550 l 14075 14550 l 14075 13800 l 14125 13800 l -p ef -5900 15500 m 6463 15313 l 6463 15688 l 5900 15500 l p ef -8000 15525 m 6350 15525 l 6350 15475 l 8000 15475 l 8000 15525 l p ef -8500 11800 m 8313 11238 l 8688 11238 l 8500 11800 l p ef -5600 10575 m 8500 10575 l 8500 10600 l 8500 10625 l 5600 10625 l 5600 10600 l -5600 10575 l p ef -8500 10600 m 8500 10575 l 8504 10575 l 8509 10577 l 8512 10578 l 8516 10581 l -8519 10584 l 8522 10587 l 8523 10591 l 8525 10596 l 8525 10600 l 8525 10600 l -8500 10600 l p ef -8525 10600 m 8525 11350 l 8500 11350 l 8475 11350 l 8475 10600 l 8500 10600 l -8525 10600 l p ef -14600 15500 m 15163 15313 l 15163 15688 l 14600 15500 l p ef -15900 15525 m 15050 15525 l 15050 15475 l 15900 15475 l 15900 15525 l -p ef -14100 11800 m 13913 11238 l 14288 11238 l 14100 11800 l p ef -5600 10575 m 14100 10575 l 14100 10600 l 14100 10625 l 5600 10625 l -5600 10600 l 5600 10575 l p ef -14100 10600 m 14100 10575 l 14104 10575 l 14109 10577 l 14112 10578 l -14116 10581 l 14119 10584 l 14122 10587 l 14123 10591 l 14125 10596 l -14125 10600 l 14125 10600 l 14100 10600 l p ef -14125 10600 m 14125 11350 l 14100 11350 l 14075 11350 l 14075 10600 l -14100 10600 l 14125 10600 l p ef -7000 15500 m 7000 13500 l ps -gs -gs -pum -16150 15536 t -10 -200 m 16 -200 20 -200 25 -200 ct 44 -200 49 -192 56 -146 ct 61 -112 67 -37 67 -8 ct -67 6 68 9 72 9 ct 84 9 130 -43 180 -114 ct 198 -138 210 -170 210 -189 ct 210 -205 198 -218 183 -218 ct -172 -218 165 -212 165 -201 ct 165 -193 167 -188 176 -180 ct 183 -174 185 -170 185 -165 ct -185 -142 153 -87 118 -50 ct 118 -50 118 -50 102 -35 ct 99 -104 96 -130 89 -167 ct -80 -217 80 -218 75 -218 ct 73 -218 69 -217 65 -216 ct 56 -214 29 -209 10 -206 ct -10 -206 10 -206 10 -200 ct p ef -pom -gr -gs -pum -16370 15536 t -143 -334 m 107 -310 92 -297 75 -274 ct 40 -231 23 -182 23 -124 ct 23 -62 41 -13 84 37 ct -104 61 116 72 141 87 ct 141 87 141 87 147 79 ct 108 48 95 31 82 -6 ct 70 -39 65 -76 65 -126 ct -65 -178 71 -218 84 -249 ct 98 -279 112 -297 147 -326 ct 147 -326 147 -326 143 -334 ct -p ef -pom -gr -gs -pum -16535 15536 t -227 -58 m 227 -58 227 -58 217 -45 ct 203 -27 194 -19 187 -19 ct 183 -19 179 -23 179 -27 ct -179 -31 179 -31 186 -58 ct 186 -58 186 -58 214 -160 ct 216 -170 218 -181 218 -188 ct -218 -206 205 -218 186 -218 ct 154 -218 123 -189 72 -110 ct 72 -110 72 -110 105 -217 ct -105 -217 105 -217 104 -218 ct 77 -213 67 -211 24 -203 ct 24 -203 24 -203 24 -195 ct -49 -195 55 -192 55 -182 ct 55 -179 55 -176 54 -173 ct 54 -173 54 -173 7 0 ct 7 0 7 0 44 0 ct -67 -78 72 -89 93 -123 ct 123 -168 148 -193 166 -193 ct 174 -193 178 -188 178 -179 ct -178 -173 175 -156 171 -141 ct 171 -141 171 -141 150 -60 ct 143 -35 142 -28 142 -23 ct -142 -4 149 4 165 4 ct 187 4 200 -6 234 -52 ct 234 -52 234 -52 227 -58 ct p ef -pom -gr -gs -pum -16785 15536 t -18 87 m 54 64 69 51 87 28 ct 121 -15 138 -64 138 -122 ct 138 -185 120 -233 77 -283 ct -58 -307 45 -318 20 -334 ct 20 -334 20 -334 14 -326 ct 53 -295 66 -277 79 -240 ct -91 -207 96 -170 96 -120 ct 96 -69 90 -28 77 2 ct 63 33 49 51 14 79 ct 14 79 14 79 18 87 ct -p ef -pom -gr -gr -gs -gs -pum -9747 15298 t -229 -55 m 202 -24 197 -20 188 -20 ct 183 -20 179 -24 179 -30 ct 179 -37 195 -97 211 -152 ct -225 -197 235 -237 260 -336 ct 260 -336 260 -336 258 -338 ct 232 -333 214 -330 182 -327 ct -182 -327 182 -327 182 -318 ct 209 -318 213 -316 213 -306 ct 213 -299 212 -296 206 -271 ct -206 -271 206 -271 184 -190 ct 180 -210 171 -218 152 -218 ct 87 -218 7 -125 7 -51 ct -7 -16 27 5 59 5 ct 93 5 115 -11 148 -60 ct 143 -35 142 -27 142 -16 ct 142 -3 150 6 163 6 ct -183 6 209 -14 235 -50 ct 235 -50 235 -50 229 -55 ct p -154 -207 m 168 -207 176 -198 176 -180 ct 176 -104 124 -19 79 -19 ct 62 -19 50 -32 50 -51 ct -50 -92 75 -149 108 -183 ct 122 -198 140 -207 154 -207 ct p ef -pom -gr -gs -pum -9997 15298 t -143 -334 m 107 -310 92 -297 75 -274 ct 40 -231 23 -182 23 -124 ct 23 -62 41 -13 84 37 ct -104 61 116 72 141 87 ct 141 87 141 87 147 79 ct 108 48 95 31 82 -6 ct 70 -39 65 -76 65 -126 ct -65 -178 71 -218 84 -249 ct 98 -279 112 -297 147 -326 ct 147 -326 147 -326 143 -334 ct -p ef -pom -gr -gs -pum -10162 15298 t -227 -58 m 227 -58 227 -58 217 -45 ct 203 -27 194 -19 187 -19 ct 183 -19 179 -23 179 -27 ct -179 -31 179 -31 186 -58 ct 186 -58 186 -58 214 -160 ct 216 -170 218 -181 218 -188 ct -218 -206 205 -218 186 -218 ct 154 -218 123 -189 72 -110 ct 72 -110 72 -110 105 -217 ct -105 -217 105 -217 104 -218 ct 77 -213 67 -211 24 -203 ct 24 -203 24 -203 24 -195 ct -49 -195 55 -192 55 -182 ct 55 -179 55 -176 54 -173 ct 54 -173 54 -173 7 0 ct 7 0 7 0 44 0 ct -67 -78 72 -89 93 -123 ct 123 -168 148 -193 166 -193 ct 174 -193 178 -188 178 -179 ct -178 -173 175 -156 171 -141 ct 171 -141 171 -141 150 -60 ct 143 -35 142 -28 142 -23 ct -142 -4 149 4 165 4 ct 187 4 200 -6 234 -52 ct 234 -52 234 -52 227 -58 ct p ef -pom -gr -gs -pum -10412 15298 t -18 87 m 54 64 69 51 87 28 ct 121 -15 138 -64 138 -122 ct 138 -185 120 -233 77 -283 ct -58 -307 45 -318 20 -334 ct 20 -334 20 -334 14 -326 ct 53 -295 66 -277 79 -240 ct -91 -207 96 -170 96 -120 ct 96 -69 90 -28 77 2 ct 63 33 49 51 14 79 ct 14 79 14 79 18 87 ct -p ef -pom -gr -gr -gs -gs -pum -4561 10747 t -199 -55 m 195 -51 192 -48 188 -42 ct 176 -27 170 -22 165 -22 ct 158 -22 153 -29 150 -42 ct -149 -46 148 -49 148 -51 ct 135 -101 130 -123 130 -131 ct 152 -169 169 -190 178 -190 ct -181 -190 185 -189 190 -186 ct 196 -183 200 -182 204 -182 ct 214 -182 221 -189 221 -200 ct -221 -210 212 -218 201 -218 ct 179 -218 160 -200 126 -147 ct 126 -147 126 -147 121 -175 ct -114 -208 108 -218 95 -218 ct 84 -218 67 -214 37 -204 ct 37 -204 37 -204 32 -202 ct -32 -202 32 -202 34 -194 ct 52 -199 57 -200 61 -200 ct 74 -200 77 -195 83 -166 ct -83 -166 83 -166 98 -105 ct 98 -105 98 -105 57 -47 ct 47 -33 38 -24 32 -24 ct 29 -24 24 -25 19 -28 ct -13 -32 7 -33 3 -33 ct -6 -33 -13 -26 -13 -16 ct -13 -3 -3 5 11 5 ct 27 5 33 1 57 -30 ct -71 -45 81 -59 102 -87 ct 102 -87 102 -87 117 -28 ct 123 -3 129 5 145 5 ct 164 5 177 -7 206 -51 ct -206 -51 206 -51 199 -55 ct p ef -pom -gr -gs -pum -4781 10747 t -143 -334 m 107 -310 92 -297 75 -274 ct 40 -231 23 -182 23 -124 ct 23 -62 41 -13 84 37 ct -104 61 116 72 141 87 ct 141 87 141 87 147 79 ct 108 48 95 31 82 -6 ct 70 -39 65 -76 65 -126 ct -65 -178 71 -218 84 -249 ct 98 -279 112 -297 147 -326 ct 147 -326 147 -326 143 -334 ct -p ef -pom -gr -gs -pum -4946 10747 t -227 -58 m 227 -58 227 -58 217 -45 ct 203 -27 194 -19 187 -19 ct 183 -19 179 -23 179 -27 ct -179 -31 179 -31 186 -58 ct 186 -58 186 -58 214 -160 ct 216 -170 218 -181 218 -188 ct -218 -206 205 -218 186 -218 ct 154 -218 123 -189 72 -110 ct 72 -110 72 -110 105 -217 ct -105 -217 105 -217 104 -218 ct 77 -213 67 -211 24 -203 ct 24 -203 24 -203 24 -195 ct -49 -195 55 -192 55 -182 ct 55 -179 55 -176 54 -173 ct 54 -173 54 -173 7 0 ct 7 0 7 0 44 0 ct -67 -78 72 -89 93 -123 ct 123 -168 148 -193 166 -193 ct 174 -193 178 -188 178 -179 ct -178 -173 175 -156 171 -141 ct 171 -141 171 -141 150 -60 ct 143 -35 142 -28 142 -23 ct -142 -4 149 4 165 4 ct 187 4 200 -6 234 -52 ct 234 -52 234 -52 227 -58 ct p ef -pom -gr -gs -pum -5196 10747 t -18 87 m 54 64 69 51 87 28 ct 121 -15 138 -64 138 -122 ct 138 -185 120 -233 77 -283 ct -58 -307 45 -318 20 -334 ct 20 -334 20 -334 14 -326 ct 53 -295 66 -277 79 -240 ct -91 -207 96 -170 96 -120 ct 96 -69 90 -28 77 2 ct 63 33 49 51 14 79 ct 14 79 14 79 18 87 ct -p ef -pom -gr -gr -gs -gs -pum -4932 15694 t -177 -54 m 141 -25 126 -17 105 -17 ct 77 -17 58 -35 58 -62 ct 58 -69 59 -77 63 -92 ct -63 -92 63 -92 77 -94 ct 151 -105 204 -142 204 -185 ct 204 -206 189 -218 164 -218 ct -93 -218 15 -137 15 -63 ct 15 -23 42 5 81 5 ct 116 5 154 -15 183 -48 ct 183 -48 183 -48 177 -54 ct -p -75 -125 m 92 -169 128 -207 154 -207 ct 164 -207 171 -199 171 -188 ct 171 -172 162 -155 146 -140 ct -128 -123 109 -114 67 -103 ct 67 -103 67 -103 75 -125 ct p ef -pom -gr -gs -pum -5152 15694 t -143 -334 m 107 -310 92 -297 75 -274 ct 40 -231 23 -182 23 -124 ct 23 -62 41 -13 84 37 ct -104 61 116 72 141 87 ct 141 87 141 87 147 79 ct 108 48 95 31 82 -6 ct 70 -39 65 -76 65 -126 ct -65 -178 71 -218 84 -249 ct 98 -279 112 -297 147 -326 ct 147 -326 147 -326 143 -334 ct -p ef -pom -gr -gs -pum -5317 15694 t -227 -58 m 227 -58 227 -58 217 -45 ct 203 -27 194 -19 187 -19 ct 183 -19 179 -23 179 -27 ct -179 -31 179 -31 186 -58 ct 186 -58 186 -58 214 -160 ct 216 -170 218 -181 218 -188 ct -218 -206 205 -218 186 -218 ct 154 -218 123 -189 72 -110 ct 72 -110 72 -110 105 -217 ct -105 -217 105 -217 104 -218 ct 77 -213 67 -211 24 -203 ct 24 -203 24 -203 24 -195 ct -49 -195 55 -192 55 -182 ct 55 -179 55 -176 54 -173 ct 54 -173 54 -173 7 0 ct 7 0 7 0 44 0 ct -67 -78 72 -89 93 -123 ct 123 -168 148 -193 166 -193 ct 174 -193 178 -188 178 -179 ct -178 -173 175 -156 171 -141 ct 171 -141 171 -141 150 -60 ct 143 -35 142 -28 142 -23 ct -142 -4 149 4 165 4 ct 187 4 200 -6 234 -52 ct 234 -52 234 -52 227 -58 ct p ef -pom -gr -gs -pum -5567 15694 t -18 87 m 54 64 69 51 87 28 ct 121 -15 138 -64 138 -122 ct 138 -185 120 -233 77 -283 ct -58 -307 45 -318 20 -334 ct 20 -334 20 -334 14 -326 ct 53 -295 66 -277 79 -240 ct -91 -207 96 -170 96 -120 ct 96 -69 90 -28 77 2 ct 63 33 49 51 14 79 ct 14 79 14 79 18 87 ct -p ef -pom -gr -gr -gs -gs -pum -8954 15959 t -121 -141 m 15 -141 l 15 -108 l 121 -108 l 121 0 l 153 0 l 153 -108 l -259 -108 l 259 -141 l 153 -141 l 153 -250 l 121 -250 l 121 -141 l -p ef -pom -gr -gr -gs -gs -pum -8848 15033 t -19 -127 m 19 -96 l 138 -96 l 138 -127 l 19 -127 l p ef -pom -gr -gr -gs -gs -pum -8080 12705 t -45 -147 m 114 -290 l 183 -147 l 216 -147 l 128 -327 l 99 -327 l 12 -147 l -45 -147 l p ef -pom -gr -gr -0.996 c 12400 9601 m 12394 11602 l 11895 11099 l 11897 10099 l 12400 9601 l -p ef -0.000 c 12400 9601 m 12394 11602 l 11895 11099 l 11897 10099 l 12400 9601 l -pc -0.996 c 11397 10599 m 11398 10099 l 11898 10100 l 11895 11100 l 11395 11099 l -11397 10599 l p ef -0.000 c 11397 10599 m 11398 10099 l 11898 10100 l 11895 11100 l 11395 11099 l -11397 10599 l pc -0.996 c 11900 16000 m 11624 16000 11400 15776 11400 15500 ct 11400 15224 11624 15000 11900 15000 ct -12176 15000 12400 15224 12400 15500 ct 12400 15776 12176 16000 11900 16000 ct -p ef -0.000 c 11900 16000 m 11624 16000 11400 15776 11400 15500 ct 11400 15224 11624 15000 11900 15000 ct -12176 15000 12400 15224 12400 15500 ct 12400 15776 12176 16000 11900 16000 ct -pc -12400 15000 m 12400 16000 l ps -gs -gs -pum -14880 16144 t -8 -196 m 11 -198 15 -198 21 -198 ct 34 -198 39 -191 39 -166 ct 39 -166 39 -166 39 -44 ct -39 -15 33 -8 9 -8 ct 9 -8 9 -8 9 0 ct 9 0 9 0 111 0 ct 111 0 111 0 111 -8 ct 87 -8 79 -14 79 -32 ct -79 -32 79 -32 79 -171 ct 103 -194 113 -200 129 -200 ct 153 -200 165 -184 165 -152 ct -165 -152 165 -152 165 -48 ct 165 -17 158 -8 134 -8 ct 134 -8 134 -8 134 0 ct 134 0 134 0 235 0 ct -235 0 235 0 235 -7 ct 211 -10 205 -16 205 -40 ct 205 -40 205 -40 205 -153 ct 205 -199 184 -227 148 -227 ct -126 -227 111 -219 78 -187 ct 78 -187 78 -187 78 -226 ct 78 -226 78 -226 75 -227 ct -51 -218 34 -213 8 -205 ct 8 -205 8 -205 8 -196 ct p ef -448 -81 m 424 -43 403 -29 372 -29 ct 345 -29 324 -43 310 -72 ct 301 -90 298 -107 297 -137 ct -297 -137 297 -137 446 -137 ct 442 -169 437 -183 425 -199 ct 411 -217 388 -227 363 -227 ct -339 -227 316 -218 298 -201 ct 275 -181 262 -146 262 -106 ct 262 -37 297 5 353 5 ct -399 5 435 -24 455 -78 ct 455 -78 455 -78 448 -81 ct p -298 -153 m 303 -191 320 -209 349 -209 ct 379 -209 390 -196 397 -153 ct 397 -153 397 -153 298 -153 ct -p ef -684 -32 m 676 -26 670 -23 663 -23 ct 652 -23 648 -30 648 -52 ct 648 -52 648 -52 648 -148 ct -648 -173 646 -188 638 -200 ct 628 -218 607 -227 578 -227 ct 533 -227 497 -203 497 -171 ct -497 -160 507 -150 518 -150 ct 530 -150 540 -160 540 -171 ct 540 -173 539 -175 539 -179 ct -538 -183 537 -187 537 -191 ct 537 -204 553 -215 572 -215 ct 596 -215 609 -201 609 -174 ct -609 -174 609 -174 609 -144 ct 534 -113 526 -109 505 -90 ct 495 -81 488 -64 488 -48 ct -488 -17 509 5 539 5 ct 560 5 580 -5 609 -31 ct 612 -5 621 5 640 5 ct 657 5 667 -1 684 -20 ct -684 -20 684 -20 684 -32 ct p -609 -61 m 609 -45 607 -41 596 -35 ct 585 -28 571 -24 561 -24 ct 544 -24 531 -40 531 -62 ct -531 -62 531 -62 531 -63 ct 531 -92 550 -110 609 -132 ct 609 -132 609 -132 609 -61 ct -p ef -693 -192 m 700 -194 705 -194 710 -194 ct 722 -194 727 -186 727 -164 ct 727 -164 727 -164 727 -41 ct -727 -17 723 -13 692 -7 ct 692 -7 692 -7 692 0 ct 692 0 692 0 809 0 ct 809 0 809 0 809 -8 ct -776 -8 767 -15 767 -44 ct 767 -44 767 -44 767 -155 ct 767 -171 788 -196 801 -196 ct -804 -196 809 -193 814 -188 ct 822 -182 827 -179 833 -179 ct 845 -179 852 -187 852 -201 ct -852 -217 842 -227 826 -227 ct 805 -227 791 -216 767 -181 ct 767 -181 767 -181 767 -226 ct -767 -226 767 -226 765 -227 ct 739 -216 722 -210 693 -200 ct 693 -200 693 -200 693 -192 ct -p ef -1176 -81 m 1152 -43 1131 -29 1100 -29 ct 1073 -29 1052 -43 1038 -72 ct 1029 -90 1026 -107 1025 -137 ct -1025 -137 1025 -137 1174 -137 ct 1170 -169 1165 -183 1153 -199 ct 1139 -217 1116 -227 1091 -227 ct -1067 -227 1044 -218 1026 -201 ct 1003 -181 990 -146 990 -106 ct 990 -37 1025 5 1081 5 ct -1127 5 1163 -24 1183 -78 ct 1183 -78 1183 -78 1176 -81 ct p -1026 -153 m 1031 -191 1048 -209 1077 -209 ct 1107 -209 1118 -196 1125 -153 ct -1125 -153 1125 -153 1026 -153 ct p ef -1206 -196 m 1209 -198 1213 -198 1219 -198 ct 1232 -198 1237 -191 1237 -166 ct -1237 -166 1237 -166 1237 -44 ct 1237 -15 1231 -8 1207 -8 ct 1207 -8 1207 -8 1207 0 ct -1207 0 1207 0 1309 0 ct 1309 0 1309 0 1309 -8 ct 1285 -8 1277 -14 1277 -32 ct 1277 -32 1277 -32 1277 -171 ct -1301 -194 1311 -200 1327 -200 ct 1351 -200 1363 -184 1363 -152 ct 1363 -152 1363 -152 1363 -48 ct -1363 -17 1356 -8 1332 -8 ct 1332 -8 1332 -8 1332 0 ct 1332 0 1332 0 1433 0 ct 1433 0 1433 0 1433 -7 ct -1409 -10 1403 -16 1403 -40 ct 1403 -40 1403 -40 1403 -153 ct 1403 -199 1382 -227 1346 -227 ct -1324 -227 1309 -219 1276 -187 ct 1276 -187 1276 -187 1276 -226 ct 1276 -226 1276 -226 1273 -227 ct -1249 -218 1232 -213 1206 -205 ct 1206 -205 1206 -205 1206 -196 ct p ef -1615 5 m 1615 5 1615 5 1686 -21 ct 1686 -21 1686 -21 1686 -28 ct 1677 -28 1676 -28 1675 -28 ct -1657 -28 1653 -33 1653 -56 ct 1653 -56 1653 -56 1653 -336 ct 1653 -336 1653 -336 1651 -337 ct -1628 -329 1611 -324 1580 -315 ct 1580 -315 1580 -315 1580 -308 ct 1584 -308 1586 -308 1590 -308 ct -1608 -308 1613 -303 1613 -283 ct 1613 -283 1613 -283 1613 -206 ct 1594 -222 1581 -227 1562 -227 ct -1506 -227 1461 -171 1461 -101 ct 1461 -38 1497 5 1551 5 ct 1578 5 1596 -5 1613 -28 ct -1613 -28 1613 -28 1613 4 ct 1613 4 1613 4 1615 5 ct p -1613 -50 m 1613 -47 1609 -41 1604 -35 ct 1596 -26 1584 -21 1570 -21 ct 1529 -21 1503 -60 1503 -121 ct -1503 -177 1526 -213 1563 -213 ct 1589 -213 1613 -190 1613 -164 ct 1613 -164 1613 -164 1613 -50 ct -p ef -1973 -155 m 1973 -155 1973 -155 1971 -222 ct 1971 -222 1971 -222 1965 -222 ct -1965 -222 1965 -222 1964 -221 ct 1960 -218 1959 -217 1957 -217 ct 1955 -217 1950 -218 1944 -221 ct -1934 -225 1923 -227 1911 -227 ct 1872 -227 1845 -202 1845 -166 ct 1845 -138 1860 -118 1901 -95 ct -1901 -95 1901 -95 1929 -78 ct 1946 -69 1955 -57 1955 -41 ct 1955 -20 1939 -6 1914 -6 ct -1898 -6 1883 -12 1874 -23 ct 1864 -35 1859 -47 1853 -75 ct 1853 -75 1853 -75 1845 -75 ct -1845 -75 1845 -75 1845 2 ct 1845 2 1845 2 1851 2 ct 1855 -3 1857 -4 1863 -4 ct -1867 -4 1874 -3 1885 0 ct 1898 3 1912 5 1920 5 ct 1957 5 1988 -24 1988 -58 ct 1988 -83 1977 -99 1948 -117 ct -1948 -117 1948 -117 1896 -148 ct 1882 -156 1875 -169 1875 -182 ct 1875 -202 1890 -216 1912 -216 ct -1940 -216 1954 -199 1965 -155 ct 1965 -155 1965 -155 1973 -155 ct p ef -2019 -195 m 2024 -195 2027 -195 2031 -195 ct 2048 -195 2051 -190 2051 -167 ct -2051 -167 2051 -167 2051 65 ct 2051 90 2046 96 2017 99 ct 2017 99 2017 99 2017 107 ct -2017 107 2017 107 2135 107 ct 2135 107 2135 107 2135 98 ct 2098 98 2092 93 2092 61 ct -2092 61 2092 61 2092 -16 ct 2109 0 2121 5 2141 5 ct 2198 5 2243 -50 2243 -122 ct -2243 -183 2209 -227 2162 -227 ct 2135 -227 2113 -215 2092 -189 ct 2092 -189 2092 -189 2092 -226 ct -2092 -226 2092 -226 2089 -227 ct 2063 -217 2046 -210 2019 -202 ct 2019 -202 2019 -202 2019 -195 ct -p -2092 -165 m 2092 -180 2119 -197 2141 -197 ct 2177 -197 2201 -160 2201 -103 ct -2201 -48 2177 -11 2142 -11 ct 2120 -11 2092 -29 2092 -44 ct 2092 -44 2092 -44 2092 -165 ct -p ef -2463 -81 m 2439 -43 2418 -29 2387 -29 ct 2360 -29 2339 -43 2325 -72 ct 2316 -90 2313 -107 2312 -137 ct -2312 -137 2312 -137 2461 -137 ct 2457 -169 2452 -183 2440 -199 ct 2426 -217 2403 -227 2378 -227 ct -2354 -227 2331 -218 2313 -201 ct 2290 -181 2277 -146 2277 -106 ct 2277 -37 2312 5 2368 5 ct -2414 5 2450 -24 2470 -78 ct 2470 -78 2470 -78 2463 -81 ct p -2313 -153 m 2318 -191 2335 -209 2364 -209 ct 2394 -209 2405 -196 2412 -153 ct -2412 -153 2412 -153 2313 -153 ct p ef -2683 -81 m 2659 -43 2638 -29 2607 -29 ct 2580 -29 2559 -43 2545 -72 ct 2536 -90 2533 -107 2532 -137 ct -2532 -137 2532 -137 2681 -137 ct 2677 -169 2672 -183 2660 -199 ct 2646 -217 2623 -227 2598 -227 ct -2574 -227 2551 -218 2533 -201 ct 2510 -181 2497 -146 2497 -106 ct 2497 -37 2532 5 2588 5 ct -2634 5 2670 -24 2690 -78 ct 2690 -78 2690 -78 2683 -81 ct p -2533 -153 m 2538 -191 2555 -209 2584 -209 ct 2614 -209 2625 -196 2632 -153 ct -2632 -153 2632 -153 2533 -153 ct p ef -2898 -77 m 2874 -42 2857 -31 2829 -31 ct 2785 -31 2754 -70 2754 -127 ct 2754 -178 2781 -213 2820 -213 ct -2838 -213 2844 -207 2849 -189 ct 2849 -189 2849 -189 2852 -178 ct 2856 -164 2864 -155 2874 -155 ct -2887 -155 2898 -164 2898 -176 ct 2898 -204 2864 -227 2823 -227 ct 2799 -227 2775 -217 2755 -199 ct -2731 -178 2717 -144 2717 -105 ct 2717 -41 2755 5 2809 5 ct 2831 5 2850 -3 2868 -18 ct -2881 -30 2890 -43 2904 -72 ct 2904 -72 2904 -72 2898 -77 ct p ef -3001 -169 m 3021 -192 3036 -200 3055 -200 ct 3079 -200 3091 -182 3091 -148 ct -3091 -148 3091 -148 3091 -50 ct 3091 -16 3086 -10 3058 -7 ct 3058 -7 3058 -7 3058 0 ct -3058 0 3058 0 3161 0 ct 3161 0 3161 0 3161 -7 ct 3135 -12 3132 -16 3132 -50 ct -3132 -50 3132 -50 3132 -148 ct 3132 -200 3111 -227 3072 -227 ct 3044 -227 3023 -215 3001 -185 ct -3001 -185 3001 -185 3001 -336 ct 3001 -336 3001 -336 2999 -337 ct 2982 -331 2970 -327 2943 -319 ct -2943 -319 2943 -319 2930 -315 ct 2930 -315 2930 -315 2930 -308 ct 2932 -308 2933 -308 2936 -308 ct -2956 -308 2960 -304 2960 -283 ct 2960 -283 2960 -283 2960 -50 ct 2960 -15 2957 -11 2929 -7 ct -2929 -7 2929 -7 2929 0 ct 2929 0 2929 0 3034 0 ct 3034 0 3034 0 3034 -7 ct 3006 -10 3001 -16 3001 -50 ct -3001 -50 3001 -50 3001 -169 ct p ef -pom -gr -gs -pum -15519 16745 t -214 -32 m 206 -26 200 -23 193 -23 ct 182 -23 178 -30 178 -52 ct 178 -52 178 -52 178 -148 ct -178 -173 176 -188 168 -200 ct 158 -218 137 -227 108 -227 ct 63 -227 27 -203 27 -171 ct -27 -160 37 -150 48 -150 ct 60 -150 70 -160 70 -171 ct 70 -173 69 -175 69 -179 ct -68 -183 67 -187 67 -191 ct 67 -204 83 -215 102 -215 ct 126 -215 139 -201 139 -174 ct -139 -174 139 -174 139 -144 ct 64 -113 56 -109 35 -90 ct 25 -81 18 -64 18 -48 ct -18 -17 39 5 69 5 ct 90 5 110 -5 139 -31 ct 142 -5 151 5 170 5 ct 187 5 197 -1 214 -20 ct -214 -20 214 -20 214 -32 ct p -139 -61 m 139 -45 137 -41 126 -35 ct 115 -28 101 -24 91 -24 ct 74 -24 61 -40 61 -62 ct -61 -62 61 -62 61 -63 ct 61 -92 80 -110 139 -132 ct 139 -132 139 -132 139 -61 ct -p ef -228 -196 m 231 -198 235 -198 241 -198 ct 254 -198 259 -191 259 -166 ct 259 -166 259 -166 259 -44 ct -259 -15 253 -8 229 -8 ct 229 -8 229 -8 229 0 ct 229 0 229 0 331 0 ct 331 0 331 0 331 -8 ct -307 -8 299 -14 299 -32 ct 299 -32 299 -32 299 -171 ct 323 -194 333 -200 349 -200 ct -373 -200 385 -184 385 -152 ct 385 -152 385 -152 385 -48 ct 385 -17 378 -8 354 -8 ct -354 -8 354 -8 354 0 ct 354 0 354 0 455 0 ct 455 0 455 0 455 -7 ct 431 -10 425 -16 425 -40 ct -425 -40 425 -40 425 -153 ct 425 -199 404 -227 368 -227 ct 346 -227 331 -219 298 -187 ct -298 -187 298 -187 298 -226 ct 298 -226 298 -226 295 -227 ct 271 -218 254 -213 228 -205 ct -228 -205 228 -205 228 -196 ct p ef -637 5 m 637 5 637 5 708 -21 ct 708 -21 708 -21 708 -28 ct 699 -28 698 -28 697 -28 ct -679 -28 675 -33 675 -56 ct 675 -56 675 -56 675 -336 ct 675 -336 675 -336 673 -337 ct -650 -329 633 -324 602 -315 ct 602 -315 602 -315 602 -308 ct 606 -308 608 -308 612 -308 ct -630 -308 635 -303 635 -283 ct 635 -283 635 -283 635 -206 ct 616 -222 603 -227 584 -227 ct -528 -227 483 -171 483 -101 ct 483 -38 519 5 573 5 ct 600 5 618 -5 635 -28 ct 635 -28 635 -28 635 4 ct -635 4 635 4 637 5 ct p -635 -50 m 635 -47 631 -41 626 -35 ct 618 -26 606 -21 592 -21 ct 551 -21 525 -60 525 -121 ct -525 -177 548 -213 585 -213 ct 611 -213 635 -190 635 -164 ct 635 -164 635 -164 635 -50 ct -p ef -850 -196 m 853 -198 857 -198 863 -198 ct 876 -198 881 -191 881 -166 ct 881 -166 881 -166 881 -44 ct -881 -15 875 -8 851 -8 ct 851 -8 851 -8 851 0 ct 851 0 851 0 953 0 ct 953 0 953 0 953 -8 ct -929 -8 921 -14 921 -32 ct 921 -32 921 -32 921 -171 ct 945 -194 955 -200 971 -200 ct -995 -200 1007 -184 1007 -152 ct 1007 -152 1007 -152 1007 -48 ct 1007 -17 1000 -8 976 -8 ct -976 -8 976 -8 976 0 ct 976 0 976 0 1077 0 ct 1077 0 1077 0 1077 -7 ct 1053 -10 1047 -16 1047 -40 ct -1047 -40 1047 -40 1047 -153 ct 1047 -199 1026 -227 990 -227 ct 968 -227 953 -219 920 -187 ct -920 -187 920 -187 920 -226 ct 920 -226 920 -226 917 -227 ct 893 -218 876 -213 850 -205 ct -850 -205 850 -205 850 -196 ct p ef -1213 -227 m 1150 -227 1106 -180 1106 -112 ct 1106 -45 1151 5 1212 5 ct 1273 5 1320 -47 1320 -115 ct -1320 -180 1275 -227 1213 -227 ct p -1207 -213 m 1247 -213 1276 -166 1276 -98 ct 1276 -42 1254 -9 1218 -9 ct 1199 -9 1181 -21 1171 -40 ct -1157 -66 1150 -101 1150 -136 ct 1150 -183 1172 -213 1207 -213 ct p ef -1427 -227 m 1427 -227 1427 -227 1352 -200 ct 1352 -200 1352 -200 1352 -192 ct -1352 -192 1352 -192 1356 -193 ct 1361 -194 1368 -194 1372 -194 ct 1384 -194 1388 -186 1388 -164 ct -1388 -164 1388 -164 1388 -49 ct 1388 -14 1383 -8 1350 -8 ct 1350 -8 1350 -8 1350 0 ct -1350 0 1350 0 1464 0 ct 1464 0 1464 0 1464 -8 ct 1433 -8 1429 -15 1429 -50 ct 1429 -50 1429 -50 1429 -225 ct -1429 -225 1429 -225 1427 -227 ct p -1404 -337 m 1391 -337 1380 -326 1380 -312 ct 1380 -298 1390 -287 1404 -287 ct -1418 -287 1429 -298 1429 -312 ct 1429 -326 1418 -337 1404 -337 ct p ef -1635 -155 m 1635 -155 1635 -155 1633 -222 ct 1633 -222 1633 -222 1627 -222 ct -1627 -222 1627 -222 1626 -221 ct 1622 -218 1621 -217 1619 -217 ct 1617 -217 1612 -218 1606 -221 ct -1596 -225 1585 -227 1573 -227 ct 1534 -227 1507 -202 1507 -166 ct 1507 -138 1522 -118 1563 -95 ct -1563 -95 1563 -95 1591 -78 ct 1608 -69 1617 -57 1617 -41 ct 1617 -20 1601 -6 1576 -6 ct -1560 -6 1545 -12 1536 -23 ct 1526 -35 1521 -47 1515 -75 ct 1515 -75 1515 -75 1507 -75 ct -1507 -75 1507 -75 1507 2 ct 1507 2 1507 2 1513 2 ct 1517 -3 1519 -4 1525 -4 ct -1529 -4 1536 -3 1547 0 ct 1560 3 1574 5 1582 5 ct 1619 5 1650 -24 1650 -58 ct 1650 -83 1639 -99 1610 -117 ct -1610 -117 1610 -117 1558 -148 ct 1544 -156 1537 -169 1537 -182 ct 1537 -202 1552 -216 1574 -216 ct -1602 -216 1616 -199 1627 -155 ct 1627 -155 1627 -155 1635 -155 ct p ef -1874 -81 m 1850 -43 1829 -29 1798 -29 ct 1771 -29 1750 -43 1736 -72 ct 1727 -90 1724 -107 1723 -137 ct -1723 -137 1723 -137 1872 -137 ct 1868 -169 1863 -183 1851 -199 ct 1837 -217 1814 -227 1789 -227 ct -1765 -227 1742 -218 1724 -201 ct 1701 -181 1688 -146 1688 -106 ct 1688 -37 1723 5 1779 5 ct -1825 5 1861 -24 1881 -78 ct 1881 -78 1881 -78 1874 -81 ct p -1724 -153 m 1729 -191 1746 -209 1775 -209 ct 1805 -209 1816 -196 1823 -153 ct -1823 -153 1823 -153 1724 -153 ct p ef -pom -gr -gr -gs -gs -pum -5435 10350 t -150 -222 m 150 -222 150 -222 90 -222 ct 90 -222 90 -222 90 -279 ct 90 -308 99 -323 118 -323 ct -128 -323 135 -318 143 -304 ct 151 -291 157 -286 165 -286 ct 176 -286 185 -295 185 -306 ct -185 -324 164 -337 135 -337 ct 105 -337 79 -324 67 -301 ct 54 -279 50 -261 50 -222 ct -50 -222 50 -222 10 -222 ct 10 -222 10 -222 10 -206 ct 10 -206 10 -206 50 -206 ct -50 -206 50 -206 50 -51 ct 50 -14 45 -8 10 -8 ct 10 -8 10 -8 10 0 ct 10 0 10 0 136 0 ct -136 0 136 0 136 -8 ct 96 -8 91 -13 91 -51 ct 91 -51 91 -51 91 -206 ct 91 -206 91 -206 150 -206 ct -150 -206 150 -206 150 -222 ct p ef -375 -32 m 367 -26 361 -23 354 -23 ct 343 -23 339 -30 339 -52 ct 339 -52 339 -52 339 -148 ct -339 -173 337 -188 329 -200 ct 319 -218 298 -227 269 -227 ct 224 -227 188 -203 188 -171 ct -188 -160 198 -150 209 -150 ct 221 -150 231 -160 231 -171 ct 231 -173 230 -175 230 -179 ct -229 -183 228 -187 228 -191 ct 228 -204 244 -215 263 -215 ct 287 -215 300 -201 300 -174 ct -300 -174 300 -174 300 -144 ct 225 -113 217 -109 196 -90 ct 186 -81 179 -64 179 -48 ct -179 -17 200 5 230 5 ct 251 5 271 -5 300 -31 ct 303 -5 312 5 331 5 ct 348 5 358 -1 375 -20 ct -375 -20 375 -20 375 -32 ct p -300 -61 m 300 -45 298 -41 287 -35 ct 276 -28 262 -24 252 -24 ct 235 -24 222 -40 222 -62 ct -222 -62 222 -62 222 -63 ct 222 -92 241 -110 300 -132 ct 300 -132 300 -132 300 -61 ct -p ef -384 -192 m 391 -194 396 -194 401 -194 ct 413 -194 418 -186 418 -164 ct 418 -164 418 -164 418 -41 ct -418 -17 414 -13 383 -7 ct 383 -7 383 -7 383 0 ct 383 0 383 0 500 0 ct 500 0 500 0 500 -8 ct -467 -8 458 -15 458 -44 ct 458 -44 458 -44 458 -155 ct 458 -171 479 -196 492 -196 ct -495 -196 500 -193 505 -188 ct 513 -182 518 -179 524 -179 ct 536 -179 543 -187 543 -201 ct -543 -217 533 -227 517 -227 ct 496 -227 482 -216 458 -181 ct 458 -181 458 -181 458 -226 ct -458 -226 458 -226 456 -227 ct 430 -216 413 -210 384 -200 ct 384 -200 384 -200 384 -192 ct -p ef -867 -81 m 843 -43 822 -29 791 -29 ct 764 -29 743 -43 729 -72 ct 720 -90 717 -107 716 -137 ct -716 -137 716 -137 865 -137 ct 861 -169 856 -183 844 -199 ct 830 -217 807 -227 782 -227 ct -758 -227 735 -218 717 -201 ct 694 -181 681 -146 681 -106 ct 681 -37 716 5 772 5 ct -818 5 854 -24 874 -78 ct 874 -78 874 -78 867 -81 ct p -717 -153 m 722 -191 739 -209 768 -209 ct 798 -209 809 -196 816 -153 ct 816 -153 816 -153 717 -153 ct -p ef -897 -196 m 900 -198 904 -198 910 -198 ct 923 -198 928 -191 928 -166 ct 928 -166 928 -166 928 -44 ct -928 -15 922 -8 898 -8 ct 898 -8 898 -8 898 0 ct 898 0 898 0 1000 0 ct 1000 0 1000 0 1000 -8 ct -976 -8 968 -14 968 -32 ct 968 -32 968 -32 968 -171 ct 992 -194 1002 -200 1018 -200 ct -1042 -200 1054 -184 1054 -152 ct 1054 -152 1054 -152 1054 -48 ct 1054 -17 1047 -8 1023 -8 ct -1023 -8 1023 -8 1023 0 ct 1023 0 1023 0 1124 0 ct 1124 0 1124 0 1124 -7 ct 1100 -10 1094 -16 1094 -40 ct -1094 -40 1094 -40 1094 -153 ct 1094 -199 1073 -227 1037 -227 ct 1015 -227 1000 -219 967 -187 ct -967 -187 967 -187 967 -226 ct 967 -226 967 -226 964 -227 ct 940 -218 923 -213 897 -205 ct -897 -205 897 -205 897 -196 ct p ef -1306 5 m 1306 5 1306 5 1377 -21 ct 1377 -21 1377 -21 1377 -28 ct 1368 -28 1367 -28 1366 -28 ct -1348 -28 1344 -33 1344 -56 ct 1344 -56 1344 -56 1344 -336 ct 1344 -336 1344 -336 1342 -337 ct -1319 -329 1302 -324 1271 -315 ct 1271 -315 1271 -315 1271 -308 ct 1275 -308 1277 -308 1281 -308 ct -1299 -308 1304 -303 1304 -283 ct 1304 -283 1304 -283 1304 -206 ct 1285 -222 1272 -227 1253 -227 ct -1197 -227 1152 -171 1152 -101 ct 1152 -38 1188 5 1242 5 ct 1269 5 1287 -5 1304 -28 ct -1304 -28 1304 -28 1304 4 ct 1304 4 1304 4 1306 5 ct p -1304 -50 m 1304 -47 1300 -41 1295 -35 ct 1287 -26 1275 -21 1261 -21 ct 1220 -21 1194 -60 1194 -121 ct -1194 -177 1217 -213 1254 -213 ct 1280 -213 1304 -190 1304 -164 ct 1304 -164 1304 -164 1304 -50 ct -p ef -1664 -155 m 1664 -155 1664 -155 1662 -222 ct 1662 -222 1662 -222 1656 -222 ct -1656 -222 1656 -222 1655 -221 ct 1651 -218 1650 -217 1648 -217 ct 1646 -217 1641 -218 1635 -221 ct -1625 -225 1614 -227 1602 -227 ct 1563 -227 1536 -202 1536 -166 ct 1536 -138 1551 -118 1592 -95 ct -1592 -95 1592 -95 1620 -78 ct 1637 -69 1646 -57 1646 -41 ct 1646 -20 1630 -6 1605 -6 ct -1589 -6 1574 -12 1565 -23 ct 1555 -35 1550 -47 1544 -75 ct 1544 -75 1544 -75 1536 -75 ct -1536 -75 1536 -75 1536 2 ct 1536 2 1536 2 1542 2 ct 1546 -3 1548 -4 1554 -4 ct -1558 -4 1565 -3 1576 0 ct 1589 3 1603 5 1611 5 ct 1648 5 1679 -24 1679 -58 ct 1679 -83 1668 -99 1639 -117 ct -1639 -117 1639 -117 1587 -148 ct 1573 -156 1566 -169 1566 -182 ct 1566 -202 1581 -216 1603 -216 ct -1631 -216 1645 -199 1656 -155 ct 1656 -155 1656 -155 1664 -155 ct p ef -1710 -195 m 1715 -195 1718 -195 1722 -195 ct 1739 -195 1742 -190 1742 -167 ct -1742 -167 1742 -167 1742 65 ct 1742 90 1737 96 1708 99 ct 1708 99 1708 99 1708 107 ct -1708 107 1708 107 1826 107 ct 1826 107 1826 107 1826 98 ct 1789 98 1783 93 1783 61 ct -1783 61 1783 61 1783 -16 ct 1800 0 1812 5 1832 5 ct 1889 5 1934 -50 1934 -122 ct -1934 -183 1900 -227 1853 -227 ct 1826 -227 1804 -215 1783 -189 ct 1783 -189 1783 -189 1783 -226 ct -1783 -226 1783 -226 1780 -227 ct 1754 -217 1737 -210 1710 -202 ct 1710 -202 1710 -202 1710 -195 ct -p -1783 -165 m 1783 -180 1810 -197 1832 -197 ct 1868 -197 1892 -160 1892 -103 ct -1892 -48 1868 -11 1833 -11 ct 1811 -11 1783 -29 1783 -44 ct 1783 -44 1783 -44 1783 -165 ct -p ef -2154 -81 m 2130 -43 2109 -29 2078 -29 ct 2051 -29 2030 -43 2016 -72 ct 2007 -90 2004 -107 2003 -137 ct -2003 -137 2003 -137 2152 -137 ct 2148 -169 2143 -183 2131 -199 ct 2117 -217 2094 -227 2069 -227 ct -2045 -227 2022 -218 2004 -201 ct 1981 -181 1968 -146 1968 -106 ct 1968 -37 2003 5 2059 5 ct -2105 5 2141 -24 2161 -78 ct 2161 -78 2161 -78 2154 -81 ct p -2004 -153 m 2009 -191 2026 -209 2055 -209 ct 2085 -209 2096 -196 2103 -153 ct -2103 -153 2103 -153 2004 -153 ct p ef -2374 -81 m 2350 -43 2329 -29 2298 -29 ct 2271 -29 2250 -43 2236 -72 ct 2227 -90 2224 -107 2223 -137 ct -2223 -137 2223 -137 2372 -137 ct 2368 -169 2363 -183 2351 -199 ct 2337 -217 2314 -227 2289 -227 ct -2265 -227 2242 -218 2224 -201 ct 2201 -181 2188 -146 2188 -106 ct 2188 -37 2223 5 2279 5 ct -2325 5 2361 -24 2381 -78 ct 2381 -78 2381 -78 2374 -81 ct p -2224 -153 m 2229 -191 2246 -209 2275 -209 ct 2305 -209 2316 -196 2323 -153 ct -2323 -153 2323 -153 2224 -153 ct p ef -2589 -77 m 2565 -42 2548 -31 2520 -31 ct 2476 -31 2445 -70 2445 -127 ct 2445 -178 2472 -213 2511 -213 ct -2529 -213 2535 -207 2540 -189 ct 2540 -189 2540 -189 2543 -178 ct 2547 -164 2555 -155 2565 -155 ct -2578 -155 2589 -164 2589 -176 ct 2589 -204 2555 -227 2514 -227 ct 2490 -227 2466 -217 2446 -199 ct -2422 -178 2408 -144 2408 -105 ct 2408 -41 2446 5 2500 5 ct 2522 5 2541 -3 2559 -18 ct -2572 -30 2581 -43 2595 -72 ct 2595 -72 2595 -72 2589 -77 ct p ef -2692 -169 m 2712 -192 2727 -200 2746 -200 ct 2770 -200 2782 -182 2782 -148 ct -2782 -148 2782 -148 2782 -50 ct 2782 -16 2777 -10 2749 -7 ct 2749 -7 2749 -7 2749 0 ct -2749 0 2749 0 2852 0 ct 2852 0 2852 0 2852 -7 ct 2826 -12 2823 -16 2823 -50 ct -2823 -50 2823 -50 2823 -148 ct 2823 -200 2802 -227 2763 -227 ct 2735 -227 2714 -215 2692 -185 ct -2692 -185 2692 -185 2692 -336 ct 2692 -336 2692 -336 2690 -337 ct 2673 -331 2661 -327 2634 -319 ct -2634 -319 2634 -319 2621 -315 ct 2621 -315 2621 -315 2621 -308 ct 2623 -308 2624 -308 2627 -308 ct -2647 -308 2651 -304 2651 -283 ct 2651 -283 2651 -283 2651 -50 ct 2651 -15 2648 -11 2620 -7 ct -2620 -7 2620 -7 2620 0 ct 2620 0 2620 0 2725 0 ct 2725 0 2725 0 2725 -7 ct 2697 -10 2692 -16 2692 -50 ct -2692 -50 2692 -50 2692 -169 ct p ef -pom -gr -gr -gs -gs -pum -10779 16488 t -9 -196 m 15 -198 19 -198 25 -198 ct 37 -198 42 -190 42 -166 ct 42 -166 42 -166 42 -41 ct -42 -15 35 -7 8 -7 ct 8 -7 8 -7 8 0 ct 8 0 8 0 115 0 ct 115 0 115 0 115 -8 ct 90 -8 82 -13 82 -33 ct -82 -33 82 -33 82 -172 ct 82 -173 86 -178 90 -181 ct 102 -193 122 -201 139 -201 ct -161 -201 171 -184 171 -149 ct 171 -149 171 -149 171 -42 ct 171 -14 166 -8 138 -8 ct -138 -8 138 -8 138 0 ct 138 0 138 0 247 0 ct 247 0 247 0 247 -7 ct 219 -7 212 -16 212 -46 ct -212 -46 212 -46 212 -171 ct 227 -192 243 -201 265 -201 ct 292 -201 301 -188 301 -147 ct -301 -147 301 -147 301 -43 ct 301 -15 297 -11 269 -7 ct 269 -7 269 -7 269 0 ct 269 0 269 0 375 0 ct -375 0 375 0 375 -8 ct 375 -8 375 -8 363 -8 ct 348 -8 342 -18 342 -37 ct 342 -37 342 -37 342 -139 ct -342 -197 323 -227 286 -227 ct 258 -227 233 -214 207 -185 ct 198 -214 182 -227 155 -227 ct -134 -227 121 -220 80 -189 ct 80 -189 80 -189 80 -226 ct 80 -226 80 -226 77 -227 ct -52 -218 36 -212 9 -205 ct 9 -205 9 -205 9 -196 ct p ef -470 -227 m 470 -227 470 -227 395 -200 ct 395 -200 395 -200 395 -192 ct 395 -192 395 -192 399 -193 ct -404 -194 411 -194 415 -194 ct 427 -194 431 -186 431 -164 ct 431 -164 431 -164 431 -49 ct -431 -14 426 -8 393 -8 ct 393 -8 393 -8 393 0 ct 393 0 393 0 507 0 ct 507 0 507 0 507 -8 ct -476 -8 472 -15 472 -50 ct 472 -50 472 -50 472 -225 ct 472 -225 472 -225 470 -227 ct -p -447 -337 m 434 -337 423 -326 423 -312 ct 423 -298 433 -287 447 -287 ct 461 -287 472 -298 472 -312 ct -472 -326 461 -337 447 -337 ct p ef -718 -77 m 694 -42 677 -31 649 -31 ct 605 -31 574 -70 574 -127 ct 574 -178 601 -213 640 -213 ct -658 -213 664 -207 669 -189 ct 669 -189 669 -189 672 -178 ct 676 -164 684 -155 694 -155 ct -707 -155 718 -164 718 -176 ct 718 -204 684 -227 643 -227 ct 619 -227 595 -217 575 -199 ct -551 -178 537 -144 537 -105 ct 537 -41 575 5 629 5 ct 651 5 670 -3 688 -18 ct 701 -30 710 -43 724 -72 ct -724 -72 724 -72 718 -77 ct p ef -748 -192 m 755 -194 760 -194 765 -194 ct 777 -194 782 -186 782 -164 ct 782 -164 782 -164 782 -41 ct -782 -17 778 -13 747 -7 ct 747 -7 747 -7 747 0 ct 747 0 747 0 864 0 ct 864 0 864 0 864 -8 ct -831 -8 822 -15 822 -44 ct 822 -44 822 -44 822 -155 ct 822 -171 843 -196 856 -196 ct -859 -196 864 -193 869 -188 ct 877 -182 882 -179 888 -179 ct 900 -179 907 -187 907 -201 ct -907 -217 897 -227 881 -227 ct 860 -227 846 -216 822 -181 ct 822 -181 822 -181 822 -226 ct -822 -226 822 -226 820 -227 ct 794 -216 777 -210 748 -200 ct 748 -200 748 -200 748 -192 ct -p ef -1031 -227 m 968 -227 924 -180 924 -112 ct 924 -45 969 5 1030 5 ct 1091 5 1138 -47 1138 -115 ct -1138 -180 1093 -227 1031 -227 ct p -1025 -213 m 1065 -213 1094 -166 1094 -98 ct 1094 -42 1072 -9 1036 -9 ct 1017 -9 999 -21 989 -40 ct -975 -66 968 -101 968 -136 ct 968 -183 990 -213 1025 -213 ct p ef -1164 -195 m 1169 -195 1172 -195 1176 -195 ct 1193 -195 1196 -190 1196 -167 ct -1196 -167 1196 -167 1196 65 ct 1196 90 1191 96 1162 99 ct 1162 99 1162 99 1162 107 ct -1162 107 1162 107 1280 107 ct 1280 107 1280 107 1280 98 ct 1243 98 1237 93 1237 61 ct -1237 61 1237 61 1237 -16 ct 1254 0 1266 5 1286 5 ct 1343 5 1388 -50 1388 -122 ct -1388 -183 1354 -227 1307 -227 ct 1280 -227 1258 -215 1237 -189 ct 1237 -189 1237 -189 1237 -226 ct -1237 -226 1237 -226 1234 -227 ct 1208 -217 1191 -210 1164 -202 ct 1164 -202 1164 -202 1164 -195 ct -p -1237 -165 m 1237 -180 1264 -197 1286 -197 ct 1322 -197 1346 -160 1346 -103 ct -1346 -48 1322 -11 1287 -11 ct 1265 -11 1237 -29 1237 -44 ct 1237 -44 1237 -44 1237 -165 ct -p ef -1486 -169 m 1506 -192 1521 -200 1540 -200 ct 1564 -200 1576 -182 1576 -148 ct -1576 -148 1576 -148 1576 -50 ct 1576 -16 1571 -10 1543 -7 ct 1543 -7 1543 -7 1543 0 ct -1543 0 1543 0 1646 0 ct 1646 0 1646 0 1646 -7 ct 1620 -12 1617 -16 1617 -50 ct -1617 -50 1617 -50 1617 -148 ct 1617 -200 1596 -227 1557 -227 ct 1529 -227 1508 -215 1486 -185 ct -1486 -185 1486 -185 1486 -336 ct 1486 -336 1486 -336 1484 -337 ct 1467 -331 1455 -327 1428 -319 ct -1428 -319 1428 -319 1415 -315 ct 1415 -315 1415 -315 1415 -308 ct 1417 -308 1418 -308 1421 -308 ct -1441 -308 1445 -304 1445 -283 ct 1445 -283 1445 -283 1445 -50 ct 1445 -15 1442 -11 1414 -7 ct -1414 -7 1414 -7 1414 0 ct 1414 0 1414 0 1519 0 ct 1519 0 1519 0 1519 -7 ct 1491 -10 1486 -16 1486 -50 ct -1486 -50 1486 -50 1486 -169 ct p ef -1780 -227 m 1717 -227 1673 -180 1673 -112 ct 1673 -45 1718 5 1779 5 ct 1840 5 1887 -47 1887 -115 ct -1887 -180 1842 -227 1780 -227 ct p -1774 -213 m 1814 -213 1843 -166 1843 -98 ct 1843 -42 1821 -9 1785 -9 ct 1766 -9 1748 -21 1738 -40 ct -1724 -66 1717 -101 1717 -136 ct 1717 -183 1739 -213 1774 -213 ct p ef -1917 -196 m 1920 -198 1924 -198 1930 -198 ct 1943 -198 1948 -191 1948 -166 ct -1948 -166 1948 -166 1948 -44 ct 1948 -15 1942 -8 1918 -8 ct 1918 -8 1918 -8 1918 0 ct -1918 0 1918 0 2020 0 ct 2020 0 2020 0 2020 -8 ct 1996 -8 1988 -14 1988 -32 ct 1988 -32 1988 -32 1988 -171 ct -2012 -194 2022 -200 2038 -200 ct 2062 -200 2074 -184 2074 -152 ct 2074 -152 2074 -152 2074 -48 ct -2074 -17 2067 -8 2043 -8 ct 2043 -8 2043 -8 2043 0 ct 2043 0 2043 0 2144 0 ct 2144 0 2144 0 2144 -7 ct -2120 -10 2114 -16 2114 -40 ct 2114 -40 2114 -40 2114 -153 ct 2114 -199 2093 -227 2057 -227 ct -2035 -227 2020 -219 1987 -187 ct 1987 -187 1987 -187 1987 -226 ct 1987 -226 1987 -226 1984 -227 ct -1960 -218 1943 -213 1917 -205 ct 1917 -205 1917 -205 1917 -196 ct p ef -2357 -81 m 2333 -43 2312 -29 2281 -29 ct 2254 -29 2233 -43 2219 -72 ct 2210 -90 2207 -107 2206 -137 ct -2206 -137 2206 -137 2355 -137 ct 2351 -169 2346 -183 2334 -199 ct 2320 -217 2297 -227 2272 -227 ct -2248 -227 2225 -218 2207 -201 ct 2184 -181 2171 -146 2171 -106 ct 2171 -37 2206 5 2262 5 ct -2308 5 2344 -24 2364 -78 ct 2364 -78 2364 -78 2357 -81 ct p -2207 -153 m 2212 -191 2229 -209 2258 -209 ct 2288 -209 2299 -196 2306 -153 ct -2306 -153 2306 -153 2207 -153 ct p ef -pom -gr -gr -gs -gs -pum -15356 12996 t -3 -192 m 10 -194 15 -194 20 -194 ct 32 -194 37 -186 37 -164 ct 37 -164 37 -164 37 -41 ct -37 -17 33 -13 2 -7 ct 2 -7 2 -7 2 0 ct 2 0 2 0 119 0 ct 119 0 119 0 119 -8 ct 86 -8 77 -15 77 -44 ct -77 -44 77 -44 77 -155 ct 77 -171 98 -196 111 -196 ct 114 -196 119 -193 124 -188 ct -132 -182 137 -179 143 -179 ct 155 -179 162 -187 162 -201 ct 162 -217 152 -227 136 -227 ct -115 -227 101 -216 77 -181 ct 77 -181 77 -181 77 -226 ct 77 -226 77 -226 75 -227 ct -49 -216 32 -210 3 -200 ct 3 -200 3 -200 3 -192 ct p ef -363 -81 m 339 -43 318 -29 287 -29 ct 260 -29 239 -43 225 -72 ct 216 -90 213 -107 212 -137 ct -212 -137 212 -137 361 -137 ct 357 -169 352 -183 340 -199 ct 326 -217 303 -227 278 -227 ct -254 -227 231 -218 213 -201 ct 190 -181 177 -146 177 -106 ct 177 -37 212 5 268 5 ct -314 5 350 -24 370 -78 ct 370 -78 370 -78 363 -81 ct p -213 -153 m 218 -191 235 -209 264 -209 ct 294 -209 305 -196 312 -153 ct 312 -153 312 -153 213 -153 ct -p ef -616 -222 m 616 -222 616 -222 549 -222 ct 549 -222 549 -222 549 -215 ct 564 -213 571 -208 571 -199 ct -571 -194 570 -189 568 -184 ct 568 -184 568 -184 521 -56 ct 521 -56 521 -56 471 -182 ct -468 -189 467 -196 467 -201 ct 467 -210 472 -213 489 -215 ct 489 -215 489 -215 489 -222 ct -489 -222 489 -222 394 -222 ct 394 -222 394 -222 394 -214 ct 413 -214 416 -209 438 -158 ct -438 -158 438 -158 496 -16 ct 497 -13 499 -10 500 -6 ct 503 3 506 7 509 7 ct 512 7 515 1 522 -18 ct -522 -18 522 -18 584 -176 ct 599 -210 601 -213 616 -215 ct 616 -215 616 -215 616 -222 ct -p ef -829 -81 m 805 -43 784 -29 753 -29 ct 726 -29 705 -43 691 -72 ct 682 -90 679 -107 678 -137 ct -678 -137 678 -137 827 -137 ct 823 -169 818 -183 806 -199 ct 792 -217 769 -227 744 -227 ct -720 -227 697 -218 679 -201 ct 656 -181 643 -146 643 -106 ct 643 -37 678 5 734 5 ct -780 5 816 -24 836 -78 ct 836 -78 836 -78 829 -81 ct p -679 -153 m 684 -191 701 -209 730 -209 ct 760 -209 771 -196 778 -153 ct 778 -153 778 -153 679 -153 ct -p ef -854 -192 m 861 -194 866 -194 871 -194 ct 883 -194 888 -186 888 -164 ct 888 -164 888 -164 888 -41 ct -888 -17 884 -13 853 -7 ct 853 -7 853 -7 853 0 ct 853 0 853 0 970 0 ct 970 0 970 0 970 -8 ct -937 -8 928 -15 928 -44 ct 928 -44 928 -44 928 -155 ct 928 -171 949 -196 962 -196 ct -965 -196 970 -193 975 -188 ct 983 -182 988 -179 994 -179 ct 1006 -179 1013 -187 1013 -201 ct -1013 -217 1003 -227 987 -227 ct 966 -227 952 -216 928 -181 ct 928 -181 928 -181 928 -226 ct -928 -226 928 -226 926 -227 ct 900 -216 883 -210 854 -200 ct 854 -200 854 -200 854 -192 ct -p ef -1090 -336 m 1090 -336 1090 -336 1088 -337 ct 1067 -330 1054 -326 1031 -319 ct -1031 -319 1031 -319 1017 -315 ct 1017 -315 1017 -315 1017 -308 ct 1020 -308 1022 -308 1026 -308 ct -1045 -308 1049 -304 1049 -283 ct 1049 -283 1049 -283 1049 -27 ct 1049 -11 1091 5 1129 5 ct -1193 5 1243 -49 1243 -120 ct 1243 -181 1206 -227 1157 -227 ct 1128 -227 1100 -209 1090 -185 ct -1090 -185 1090 -185 1090 -336 ct p -1090 -159 m 1090 -178 1113 -196 1138 -196 ct 1176 -196 1200 -157 1200 -97 ct -1200 -42 1177 -11 1137 -11 ct 1112 -11 1090 -22 1090 -35 ct 1090 -35 1090 -35 1090 -159 ct -p ef -1464 -81 m 1440 -43 1419 -29 1388 -29 ct 1361 -29 1340 -43 1326 -72 ct 1317 -90 1314 -107 1313 -137 ct -1313 -137 1313 -137 1462 -137 ct 1458 -169 1453 -183 1441 -199 ct 1427 -217 1404 -227 1379 -227 ct -1355 -227 1332 -218 1314 -201 ct 1291 -181 1278 -146 1278 -106 ct 1278 -37 1313 5 1369 5 ct -1415 5 1451 -24 1471 -78 ct 1471 -78 1471 -78 1464 -81 ct p -1314 -153 m 1319 -191 1336 -209 1365 -209 ct 1395 -209 1406 -196 1413 -153 ct -1413 -153 1413 -153 1314 -153 ct p ef -1489 -192 m 1496 -194 1501 -194 1506 -194 ct 1518 -194 1523 -186 1523 -164 ct -1523 -164 1523 -164 1523 -41 ct 1523 -17 1519 -13 1488 -7 ct 1488 -7 1488 -7 1488 0 ct -1488 0 1488 0 1605 0 ct 1605 0 1605 0 1605 -8 ct 1572 -8 1563 -15 1563 -44 ct 1563 -44 1563 -44 1563 -155 ct -1563 -171 1584 -196 1597 -196 ct 1600 -196 1605 -193 1610 -188 ct 1618 -182 1623 -179 1629 -179 ct -1641 -179 1648 -187 1648 -201 ct 1648 -217 1638 -227 1622 -227 ct 1601 -227 1587 -216 1563 -181 ct -1563 -181 1563 -181 1563 -226 ct 1563 -226 1563 -226 1561 -227 ct 1535 -216 1518 -210 1489 -200 ct -1489 -200 1489 -200 1489 -192 ct p ef -1865 -32 m 1857 -26 1851 -23 1844 -23 ct 1833 -23 1829 -30 1829 -52 ct 1829 -52 1829 -52 1829 -148 ct -1829 -173 1827 -188 1819 -200 ct 1809 -218 1788 -227 1759 -227 ct 1714 -227 1678 -203 1678 -171 ct -1678 -160 1688 -150 1699 -150 ct 1711 -150 1721 -160 1721 -171 ct 1721 -173 1720 -175 1720 -179 ct -1719 -183 1718 -187 1718 -191 ct 1718 -204 1734 -215 1753 -215 ct 1777 -215 1790 -201 1790 -174 ct -1790 -174 1790 -174 1790 -144 ct 1715 -113 1707 -109 1686 -90 ct 1676 -81 1669 -64 1669 -48 ct -1669 -17 1690 5 1720 5 ct 1741 5 1761 -5 1790 -31 ct 1793 -5 1802 5 1821 5 ct 1838 5 1848 -1 1865 -20 ct -1865 -20 1865 -20 1865 -32 ct p -1790 -61 m 1790 -45 1788 -41 1777 -35 ct 1766 -28 1752 -24 1742 -24 ct 1725 -24 1712 -40 1712 -62 ct -1712 -62 1712 -62 1712 -63 ct 1712 -92 1731 -110 1790 -132 ct 1790 -132 1790 -132 1790 -61 ct -p ef -1994 -222 m 1994 -222 1994 -222 1946 -222 ct 1946 -222 1946 -222 1946 -279 ct -1946 -284 1945 -286 1942 -286 ct 1939 -281 1936 -277 1932 -272 ct 1914 -245 1893 -221 1886 -219 ct -1880 -216 1877 -212 1877 -210 ct 1877 -208 1878 -207 1879 -206 ct 1879 -206 1879 -206 1905 -206 ct -1905 -206 1905 -206 1905 -58 ct 1905 -16 1919 5 1948 5 ct 1972 5 1990 -7 2006 -33 ct -2006 -33 2006 -33 2000 -38 ct 1990 -26 1981 -21 1971 -21 ct 1953 -21 1946 -34 1946 -65 ct -1946 -65 1946 -65 1946 -206 ct 1946 -206 1946 -206 1994 -206 ct 1994 -206 1994 -206 1994 -222 ct -p ef -2096 -227 m 2096 -227 2096 -227 2021 -200 ct 2021 -200 2021 -200 2021 -192 ct -2021 -192 2021 -192 2025 -193 ct 2030 -194 2037 -194 2041 -194 ct 2053 -194 2057 -186 2057 -164 ct -2057 -164 2057 -164 2057 -49 ct 2057 -14 2052 -8 2019 -8 ct 2019 -8 2019 -8 2019 0 ct -2019 0 2019 0 2133 0 ct 2133 0 2133 0 2133 -8 ct 2102 -8 2098 -15 2098 -50 ct 2098 -50 2098 -50 2098 -225 ct -2098 -225 2098 -225 2096 -227 ct p -2073 -337 m 2060 -337 2049 -326 2049 -312 ct 2049 -298 2059 -287 2073 -287 ct -2087 -287 2098 -298 2098 -312 ct 2098 -326 2087 -337 2073 -337 ct p ef -2272 -227 m 2209 -227 2165 -180 2165 -112 ct 2165 -45 2210 5 2271 5 ct 2332 5 2379 -47 2379 -115 ct -2379 -180 2334 -227 2272 -227 ct p -2266 -213 m 2306 -213 2335 -166 2335 -98 ct 2335 -42 2313 -9 2277 -9 ct 2258 -9 2240 -21 2230 -40 ct -2216 -66 2209 -101 2209 -136 ct 2209 -183 2231 -213 2266 -213 ct p ef -2408 -196 m 2411 -198 2415 -198 2421 -198 ct 2434 -198 2439 -191 2439 -166 ct -2439 -166 2439 -166 2439 -44 ct 2439 -15 2433 -8 2409 -8 ct 2409 -8 2409 -8 2409 0 ct -2409 0 2409 0 2511 0 ct 2511 0 2511 0 2511 -8 ct 2487 -8 2479 -14 2479 -32 ct 2479 -32 2479 -32 2479 -171 ct -2503 -194 2513 -200 2529 -200 ct 2553 -200 2565 -184 2565 -152 ct 2565 -152 2565 -152 2565 -48 ct -2565 -17 2558 -8 2534 -8 ct 2534 -8 2534 -8 2534 0 ct 2534 0 2534 0 2635 0 ct 2635 0 2635 0 2635 -7 ct -2611 -10 2605 -16 2605 -40 ct 2605 -40 2605 -40 2605 -153 ct 2605 -199 2584 -227 2548 -227 ct -2526 -227 2511 -219 2478 -187 ct 2478 -187 2478 -187 2478 -226 ct 2478 -226 2478 -226 2475 -227 ct -2451 -218 2434 -213 2408 -205 ct 2408 -205 2408 -205 2408 -196 ct p ef -pom -gr -gr -gs -gs -pum -4561 12996 t -214 -32 m 206 -26 200 -23 193 -23 ct 182 -23 178 -30 178 -52 ct 178 -52 178 -52 178 -148 ct -178 -173 176 -188 168 -200 ct 158 -218 137 -227 108 -227 ct 63 -227 27 -203 27 -171 ct -27 -160 37 -150 48 -150 ct 60 -150 70 -160 70 -171 ct 70 -173 69 -175 69 -179 ct -68 -183 67 -187 67 -191 ct 67 -204 83 -215 102 -215 ct 126 -215 139 -201 139 -174 ct -139 -174 139 -174 139 -144 ct 64 -113 56 -109 35 -90 ct 25 -81 18 -64 18 -48 ct -18 -17 39 5 69 5 ct 90 5 110 -5 139 -31 ct 142 -5 151 5 170 5 ct 187 5 197 -1 214 -20 ct -214 -20 214 -20 214 -32 ct p -139 -61 m 139 -45 137 -41 126 -35 ct 115 -28 101 -24 91 -24 ct 74 -24 61 -40 61 -62 ct -61 -62 61 -62 61 -63 ct 61 -92 80 -110 139 -132 ct 139 -132 139 -132 139 -61 ct -p ef -387 5 m 387 5 387 5 458 -21 ct 458 -21 458 -21 458 -28 ct 449 -28 448 -28 447 -28 ct -429 -28 425 -33 425 -56 ct 425 -56 425 -56 425 -336 ct 425 -336 425 -336 423 -337 ct -400 -329 383 -324 352 -315 ct 352 -315 352 -315 352 -308 ct 356 -308 358 -308 362 -308 ct -380 -308 385 -303 385 -283 ct 385 -283 385 -283 385 -206 ct 366 -222 353 -227 334 -227 ct -278 -227 233 -171 233 -101 ct 233 -38 269 5 323 5 ct 350 5 368 -5 385 -28 ct 385 -28 385 -28 385 4 ct -385 4 385 4 387 5 ct p -385 -50 m 385 -47 381 -41 376 -35 ct 368 -26 356 -21 342 -21 ct 301 -21 275 -60 275 -121 ct -275 -177 298 -213 335 -213 ct 361 -213 385 -190 385 -164 ct 385 -164 385 -164 385 -50 ct -p ef -684 -32 m 676 -26 670 -23 663 -23 ct 652 -23 648 -30 648 -52 ct 648 -52 648 -52 648 -148 ct -648 -173 646 -188 638 -200 ct 628 -218 607 -227 578 -227 ct 533 -227 497 -203 497 -171 ct -497 -160 507 -150 518 -150 ct 530 -150 540 -160 540 -171 ct 540 -173 539 -175 539 -179 ct -538 -183 537 -187 537 -191 ct 537 -204 553 -215 572 -215 ct 596 -215 609 -201 609 -174 ct -609 -174 609 -174 609 -144 ct 534 -113 526 -109 505 -90 ct 495 -81 488 -64 488 -48 ct -488 -17 509 5 539 5 ct 560 5 580 -5 609 -31 ct 612 -5 621 5 640 5 ct 657 5 667 -1 684 -20 ct -684 -20 684 -20 684 -32 ct p -609 -61 m 609 -45 607 -41 596 -35 ct 585 -28 571 -24 561 -24 ct 544 -24 531 -40 531 -62 ct -531 -62 531 -62 531 -63 ct 531 -92 550 -110 609 -132 ct 609 -132 609 -132 609 -61 ct -p ef -694 -195 m 699 -195 702 -195 706 -195 ct 723 -195 726 -190 726 -167 ct 726 -167 726 -167 726 65 ct -726 90 721 96 692 99 ct 692 99 692 99 692 107 ct 692 107 692 107 810 107 ct 810 107 810 107 810 98 ct -773 98 767 93 767 61 ct 767 61 767 61 767 -16 ct 784 0 796 5 816 5 ct 873 5 918 -50 918 -122 ct -918 -183 884 -227 837 -227 ct 810 -227 788 -215 767 -189 ct 767 -189 767 -189 767 -226 ct -767 -226 767 -226 764 -227 ct 738 -217 721 -210 694 -202 ct 694 -202 694 -202 694 -195 ct -p -767 -165 m 767 -180 794 -197 816 -197 ct 852 -197 876 -160 876 -103 ct 876 -48 852 -11 817 -11 ct -795 -11 767 -29 767 -44 ct 767 -44 767 -44 767 -165 ct p ef -1063 -222 m 1063 -222 1063 -222 1015 -222 ct 1015 -222 1015 -222 1015 -279 ct -1015 -284 1014 -286 1011 -286 ct 1008 -281 1005 -277 1001 -272 ct 983 -245 962 -221 955 -219 ct -949 -216 946 -212 946 -210 ct 946 -208 947 -207 948 -206 ct 948 -206 948 -206 974 -206 ct -974 -206 974 -206 974 -58 ct 974 -16 988 5 1017 5 ct 1041 5 1059 -7 1075 -33 ct -1075 -33 1075 -33 1069 -38 ct 1059 -26 1050 -21 1040 -21 ct 1022 -21 1015 -34 1015 -65 ct -1015 -65 1015 -65 1015 -206 ct 1015 -206 1015 -206 1063 -206 ct 1063 -206 1063 -206 1063 -222 ct -p ef -1165 -227 m 1165 -227 1165 -227 1090 -200 ct 1090 -200 1090 -200 1090 -192 ct -1090 -192 1090 -192 1094 -193 ct 1099 -194 1106 -194 1110 -194 ct 1122 -194 1126 -186 1126 -164 ct -1126 -164 1126 -164 1126 -49 ct 1126 -14 1121 -8 1088 -8 ct 1088 -8 1088 -8 1088 0 ct -1088 0 1088 0 1202 0 ct 1202 0 1202 0 1202 -8 ct 1171 -8 1167 -15 1167 -50 ct 1167 -50 1167 -50 1167 -225 ct -1167 -225 1167 -225 1165 -227 ct p -1142 -337 m 1129 -337 1118 -326 1118 -312 ct 1118 -298 1128 -287 1142 -287 ct -1156 -287 1167 -298 1167 -312 ct 1167 -326 1156 -337 1142 -337 ct p ef -1450 -222 m 1450 -222 1450 -222 1383 -222 ct 1383 -222 1383 -222 1383 -215 ct -1398 -213 1405 -208 1405 -199 ct 1405 -194 1404 -189 1402 -184 ct 1402 -184 1402 -184 1355 -56 ct -1355 -56 1355 -56 1305 -182 ct 1302 -189 1301 -196 1301 -201 ct 1301 -210 1306 -213 1323 -215 ct -1323 -215 1323 -215 1323 -222 ct 1323 -222 1323 -222 1228 -222 ct 1228 -222 1228 -222 1228 -214 ct -1247 -214 1250 -209 1272 -158 ct 1272 -158 1272 -158 1330 -16 ct 1331 -13 1333 -10 1334 -6 ct -1337 3 1340 7 1343 7 ct 1346 7 1349 1 1356 -18 ct 1356 -18 1356 -18 1418 -176 ct -1433 -210 1435 -213 1450 -215 ct 1450 -215 1450 -215 1450 -222 ct p ef -1663 -81 m 1639 -43 1618 -29 1587 -29 ct 1560 -29 1539 -43 1525 -72 ct 1516 -90 1513 -107 1512 -137 ct -1512 -137 1512 -137 1661 -137 ct 1657 -169 1652 -183 1640 -199 ct 1626 -217 1603 -227 1578 -227 ct -1554 -227 1531 -218 1513 -201 ct 1490 -181 1477 -146 1477 -106 ct 1477 -37 1512 5 1568 5 ct -1614 5 1650 -24 1670 -78 ct 1670 -78 1670 -78 1663 -81 ct p -1513 -153 m 1518 -191 1535 -209 1564 -209 ct 1594 -209 1605 -196 1612 -153 ct -1612 -153 1612 -153 1513 -153 ct p ef -1958 -222 m 1958 -222 1958 -222 1898 -222 ct 1898 -222 1898 -222 1898 -279 ct -1898 -308 1907 -323 1926 -323 ct 1936 -323 1943 -318 1951 -304 ct 1959 -291 1965 -286 1973 -286 ct -1984 -286 1993 -295 1993 -306 ct 1993 -324 1972 -337 1943 -337 ct 1913 -337 1887 -324 1875 -301 ct -1862 -279 1858 -261 1858 -222 ct 1858 -222 1858 -222 1818 -222 ct 1818 -222 1818 -222 1818 -206 ct -1818 -206 1818 -206 1858 -206 ct 1858 -206 1858 -206 1858 -51 ct 1858 -14 1853 -8 1818 -8 ct -1818 -8 1818 -8 1818 0 ct 1818 0 1818 0 1944 0 ct 1944 0 1944 0 1944 -8 ct 1904 -8 1899 -13 1899 -51 ct -1899 -51 1899 -51 1899 -206 ct 1899 -206 1899 -206 1958 -206 ct 1958 -206 1958 -206 1958 -222 ct -p ef -2054 -227 m 2054 -227 2054 -227 1979 -200 ct 1979 -200 1979 -200 1979 -192 ct -1979 -192 1979 -192 1983 -193 ct 1988 -194 1995 -194 1999 -194 ct 2011 -194 2015 -186 2015 -164 ct -2015 -164 2015 -164 2015 -49 ct 2015 -14 2010 -8 1977 -8 ct 1977 -8 1977 -8 1977 0 ct -1977 0 1977 0 2091 0 ct 2091 0 2091 0 2091 -8 ct 2060 -8 2056 -15 2056 -50 ct 2056 -50 2056 -50 2056 -225 ct -2056 -225 2056 -225 2054 -227 ct p -2031 -337 m 2018 -337 2007 -326 2007 -312 ct 2007 -298 2017 -287 2031 -287 ct -2045 -287 2056 -298 2056 -312 ct 2056 -326 2045 -337 2031 -337 ct p ef -2117 -307 m 2117 -307 2117 -307 2120 -307 ct 2125 -308 2131 -308 2135 -308 ct -2151 -308 2155 -301 2155 -278 ct 2155 -278 2155 -278 2155 -42 ct 2155 -15 2149 -8 2118 -8 ct -2118 -8 2118 -8 2118 0 ct 2118 0 2118 0 2232 0 ct 2232 0 2232 0 2232 -8 ct 2202 -8 2196 -14 2196 -41 ct -2196 -41 2196 -41 2196 -336 ct 2196 -336 2196 -336 2194 -337 ct 2169 -328 2151 -323 2117 -315 ct -2117 -315 2117 -315 2117 -307 ct p ef -2367 -222 m 2367 -222 2367 -222 2319 -222 ct 2319 -222 2319 -222 2319 -279 ct -2319 -284 2318 -286 2315 -286 ct 2312 -281 2309 -277 2305 -272 ct 2287 -245 2266 -221 2259 -219 ct -2253 -216 2250 -212 2250 -210 ct 2250 -208 2251 -207 2252 -206 ct 2252 -206 2252 -206 2278 -206 ct -2278 -206 2278 -206 2278 -58 ct 2278 -16 2292 5 2321 5 ct 2345 5 2363 -7 2379 -33 ct -2379 -33 2379 -33 2373 -38 ct 2363 -26 2354 -21 2344 -21 ct 2326 -21 2319 -34 2319 -65 ct -2319 -65 2319 -65 2319 -206 ct 2319 -206 2319 -206 2367 -206 ct 2367 -206 2367 -206 2367 -222 ct -p ef -2581 -81 m 2557 -43 2536 -29 2505 -29 ct 2478 -29 2457 -43 2443 -72 ct 2434 -90 2431 -107 2430 -137 ct -2430 -137 2430 -137 2579 -137 ct 2575 -169 2570 -183 2558 -199 ct 2544 -217 2521 -227 2496 -227 ct -2472 -227 2449 -218 2431 -201 ct 2408 -181 2395 -146 2395 -106 ct 2395 -37 2430 5 2486 5 ct -2532 5 2568 -24 2588 -78 ct 2588 -78 2588 -78 2581 -81 ct p -2431 -153 m 2436 -191 2453 -209 2482 -209 ct 2512 -209 2523 -196 2530 -153 ct -2530 -153 2530 -153 2431 -153 ct p ef -2607 -192 m 2614 -194 2619 -194 2624 -194 ct 2636 -194 2641 -186 2641 -164 ct -2641 -164 2641 -164 2641 -41 ct 2641 -17 2637 -13 2606 -7 ct 2606 -7 2606 -7 2606 0 ct -2606 0 2606 0 2723 0 ct 2723 0 2723 0 2723 -8 ct 2690 -8 2681 -15 2681 -44 ct 2681 -44 2681 -44 2681 -155 ct -2681 -171 2702 -196 2715 -196 ct 2718 -196 2723 -193 2728 -188 ct 2736 -182 2741 -179 2747 -179 ct -2759 -179 2766 -187 2766 -201 ct 2766 -217 2756 -227 2740 -227 ct 2719 -227 2705 -216 2681 -181 ct -2681 -181 2681 -181 2681 -226 ct 2681 -226 2681 -226 2679 -227 ct 2653 -216 2636 -210 2607 -200 ct -2607 -200 2607 -200 2607 -192 ct p ef -pom -gr -gr -gs -gs -pum -10753 9450 t -9 -307 m 9 -307 9 -307 12 -307 ct 17 -308 23 -308 27 -308 ct 43 -308 47 -301 47 -278 ct -47 -278 47 -278 47 -42 ct 47 -15 41 -8 10 -8 ct 10 -8 10 -8 10 0 ct 10 0 10 0 124 0 ct -124 0 124 0 124 -8 ct 94 -8 88 -14 88 -41 ct 88 -41 88 -41 88 -336 ct 88 -336 88 -336 86 -337 ct -61 -328 43 -323 9 -315 ct 9 -315 9 -315 9 -307 ct p ef -256 -227 m 193 -227 149 -180 149 -112 ct 149 -45 194 5 255 5 ct 316 5 363 -47 363 -115 ct -363 -180 318 -227 256 -227 ct p -250 -213 m 290 -213 319 -166 319 -98 ct 319 -42 297 -9 261 -9 ct 242 -9 224 -21 214 -40 ct -200 -66 193 -101 193 -136 ct 193 -183 215 -213 250 -213 ct p ef -617 -25 m 617 -25 617 -25 614 -25 ct 592 -25 587 -30 587 -53 ct 587 -53 587 -53 587 -222 ct -587 -222 587 -222 510 -222 ct 510 -222 510 -222 510 -213 ct 540 -213 546 -208 546 -183 ct -546 -183 546 -183 546 -67 ct 546 -53 544 -46 537 -41 ct 524 -30 509 -24 494 -24 ct -476 -24 460 -41 460 -61 ct 460 -61 460 -61 460 -222 ct 460 -222 460 -222 389 -222 ct -389 -222 389 -222 389 -214 ct 413 -214 419 -206 419 -184 ct 419 -184 419 -184 419 -59 ct -419 -20 443 5 478 5 ct 496 5 515 -3 528 -16 ct 528 -16 528 -16 549 -38 ct 549 -38 549 -38 549 4 ct -549 4 549 4 551 5 ct 575 -5 592 -11 617 -18 ct 617 -18 617 -18 617 -25 ct p ef -798 5 m 798 5 798 5 869 -21 ct 869 -21 869 -21 869 -28 ct 860 -28 859 -28 858 -28 ct -840 -28 836 -33 836 -56 ct 836 -56 836 -56 836 -336 ct 836 -336 836 -336 834 -337 ct -811 -329 794 -324 763 -315 ct 763 -315 763 -315 763 -308 ct 767 -308 769 -308 773 -308 ct -791 -308 796 -303 796 -283 ct 796 -283 796 -283 796 -206 ct 777 -222 764 -227 745 -227 ct -689 -227 644 -171 644 -101 ct 644 -38 680 5 734 5 ct 761 5 779 -5 796 -28 ct 796 -28 796 -28 796 4 ct -796 4 796 4 798 5 ct p -796 -50 m 796 -47 792 -41 787 -35 ct 779 -26 767 -21 753 -21 ct 712 -21 686 -60 686 -121 ct -686 -177 709 -213 746 -213 ct 772 -213 796 -190 796 -164 ct 796 -164 796 -164 796 -50 ct -p ef -1034 -155 m 1034 -155 1034 -155 1032 -222 ct 1032 -222 1032 -222 1026 -222 ct -1026 -222 1026 -222 1025 -221 ct 1021 -218 1020 -217 1018 -217 ct 1016 -217 1011 -218 1005 -221 ct -995 -225 984 -227 972 -227 ct 933 -227 906 -202 906 -166 ct 906 -138 921 -118 962 -95 ct -962 -95 962 -95 990 -78 ct 1007 -69 1016 -57 1016 -41 ct 1016 -20 1000 -6 975 -6 ct -959 -6 944 -12 935 -23 ct 925 -35 920 -47 914 -75 ct 914 -75 914 -75 906 -75 ct -906 -75 906 -75 906 2 ct 906 2 906 2 912 2 ct 916 -3 918 -4 924 -4 ct 928 -4 935 -3 946 0 ct -959 3 973 5 981 5 ct 1018 5 1049 -24 1049 -58 ct 1049 -83 1038 -99 1009 -117 ct -1009 -117 1009 -117 957 -148 ct 943 -156 936 -169 936 -182 ct 936 -202 951 -216 973 -216 ct -1001 -216 1015 -199 1026 -155 ct 1026 -155 1026 -155 1034 -155 ct p ef -1079 -195 m 1084 -195 1087 -195 1091 -195 ct 1108 -195 1111 -190 1111 -167 ct -1111 -167 1111 -167 1111 65 ct 1111 90 1106 96 1077 99 ct 1077 99 1077 99 1077 107 ct -1077 107 1077 107 1195 107 ct 1195 107 1195 107 1195 98 ct 1158 98 1152 93 1152 61 ct -1152 61 1152 61 1152 -16 ct 1169 0 1181 5 1201 5 ct 1258 5 1303 -50 1303 -122 ct -1303 -183 1269 -227 1222 -227 ct 1195 -227 1173 -215 1152 -189 ct 1152 -189 1152 -189 1152 -226 ct -1152 -226 1152 -226 1149 -227 ct 1123 -217 1106 -210 1079 -202 ct 1079 -202 1079 -202 1079 -195 ct -p -1152 -165 m 1152 -180 1179 -197 1201 -197 ct 1237 -197 1261 -160 1261 -103 ct -1261 -48 1237 -11 1202 -11 ct 1180 -11 1152 -29 1152 -44 ct 1152 -44 1152 -44 1152 -165 ct -p ef -1523 -81 m 1499 -43 1478 -29 1447 -29 ct 1420 -29 1399 -43 1385 -72 ct 1376 -90 1373 -107 1372 -137 ct -1372 -137 1372 -137 1521 -137 ct 1517 -169 1512 -183 1500 -199 ct 1486 -217 1463 -227 1438 -227 ct -1414 -227 1391 -218 1373 -201 ct 1350 -181 1337 -146 1337 -106 ct 1337 -37 1372 5 1428 5 ct -1474 5 1510 -24 1530 -78 ct 1530 -78 1530 -78 1523 -81 ct p -1373 -153 m 1378 -191 1395 -209 1424 -209 ct 1454 -209 1465 -196 1472 -153 ct -1472 -153 1472 -153 1373 -153 ct p ef -1759 -32 m 1751 -26 1745 -23 1738 -23 ct 1727 -23 1723 -30 1723 -52 ct 1723 -52 1723 -52 1723 -148 ct -1723 -173 1721 -188 1713 -200 ct 1703 -218 1682 -227 1653 -227 ct 1608 -227 1572 -203 1572 -171 ct -1572 -160 1582 -150 1593 -150 ct 1605 -150 1615 -160 1615 -171 ct 1615 -173 1614 -175 1614 -179 ct -1613 -183 1612 -187 1612 -191 ct 1612 -204 1628 -215 1647 -215 ct 1671 -215 1684 -201 1684 -174 ct -1684 -174 1684 -174 1684 -144 ct 1609 -113 1601 -109 1580 -90 ct 1570 -81 1563 -64 1563 -48 ct -1563 -17 1584 5 1614 5 ct 1635 5 1655 -5 1684 -31 ct 1687 -5 1696 5 1715 5 ct 1732 5 1742 -1 1759 -20 ct -1759 -20 1759 -20 1759 -32 ct p -1684 -61 m 1684 -45 1682 -41 1671 -35 ct 1660 -28 1646 -24 1636 -24 ct 1619 -24 1606 -40 1606 -62 ct -1606 -62 1606 -62 1606 -63 ct 1606 -92 1625 -110 1684 -132 ct 1684 -132 1684 -132 1684 -61 ct -p ef -1768 -307 m 1775 -307 1779 -308 1784 -308 ct 1800 -308 1805 -302 1805 -278 ct -1805 -278 1805 -278 1805 -40 ct 1805 -15 1803 -13 1768 -7 ct 1768 -7 1768 -7 1768 0 ct -1768 0 1768 0 1882 0 ct 1882 0 1882 0 1882 -8 ct 1882 -8 1882 -8 1872 -8 ct 1853 -8 1845 -15 1845 -32 ct -1845 -32 1845 -32 1845 -124 ct 1845 -124 1845 -124 1913 -32 ct 1913 -32 1913 -32 1915 -30 ct -1916 -28 1917 -27 1918 -25 ct 1922 -20 1923 -17 1923 -15 ct 1923 -10 1919 -7 1913 -7 ct -1913 -7 1913 -7 1904 -7 ct 1904 -7 1904 -7 1904 0 ct 1904 0 1904 0 2009 0 ct 2009 0 2009 0 2009 -8 ct -1988 -8 1973 -18 1953 -43 ct 1953 -43 1953 -43 1879 -139 ct 1879 -139 1879 -139 1893 -152 ct -1927 -185 1957 -208 1971 -212 ct 1979 -214 1985 -215 1994 -215 ct 1994 -215 1994 -215 1997 -215 ct -1997 -215 1997 -215 1997 -222 ct 1997 -222 1997 -222 1899 -222 ct 1899 -222 1899 -222 1899 -215 ct -1918 -215 1923 -213 1923 -206 ct 1923 -202 1918 -195 1912 -189 ct 1912 -189 1912 -189 1845 -129 ct -1845 -129 1845 -129 1845 -336 ct 1845 -336 1845 -336 1843 -337 ct 1825 -331 1811 -327 1783 -319 ct -1783 -319 1783 -319 1768 -315 ct 1768 -315 1768 -315 1768 -307 ct p ef -2217 -81 m 2193 -43 2172 -29 2141 -29 ct 2114 -29 2093 -43 2079 -72 ct 2070 -90 2067 -107 2066 -137 ct -2066 -137 2066 -137 2215 -137 ct 2211 -169 2206 -183 2194 -199 ct 2180 -217 2157 -227 2132 -227 ct -2108 -227 2085 -218 2067 -201 ct 2044 -181 2031 -146 2031 -106 ct 2031 -37 2066 5 2122 5 ct -2168 5 2204 -24 2224 -78 ct 2224 -78 2224 -78 2217 -81 ct p -2067 -153 m 2072 -191 2089 -209 2118 -209 ct 2148 -209 2159 -196 2166 -153 ct -2166 -153 2166 -153 2067 -153 ct p ef -2242 -192 m 2249 -194 2254 -194 2259 -194 ct 2271 -194 2276 -186 2276 -164 ct -2276 -164 2276 -164 2276 -41 ct 2276 -17 2272 -13 2241 -7 ct 2241 -7 2241 -7 2241 0 ct -2241 0 2241 0 2358 0 ct 2358 0 2358 0 2358 -8 ct 2325 -8 2316 -15 2316 -44 ct 2316 -44 2316 -44 2316 -155 ct -2316 -171 2337 -196 2350 -196 ct 2353 -196 2358 -193 2363 -188 ct 2371 -182 2376 -179 2382 -179 ct -2394 -179 2401 -187 2401 -201 ct 2401 -217 2391 -227 2375 -227 ct 2354 -227 2340 -216 2316 -181 ct -2316 -181 2316 -181 2316 -226 ct 2316 -226 2316 -226 2314 -227 ct 2288 -216 2271 -210 2242 -200 ct -2242 -200 2242 -200 2242 -192 ct p ef -pom -gr -gr -gs -gs -pum -4619 16250 t -121 -227 m 58 -227 14 -180 14 -112 ct 14 -45 59 5 120 5 ct 181 5 228 -47 228 -115 ct -228 -180 183 -227 121 -227 ct p -115 -213 m 155 -213 184 -166 184 -98 ct 184 -42 162 -9 126 -9 ct 107 -9 89 -21 79 -40 ct -65 -66 58 -101 58 -136 ct 58 -183 80 -213 115 -213 ct p ef -482 -25 m 482 -25 482 -25 479 -25 ct 457 -25 452 -30 452 -53 ct 452 -53 452 -53 452 -222 ct -452 -222 452 -222 375 -222 ct 375 -222 375 -222 375 -213 ct 405 -213 411 -208 411 -183 ct -411 -183 411 -183 411 -67 ct 411 -53 409 -46 402 -41 ct 389 -30 374 -24 359 -24 ct -341 -24 325 -41 325 -61 ct 325 -61 325 -61 325 -222 ct 325 -222 325 -222 254 -222 ct -254 -222 254 -222 254 -214 ct 278 -214 284 -206 284 -184 ct 284 -184 284 -184 284 -59 ct -284 -20 308 5 343 5 ct 361 5 380 -3 393 -16 ct 393 -16 393 -16 414 -38 ct 414 -38 414 -38 414 4 ct -414 4 414 4 416 5 ct 440 -5 457 -11 482 -18 ct 482 -18 482 -18 482 -25 ct p ef -618 -222 m 618 -222 618 -222 570 -222 ct 570 -222 570 -222 570 -279 ct 570 -284 569 -286 566 -286 ct -563 -281 560 -277 556 -272 ct 538 -245 517 -221 510 -219 ct 504 -216 501 -212 501 -210 ct -501 -208 502 -207 503 -206 ct 503 -206 503 -206 529 -206 ct 529 -206 529 -206 529 -58 ct -529 -16 543 5 572 5 ct 596 5 614 -7 630 -33 ct 630 -33 630 -33 624 -38 ct 614 -26 605 -21 595 -21 ct -577 -21 570 -34 570 -65 ct 570 -65 570 -65 570 -206 ct 570 -206 570 -206 618 -206 ct -618 -206 618 -206 618 -222 ct p ef -639 -195 m 644 -195 647 -195 651 -195 ct 668 -195 671 -190 671 -167 ct 671 -167 671 -167 671 65 ct -671 90 666 96 637 99 ct 637 99 637 99 637 107 ct 637 107 637 107 755 107 ct 755 107 755 107 755 98 ct -718 98 712 93 712 61 ct 712 61 712 61 712 -16 ct 729 0 741 5 761 5 ct 818 5 863 -50 863 -122 ct -863 -183 829 -227 782 -227 ct 755 -227 733 -215 712 -189 ct 712 -189 712 -189 712 -226 ct -712 -226 712 -226 709 -227 ct 683 -217 666 -210 639 -202 ct 639 -202 639 -202 639 -195 ct -p -712 -165 m 712 -180 739 -197 761 -197 ct 797 -197 821 -160 821 -103 ct 821 -48 797 -11 762 -11 ct -740 -11 712 -29 712 -44 ct 712 -44 712 -44 712 -165 ct p ef -1117 -25 m 1117 -25 1117 -25 1114 -25 ct 1092 -25 1087 -30 1087 -53 ct 1087 -53 1087 -53 1087 -222 ct -1087 -222 1087 -222 1010 -222 ct 1010 -222 1010 -222 1010 -213 ct 1040 -213 1046 -208 1046 -183 ct -1046 -183 1046 -183 1046 -67 ct 1046 -53 1044 -46 1037 -41 ct 1024 -30 1009 -24 994 -24 ct -976 -24 960 -41 960 -61 ct 960 -61 960 -61 960 -222 ct 960 -222 960 -222 889 -222 ct -889 -222 889 -222 889 -214 ct 913 -214 919 -206 919 -184 ct 919 -184 919 -184 919 -59 ct -919 -20 943 5 978 5 ct 996 5 1015 -3 1028 -16 ct 1028 -16 1028 -16 1049 -38 ct -1049 -38 1049 -38 1049 4 ct 1049 4 1049 4 1051 5 ct 1075 -5 1092 -11 1117 -18 ct -1117 -18 1117 -18 1117 -25 ct p ef -1253 -222 m 1253 -222 1253 -222 1205 -222 ct 1205 -222 1205 -222 1205 -279 ct -1205 -284 1204 -286 1201 -286 ct 1198 -281 1195 -277 1191 -272 ct 1173 -245 1152 -221 1145 -219 ct -1139 -216 1136 -212 1136 -210 ct 1136 -208 1137 -207 1138 -206 ct 1138 -206 1138 -206 1164 -206 ct -1164 -206 1164 -206 1164 -58 ct 1164 -16 1178 5 1207 5 ct 1231 5 1249 -7 1265 -33 ct -1265 -33 1265 -33 1259 -38 ct 1249 -26 1240 -21 1230 -21 ct 1212 -21 1205 -34 1205 -65 ct -1205 -65 1205 -65 1205 -206 ct 1205 -206 1205 -206 1253 -206 ct 1253 -206 1253 -206 1253 -222 ct -p ef -pom -gr -gs -pum -4138 16851 t -143 -334 m 107 -310 92 -297 75 -274 ct 40 -231 23 -182 23 -124 ct 23 -62 41 -13 84 37 ct -104 61 116 72 141 87 ct 141 87 141 87 147 79 ct 108 48 95 31 82 -6 ct 70 -39 65 -76 65 -126 ct -65 -178 71 -218 84 -249 ct 98 -279 112 -297 147 -326 ct 147 -326 147 -326 143 -334 ct -p ef -288 -222 m 288 -222 288 -222 240 -222 ct 240 -222 240 -222 240 -279 ct 240 -284 239 -286 236 -286 ct -233 -281 230 -277 226 -272 ct 208 -245 187 -221 180 -219 ct 174 -216 171 -212 171 -210 ct -171 -208 172 -207 173 -206 ct 173 -206 173 -206 199 -206 ct 199 -206 199 -206 199 -58 ct -199 -16 213 5 242 5 ct 266 5 284 -7 300 -33 ct 300 -33 300 -33 294 -38 ct 284 -26 275 -21 265 -21 ct -247 -21 240 -34 240 -65 ct 240 -65 240 -65 240 -206 ct 240 -206 240 -206 288 -206 ct -288 -206 288 -206 288 -222 ct p ef -426 -227 m 363 -227 319 -180 319 -112 ct 319 -45 364 5 425 5 ct 486 5 533 -47 533 -115 ct -533 -180 488 -227 426 -227 ct p -420 -213 m 460 -213 489 -166 489 -98 ct 489 -42 467 -9 431 -9 ct 412 -9 394 -21 384 -40 ct -370 -66 363 -101 363 -136 ct 363 -183 385 -213 420 -213 ct p ef -827 -222 m 827 -222 827 -222 767 -222 ct 767 -222 767 -222 767 -279 ct 767 -308 776 -323 795 -323 ct -805 -323 812 -318 820 -304 ct 828 -291 834 -286 842 -286 ct 853 -286 862 -295 862 -306 ct -862 -324 841 -337 812 -337 ct 782 -337 756 -324 744 -301 ct 731 -279 727 -261 727 -222 ct -727 -222 727 -222 687 -222 ct 687 -222 687 -222 687 -206 ct 687 -206 687 -206 727 -206 ct -727 -206 727 -206 727 -51 ct 727 -14 722 -8 687 -8 ct 687 -8 687 -8 687 0 ct 687 0 687 0 813 0 ct -813 0 813 0 813 -8 ct 773 -8 768 -13 768 -51 ct 768 -51 768 -51 768 -206 ct 768 -206 768 -206 827 -206 ct -827 -206 827 -206 827 -222 ct p ef -1052 -32 m 1044 -26 1038 -23 1031 -23 ct 1020 -23 1016 -30 1016 -52 ct 1016 -52 1016 -52 1016 -148 ct -1016 -173 1014 -188 1006 -200 ct 996 -218 975 -227 946 -227 ct 901 -227 865 -203 865 -171 ct -865 -160 875 -150 886 -150 ct 898 -150 908 -160 908 -171 ct 908 -173 907 -175 907 -179 ct -906 -183 905 -187 905 -191 ct 905 -204 921 -215 940 -215 ct 964 -215 977 -201 977 -174 ct -977 -174 977 -174 977 -144 ct 902 -113 894 -109 873 -90 ct 863 -81 856 -64 856 -48 ct -856 -17 877 5 907 5 ct 928 5 948 -5 977 -31 ct 980 -5 989 5 1008 5 ct 1025 5 1035 -1 1052 -20 ct -1052 -20 1052 -20 1052 -32 ct p -977 -61 m 977 -45 975 -41 964 -35 ct 953 -28 939 -24 929 -24 ct 912 -24 899 -40 899 -62 ct -899 -62 899 -62 899 -63 ct 899 -92 918 -110 977 -132 ct 977 -132 977 -132 977 -61 ct -p ef -1061 -192 m 1068 -194 1073 -194 1078 -194 ct 1090 -194 1095 -186 1095 -164 ct -1095 -164 1095 -164 1095 -41 ct 1095 -17 1091 -13 1060 -7 ct 1060 -7 1060 -7 1060 0 ct -1060 0 1060 0 1177 0 ct 1177 0 1177 0 1177 -8 ct 1144 -8 1135 -15 1135 -44 ct 1135 -44 1135 -44 1135 -155 ct -1135 -171 1156 -196 1169 -196 ct 1172 -196 1177 -193 1182 -188 ct 1190 -182 1195 -179 1201 -179 ct -1213 -179 1220 -187 1220 -201 ct 1220 -217 1210 -227 1194 -227 ct 1173 -227 1159 -216 1135 -181 ct -1135 -181 1135 -181 1135 -226 ct 1135 -226 1135 -226 1133 -227 ct 1107 -216 1090 -210 1061 -200 ct -1061 -200 1061 -200 1061 -192 ct p ef -1544 -81 m 1520 -43 1499 -29 1468 -29 ct 1441 -29 1420 -43 1406 -72 ct 1397 -90 1394 -107 1393 -137 ct -1393 -137 1393 -137 1542 -137 ct 1538 -169 1533 -183 1521 -199 ct 1507 -217 1484 -227 1459 -227 ct -1435 -227 1412 -218 1394 -201 ct 1371 -181 1358 -146 1358 -106 ct 1358 -37 1393 5 1449 5 ct -1495 5 1531 -24 1551 -78 ct 1551 -78 1551 -78 1544 -81 ct p -1394 -153 m 1399 -191 1416 -209 1445 -209 ct 1475 -209 1486 -196 1493 -153 ct -1493 -153 1493 -153 1394 -153 ct p ef -1574 -196 m 1577 -198 1581 -198 1587 -198 ct 1600 -198 1605 -191 1605 -166 ct -1605 -166 1605 -166 1605 -44 ct 1605 -15 1599 -8 1575 -8 ct 1575 -8 1575 -8 1575 0 ct -1575 0 1575 0 1677 0 ct 1677 0 1677 0 1677 -8 ct 1653 -8 1645 -14 1645 -32 ct 1645 -32 1645 -32 1645 -171 ct -1669 -194 1679 -200 1695 -200 ct 1719 -200 1731 -184 1731 -152 ct 1731 -152 1731 -152 1731 -48 ct -1731 -17 1724 -8 1700 -8 ct 1700 -8 1700 -8 1700 0 ct 1700 0 1700 0 1801 0 ct 1801 0 1801 0 1801 -7 ct -1777 -10 1771 -16 1771 -40 ct 1771 -40 1771 -40 1771 -153 ct 1771 -199 1750 -227 1714 -227 ct -1692 -227 1677 -219 1644 -187 ct 1644 -187 1644 -187 1644 -226 ct 1644 -226 1644 -226 1641 -227 ct -1617 -218 1600 -213 1574 -205 ct 1574 -205 1574 -205 1574 -196 ct p ef -1983 5 m 1983 5 1983 5 2054 -21 ct 2054 -21 2054 -21 2054 -28 ct 2045 -28 2044 -28 2043 -28 ct -2025 -28 2021 -33 2021 -56 ct 2021 -56 2021 -56 2021 -336 ct 2021 -336 2021 -336 2019 -337 ct -1996 -329 1979 -324 1948 -315 ct 1948 -315 1948 -315 1948 -308 ct 1952 -308 1954 -308 1958 -308 ct -1976 -308 1981 -303 1981 -283 ct 1981 -283 1981 -283 1981 -206 ct 1962 -222 1949 -227 1930 -227 ct -1874 -227 1829 -171 1829 -101 ct 1829 -38 1865 5 1919 5 ct 1946 5 1964 -5 1981 -28 ct -1981 -28 1981 -28 1981 4 ct 1981 4 1981 4 1983 5 ct p -1981 -50 m 1981 -47 1977 -41 1972 -35 ct 1964 -26 1952 -21 1938 -21 ct 1897 -21 1871 -60 1871 -121 ct -1871 -177 1894 -213 1931 -213 ct 1957 -213 1981 -190 1981 -164 ct 1981 -164 1981 -164 1981 -50 ct -p ef -2084 87 m 2120 64 2135 51 2153 28 ct 2187 -15 2204 -64 2204 -122 ct 2204 -185 2186 -233 2143 -283 ct -2124 -307 2111 -318 2086 -334 ct 2086 -334 2086 -334 2080 -326 ct 2119 -295 2132 -277 2145 -240 ct -2157 -207 2162 -170 2162 -120 ct 2162 -69 2156 -28 2143 2 ct 2129 33 2115 51 2080 79 ct -2080 79 2080 79 2084 87 ct p ef -pom -gr -gr -gs -gs -pum -8742 14319 t -7 -199 m 14 -200 17 -201 23 -201 ct 51 -201 58 -188 81 -103 ct 89 -71 101 -13 101 -4 ct -101 4 98 11 91 20 ct 76 41 66 54 60 59 ct 50 70 44 74 38 74 ct 35 74 31 73 26 69 ct -18 63 13 60 7 60 ct -3 60 -12 69 -12 80 ct -12 92 -1 102 13 102 ct 45 102 110 27 163 -71 ct -197 -131 210 -167 210 -191 ct 210 -206 198 -219 183 -219 ct 172 -219 164 -211 164 -200 ct -164 -193 168 -188 178 -181 ct 187 -176 191 -171 191 -164 ct 191 -145 172 -106 130 -36 ct -130 -36 130 -36 121 -94 ct 113 -137 85 -219 78 -219 ct 78 -219 78 -219 76 -219 ct -76 -218 74 -218 72 -218 ct 67 -217 49 -214 23 -209 ct 21 -209 14 -208 7 -207 ct -7 -207 7 -207 7 -199 ct p ef -pom -gr -gs -pum -8962 14319 t -143 -334 m 107 -310 92 -297 75 -274 ct 40 -231 23 -182 23 -124 ct 23 -62 41 -13 84 37 ct -104 61 116 72 141 87 ct 141 87 141 87 147 79 ct 108 48 95 31 82 -6 ct 70 -39 65 -76 65 -126 ct -65 -178 71 -218 84 -249 ct 98 -279 112 -297 147 -326 ct 147 -326 147 -326 143 -334 ct -p ef -pom -gr -gs -pum -9127 14319 t -227 -58 m 227 -58 227 -58 217 -45 ct 203 -27 194 -19 187 -19 ct 183 -19 179 -23 179 -27 ct -179 -31 179 -31 186 -58 ct 186 -58 186 -58 214 -160 ct 216 -170 218 -181 218 -188 ct -218 -206 205 -218 186 -218 ct 154 -218 123 -189 72 -110 ct 72 -110 72 -110 105 -217 ct -105 -217 105 -217 104 -218 ct 77 -213 67 -211 24 -203 ct 24 -203 24 -203 24 -195 ct -49 -195 55 -192 55 -182 ct 55 -179 55 -176 54 -173 ct 54 -173 54 -173 7 0 ct 7 0 7 0 44 0 ct -67 -78 72 -89 93 -123 ct 123 -168 148 -193 166 -193 ct 174 -193 178 -188 178 -179 ct -178 -173 175 -156 171 -141 ct 171 -141 171 -141 150 -60 ct 143 -35 142 -28 142 -23 ct -142 -4 149 4 165 4 ct 187 4 200 -6 234 -52 ct 234 -52 234 -52 227 -58 ct p ef -pom -gr -gs -pum -9377 14319 t -18 87 m 54 64 69 51 87 28 ct 121 -15 138 -64 138 -122 ct 138 -185 120 -233 77 -283 ct -58 -307 45 -318 20 -334 ct 20 -334 20 -334 14 -326 ct 53 -295 66 -277 79 -240 ct -91 -207 96 -170 96 -120 ct 96 -69 90 -28 77 2 ct 63 33 49 51 14 79 ct 14 79 14 79 18 87 ct -p ef -pom -gr -gr -gs -gs -pum -8742 14186 t -45 -147 m 114 -290 l 183 -147 l 216 -147 l 128 -327 l 99 -327 l 12 -147 l -45 -147 l p ef -pom -gr -gr -gs -gs -pum -14351 14292 t -7 -199 m 14 -200 17 -201 23 -201 ct 51 -201 58 -188 81 -103 ct 89 -71 101 -13 101 -4 ct -101 4 98 11 91 20 ct 76 41 66 54 60 59 ct 50 70 44 74 38 74 ct 35 74 31 73 26 69 ct -18 63 13 60 7 60 ct -3 60 -12 69 -12 80 ct -12 92 -1 102 13 102 ct 45 102 110 27 163 -71 ct -197 -131 210 -167 210 -191 ct 210 -206 198 -219 183 -219 ct 172 -219 164 -211 164 -200 ct -164 -193 168 -188 178 -181 ct 187 -176 191 -171 191 -164 ct 191 -145 172 -106 130 -36 ct -130 -36 130 -36 121 -94 ct 113 -137 85 -219 78 -219 ct 78 -219 78 -219 76 -219 ct -76 -218 74 -218 72 -218 ct 67 -217 49 -214 23 -209 ct 21 -209 14 -208 7 -207 ct -7 -207 7 -207 7 -199 ct p ef -pom -gr -gs -pum -14571 14292 t -143 -334 m 107 -310 92 -297 75 -274 ct 40 -231 23 -182 23 -124 ct 23 -62 41 -13 84 37 ct -104 61 116 72 141 87 ct 141 87 141 87 147 79 ct 108 48 95 31 82 -6 ct 70 -39 65 -76 65 -126 ct -65 -178 71 -218 84 -249 ct 98 -279 112 -297 147 -326 ct 147 -326 147 -326 143 -334 ct -p ef -pom -gr -gs -pum -14736 14292 t -227 -58 m 227 -58 227 -58 217 -45 ct 203 -27 194 -19 187 -19 ct 183 -19 179 -23 179 -27 ct -179 -31 179 -31 186 -58 ct 186 -58 186 -58 214 -160 ct 216 -170 218 -181 218 -188 ct -218 -206 205 -218 186 -218 ct 154 -218 123 -189 72 -110 ct 72 -110 72 -110 105 -217 ct -105 -217 105 -217 104 -218 ct 77 -213 67 -211 24 -203 ct 24 -203 24 -203 24 -195 ct -49 -195 55 -192 55 -182 ct 55 -179 55 -176 54 -173 ct 54 -173 54 -173 7 0 ct 7 0 7 0 44 0 ct -67 -78 72 -89 93 -123 ct 123 -168 148 -193 166 -193 ct 174 -193 178 -188 178 -179 ct -178 -173 175 -156 171 -141 ct 171 -141 171 -141 150 -60 ct 143 -35 142 -28 142 -23 ct -142 -4 149 4 165 4 ct 187 4 200 -6 234 -52 ct 234 -52 234 -52 227 -58 ct p ef -pom -gr -gs -pum -14986 14292 t -18 87 m 54 64 69 51 87 28 ct 121 -15 138 -64 138 -122 ct 138 -185 120 -233 77 -283 ct -58 -307 45 -318 20 -334 ct 20 -334 20 -334 14 -326 ct 53 -295 66 -277 79 -240 ct -91 -207 96 -170 96 -120 ct 96 -69 90 -28 77 2 ct 63 33 49 51 14 79 ct 14 79 14 79 18 87 ct -p ef -pom -gr -gr -tm setmatrix -0 0 t -1 1 s -0 8286 t -pom -count op_count sub {pop} repeat countdictstack dict_count sub {end} repeat b4_inc_state restore -%%PageTrailer -%%Trailer -%%EOF diff --git a/speex/doc/echo_path.odg b/speex/doc/echo_path.odg deleted file mode 100644 index 460af845f55cde33573ab6e80ea68c2a4360cc1c..0000000000000000000000000000000000000000 Binary files a/speex/doc/echo_path.odg and /dev/null differ diff --git a/speex/doc/manual.lyx b/speex/doc/manual.lyx deleted file mode 100644 index fcbe985a199bdbf1d51210985fc5a0d742b7e9da..0000000000000000000000000000000000000000 --- a/speex/doc/manual.lyx +++ /dev/null @@ -1,11984 +0,0 @@ -#LyX 1.6.1 created this file. For more info see http://www.lyx.org/ -\lyxformat 345 -\begin_document -\begin_header -\textclass scrbook -\use_default_options true -\language english -\inputencoding auto -\font_roman default -\font_sans default -\font_typewriter default -\font_default_family default -\font_sc false -\font_osf false -\font_sf_scale 100 -\font_tt_scale 100 - -\graphics default -\paperfontsize 10 -\spacing single -\use_hyperref false -\papersize letterpaper -\use_geometry true -\use_amsmath 2 -\use_esint 2 -\cite_engine basic -\use_bibtopic false -\paperorientation portrait -\leftmargin 2cm -\topmargin 2cm -\rightmargin 2cm -\bottommargin 2cm -\secnumdepth 3 -\tocdepth 3 -\paragraph_separation indent -\defskip medskip -\quotes_language english -\papercolumns 1 -\papersides 1 -\paperpagestyle headings -\tracking_changes false -\output_changes false -\author "" -\author "" -\end_header - -\begin_body - -\begin_layout Title -The Speex Manual -\begin_inset Newline newline -\end_inset - -Version 1.2 -\end_layout - -\begin_layout Author -Jean-Marc Valin -\end_layout - -\begin_layout Standard -\begin_inset Newpage newpage -\end_inset - - -\end_layout - -\begin_layout Standard -Copyright -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -copyright -\end_layout - -\end_inset - - 2002-2008 Jean-Marc Valin/Xiph.org Foundation -\end_layout - -\begin_layout Standard -Permission is granted to copy, distribute and/or modify this document under - the terms of the GNU Free Documentation License, Version 1.1 or any later - version published by the Free Software Foundation; with no Invariant Section, - with no Front-Cover Texts, and with no Back-Cover. - A copy of the license is included in the section entitled "GNU Free Documentati -on License". - -\end_layout - -\begin_layout Standard -\begin_inset Newpage newpage -\end_inset - - -\begin_inset CommandInset toc -LatexCommand tableofcontents - -\end_inset - - -\begin_inset Newpage newpage -\end_inset - - -\end_layout - -\begin_layout Standard -\begin_inset FloatList table - -\end_inset - - -\begin_inset Newpage newpage -\end_inset - - -\end_layout - -\begin_layout Chapter -Introduction to Speex -\end_layout - -\begin_layout Standard -The Speex codec ( -\family typewriter -http://www.speex.org/ -\family default -) exists because there is a need for a speech codec that is open-source - and free from software patent royalties. - These are essential conditions for being usable in any open-source software. - In essence, Speex is to speech what Vorbis is to audio/music. - Unlike many other speech codecs, Speex is not designed for mobile phones - but rather for packet networks and voice over IP (VoIP) applications. - File-based compression is of course also supported. - -\end_layout - -\begin_layout Standard -The Speex codec is designed to be very flexible and support a wide range - of speech quality and bit-rate. - Support for very good quality speech also means that Speex can encode wideband - speech (16 kHz sampling rate) in addition to narrowband speech (telephone - quality, 8 kHz sampling rate). -\end_layout - -\begin_layout Standard -Designing for VoIP instead of mobile phones means that Speex is robust to - lost packets, but not to corrupted ones. - This is based on the assumption that in VoIP, packets either arrive unaltered - or don't arrive at all. - Because Speex is targeted at a wide range of devices, it has modest (adjustable -) complexity and a small memory footprint. -\end_layout - -\begin_layout Standard -All the design goals led to the choice of CELP -\begin_inset Index -status collapsed - -\begin_layout Plain Layout -CELP -\end_layout - -\end_inset - - as the encoding technique. - One of the main reasons is that CELP has long proved that it could work - reliably and scale well to both low bit-rates (e.g. - DoD CELP @ 4.8 kbps) and high bit-rates (e.g. - G.728 @ 16 kbps). - -\end_layout - -\begin_layout Section -Getting help -\begin_inset CommandInset label -LatexCommand label -name "sec:Getting-help" - -\end_inset - - -\end_layout - -\begin_layout Standard -As for many open source projects, there are many ways to get help with Speex. - These include: -\end_layout - -\begin_layout Itemize -This manual -\end_layout - -\begin_layout Itemize -Other documentation on the Speex website (http://www.speex.org/) -\end_layout - -\begin_layout Itemize -Mailing list: Discuss any Speex-related topic on speex-dev@xiph.org (not - just for developers) -\end_layout - -\begin_layout Itemize -IRC: The main channel is #speex on irc.freenode.net. - Note that due to time differences, it may take a while to get someone, - so please be patient. -\end_layout - -\begin_layout Itemize -Email the author privately at jean-marc.valin@usherbrooke.ca -\series bold -only -\series default - for private/delicate topics you do not wish to discuss publicly. -\end_layout - -\begin_layout Standard -Before asking for help (mailing list or IRC), -\series bold -it is important to first read this manual -\series default - (OK, so if you made it here it's already a good sign). - It is generally considered rude to ask on a mailing list about topics that - are clearly detailed in the documentation. - On the other hand, it's perfectly OK (and encouraged) to ask for clarifications - about something covered in the manual. - This manual does not (yet) cover everything about Speex, so everyone is - encouraged to ask questions, send comments, feature requests, or just let - us know how Speex is being used. - -\end_layout - -\begin_layout Standard -Here are some additional guidelines related to the mailing list. - Before reporting bugs in Speex to the list, it is strongly recommended - (if possible) to first test whether these bugs can be reproduced using - the speexenc and speexdec (see Section -\begin_inset CommandInset ref -LatexCommand ref -reference "sec:Command-line-encoder/decoder" - -\end_inset - -) command-line utilities. - Bugs reported based on 3rd party code are both harder to find and far too - often caused by errors that have nothing to do with Speex. - -\end_layout - -\begin_layout Section -About this document -\end_layout - -\begin_layout Standard -This document is divided in the following way. - Section -\begin_inset CommandInset ref -LatexCommand ref -reference "sec:Feature-description" - -\end_inset - - describes the different Speex features and defines many basic terms that - are used throughout this manual. - Section -\begin_inset CommandInset ref -LatexCommand ref -reference "sec:Command-line-encoder/decoder" - -\end_inset - - documents the standard command-line tools provided in the Speex distribution. - Section -\begin_inset CommandInset ref -LatexCommand ref -reference "sec:Programming-with-Speex" - -\end_inset - - includes detailed instructions about programming using the libspeex -\begin_inset Index -status collapsed - -\begin_layout Plain Layout -libspeex -\end_layout - -\end_inset - - API. - Section -\begin_inset CommandInset ref -LatexCommand ref -reference "sec:Formats-and-standards" - -\end_inset - - has some information related to Speex and standards. - -\end_layout - -\begin_layout Standard -The three last sections describe the algorithms used in Speex. - These sections require signal processing knowledge, but are not required - for merely using Speex. - They are intended for people who want to understand how Speex really works - and/or want to do research based on Speex. - Section -\begin_inset CommandInset ref -LatexCommand ref -reference "sec:Introduction-to-CELP" - -\end_inset - - explains the general idea behind CELP, while sections -\begin_inset CommandInset ref -LatexCommand ref -reference "sec:Speex-narrowband-mode" - -\end_inset - - and -\begin_inset CommandInset ref -LatexCommand ref -reference "sec:Speex-wideband-mode" - -\end_inset - - are specific to Speex. -\end_layout - -\begin_layout Standard -\begin_inset Newpage newpage -\end_inset - - -\end_layout - -\begin_layout Chapter -Codec description -\begin_inset CommandInset label -LatexCommand label -name "sec:Feature-description" - -\end_inset - - -\end_layout - -\begin_layout Standard -This section describes Speex and its features into more details. -\end_layout - -\begin_layout Section -Concepts -\end_layout - -\begin_layout Standard -Before introducing all the Speex features, here are some concepts in speech - coding that help better understand the rest of the manual. - Although some are general concepts in speech/audio processing, others are - specific to Speex. -\end_layout - -\begin_layout Subsection* -Sampling rate -\begin_inset Index -status collapsed - -\begin_layout Plain Layout -sampling rate -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -The sampling rate expressed in Hertz (Hz) is the number of samples taken - from a signal per second. - For a sampling rate of -\begin_inset Formula $F_{s}$ -\end_inset - - kHz, the highest frequency that can be represented is equal to -\begin_inset Formula $F_{s}/2$ -\end_inset - - kHz ( -\begin_inset Formula $F_{s}/2$ -\end_inset - - is known as the Nyquist frequency). - This is a fundamental property in signal processing and is described by - the sampling theorem. - Speex is mainly designed for three different sampling rates: 8 kHz, 16 - kHz, and 32 kHz. - These are respectively referred to as narrowband -\begin_inset Index -status collapsed - -\begin_layout Plain Layout -narrowband -\end_layout - -\end_inset - -, wideband -\begin_inset Index -status collapsed - -\begin_layout Plain Layout -wideband -\end_layout - -\end_inset - - and ultra-wideband -\begin_inset Index -status collapsed - -\begin_layout Plain Layout -ultra-wideband -\end_layout - -\end_inset - -. - -\end_layout - -\begin_layout Subsection* -Bit-rate -\end_layout - -\begin_layout Standard -When encoding a speech signal, the bit-rate is defined as the number of - bits per unit of time required to encode the speech. - It is measured in -\emph on -bits per second -\emph default - (bps), or generally -\emph on -kilobits per second -\emph default -. - It is important to make the distinction between -\emph on -kilo -\series bold -bits -\series default -\emph default - -\emph on -per second -\emph default - (k -\series bold -b -\series default -ps) and -\emph on -kilo -\series bold -bytes -\series default -\emph default - -\emph on -per second -\emph default - (k -\series bold -B -\series default -ps). -\end_layout - -\begin_layout Subsection* -Quality -\begin_inset Index -status collapsed - -\begin_layout Plain Layout -quality -\end_layout - -\end_inset - - (variable) -\end_layout - -\begin_layout Standard -Speex is a lossy codec, which means that it achieves compression at the - expense of fidelity of the input speech signal. - Unlike some other speech codecs, it is possible to control the trade-off - made between quality and bit-rate. - The Speex encoding process is controlled most of the time by a quality - parameter that ranges from 0 to 10. - In constant bit-rate -\begin_inset Index -status collapsed - -\begin_layout Plain Layout -constant bit-rate -\end_layout - -\end_inset - - (CBR) operation, the quality parameter is an integer, while for variable - bit-rate (VBR), the parameter is a float. - -\end_layout - -\begin_layout Subsection* -Complexity -\begin_inset Index -status collapsed - -\begin_layout Plain Layout -complexity -\end_layout - -\end_inset - - (variable) -\end_layout - -\begin_layout Standard -With Speex, it is possible to vary the complexity allowed for the encoder. - This is done by controlling how the search is performed with an integer - ranging from 1 to 10 in a way that's similar to the -1 to -9 options to - -\emph on -gzip -\emph default - and -\emph on -bzip2 -\emph default - compression utilities. - For normal use, the noise level at complexity 1 is between 1 and 2 dB higher - than at complexity 10, but the CPU requirements for complexity 10 is about - 5 times higher than for complexity 1. - In practice, the best trade-off is between complexity 2 and 4, though higher - settings are often useful when encoding non-speech sounds like DTMF -\begin_inset Index -status collapsed - -\begin_layout Plain Layout -DTMF -\end_layout - -\end_inset - - tones. -\end_layout - -\begin_layout Subsection* -Variable Bit-Rate -\begin_inset Index -status collapsed - -\begin_layout Plain Layout -variable bit-rate -\end_layout - -\end_inset - - (VBR) -\end_layout - -\begin_layout Standard -Variable bit-rate (VBR) allows a codec to change its bit-rate dynamically - to adapt to the -\begin_inset Quotes eld -\end_inset - -difficulty -\begin_inset Quotes erd -\end_inset - - of the audio being encoded. - In the example of Speex, sounds like vowels and high-energy transients - require a higher bit-rate to achieve good quality, while fricatives (e.g. - s,f sounds) can be coded adequately with less bits. - For this reason, VBR can achieve lower bit-rate for the same quality, or - a better quality for a certain bit-rate. - Despite its advantages, VBR has two main drawbacks: first, by only specifying - quality, there's no guaranty about the final average bit-rate. - Second, for some real-time applications like voice over IP (VoIP), what - counts is the maximum bit-rate, which must be low enough for the communication - channel. -\end_layout - -\begin_layout Subsection* -Average Bit-Rate -\begin_inset Index -status collapsed - -\begin_layout Plain Layout -average bit-rate -\end_layout - -\end_inset - - (ABR) -\end_layout - -\begin_layout Standard -Average bit-rate solves one of the problems of VBR, as it dynamically adjusts - VBR quality in order to meet a specific target bit-rate. - Because the quality/bit-rate is adjusted in real-time (open-loop), the - global quality will be slightly lower than that obtained by encoding in - VBR with exactly the right quality setting to meet the target average bit-rate. -\end_layout - -\begin_layout Subsection* -Voice Activity Detection -\begin_inset Index -status collapsed - -\begin_layout Plain Layout -voice activity detection -\end_layout - -\end_inset - - (VAD) -\end_layout - -\begin_layout Standard -When enabled, voice activity detection detects whether the audio being encoded - is speech or silence/background noise. - VAD is always implicitly activated when encoding in VBR, so the option - is only useful in non-VBR operation. - In this case, Speex detects non-speech periods and encode them with just - enough bits to reproduce the background noise. - This is called -\begin_inset Quotes eld -\end_inset - -comfort noise generation -\begin_inset Quotes erd -\end_inset - - (CNG). -\end_layout - -\begin_layout Subsection* -Discontinuous Transmission -\begin_inset Index -status collapsed - -\begin_layout Plain Layout -discontinuous transmission -\end_layout - -\end_inset - - (DTX) -\end_layout - -\begin_layout Standard -Discontinuous transmission is an addition to VAD/VBR operation, that allows - to stop transmitting completely when the background noise is stationary. - In file-based operation, since we cannot just stop writing to the file, - only 5 bits are used for such frames (corresponding to 250 bps). -\end_layout - -\begin_layout Subsection* -Perceptual enhancement -\begin_inset Index -status collapsed - -\begin_layout Plain Layout -perceptual enhancement -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -Perceptual enhancement is a part of the decoder which, when turned on, attempts - to reduce the perception of the noise/distortion produced by the encoding/decod -ing process. - In most cases, perceptual enhancement brings the sound further from the - original -\emph on -objectively -\emph default - (e.g. - considering only SNR), but in the end it still -\emph on -sounds -\emph default - better (subjective improvement). -\end_layout - -\begin_layout Subsection* -Latency and algorithmic delay -\begin_inset Index -status collapsed - -\begin_layout Plain Layout -algorithmic delay -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -Every speech codec introduces a delay in the transmission. - For Speex, this delay is equal to the frame size, plus some amount of -\begin_inset Quotes eld -\end_inset - -look-ahead -\begin_inset Quotes erd -\end_inset - - required to process each frame. - In narrowband operation (8 kHz), the look-ahead is 10 ms, in wideband operation - (16 kHz), the look-ahead is 13.9 ms and in ultra-wideband operation (32 - kHz) look-ahead is 15.9 ms, resulting in the algorithic delays of 30 ms, - 33.9 ms and 35.9 ms accordingly. - These values don't account for the CPU time it takes to encode or decode - the frames. -\end_layout - -\begin_layout Section -Codec -\end_layout - -\begin_layout Standard -The main characteristics of Speex can be summarized as follows: -\end_layout - -\begin_layout Itemize -Free software/open-source -\begin_inset Index -status collapsed - -\begin_layout Plain Layout -open-source -\end_layout - -\end_inset - -, patent -\begin_inset Index -status collapsed - -\begin_layout Plain Layout -patent -\end_layout - -\end_inset - - and royalty-free -\end_layout - -\begin_layout Itemize -Integration of narrowband -\begin_inset Index -status collapsed - -\begin_layout Plain Layout -narrowband -\end_layout - -\end_inset - - and wideband -\begin_inset Index -status collapsed - -\begin_layout Plain Layout -wideband -\end_layout - -\end_inset - - using an embedded bit-stream -\end_layout - -\begin_layout Itemize -Wide range of bit-rates available (from 2.15 kbps to 44 kbps) -\end_layout - -\begin_layout Itemize -Dynamic bit-rate switching (AMR) and Variable Bit-Rate -\begin_inset Index -status collapsed - -\begin_layout Plain Layout -variable bit-rate -\end_layout - -\end_inset - - (VBR) operation -\end_layout - -\begin_layout Itemize -Voice Activity Detection -\begin_inset Index -status collapsed - -\begin_layout Plain Layout -voice activity detection -\end_layout - -\end_inset - - (VAD, integrated with VBR) and discontinuous transmission (DTX) -\end_layout - -\begin_layout Itemize -Variable complexity -\begin_inset Index -status collapsed - -\begin_layout Plain Layout -complexity -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Itemize -Embedded wideband structure (scalable sampling rate) -\end_layout - -\begin_layout Itemize -Ultra-wideband sampling rate at 32 kHz -\end_layout - -\begin_layout Itemize -Intensity stereo encoding option -\end_layout - -\begin_layout Itemize -Fixed-point implementation -\end_layout - -\begin_layout Section -Preprocessor -\end_layout - -\begin_layout Standard -This part refers to the preprocessor module introduced in the 1.1.x branch. - The preprocessor is designed to be used on the audio -\emph on -before -\emph default - running the encoder. - The preprocessor provides three main functionalities: -\end_layout - -\begin_layout Itemize -noise suppression -\end_layout - -\begin_layout Itemize -automatic gain control (AGC) -\end_layout - -\begin_layout Itemize -voice activity detection (VAD) -\end_layout - -\begin_layout Standard -The denoiser can be used to reduce the amount of background noise present - in the input signal. - This provides higher quality speech whether or not the denoised signal - is encoded with Speex (or at all). - However, when using the denoised signal with the codec, there is an additional - benefit. - Speech codecs in general (Speex included) tend to perform poorly on noisy - input, which tends to amplify the noise. - The denoiser greatly reduces this effect. -\end_layout - -\begin_layout Standard -Automatic gain control (AGC) is a feature that deals with the fact that - the recording volume may vary by a large amount between different setups. - The AGC provides a way to adjust a signal to a reference volume. - This is useful for voice over IP because it removes the need for manual - adjustment of the microphone gain. - A secondary advantage is that by setting the microphone gain to a conservative - (low) level, it is easier to avoid clipping. -\end_layout - -\begin_layout Standard -The voice activity detector (VAD) provided by the preprocessor is more advanced - than the one directly provided in the codec. - -\end_layout - -\begin_layout Section -Adaptive Jitter Buffer -\end_layout - -\begin_layout Standard -When transmitting voice (or any content for that matter) over UDP or RTP, - packet may be lost, arrive with different delay, or even out of order. - The purpose of a jitter buffer is to reorder packets and buffer them long - enough (but no longer than necessary) so they can be sent to be decoded. - -\end_layout - -\begin_layout Section -Acoustic Echo Canceller -\end_layout - -\begin_layout Standard -In any hands-free communication system (Fig. - -\begin_inset CommandInset ref -LatexCommand ref -reference "fig:Acoustic-echo-model" - -\end_inset - -), speech from the remote end is played in the local loudspeaker, propagates - in the room and is captured by the microphone. - If the audio captured from the microphone is sent directly to the remote - end, then the remote user hears an echo of his voice. - An acoustic echo canceller is designed to remove the acoustic echo before - it is sent to the remote end. - It is important to understand that the echo canceller is meant to improve - the quality on the -\series bold -remote -\series default - end. - For those who care a lot about mouth-to-ear delays it should be noted that - unlike Speex codec, resampler and preprocessor, this Acoustic Echo Canceller - does not introduce any latency. -\end_layout - -\begin_layout Standard -\begin_inset Float figure -wide false -sideways false -status open - -\begin_layout Plain Layout -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -begin{center} -\end_layout - -\end_inset - - -\begin_inset Graphics - filename echo_path.eps - width 10cm - -\end_inset - - -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -end{center} -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Plain Layout -\begin_inset Caption - -\begin_layout Plain Layout -Acoustic echo model -\begin_inset CommandInset label -LatexCommand label -name "fig:Acoustic-echo-model" - -\end_inset - - -\end_layout - -\end_inset - - -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Section -Resampler -\end_layout - -\begin_layout Standard -In some cases, it may be useful to convert audio from one sampling rate - to another. - There are many reasons for that. - It can be for mixing streams that have different sampling rates, for supporting - sampling rates that the soundcard doesn't support, for transcoding, etc. - That's why there is now a resampler that is part of the Speex project. - This resampler can be used to convert between any two arbitrary rates (the - ratio must only be a rational number) and there is control over the quality/com -plexity tradeoff. - Keep in mind, that resampler introduce some delay in audio stream, which - size depends on resampler quality setting. - Refer to resampler API documentation to know how to get exact delay values. -\end_layout - -\begin_layout Section -Integration -\end_layout - -\begin_layout Standard -Knowing -\emph on -how -\emph default - to use each of the components is not that useful unless we know -\emph on -where -\emph default - to use them. - Figure -\begin_inset CommandInset ref -LatexCommand ref -reference "fig:Integration-VoIP" - -\end_inset - - shows where each of the components would be used in a typical VoIP client. - Components in dotted lines are optional, though they may be very useful - in some circumstances. - There are several important things to note from there. - The AEC must be placed as close as possible to the playback and capture. - Only the resampling may be closer. - Also, it is very important to use the same clock for both mic capture and - speaker/headphones playback. -\end_layout - -\begin_layout Standard -\begin_inset Float figure -wide false -sideways false -status open - -\begin_layout Plain Layout -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -begin{center} -\end_layout - -\end_inset - - -\begin_inset Graphics - filename components.eps - width 80text% - -\end_inset - - -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -end{center} -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Plain Layout -\begin_inset Caption - -\begin_layout Plain Layout -Integration of all the components in a VoIP client. -\begin_inset CommandInset label -LatexCommand label -name "fig:Integration-VoIP" - -\end_inset - - -\end_layout - -\end_inset - - -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -\begin_inset Newpage newpage -\end_inset - - -\end_layout - -\begin_layout Chapter -Compiling and Porting -\end_layout - -\begin_layout Standard -Compiling Speex under UNIX/Linux or any other platform supported by autoconf - (e.g. - Win32/cygwin) is as easy as typing: -\end_layout - -\begin_layout LyX-Code -% ./configure [options] -\end_layout - -\begin_layout LyX-Code -% make -\end_layout - -\begin_layout LyX-Code -% make install -\end_layout - -\begin_layout Standard -The options supported by the Speex configure script are: -\end_layout - -\begin_layout Description ---prefix= Specifies the base path for installing Speex (e.g. - /usr) -\end_layout - -\begin_layout Description ---enable-shared/--disable-shared Whether to compile shared libraries -\end_layout - -\begin_layout Description ---enable-static/--disable-static Whether to compile static libraries -\end_layout - -\begin_layout Description ---disable-wideband Disable the wideband part of Speex (typically to save - space) -\end_layout - -\begin_layout Description ---enable-valgrind Enable extra hits for valgrind for debugging purposes - (do not use by default) -\end_layout - -\begin_layout Description ---enable-sse Enable use of SSE instructions (x86/float only) -\end_layout - -\begin_layout Description ---enable-fixed-point -\begin_inset Index -status collapsed - -\begin_layout Plain Layout -fixed-point -\end_layout - -\end_inset - - Compile Speex for a processor that does not have a floating point unit - (FPU) -\end_layout - -\begin_layout Description ---enable-arm4-asm Enable assembly specific to the ARMv4 architecture (gcc - only) -\end_layout - -\begin_layout Description ---enable-arm5e-asm Enable assembly specific to the ARMv5E architecture (gcc - only) -\end_layout - -\begin_layout Description ---enable-fixed-point-debug Use only for debugging the fixed-point -\begin_inset Index -status collapsed - -\begin_layout Plain Layout -fixed-point -\end_layout - -\end_inset - - code (very slow) -\end_layout - -\begin_layout Description ---enable-ti-c55x Enable support for the TI C5x family -\end_layout - -\begin_layout Description ---enable-blackfin-asm Enable assembly specific to the Blackfin DSP architecture - (gcc only) -\end_layout - -\begin_layout Section -Platforms -\end_layout - -\begin_layout Standard -Speex is known to compile and work on a large number of architectures, both - floating-point and fixed-point. - In general, any architecture that can natively compute the multiplication - of two signed 16-bit numbers (32-bit result) and runs at a sufficient clock - rate (architecture-dependent) is capable of running Speex. - Architectures on which Speex is -\series bold -known -\series default - to work (it probably works on many others) are: -\end_layout - -\begin_layout Itemize -x86 & x86-64 -\end_layout - -\begin_layout Itemize -Power -\end_layout - -\begin_layout Itemize -SPARC -\end_layout - -\begin_layout Itemize -ARM -\end_layout - -\begin_layout Itemize -Blackfin -\end_layout - -\begin_layout Itemize -Coldfire (68k family) -\end_layout - -\begin_layout Itemize -TI C54xx & C55xx -\end_layout - -\begin_layout Itemize -TI C6xxx -\end_layout - -\begin_layout Itemize -TriMedia (experimental) -\end_layout - -\begin_layout Standard -Operating systems on top of which Speex is known to work include (it probably - works on many others): -\end_layout - -\begin_layout Itemize -Linux -\end_layout - -\begin_layout Itemize -\begin_inset Formula $\mu$ -\end_inset - -Clinux -\end_layout - -\begin_layout Itemize -MacOS X -\end_layout - -\begin_layout Itemize -BSD -\end_layout - -\begin_layout Itemize -Other UNIX/POSIX variants -\end_layout - -\begin_layout Itemize -Symbian -\end_layout - -\begin_layout Standard -The source code directory include additional information for compiling on - certain architectures or operating systems in README.xxx files. -\end_layout - -\begin_layout Section -Porting and Optimising -\end_layout - -\begin_layout Standard -Here are a few things to consider when porting or optimising Speex for a - new platform or an existing one. -\end_layout - -\begin_layout Subsection -CPU optimisation -\end_layout - -\begin_layout Standard -The single factor that will affect the CPU usage of Speex the most is whether - it is compiled for floating point or fixed-point. - If your CPU/DSP does not have a floating-point unit FPU, then compiling - as fixed-point will be orders of magnitudes faster. - If there is an FPU present, then it is important to test which version - is faster. - On the x86 architecture, floating-point is -\series bold -generally -\series default - faster, but not always. - To compile Speex as fixed-point, you need to pass --fixed-point to the - configure script or define the FIXED_POINT macro for the compiler. - As of 1.2beta3, it is now possible to disable the floating-point compatibility - API, which means that your code can link without a float emulation library. - To do that configure with --disable-float-api or define the DISABLE_FLOAT_API - macro. - Until the VBR feature is ported to fixed-point, you will also need to configure - with --disable-vbr or define DISABLE_VBR. -\end_layout - -\begin_layout Standard -Other important things to check on some DSP architectures are: -\end_layout - -\begin_layout Itemize -Make sure the cache is set to write-back mode -\end_layout - -\begin_layout Itemize -If the chip has SRAM instead of cache, make sure as much code and data are - in SRAM, rather than in RAM -\end_layout - -\begin_layout Standard -If you are going to be writing assembly, then the following functions are - -\series bold -usually -\series default - the first ones you should consider optimising: -\end_layout - -\begin_layout Itemize -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -filter_mem16() -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Itemize -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -iir_mem16() -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Itemize -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -vq_nbest() -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Itemize -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -pitch_xcorr() -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Itemize -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -interp_pitch() -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -The filtering functions -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -filter_mem16() -\end_layout - -\end_inset - - and -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -iir_mem16() -\end_layout - -\end_inset - - are implemented in the direct form II transposed (DF2T). - However, for architectures based on multiply-accumulate (MAC), DF2T requires - frequent reload of the accumulator, which can make the code very slow. - For these architectures (e.g. - Blackfin and Coldfire), a better approach is to implement those functions - as direct form I (DF1), which is easier to express in terms of MAC. - When doing that however, -\series bold -it is important to make sure that the DF1 implementation still behaves like - the original DF2T behaviour when it comes to memory values -\series default -. - This is necessary because the filter is time-varying and must compute exactly - the same value (not counting machine rounding) on any encoder or decoder. -\end_layout - -\begin_layout Subsection -Memory optimisation -\end_layout - -\begin_layout Standard -Memory optimisation is mainly something that should be considered for small - embedded platforms. - For PCs, Speex is already so tiny that it's just not worth doing any of - the things suggested here. - There are several ways to reduce the memory usage of Speex, both in terms - of code size and data size. - For optimising code size, the trick is to first remove features you do - not need. - Some examples of things that can easily be disabled -\series bold -if you don't need them -\series default - are: -\end_layout - -\begin_layout Itemize -Wideband support (--disable-wideband) -\end_layout - -\begin_layout Itemize -Support for stereo (removing stereo.c) -\end_layout - -\begin_layout Itemize -VBR support (--disable-vbr or DISABLE_VBR) -\end_layout - -\begin_layout Itemize -Static codebooks that are not needed for the bit-rates you are using (*_table.c - files) -\end_layout - -\begin_layout Standard -Speex also has several methods for allocating temporary arrays. - When using a compiler that supports C99 properly (as of 2007, Microsoft - compilers don't, but gcc does), it is best to define VAR_ARRAYS. - That makes use of the variable-size array feature of C99. - The next best is to define USE_ALLOCA so that Speex can use alloca() to - allocate the temporary arrays. - Note that on many systems, alloca() is buggy so it may not work. - If none of VAR_ARRAYS and USE_ALLOCA are defined, then Speex falls back - to allocating a large -\begin_inset Quotes eld -\end_inset - -scratch space -\begin_inset Quotes erd -\end_inset - - and doing its own internal allocation. - The main disadvantage of this solution is that it is wasteful. - It needs to allocate enough stack for the worst case scenario (worst bit-rate, - highest complexity setting, ...) and by default, the memory isn't shared between - multiple encoder/decoder states. - Still, if the -\begin_inset Quotes eld -\end_inset - -manual -\begin_inset Quotes erd -\end_inset - - allocation is the only option left, there are a few things that can be - improved. - By overriding the speex_alloc_scratch() call in os_support.h, it is possible - to always return the same memory area for all states -\begin_inset Foot -status collapsed - -\begin_layout Plain Layout -In this case, one must be careful with threads -\end_layout - -\end_inset - -. - In addition to that, by redefining the NB_ENC_STACK and NB_DEC_STACK (or - similar for wideband), it is possible to only allocate memory for a scenario - that is known in advance. - In this case, it is important to measure the amount of memory required - for the specific sampling rate, bit-rate and complexity level being used. -\end_layout - -\begin_layout Standard -\begin_inset Newpage newpage -\end_inset - - -\end_layout - -\begin_layout Chapter -Command-line encoder/decoder -\begin_inset CommandInset label -LatexCommand label -name "sec:Command-line-encoder/decoder" - -\end_inset - - -\end_layout - -\begin_layout Standard -The base Speex distribution includes a command-line encoder ( -\emph on -speexenc -\emph default -) and decoder ( -\emph on -speexdec -\emph default -). - Those tools produce and read Speex files encapsulated in the Ogg container. - Although it is possible to encapsulate Speex in any container, Ogg is the - recommended container for files. - This section describes how to use the command line tools for Speex files - in Ogg. -\end_layout - -\begin_layout Section - -\emph on -speexenc -\begin_inset Index -status collapsed - -\begin_layout Plain Layout -speexenc -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -The -\emph on -speexenc -\emph default - utility is used to create Speex files from raw PCM or wave files. - It can be used by calling: -\end_layout - -\begin_layout LyX-Code -speexenc [options] input_file output_file -\end_layout - -\begin_layout Standard -The value '-' for input_file or output_file corresponds respectively to - stdin and stdout. - The valid options are: -\end_layout - -\begin_layout Description ---narrowband -\begin_inset space ~ -\end_inset - -(-n) Tell Speex to treat the input as narrowband (8 kHz). - This is the default -\end_layout - -\begin_layout Description ---wideband -\begin_inset space ~ -\end_inset - -(-w) Tell Speex to treat the input as wideband (16 kHz) -\end_layout - -\begin_layout Description ---ultra-wideband -\begin_inset space ~ -\end_inset - -(-u) Tell Speex to treat the input as -\begin_inset Quotes eld -\end_inset - -ultra-wideband -\begin_inset Quotes erd -\end_inset - - (32 kHz) -\end_layout - -\begin_layout Description ---quality -\begin_inset space ~ -\end_inset - -n Set the encoding quality (0-10), default is 8 -\end_layout - -\begin_layout Description ---bitrate -\begin_inset space ~ -\end_inset - -n Encoding bit-rate (use bit-rate n or lower) -\end_layout - -\begin_layout Description ---vbr Enable VBR (Variable Bit-Rate), disabled by default -\end_layout - -\begin_layout Description ---abr -\begin_inset space ~ -\end_inset - -n Enable ABR (Average Bit-Rate) at n kbps, disabled by default -\end_layout - -\begin_layout Description ---vad Enable VAD (Voice Activity Detection), disabled by default -\end_layout - -\begin_layout Description ---dtx Enable DTX (Discontinuous Transmission), disabled by default -\end_layout - -\begin_layout Description ---nframes -\begin_inset space ~ -\end_inset - -n Pack n frames in each Ogg packet (this saves space at low bit-rates) -\end_layout - -\begin_layout Description ---comp -\begin_inset space ~ -\end_inset - -n Set encoding speed/quality tradeoff. - The higher the value of n, the slower the encoding (default is 3) -\end_layout - -\begin_layout Description --V Verbose operation, print bit-rate currently in use -\end_layout - -\begin_layout Description ---help -\begin_inset space ~ -\end_inset - -(-h) Print the help -\end_layout - -\begin_layout Description ---version -\begin_inset space ~ -\end_inset - -(-v) Print version information -\end_layout - -\begin_layout Subsection* -Speex comments -\end_layout - -\begin_layout Description ---comment Add the given string as an extra comment. - This may be used multiple times. - -\end_layout - -\begin_layout Description ---author Author of this track. - -\end_layout - -\begin_layout Description ---title Title for this track. - -\end_layout - -\begin_layout Subsection* -Raw input options -\end_layout - -\begin_layout Description ---rate -\begin_inset space ~ -\end_inset - -n Sampling rate for raw input -\end_layout - -\begin_layout Description ---stereo Consider raw input as stereo -\end_layout - -\begin_layout Description ---le Raw input is little-endian -\end_layout - -\begin_layout Description ---be Raw input is big-endian -\end_layout - -\begin_layout Description ---8bit Raw input is 8-bit unsigned -\end_layout - -\begin_layout Description ---16bit Raw input is 16-bit signed -\end_layout - -\begin_layout Section - -\emph on -speexdec -\begin_inset Index -status collapsed - -\begin_layout Plain Layout -speexdec -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -The -\emph on -speexdec -\emph default - utility is used to decode Speex files and can be used by calling: -\end_layout - -\begin_layout LyX-Code -speexdec [options] speex_file [output_file] -\end_layout - -\begin_layout Standard -The value '-' for input_file or output_file corresponds respectively to - stdin and stdout. - Also, when no output_file is specified, the file is played to the soundcard. - The valid options are: -\end_layout - -\begin_layout Description ---enh enable post-filter (default) -\end_layout - -\begin_layout Description ---no-enh disable post-filter -\end_layout - -\begin_layout Description ---force-nb Force decoding in narrowband -\end_layout - -\begin_layout Description ---force-wb Force decoding in wideband -\end_layout - -\begin_layout Description ---force-uwb Force decoding in ultra-wideband -\end_layout - -\begin_layout Description ---mono Force decoding in mono -\end_layout - -\begin_layout Description ---stereo Force decoding in stereo -\end_layout - -\begin_layout Description ---rate -\begin_inset space ~ -\end_inset - -n Force decoding at n Hz sampling rate -\end_layout - -\begin_layout Description ---packet-loss -\begin_inset space ~ -\end_inset - -n Simulate n % random packet loss -\end_layout - -\begin_layout Description --V Verbose operation, print bit-rate currently in use -\end_layout - -\begin_layout Description ---help -\begin_inset space ~ -\end_inset - -(-h) Print the help -\end_layout - -\begin_layout Description ---version -\begin_inset space ~ -\end_inset - -(-v) Print version information -\end_layout - -\begin_layout Standard -\begin_inset Newpage newpage -\end_inset - - -\end_layout - -\begin_layout Chapter -Using the Speex Codec API ( -\emph on -libspeex -\emph default - -\begin_inset Index -status collapsed - -\begin_layout Plain Layout -libspeex -\end_layout - -\end_inset - -) -\begin_inset CommandInset label -LatexCommand label -name "sec:Programming-with-Speex" - -\end_inset - - -\end_layout - -\begin_layout Standard -The -\emph on -libspeex -\emph default - library contains all the functions for encoding and decoding speech with - the Speex codec. - When linking on a UNIX system, one must add -\emph on --lspeex -lm -\emph default - to the compiler command line. - One important thing to know is that -\series bold -libspeex calls are reentrant, but not thread-safe -\series default -. - That means that it is fine to use calls from many threads, but -\series bold -calls using the same state from multiple threads must be protected by mutexes -\series default -. - Examples of code can also be found in Appendix -\begin_inset CommandInset ref -LatexCommand ref -reference "sec:Sample-code" - -\end_inset - - and the complete API documentation is included in the Documentation section - of the Speex website (http://www.speex.org/). -\end_layout - -\begin_layout Section -Encoding -\begin_inset CommandInset label -LatexCommand label -name "sub:Encoding" - -\end_inset - - -\end_layout - -\begin_layout Standard -In order to encode speech using Speex, one first needs to: -\end_layout - -\begin_layout Standard -\begin_inset listings -inline false -status open - -\begin_layout Plain Layout - -#include -\end_layout - -\end_inset - -Then in the code, a Speex bit-packing struct must be declared, along with - a Speex encoder state: -\begin_inset listings -inline false -status open - -\begin_layout Plain Layout - -SpeexBits bits; -\end_layout - -\begin_layout Plain Layout - -void *enc_state; -\end_layout - -\end_inset - -The two are initialized by: -\begin_inset listings -inline false -status open - -\begin_layout Plain Layout - -speex_bits_init(&bits); -\end_layout - -\begin_layout Plain Layout - -enc_state = speex_encoder_init(&speex_nb_mode); -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -For wideband coding, -\emph on -speex_nb_mode -\emph default - will be replaced by -\emph on -speex_wb_mode -\emph default -. - In most cases, you will need to know the frame size used at the sampling - rate you are using. - You can get that value in the -\emph on -frame_size -\emph default - variable (expressed in -\series bold -samples -\series default -, not bytes) with: -\end_layout - -\begin_layout Standard -\begin_inset listings -inline false -status open - -\begin_layout Plain Layout - -speex_encoder_ctl(enc_state,SPEEX_GET_FRAME_SIZE,&frame_size); -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -In practice, -\emph on -frame_size -\emph default - will correspond to 20 ms when using 8, 16, or 32 kHz sampling rate. - There are many parameters that can be set for the Speex encoder, but the - most useful one is the quality parameter that controls the quality vs bit-rate - tradeoff. - This is set by: -\end_layout - -\begin_layout Standard -\begin_inset listings -inline false -status open - -\begin_layout Plain Layout - -speex_encoder_ctl(enc_state,SPEEX_SET_QUALITY,&quality); -\end_layout - -\end_inset - -where -\emph on -quality -\emph default - is an integer value ranging from 0 to 10 (inclusively). - The mapping between quality and bit-rate is described in Fig. - -\begin_inset CommandInset ref -LatexCommand ref -reference "cap:quality_vs_bps" - -\end_inset - - for narrowband. -\end_layout - -\begin_layout Standard -Once the initialization is done, for every input frame: -\end_layout - -\begin_layout Standard -\begin_inset listings -inline false -status open - -\begin_layout Plain Layout - -speex_bits_reset(&bits); -\end_layout - -\begin_layout Plain Layout - -speex_encode_int(enc_state, input_frame, &bits); -\end_layout - -\begin_layout Plain Layout - -nbBytes = speex_bits_write(&bits, byte_ptr, MAX_NB_BYTES); -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -where -\emph on -input_frame -\emph default - is a -\emph on -( -\emph default -short -\emph on -*) -\emph default - pointing to the beginning of a speech frame, -\emph on -byte_ptr -\emph default - is a -\emph on -(char *) -\emph default - where the encoded frame will be written, -\emph on -MAX_NB_BYTES -\emph default - is the maximum number of bytes that can be written to -\emph on -byte_ptr -\emph default - without causing an overflow and -\emph on -nbBytes -\emph default - is the number of bytes actually written to -\emph on -byte_ptr -\emph default - (the encoded size in bytes). - Before calling speex_bits_write, it is possible to find the number of bytes - that need to be written by calling -\family typewriter -speex_bits_nbytes(&bits) -\family default -, which returns a number of bytes. -\end_layout - -\begin_layout Standard -It is still possible to use the -\emph on -speex_encode() -\emph default - function, which takes a -\emph on -(float *) -\emph default - for the audio. - However, this would make an eventual port to an FPU-less platform (like - ARM) more complicated. - Internally, -\emph on -speex_encode() -\emph default - and -\emph on -speex_encode_int() -\emph default - are processed in the same way. - Whether the encoder uses the fixed-point version is only decided by the - compile-time flags, not at the API level. -\end_layout - -\begin_layout Standard -After you're done with the encoding, free all resources with: -\end_layout - -\begin_layout Standard -\begin_inset listings -inline false -status open - -\begin_layout Plain Layout - -speex_bits_destroy(&bits); -\end_layout - -\begin_layout Plain Layout - -speex_encoder_destroy(enc_state); -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -That's about it for the encoder. - -\end_layout - -\begin_layout Section -Decoding -\begin_inset CommandInset label -LatexCommand label -name "sub:Decoding" - -\end_inset - - -\end_layout - -\begin_layout Standard -In order to decode speech using Speex, you first need to: -\begin_inset listings -inline false -status open - -\begin_layout Plain Layout - -#include -\end_layout - -\end_inset - -You also need to declare a Speex bit-packing struct -\begin_inset listings -inline false -status open - -\begin_layout Plain Layout - -SpeexBits bits; -\end_layout - -\end_inset - -and a Speex decoder state -\begin_inset listings -inline false -status open - -\begin_layout Plain Layout - -void *dec_state; -\end_layout - -\end_inset - -The two are initialized by: -\begin_inset listings -inline false -status open - -\begin_layout Plain Layout - -speex_bits_init(&bits); -\end_layout - -\begin_layout Plain Layout - -dec_state = speex_decoder_init(&speex_nb_mode); -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -For wideband decoding, -\emph on -speex_nb_mode -\emph default - will be replaced by -\emph on -speex_wb_mode -\emph default -. - If you need to obtain the size of the frames that will be used by the decoder, - you can get that value in the -\emph on -frame_size -\emph default - variable (expressed in -\series bold -samples -\series default -, not bytes) with: -\end_layout - -\begin_layout Standard -\begin_inset listings -inline false -status open - -\begin_layout Plain Layout - -speex_decoder_ctl(dec_state, SPEEX_GET_FRAME_SIZE, &frame_size); -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -There is also a parameter that can be set for the decoder: whether or not - to use a perceptual enhancer. - This can be set by: -\end_layout - -\begin_layout Standard -\begin_inset listings -inline false -status open - -\begin_layout Plain Layout - -speex_decoder_ctl(dec_state, SPEEX_SET_ENH, &enh); -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -where -\emph on -enh -\emph default - is an int with value 0 to have the enhancer disabled and 1 to have it enabled. - As of 1.2-beta1, the default is now to enable the enhancer. -\end_layout - -\begin_layout Standard -Again, once the decoder initialization is done, for every input frame: -\end_layout - -\begin_layout Standard -\begin_inset listings -inline false -status open - -\begin_layout Plain Layout - -speex_bits_read_from(&bits, input_bytes, nbBytes); -\end_layout - -\begin_layout Plain Layout - -speex_decode_int(dec_state, &bits, output_frame); -\end_layout - -\end_inset - -where input_bytes is a -\emph on -(char *) -\emph default - containing the bit-stream data received for a frame, -\emph on -nbBytes -\emph default - is the size (in bytes) of that bit-stream, and -\emph on -output_frame -\emph default - is a -\emph on -(short *) -\emph default - and points to the area where the decoded speech frame will be written. - A NULL value as the second argument indicates that we don't have the bits - for the current frame. - When a frame is lost, the Speex decoder will do its best to "guess" the - correct signal. -\end_layout - -\begin_layout Standard -As for the encoder, the -\emph on -speex_decode() -\emph default - function can still be used, with a -\emph on -(float *) -\emph default - as the output for the audio. - After you're done with the decoding, free all resources with: -\end_layout - -\begin_layout Standard -\begin_inset listings -inline false -status open - -\begin_layout Plain Layout - -speex_bits_destroy(&bits); -\end_layout - -\begin_layout Plain Layout - -speex_decoder_destroy(dec_state); -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Section -Codec Options (speex_*_ctl) -\begin_inset CommandInset label -LatexCommand label -name "sub:Codec-Options" - -\end_inset - - -\end_layout - -\begin_layout Quote -\align center - -\emph on -Entities should not be multiplied beyond necessity -- William of Ockham. -\end_layout - -\begin_layout Quote -\align center - -\emph on -Just because there's an option for it doesn't mean you have to turn it on - -- me. -\end_layout - -\begin_layout Standard -The Speex encoder and decoder support many options and requests that can - be accessed through the -\emph on -speex_encoder_ctl -\emph default - and -\emph on -speex_decoder_ctl -\emph default - functions. - These functions are similar to the -\emph on -ioctl -\emph default - system call and their prototypes are: -\end_layout - -\begin_layout Standard -\begin_inset listings -inline false -status open - -\begin_layout Plain Layout - -void speex_encoder_ctl(void *encoder, int request, void *ptr); -\end_layout - -\begin_layout Plain Layout - -void speex_decoder_ctl(void *encoder, int request, void *ptr); -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -Despite those functions, the defaults are usually good for many applications - and -\series bold -optional settings should only be used when one understands them and knows - that they are needed -\series default -. - A common error is to attempt to set many unnecessary settings. - -\end_layout - -\begin_layout Standard -Here is a list of the values allowed for the requests. - Some only apply to the encoder or the decoder. - Because the last argument is of type -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -void * -\end_layout - -\end_inset - -, the -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -_ctl() -\end_layout - -\end_inset - - functions are -\series bold -not type safe -\series default -, and should thus be used with care. - The type -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -spx_int32_t -\end_layout - -\end_inset - - is the same as the C99 -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -int32_t -\end_layout - -\end_inset - - type. -\end_layout - -\begin_layout Description -SPEEX_SET_ENH -\begin_inset Formula $\ddagger$ -\end_inset - - Set perceptual enhancer -\begin_inset Index -status collapsed - -\begin_layout Plain Layout -perceptual enhancement -\end_layout - -\end_inset - - to on (1) or off (0) ( -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -spx_int32_t -\end_layout - -\end_inset - -, default is on) -\end_layout - -\begin_layout Description -SPEEX_GET_ENH -\begin_inset Formula $\ddagger$ -\end_inset - - Get perceptual enhancer status ( -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -spx_int32_t -\end_layout - -\end_inset - -) -\end_layout - -\begin_layout Description -SPEEX_GET_FRAME_SIZE Get the number of samples per frame for the current - mode ( -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -spx_int32_t -\end_layout - -\end_inset - -) -\end_layout - -\begin_layout Description -SPEEX_SET_QUALITY -\begin_inset Formula $\dagger$ -\end_inset - - Set the encoder speech quality ( -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -spx_int32_t -\end_layout - -\end_inset - - from 0 to 10, default is 8) -\end_layout - -\begin_layout Description -SPEEX_GET_QUALITY -\begin_inset Formula $\dagger$ -\end_inset - - Get the current encoder speech quality ( -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -spx_int32_t -\end_layout - -\end_inset - - from 0 to 10) -\end_layout - -\begin_layout Description -SPEEX_SET_MODE -\begin_inset Formula $\dagger$ -\end_inset - - Set the mode number, as specified in the RTP spec ( -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -spx_int32_t -\end_layout - -\end_inset - -) -\end_layout - -\begin_layout Description -SPEEX_GET_MODE -\begin_inset Formula $\dagger$ -\end_inset - - Get the current mode number, as specified in the RTP spec ( -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -spx_int32_t -\end_layout - -\end_inset - -) -\end_layout - -\begin_layout Description -SPEEX_SET_VBR -\begin_inset Formula $\dagger$ -\end_inset - - Set variable bit-rate (VBR) to on (1) or off (0) ( -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -spx_int32_t -\end_layout - -\end_inset - -, default is off) -\end_layout - -\begin_layout Description -SPEEX_GET_VBR -\begin_inset Formula $\dagger$ -\end_inset - - Get variable bit-rate -\begin_inset Index -status collapsed - -\begin_layout Plain Layout -variable bit-rate -\end_layout - -\end_inset - - (VBR) status ( -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -spx_int32_t -\end_layout - -\end_inset - -) -\end_layout - -\begin_layout Description -SPEEX_SET_VBR_QUALITY -\begin_inset Formula $\dagger$ -\end_inset - - Set the encoder VBR speech quality (float 0.0 to 10.0, default is 8.0) -\end_layout - -\begin_layout Description -SPEEX_GET_VBR_QUALITY -\begin_inset Formula $\dagger$ -\end_inset - - Get the current encoder VBR speech quality (float 0 to 10) -\end_layout - -\begin_layout Description -SPEEX_SET_COMPLEXITY -\begin_inset Formula $\dagger$ -\end_inset - - Set the CPU resources allowed for the encoder ( -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -spx_int32_t -\end_layout - -\end_inset - - from 1 to 10, default is 2) -\end_layout - -\begin_layout Description -SPEEX_GET_COMPLEXITY -\begin_inset Formula $\dagger$ -\end_inset - - Get the CPU resources allowed for the encoder ( -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -spx_int32_t -\end_layout - -\end_inset - - from 1 to 10, default is 2) -\end_layout - -\begin_layout Description -SPEEX_SET_BITRATE -\begin_inset Formula $\dagger$ -\end_inset - - Set the bit-rate to use the closest value not exceeding the parameter ( -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -spx_int32_t -\end_layout - -\end_inset - - in bits per second) -\end_layout - -\begin_layout Description -SPEEX_GET_BITRATE Get the current bit-rate in use ( -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -spx_int32_t -\end_layout - -\end_inset - - in bits per second) -\end_layout - -\begin_layout Description -SPEEX_SET_SAMPLING_RATE Set real sampling rate ( -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -spx_int32_t -\end_layout - -\end_inset - - in Hz) -\end_layout - -\begin_layout Description -SPEEX_GET_SAMPLING_RATE Get real sampling rate ( -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -spx_int32_t -\end_layout - -\end_inset - - in Hz) -\end_layout - -\begin_layout Description -SPEEX_RESET_STATE Reset the encoder/decoder state to its original state, - clearing all memories (no argument) -\end_layout - -\begin_layout Description -SPEEX_SET_VAD -\begin_inset Formula $\dagger$ -\end_inset - - Set voice activity detection -\begin_inset Index -status collapsed - -\begin_layout Plain Layout -voice activity detection -\end_layout - -\end_inset - - (VAD) to on (1) or off (0) ( -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -spx_int32_t -\end_layout - -\end_inset - -, default is off) -\end_layout - -\begin_layout Description -SPEEX_GET_VAD -\begin_inset Formula $\dagger$ -\end_inset - - Get voice activity detection (VAD) status ( -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -spx_int32_t -\end_layout - -\end_inset - -) -\end_layout - -\begin_layout Description -SPEEX_SET_DTX -\begin_inset Formula $\dagger$ -\end_inset - - Set discontinuous transmission -\begin_inset Index -status collapsed - -\begin_layout Plain Layout -discontinuous transmission -\end_layout - -\end_inset - - (DTX) to on (1) or off (0) ( -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -spx_int32_t -\end_layout - -\end_inset - -, default is off) -\end_layout - -\begin_layout Description -SPEEX_GET_DTX -\begin_inset Formula $\dagger$ -\end_inset - - Get discontinuous transmission (DTX) status ( -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -spx_int32_t -\end_layout - -\end_inset - -) -\end_layout - -\begin_layout Description -SPEEX_SET_ABR -\begin_inset Formula $\dagger$ -\end_inset - - Set average bit-rate -\begin_inset Index -status collapsed - -\begin_layout Plain Layout -average bit-rate -\end_layout - -\end_inset - - (ABR) to a value n in bits per second ( -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -spx_int32_t -\end_layout - -\end_inset - - in bits per second) -\end_layout - -\begin_layout Description -SPEEX_GET_ABR -\begin_inset Formula $\dagger$ -\end_inset - - Get average bit-rate (ABR) setting ( -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -spx_int32_t -\end_layout - -\end_inset - - in bits per second) -\end_layout - -\begin_layout Description -SPEEX_SET_PLC_TUNING -\begin_inset Formula $\dagger$ -\end_inset - - Tell the encoder to optimize encoding for a certain percentage of packet - loss ( -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -spx_int32_t -\end_layout - -\end_inset - - in percent) -\end_layout - -\begin_layout Description -SPEEX_GET_PLC_TUNING -\begin_inset Formula $\dagger$ -\end_inset - - Get the current tuning of the encoder for PLC ( -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -spx_int32_t -\end_layout - -\end_inset - - in percent) -\end_layout - -\begin_layout Description -SPEEX_GET_LOOKAHEAD Returns the lookahead used by Speex separately for an - encoder and a decoder. - Sum encoder and decoder lookahead values to get the total codec lookahead. -\end_layout - -\begin_layout Description -SPEEX_SET_VBR_MAX_BITRATE -\begin_inset Formula $\dagger$ -\end_inset - - Set the maximum bit-rate allowed in VBR operation ( -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -spx_int32_t -\end_layout - -\end_inset - - in bits per second) -\end_layout - -\begin_layout Description -SPEEX_GET_VBR_MAX_BITRATE -\begin_inset Formula $\dagger$ -\end_inset - - Get the current maximum bit-rate allowed in VBR operation ( -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -spx_int32_t -\end_layout - -\end_inset - - in bits per second) -\end_layout - -\begin_layout Description -SPEEX_SET_HIGHPASS Set the high-pass filter on (1) or off (0) ( -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -spx_int32_t -\end_layout - -\end_inset - -, default is on) -\end_layout - -\begin_layout Description -SPEEX_GET_HIGHPASS Get the current high-pass filter status ( -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -spx_int32_t -\end_layout - -\end_inset - -) -\end_layout - -\begin_layout Description -\begin_inset Formula $\dagger$ -\end_inset - - applies only to the encoder -\end_layout - -\begin_layout Description -\begin_inset Formula $\ddagger$ -\end_inset - - applies only to the decoder -\end_layout - -\begin_layout Section -Mode queries -\begin_inset CommandInset label -LatexCommand label -name "sub:Mode-queries" - -\end_inset - - -\end_layout - -\begin_layout Standard -Speex modes have a query system similar to the speex_encoder_ctl and speex_decod -er_ctl calls. - Since modes are read-only, it is only possible to get information about - a particular mode. - The function used to do that is: -\begin_inset listings -inline false -status open - -\begin_layout Plain Layout - -void speex_mode_query(SpeexMode *mode, int request, void *ptr); -\end_layout - -\end_inset - -The admissible values for request are (unless otherwise note, the values - are returned through -\emph on -ptr -\emph default -): -\end_layout - -\begin_layout Description -SPEEX_MODE_FRAME_SIZE Get the frame size (in samples) for the mode -\end_layout - -\begin_layout Description -SPEEX_SUBMODE_BITRATE Get the bit-rate for a submode number specified through - -\emph on -ptr -\emph default - (integer in bps). - -\end_layout - -\begin_layout Section -Packing and in-band signalling -\begin_inset Index -status collapsed - -\begin_layout Plain Layout -in-band signalling -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -Sometimes it is desirable to pack more than one frame per packet (or other - basic unit of storage). - The proper way to do it is to call speex_encode -\begin_inset Formula $N$ -\end_inset - - times before writing the stream with speex_bits_write. - In cases where the number of frames is not determined by an out-of-band - mechanism, it is possible to include a terminator code. - That terminator consists of the code 15 (decimal) encoded with 5 bits, - as shown in Table -\begin_inset CommandInset ref -LatexCommand ref -reference "cap:quality_vs_bps" - -\end_inset - -. - Note that as of version 1.0.2, calling speex_bits_write automatically inserts - the terminator so as to fill the last byte. - This doesn't involves any overhead and makes sure Speex can always detect - when there is no more frame in a packet. -\end_layout - -\begin_layout Standard -It is also possible to send in-band -\begin_inset Quotes eld -\end_inset - -messages -\begin_inset Quotes erd -\end_inset - - to the other side. - All these messages are encoded as -\begin_inset Quotes eld -\end_inset - -pseudo-frames -\begin_inset Quotes erd -\end_inset - - of mode 14 which contain a 4-bit message type code, followed by the message. - Table -\begin_inset CommandInset ref -LatexCommand ref -reference "cap:In-band-signalling-codes" - -\end_inset - - lists the available codes, their meaning and the size of the message that - follows. - Most of these messages are requests that are sent to the encoder or decoder - on the other end, which is free to comply or ignore them. - By default, all in-band messages are ignored. -\end_layout - -\begin_layout Standard -\begin_inset Float table -placement htbp -wide false -sideways false -status open - -\begin_layout Plain Layout -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -begin{center} -\end_layout - -\end_inset - - -\begin_inset Tabular - - - - - - - -\begin_inset Text - -\begin_layout Plain Layout -Code -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -Size (bits) -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -Content -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -0 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -1 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -Asks decoder to set perceptual enhancement off (0) or on(1) -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -1 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -1 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -Asks (if 1) the encoder to be less -\begin_inset Quotes eld -\end_inset - -aggressive -\begin_inset Quotes erd -\end_inset - - due to high packet loss -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -2 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -4 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -Asks encoder to switch to mode N -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -3 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -4 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -Asks encoder to switch to mode N for low-band -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -4 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -4 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -Asks encoder to switch to mode N for high-band -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -5 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -4 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -Asks encoder to switch to quality N for VBR -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -6 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -4 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -Request acknowledge (0=no, 1=all, 2=only for in-band data) -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -7 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -4 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -Asks encoder to set CBR (0), VAD(1), DTX(3), VBR(5), VBR+DTX(7) -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -8 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -8 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -Transmit (8-bit) character to the other end -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -9 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -8 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -Intensity stereo information -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -10 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -16 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -Announce maximum bit-rate acceptable (N in bytes/second) -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -11 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -16 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -reserved -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -12 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -32 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -Acknowledge receiving packet N -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -13 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -32 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -reserved -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -14 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -64 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -reserved -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -15 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -64 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -reserved -\end_layout - -\end_inset - - - - -\end_inset - - -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -end{center} -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Plain Layout -\begin_inset Caption - -\begin_layout Plain Layout -In-band signalling codes -\begin_inset CommandInset label -LatexCommand label -name "cap:In-band-signalling-codes" - -\end_inset - - -\end_layout - -\end_inset - - -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -Finally, applications may define custom in-band messages using mode 13. - The size of the message in bytes is encoded with 5 bits, so that the decoder - can skip it if it doesn't know how to interpret it. -\begin_inset Newpage newpage -\end_inset - - -\end_layout - -\begin_layout Chapter -Speech Processing API ( -\emph on -libspeexdsp -\emph default -) -\end_layout - -\begin_layout Standard -As of version 1.2beta3, the non-codec parts of the Speex package are now - in a separate library called -\emph on -libspeexdsp -\emph default -. - This library includes the preprocessor, the acoustic echo canceller, the - jitter buffer, and the resampler. - In a UNIX environment, it can be linked into a program by adding -\emph on --lspeexdsp -lm -\emph default - to the compiler command line. - Just like for libspeex, -\series bold -libspeexdsp calls are reentrant, but not thread-safe -\series default -. - That means that it is fine to use calls from many threads, but -\series bold -calls using the same state from multiple threads must be protected by mutexes -\series default -. -\end_layout - -\begin_layout Section -Preprocessor -\begin_inset CommandInset label -LatexCommand label -name "sub:Preprocessor" - -\end_inset - - -\end_layout - -\begin_layout Standard -\noindent -In order to use the Speex preprocessor -\begin_inset Index -status collapsed - -\begin_layout Plain Layout -preprocessor -\end_layout - -\end_inset - -, you first need to: -\begin_inset listings -inline false -status open - -\begin_layout Plain Layout - -#include -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -\noindent -Then, a preprocessor state can be created as: -\begin_inset listings -inline false -status open - -\begin_layout Plain Layout - -SpeexPreprocessState *preprocess_state = speex_preprocess_state_init(frame_size, - sampling_rate); -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -\noindent -and it is recommended to use the same value for -\family typewriter -frame_size -\family default - as is used by the encoder (20 -\emph on -ms -\emph default -). -\end_layout - -\begin_layout Standard -For each input frame, you need to call: -\end_layout - -\begin_layout Standard -\begin_inset listings -inline false -status open - -\begin_layout Plain Layout - -speex_preprocess_run(preprocess_state, audio_frame); -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -\noindent -where -\family typewriter -audio_frame -\family default - is used both as input and output. - In cases where the output audio is not useful for a certain frame, it is - possible to use instead: -\end_layout - -\begin_layout Standard -\begin_inset listings -inline false -status open - -\begin_layout Plain Layout - -speex_preprocess_estimate_update(preprocess_state, audio_frame); -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -\noindent -This call will update all the preprocessor internal state variables without - computing the output audio, thus saving some CPU cycles. -\end_layout - -\begin_layout Standard -The behaviour of the preprocessor can be changed using: -\end_layout - -\begin_layout Standard -\begin_inset listings -inline false -status open - -\begin_layout Plain Layout - -speex_preprocess_ctl(preprocess_state, request, ptr); -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -\noindent -which is used in the same way as the encoder and decoder equivalent. - Options are listed in Section -\begin_inset CommandInset ref -LatexCommand ref -reference "sub:Preprocessor-options" - -\end_inset - -. -\end_layout - -\begin_layout Standard -The preprocessor state can be destroyed using: -\end_layout - -\begin_layout Standard -\begin_inset listings -inline false -status open - -\begin_layout Plain Layout - -speex_preprocess_state_destroy(preprocess_state); -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Subsection -Preprocessor options -\begin_inset CommandInset label -LatexCommand label -name "sub:Preprocessor-options" - -\end_inset - - -\end_layout - -\begin_layout Standard -As with the codec, the preprocessor also has options that can be controlled - using an ioctl()-like call. - The available options are: -\end_layout - -\begin_layout Description -SPEEX_PREPROCESS_SET_DENOISE Turns denoising on(1) or off(0) ( -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -spx_int32_t -\end_layout - -\end_inset - -) -\end_layout - -\begin_layout Description -SPEEX_PREPROCESS_GET_DENOISE Get denoising status ( -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -spx_int32_t -\end_layout - -\end_inset - -) -\end_layout - -\begin_layout Description -SPEEX_PREPROCESS_SET_AGC Turns automatic gain control (AGC) on(1) or off(0) - ( -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -spx_int32_t -\end_layout - -\end_inset - -) -\end_layout - -\begin_layout Description -SPEEX_PREPROCESS_GET_AGC Get AGC status ( -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -spx_int32_t -\end_layout - -\end_inset - -) -\end_layout - -\begin_layout Description -SPEEX_PREPROCESS_SET_VAD Turns voice activity detector (VAD) on(1) or off(0) - ( -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -spx_int32_t -\end_layout - -\end_inset - -) -\end_layout - -\begin_layout Description -SPEEX_PREPROCESS_GET_VAD Get VAD status ( -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -spx_int32_t -\end_layout - -\end_inset - -) -\end_layout - -\begin_layout Description -SPEEX_PREPROCESS_SET_AGC_LEVEL -\end_layout - -\begin_layout Description -SPEEX_PREPROCESS_GET_AGC_LEVEL -\end_layout - -\begin_layout Description -SPEEX_PREPROCESS_SET_DEREVERB Turns reverberation removal on(1) or off(0) - ( -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -spx_int32_t -\end_layout - -\end_inset - -) -\end_layout - -\begin_layout Description -SPEEX_PREPROCESS_GET_DEREVERB Get reverberation removal status ( -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -spx_int32_t -\end_layout - -\end_inset - -) -\end_layout - -\begin_layout Description -SPEEX_PREPROCESS_SET_DEREVERB_LEVEL Not working yet, do not use -\end_layout - -\begin_layout Description -SPEEX_PREPROCESS_GET_DEREVERB_LEVEL Not working yet, do not use -\end_layout - -\begin_layout Description -SPEEX_PREPROCESS_SET_DEREVERB_DECAY Not working yet, do not use -\end_layout - -\begin_layout Description -SPEEX_PREPROCESS_GET_DEREVERB_DECAY Not working yet, do not use -\end_layout - -\begin_layout Description -SPEEX_PREPROCESS_SET_PROB_START -\end_layout - -\begin_layout Description -SPEEX_PREPROCESS_GET_PROB_START -\end_layout - -\begin_layout Description -SPEEX_PREPROCESS_SET_PROB_CONTINUE -\end_layout - -\begin_layout Description -SPEEX_PREPROCESS_GET_PROB_CONTINUE -\end_layout - -\begin_layout Description -SPEEX_PREPROCESS_SET_NOISE_SUPPRESS Set maximum attenuation of the noise - in dB (negative -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -spx_int32_t -\end_layout - -\end_inset - -) -\end_layout - -\begin_layout Description -SPEEX_PREPROCESS_GET_NOISE_SUPPRESS Get maximum attenuation of the noise - in dB (negative -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -spx_int32_t -\end_layout - -\end_inset - -) -\end_layout - -\begin_layout Description -SPEEX_PREPROCESS_SET_ECHO_SUPPRESS Set maximum attenuation of the residual - echo in dB (negative -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -spx_int32_t -\end_layout - -\end_inset - -) -\end_layout - -\begin_layout Description -SPEEX_PREPROCESS_GET_ECHO_SUPPRESS Get maximum attenuation of the residual - echo in dB (negative -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -spx_int32_t -\end_layout - -\end_inset - -) -\end_layout - -\begin_layout Description -SPEEX_PREPROCESS_SET_ECHO_SUPPRESS_ACTIVE Set maximum attenuation of the - echo in dB when near end is active (negative -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -spx_int32_t -\end_layout - -\end_inset - -) -\end_layout - -\begin_layout Description -SPEEX_PREPROCESS_GET_ECHO_SUPPRESS_ACTIVE Get maximum attenuation of the - echo in dB when near end is active (negative -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -spx_int32_t -\end_layout - -\end_inset - -) -\end_layout - -\begin_layout Description -SPEEX_PREPROCESS_SET_ECHO_STATE Set the associated echo canceller for residual - echo suppression (pointer or NULL for no residual echo suppression) -\end_layout - -\begin_layout Description -SPEEX_PREPROCESS_GET_ECHO_STATE Get the associated echo canceller (pointer) -\end_layout - -\begin_layout Section -Echo Cancellation -\begin_inset CommandInset label -LatexCommand label -name "sub:Echo-Cancellation" - -\end_inset - - -\end_layout - -\begin_layout Standard -The Speex library now includes an echo cancellation -\begin_inset Index -status collapsed - -\begin_layout Plain Layout -echo cancellation -\end_layout - -\end_inset - - algorithm suitable for Acoustic Echo Cancellation -\begin_inset Index -status collapsed - -\begin_layout Plain Layout -acoustic echo cancellation -\end_layout - -\end_inset - - (AEC). - In order to use the echo canceller, you first need to -\end_layout - -\begin_layout Standard -\begin_inset listings -inline false -status open - -\begin_layout Plain Layout - -#include -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -Then, an echo canceller state can be created by: -\end_layout - -\begin_layout Standard -\begin_inset listings -inline false -status open - -\begin_layout Plain Layout - -SpeexEchoState *echo_state = speex_echo_state_init(frame_size, filter_length); -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -where -\family typewriter -frame_size -\family default - is the amount of data (in samples) you want to process at once and -\family typewriter -filter_length -\family default - is the length (in samples) of the echo cancelling filter you want to use - (also known as -\shape italic -tail length -\shape default - -\begin_inset Index -status collapsed - -\begin_layout Plain Layout -tail length -\end_layout - -\end_inset - -). - It is recommended to use a frame size in the order of 20 ms (or equal to - the codec frame size) and make sure it is easy to perform an FFT of that - size (powers of two are better than prime sizes). - The recommended tail length is approximately the third of the room reverberatio -n time. - For example, in a small room, reverberation time is in the order of 300 - ms, so a tail length of 100 ms is a good choice (800 samples at 8000 Hz - sampling rate). -\end_layout - -\begin_layout Standard -Once the echo canceller state is created, audio can be processed by: -\end_layout - -\begin_layout Standard -\begin_inset listings -inline false -status open - -\begin_layout Plain Layout - -speex_echo_cancellation(echo_state, input_frame, echo_frame, output_frame); -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -where -\family typewriter -input_frame -\family default - is the audio as captured by the microphone, -\family typewriter -echo_frame -\family default - is the signal that was played in the speaker (and needs to be removed) - and -\family typewriter -output_frame -\family default - is the signal with echo removed. - -\end_layout - -\begin_layout Standard -One important thing to keep in mind is the relationship between -\family typewriter -input_frame -\family default - and -\family typewriter -echo_frame -\family default -. - It is important that, at any time, any echo that is present in the input - has already been sent to the echo canceller as -\family typewriter -echo_frame -\family default -. - In other words, the echo canceller cannot remove a signal that it hasn't - yet received. - On the other hand, the delay between the input signal and the echo signal - must be small enough because otherwise part of the echo cancellation filter - is inefficient. - In the ideal case, you code would look like: -\begin_inset listings -lstparams "breaklines=true" -inline false -status open - -\begin_layout Plain Layout - -write_to_soundcard(echo_frame, frame_size); -\end_layout - -\begin_layout Plain Layout - -read_from_soundcard(input_frame, frame_size); -\end_layout - -\begin_layout Plain Layout - -speex_echo_cancellation(echo_state, input_frame, echo_frame, output_frame); -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -If you wish to further reduce the echo present in the signal, you can do - so by associating the echo canceller to the preprocessor (see Section -\begin_inset CommandInset ref -LatexCommand ref -reference "sub:Preprocessor" - -\end_inset - -). - This is done by calling: -\begin_inset listings -lstparams "breaklines=true" -inline false -status open - -\begin_layout Plain Layout - -speex_preprocess_ctl(preprocess_state, SPEEX_PREPROCESS_SET_ECHO_STATE,echo_stat -e); -\end_layout - -\end_inset - -in the initialisation. -\end_layout - -\begin_layout Standard -As of version 1.2-beta2, there is an alternative, simpler API that can be - used instead of -\emph on -speex_echo_cancellation() -\emph default -. - When audio capture and playback are handled asynchronously (e.g. - in different threads or using the -\emph on -poll() -\emph default - or -\emph on -select() -\emph default - system call), it can be difficult to keep track of what input_frame comes - with what echo_frame. - Instead, the playback context/thread can simply call: -\end_layout - -\begin_layout Standard -\begin_inset listings -inline false -status open - -\begin_layout Plain Layout - -speex_echo_playback(echo_state, echo_frame); -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -every time an audio frame is played. - Then, the capture context/thread calls: -\end_layout - -\begin_layout Standard -\begin_inset listings -inline false -status open - -\begin_layout Plain Layout - -speex_echo_capture(echo_state, input_frame, output_frame); -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -for every frame captured. - Internally, -\emph on -speex_echo_playback() -\emph default - simply buffers the playback frame so it can be used by -\emph on -speex_echo_capture() -\emph default - to call -\emph on -speex_echo_cancel() -\emph default -. - A side effect of using this alternate API is that the playback audio is - delayed by two frames, which is the normal delay caused by the soundcard. - When capture and playback are already synchronised, -\emph on -speex_echo_cancellation() -\emph default - is preferable since it gives better control on the exact input/echo timing. -\end_layout - -\begin_layout Standard -The echo cancellation state can be destroyed with: -\end_layout - -\begin_layout Standard -\begin_inset listings -inline false -status open - -\begin_layout Plain Layout - -speex_echo_state_destroy(echo_state); -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -It is also possible to reset the state of the echo canceller so it can be - reused without the need to create another state with: -\end_layout - -\begin_layout Standard -\begin_inset listings -inline false -status open - -\begin_layout Plain Layout - -speex_echo_state_reset(echo_state); -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Subsection -Troubleshooting -\end_layout - -\begin_layout Standard -There are several things that may prevent the echo canceller from working - properly. - One of them is a bug (or something suboptimal) in the code, but there are - many others you should consider first -\end_layout - -\begin_layout Itemize -Using a different soundcard to do the capture and plaback will -\series bold -not -\series default - work, regardless of what you may think. - The only exception to that is if the two cards can be made to have their - sampling clock -\begin_inset Quotes eld -\end_inset - -locked -\begin_inset Quotes erd -\end_inset - - on the same clock source. - If not, the clocks will always have a small amount of drift, which will - prevent the echo canceller from adapting. -\end_layout - -\begin_layout Itemize -The delay between the record and playback signals must be minimal. - Any signal played has to -\begin_inset Quotes eld -\end_inset - -appear -\begin_inset Quotes erd -\end_inset - - on the playback (far end) signal slightly before the echo canceller -\begin_inset Quotes eld -\end_inset - -sees -\begin_inset Quotes erd -\end_inset - - it in the near end signal, but excessive delay means that part of the filter - length is wasted. - In the worst situations, the delay is such that it is longer than the filter - length, in which case, no echo can be cancelled. -\end_layout - -\begin_layout Itemize -When it comes to echo tail length (filter length), longer is -\series bold -not -\series default - better. - Actually, the longer the tail length, the longer it takes for the filter - to adapt. - Of course, a tail length that is too short will not cancel enough echo, - but the most common problem seen is that people set a very long tail length - and then wonder why no echo is being cancelled. -\end_layout - -\begin_layout Itemize -Non-linear distortion cannot (by definition) be modeled by the linear adaptive - filter used in the echo canceller and thus cannot be cancelled. - Use good audio gear and avoid saturation/clipping. -\end_layout - -\begin_layout Standard -Also useful is reading -\emph on -Echo Cancellation Demystified -\emph default - by Alexey Frunze -\begin_inset Foot -status collapsed - -\begin_layout Plain Layout -http://www.embeddedstar.com/articles/2003/7/article20030720-1.html -\end_layout - -\end_inset - -, which explains the fundamental principles of echo cancellation. - The details of the algorithm described in the article are different, but - the general ideas of echo cancellation through adaptive filters are the - same. -\end_layout - -\begin_layout Standard -As of version 1.2beta2, a new -\family typewriter -echo_diagnostic.m -\family default - tool is included in the source distribution. - The first step is to define DUMP_ECHO_CANCEL_DATA during the build. - This causes the echo canceller to automatically save the near-end, far-end - and output signals to files (aec_rec.sw aec_play.sw and aec_out.sw). - These are exactly what the AEC receives and outputs. - From there, it is necessary to start Octave and type: -\end_layout - -\begin_layout Standard -\begin_inset listings -lstparams "language=Matlab" -inline false -status open - -\begin_layout Plain Layout - -echo_diagnostic('aec_rec.sw', 'aec_play.sw', 'aec_diagnostic.sw', 1024); -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -The value of 1024 is the filter length and can be changed. - There will be some (hopefully) useful messages printed and echo cancelled - audio will be saved to aec_diagnostic.sw . - If even that output is bad (almost no cancellation) then there is probably - problem with the playback or recording process. -\end_layout - -\begin_layout Section -Jitter Buffer -\end_layout - -\begin_layout Standard -The jitter buffer can be enabled by including: -\begin_inset listings -lstparams "breaklines=true" -inline false -status open - -\begin_layout Plain Layout - -#include -\end_layout - -\end_inset - - and a new jitter buffer state can be initialised by: -\end_layout - -\begin_layout Standard -\begin_inset listings -lstparams "breaklines=true" -inline false -status open - -\begin_layout Plain Layout - -JitterBuffer *state = jitter_buffer_init(step); -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -where the -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -step -\end_layout - -\end_inset - - argument is the default time step (in timestamp units) used for adjusting - the delay and doing concealment. - A value of 1 is always correct, but higher values may be more convenient - sometimes. - For example, if you are only able to do concealment on 20ms frames, there - is no point in the jitter buffer asking you to do it on one sample. - Another example is that for video, it makes no sense to adjust the delay - by less than a full frame. - The value provided can always be changed at a later time. -\end_layout - -\begin_layout Standard -The jitter buffer API is based on the -\begin_inset listings -inline true -status open - -\begin_layout Plain Layout - -JitterBufferPacket -\end_layout - -\end_inset - - type, which is defined as: -\begin_inset listings -inline false -status open - -\begin_layout Plain Layout - -typedef struct { -\end_layout - -\begin_layout Plain Layout - - char *data; /* Data bytes contained in the packet */ -\end_layout - -\begin_layout Plain Layout - - spx_uint32_t len; /* Length of the packet in bytes */ -\end_layout - -\begin_layout Plain Layout - - spx_uint32_t timestamp; /* Timestamp for the packet */ -\end_layout - -\begin_layout Plain Layout - - spx_uint32_t span; /* Time covered by the packet (timestamp units) - */ -\end_layout - -\begin_layout Plain Layout - -} JitterBufferPacket; -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -As an example, for audio the timestamp field would be what is obtained from - the RTP timestamp field and the span would be the number of samples that - are encoded in the packet. - For Speex narrowband, span would be 160 if only one frame is included in - the packet. - -\end_layout - -\begin_layout Standard -When a packet arrives, it need to be inserter into the jitter buffer by: -\begin_inset listings -inline false -status open - -\begin_layout Plain Layout - -JitterBufferPacket packet; -\end_layout - -\begin_layout Plain Layout - -/* Fill in each field in the packet struct */ -\end_layout - -\begin_layout Plain Layout - -jitter_buffer_put(state, &packet); -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -When the decoder is ready to decode a packet the packet to be decoded can - be obtained by: -\begin_inset listings -inline false -status open - -\begin_layout Plain Layout - -int start_offset; -\end_layout - -\begin_layout Plain Layout - -err = jitter_buffer_get(state, &packet, desired_span, &start_offset); -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -If -\begin_inset listings -inline true -status open - -\begin_layout Plain Layout - -jitter_buffer_put() -\end_layout - -\end_inset - - and -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -jitter_buffer_get() -\end_layout - -\end_inset - - are called from different threads, then -\series bold -you need to protect the jitter buffer state with a mutex -\series default -. - -\end_layout - -\begin_layout Standard -Because the jitter buffer is designed not to use an explicit timer, it needs - to be told about the time explicitly. - This is done by calling: -\begin_inset listings -inline false -status open - -\begin_layout Plain Layout - -jitter_buffer_tick(state); -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -This needs to be done periodically in the playing thread. - This will be the last jitter buffer call before going to sleep (until more - data is played back). - In some cases, it may be preferable to use -\begin_inset listings -inline false -status open - -\begin_layout Plain Layout - -jitter_buffer_remaining_span(state, remaining); -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -The second argument is used to specify that we are still holding data that - has not been written to the playback device. - For instance, if 256 samples were needed by the soundcard (specified by - -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -desired_span -\end_layout - -\end_inset - -), but -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -jitter_buffer_get() -\end_layout - -\end_inset - - returned 320 samples, we would have -\begin_inset listings -inline true -status open - -\begin_layout Plain Layout - -remaining=64 -\end_layout - -\end_inset - -. -\end_layout - -\begin_layout Section -Resampler -\end_layout - -\begin_layout Standard -Speex includes a resampling modules. - To make use of the resampler, it is necessary to include its header file: -\end_layout - -\begin_layout Standard -\begin_inset listings -inline false -status open - -\begin_layout Plain Layout - -#include -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -For each stream that is to be resampled, it is necessary to create a resampler - state with: -\end_layout - -\begin_layout Standard -\begin_inset listings -inline false -status open - -\begin_layout Plain Layout - -SpeexResamplerState *resampler; -\end_layout - -\begin_layout Plain Layout - -resampler = speex_resampler_init(nb_channels, input_rate, output_rate, quality, - &err); -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -where -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -nb_channels -\end_layout - -\end_inset - - is the number of channels that will be used (either interleaved or non-interlea -ved), -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -input_rate -\end_layout - -\end_inset - - is the sampling rate of the input stream, -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -output_rate -\end_layout - -\end_inset - - is the sampling rate of the output stream and -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -quality -\end_layout - -\end_inset - - is the requested quality setting (0 to 10). - The quality parameter is useful for controlling the quality/complexity/latency - tradeoff. - Using a higher quality setting means less noise/aliasing, a higher complexity - and a higher latency. - Usually, a quality of 3 is acceptable for most desktop uses and quality - 10 is mostly recommended for pro audio work. - Quality 0 usually has a decent sound (certainly better than using linear - interpolation resampling), but artifacts may be heard. -\end_layout - -\begin_layout Standard -The actual resampling is performed using -\end_layout - -\begin_layout Standard -\begin_inset listings -inline false -status open - -\begin_layout Plain Layout - -err = speex_resampler_process_int(resampler, channelID, in, &in_length, - out, &out_length); -\end_layout - -\end_inset - -where -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -channelID -\end_layout - -\end_inset - - is the ID of the channel to be processed. - For a mono stream, use 0. - The -\emph on -in -\emph default - pointer points to the first sample of the input buffer for the selected - channel and -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -out -\end_layout - -\end_inset - - points to the first sample of the output. - The size of the input and output buffers are specified by -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -in_length -\end_layout - -\end_inset - - and -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -out_length -\end_layout - -\end_inset - - respectively. - Upon completion, these values are replaced by the number of samples read - and written by the resampler. - Unless an error occurs, either all input samples will be read or all output - samples will be written to (or both). - For floating-point samples, the function -\begin_inset listings -inline true -status open - -\begin_layout Plain Layout - -speex_resampler_process_float() -\end_layout - -\end_inset - - behaves similarly. -\end_layout - -\begin_layout Standard -It is also possible to process multiple channels at once. - To do that, you can use speex_resampler_process_interleaved_int() or -\begin_inset listings -inline true -status open - -\begin_layout Plain Layout - -speex_resampler_process_interleaved_float() -\end_layout - -\end_inset - -. - The arguments are the same except that there is no -\begin_inset listings -inline true -status collapsed - -\begin_layout Plain Layout - -channelID -\end_layout - -\end_inset - - argument. - Note that the -\series bold -length parameters are per-channel -\series default -. - So if you have 1024 samples for each of 4 channels, you pass 1024 and not - 4096. -\end_layout - -\begin_layout Standard -The resampler allows changing the quality and input/output sampling frequencies - on the fly without glitches. - This can be done with calls such as -\begin_inset listings -inline true -status open - -\begin_layout Plain Layout - -speex_resampler_set_quality() -\end_layout - -\end_inset - - and -\begin_inset listings -inline true -status open - -\begin_layout Plain Layout - -speex_resampler_set_rate() -\end_layout - -\end_inset - -. - The only side effect is that a new filter will have to be recomputed, consuming - many CPU cycles. - -\end_layout - -\begin_layout Standard -When resampling a file, it is often desirable to have the output file perfectly - synchronised with the input. - To do that, you need to call -\begin_inset listings -inline true -status open - -\begin_layout Plain Layout - -speex_resampler_skip_zeros() -\end_layout - -\end_inset - - -\series bold -before -\series default - you start processing any samples. - For real-time applications (e.g. - VoIP), it is not recommended to do that as the first process frame will - be shorter to compensate for the delay (the skipped zeros). - Instead, in real-time applications you may want to know how many delay - is introduced by the resampler. - This can be done at run-time with -\begin_inset listings -inline true -status open - -\begin_layout Plain Layout - -speex_resampler_get_input_latency() -\end_layout - -\end_inset - - and -\begin_inset listings -inline true -status open - -\begin_layout Plain Layout - -speex_resampler_get_output_latency() -\end_layout - -\end_inset - - functions. - First function returns delay measured in samples at input samplerate, while - second returns delay measured in samples at output samplerate. -\end_layout - -\begin_layout Standard -To destroy a resampler state, just call -\begin_inset listings -inline true -status open - -\begin_layout Plain Layout - -speex_resampler_destroy() -\end_layout - -\end_inset - -. -\end_layout - -\begin_layout Section -Ring Buffer -\end_layout - -\begin_layout Standard -In some cases, it is necessary to interface components that use different - block sizes. - For example, it is possible that the soundcard does not support reading/writing - in blocks of 20 -\begin_inset space ~ -\end_inset - -ms or sometimes, complicated resampling ratios mean that the blocks don't - always have the same time. - In thoses cases, it is often necessary to buffer a bit of audio using a - ring buffer. -\end_layout - -\begin_layout Standard -\begin_inset Newpage newpage -\end_inset - - -\end_layout - -\begin_layout Chapter -Formats and standards -\begin_inset Index -status collapsed - -\begin_layout Plain Layout -standards -\end_layout - -\end_inset - - -\begin_inset CommandInset label -LatexCommand label -name "sec:Formats-and-standards" - -\end_inset - - -\end_layout - -\begin_layout Standard -Speex can encode speech in both narrowband and wideband and provides different - bit-rates. - However, not all features need to be supported by a certain implementation - or device. - In order to be called -\begin_inset Quotes eld -\end_inset - -Speex compatible -\begin_inset Quotes erd -\end_inset - - (whatever that means), an implementation must implement at least a basic - set of features. -\end_layout - -\begin_layout Standard -At the minimum, all narrowband modes of operation MUST be supported at the - decoder. - This includes the decoding of a wideband bit-stream by the narrowband decoder -\begin_inset Foot -status collapsed - -\begin_layout Plain Layout -The wideband bit-stream contains an embedded narrowband bit-stream which - can be decoded alone -\end_layout - -\end_inset - -. - If present, a wideband decoder MUST be able to decode a narrowband stream, - and MAY either be able to decode all wideband modes or be able to decode - the embedded narrowband part of all modes (which includes ignoring the - high-band bits). -\end_layout - -\begin_layout Standard -For encoders, at least one narrowband or wideband mode MUST be supported. - The main reason why all encoding modes do not have to be supported is that - some platforms may not be able to handle the complexity of encoding in - some modes. -\end_layout - -\begin_layout Section -RTP -\begin_inset Index -status collapsed - -\begin_layout Plain Layout -RTP -\end_layout - -\end_inset - - Payload Format -\end_layout - -\begin_layout Standard -The RTP payload draft is included in appendix -\begin_inset CommandInset ref -LatexCommand ref -reference "sec:IETF-draft" - -\end_inset - - and the latest version is available at -\begin_inset Flex URL -status collapsed - -\begin_layout Plain Layout - -http://www.speex.org/drafts/latest -\end_layout - -\end_inset - -. - This draft has been sent (2003/02/26) to the Internet Engineering Task - Force (IETF) and will be discussed at the March 18th meeting in San Francisco. - -\end_layout - -\begin_layout Section -MIME Type -\end_layout - -\begin_layout Standard -For now, you should use the MIME type audio/x-speex for Speex-in-Ogg. - We will apply for type -\family typewriter -audio/speex -\family default - in the near future. -\end_layout - -\begin_layout Section -Ogg -\begin_inset Index -status collapsed - -\begin_layout Plain Layout -Ogg -\end_layout - -\end_inset - - file format -\end_layout - -\begin_layout Standard -Speex bit-streams can be stored in Ogg files. - In this case, the first packet of the Ogg file contains the Speex header - described in table -\begin_inset CommandInset ref -LatexCommand ref -reference "cap:ogg_speex_header" - -\end_inset - -. - All integer fields in the headers are stored as little-endian. - The -\family typewriter -speex_string -\family default - field must contain the -\begin_inset Quotes eld -\end_inset - - -\family typewriter -Speex -\family default - -\begin_inset space ~ -\end_inset - - -\begin_inset space ~ -\end_inset - - -\begin_inset space ~ -\end_inset - - -\begin_inset Quotes erd -\end_inset - - (with 3 trailing spaces), which identifies the bit-stream. - The next field, -\family typewriter -speex_version -\family default - contains the version of Speex that encoded the file. - For now, refer to speex_header.[ch] for more info. - The -\emph on -beginning of stream -\emph default - ( -\family typewriter -b_o_s -\family default -) flag is set to 1 for the header. - The header packet has -\family typewriter -packetno=0 -\family default - and -\family typewriter -granulepos=0 -\family default -. -\end_layout - -\begin_layout Standard -The second packet contains the Speex comment header. - The format used is the Vorbis comment format described here: http://www.xiph.org/ -ogg/vorbis/doc/v-comment.html . - This packet has -\family typewriter -packetno=1 -\family default - and -\family typewriter -granulepos=0 -\family default -. -\end_layout - -\begin_layout Standard -The third and subsequent packets each contain one or more (number found - in header) Speex frames. - These are identified with -\family typewriter -packetno -\family default - starting from 2 and the -\family typewriter -granulepos -\family default - is the number of the last sample encoded in that packet. - The last of these packets has the -\emph on -end of stream -\emph default - ( -\family typewriter -e_o_s -\family default -) flag is set to 1. -\end_layout - -\begin_layout Standard -\begin_inset Float table -placement htbp -wide true -sideways false -status open - -\begin_layout Plain Layout -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -begin{center} -\end_layout - -\end_inset - - -\begin_inset Tabular - - - - - - - -\begin_inset Text - -\begin_layout Plain Layout -Field -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -Type -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -Size -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -speex_string -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -char[] -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -8 -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -speex_version -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -char[] -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -20 -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -speex_version_id -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -int -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -4 -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -header_size -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -int -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -4 -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -rate -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -int -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -4 -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -mode -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -int -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -4 -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -mode_bitstream_version -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -int -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -4 -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -nb_channels -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -int -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -4 -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -bitrate -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -int -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -4 -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -frame_size -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -int -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -4 -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -vbr -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -int -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -4 -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -frames_per_packet -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -int -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -4 -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -extra_headers -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -int -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -4 -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -reserved1 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -int -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -4 -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -reserved2 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -int -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -4 -\end_layout - -\end_inset - - - - -\end_inset - - -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -end{center} -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Plain Layout -\begin_inset Caption - -\begin_layout Plain Layout -Ogg/Speex header packet -\begin_inset CommandInset label -LatexCommand label -name "cap:ogg_speex_header" - -\end_inset - - -\end_layout - -\end_inset - - -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -clearpage -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Chapter -Introduction to CELP Coding -\begin_inset Index -status collapsed - -\begin_layout Plain Layout -CELP -\end_layout - -\end_inset - - -\begin_inset CommandInset label -LatexCommand label -name "sec:Introduction-to-CELP" - -\end_inset - - -\end_layout - -\begin_layout Quote -\align center - -\emph on -Do not meddle in the affairs of poles, for they are subtle and quick to - leave the unit circle. -\end_layout - -\begin_layout Standard -Speex is based on CELP, which stands for Code Excited Linear Prediction. - This section attempts to introduce the principles behind CELP, so if you - are already familiar with CELP, you can safely skip to section -\begin_inset CommandInset ref -LatexCommand ref -reference "sec:Speex-narrowband-mode" - -\end_inset - -. - The CELP technique is based on three ideas: -\end_layout - -\begin_layout Enumerate -The use of a linear prediction (LP) model to model the vocal tract -\end_layout - -\begin_layout Enumerate -The use of (adaptive and fixed) codebook entries as input (excitation) of - the LP model -\end_layout - -\begin_layout Enumerate -The search performed in closed-loop in a -\begin_inset Quotes eld -\end_inset - -perceptually weighted domain -\begin_inset Quotes erd -\end_inset - - -\end_layout - -\begin_layout Standard -This section describes the basic ideas behind CELP. - This is still a work in progress. -\end_layout - -\begin_layout Section -Source-Filter Model of Speech Prediction -\end_layout - -\begin_layout Standard -The source-filter model of speech production assumes that the vocal cords - are the source of spectrally flat sound (the excitation signal), and that - the vocal tract acts as a filter to spectrally shape the various sounds - of speech. - While still an approximation, the model is widely used in speech coding - because of its simplicity.Its use is also the reason why most speech codecs - (Speex included) perform badly on music signals. - The different phonemes can be distinguished by their excitation (source) - and spectral shape (filter). - Voiced sounds (e.g. - vowels) have an excitation signal that is periodic and that can be approximated - by an impulse train in the time domain or by regularly-spaced harmonics - in the frequency domain. - On the other hand, fricatives (such as the "s", "sh" and "f" sounds) have - an excitation signal that is similar to white Gaussian noise. - So called voice fricatives (such as "z" and "v") have excitation signal - composed of an harmonic part and a noisy part. -\end_layout - -\begin_layout Standard -The source-filter model is usually tied with the use of Linear prediction. - The CELP model is based on source-filter model, as can be seen from the - CELP decoder illustrated in Figure -\begin_inset CommandInset ref -LatexCommand ref -reference "fig:The-CELP-model" - -\end_inset - -. - -\end_layout - -\begin_layout Standard -\begin_inset Float figure -wide false -sideways false -status open - -\begin_layout Plain Layout -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -begin{center} -\end_layout - -\end_inset - - -\begin_inset Graphics - filename celp_decoder.eps - width 45page% - keepAspectRatio - -\end_inset - - -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -end{center} -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Plain Layout -\begin_inset Caption - -\begin_layout Plain Layout -The CELP model of speech synthesis (decoder) -\begin_inset CommandInset label -LatexCommand label -name "fig:The-CELP-model" - -\end_inset - - -\end_layout - -\end_inset - - -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Section -Linear Prediction Coefficients (LPC) -\begin_inset Index -status collapsed - -\begin_layout Plain Layout -linear prediction -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -Linear prediction is at the base of many speech coding techniques, including - CELP. - The idea behind it is to predict the signal -\begin_inset Formula $x[n]$ -\end_inset - - using a linear combination of its past samples: -\end_layout - -\begin_layout Standard -\begin_inset Formula \[ -y[n]=\sum_{i=1}^{N}a_{i}x[n-i]\] - -\end_inset - -where -\begin_inset Formula $y[n]$ -\end_inset - - is the linear prediction of -\begin_inset Formula $x[n]$ -\end_inset - -. - The prediction error is thus given by: -\begin_inset Formula \[ -e[n]=x[n]-y[n]=x[n]-\sum_{i=1}^{N}a_{i}x[n-i]\] - -\end_inset - - -\end_layout - -\begin_layout Standard -The goal of the LPC analysis is to find the best prediction coefficients - -\begin_inset Formula $a_{i}$ -\end_inset - - which minimize the quadratic error function: -\begin_inset Formula \[ -E=\sum_{n=0}^{L-1}\left[e[n]\right]^{2}=\sum_{n=0}^{L-1}\left[x[n]-\sum_{i=1}^{N}a_{i}x[n-i]\right]^{2}\] - -\end_inset - -That can be done by making all derivatives -\begin_inset Formula $\frac{\partial E}{\partial a_{i}}$ -\end_inset - - equal to zero: -\begin_inset Formula \[ -\frac{\partial E}{\partial a_{i}}=\frac{\partial}{\partial a_{i}}\sum_{n=0}^{L-1}\left[x[n]-\sum_{i=1}^{N}a_{i}x[n-i]\right]^{2}=0\] - -\end_inset - - -\end_layout - -\begin_layout Standard -For an order -\begin_inset Formula $N$ -\end_inset - - filter, the filter coefficients -\begin_inset Formula $a_{i}$ -\end_inset - - are found by solving the system -\begin_inset Formula $N\times N$ -\end_inset - - linear system -\begin_inset Formula $\mathbf{Ra}=\mathbf{r}$ -\end_inset - -, where -\begin_inset Formula \[ -\mathbf{R}=\left[\begin{array}{cccc} -R(0) & R(1) & \cdots & R(N-1)\\ -R(1) & R(0) & \cdots & R(N-2)\\ -\vdots & \vdots & \ddots & \vdots\\ -R(N-1) & R(N-2) & \cdots & R(0)\end{array}\right]\] - -\end_inset - - -\begin_inset Formula \[ -\mathbf{r}=\left[\begin{array}{c} -R(1)\\ -R(2)\\ -\vdots\\ -R(N)\end{array}\right]\] - -\end_inset - -with -\begin_inset Formula $R(m)$ -\end_inset - -, the auto-correlation -\begin_inset Index -status collapsed - -\begin_layout Plain Layout -auto-correlation -\end_layout - -\end_inset - - of the signal -\begin_inset Formula $x[n]$ -\end_inset - -, computed as: -\end_layout - -\begin_layout Standard -\begin_inset Formula \[ -R(m)=\sum_{i=0}^{N-1}x[i]x[i-m]\] - -\end_inset - - -\end_layout - -\begin_layout Standard -Because -\begin_inset Formula $\mathbf{R}$ -\end_inset - - is Hermitian Toeplitz, the Levinson-Durbin -\begin_inset Index -status collapsed - -\begin_layout Plain Layout -Levinson-Durbin -\end_layout - -\end_inset - - algorithm can be used, making the solution to the problem -\begin_inset Formula $\mathcal{O}\left(N^{2}\right)$ -\end_inset - - instead of -\begin_inset Formula $\mathcal{O}\left(N^{3}\right)$ -\end_inset - -. - Also, it can be proven that all the roots of -\begin_inset Formula $A(z)$ -\end_inset - - are within the unit circle, which means that -\begin_inset Formula $1/A(z)$ -\end_inset - - is always stable. - This is in theory; in practice because of finite precision, there are two - commonly used techniques to make sure we have a stable filter. - First, we multiply -\begin_inset Formula $R(0)$ -\end_inset - - by a number slightly above one (such as 1.0001), which is equivalent to - adding noise to the signal. - Also, we can apply a window to the auto-correlation, which is equivalent - to filtering in the frequency domain, reducing sharp resonances. -\end_layout - -\begin_layout Section -Pitch Prediction -\begin_inset Index -status collapsed - -\begin_layout Plain Layout -pitch -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -During voiced segments, the speech signal is periodic, so it is possible - to take advantage of that property by approximating the excitation signal - -\begin_inset Formula $e[n]$ -\end_inset - - by a gain times the past of the excitation: -\end_layout - -\begin_layout Standard -\begin_inset Formula \[ -e[n]\simeq p[n]=\beta e[n-T]\ ,\] - -\end_inset - -where -\begin_inset Formula $T$ -\end_inset - - is the pitch period, -\begin_inset Formula $\beta$ -\end_inset - - is the pitch gain. - We call that long-term prediction since the excitation is predicted from - -\begin_inset Formula $e[n-T]$ -\end_inset - - with -\begin_inset Formula $T\gg N$ -\end_inset - -. -\end_layout - -\begin_layout Section -Innovation Codebook -\end_layout - -\begin_layout Standard -The final excitation -\begin_inset Formula $e[n]$ -\end_inset - - will be the sum of the pitch prediction and an -\emph on -innovation -\emph default - signal -\begin_inset Formula $c[n]$ -\end_inset - - taken from a fixed codebook, hence the name -\emph on -Code -\emph default - Excited Linear Prediction. - The final excitation is given by -\end_layout - -\begin_layout Standard -\begin_inset Formula \[ -e[n]=p[n]+c[n]=\beta e[n-T]+c[n]\ .\] - -\end_inset - -The quantization of -\begin_inset Formula $c[n]$ -\end_inset - - is where most of the bits in a CELP codec are allocated. - It represents the information that couldn't be obtained either from linear - prediction or pitch prediction. - In the -\emph on -z -\emph default --domain we can represent the final signal -\begin_inset Formula $X(z)$ -\end_inset - - as -\begin_inset Formula \[ -X(z)=\frac{C(z)}{A(z)\left(1-\beta z^{-T}\right)}\] - -\end_inset - - -\end_layout - -\begin_layout Section -Noise Weighting -\begin_inset Index -status collapsed - -\begin_layout Plain Layout -error weighting -\end_layout - -\end_inset - - -\begin_inset Index -status collapsed - -\begin_layout Plain Layout -analysis-by-synthesis -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -Most (if not all) modern audio codecs attempt to -\begin_inset Quotes eld -\end_inset - -shape -\begin_inset Quotes erd -\end_inset - - the noise so that it appears mostly in the frequency regions where the - ear cannot detect it. - For example, the ear is more tolerant to noise in parts of the spectrum - that are louder and -\emph on -vice versa -\emph default -. - In order to maximize speech quality, CELP codecs minimize the mean square - of the error (noise) in the perceptually weighted domain. - This means that a perceptual noise weighting filter -\begin_inset Formula $W(z)$ -\end_inset - - is applied to the error signal in the encoder. - In most CELP codecs, -\begin_inset Formula $W(z)$ -\end_inset - - is a pole-zero weighting filter derived from the linear prediction coefficients - (LPC), generally using bandwidth expansion. - Let the spectral envelope be represented by the synthesis filter -\begin_inset Formula $1/A(z)$ -\end_inset - -, CELP codecs typically derive the noise weighting filter as -\begin_inset Formula \begin{equation} -W(z)=\frac{A(z/\gamma_{1})}{A(z/\gamma_{2})}\ ,\label{eq:gamma-weighting}\end{equation} - -\end_inset - -where -\begin_inset Formula $\gamma_{1}=0.9$ -\end_inset - - and -\begin_inset Formula $\gamma_{2}=0.6$ -\end_inset - - in the Speex reference implementation. - If a filter -\begin_inset Formula $A(z)$ -\end_inset - - has (complex) poles at -\begin_inset Formula $p_{i}$ -\end_inset - - in the -\begin_inset Formula $z$ -\end_inset - --plane, the filter -\begin_inset Formula $A(z/\gamma)$ -\end_inset - - will have its poles at -\begin_inset Formula $p'_{i}=\gamma p_{i}$ -\end_inset - -, making it a flatter version of -\begin_inset Formula $A(z)$ -\end_inset - -. -\end_layout - -\begin_layout Standard -The weighting filter is applied to the error signal used to optimize the - codebook search through analysis-by-synthesis (AbS). - This results in a spectral shape of the noise that tends towards -\begin_inset Formula $1/W(z)$ -\end_inset - -. - While the simplicity of the model has been an important reason for the - success of CELP, it remains that -\begin_inset Formula $W(z)$ -\end_inset - - is a very rough approximation for the perceptually optimal noise weighting - function. - Fig. - -\begin_inset CommandInset ref -LatexCommand ref -reference "cap:Standard-noise-shaping" - -\end_inset - - illustrates the noise shaping that results from Eq. - -\begin_inset CommandInset ref -LatexCommand ref -reference "eq:gamma-weighting" - -\end_inset - -. - Throughout this paper, we refer to -\begin_inset Formula $W(z)$ -\end_inset - - as the noise weighting filter and to -\begin_inset Formula $1/W(z)$ -\end_inset - - as the noise shaping filter (or curve). -\end_layout - -\begin_layout Standard -\begin_inset Float figure -wide false -sideways false -status open - -\begin_layout Plain Layout -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -begin{center} -\end_layout - -\end_inset - - -\begin_inset Graphics - filename ref_shaping.eps - width 45page% - keepAspectRatio - -\end_inset - - -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -end{center} -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Plain Layout -\begin_inset Caption - -\begin_layout Plain Layout -Standard noise shaping in CELP. - Arbitrary y-axis offset. -\begin_inset CommandInset label -LatexCommand label -name "cap:Standard-noise-shaping" - -\end_inset - - -\end_layout - -\end_inset - - -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Section -Analysis-by-Synthesis -\end_layout - -\begin_layout Standard -One of the main principles behind CELP is called Analysis-by-Synthesis (AbS), - meaning that the encoding (analysis) is performed by perceptually optimising - the decoded (synthesis) signal in a closed loop. - In theory, the best CELP stream would be produced by trying all possible - bit combinations and selecting the one that produces the best-sounding - decoded signal. - This is obviously not possible in practice for two reasons: the required - complexity is beyond any currently available hardware and the -\begin_inset Quotes eld -\end_inset - -best sounding -\begin_inset Quotes erd -\end_inset - - selection criterion implies a human listener. - -\end_layout - -\begin_layout Standard -In order to achieve real-time encoding using limited computing resources, - the CELP optimisation is broken down into smaller, more manageable, sequential - searches using the perceptual weighting function described earlier. -\end_layout - -\begin_layout Standard -\begin_inset Newpage newpage -\end_inset - - -\end_layout - -\begin_layout Chapter -The Speex Decoder Specification -\end_layout - -\begin_layout Section -Narrowband decoder -\end_layout - -\begin_layout Standard - -\end_layout - -\begin_layout Subsection -Narrowband modes -\end_layout - -\begin_layout Standard -There are 7 different narrowband bit-rates defined for Speex, ranging from - 250 bps to 24.6 kbps, although the modes below 5.9 kbps should not be used - for speech. - The bit-allocation for each mode is detailed in table -\begin_inset CommandInset ref -LatexCommand ref -reference "cap:bits-narrowband" - -\end_inset - -. - Each frame starts with the mode ID encoded with 4 bits which allows a range - from 0 to 15, though only the first 7 values are used (the others are reserved). - The parameters are listed in the table in the order they are packed in - the bit-stream. - All frame-based parameters are packed before sub-frame parameters. - The parameters for a certain sub-frame are all packed before the following - sub-frame is packed. - The -\begin_inset Quotes eld -\end_inset - -OL -\begin_inset Quotes erd -\end_inset - - in the parameter description means that the parameter is an open loop estimatio -n based on the whole frame. -\end_layout - -\begin_layout Standard -\begin_inset Float table -placement h -wide true -sideways false -status open - -\begin_layout Plain Layout -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -begin{center} -\end_layout - -\end_inset - - -\begin_inset Tabular - - - - - - - - - - - - - - - -\begin_inset Text - -\begin_layout Plain Layout -Parameter -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -Update rate -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -0 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -1 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -2 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -3 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -4 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -5 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -6 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -7 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -8 -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -Wideband bit -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -frame -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -1 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -1 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -1 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -1 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -1 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -1 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -1 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -1 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -1 -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -Mode ID -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -frame -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -4 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -4 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -4 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -4 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -4 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -4 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -4 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -4 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -4 -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -LSP -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -frame -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -0 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -18 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -18 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -18 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -18 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -30 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -30 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -30 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -18 -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -OL pitch -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -frame -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -0 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -7 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -7 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -0 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -0 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -0 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -0 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -0 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -7 -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -OL pitch gain -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -frame -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -0 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -4 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -0 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -0 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -0 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -0 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -0 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -0 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -4 -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -OL Exc gain -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -frame -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -0 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -5 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -5 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -5 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -5 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -5 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -5 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -5 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -5 -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -Fine pitch -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -sub-frame -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -0 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -0 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -0 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -7 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -7 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -7 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -7 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -7 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -0 -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -Pitch gain -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -sub-frame -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -0 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -0 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -5 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -5 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -5 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -7 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -7 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -7 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -0 -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -Innovation gain -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -sub-frame -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -0 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -1 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -0 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -1 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -1 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -3 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -3 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -3 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -0 -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -Innovation VQ -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -sub-frame -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -0 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -0 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -16 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -20 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -35 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -48 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -64 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -96 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -10 -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -Total -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -frame -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -5 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -43 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -119 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -160 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -220 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -300 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -364 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -492 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -79 -\end_layout - -\end_inset - - - - -\end_inset - - -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -end{center} -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Plain Layout -\begin_inset Caption - -\begin_layout Plain Layout -Bit allocation for narrowband modes -\begin_inset CommandInset label -LatexCommand label -name "cap:bits-narrowband" - -\end_inset - - -\end_layout - -\end_inset - - -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Subsection -LSP decoding -\end_layout - -\begin_layout Standard -Depending on the mode, LSP parameters are encoded using either 18 bits or - 30 bits. -\end_layout - -\begin_layout Standard -Interpolation -\end_layout - -\begin_layout Standard -Safe margin -\end_layout - -\begin_layout Subsection -Adaptive codebook -\end_layout - -\begin_layout Standard -For rates of 8 kbit/s and above, the pitch period is encoded for each subframe. - The real period is -\begin_inset Formula $T=p_{i}+17$ -\end_inset - - where -\begin_inset Formula $p_{i}$ -\end_inset - - is a value encoded with 7 bits and 17 corresponds to the minimum pitch. - The maximum period is 144. - At 5.95 kbit/s (mode 2), the pitch period is similarly encoded, but only - once for the frame. - Each sub-frame then has a 2-bit offset that is added to the pitch value - of the frame. - In that case, the pitch for each sub-frame is equal to -\begin_inset Formula $T-1+offset$ -\end_inset - -. - For rates below 5.95 kbit/s, only the per-frame pitch is used and the pitch - is constant for all sub-frames. -\end_layout - -\begin_layout Standard -Speex uses a 3-tap predictor for rates of 5.95 kbit/s and above. - The three gain values are obtained from a 5-bit or a 7-bit codebook, depending - on the mode. - -\end_layout - -\begin_layout Subsection -Innovation codebook -\end_layout - -\begin_layout Standard -Split codebook, size and entries depend on bit-rate -\end_layout - -\begin_layout Standard -a 5-bit gain is encoder on a per-frame basis -\end_layout - -\begin_layout Standard -Depending on the mode, higher resolution per sub-frame -\end_layout - -\begin_layout Standard -innovation sub-vectors concatenated, gain applied -\end_layout - -\begin_layout Subsection -Perceptual enhancement -\end_layout - -\begin_layout Standard -Optional, implementation-defined. - -\end_layout - -\begin_layout Subsection -Bit-stream definition -\end_layout - -\begin_layout Standard -This section defines the bit-stream that is transmitted on the wire. - One speex packet consist of 1 frame header and 4 sub-frames: -\end_layout - -\begin_layout Standard -\begin_inset Tabular - - - - - - - - - -\begin_inset Text - -\begin_layout Plain Layout -Frame Header -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -Subframe 1 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -Subframe2 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -Subframe 3 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -Subframe 4 -\end_layout - -\end_inset - - - - -\end_inset - - -\end_layout - -\begin_layout Standard -The frame header is variable length, depending on decoding mode and submode. - The narrowband frame header is defined as follows: -\end_layout - -\begin_layout Standard -\begin_inset Tabular - - - - - - - - - - -\begin_inset Text - -\begin_layout Plain Layout -wb bit -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -modeid -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -LSP -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -OL-pitch -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -OL-pitchgain -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -OL ExcGain -\end_layout - -\end_inset - - - - -\end_inset - - -\end_layout - -\begin_layout Standard -wb-bit: Wideband bit (1 bit) 0=narrowband, 1=wideband -\end_layout - -\begin_layout Standard -modeid: Mode identifier (4 bits) -\end_layout - -\begin_layout Standard -LSP: Line Spectral Pairs (0, 18 or 30 bits) -\end_layout - -\begin_layout Standard -OL-pitch: Open Loop Pitch (0 or 7 bits) -\end_layout - -\begin_layout Standard -OL-pitchgain: Open Loop Pitch Gain (0 or 4 bits) -\end_layout - -\begin_layout Standard -OL-ExcGain: Open Loop Excitation Gain (0 or 5 bits) -\end_layout - -\begin_layout Standard -... -\end_layout - -\begin_layout Standard -Each subframe is defined as follows: -\end_layout - -\begin_layout Standard -\begin_inset Tabular - - - - - - - - -\begin_inset Text - -\begin_layout Plain Layout -FinePitch -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -PitchGain -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -InnovationGain -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -Innovation VQ -\end_layout - -\end_inset - - - - -\end_inset - - -\end_layout - -\begin_layout Standard -FinePitch: (0 or 7 bits) -\end_layout - -\begin_layout Standard -PitchGain: (0, 5, or 7 bits) -\end_layout - -\begin_layout Standard -Innovation Gain: (0, 1, 3 bits) -\end_layout - -\begin_layout Standard -Innovation VQ: (0-96 bits) -\end_layout - -\begin_layout Standard -... -\end_layout - -\begin_layout Subsection -Sample decoder -\end_layout - -\begin_layout Standard -This section contains some sample source code, showing how a basic Speex - decoder can be implemented. - The sample decoder is narrowband submode 3 only, and with no advanced features - like enhancement, vbr etc. -\end_layout - -\begin_layout Standard -... -\end_layout - -\begin_layout Subsection -Lookup tables -\end_layout - -\begin_layout Standard -The Speex decoder includes a set of lookup tables and codebooks, which are - used to convert between values of different domains. - This includes: -\end_layout - -\begin_layout Standard -- Excitation 10x16 (3200 bps) -\end_layout - -\begin_layout Standard -- Excitation 10x32 (4000 bps) -\end_layout - -\begin_layout Standard -- Excitation 20x32 (2000 bps) -\end_layout - -\begin_layout Standard -- Excitation 5x256 (12800 bps) -\end_layout - -\begin_layout Standard -- Excitation 5x64 (9600 bps) -\end_layout - -\begin_layout Standard -- Excitation 8x128 (7000 bps) -\end_layout - -\begin_layout Standard -- Codebook for 3-tap pitch prediction gain (Normal and Low Bitrate) -\end_layout - -\begin_layout Standard -- Codebook for LSPs in narrowband CELP mode -\end_layout - -\begin_layout Standard -... -\end_layout - -\begin_layout Standard -The exact lookup tables are included here for reference. -\end_layout - -\begin_layout Section -Wideband embedded decoder -\end_layout - -\begin_layout Standard -QMF filter. - Narrowband signal decoded using narrowband decoder -\end_layout - -\begin_layout Standard -For the high band, the decoder is similar to the narrowband decoder, with - the main difference being that there is no adaptive codebook. -\end_layout - -\begin_layout Standard -Gain is per-subframe -\end_layout - -\begin_layout Chapter -Speex narrowband mode -\begin_inset CommandInset label -LatexCommand label -name "sec:Speex-narrowband-mode" - -\end_inset - - -\begin_inset Index -status collapsed - -\begin_layout Plain Layout -narrowband -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -This section looks at how Speex works for narrowband ( -\begin_inset Formula $8\:\mathrm{kHz}$ -\end_inset - - sampling rate) operation. - The frame size for this mode is -\begin_inset Formula $20\:\mathrm{ms}$ -\end_inset - -, corresponding to 160 samples. - Each frame is also subdivided into 4 sub-frames of 40 samples each. -\end_layout - -\begin_layout Standard -Also many design decisions were based on the original goals and assumptions: -\end_layout - -\begin_layout Itemize -Minimizing the amount of information extracted from past frames (for robustness - to packet loss) -\end_layout - -\begin_layout Itemize -Dynamically-selectable codebooks (LSP, pitch and innovation) -\end_layout - -\begin_layout Itemize -sub-vector fixed (innovation) codebooks -\end_layout - -\begin_layout Section -Whole-Frame Analysis -\begin_inset Index -status collapsed - -\begin_layout Plain Layout -linear prediction -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -In narrowband, Speex frames are 20 ms long (160 samples) and are subdivided - in 4 sub-frames of 5 ms each (40 samples). - For most narrowband bit-rates (8 kbps and above), the only parameters encoded - at the frame level are the Line Spectral Pairs (LSP) and a global excitation - gain -\begin_inset Formula $g_{frame}$ -\end_inset - -, as shown in Fig. - -\begin_inset CommandInset ref -LatexCommand ref -reference "cap:Frame-open-loop-analysis" - -\end_inset - -. - All other parameters are encoded at the sub-frame level. -\end_layout - -\begin_layout Standard -Linear prediction analysis is performed once per frame using an asymmetric - Hamming window centered on the fourth sub-frame. - Because linear prediction coefficients (LPC) are not robust to quantization, - they are first converted to line spectral pairs (LSP) -\begin_inset Index -status collapsed - -\begin_layout Plain Layout -line spectral pair -\end_layout - -\end_inset - -. - The LSP's are considered to be associated to the -\begin_inset Formula $4^{th}$ -\end_inset - - sub-frames and the LSP's associated to the first 3 sub-frames are linearly - interpolated using the current and previous LSP coefficients. - The LSP coefficients and converted back to the LPC filter -\begin_inset Formula $\hat{A}(z)$ -\end_inset - -. - The non-quantized interpolated filter is denoted -\begin_inset Formula $A(z)$ -\end_inset - - and can be used for the weighting filter -\begin_inset Formula $W(z)$ -\end_inset - - because it does not need to be available to the decoder. - -\end_layout - -\begin_layout Standard -To make Speex more robust to packet loss, no prediction is applied on the - LSP coefficients prior to quantization. - The LSPs are encoded using vector quantization (VQ) with 30 bits for higher - quality modes and 18 bits for lower quality. -\end_layout - -\begin_layout Standard -\begin_inset Float figure -wide false -sideways false -status open - -\begin_layout Plain Layout -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -begin{center} -\end_layout - -\end_inset - - -\begin_inset Graphics - filename speex_analysis.eps - width 35page% - -\end_inset - - -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -end{center} -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Plain Layout -\begin_inset Caption - -\begin_layout Plain Layout -Frame open-loop analysis -\begin_inset CommandInset label -LatexCommand label -name "cap:Frame-open-loop-analysis" - -\end_inset - - -\end_layout - -\end_inset - - -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Section -Sub-Frame Analysis-by-Synthesis -\end_layout - -\begin_layout Standard -\begin_inset Float figure -wide false -sideways false -status open - -\begin_layout Plain Layout -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -begin{center} -\end_layout - -\end_inset - - -\begin_inset Graphics - filename speex_abs.eps - lyxscale 75 - width 40page% - -\end_inset - - -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -end{center} -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Plain Layout -\begin_inset Caption - -\begin_layout Plain Layout -Analysis-by-synthesis closed-loop optimization on a sub-frame. -\begin_inset CommandInset label -LatexCommand label -name "cap:Sub-frame-AbS" - -\end_inset - - -\end_layout - -\end_inset - - -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -The analysis-by-synthesis (AbS) encoder loop is described in Fig. - -\begin_inset CommandInset ref -LatexCommand ref -reference "cap:Sub-frame-AbS" - -\end_inset - -. - There are three main aspects where Speex significantly differs from most - other CELP codecs. - First, while most recent CELP codecs make use of fractional pitch estimation - with a single gain, Speex uses an integer to encode the pitch period, but - uses a 3-tap predictor (3 gains). - The adaptive codebook contribution -\begin_inset Formula $e_{a}[n]$ -\end_inset - - can thus be expressed as: -\begin_inset Formula \begin{equation} -e_{a}[n]=g_{0}e[n-T-1]+g_{1}e[n-T]+g_{2}e[n-T+1]\label{eq:adaptive-3tap}\end{equation} - -\end_inset - -where -\begin_inset Formula $g_{0}$ -\end_inset - -, -\begin_inset Formula $g_{1}$ -\end_inset - - and -\begin_inset Formula $g_{2}$ -\end_inset - - are the jointly quantized pitch gains and -\begin_inset Formula $e[n]$ -\end_inset - - is the codec excitation memory. - It is worth noting that when the pitch is smaller than the sub-frame size, - we repeat the excitation at a period -\begin_inset Formula $T$ -\end_inset - -. - For example, when -\begin_inset Formula $n-T+1\geq0$ -\end_inset - -, we use -\begin_inset Formula $n-2T+1$ -\end_inset - - instead. - In most modes, the pitch period is encoded with 7 bits in the -\begin_inset Formula $\left[17,144\right]$ -\end_inset - - range and the -\begin_inset Formula $\beta_{i}$ -\end_inset - - coefficients are vector-quantized using 7 bits at higher bit-rates (15 - kbps narrowband and above) and 5 bits at lower bit-rates (11 kbps narrowband - and below). -\end_layout - -\begin_layout Standard -Many current CELP codecs use moving average (MA) prediction to encode the - fixed codebook gain. - This provides slightly better coding at the expense of introducing a dependency - on previously encoded frames. - A second difference is that Speex encodes the fixed codebook gain as the - product of the global excitation gain -\begin_inset Formula $g_{frame}$ -\end_inset - - with a sub-frame gain corrections -\begin_inset Formula $g_{subf}$ -\end_inset - -. - This increases robustness to packet loss by eliminating the inter-frame - dependency. - The sub-frame gain correction is encoded before the fixed codebook is searched - (not closed-loop optimized) and uses between 0 and 3 bits per sub-frame, - depending on the bit-rate. -\end_layout - -\begin_layout Standard -The third difference is that Speex uses sub-vector quantization of the innovatio -n (fixed codebook) signal instead of an algebraic codebook. - Each sub-frame is divided into sub-vectors of lengths ranging between 5 - and 20 samples. - Each sub-vector is chosen from a bitrate-dependent codebook and all sub-vectors - are concatenated to form a sub-frame. - As an example, the 3.95 kbps mode uses a sub-vector size of 20 samples with - 32 entries in the codebook (5 bits). - This means that the innovation is encoded with 10 bits per sub-frame, or - 2000 bps. - On the other hand, the 18.2 kbps mode uses a sub-vector size of 5 samples - with 256 entries in the codebook (8 bits), so the innovation uses 64 bits - per sub-frame, or 12800 bps. - -\end_layout - -\begin_layout Section -Bit-rates -\end_layout - -\begin_layout Standard -So far, no MOS (Mean Opinion Score -\begin_inset Index -status collapsed - -\begin_layout Plain Layout -mean opinion score -\end_layout - -\end_inset - -) subjective evaluation has been performed for Speex. - In order to give an idea of the quality achievable with it, table -\begin_inset CommandInset ref -LatexCommand ref -reference "cap:quality_vs_bps" - -\end_inset - - presents my own subjective opinion on it. - It should be noted that different people will perceive the quality differently - and that the person that designed the codec often has a bias (one way or - another) when it comes to subjective evaluation. - Last thing, it should be noted that for most codecs (including Speex) encoding - quality sometimes varies depending on the input. - Note that the complexity is only approximate (within 0.5 mflops and using - the lowest complexity setting). - Decoding requires approximately 0.5 mflops -\begin_inset Index -status collapsed - -\begin_layout Plain Layout -complexity -\end_layout - -\end_inset - - in most modes (1 mflops with perceptual enhancement). -\end_layout - -\begin_layout Standard -\begin_inset Float table -placement h -wide true -sideways false -status open - -\begin_layout Plain Layout -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -begin{center} -\end_layout - -\end_inset - - -\begin_inset Tabular - - - - - - - - - -\begin_inset Text - -\begin_layout Plain Layout -Mode -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -Quality -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -Bit-rate -\begin_inset Index -status collapsed - -\begin_layout Plain Layout -bit-rate -\end_layout - -\end_inset - - (bps) -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -mflops -\begin_inset Index -status collapsed - -\begin_layout Plain Layout -complexity -\end_layout - -\end_inset - - -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -Quality/description -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -0 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -- -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -250 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -0 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -No transmission (DTX) -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -1 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -0 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -2,150 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -6 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -Vocoder (mostly for comfort noise) -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -2 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -2 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -5,950 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -9 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -Very noticeable artifacts/noise, good intelligibility -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -3 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -3-4 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -8,000 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -10 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -Artifacts/noise sometimes noticeable -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -4 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -5-6 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -11,000 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -14 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -Artifacts usually noticeable only with headphones -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -5 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -7-8 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -15,000 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -11 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -Need good headphones to tell the difference -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -6 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -9 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -18,200 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -17.5 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -Hard to tell the difference even with good headphones -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -7 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -10 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -24,600 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -14.5 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -Completely transparent for voice, good quality music -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -8 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -1 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -3,950 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -10.5 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -Very noticeable artifacts/noise, good intelligibility -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -9 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -- -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -- -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -- -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -reserved -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -10 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -- -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -- -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -- -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -reserved -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -11 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -- -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -- -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -- -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -reserved -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -12 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -- -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -- -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -- -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -reserved -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -13 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -- -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -- -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -- -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -Application-defined, interpreted by callback or skipped -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -14 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -- -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -- -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -- -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -Speex in-band signaling -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -15 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -- -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -- -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -- -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -Terminator code -\end_layout - -\end_inset - - - - -\end_inset - - -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -end{center} -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Plain Layout -\begin_inset Caption - -\begin_layout Plain Layout -Quality versus bit-rate -\begin_inset CommandInset label -LatexCommand label -name "cap:quality_vs_bps" - -\end_inset - - -\end_layout - -\end_inset - - -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Section -Perceptual enhancement -\begin_inset Index -status collapsed - -\begin_layout Plain Layout -perceptual enhancement -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard - -\series bold -This section was only valid for version 1.1.12 and earlier. - It does not apply to version 1.2-beta1 (and later), for which the new perceptual - enhancement is not yet documented. -\end_layout - -\begin_layout Standard -This part of the codec only applies to the decoder and can even be changed - without affecting inter-operability. - For that reason, the implementation provided and described here should - only be considered as a reference implementation. - The enhancement system is divided into two parts. - First, the synthesis filter -\begin_inset Formula $S(z)=1/A(z)$ -\end_inset - - is replaced by an enhanced filter: -\begin_inset Formula \[ -S'(z)=\frac{A\left(z/a_{2}\right)A\left(z/a_{3}\right)}{A\left(z\right)A\left(z/a_{1}\right)}\] - -\end_inset - -where -\begin_inset Formula $a_{1}$ -\end_inset - - and -\begin_inset Formula $a_{2}$ -\end_inset - - depend on the mode in use and -\begin_inset Formula $a_{3}=\frac{1}{r}\left(1-\frac{1-ra_{1}}{1-ra_{2}}\right)$ -\end_inset - - with -\begin_inset Formula $r=.9$ -\end_inset - -. - The second part of the enhancement consists of using a comb filter to enhance - the pitch in the excitation domain. - -\end_layout - -\begin_layout Standard -\begin_inset Newpage newpage -\end_inset - - -\end_layout - -\begin_layout Chapter -Speex wideband mode (sub-band CELP) -\begin_inset Index -status collapsed - -\begin_layout Plain Layout -wideband -\end_layout - -\end_inset - - -\begin_inset CommandInset label -LatexCommand label -name "sec:Speex-wideband-mode" - -\end_inset - - -\end_layout - -\begin_layout Standard -For wideband, the Speex approach uses a -\emph on -q -\emph default -uadrature -\emph on -m -\emph default -irror -\emph on -f -\emph default -ilter -\begin_inset Index -status collapsed - -\begin_layout Plain Layout -quadrature mirror filter -\end_layout - -\end_inset - - (QMF) to split the band in two. - The 16 kHz signal is thus divided into two 8 kHz signals, one representing - the low band (0-4 kHz), the other the high band (4-8 kHz). - The low band is encoded with the narrowband mode described in section -\begin_inset CommandInset ref -LatexCommand ref -reference "sec:Speex-narrowband-mode" - -\end_inset - - in such a way that the resulting -\begin_inset Quotes eld -\end_inset - -embedded narrowband bit-stream -\begin_inset Quotes erd -\end_inset - - can also be decoded with the narrowband decoder. - Since the low band encoding has already been described, only the high band - encoding is described in this section. -\end_layout - -\begin_layout Section -Linear Prediction -\end_layout - -\begin_layout Standard -The linear prediction part used for the high-band is very similar to what - is done for narrowband. - The only difference is that we use only 12 bits to encode the high-band - LSP's using a multi-stage vector quantizer (MSVQ). - The first level quantizes the 10 coefficients with 6 bits and the error - is then quantized using 6 bits, too. -\end_layout - -\begin_layout Section -Pitch Prediction -\end_layout - -\begin_layout Standard -That part is easy: there's no pitch prediction for the high-band. - There are two reasons for that. - First, there is usually little harmonic structure in this band (above 4 - kHz). - Second, it would be very hard to implement since the QMF folds the 4-8 - kHz band into 4-0 kHz (reversing the frequency axis), which means that - the location of the harmonics is no longer at multiples of the fundamental - (pitch). -\end_layout - -\begin_layout Section -Excitation Quantization -\end_layout - -\begin_layout Standard -The high-band excitation is coded in the same way as for narrowband. - -\end_layout - -\begin_layout Section -Bit allocation -\end_layout - -\begin_layout Standard -For the wideband mode, the entire narrowband frame is packed before the - high-band is encoded. - The narrowband part of the bit-stream is as defined in table -\begin_inset CommandInset ref -LatexCommand ref -reference "cap:bits-narrowband" - -\end_inset - -. - The high-band follows, as described in table -\begin_inset CommandInset ref -LatexCommand ref -reference "cap:bits-wideband" - -\end_inset - -. - For wideband, the mode ID is the same as the Speex quality setting and - is defined in table -\begin_inset CommandInset ref -LatexCommand ref -reference "tab:wideband-quality" - -\end_inset - -. - This also means that a wideband frame may be correctly decoded by a narrowband - decoder with the only caveat that if more than one frame is packed in the - same packet, the decoder will need to skip the high-band parts in order - to sync with the bit-stream. -\end_layout - -\begin_layout Standard -\begin_inset Float table -placement h -wide true -sideways false -status open - -\begin_layout Plain Layout -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -begin{center} -\end_layout - -\end_inset - - -\begin_inset Tabular - - - - - - - - - - - -\begin_inset Text - -\begin_layout Plain Layout -Parameter -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -Update rate -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -0 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -1 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -2 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -3 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -4 -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -Wideband bit -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -frame -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -1 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -1 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -1 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -1 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -1 -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -Mode ID -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -frame -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -3 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -3 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -3 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -3 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -3 -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -LSP -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -frame -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -0 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -12 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -12 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -12 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -12 -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -Excitation gain -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -sub-frame -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -0 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -5 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -4 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -4 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -4 -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -Excitation VQ -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -sub-frame -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -0 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -0 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -20 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -40 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -80 -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -Total -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -frame -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -4 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -36 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -112 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -192 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -352 -\end_layout - -\end_inset - - - - -\end_inset - - -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -end{center} -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Plain Layout -\begin_inset Caption - -\begin_layout Plain Layout -Bit allocation for high-band in wideband mode -\begin_inset CommandInset label -LatexCommand label -name "cap:bits-wideband" - -\end_inset - - -\end_layout - -\end_inset - - -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -\begin_inset Float table -placement h -wide true -sideways false -status open - -\begin_layout Plain Layout -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -begin{center} -\end_layout - -\end_inset - - -\begin_inset Tabular - - - - - - - -\begin_inset Text - -\begin_layout Plain Layout -Mode/Quality -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -Bit-rate -\begin_inset Index -status collapsed - -\begin_layout Plain Layout -bit-rate -\end_layout - -\end_inset - - (bps) -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -Quality/description -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -0 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -3,950 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -Barely intelligible (mostly for comfort noise) -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -1 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -5,750 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -Very noticeable artifacts/noise, poor intelligibility -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -2 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -7,750 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -Very noticeable artifacts/noise, good intelligibility -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -3 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -9,800 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -Artifacts/noise sometimes annoying -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -4 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -12,800 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -Artifacts/noise usually noticeable -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -5 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -16,800 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -Artifacts/noise sometimes noticeable -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -6 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -20,600 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -Need good headphones to tell the difference -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -7 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -23,800 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -Need good headphones to tell the difference -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -8 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -27,800 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -Hard to tell the difference even with good headphones -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -9 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -34,200 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -Hard to tell the difference even with good headphones -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -10 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -42,200 -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -Completely transparent for voice, good quality music -\end_layout - -\end_inset - - - - -\end_inset - - -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -end{center} -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Plain Layout -\begin_inset Caption - -\begin_layout Plain Layout -Quality versus bit-rate for the wideband encoder -\begin_inset CommandInset label -LatexCommand label -name "tab:wideband-quality" - -\end_inset - - -\end_layout - -\end_inset - - -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -\begin_inset ERT -status open - -\begin_layout Plain Layout - - -\backslash -clearpage -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -clearpage -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Chapter -\start_of_appendix -Sample code -\begin_inset CommandInset label -LatexCommand label -name "sec:Sample-code" - -\end_inset - - -\end_layout - -\begin_layout Standard -This section shows sample code for encoding and decoding speech using the - Speex API. - The commands can be used to encode and decode a file by calling: -\family typewriter - -\begin_inset Newline newline -\end_inset - -% sampleenc in_file.sw | sampledec out_file.sw -\family default - -\begin_inset Newline newline -\end_inset - -where both files are raw (no header) files encoded at 16 bits per sample - (in the machine natural endianness). -\end_layout - -\begin_layout Section -sampleenc.c -\end_layout - -\begin_layout Standard -sampleenc takes a raw 16 bits/sample file, encodes it and outputs a Speex - stream to stdout. - Note that the packing used is -\series bold -not -\series default - compatible with that of speexenc/speexdec. -\end_layout - -\begin_layout Standard -\begin_inset CommandInset include -LatexCommand lstinputlisting -filename "sampleenc.c" -lstparams "caption={Source code for sampleenc},label={sampleenc-source-code},numbers=left,numberstyle={\\footnotesize}" - -\end_inset - - -\end_layout - -\begin_layout Section -sampledec.c -\end_layout - -\begin_layout Standard -sampledec reads a Speex stream from stdin, decodes it and outputs it to - a raw 16 bits/sample file. - Note that the packing used is -\series bold -not -\series default - compatible with that of speexenc/speexdec. -\end_layout - -\begin_layout Standard -\begin_inset CommandInset include -LatexCommand lstinputlisting -filename "sampledec.c" -lstparams "caption={Source code for sampledec},label={sampledec-source-code},numbers=left,numberstyle={\\footnotesize}" - -\end_inset - - -\end_layout - -\begin_layout Standard -\begin_inset Newpage newpage -\end_inset - - -\end_layout - -\begin_layout Chapter -Jitter Buffer for Speex -\end_layout - -\begin_layout Standard -\begin_inset CommandInset include -LatexCommand lstinputlisting -filename "../speexclient/speex_jitter_buffer.c" -lstparams "caption={Example of using the jitter buffer for Speex packets},label={example-speex-jitter},numbers=left,numberstyle={\\footnotesize}" - -\end_inset - - -\end_layout - -\begin_layout Standard -\begin_inset Newpage newpage -\end_inset - - -\end_layout - -\begin_layout Chapter -IETF RTP Profile -\begin_inset CommandInset label -LatexCommand label -name "sec:IETF-draft" - -\end_inset - - -\end_layout - -\begin_layout Standard -\begin_inset CommandInset include -LatexCommand verbatiminput -filename "draft-ietf-avt-rtp-speex-05-tmp.txt" - -\end_inset - - -\end_layout - -\begin_layout Standard -\begin_inset Newpage newpage -\end_inset - - -\end_layout - -\begin_layout Chapter -Speex License -\begin_inset CommandInset label -LatexCommand label -name "sec:Speex-License" - -\end_inset - - -\end_layout - -\begin_layout Standard -\begin_inset CommandInset include -LatexCommand verbatiminput -filename "../COPYING" - -\end_inset - - -\end_layout - -\begin_layout Standard -\begin_inset Newpage newpage -\end_inset - - -\end_layout - -\begin_layout Chapter -GNU Free Documentation License -\end_layout - -\begin_layout Standard -Version 1.1, March 2000 -\end_layout - -\begin_layout Standard -Copyright (C) 2000 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Everyone is permitted - to copy and distribute verbatim copies of this license document, but changing - it is not allowed. - -\end_layout - -\begin_layout Section* -0. - PREAMBLE -\end_layout - -\begin_layout Standard -The purpose of this License is to make a manual, textbook, or other written - document "free" in the sense of freedom: to assure everyone the effective - freedom to copy and redistribute it, with or without modifying it, either - commercially or noncommercially. - Secondarily, this License preserves for the author and publisher a way - to get credit for their work, while not being considered responsible for - modifications made by others. -\end_layout - -\begin_layout Standard -This License is a kind of "copyleft", which means that derivative works - of the document must themselves be free in the same sense. - It complements the GNU General Public License, which is a copyleft license - designed for free software. -\end_layout - -\begin_layout Standard -We have designed this License in order to use it for manuals for free software, - because free software needs free documentation: a free program should come - with manuals providing the same freedoms that the software does. - But this License is not limited to software manuals; it can be used for - any textual work, regardless of subject matter or whether it is published - as a printed book. - We recommend this License principally for works whose purpose is instruction - or reference. - -\end_layout - -\begin_layout Section* -1. - APPLICABILITY AND DEFINITIONS -\end_layout - -\begin_layout Standard -This License applies to any manual or other work that contains a notice - placed by the copyright holder saying it can be distributed under the terms - of this License. - The "Document", below, refers to any such manual or work. - Any member of the public is a licensee, and is addressed as "you". -\end_layout - -\begin_layout Standard -A "Modified Version" of the Document means any work containing the Document - or a portion of it, either copied verbatim, or with modifications and/or - translated into another language. -\end_layout - -\begin_layout Standard -A "Secondary Section" is a named appendix or a front-matter section of the - Document that deals exclusively with the relationship of the publishers - or authors of the Document to the Document's overall subject (or to related - matters) and contains nothing that could fall directly within that overall - subject. - (For example, if the Document is in part a textbook of mathematics, a Secondary - Section may not explain any mathematics.) The relationship could be a matter - of historical connection with the subject or with related matters, or of - legal, commercial, philosophical, ethical or political position regarding - them. -\end_layout - -\begin_layout Standard -The "Invariant Sections" are certain Secondary Sections whose titles are - designated, as being those of Invariant Sections, in the notice that says - that the Document is released under this License. -\end_layout - -\begin_layout Standard -The "Cover Texts" are certain short passages of text that are listed, as - Front-Cover Texts or Back-Cover Texts, in the notice that says that the - Document is released under this License. -\end_layout - -\begin_layout Standard -A "Transparent" copy of the Document means a machine-readable copy, represented - in a format whose specification is available to the general public, whose - contents can be viewed and edited directly and straightforwardly with generic - text editors or (for images composed of pixels) generic paint programs - or (for drawings) some widely available drawing editor, and that is suitable - for input to text formatters or for automatic translation to a variety - of formats suitable for input to text formatters. - A copy made in an otherwise Transparent file format whose markup has been - designed to thwart or discourage subsequent modification by readers is - not Transparent. - A copy that is not "Transparent" is called "Opaque". -\end_layout - -\begin_layout Standard -Examples of suitable formats for Transparent copies include plain ASCII - without markup, Texinfo input format, LaTeX input format, SGML or XML using - a publicly available DTD, and standard-conforming simple HTML designed - for human modification. - Opaque formats include PostScript, PDF, proprietary formats that can be - read and edited only by proprietary word processors, SGML or XML for which - the DTD and/or processing tools are not generally available, and the machine-ge -nerated HTML produced by some word processors for output purposes only. -\end_layout - -\begin_layout Standard -The "Title Page" means, for a printed book, the title page itself, plus - such following pages as are needed to hold, legibly, the material this - License requires to appear in the title page. - For works in formats which do not have any title page as such, "Title Page" - means the text near the most prominent appearance of the work's title, - preceding the beginning of the body of the text. -\end_layout - -\begin_layout Section* -2. - VERBATIM COPYING -\end_layout - -\begin_layout Standard -You may copy and distribute the Document in any medium, either commercially - or noncommercially, provided that this License, the copyright notices, - and the license notice saying this License applies to the Document are - reproduced in all copies, and that you add no other conditions whatsoever - to those of this License. - You may not use technical measures to obstruct or control the reading or - further copying of the copies you make or distribute. - However, you may accept compensation in exchange for copies. - If you distribute a large enough number of copies you must also follow - the conditions in section 3. -\end_layout - -\begin_layout Standard -You may also lend copies, under the same conditions stated above, and you - may publicly display copies. -\end_layout - -\begin_layout Section* -3. - COPYING IN QUANTITY -\end_layout - -\begin_layout Standard -If you publish printed copies of the Document numbering more than 100, and - the Document's license notice requires Cover Texts, you must enclose the - copies in covers that carry, clearly and legibly, all these Cover Texts: - Front-Cover Texts on the front cover, and Back-Cover Texts on the back - cover. - Both covers must also clearly and legibly identify you as the publisher - of these copies. - The front cover must present the full title with all words of the title - equally prominent and visible. - You may add other material on the covers in addition. - Copying with changes limited to the covers, as long as they preserve the - title of the Document and satisfy these conditions, can be treated as verbatim - copying in other respects. -\end_layout - -\begin_layout Standard -If the required texts for either cover are too voluminous to fit legibly, - you should put the first ones listed (as many as fit reasonably) on the - actual cover, and continue the rest onto adjacent pages. -\end_layout - -\begin_layout Standard -If you publish or distribute Opaque copies of the Document numbering more - than 100, you must either include a machine-readable Transparent copy along - with each Opaque copy, or state in or with each Opaque copy a publicly-accessib -le computer-network location containing a complete Transparent copy of the - Document, free of added material, which the general network-using public - has access to download anonymously at no charge using public-standard network - protocols. - If you use the latter option, you must take reasonably prudent steps, when - you begin distribution of Opaque copies in quantity, to ensure that this - Transparent copy will remain thus accessible at the stated location until - at least one year after the last time you distribute an Opaque copy (directly - or through your agents or retailers) of that edition to the public. -\end_layout - -\begin_layout Standard -It is requested, but not required, that you contact the authors of the Document - well before redistributing any large number of copies, to give them a chance - to provide you with an updated version of the Document. - -\end_layout - -\begin_layout Section* -4. - MODIFICATIONS -\end_layout - -\begin_layout Standard -You may copy and distribute a Modified Version of the Document under the - conditions of sections 2 and 3 above, provided that you release the Modified - Version under precisely this License, with the Modified Version filling - the role of the Document, thus licensing distribution and modification - of the Modified Version to whoever possesses a copy of it. - In addition, you must do these things in the Modified Version: -\end_layout - -\begin_layout Itemize -A. - Use in the Title Page (and on the covers, if any) a title distinct from - that of the Document, and from those of previous versions (which should, - if there were any, be listed in the History section of the Document). - You may use the same title as a previous version if the original publisher - of that version gives permission. -\end_layout - -\begin_layout Itemize -B. - List on the Title Page, as authors, one or more persons or entities responsible - for authorship of the modifications in the Modified Version, together with - at least five of the principal authors of the Document (all of its principal - authors, if it has less than five). -\end_layout - -\begin_layout Itemize -C. - State on the Title page the name of the publisher of the Modified Version, - as the publisher. -\end_layout - -\begin_layout Itemize -D. - Preserve all the copyright notices of the Document. -\end_layout - -\begin_layout Itemize -E. - Add an appropriate copyright notice for your modifications adjacent to - the other copyright notices. -\end_layout - -\begin_layout Itemize -F. - Include, immediately after the copyright notices, a license notice giving - the public permission to use the Modified Version under the terms of this - License, in the form shown in the Addendum below. -\end_layout - -\begin_layout Itemize -G. - Preserve in that license notice the full lists of Invariant Sections and - required Cover Texts given in the Document's license notice. -\end_layout - -\begin_layout Itemize -H. - Include an unaltered copy of this License. -\end_layout - -\begin_layout Itemize -I. - Preserve the section entitled "History", and its title, and add to it an - item stating at least the title, year, new authors, and publisher of the - Modified Version as given on the Title Page. - If there is no section entitled "History" in the Document, create one stating - the title, year, authors, and publisher of the Document as given on its - Title Page, then add an item describing the Modified Version as stated - in the previous sentence. -\end_layout - -\begin_layout Itemize -J. - Preserve the network location, if any, given in the Document for public - access to a Transparent copy of the Document, and likewise the network - locations given in the Document for previous versions it was based on. - These may be placed in the "History" section. - You may omit a network location for a work that was published at least - four years before the Document itself, or if the original publisher of - the version it refers to gives permission. -\end_layout - -\begin_layout Itemize -K. - In any section entitled "Acknowledgements" or "Dedications", preserve the - section's title, and preserve in the section all the substance and tone - of each of the contributor acknowledgements and/or dedications given therein. -\end_layout - -\begin_layout Itemize -L. - Preserve all the Invariant Sections of the Document, unaltered in their - text and in their titles. - Section numbers or the equivalent are not considered part of the section - titles. -\end_layout - -\begin_layout Itemize -M. - Delete any section entitled "Endorsements". - Such a section may not be included in the Modified Version. -\end_layout - -\begin_layout Itemize -N. - Do not retitle any existing section as "Endorsements" or to conflict in - title with any Invariant Section. - -\end_layout - -\begin_layout Standard -If the Modified Version includes new front-matter sections or appendices - that qualify as Secondary Sections and contain no material copied from - the Document, you may at your option designate some or all of these sections - as invariant. - To do this, add their titles to the list of Invariant Sections in the Modified - Version's license notice. - These titles must be distinct from any other section titles. -\end_layout - -\begin_layout Standard -You may add a section entitled "Endorsements", provided it contains nothing - but endorsements of your Modified Version by various parties--for example, - statements of peer review or that the text has been approved by an organization - as the authoritative definition of a standard. -\end_layout - -\begin_layout Standard -You may add a passage of up to five words as a Front-Cover Text, and a passage - of up to 25 words as a Back-Cover Text, to the end of the list of Cover - Texts in the Modified Version. - Only one passage of Front-Cover Text and one of Back-Cover Text may be - added by (or through arrangements made by) any one entity. - If the Document already includes a cover text for the same cover, previously - added by you or by arrangement made by the same entity you are acting on - behalf of, you may not add another; but you may replace the old one, on - explicit permission from the previous publisher that added the old one. -\end_layout - -\begin_layout Standard -The author(s) and publisher(s) of the Document do not by this License give - permission to use their names for publicity for or to assert or imply endorseme -nt of any Modified Version. - -\end_layout - -\begin_layout Section* -5. - COMBINING DOCUMENTS -\end_layout - -\begin_layout Standard -You may combine the Document with other documents released under this License, - under the terms defined in section 4 above for modified versions, provided - that you include in the combination all of the Invariant Sections of all - of the original documents, unmodified, and list them all as Invariant Sections - of your combined work in its license notice. -\end_layout - -\begin_layout Standard -The combined work need only contain one copy of this License, and multiple - identical Invariant Sections may be replaced with a single copy. - If there are multiple Invariant Sections with the same name but different - contents, make the title of each such section unique by adding at the end - of it, in parentheses, the name of the original author or publisher of - that section if known, or else a unique number. - Make the same adjustment to the section titles in the list of Invariant - Sections in the license notice of the combined work. -\end_layout - -\begin_layout Standard -In the combination, you must combine any sections entitled "History" in - the various original documents, forming one section entitled "History"; - likewise combine any sections entitled "Acknowledgements", and any sections - entitled "Dedications". - You must delete all sections entitled "Endorsements." -\end_layout - -\begin_layout Section* -6. - COLLECTIONS OF DOCUMENTS -\end_layout - -\begin_layout Standard -You may make a collection consisting of the Document and other documents - released under this License, and replace the individual copies of this - License in the various documents with a single copy that is included in - the collection, provided that you follow the rules of this License for - verbatim copying of each of the documents in all other respects. -\end_layout - -\begin_layout Standard -You may extract a single document from such a collection, and distribute - it individually under this License, provided you insert a copy of this - License into the extracted document, and follow this License in all other - respects regarding verbatim copying of that document. - -\end_layout - -\begin_layout Section* -7. - AGGREGATION WITH INDEPENDENT WORKS -\end_layout - -\begin_layout Standard -A compilation of the Document or its derivatives with other separate and - independent documents or works, in or on a volume of a storage or distribution - medium, does not as a whole count as a Modified Version of the Document, - provided no compilation copyright is claimed for the compilation. - Such a compilation is called an "aggregate", and this License does not - apply to the other self-contained works thus compiled with the Document, - on account of their being thus compiled, if they are not themselves derivative - works of the Document. -\end_layout - -\begin_layout Standard -If the Cover Text requirement of section 3 is applicable to these copies - of the Document, then if the Document is less than one quarter of the entire - aggregate, the Document's Cover Texts may be placed on covers that surround - only the Document within the aggregate. - Otherwise they must appear on covers around the whole aggregate. -\end_layout - -\begin_layout Section* -8. - TRANSLATION -\end_layout - -\begin_layout Standard -Translation is considered a kind of modification, so you may distribute - translations of the Document under the terms of section 4. - Replacing Invariant Sections with translations requires special permission - from their copyright holders, but you may include translations of some - or all Invariant Sections in addition to the original versions of these - Invariant Sections. - You may include a translation of this License provided that you also include - the original English version of this License. - In case of a disagreement between the translation and the original English - version of this License, the original English version will prevail. -\end_layout - -\begin_layout Section* -9. - TERMINATION -\end_layout - -\begin_layout Standard -You may not copy, modify, sublicense, or distribute the Document except - as expressly provided for under this License. - Any other attempt to copy, modify, sublicense or distribute the Document - is void, and will automatically terminate your rights under this License. - However, parties who have received copies, or rights, from you under this - License will not have their licenses terminated so long as such parties - remain in full compliance. - -\end_layout - -\begin_layout Section* -10. - FUTURE REVISIONS OF THIS LICENSE -\end_layout - -\begin_layout Standard -The Free Software Foundation may publish new, revised versions of the GNU - Free Documentation License from time to time. - Such new versions will be similar in spirit to the present version, but - may differ in detail to address new problems or concerns. - See http://www.gnu.org/copyleft/. -\end_layout - -\begin_layout Standard -Each version of the License is given a distinguishing version number. - If the Document specifies that a particular numbered version of this License - "or any later version" applies to it, you have the option of following - the terms and conditions either of that specified version or of any later - version that has been published (not as a draft) by the Free Software Foundatio -n. - If the Document does not specify a version number of this License, you - may choose any version ever published (not as a draft) by the Free Software - Foundation. -\end_layout - -\begin_layout Standard -\begin_inset CommandInset index_print -LatexCommand printindex - -\end_inset - - -\end_layout - -\end_body -\end_document diff --git a/speex/doc/manual.pdf b/speex/doc/manual.pdf deleted file mode 100644 index 292f304defd312957dbf95c66b3afc6316cfc255..0000000000000000000000000000000000000000 Binary files a/speex/doc/manual.pdf and /dev/null differ diff --git a/speex/doc/programming.html b/speex/doc/programming.html deleted file mode 100644 index 7b5bc7ae6fcc0a31a87f71aeb5a00c34daf8c957..0000000000000000000000000000000000000000 --- a/speex/doc/programming.html +++ /dev/null @@ -1,125 +0,0 @@ - - - - Speex Programming - - - - - -
-

Speex Programming

- -
-

Encoding

- In order to encode speech using Speex, you first need to:
- -
- 
#include <speex.h>
-
- You then need to declare a Speex bit-packing struct
- -
- 
SpeexBits bits;
-
- and a Speex encoder state
- -
- 
void *enc_state;
-
- The two are initialized by:
- -
- 
speex_bits_init(&bits);
- - 
enc_state = speex_encoder_init(&speex_nb_mode);
-
- For wideband coding, speex_nb_mode will be replaced by speex_wb_mode -. In most cases, you will need to know the frame size used by the mode you -are using. You can get that value in the frame_size variable with:
-
speex_encoder_ctl(enc_state, SPEEX_GET_FRAME_SIZE, &frame_size);
-
- For every input frame:
- -
- 
speex_bits_reset(&bits);
- - 
speex_encode(enc_state, input_frame, &bits);
- - 
nbBytes = speex_bits_write(&bits, byte_ptr, MAX_NB_BYTES);
-
- where input_frame is a (float *) pointing to the beginning -of a speech frame, byte_ptr is a (char *) where the encoded frame will -be written, MAX_NB_BYTES is the maximum number of bytes that can be -written to byte_ptr without causing an overflow and nbBytes - is the number of bytes actually written to byte_ptr (the encoded -size in bytes).
-
- After you're done with the encoding, free all resources with:
- -
- 
speex_bits_destroy(&bits);
- - 
speex_encoder_destroy(&enc_state);
-
- That's about it for the encoder.
- -

Decoding

- In order to encode speech using Speex, you first need to:
- -
- 
#include <speex.h>
-
- You then need to declare a Speex bit-packing struct
- -
- 
SpeexBits bits;
-
- and a Speex encoder state
- -
- 
void *dec_state;
-
- The two are initialized by:
- -
- 
speex_bits_init(&bits);
- - 
dec_state = speex_decoder_init(&speex_nb_mode);
-
- For wideband decoding, speex_nb_mode will be replaced by speex_wb_mode -. You can get that value in the frame_size variable with:
- -
speex_decoder_ctl(dec_state, SPEEX_GET_FRAME_SIZE, &frame_size);
-
- There is also a parameter that can be set for the decoder: whether or not -to use a perceptual post-filter. This can be set by:
-
speex_decoder_ctl(dec_state, SPEEX_SET_PF, &pf);
-
-where pf is an int that with value 0 to have the post-filter -disabled and 1 to have it enabled.
-
-For every input frame:
- -
- 
speex_bits_read_from(&bits, input_bytes, nbBytes);
- - 
speex_decode(st, &bits, output_frame, 0);
-
- where input_bytes is a (char *) containing the bit-stream -data received for a frame, nbBytes is the size (in bytes) of that -bit-stream, and output_frame is a (float *) and points to the -area where the decoded speech frame will be written. The last argument indicates -whether the frame we'd like to decode was lost. A value of 0 indicates the -normal case where bits points to the bit of the current frame. A value of -1 indicates that we don't have the bits for the current frame, in which case -the bits argument should be the same as the bits for the last correctly received -frame. When a frame is lost, the Speex decoder will do its best to "guess" -the sorrect signal.
-
-
-
- - - diff --git a/speex/doc/ref_shaping.eps b/speex/doc/ref_shaping.eps deleted file mode 100644 index 4ef7007f523909bd3ffc213d4828ee418e98b35c..0000000000000000000000000000000000000000 --- a/speex/doc/ref_shaping.eps +++ /dev/null @@ -1,2045 +0,0 @@ -%!PS-Adobe-2.0 EPSF-2.0 -%%Title: printout.eps -%%Creator: gnuplot 4.0 patchlevel 0 -%%CreationDate: Mon Mar 6 17:15:27 2006 -%%DocumentFonts: (atend) -%%BoundingBox: 50 50 410 302 -%%Orientation: Portrait -%%EndComments -/gnudict 256 dict def -gnudict begin -/Color true def -/Solid false def -/gnulinewidth 5.000 def -/userlinewidth gnulinewidth def -/vshift -46 def -/dl {10.0 mul} def -/hpt_ 31.5 def -/vpt_ 31.5 def -/hpt hpt_ def -/vpt vpt_ def -/Rounded false def -/M {moveto} bind def -/L {lineto} bind def -/R {rmoveto} bind def -/V {rlineto} bind def -/N {newpath moveto} bind def -/C {setrgbcolor} bind def -/f {rlineto fill} bind def -/vpt2 vpt 2 mul def -/hpt2 hpt 2 mul def -/Lshow { currentpoint stroke M - 0 vshift R show } def -/Rshow { currentpoint stroke M - dup stringwidth pop neg vshift R show } def -/Cshow { currentpoint stroke M - dup stringwidth pop -2 div vshift R show } def -/UP { dup vpt_ mul /vpt exch def hpt_ mul /hpt exch def - /hpt2 hpt 2 mul def /vpt2 vpt 2 mul def } def -/DL { Color {setrgbcolor Solid {pop []} if 0 setdash } - {pop pop pop 0 setgray Solid {pop []} if 0 setdash} ifelse } def -/BL { stroke userlinewidth 2 mul setlinewidth - Rounded { 1 setlinejoin 1 setlinecap } if } def -/AL { stroke userlinewidth 2 div setlinewidth - Rounded { 1 setlinejoin 1 setlinecap } if } def -/UL { dup gnulinewidth mul /userlinewidth exch def - dup 1 lt {pop 1} if 10 mul /udl exch def } def -/PL { stroke userlinewidth setlinewidth - Rounded { 1 setlinejoin 1 setlinecap } if } def -/LTw { PL [] 1 setgray } def -/LTb { BL [] 0 0 0 DL } def -/LTa { AL [1 udl mul 2 udl mul] 0 setdash 0 0 0 setrgbcolor } def -/LT0 { PL [] 1 0 0 DL } def -/LT1 { PL [4 dl 2 dl] 0 1 0 DL } def -/LT2 { PL [2 dl 3 dl] 0 0 1 DL } def -/LT3 { PL [1 dl 1.5 dl] 1 0 1 DL } def -/LT4 { PL [5 dl 2 dl 1 dl 2 dl] 0 1 1 DL } def -/LT5 { PL [4 dl 3 dl 1 dl 3 dl] 1 1 0 DL } def -/LT6 { PL [2 dl 2 dl 2 dl 4 dl] 0 0 0 DL } def -/LT7 { PL [2 dl 2 dl 2 dl 2 dl 2 dl 4 dl] 1 0.3 0 DL } def -/LT8 { PL [2 dl 2 dl 2 dl 2 dl 2 dl 2 dl 2 dl 4 dl] 0.5 0.5 0.5 DL } def -/Pnt { stroke [] 0 setdash - gsave 1 setlinecap M 0 0 V stroke grestore } def -/Dia { stroke [] 0 setdash 2 copy vpt add M - hpt neg vpt neg V hpt vpt neg V - hpt vpt V hpt neg vpt V closepath stroke - Pnt } def -/Pls { stroke [] 0 setdash vpt sub M 0 vpt2 V - currentpoint stroke M - hpt neg vpt neg R hpt2 0 V stroke - } def -/Box { stroke [] 0 setdash 2 copy exch hpt sub exch vpt add M - 0 vpt2 neg V hpt2 0 V 0 vpt2 V - hpt2 neg 0 V closepath stroke - Pnt } def -/Crs { stroke [] 0 setdash exch hpt sub exch vpt add M - hpt2 vpt2 neg V currentpoint stroke M - hpt2 neg 0 R hpt2 vpt2 V stroke } def -/TriU { stroke [] 0 setdash 2 copy vpt 1.12 mul add M - hpt neg vpt -1.62 mul V - hpt 2 mul 0 V - hpt neg vpt 1.62 mul V closepath stroke - Pnt } def -/Star { 2 copy Pls Crs } def -/BoxF { stroke [] 0 setdash exch hpt sub exch vpt add M - 0 vpt2 neg V hpt2 0 V 0 vpt2 V - hpt2 neg 0 V closepath fill } def -/TriUF { stroke [] 0 setdash vpt 1.12 mul add M - hpt neg vpt -1.62 mul V - hpt 2 mul 0 V - hpt neg vpt 1.62 mul V closepath fill } def -/TriD { stroke [] 0 setdash 2 copy vpt 1.12 mul sub M - hpt neg vpt 1.62 mul V - hpt 2 mul 0 V - hpt neg vpt -1.62 mul V closepath stroke - Pnt } def -/TriDF { stroke [] 0 setdash vpt 1.12 mul sub M - hpt neg vpt 1.62 mul V - hpt 2 mul 0 V - hpt neg vpt -1.62 mul V closepath fill} def -/DiaF { stroke [] 0 setdash vpt add M - hpt neg vpt neg V hpt vpt neg V - hpt vpt V hpt neg vpt V closepath fill } def -/Pent { stroke [] 0 setdash 2 copy gsave - translate 0 hpt M 4 {72 rotate 0 hpt L} repeat - closepath stroke grestore Pnt } def -/PentF { stroke [] 0 setdash gsave - translate 0 hpt M 4 {72 rotate 0 hpt L} repeat - closepath fill grestore } def -/Circle { stroke [] 0 setdash 2 copy - hpt 0 360 arc stroke Pnt } def -/CircleF { stroke [] 0 setdash hpt 0 360 arc fill } def -/C0 { BL [] 0 setdash 2 copy moveto vpt 90 450 arc } bind def -/C1 { BL [] 0 setdash 2 copy moveto - 2 copy vpt 0 90 arc closepath fill - vpt 0 360 arc closepath } bind def -/C2 { BL [] 0 setdash 2 copy moveto - 2 copy vpt 90 180 arc closepath fill - vpt 0 360 arc closepath } bind def -/C3 { BL [] 0 setdash 2 copy moveto - 2 copy vpt 0 180 arc closepath fill - vpt 0 360 arc closepath } bind def -/C4 { BL [] 0 setdash 2 copy moveto - 2 copy vpt 180 270 arc closepath fill - vpt 0 360 arc closepath } bind def -/C5 { BL [] 0 setdash 2 copy moveto - 2 copy vpt 0 90 arc - 2 copy moveto - 2 copy vpt 180 270 arc closepath fill - vpt 0 360 arc } bind def -/C6 { BL [] 0 setdash 2 copy moveto - 2 copy vpt 90 270 arc closepath fill - vpt 0 360 arc closepath } bind def -/C7 { BL [] 0 setdash 2 copy moveto - 2 copy vpt 0 270 arc closepath fill - vpt 0 360 arc closepath } bind def -/C8 { BL [] 0 setdash 2 copy moveto - 2 copy vpt 270 360 arc closepath fill - vpt 0 360 arc closepath } bind def -/C9 { BL [] 0 setdash 2 copy moveto - 2 copy vpt 270 450 arc closepath fill - vpt 0 360 arc closepath } bind def -/C10 { BL [] 0 setdash 2 copy 2 copy moveto vpt 270 360 arc closepath fill - 2 copy moveto - 2 copy vpt 90 180 arc closepath fill - vpt 0 360 arc closepath } bind def -/C11 { BL [] 0 setdash 2 copy moveto - 2 copy vpt 0 180 arc closepath fill - 2 copy moveto - 2 copy vpt 270 360 arc closepath fill - vpt 0 360 arc closepath } bind def -/C12 { BL [] 0 setdash 2 copy moveto - 2 copy vpt 180 360 arc closepath fill - vpt 0 360 arc closepath } bind def -/C13 { BL [] 0 setdash 2 copy moveto - 2 copy vpt 0 90 arc closepath fill - 2 copy moveto - 2 copy vpt 180 360 arc closepath fill - vpt 0 360 arc closepath } bind def -/C14 { BL [] 0 setdash 2 copy moveto - 2 copy vpt 90 360 arc closepath fill - vpt 0 360 arc } bind def -/C15 { BL [] 0 setdash 2 copy vpt 0 360 arc closepath fill - vpt 0 360 arc closepath } bind def -/Rec { newpath 4 2 roll moveto 1 index 0 rlineto 0 exch rlineto - neg 0 rlineto closepath } bind def -/Square { dup Rec } bind def -/Bsquare { vpt sub exch vpt sub exch vpt2 Square } bind def -/S0 { BL [] 0 setdash 2 copy moveto 0 vpt rlineto BL Bsquare } bind def -/S1 { BL [] 0 setdash 2 copy vpt Square fill Bsquare } bind def -/S2 { BL [] 0 setdash 2 copy exch vpt sub exch vpt Square fill Bsquare } bind def -/S3 { BL [] 0 setdash 2 copy exch vpt sub exch vpt2 vpt Rec fill Bsquare } bind def -/S4 { BL [] 0 setdash 2 copy exch vpt sub exch vpt sub vpt Square fill Bsquare } bind def -/S5 { BL [] 0 setdash 2 copy 2 copy vpt Square fill - exch vpt sub exch vpt sub vpt Square fill Bsquare } bind def -/S6 { BL [] 0 setdash 2 copy exch vpt sub exch vpt sub vpt vpt2 Rec fill Bsquare } bind def -/S7 { BL [] 0 setdash 2 copy exch vpt sub exch vpt sub vpt vpt2 Rec fill - 2 copy vpt Square fill - Bsquare } bind def -/S8 { BL [] 0 setdash 2 copy vpt sub vpt Square fill Bsquare } bind def -/S9 { BL [] 0 setdash 2 copy vpt sub vpt vpt2 Rec fill Bsquare } bind def -/S10 { BL [] 0 setdash 2 copy vpt sub vpt Square fill 2 copy exch vpt sub exch vpt Square fill - Bsquare } bind def -/S11 { BL [] 0 setdash 2 copy vpt sub vpt Square fill 2 copy exch vpt sub exch vpt2 vpt Rec fill - Bsquare } bind def -/S12 { BL [] 0 setdash 2 copy exch vpt sub exch vpt sub vpt2 vpt Rec fill Bsquare } bind def -/S13 { BL [] 0 setdash 2 copy exch vpt sub exch vpt sub vpt2 vpt Rec fill - 2 copy vpt Square fill Bsquare } bind def -/S14 { BL [] 0 setdash 2 copy exch vpt sub exch vpt sub vpt2 vpt Rec fill - 2 copy exch vpt sub exch vpt Square fill Bsquare } bind def -/S15 { BL [] 0 setdash 2 copy Bsquare fill Bsquare } bind def -/D0 { gsave translate 45 rotate 0 0 S0 stroke grestore } bind def -/D1 { gsave translate 45 rotate 0 0 S1 stroke grestore } bind def -/D2 { gsave translate 45 rotate 0 0 S2 stroke grestore } bind def -/D3 { gsave translate 45 rotate 0 0 S3 stroke grestore } bind def -/D4 { gsave translate 45 rotate 0 0 S4 stroke grestore } bind def -/D5 { gsave translate 45 rotate 0 0 S5 stroke grestore } bind def -/D6 { gsave translate 45 rotate 0 0 S6 stroke grestore } bind def -/D7 { gsave translate 45 rotate 0 0 S7 stroke grestore } bind def -/D8 { gsave translate 45 rotate 0 0 S8 stroke grestore } bind def -/D9 { gsave translate 45 rotate 0 0 S9 stroke grestore } bind def -/D10 { gsave translate 45 rotate 0 0 S10 stroke grestore } bind def -/D11 { gsave translate 45 rotate 0 0 S11 stroke grestore } bind def -/D12 { gsave translate 45 rotate 0 0 S12 stroke grestore } bind def -/D13 { gsave translate 45 rotate 0 0 S13 stroke grestore } bind def -/D14 { gsave translate 45 rotate 0 0 S14 stroke grestore } bind def -/D15 { gsave translate 45 rotate 0 0 S15 stroke grestore } bind def -/DiaE { stroke [] 0 setdash vpt add M - hpt neg vpt neg V hpt vpt neg V - hpt vpt V hpt neg vpt V closepath stroke } def -/BoxE { stroke [] 0 setdash exch hpt sub exch vpt add M - 0 vpt2 neg V hpt2 0 V 0 vpt2 V - hpt2 neg 0 V closepath stroke } def -/TriUE { stroke [] 0 setdash vpt 1.12 mul add M - hpt neg vpt -1.62 mul V - hpt 2 mul 0 V - hpt neg vpt 1.62 mul V closepath stroke } def -/TriDE { stroke [] 0 setdash vpt 1.12 mul sub M - hpt neg vpt 1.62 mul V - hpt 2 mul 0 V - hpt neg vpt -1.62 mul V closepath stroke } def -/PentE { stroke [] 0 setdash gsave - translate 0 hpt M 4 {72 rotate 0 hpt L} repeat - closepath stroke grestore } def -/CircE { stroke [] 0 setdash - hpt 0 360 arc stroke } def -/Opaque { gsave closepath 1 setgray fill grestore 0 setgray closepath } def -/DiaW { stroke [] 0 setdash vpt add M - hpt neg vpt neg V hpt vpt neg V - hpt vpt V hpt neg vpt V Opaque stroke } def -/BoxW { stroke [] 0 setdash exch hpt sub exch vpt add M - 0 vpt2 neg V hpt2 0 V 0 vpt2 V - hpt2 neg 0 V Opaque stroke } def -/TriUW { stroke [] 0 setdash vpt 1.12 mul add M - hpt neg vpt -1.62 mul V - hpt 2 mul 0 V - hpt neg vpt 1.62 mul V Opaque stroke } def -/TriDW { stroke [] 0 setdash vpt 1.12 mul sub M - hpt neg vpt 1.62 mul V - hpt 2 mul 0 V - hpt neg vpt -1.62 mul V Opaque stroke } def -/PentW { stroke [] 0 setdash gsave - translate 0 hpt M 4 {72 rotate 0 hpt L} repeat - Opaque stroke grestore } def -/CircW { stroke [] 0 setdash - hpt 0 360 arc Opaque stroke } def -/BoxFill { gsave Rec 1 setgray fill grestore } def -/BoxColFill { - gsave Rec - /Fillden exch def - currentrgbcolor - /ColB exch def /ColG exch def /ColR exch def - /ColR ColR Fillden mul Fillden sub 1 add def - /ColG ColG Fillden mul Fillden sub 1 add def - /ColB ColB Fillden mul Fillden sub 1 add def - ColR ColG ColB setrgbcolor - fill grestore } def -% -% PostScript Level 1 Pattern Fill routine -% Usage: x y w h s a XX PatternFill -% x,y = lower left corner of box to be filled -% w,h = width and height of box -% a = angle in degrees between lines and x-axis -% XX = 0/1 for no/yes cross-hatch -% -/PatternFill { gsave /PFa [ 9 2 roll ] def - PFa 0 get PFa 2 get 2 div add PFa 1 get PFa 3 get 2 div add translate - PFa 2 get -2 div PFa 3 get -2 div PFa 2 get PFa 3 get Rec - gsave 1 setgray fill grestore clip - currentlinewidth 0.5 mul setlinewidth - /PFs PFa 2 get dup mul PFa 3 get dup mul add sqrt def - 0 0 M PFa 5 get rotate PFs -2 div dup translate - 0 1 PFs PFa 4 get div 1 add floor cvi - { PFa 4 get mul 0 M 0 PFs V } for - 0 PFa 6 get ne { - 0 1 PFs PFa 4 get div 1 add floor cvi - { PFa 4 get mul 0 2 1 roll M PFs 0 V } for - } if - stroke grestore } def -% -/Symbol-Oblique /Symbol findfont [1 0 .167 1 0 0] makefont -dup length dict begin {1 index /FID eq {pop pop} {def} ifelse} forall -currentdict end definefont pop -end -%%EndProlog -gnudict begin -gsave -50 50 translate -0.050 0.050 scale -0 setgray -newpath -(Helvetica) findfont 140 scalefont setfont -1.000 UL -LTb -630 420 M -63 0 V -6269 0 R --63 0 V -546 420 M -(-40) Rshow -1.000 UL -LTb -630 1056 M -63 0 V -6269 0 R --63 0 V --6353 0 R -(-30) Rshow -1.000 UL -LTb -630 1692 M -63 0 V -6269 0 R --63 0 V --6353 0 R -(-20) Rshow -1.000 UL -LTb -630 2328 M -63 0 V -6269 0 R --63 0 V --6353 0 R -(-10) Rshow -1.000 UL -LTb -630 2964 M -63 0 V -6269 0 R --63 0 V --6353 0 R -( 0) Rshow -1.000 UL -LTb -630 3600 M -63 0 V -6269 0 R --63 0 V --6353 0 R -( 10) Rshow -1.000 UL -LTb -630 4236 M -63 0 V -6269 0 R --63 0 V --6353 0 R -( 20) Rshow -1.000 UL -LTb -630 4872 M -63 0 V -6269 0 R --63 0 V --6353 0 R -( 30) Rshow -1.000 UL -LTb -630 420 M -0 63 V -0 4389 R -0 -63 V -630 280 M -( 0) Cshow -1.000 UL -LTb -1421 420 M -0 63 V -0 4389 R -0 -63 V -0 -4529 R -( 500) Cshow -1.000 UL -LTb -2213 420 M -0 63 V -0 4389 R -0 -63 V -0 -4529 R -( 1000) Cshow -1.000 UL -LTb -3004 420 M -0 63 V -0 4389 R -0 -63 V -0 -4529 R -( 1500) Cshow -1.000 UL -LTb -3796 420 M -0 63 V -0 4389 R -0 -63 V -0 -4529 R -( 2000) Cshow -1.000 UL -LTb -4587 420 M -0 63 V -0 4389 R -0 -63 V -0 -4529 R -( 2500) Cshow -1.000 UL -LTb -5379 420 M -0 63 V -0 4389 R -0 -63 V -0 -4529 R -( 3000) Cshow -1.000 UL -LTb -6170 420 M -0 63 V -0 4389 R -0 -63 V -0 -4529 R -( 3500) Cshow -1.000 UL -LTb -6962 420 M -0 63 V -0 4389 R -0 -63 V -0 -4529 R -( 4000) Cshow -1.000 UL -LTb -1.000 UL -LTb -630 420 M -6332 0 V -0 4452 V --6332 0 V -630 420 L -LTb -140 2646 M -currentpoint gsave translate 90 rotate 0 0 M -(Response \(dB\)) Cshow -grestore -LTb -3796 70 M -(Frequency \(Hz\)) Cshow -1.000 UP -1.000 UL -LT0 -LTb -6311 4739 M -(Speech signal) Rshow -LT0 -6395 4739 M -399 0 V -630 1817 M -12 -132 V -13 -287 V -12 256 V -12 139 V -13 -127 V -12 -193 V -13 256 V -12 101 V -12 -189 V -13 -269 V -12 429 V -12 152 V -13 -102 V -12 -276 V -13 139 V -12 115 V -12 -205 V -13 -174 V -12 485 V -12 193 V -13 37 V -12 -17 V -12 41 V -13 230 V -12 242 V -13 107 V -12 190 V -12 513 V -13 436 V -12 323 V -12 236 V -13 168 V -12 110 V -12 58 V -13 9 V -12 -40 V -13 -90 V -12 -141 V -12 -197 V -13 -251 V -12 -289 V -12 -283 V -13 -247 V -12 -265 V -13 -324 V -12 -302 V -12 -231 V -13 -75 V -12 150 V -12 1 V -13 -298 V -1273 782 L -12 1103 V -13 76 V -12 -338 V -13 252 V -12 357 V -12 86 V -13 -118 V -12 -341 V -12 -20 V -13 364 V -12 243 V -12 212 V -13 214 V -12 208 V -13 180 V -12 136 V -12 82 V -13 23 V -12 -40 V -12 -107 V -13 -177 V -12 -240 V -13 -259 V -12 -215 V -12 -220 V -13 -297 V -12 -196 V -12 -128 V -13 -701 V -12 632 V -12 329 V -13 -25 V -12 -470 V -13 -54 V -12 538 V -12 70 V -13 -246 V -1743 551 L -12 1111 V -13 185 V -12 -159 V -1793 652 L -12 893 V -12 321 V -13 103 V -12 164 V -12 262 V -13 239 V -12 190 V -12 141 V -stroke -1891 2965 M -13 91 V -12 39 V -13 -13 V -12 -62 V -12 -97 V -13 -110 V -12 -120 V -12 -161 V -13 -265 V -12 -453 V -12 -215 V -13 139 V -12 -195 V -2062 420 L -5 0 R -10 961 V -12 135 V -13 -422 V -12 167 V -12 491 V -13 101 V -12 -169 V -13 -737 V -12 482 V -12 299 V -13 -48 V -12 -421 V -12 -151 V -13 434 V -12 -3 V -12 -378 V -13 -12 V -12 298 V -13 -187 V -12 -44 V -12 658 V -13 272 V -12 90 V -12 -49 V -13 -191 V -12 -370 V -13 -579 V -12 -329 V -12 385 V -13 444 V -12 172 V -12 -57 V -13 -407 V -12 -311 V -12 617 V -13 97 V -12 -198 V -13 -469 V -12 446 V -12 177 V -13 -114 V -12 -483 V -12 196 V -13 269 V -12 -74 V -12 -404 V -13 263 V -12 248 V -13 -37 V -12 -66 V -12 339 V -13 312 V -12 244 V -12 215 V -13 176 V -12 125 V -13 69 V -12 15 V -12 -30 V -13 -64 V -12 -85 V -12 -104 V -13 -138 V -12 -195 V -12 -278 V -13 -354 V -12 -257 V -13 -43 V -12 -20 V -12 -73 V -13 -202 V -12 -25 V -12 318 V -13 132 V -12 -73 V -12 -242 V -13 107 V -12 220 V -13 7 V -12 -277 V -9 -811 V -6 0 R -10 887 V -12 241 V -12 20 V -13 -14 V -12 241 V -13 323 V -12 262 V -stroke -3153 2380 M -12 197 V -13 138 V -12 86 V -12 36 V -13 -10 V -12 -54 V -12 -92 V -13 -116 V -12 -108 V -13 -73 V -12 -63 V -12 -107 V -13 -195 V -12 -267 V -12 -88 V -13 50 V -12 -97 V -13 -367 V -12 -285 V -12 374 V -13 3 V -12 -352 V -12 88 V -13 347 V -12 47 V -12 -192 V -13 -264 V -12 200 V -13 16 V -12 -421 V -12 296 V -13 398 V -12 65 V -12 -212 V -13 69 V -12 453 V -12 240 V -13 104 V -12 12 V -13 -52 V -12 -82 V -12 -69 V -13 -34 V -12 -25 V -12 -64 V -13 -158 V -12 -346 V -13 -166 V -12 375 V -12 139 V -13 -46 V -12 -207 V -12 -187 V -13 102 V -12 -14 V -12 -357 V -13 -271 V -12 601 V -13 119 V -12 -172 V -12 -486 V -13 521 V -12 256 V -12 10 V -13 -219 V -12 -294 V -13 446 V -12 285 V -12 167 V -13 137 V -12 152 V -12 161 V -13 144 V -12 106 V -12 58 V -13 7 V -12 -44 V -13 -87 V -12 -116 V -12 -119 V -13 -118 V -12 -152 V -12 -241 V -13 -363 V -12 -109 V -12 172 V -13 43 V -12 -75 V -13 -176 V -12 -313 V -12 -344 V -13 236 V -12 93 V -12 -169 V -13 -102 V -12 320 V -13 123 V -12 17 V -12 207 V -13 270 V -12 201 V -12 186 V -13 217 V -12 213 V -stroke -4439 2543 M -12 174 V -13 125 V -12 79 V -13 42 V -12 14 V -12 -3 V -13 -17 V -12 -34 V -12 -62 V -13 -102 V -12 -149 V -12 -182 V -13 -151 V -12 -70 V -13 -73 V -12 -146 V -12 -150 V -13 43 V -12 81 V -12 -27 V -13 -148 V -12 -213 V -13 -14 V -12 246 V -12 262 V -13 190 V -12 94 V -12 -7 V -13 -56 V -12 149 V -12 312 V -13 269 V -12 212 V -13 169 V -12 136 V -12 105 V -13 76 V -12 45 V -12 15 V -13 -15 V -12 -43 V -13 -66 V -12 -80 V -12 -83 V -13 -79 V -12 -80 V -12 -99 V -13 -136 V -12 -193 V -12 -274 V -13 -400 V -12 -462 V -13 173 V -12 148 V -12 -21 V -13 -198 V -12 -146 V -12 391 V -13 253 V -12 99 V -12 -38 V -13 -208 V -12 -260 V -13 418 V -12 330 V -12 210 V -13 153 V -12 123 V -12 105 V -13 88 V -12 68 V -13 47 V -12 24 V -12 1 V -13 -19 V -12 -38 V -12 -54 V -13 -67 V -12 -80 V -12 -93 V -13 -111 V -12 -132 V -13 -152 V -12 -167 V -12 -183 V -13 -211 V -12 -236 V -12 -139 V -13 15 V -12 -22 V -13 -164 V -12 -405 V -12 -211 V -13 440 V -12 230 V -12 152 V -13 96 V -12 29 V -12 -28 V -13 -10 V -12 81 V -13 96 V -12 29 V -12 -69 V -stroke -5725 2104 M -13 -186 V -12 -239 V -12 142 V -13 249 V -12 155 V -12 88 V -13 49 V -12 35 V -13 39 V -12 38 V -12 13 V -13 -34 V -12 -87 V -12 -112 V -13 -72 V -12 -35 V -13 -100 V -12 -269 V -12 -452 V -13 296 V -12 99 V -12 -312 V -13 242 V -12 513 V -12 237 V -13 88 V -12 -21 V -13 -82 V -12 -1 V -12 153 V -13 177 V -12 156 V -12 145 V -13 134 V -12 114 V -12 87 V -13 56 V -12 26 V -13 -3 V -12 -30 V -12 -52 V -13 -74 V -12 -93 V -12 -108 V -13 -121 V -12 -130 V -13 -129 V -12 -118 V -12 -100 V -13 -92 V -12 -105 V -12 -135 V -13 -172 V -12 -195 V -12 -222 V -13 -353 V -12 -548 V -13 682 V -12 273 V -12 79 V -13 -59 V -12 -188 V -12 -225 V -13 39 V -12 80 V -13 -43 V -12 -44 V -12 184 V -13 213 V -12 127 V -12 42 V -13 -37 V -12 -115 V -12 -182 V -13 -179 V -12 -53 V -13 12 V -12 6 V -12 20 V -13 10 V -12 -65 V -12 -195 V -13 -296 V -12 56 V -12 100 V -13 -118 V -12 -182 V -13 253 V -12 155 V -12 -50 V -13 -222 V -12 21 V -12 197 V -13 7 V -12 -194 V -13 -77 V -12 240 V -12 73 V -13 -132 V -1.000 UL -LT1 -LTb -6311 4599 M -(LPC synthesis filter) Rshow -LT1 -6395 4599 M -399 0 V -630 4034 M -12 0 V -13 0 V -12 1 V -12 1 V -13 1 V -12 1 V -13 1 V -12 2 V -12 2 V -13 3 V -12 2 V -12 4 V -13 3 V -12 5 V -13 4 V -12 6 V -12 6 V -13 7 V -12 8 V -12 8 V -13 10 V -12 11 V -12 11 V -13 13 V -12 15 V -13 16 V -12 17 V -12 19 V -13 21 V -12 23 V -12 25 V -13 27 V -12 29 V -12 31 V -13 32 V -12 33 V -13 33 V -12 30 V -12 26 V -13 16 V -12 4 V -12 -11 V -13 -26 V -12 -38 V -13 -49 V -12 -54 V -12 -56 V -13 -58 V -12 -57 V -12 -55 V -13 -53 V -12 -52 V -12 -49 V -13 -47 V -12 -45 V -13 -44 V -12 -41 V -12 -40 V -13 -38 V -12 -37 V -12 -35 V -13 -35 V -12 -33 V -12 -31 V -13 -31 V -12 -30 V -13 -29 V -12 -28 V -12 -27 V -13 -26 V -12 -26 V -12 -24 V -13 -25 V -12 -23 V -13 -23 V -12 -22 V -12 -22 V -13 -21 V -12 -20 V -12 -20 V -13 -20 V -12 -19 V -12 -19 V -13 -18 V -12 -17 V -13 -18 V -12 -17 V -12 -16 V -13 -16 V -12 -16 V -12 -15 V -13 -15 V -12 -15 V -13 -14 V -12 -14 V -12 -14 V -13 -13 V -12 -13 V -12 -13 V -13 -12 V -12 -13 V -12 -11 V -stroke -1891 2822 M -13 -12 V -12 -11 V -13 -11 V -12 -11 V -12 -11 V -13 -10 V -12 -10 V -12 -10 V -13 -10 V -12 -9 V -12 -9 V -13 -9 V -12 -8 V -13 -9 V -12 -8 V -12 -8 V -13 -8 V -12 -7 V -12 -8 V -13 -7 V -12 -7 V -13 -7 V -12 -6 V -12 -6 V -13 -7 V -12 -6 V -12 -5 V -13 -6 V -12 -5 V -12 -6 V -13 -5 V -12 -5 V -13 -4 V -12 -5 V -12 -4 V -13 -5 V -12 -4 V -12 -4 V -13 -3 V -12 -4 V -13 -3 V -12 -4 V -12 -3 V -13 -3 V -12 -2 V -12 -3 V -13 -3 V -12 -2 V -12 -2 V -13 -2 V -12 -2 V -13 -2 V -12 -2 V -12 -1 V -13 -2 V -12 -1 V -12 -1 V -13 -2 V -12 -1 V -12 0 V -13 -1 V -12 -1 V -13 0 V -12 -1 V -12 0 V -13 0 V -12 -1 V -12 0 V -13 0 V -12 0 V -13 0 V -12 1 V -12 0 V -13 0 V -12 1 V -12 0 V -13 1 V -12 0 V -12 1 V -13 1 V -12 0 V -13 1 V -12 1 V -12 1 V -13 0 V -12 1 V -12 1 V -13 1 V -12 1 V -12 0 V -13 1 V -12 1 V -13 1 V -12 0 V -12 1 V -13 1 V -12 0 V -12 1 V -13 1 V -12 0 V -13 1 V -12 0 V -12 0 V -13 1 V -stroke -3178 2508 M -12 0 V -12 0 V -13 0 V -12 0 V -12 0 V -13 0 V -12 0 V -13 0 V -12 0 V -12 -1 V -13 0 V -12 -1 V -12 0 V -13 -1 V -12 0 V -13 -1 V -12 -1 V -12 0 V -13 -1 V -12 -1 V -12 -1 V -13 -1 V -12 -1 V -12 0 V -13 -1 V -12 -1 V -13 -1 V -12 -1 V -12 -1 V -13 -1 V -12 -1 V -12 -1 V -13 -1 V -12 -1 V -12 0 V -13 -1 V -12 -1 V -13 -1 V -12 0 V -12 -1 V -13 0 V -12 -1 V -12 0 V -13 0 V -12 0 V -13 0 V -12 0 V -12 0 V -13 0 V -12 0 V -12 0 V -13 1 V -12 1 V -12 0 V -13 1 V -12 1 V -13 1 V -12 2 V -12 1 V -13 1 V -12 2 V -12 2 V -13 2 V -12 2 V -13 2 V -12 3 V -12 2 V -13 3 V -12 3 V -12 3 V -13 4 V -12 3 V -12 4 V -13 4 V -12 4 V -13 4 V -12 4 V -12 5 V -13 5 V -12 5 V -12 5 V -13 6 V -12 6 V -12 6 V -13 6 V -12 6 V -13 7 V -12 7 V -12 7 V -13 8 V -12 8 V -12 8 V -13 8 V -12 9 V -13 9 V -12 9 V -12 9 V -13 10 V -12 10 V -12 11 V -13 11 V -12 11 V -12 12 V -13 12 V -stroke -4464 2759 M -12 12 V -13 13 V -12 13 V -12 14 V -13 14 V -12 15 V -12 15 V -13 16 V -12 16 V -12 17 V -13 17 V -12 18 V -13 18 V -12 19 V -12 20 V -13 21 V -12 21 V -12 22 V -13 23 V -12 23 V -13 24 V -12 26 V -12 26 V -13 26 V -12 28 V -12 28 V -13 30 V -12 29 V -12 31 V -13 30 V -12 31 V -13 30 V -12 29 V -12 27 V -13 26 V -12 22 V -12 18 V -13 13 V -12 8 V -13 2 V -12 -3 V -12 -9 V -13 -13 V -12 -16 V -12 -20 V -13 -21 V -12 -23 V -12 -24 V -13 -23 V -12 -24 V -13 -23 V -12 -23 V -12 -22 V -13 -21 V -12 -21 V -12 -20 V -13 -18 V -12 -18 V -12 -17 V -13 -16 V -12 -16 V -13 -14 V -12 -14 V -12 -13 V -13 -13 V -12 -11 V -12 -11 V -13 -11 V -12 -10 V -13 -9 V -12 -8 V -12 -8 V -13 -8 V -12 -6 V -12 -7 V -13 -6 V -12 -5 V -12 -5 V -13 -4 V -12 -4 V -13 -4 V -12 -3 V -12 -3 V -13 -2 V -12 -2 V -12 -2 V -13 -1 V -12 -1 V -13 0 V -12 0 V -12 0 V -13 0 V -12 1 V -12 1 V -13 1 V -12 2 V -12 2 V -13 2 V -12 2 V -13 2 V -12 3 V -12 3 V -13 2 V -12 3 V -stroke -5750 3038 M -12 3 V -13 3 V -12 3 V -12 3 V -13 3 V -12 2 V -13 3 V -12 2 V -12 2 V -13 2 V -12 2 V -12 1 V -13 0 V -12 1 V -13 0 V -12 -1 V -12 -1 V -13 -2 V -12 -2 V -12 -3 V -13 -4 V -12 -4 V -12 -4 V -13 -6 V -12 -5 V -13 -7 V -12 -6 V -12 -8 V -13 -7 V -12 -9 V -12 -8 V -13 -9 V -12 -9 V -12 -10 V -13 -9 V -12 -10 V -13 -10 V -12 -10 V -12 -11 V -13 -10 V -12 -10 V -12 -11 V -13 -10 V -12 -10 V -13 -11 V -12 -10 V -12 -10 V -13 -10 V -12 -10 V -12 -9 V -13 -10 V -12 -10 V -12 -9 V -13 -9 V -12 -9 V -13 -9 V -12 -8 V -12 -8 V -13 -9 V -12 -8 V -12 -7 V -13 -8 V -12 -7 V -13 -7 V -12 -7 V -12 -7 V -13 -7 V -12 -6 V -12 -6 V -13 -6 V -12 -6 V -12 -5 V -13 -5 V -12 -5 V -13 -5 V -12 -5 V -12 -4 V -13 -4 V -12 -4 V -12 -4 V -13 -4 V -12 -3 V -12 -3 V -13 -3 V -12 -3 V -13 -2 V -12 -3 V -12 -2 V -13 -2 V -12 -2 V -12 -1 V -13 -1 V -12 -2 V -13 0 V -12 -1 V -12 -1 V -13 0 V -1.000 UL -LT2 -LTb -6311 4459 M -(Reference shaping) Rshow -LT2 -6395 4459 M -399 0 V -630 3487 M -12 0 V -13 0 V -12 1 V -12 0 V -13 1 V -12 1 V -13 1 V -12 2 V -12 1 V -13 2 V -12 2 V -12 2 V -13 2 V -12 2 V -13 3 V -12 2 V -12 3 V -13 3 V -12 3 V -12 2 V -13 4 V -12 3 V -12 3 V -13 3 V -12 3 V -13 2 V -12 3 V -12 3 V -13 2 V -12 2 V -12 1 V -13 1 V -12 1 V -12 0 V -13 0 V -12 -2 V -13 -2 V -12 -2 V -12 -4 V -13 -4 V -12 -6 V -12 -6 V -13 -7 V -12 -8 V -13 -8 V -12 -10 V -12 -10 V -13 -11 V -12 -12 V -12 -12 V -13 -13 V -12 -13 V -12 -14 V -13 -14 V -12 -14 V -13 -15 V -12 -15 V -12 -15 V -13 -15 V -12 -15 V -12 -15 V -13 -14 V -12 -15 V -12 -15 V -13 -15 V -12 -14 V -13 -14 V -12 -15 V -12 -13 V -13 -14 V -12 -14 V -12 -13 V -13 -13 V -12 -13 V -13 -12 V -12 -12 V -12 -12 V -13 -12 V -12 -12 V -12 -11 V -13 -11 V -12 -11 V -12 -10 V -13 -10 V -12 -10 V -13 -10 V -12 -10 V -12 -9 V -13 -9 V -12 -9 V -12 -9 V -13 -8 V -12 -8 V -13 -8 V -12 -8 V -12 -8 V -13 -7 V -12 -7 V -12 -7 V -13 -7 V -12 -6 V -12 -7 V -stroke -1891 2847 M -13 -6 V -12 -6 V -13 -6 V -12 -5 V -12 -6 V -13 -5 V -12 -5 V -12 -5 V -13 -5 V -12 -5 V -12 -4 V -13 -5 V -12 -4 V -13 -4 V -12 -4 V -12 -4 V -13 -4 V -12 -3 V -12 -4 V -13 -3 V -12 -3 V -13 -3 V -12 -3 V -12 -3 V -13 -2 V -12 -3 V -12 -2 V -13 -3 V -12 -2 V -12 -2 V -13 -2 V -12 -2 V -13 -2 V -12 -1 V -12 -2 V -13 -1 V -12 -2 V -12 -1 V -13 -1 V -12 -1 V -13 -2 V -12 0 V -12 -1 V -13 -1 V -12 -1 V -12 -1 V -13 0 V -12 -1 V -12 0 V -13 0 V -12 -1 V -13 0 V -12 0 V -12 0 V -13 0 V -12 0 V -12 0 V -13 0 V -12 0 V -12 1 V -13 0 V -12 0 V -13 1 V -12 0 V -12 0 V -13 1 V -12 0 V -12 1 V -13 1 V -12 0 V -13 1 V -12 1 V -12 0 V -13 1 V -12 1 V -12 1 V -13 0 V -12 1 V -12 1 V -13 1 V -12 1 V -13 1 V -12 0 V -12 1 V -13 1 V -12 1 V -12 1 V -13 1 V -12 1 V -12 0 V -13 1 V -12 1 V -13 1 V -12 0 V -12 1 V -13 1 V -12 1 V -12 0 V -13 1 V -12 1 V -13 0 V -12 1 V -12 0 V -13 1 V -stroke -3178 2736 M -12 0 V -12 1 V -13 0 V -12 1 V -12 0 V -13 0 V -12 1 V -13 0 V -12 0 V -12 0 V -13 1 V -12 0 V -12 0 V -13 0 V -12 0 V -13 0 V -12 0 V -12 0 V -13 0 V -12 0 V -12 0 V -13 0 V -12 0 V -12 0 V -13 0 V -12 0 V -13 0 V -12 0 V -12 0 V -13 0 V -12 0 V -12 0 V -13 0 V -12 -1 V -12 0 V -13 0 V -12 0 V -13 0 V -12 1 V -12 0 V -13 0 V -12 0 V -12 0 V -13 0 V -12 0 V -13 1 V -12 0 V -12 0 V -13 1 V -12 0 V -12 1 V -13 1 V -12 0 V -12 1 V -13 1 V -12 1 V -13 0 V -12 1 V -12 2 V -13 1 V -12 1 V -12 1 V -13 2 V -12 1 V -13 2 V -12 1 V -12 2 V -13 2 V -12 2 V -12 2 V -13 2 V -12 3 V -12 2 V -13 3 V -12 2 V -13 3 V -12 3 V -12 3 V -13 3 V -12 3 V -12 4 V -13 3 V -12 4 V -12 4 V -13 4 V -12 4 V -13 4 V -12 5 V -12 4 V -13 5 V -12 5 V -12 5 V -13 5 V -12 5 V -13 6 V -12 6 V -12 6 V -13 6 V -12 6 V -12 6 V -13 7 V -12 6 V -12 7 V -13 7 V -stroke -4464 2918 M -12 8 V -13 7 V -12 8 V -12 7 V -13 8 V -12 8 V -12 9 V -13 8 V -12 9 V -12 8 V -13 9 V -12 9 V -13 9 V -12 9 V -12 9 V -13 9 V -12 10 V -12 9 V -13 9 V -12 10 V -13 9 V -12 9 V -12 9 V -13 9 V -12 9 V -12 8 V -13 8 V -12 8 V -12 8 V -13 7 V -12 7 V -13 6 V -12 6 V -12 6 V -13 4 V -12 5 V -12 3 V -13 3 V -12 3 V -13 1 V -12 1 V -12 1 V -13 0 V -12 -1 V -12 -1 V -13 -2 V -12 -2 V -12 -3 V -13 -4 V -12 -3 V -13 -4 V -12 -5 V -12 -4 V -13 -5 V -12 -5 V -12 -5 V -13 -5 V -12 -6 V -12 -5 V -13 -6 V -12 -5 V -13 -6 V -12 -5 V -12 -5 V -13 -5 V -12 -6 V -12 -5 V -13 -5 V -12 -4 V -13 -5 V -12 -4 V -12 -5 V -13 -4 V -12 -4 V -12 -4 V -13 -3 V -12 -4 V -12 -3 V -13 -3 V -12 -3 V -13 -3 V -12 -3 V -12 -2 V -13 -2 V -12 -2 V -12 -2 V -13 -2 V -12 -2 V -13 -1 V -12 -2 V -12 -1 V -13 -1 V -12 -1 V -12 -1 V -13 -1 V -12 0 V -12 -1 V -13 -1 V -12 0 V -13 -1 V -12 0 V -12 0 V -13 -1 V -12 0 V -stroke -5750 3036 M -12 0 V -13 -1 V -12 0 V -12 0 V -13 -1 V -12 0 V -13 -1 V -12 0 V -12 -1 V -13 -1 V -12 0 V -12 -1 V -13 -1 V -12 -2 V -13 -1 V -12 -1 V -12 -2 V -13 -1 V -12 -2 V -12 -2 V -13 -2 V -12 -3 V -12 -2 V -13 -3 V -12 -2 V -13 -3 V -12 -3 V -12 -3 V -13 -4 V -12 -3 V -12 -4 V -13 -3 V -12 -4 V -12 -4 V -13 -4 V -12 -4 V -13 -4 V -12 -4 V -12 -5 V -13 -4 V -12 -4 V -12 -5 V -13 -4 V -12 -5 V -13 -4 V -12 -5 V -12 -5 V -13 -4 V -12 -5 V -12 -4 V -13 -5 V -12 -4 V -12 -4 V -13 -5 V -12 -4 V -13 -4 V -12 -5 V -12 -4 V -13 -4 V -12 -4 V -12 -4 V -13 -4 V -12 -4 V -13 -3 V -12 -4 V -12 -4 V -13 -3 V -12 -3 V -12 -4 V -13 -3 V -12 -3 V -12 -3 V -13 -3 V -12 -3 V -13 -2 V -12 -3 V -12 -2 V -13 -3 V -12 -2 V -12 -2 V -13 -2 V -12 -2 V -12 -2 V -13 -1 V -12 -2 V -13 -1 V -12 -2 V -12 -1 V -13 -1 V -12 -1 V -12 -1 V -13 -1 V -12 0 V -13 -1 V -12 0 V -12 0 V -13 -1 V -1.000 UL -LTb -630 420 M -6332 0 V -0 4452 V --6332 0 V -630 420 L -1.000 UP -stroke -grestore -end -showpage -%%Trailer -%%DocumentFonts: Helvetica diff --git a/speex/doc/sampledec.c b/speex/doc/sampledec.c deleted file mode 100644 index 8e89e12ce6438cd590e58becccc95e8c995c6f1e..0000000000000000000000000000000000000000 --- a/speex/doc/sampledec.c +++ /dev/null @@ -1,65 +0,0 @@ -#include -#include - -/*The frame size in hardcoded for this sample code but it doesn't have to be*/ -#define FRAME_SIZE 160 -int main(int argc, char **argv) -{ - char *outFile; - FILE *fout; - /*Holds the audio that will be written to file (16 bits per sample)*/ - short out[FRAME_SIZE]; - /*Speex handle samples as float, so we need an array of floats*/ - float output[FRAME_SIZE]; - char cbits[200]; - int nbBytes; - /*Holds the state of the decoder*/ - void *state; - /*Holds bits so they can be read and written to by the Speex routines*/ - SpeexBits bits; - int i, tmp; - - /*Create a new decoder state in narrowband mode*/ - state = speex_decoder_init(&speex_nb_mode); - - /*Set the perceptual enhancement on*/ - tmp=1; - speex_decoder_ctl(state, SPEEX_SET_ENH, &tmp); - - outFile = argv[1]; - fout = fopen(outFile, "w"); - - /*Initialization of the structure that holds the bits*/ - speex_bits_init(&bits); - while (1) - { - /*Read the size encoded by sampleenc, this part will likely be - different in your application*/ - fread(&nbBytes, sizeof(int), 1, stdin); - fprintf (stderr, "nbBytes: %d\n", nbBytes); - if (feof(stdin)) - break; - - /*Read the "packet" encoded by sampleenc*/ - fread(cbits, 1, nbBytes, stdin); - /*Copy the data into the bit-stream struct*/ - speex_bits_read_from(&bits, cbits, nbBytes); - - /*Decode the data*/ - speex_decode(state, &bits, output); - - /*Copy from float to short (16 bits) for output*/ - for (i=0;i -#include - -/*The frame size in hardcoded for this sample code but it doesn't have to be*/ -#define FRAME_SIZE 160 -int main(int argc, char **argv) -{ - char *inFile; - FILE *fin; - short in[FRAME_SIZE]; - float input[FRAME_SIZE]; - char cbits[200]; - int nbBytes; - /*Holds the state of the encoder*/ - void *state; - /*Holds bits so they can be read and written to by the Speex routines*/ - SpeexBits bits; - int i, tmp; - - /*Create a new encoder state in narrowband mode*/ - state = speex_encoder_init(&speex_nb_mode); - - /*Set the quality to 8 (15 kbps)*/ - tmp=8; - speex_encoder_ctl(state, SPEEX_SET_QUALITY, &tmp); - - inFile = argv[1]; - fin = fopen(inFile, "r"); - - /*Initialization of the structure that holds the bits*/ - speex_bits_init(&bits); - while (1) - { - /*Read a 16 bits/sample audio frame*/ - fread(in, sizeof(short), FRAME_SIZE, fin); - if (feof(fin)) - break; - /*Copy the 16 bits values to float so Speex can work on them*/ - for (i=0;i - - - - - - diff --git a/speex/html/speex.xcf b/speex/html/speex.xcf deleted file mode 100644 index e55471233e1036e51c63382676afeee2ed59bdac..0000000000000000000000000000000000000000 Binary files a/speex/html/speex.xcf and /dev/null differ diff --git a/speex/include/Makefile.am b/speex/include/Makefile.am deleted file mode 100644 index 09613b63a01fb350abcf1bc6ed5fb41a98aaf8fe..0000000000000000000000000000000000000000 --- a/speex/include/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ - -SUBDIRS = speex diff --git a/speex/include/speex/Makefile.am b/speex/include/speex/Makefile.am deleted file mode 100644 index 68789ac96012da114516453a5511585a11340acd..0000000000000000000000000000000000000000 --- a/speex/include/speex/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -# Disable automatic dependency tracking if using other tools than gcc and gmake -#AUTOMAKE_OPTIONS = no-dependencies - -# Historically, these headers were part of the speex package, so in order to -# keep compatibility with existing software we need to keep installing them -# in the same place as they were found then. If new functionality, with new -# headers, are added later, some thought should be given as to whether they -# should instead go somewhere other than $prefix/include/speex. - -speexincludedir = $(includedir)/speex - -nodist_speexinclude_HEADERS = speexdsp_config_types.h - -speexinclude_HEADERS = speex_echo.h speex_jitter.h speex_preprocess.h speex_resampler.h \ - speexdsp_types.h - -noinst_HEADERS=speex_buffer.h - diff --git a/speex/include/speex/speex_buffer.h b/speex/include/speex/speex_buffer.h deleted file mode 100644 index 9e85cfcf0e724c4a9409a93d65fe5ee7a1295125..0000000000000000000000000000000000000000 --- a/speex/include/speex/speex_buffer.h +++ /dev/null @@ -1,68 +0,0 @@ -/* Copyright (C) 2007 Jean-Marc Valin - - File: speex_buffer.h - This is a very simple ring buffer implementation. It is not thread-safe - so you need to do your own locking. - - 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. - - 3. The name of the author may not be used to endorse or promote products - derived from this software without specific prior written permission. - - 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 SPEEX_BUFFER_H -#define SPEEX_BUFFER_H - -#include "speexdsp_types.h" - -#ifdef __cplusplus -extern "C" { -#endif - -struct SpeexBuffer_; -typedef struct SpeexBuffer_ SpeexBuffer; - -SpeexBuffer *speex_buffer_init(int size); - -void speex_buffer_destroy(SpeexBuffer *st); - -int speex_buffer_write(SpeexBuffer *st, void *data, int len); - -int speex_buffer_writezeros(SpeexBuffer *st, int len); - -int speex_buffer_read(SpeexBuffer *st, void *data, int len); - -int speex_buffer_get_available(SpeexBuffer *st); - -int speex_buffer_resize(SpeexBuffer *st, int len); - -#ifdef __cplusplus -} -#endif - -#endif - - - - diff --git a/speex/include/speex/speex_echo.h b/speex/include/speex/speex_echo.h deleted file mode 100644 index 4c1aa5a5f2a43e5aa0eee7148b7bff21cb79d14c..0000000000000000000000000000000000000000 --- a/speex/include/speex/speex_echo.h +++ /dev/null @@ -1,170 +0,0 @@ -/* Copyright (C) Jean-Marc Valin */ -/** - @file speex_echo.h - @brief Echo cancellation -*/ -/* - 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. - - 3. The name of the author may not be used to endorse or promote products - derived from this software without specific prior written permission. - - 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 SPEEX_ECHO_H -#define SPEEX_ECHO_H -/** @defgroup SpeexEchoState SpeexEchoState: Acoustic echo canceller - * This is the acoustic echo canceller module. - * @{ - */ -#include "speexdsp_types.h" - -#ifdef __cplusplus -extern "C" { -#endif - -/** Obtain frame size used by the AEC */ -#define SPEEX_ECHO_GET_FRAME_SIZE 3 - -/** Set sampling rate */ -#define SPEEX_ECHO_SET_SAMPLING_RATE 24 -/** Get sampling rate */ -#define SPEEX_ECHO_GET_SAMPLING_RATE 25 - -/* Can't set window sizes */ -/** Get size of impulse response (int32) */ -#define SPEEX_ECHO_GET_IMPULSE_RESPONSE_SIZE 27 - -/* Can't set window content */ -/** Get impulse response (int32[]) */ -#define SPEEX_ECHO_GET_IMPULSE_RESPONSE 29 - -/** Internal echo canceller state. Should never be accessed directly. */ -struct SpeexEchoState_; - -/** @class SpeexEchoState - * This holds the state of the echo canceller. You need one per channel. -*/ - -/** Internal echo canceller state. Should never be accessed directly. */ -typedef struct SpeexEchoState_ SpeexEchoState; - -/** Creates a new echo canceller state - * @param frame_size Number of samples to process at one time (should correspond to 10-20 ms) - * @param filter_length Number of samples of echo to cancel (should generally correspond to 100-500 ms) - * @return Newly-created echo canceller state - */ -SpeexEchoState *speex_echo_state_init(int frame_size, int filter_length); - -/** Creates a new multi-channel echo canceller state - * @param frame_size Number of samples to process at one time (should correspond to 10-20 ms) - * @param filter_length Number of samples of echo to cancel (should generally correspond to 100-500 ms) - * @param nb_mic Number of microphone channels - * @param nb_speakers Number of speaker channels - * @return Newly-created echo canceller state - */ -SpeexEchoState *speex_echo_state_init_mc(int frame_size, int filter_length, int nb_mic, int nb_speakers); - -/** Destroys an echo canceller state - * @param st Echo canceller state -*/ -void speex_echo_state_destroy(SpeexEchoState *st); - -/** Performs echo cancellation a frame, based on the audio sent to the speaker (no delay is added - * to playback in this form) - * - * @param st Echo canceller state - * @param rec Signal from the microphone (near end + far end echo) - * @param play Signal played to the speaker (received from far end) - * @param out Returns near-end signal with echo removed - */ -void speex_echo_cancellation(SpeexEchoState *st, const spx_int16_t *rec, const spx_int16_t *play, spx_int16_t *out); - -/** Performs echo cancellation a frame (deprecated) */ -void speex_echo_cancel(SpeexEchoState *st, const spx_int16_t *rec, const spx_int16_t *play, spx_int16_t *out, spx_int32_t *Yout); - -/** Perform echo cancellation using internal playback buffer, which is delayed by two frames - * to account for the delay introduced by most soundcards (but it could be off!) - * @param st Echo canceller state - * @param rec Signal from the microphone (near end + far end echo) - * @param out Returns near-end signal with echo removed -*/ -void speex_echo_capture(SpeexEchoState *st, const spx_int16_t *rec, spx_int16_t *out); - -/** Let the echo canceller know that a frame was just queued to the soundcard - * @param st Echo canceller state - * @param play Signal played to the speaker (received from far end) -*/ -void speex_echo_playback(SpeexEchoState *st, const spx_int16_t *play); - -/** Reset the echo canceller to its original state - * @param st Echo canceller state - */ -void speex_echo_state_reset(SpeexEchoState *st); - -/** Used like the ioctl function to control the echo canceller parameters - * - * @param st Echo canceller state - * @param request ioctl-type request (one of the SPEEX_ECHO_* macros) - * @param ptr Data exchanged to-from function - * @return 0 if no error, -1 if request in unknown - */ -int speex_echo_ctl(SpeexEchoState *st, int request, void *ptr); - - - -struct SpeexDecorrState_; - -typedef struct SpeexDecorrState_ SpeexDecorrState; - - -/** Create a state for the channel decorrelation algorithm - This is useful for multi-channel echo cancellation only - * @param rate Sampling rate - * @param channels Number of channels (it's a bit pointless if you don't have at least 2) - * @param frame_size Size of the frame to process at ones (counting samples *per* channel) -*/ -SpeexDecorrState *speex_decorrelate_new(int rate, int channels, int frame_size); - -/** Remove correlation between the channels by modifying the phase and possibly - adding noise in a way that is not (or little) perceptible. - * @param st Decorrelator state - * @param in Input audio in interleaved format - * @param out Result of the decorrelation (out *may* alias in) - * @param strength How much alteration of the audio to apply from 0 to 100. -*/ -void speex_decorrelate(SpeexDecorrState *st, const spx_int16_t *in, spx_int16_t *out, int strength); - -/** Destroy a Decorrelation state - * @param st State to destroy -*/ -void speex_decorrelate_destroy(SpeexDecorrState *st); - - -#ifdef __cplusplus -} -#endif - - -/** @}*/ -#endif diff --git a/speex/include/speex/speex_jitter.h b/speex/include/speex/speex_jitter.h deleted file mode 100644 index 8fc8d7ec66bee31fcfd0bc30e6d9fd6c80213a41..0000000000000000000000000000000000000000 --- a/speex/include/speex/speex_jitter.h +++ /dev/null @@ -1,197 +0,0 @@ -/* Copyright (C) 2002 Jean-Marc Valin */ -/** - @file speex_jitter.h - @brief Adaptive jitter buffer for Speex -*/ -/* - 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 SPEEX_JITTER_H -#define SPEEX_JITTER_H -/** @defgroup JitterBuffer JitterBuffer: Adaptive jitter buffer - * This is the jitter buffer that reorders UDP/RTP packets and adjusts the buffer size - * to maintain good quality and low latency. - * @{ - */ - -#include "speexdsp_types.h" - -#ifdef __cplusplus -extern "C" { -#endif - -/** Generic adaptive jitter buffer state */ -struct JitterBuffer_; - -/** Generic adaptive jitter buffer state */ -typedef struct JitterBuffer_ JitterBuffer; - -/** Definition of an incoming packet */ -typedef struct _JitterBufferPacket JitterBufferPacket; - -/** Definition of an incoming packet */ -struct _JitterBufferPacket { - char *data; /**< Data bytes contained in the packet */ - spx_uint32_t len; /**< Length of the packet in bytes */ - spx_uint32_t timestamp; /**< Timestamp for the packet */ - spx_uint32_t span; /**< Time covered by the packet (same units as timestamp) */ - spx_uint16_t sequence; /**< RTP Sequence number if available (0 otherwise) */ - spx_uint32_t user_data; /**< Put whatever data you like here (it's ignored by the jitter buffer) */ -}; - -/** Packet has been retrieved */ -#define JITTER_BUFFER_OK 0 -/** Packet is lost or is late */ -#define JITTER_BUFFER_MISSING 1 -/** A "fake" packet is meant to be inserted here to increase buffering */ -#define JITTER_BUFFER_INSERTION 2 -/** There was an error in the jitter buffer */ -#define JITTER_BUFFER_INTERNAL_ERROR -1 -/** Invalid argument */ -#define JITTER_BUFFER_BAD_ARGUMENT -2 - - -/** Set minimum amount of extra buffering required (margin) */ -#define JITTER_BUFFER_SET_MARGIN 0 -/** Get minimum amount of extra buffering required (margin) */ -#define JITTER_BUFFER_GET_MARGIN 1 -/* JITTER_BUFFER_SET_AVAILABLE_COUNT wouldn't make sense */ - -/** Get the amount of available packets currently buffered */ -#define JITTER_BUFFER_GET_AVAILABLE_COUNT 3 -/** Included because of an early misspelling (will remove in next release) */ -#define JITTER_BUFFER_GET_AVALIABLE_COUNT 3 - -/** Assign a function to destroy unused packet. When setting that, the jitter - buffer no longer copies packet data. */ -#define JITTER_BUFFER_SET_DESTROY_CALLBACK 4 -/** */ -#define JITTER_BUFFER_GET_DESTROY_CALLBACK 5 - -/** Tell the jitter buffer to only adjust the delay in multiples of the step parameter provided */ -#define JITTER_BUFFER_SET_DELAY_STEP 6 -/** */ -#define JITTER_BUFFER_GET_DELAY_STEP 7 - -/** Tell the jitter buffer to only do concealment in multiples of the size parameter provided */ -#define JITTER_BUFFER_SET_CONCEALMENT_SIZE 8 -#define JITTER_BUFFER_GET_CONCEALMENT_SIZE 9 - -/** Absolute max amount of loss that can be tolerated regardless of the delay. Typical loss - should be half of that or less. */ -#define JITTER_BUFFER_SET_MAX_LATE_RATE 10 -#define JITTER_BUFFER_GET_MAX_LATE_RATE 11 - -/** Equivalent cost of one percent late packet in timestamp units */ -#define JITTER_BUFFER_SET_LATE_COST 12 -#define JITTER_BUFFER_GET_LATE_COST 13 - - -/** Initialises jitter buffer - * - * @param step_size Starting value for the size of concleanment packets and delay - adjustment steps. Can be changed at any time using JITTER_BUFFER_SET_DELAY_STEP - and JITTER_BUFFER_GET_CONCEALMENT_SIZE. - * @return Newly created jitter buffer state - */ -JitterBuffer *jitter_buffer_init(int step_size); - -/** Restores jitter buffer to its original state - * - * @param jitter Jitter buffer state - */ -void jitter_buffer_reset(JitterBuffer *jitter); - -/** Destroys jitter buffer - * - * @param jitter Jitter buffer state - */ -void jitter_buffer_destroy(JitterBuffer *jitter); - -/** Put one packet into the jitter buffer - * - * @param jitter Jitter buffer state - * @param packet Incoming packet -*/ -void jitter_buffer_put(JitterBuffer *jitter, const JitterBufferPacket *packet); - -/** Get one packet from the jitter buffer - * - * @param jitter Jitter buffer state - * @param packet Returned packet - * @param desired_span Number of samples (or units) we wish to get from the buffer (no guarantee) - * @param current_timestamp Timestamp for the returned packet -*/ -int jitter_buffer_get(JitterBuffer *jitter, JitterBufferPacket *packet, spx_int32_t desired_span, spx_int32_t *start_offset); - -/** Used right after jitter_buffer_get() to obtain another packet that would have the same timestamp. - * This is mainly useful for media where a single "frame" can be split into several packets. - * - * @param jitter Jitter buffer state - * @param packet Returned packet - */ -int jitter_buffer_get_another(JitterBuffer *jitter, JitterBufferPacket *packet); - -/** Get pointer timestamp of jitter buffer - * - * @param jitter Jitter buffer state -*/ -int jitter_buffer_get_pointer_timestamp(JitterBuffer *jitter); - -/** Advance by one tick - * - * @param jitter Jitter buffer state -*/ -void jitter_buffer_tick(JitterBuffer *jitter); - -/** Telling the jitter buffer about the remaining data in the application buffer - * @param jitter Jitter buffer state - * @param rem Amount of data buffered by the application (timestamp units) - */ -void jitter_buffer_remaining_span(JitterBuffer *jitter, spx_uint32_t rem); - -/** Used like the ioctl function to control the jitter buffer parameters - * - * @param jitter Jitter buffer state - * @param request ioctl-type request (one of the JITTER_BUFFER_* macros) - * @param ptr Data exchanged to-from function - * @return 0 if no error, -1 if request in unknown -*/ -int jitter_buffer_ctl(JitterBuffer *jitter, int request, void *ptr); - -int jitter_buffer_update_delay(JitterBuffer *jitter, JitterBufferPacket *packet, spx_int32_t *start_offset); - -/* @} */ - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/speex/include/speex/speex_preprocess.h b/speex/include/speex/speex_preprocess.h deleted file mode 100644 index a2e1210d41220c1d9fd1d752368a006f8f82c7c1..0000000000000000000000000000000000000000 --- a/speex/include/speex/speex_preprocess.h +++ /dev/null @@ -1,219 +0,0 @@ -/* Copyright (C) 2003 Epic Games - Written by Jean-Marc Valin */ -/** - * @file speex_preprocess.h - * @brief Speex preprocessor. The preprocess can do noise suppression, - * residual echo suppression (after using the echo canceller), automatic - * gain control (AGC) and voice activity detection (VAD). -*/ -/* - 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. - - 3. The name of the author may not be used to endorse or promote products - derived from this software without specific prior written permission. - - 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 SPEEX_PREPROCESS_H -#define SPEEX_PREPROCESS_H -/** @defgroup SpeexPreprocessState SpeexPreprocessState: The Speex preprocessor - * This is the Speex preprocessor. The preprocess can do noise suppression, - * residual echo suppression (after using the echo canceller), automatic - * gain control (AGC) and voice activity detection (VAD). - * @{ - */ - -#include "speexdsp_types.h" - -#ifdef __cplusplus -extern "C" { -#endif - -/** State of the preprocessor (one per channel). Should never be accessed directly. */ -struct SpeexPreprocessState_; - -/** State of the preprocessor (one per channel). Should never be accessed directly. */ -typedef struct SpeexPreprocessState_ SpeexPreprocessState; - - -/** Creates a new preprocessing state. You MUST create one state per channel processed. - * @param frame_size Number of samples to process at one time (should correspond to 10-20 ms). Must be - * the same value as that used for the echo canceller for residual echo cancellation to work. - * @param sampling_rate Sampling rate used for the input. - * @return Newly created preprocessor state -*/ -SpeexPreprocessState *speex_preprocess_state_init(int frame_size, int sampling_rate); - -/** Destroys a preprocessor state - * @param st Preprocessor state to destroy -*/ -void speex_preprocess_state_destroy(SpeexPreprocessState *st); - -/** Preprocess a frame - * @param st Preprocessor state - * @param x Audio sample vector (in and out). Must be same size as specified in speex_preprocess_state_init(). - * @return Bool value for voice activity (1 for speech, 0 for noise/silence), ONLY if VAD turned on. -*/ -int speex_preprocess_run(SpeexPreprocessState *st, spx_int16_t *x); - -/** Preprocess a frame (deprecated, use speex_preprocess_run() instead)*/ -int speex_preprocess(SpeexPreprocessState *st, spx_int16_t *x, spx_int32_t *echo); - -/** Update preprocessor state, but do not compute the output - * @param st Preprocessor state - * @param x Audio sample vector (in only). Must be same size as specified in speex_preprocess_state_init(). -*/ -void speex_preprocess_estimate_update(SpeexPreprocessState *st, spx_int16_t *x); - -/** Used like the ioctl function to control the preprocessor parameters - * @param st Preprocessor state - * @param request ioctl-type request (one of the SPEEX_PREPROCESS_* macros) - * @param ptr Data exchanged to-from function - * @return 0 if no error, -1 if request in unknown -*/ -int speex_preprocess_ctl(SpeexPreprocessState *st, int request, void *ptr); - - - -/** Set preprocessor denoiser state */ -#define SPEEX_PREPROCESS_SET_DENOISE 0 -/** Get preprocessor denoiser state */ -#define SPEEX_PREPROCESS_GET_DENOISE 1 - -/** Set preprocessor Automatic Gain Control state */ -#define SPEEX_PREPROCESS_SET_AGC 2 -/** Get preprocessor Automatic Gain Control state */ -#define SPEEX_PREPROCESS_GET_AGC 3 - -/** Set preprocessor Voice Activity Detection state */ -#define SPEEX_PREPROCESS_SET_VAD 4 -/** Get preprocessor Voice Activity Detection state */ -#define SPEEX_PREPROCESS_GET_VAD 5 - -/** Set preprocessor Automatic Gain Control level (float) */ -#define SPEEX_PREPROCESS_SET_AGC_LEVEL 6 -/** Get preprocessor Automatic Gain Control level (float) */ -#define SPEEX_PREPROCESS_GET_AGC_LEVEL 7 - -/** Set preprocessor dereverb state */ -#define SPEEX_PREPROCESS_SET_DEREVERB 8 -/** Get preprocessor dereverb state */ -#define SPEEX_PREPROCESS_GET_DEREVERB 9 - -/** Set preprocessor dereverb level */ -#define SPEEX_PREPROCESS_SET_DEREVERB_LEVEL 10 -/** Get preprocessor dereverb level */ -#define SPEEX_PREPROCESS_GET_DEREVERB_LEVEL 11 - -/** Set preprocessor dereverb decay */ -#define SPEEX_PREPROCESS_SET_DEREVERB_DECAY 12 -/** Get preprocessor dereverb decay */ -#define SPEEX_PREPROCESS_GET_DEREVERB_DECAY 13 - -/** Set probability required for the VAD to go from silence to voice */ -#define SPEEX_PREPROCESS_SET_PROB_START 14 -/** Get probability required for the VAD to go from silence to voice */ -#define SPEEX_PREPROCESS_GET_PROB_START 15 - -/** Set probability required for the VAD to stay in the voice state (integer percent) */ -#define SPEEX_PREPROCESS_SET_PROB_CONTINUE 16 -/** Get probability required for the VAD to stay in the voice state (integer percent) */ -#define SPEEX_PREPROCESS_GET_PROB_CONTINUE 17 - -/** Set maximum attenuation of the noise in dB (negative number) */ -#define SPEEX_PREPROCESS_SET_NOISE_SUPPRESS 18 -/** Get maximum attenuation of the noise in dB (negative number) */ -#define SPEEX_PREPROCESS_GET_NOISE_SUPPRESS 19 - -/** Set maximum attenuation of the residual echo in dB (negative number) */ -#define SPEEX_PREPROCESS_SET_ECHO_SUPPRESS 20 -/** Get maximum attenuation of the residual echo in dB (negative number) */ -#define SPEEX_PREPROCESS_GET_ECHO_SUPPRESS 21 - -/** Set maximum attenuation of the residual echo in dB when near end is active (negative number) */ -#define SPEEX_PREPROCESS_SET_ECHO_SUPPRESS_ACTIVE 22 -/** Get maximum attenuation of the residual echo in dB when near end is active (negative number) */ -#define SPEEX_PREPROCESS_GET_ECHO_SUPPRESS_ACTIVE 23 - -/** Set the corresponding echo canceller state so that residual echo suppression can be performed (NULL for no residual echo suppression) */ -#define SPEEX_PREPROCESS_SET_ECHO_STATE 24 -/** Get the corresponding echo canceller state */ -#define SPEEX_PREPROCESS_GET_ECHO_STATE 25 - -/** Set maximal gain increase in dB/second (int32) */ -#define SPEEX_PREPROCESS_SET_AGC_INCREMENT 26 - -/** Get maximal gain increase in dB/second (int32) */ -#define SPEEX_PREPROCESS_GET_AGC_INCREMENT 27 - -/** Set maximal gain decrease in dB/second (int32) */ -#define SPEEX_PREPROCESS_SET_AGC_DECREMENT 28 - -/** Get maximal gain decrease in dB/second (int32) */ -#define SPEEX_PREPROCESS_GET_AGC_DECREMENT 29 - -/** Set maximal gain in dB (int32) */ -#define SPEEX_PREPROCESS_SET_AGC_MAX_GAIN 30 - -/** Get maximal gain in dB (int32) */ -#define SPEEX_PREPROCESS_GET_AGC_MAX_GAIN 31 - -/* Can't set loudness */ -/** Get loudness */ -#define SPEEX_PREPROCESS_GET_AGC_LOUDNESS 33 - -/* Can't set gain */ -/** Get current gain (int32 percent) */ -#define SPEEX_PREPROCESS_GET_AGC_GAIN 35 - -/* Can't set spectrum size */ -/** Get spectrum size for power spectrum (int32) */ -#define SPEEX_PREPROCESS_GET_PSD_SIZE 37 - -/* Can't set power spectrum */ -/** Get power spectrum (int32[] of squared values) */ -#define SPEEX_PREPROCESS_GET_PSD 39 - -/* Can't set noise size */ -/** Get spectrum size for noise estimate (int32) */ -#define SPEEX_PREPROCESS_GET_NOISE_PSD_SIZE 41 - -/* Can't set noise estimate */ -/** Get noise estimate (int32[] of squared values) */ -#define SPEEX_PREPROCESS_GET_NOISE_PSD 43 - -/* Can't set speech probability */ -/** Get speech probability in last frame (int32). */ -#define SPEEX_PREPROCESS_GET_PROB 45 - -/** Set preprocessor Automatic Gain Control level (int32) */ -#define SPEEX_PREPROCESS_SET_AGC_TARGET 46 -/** Get preprocessor Automatic Gain Control level (int32) */ -#define SPEEX_PREPROCESS_GET_AGC_TARGET 47 - -#ifdef __cplusplus -} -#endif - -/** @}*/ -#endif diff --git a/speex/include/speex/speex_resampler.h b/speex/include/speex/speex_resampler.h deleted file mode 100644 index 901de37b3dabb38f114e04859bfc2103bfba8189..0000000000000000000000000000000000000000 --- a/speex/include/speex/speex_resampler.h +++ /dev/null @@ -1,343 +0,0 @@ -/* Copyright (C) 2007 Jean-Marc Valin - - File: speex_resampler.h - Resampling code - - The design goals of this code are: - - Very fast algorithm - - Low memory requirement - - Good *perceptual* quality (and not best SNR) - - 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. - - 3. The name of the author may not be used to endorse or promote products - derived from this software without specific prior written permission. - - 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 SPEEX_RESAMPLER_H -#define SPEEX_RESAMPLER_H - -#ifdef OUTSIDE_SPEEX - -/********* WARNING: MENTAL SANITY ENDS HERE *************/ - -/* If the resampler is defined outside of Speex, we change the symbol names so that - there won't be any clash if linking with Speex later on. */ - -/* #define RANDOM_PREFIX your software name here */ -#ifndef RANDOM_PREFIX -#error "Please define RANDOM_PREFIX (above) to something specific to your project to prevent symbol name clashes" -#endif - -#define CAT_PREFIX2(a,b) a ## b -#define CAT_PREFIX(a,b) CAT_PREFIX2(a, b) - -#define speex_resampler_init CAT_PREFIX(RANDOM_PREFIX,_resampler_init) -#define speex_resampler_init_frac CAT_PREFIX(RANDOM_PREFIX,_resampler_init_frac) -#define speex_resampler_destroy CAT_PREFIX(RANDOM_PREFIX,_resampler_destroy) -#define speex_resampler_process_float CAT_PREFIX(RANDOM_PREFIX,_resampler_process_float) -#define speex_resampler_process_int CAT_PREFIX(RANDOM_PREFIX,_resampler_process_int) -#define speex_resampler_process_interleaved_float CAT_PREFIX(RANDOM_PREFIX,_resampler_process_interleaved_float) -#define speex_resampler_process_interleaved_int CAT_PREFIX(RANDOM_PREFIX,_resampler_process_interleaved_int) -#define speex_resampler_set_rate CAT_PREFIX(RANDOM_PREFIX,_resampler_set_rate) -#define speex_resampler_get_rate CAT_PREFIX(RANDOM_PREFIX,_resampler_get_rate) -#define speex_resampler_set_rate_frac CAT_PREFIX(RANDOM_PREFIX,_resampler_set_rate_frac) -#define speex_resampler_get_ratio CAT_PREFIX(RANDOM_PREFIX,_resampler_get_ratio) -#define speex_resampler_set_quality CAT_PREFIX(RANDOM_PREFIX,_resampler_set_quality) -#define speex_resampler_get_quality CAT_PREFIX(RANDOM_PREFIX,_resampler_get_quality) -#define speex_resampler_set_input_stride CAT_PREFIX(RANDOM_PREFIX,_resampler_set_input_stride) -#define speex_resampler_get_input_stride CAT_PREFIX(RANDOM_PREFIX,_resampler_get_input_stride) -#define speex_resampler_set_output_stride CAT_PREFIX(RANDOM_PREFIX,_resampler_set_output_stride) -#define speex_resampler_get_output_stride CAT_PREFIX(RANDOM_PREFIX,_resampler_get_output_stride) -#define speex_resampler_get_input_latency CAT_PREFIX(RANDOM_PREFIX,_resampler_get_input_latency) -#define speex_resampler_get_output_latency CAT_PREFIX(RANDOM_PREFIX,_resampler_get_output_latency) -#define speex_resampler_skip_zeros CAT_PREFIX(RANDOM_PREFIX,_resampler_skip_zeros) -#define speex_resampler_reset_mem CAT_PREFIX(RANDOM_PREFIX,_resampler_reset_mem) -#define speex_resampler_strerror CAT_PREFIX(RANDOM_PREFIX,_resampler_strerror) - -#define spx_int16_t short -#define spx_int32_t int -#define spx_uint16_t unsigned short -#define spx_uint32_t unsigned int - -#define speex_assert(cond) - -#else /* OUTSIDE_SPEEX */ - -#include "speexdsp_types.h" - -#endif /* OUTSIDE_SPEEX */ - -#ifdef __cplusplus -extern "C" { -#endif - -#define SPEEX_RESAMPLER_QUALITY_MAX 10 -#define SPEEX_RESAMPLER_QUALITY_MIN 0 -#define SPEEX_RESAMPLER_QUALITY_DEFAULT 4 -#define SPEEX_RESAMPLER_QUALITY_VOIP 3 -#define SPEEX_RESAMPLER_QUALITY_DESKTOP 5 - -enum { - RESAMPLER_ERR_SUCCESS = 0, - RESAMPLER_ERR_ALLOC_FAILED = 1, - RESAMPLER_ERR_BAD_STATE = 2, - RESAMPLER_ERR_INVALID_ARG = 3, - RESAMPLER_ERR_PTR_OVERLAP = 4, - RESAMPLER_ERR_OVERFLOW = 5, - - RESAMPLER_ERR_MAX_ERROR -}; - -struct SpeexResamplerState_; -typedef struct SpeexResamplerState_ SpeexResamplerState; - -/** Create a new resampler with integer input and output rates. - * @param nb_channels Number of channels to be processed - * @param in_rate Input sampling rate (integer number of Hz). - * @param out_rate Output sampling rate (integer number of Hz). - * @param quality Resampling quality between 0 and 10, where 0 has poor quality - * and 10 has very high quality. - * @return Newly created resampler state - * @retval NULL Error: not enough memory - */ -SpeexResamplerState *speex_resampler_init(spx_uint32_t nb_channels, - spx_uint32_t in_rate, - spx_uint32_t out_rate, - int quality, - int *err); - -/** Create a new resampler with fractional input/output rates. The sampling - * rate ratio is an arbitrary rational number with both the numerator and - * denominator being 32-bit integers. - * @param nb_channels Number of channels to be processed - * @param ratio_num Numerator of the sampling rate ratio - * @param ratio_den Denominator of the sampling rate ratio - * @param in_rate Input sampling rate rounded to the nearest integer (in Hz). - * @param out_rate Output sampling rate rounded to the nearest integer (in Hz). - * @param quality Resampling quality between 0 and 10, where 0 has poor quality - * and 10 has very high quality. - * @return Newly created resampler state - * @retval NULL Error: not enough memory - */ -SpeexResamplerState *speex_resampler_init_frac(spx_uint32_t nb_channels, - spx_uint32_t ratio_num, - spx_uint32_t ratio_den, - spx_uint32_t in_rate, - spx_uint32_t out_rate, - int quality, - int *err); - -/** Destroy a resampler state. - * @param st Resampler state - */ -void speex_resampler_destroy(SpeexResamplerState *st); - -/** Resample a float array. The input and output buffers must *not* overlap. - * @param st Resampler state - * @param channel_index Index of the channel to process for the multi-channel - * base (0 otherwise) - * @param in Input buffer - * @param in_len Number of input samples in the input buffer. Returns the - * number of samples processed - * @param out Output buffer - * @param out_len Size of the output buffer. Returns the number of samples written - */ -int speex_resampler_process_float(SpeexResamplerState *st, - spx_uint32_t channel_index, - const float *in, - spx_uint32_t *in_len, - float *out, - spx_uint32_t *out_len); - -/** Resample an int array. The input and output buffers must *not* overlap. - * @param st Resampler state - * @param channel_index Index of the channel to process for the multi-channel - * base (0 otherwise) - * @param in Input buffer - * @param in_len Number of input samples in the input buffer. Returns the number - * of samples processed - * @param out Output buffer - * @param out_len Size of the output buffer. Returns the number of samples written - */ -int speex_resampler_process_int(SpeexResamplerState *st, - spx_uint32_t channel_index, - const spx_int16_t *in, - spx_uint32_t *in_len, - spx_int16_t *out, - spx_uint32_t *out_len); - -/** Resample an interleaved float array. The input and output buffers must *not* overlap. - * @param st Resampler state - * @param in Input buffer - * @param in_len Number of input samples in the input buffer. Returns the number - * of samples processed. This is all per-channel. - * @param out Output buffer - * @param out_len Size of the output buffer. Returns the number of samples written. - * This is all per-channel. - */ -int speex_resampler_process_interleaved_float(SpeexResamplerState *st, - const float *in, - spx_uint32_t *in_len, - float *out, - spx_uint32_t *out_len); - -/** Resample an interleaved int array. The input and output buffers must *not* overlap. - * @param st Resampler state - * @param in Input buffer - * @param in_len Number of input samples in the input buffer. Returns the number - * of samples processed. This is all per-channel. - * @param out Output buffer - * @param out_len Size of the output buffer. Returns the number of samples written. - * This is all per-channel. - */ -int speex_resampler_process_interleaved_int(SpeexResamplerState *st, - const spx_int16_t *in, - spx_uint32_t *in_len, - spx_int16_t *out, - spx_uint32_t *out_len); - -/** Set (change) the input/output sampling rates (integer value). - * @param st Resampler state - * @param in_rate Input sampling rate (integer number of Hz). - * @param out_rate Output sampling rate (integer number of Hz). - */ -int speex_resampler_set_rate(SpeexResamplerState *st, - spx_uint32_t in_rate, - spx_uint32_t out_rate); - -/** Get the current input/output sampling rates (integer value). - * @param st Resampler state - * @param in_rate Input sampling rate (integer number of Hz) copied. - * @param out_rate Output sampling rate (integer number of Hz) copied. - */ -void speex_resampler_get_rate(SpeexResamplerState *st, - spx_uint32_t *in_rate, - spx_uint32_t *out_rate); - -/** Set (change) the input/output sampling rates and resampling ratio - * (fractional values in Hz supported). - * @param st Resampler state - * @param ratio_num Numerator of the sampling rate ratio - * @param ratio_den Denominator of the sampling rate ratio - * @param in_rate Input sampling rate rounded to the nearest integer (in Hz). - * @param out_rate Output sampling rate rounded to the nearest integer (in Hz). - */ -int speex_resampler_set_rate_frac(SpeexResamplerState *st, - spx_uint32_t ratio_num, - spx_uint32_t ratio_den, - spx_uint32_t in_rate, - spx_uint32_t out_rate); - -/** Get the current resampling ratio. This will be reduced to the least - * common denominator. - * @param st Resampler state - * @param ratio_num Numerator of the sampling rate ratio copied - * @param ratio_den Denominator of the sampling rate ratio copied - */ -void speex_resampler_get_ratio(SpeexResamplerState *st, - spx_uint32_t *ratio_num, - spx_uint32_t *ratio_den); - -/** Set (change) the conversion quality. - * @param st Resampler state - * @param quality Resampling quality between 0 and 10, where 0 has poor - * quality and 10 has very high quality. - */ -int speex_resampler_set_quality(SpeexResamplerState *st, - int quality); - -/** Get the conversion quality. - * @param st Resampler state - * @param quality Resampling quality between 0 and 10, where 0 has poor - * quality and 10 has very high quality. - */ -void speex_resampler_get_quality(SpeexResamplerState *st, - int *quality); - -/** Set (change) the input stride. - * @param st Resampler state - * @param stride Input stride - */ -void speex_resampler_set_input_stride(SpeexResamplerState *st, - spx_uint32_t stride); - -/** Get the input stride. - * @param st Resampler state - * @param stride Input stride copied - */ -void speex_resampler_get_input_stride(SpeexResamplerState *st, - spx_uint32_t *stride); - -/** Set (change) the output stride. - * @param st Resampler state - * @param stride Output stride - */ -void speex_resampler_set_output_stride(SpeexResamplerState *st, - spx_uint32_t stride); - -/** Get the output stride. - * @param st Resampler state copied - * @param stride Output stride - */ -void speex_resampler_get_output_stride(SpeexResamplerState *st, - spx_uint32_t *stride); - -/** Get the latency introduced by the resampler measured in input samples. - * @param st Resampler state - */ -int speex_resampler_get_input_latency(SpeexResamplerState *st); - -/** Get the latency introduced by the resampler measured in output samples. - * @param st Resampler state - */ -int speex_resampler_get_output_latency(SpeexResamplerState *st); - -/** Make sure that the first samples to go out of the resamplers don't have - * leading zeros. This is only useful before starting to use a newly created - * resampler. It is recommended to use that when resampling an audio file, as - * it will generate a file with the same length. For real-time processing, - * it is probably easier not to use this call (so that the output duration - * is the same for the first frame). - * @param st Resampler state - */ -int speex_resampler_skip_zeros(SpeexResamplerState *st); - -/** Reset a resampler so a new (unrelated) stream can be processed. - * @param st Resampler state - */ -int speex_resampler_reset_mem(SpeexResamplerState *st); - -/** Returns the English meaning for an error code - * @param err Error code - * @return English string - */ -const char *speex_resampler_strerror(int err); - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/speex/include/speex/speexdsp_config_types.h b/speex/include/speex/speexdsp_config_types.h deleted file mode 100644 index ca1f5a3c20eca99b2f96def9ad18f7c93c63b326..0000000000000000000000000000000000000000 --- a/speex/include/speex/speexdsp_config_types.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef __SPEEX_TYPES_H__ -#define __SPEEX_TYPES_H__ - -#include - -typedef int16_t spx_int16_t; -typedef uint16_t spx_uint16_t; -typedef int32_t spx_int32_t; -typedef uint32_t spx_uint32_t; - -#endif - diff --git a/speex/include/speex/speexdsp_types.h b/speex/include/speex/speexdsp_types.h deleted file mode 100644 index 4b4a76a474af7f6fdd2f175815529edf951abe74..0000000000000000000000000000000000000000 --- a/speex/include/speex/speexdsp_types.h +++ /dev/null @@ -1,126 +0,0 @@ -/* speexdsp_types.h taken from libogg */ -/******************************************************************** - * * - * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. * - * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS * - * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE * - * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. * - * * - * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2002 * - * by the Xiph.Org Foundation http://www.xiph.org/ * - * * - ******************************************************************** - - function: #ifdef jail to whip a few platforms into the UNIX ideal. - last mod: $Id: os_types.h 7524 2004-08-11 04:20:36Z conrad $ - - ********************************************************************/ -/** - @file speexdsp_types.h - @brief Speex types -*/ -#ifndef _SPEEX_TYPES_H -#define _SPEEX_TYPES_H - -#if defined(_WIN32) - -# if defined(__CYGWIN__) -# include <_G_config.h> - typedef _G_int32_t spx_int32_t; - typedef _G_uint32_t spx_uint32_t; - typedef _G_int16_t spx_int16_t; - typedef _G_uint16_t spx_uint16_t; -# elif defined(__MINGW32__) - typedef short spx_int16_t; - typedef unsigned short spx_uint16_t; - typedef int spx_int32_t; - typedef unsigned int spx_uint32_t; -# elif defined(__MWERKS__) - typedef int spx_int32_t; - typedef unsigned int spx_uint32_t; - typedef short spx_int16_t; - typedef unsigned short spx_uint16_t; -# else - /* MSVC/Borland */ - typedef __int32 spx_int32_t; - typedef unsigned __int32 spx_uint32_t; - typedef __int16 spx_int16_t; - typedef unsigned __int16 spx_uint16_t; -# endif - -#elif defined(__MACOS__) - -# include - typedef SInt16 spx_int16_t; - typedef UInt16 spx_uint16_t; - typedef SInt32 spx_int32_t; - typedef UInt32 spx_uint32_t; - -#elif (defined(__APPLE__) && defined(__MACH__)) /* MacOS X Framework build */ - -# include - typedef int16_t spx_int16_t; - typedef u_int16_t spx_uint16_t; - typedef int32_t spx_int32_t; - typedef u_int32_t spx_uint32_t; - -#elif defined(__BEOS__) - - /* Be */ -# include - typedef int16_t spx_int16_t; - typedef u_int16_t spx_uint16_t; - typedef int32_t spx_int32_t; - typedef u_int32_t spx_uint32_t; - -#elif defined (__EMX__) - - /* OS/2 GCC */ - typedef short spx_int16_t; - typedef unsigned short spx_uint16_t; - typedef int spx_int32_t; - typedef unsigned int spx_uint32_t; - -#elif defined (DJGPP) - - /* DJGPP */ - typedef short spx_int16_t; - typedef int spx_int32_t; - typedef unsigned int spx_uint32_t; - -#elif defined(R5900) - - /* PS2 EE */ - typedef int spx_int32_t; - typedef unsigned spx_uint32_t; - typedef short spx_int16_t; - -#elif defined(__SYMBIAN32__) - - /* Symbian GCC */ - typedef signed short spx_int16_t; - typedef unsigned short spx_uint16_t; - typedef signed int spx_int32_t; - typedef unsigned int spx_uint32_t; - -#elif defined(CONFIG_TI_C54X) || defined (CONFIG_TI_C55X) - - typedef short spx_int16_t; - typedef unsigned short spx_uint16_t; - typedef long spx_int32_t; - typedef unsigned long spx_uint32_t; - -#elif defined(CONFIG_TI_C6X) - - typedef short spx_int16_t; - typedef unsigned short spx_uint16_t; - typedef int spx_int32_t; - typedef unsigned int spx_uint32_t; - -#else - -#include "speexdsp_config_types.h" - -#endif - -#endif /* _SPEEX_TYPES_H */ diff --git a/speex/libspeexdsp/.cvsignore b/speex/libspeexdsp/.cvsignore deleted file mode 100644 index 09a90ac7553055a9f23a5b2079072fe8b0d1529b..0000000000000000000000000000000000000000 --- a/speex/libspeexdsp/.cvsignore +++ /dev/null @@ -1,11 +0,0 @@ -.deps -.libs -*.la -*.lo -*.o -Makefile -Makefile.in -testdenoise -testenc -testenc_uwb -testenc_wb diff --git a/speex/libspeexdsp/Makefile.am b/speex/libspeexdsp/Makefile.am deleted file mode 100644 index bed1cc8e314ab6414c9f548c435053ccf769b358..0000000000000000000000000000000000000000 --- a/speex/libspeexdsp/Makefile.am +++ /dev/null @@ -1,46 +0,0 @@ -# Disable automatic dependency tracking if using other tools than gcc and gmake -#AUTOMAKE_OPTIONS = no-dependencies - -EXTRA_DIST=echo_diagnostic.m - -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include/speex -I$(top_builddir) @FFT_CFLAGS@ - -lib_LTLIBRARIES = libspeexdsp.la - -# Sources for compilation in the library -if BUILD_KISS_FFT - FFTSRC=kiss_fft.c _kiss_fft_guts.h kiss_fft.h kiss_fftr.c kiss_fftr.h -else -if BUILD_SMALLFT - FFTSRC=smallft.c -else - FFTSRC= -endif -endif - -libspeexdsp_la_SOURCES = preprocess.c jitter.c mdf.c fftwrap.c filterbank.c resample.c buffer.c scal.c $(FFTSRC) - -noinst_HEADERS = arch.h bfin.h \ - fixed_arm4.h \ - fixed_arm5e.h fixed_bfin.h fixed_debug.h \ - math_approx.h misc_bfin.h \ - stack_alloc.h fftwrap.h \ - filterbank.h fixed_generic.h os_support.h \ - pseudofloat.h smallft.h vorbis_psy.h resample_sse.h resample_neon.h - -libspeexdsp_la_LDFLAGS = -no-undefined -version-info @SPEEXDSP_LT_CURRENT@:@SPEEXDSP_LT_REVISION@:@SPEEXDSP_LT_AGE@ -libspeexdsp_la_LIBADD = $(LIBM) - -if BUILD_EXAMPLES -noinst_PROGRAMS = testdenoise testecho testjitter testresample testresample2 -testdenoise_SOURCES = testdenoise.c -testdenoise_LDADD = libspeexdsp.la @FFT_LIBS@ -testecho_SOURCES = testecho.c -testecho_LDADD = libspeexdsp.la @FFT_LIBS@ -testjitter_SOURCES = testjitter.c -testjitter_LDADD = libspeexdsp.la @FFT_LIBS@ -testresample_SOURCES = testresample.c -testresample_LDADD = libspeexdsp.la @FFT_LIBS@ @LIBM@ -testresample2_SOURCES = testresample2.c -testresample2_LDADD = libspeexdsp.la @FFT_LIBS@ @LIBM@ -endif diff --git a/speex/libspeexdsp/_kiss_fft_guts.h b/speex/libspeexdsp/_kiss_fft_guts.h deleted file mode 100644 index f5f2a5fd7691225a56ba27bd03fc417891fb9718..0000000000000000000000000000000000000000 --- a/speex/libspeexdsp/_kiss_fft_guts.h +++ /dev/null @@ -1,160 +0,0 @@ -/* -Copyright (c) 2003-2004, Mark Borgerding - -All rights reserved. - -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 author nor the names of any 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 COPYRIGHT OWNER 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. -*/ - -#define MIN(a,b) ((a)<(b) ? (a):(b)) -#define MAX(a,b) ((a)>(b) ? (a):(b)) - -/* kiss_fft.h - defines kiss_fft_scalar as either short or a float type - and defines - typedef struct { kiss_fft_scalar r; kiss_fft_scalar i; }kiss_fft_cpx; */ -#include "kiss_fft.h" -#include "math_approx.h" - -#define MAXFACTORS 32 -/* e.g. an fft of length 128 has 4 factors - as far as kissfft is concerned - 4*4*4*2 - */ - -struct kiss_fft_state{ - int nfft; - int inverse; - int factors[2*MAXFACTORS]; - kiss_fft_cpx twiddles[1]; -}; - -/* - Explanation of macros dealing with complex math: - - C_MUL(m,a,b) : m = a*b - C_FIXDIV( c , div ) : if a fixed point impl., c /= div. noop otherwise - C_SUB( res, a,b) : res = a - b - C_SUBFROM( res , a) : res -= a - C_ADDTO( res , a) : res += a - * */ -#ifdef FIXED_POINT -#include "arch.h" -# define FRACBITS 15 -# define SAMPPROD spx_int32_t -#define SAMP_MAX 32767 - -#define SAMP_MIN -SAMP_MAX - -#if defined(CHECK_OVERFLOW) -# define CHECK_OVERFLOW_OP(a,op,b) \ - if ( (SAMPPROD)(a) op (SAMPPROD)(b) > SAMP_MAX || (SAMPPROD)(a) op (SAMPPROD)(b) < SAMP_MIN ) { \ - fprintf(stderr,"WARNING:overflow @ " __FILE__ "(%d): (%d " #op" %d) = %ld\n",__LINE__,(a),(b),(SAMPPROD)(a) op (SAMPPROD)(b) ); } -#endif - - -# define smul(a,b) ( (SAMPPROD)(a)*(b) ) -# define sround( x ) (kiss_fft_scalar)( ( (x) + (1<<(FRACBITS-1)) ) >> FRACBITS ) - -# define S_MUL(a,b) sround( smul(a,b) ) - -# define C_MUL(m,a,b) \ - do{ (m).r = sround( smul((a).r,(b).r) - smul((a).i,(b).i) ); \ - (m).i = sround( smul((a).r,(b).i) + smul((a).i,(b).r) ); }while(0) - -# define C_MUL4(m,a,b) \ - do{ (m).r = PSHR32( smul((a).r,(b).r) - smul((a).i,(b).i),17 ); \ - (m).i = PSHR32( smul((a).r,(b).i) + smul((a).i,(b).r),17 ); }while(0) - -# define DIVSCALAR(x,k) \ - (x) = sround( smul( x, SAMP_MAX/k ) ) - -# define C_FIXDIV(c,div) \ - do { DIVSCALAR( (c).r , div); \ - DIVSCALAR( (c).i , div); }while (0) - -# define C_MULBYSCALAR( c, s ) \ - do{ (c).r = sround( smul( (c).r , s ) ) ;\ - (c).i = sround( smul( (c).i , s ) ) ; }while(0) - -#else /* not FIXED_POINT*/ - -# define S_MUL(a,b) ( (a)*(b) ) -#define C_MUL(m,a,b) \ - do{ (m).r = (a).r*(b).r - (a).i*(b).i;\ - (m).i = (a).r*(b).i + (a).i*(b).r; }while(0) - -#define C_MUL4(m,a,b) C_MUL(m,a,b) - -# define C_FIXDIV(c,div) /* NOOP */ -# define C_MULBYSCALAR( c, s ) \ - do{ (c).r *= (s);\ - (c).i *= (s); }while(0) -#endif - -#ifndef CHECK_OVERFLOW_OP -# define CHECK_OVERFLOW_OP(a,op,b) /* noop */ -#endif - -#define C_ADD( res, a,b)\ - do { \ - CHECK_OVERFLOW_OP((a).r,+,(b).r)\ - CHECK_OVERFLOW_OP((a).i,+,(b).i)\ - (res).r=(a).r+(b).r; (res).i=(a).i+(b).i; \ - }while(0) -#define C_SUB( res, a,b)\ - do { \ - CHECK_OVERFLOW_OP((a).r,-,(b).r)\ - CHECK_OVERFLOW_OP((a).i,-,(b).i)\ - (res).r=(a).r-(b).r; (res).i=(a).i-(b).i; \ - }while(0) -#define C_ADDTO( res , a)\ - do { \ - CHECK_OVERFLOW_OP((res).r,+,(a).r)\ - CHECK_OVERFLOW_OP((res).i,+,(a).i)\ - (res).r += (a).r; (res).i += (a).i;\ - }while(0) - -#define C_SUBFROM( res , a)\ - do {\ - CHECK_OVERFLOW_OP((res).r,-,(a).r)\ - CHECK_OVERFLOW_OP((res).i,-,(a).i)\ - (res).r -= (a).r; (res).i -= (a).i; \ - }while(0) - - -#ifdef FIXED_POINT -# define KISS_FFT_COS(phase) floor(MIN(32767,MAX(-32767,.5+32768 * cos (phase)))) -# define KISS_FFT_SIN(phase) floor(MIN(32767,MAX(-32767,.5+32768 * sin (phase)))) -# define HALF_OF(x) ((x)>>1) -#elif defined(USE_SIMD) -# define KISS_FFT_COS(phase) _mm_set1_ps( cos(phase) ) -# define KISS_FFT_SIN(phase) _mm_set1_ps( sin(phase) ) -# define HALF_OF(x) ((x)*_mm_set1_ps(.5)) -#else -# define KISS_FFT_COS(phase) (kiss_fft_scalar) cos(phase) -# define KISS_FFT_SIN(phase) (kiss_fft_scalar) sin(phase) -# define HALF_OF(x) ((x)*.5) -#endif - -#define kf_cexp(x,phase) \ - do{ \ - (x)->r = KISS_FFT_COS(phase);\ - (x)->i = KISS_FFT_SIN(phase);\ - }while(0) -#define kf_cexp2(x,phase) \ - do{ \ - (x)->r = spx_cos_norm((phase));\ - (x)->i = spx_cos_norm((phase)-32768);\ -}while(0) - - -/* a debugging function */ -#define pcpx(c)\ - fprintf(stderr,"%g + %gi\n",(double)((c)->r),(double)((c)->i) ) diff --git a/speex/libspeexdsp/arch.h b/speex/libspeexdsp/arch.h deleted file mode 100644 index 3ec968907e8d051f65b2553e4ae192bb9d881248..0000000000000000000000000000000000000000 --- a/speex/libspeexdsp/arch.h +++ /dev/null @@ -1,237 +0,0 @@ -/* Copyright (C) 2003 Jean-Marc Valin */ -/** - @file arch.h - @brief Various architecture definitions Speex -*/ -/* - 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 - -#define FLOATING_POINT - -/* A couple test to catch stupid option combinations */ -#ifdef FIXED_POINT - -#ifdef FLOATING_POINT -#error You cannot compile as floating point and fixed point at the same time -#endif -#ifdef USE_SSE -#error SSE is only for floating-point -#endif -#if ((defined (ARM4_ASM)||defined (ARM4_ASM)) && defined(BFIN_ASM)) || (defined (ARM4_ASM)&&defined(ARM5E_ASM)) -#error Make up your mind. What CPU do you have? -#endif -#ifdef VORBIS_PSYCHO -#error Vorbis-psy model currently not implemented in fixed-point -#endif - -#else - -#ifndef FLOATING_POINT -#error You now need to define either FIXED_POINT or FLOATING_POINT -#endif -#if defined (ARM4_ASM) || defined(ARM5E_ASM) || defined(BFIN_ASM) -#error I suppose you can have a [ARM4/ARM5E/Blackfin] that has float instructions? -#endif -#ifdef FIXED_POINT_DEBUG -#error "Don't you think enabling fixed-point is a good thing to do if you want to debug that?" -#endif - - -#endif - -#ifndef OUTSIDE_SPEEX -#include "speex/speexdsp_types.h" -#endif - -#define ABS(x) ((x) < 0 ? (-(x)) : (x)) /**< Absolute integer value. */ -#define ABS16(x) ((x) < 0 ? (-(x)) : (x)) /**< Absolute 16-bit value. */ -#define MIN16(a,b) ((a) < (b) ? (a) : (b)) /**< Maximum 16-bit value. */ -#define MAX16(a,b) ((a) > (b) ? (a) : (b)) /**< Maximum 16-bit value. */ -#define ABS32(x) ((x) < 0 ? (-(x)) : (x)) /**< Absolute 32-bit value. */ -#define MIN32(a,b) ((a) < (b) ? (a) : (b)) /**< Maximum 32-bit value. */ -#define MAX32(a,b) ((a) > (b) ? (a) : (b)) /**< Maximum 32-bit value. */ - -#ifdef FIXED_POINT - -typedef spx_int16_t spx_word16_t; -typedef spx_int32_t spx_word32_t; -typedef spx_word32_t spx_mem_t; -typedef spx_word16_t spx_coef_t; -typedef spx_word16_t spx_lsp_t; -typedef spx_word32_t spx_sig_t; - -#define Q15ONE 32767 - -#define LPC_SCALING 8192 -#define SIG_SCALING 16384 -#define LSP_SCALING 8192. -#define GAMMA_SCALING 32768. -#define GAIN_SCALING 64 -#define GAIN_SCALING_1 0.015625 - -#define LPC_SHIFT 13 -#define LSP_SHIFT 13 -#define SIG_SHIFT 14 -#define GAIN_SHIFT 6 - -#define WORD2INT(x) ((x) < -32767 ? -32768 : ((x) > 32766 ? 32767 : (x))) - -#define VERY_SMALL 0 -#define VERY_LARGE32 ((spx_word32_t)2147483647) -#define VERY_LARGE16 ((spx_word16_t)32767) -#define Q15_ONE ((spx_word16_t)32767) - - -#ifdef FIXED_DEBUG -#include "fixed_debug.h" -#else - -#include "fixed_generic.h" - -#ifdef ARM5E_ASM -#include "fixed_arm5e.h" -#elif defined (ARM4_ASM) -#include "fixed_arm4.h" -#elif defined (BFIN_ASM) -#include "fixed_bfin.h" -#endif - -#endif - - -#else - -typedef float spx_mem_t; -typedef float spx_coef_t; -typedef float spx_lsp_t; -typedef float spx_sig_t; -typedef float spx_word16_t; -typedef float spx_word32_t; - -#define Q15ONE 1.0f -#define LPC_SCALING 1.f -#define SIG_SCALING 1.f -#define LSP_SCALING 1.f -#define GAMMA_SCALING 1.f -#define GAIN_SCALING 1.f -#define GAIN_SCALING_1 1.f - - -#define VERY_SMALL 1e-15f -#define VERY_LARGE32 1e15f -#define VERY_LARGE16 1e15f -#define Q15_ONE ((spx_word16_t)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 SATURATE32PSHR(x,shift,a) (x) - -#define PSHR(a,shift) (a) -#define SHR(a,shift) (a) -#define SHL(a,shift) (a) -#define SATURATE(x,a) (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) ((spx_word32_t)(a)*(spx_word32_t)(b)) -#define MAC16_16(c,a,b) ((c)+(spx_word32_t)(a)*(spx_word32_t)(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_P15(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) (((spx_word32_t)(a))/(spx_word16_t)(b)) -#define PDIV32_16(a,b) (((spx_word32_t)(a))/(spx_word16_t)(b)) -#define DIV32(a,b) (((spx_word32_t)(a))/(spx_word32_t)(b)) -#define PDIV32(a,b) (((spx_word32_t)(a))/(spx_word32_t)(b)) - -#define WORD2INT(x) ((x) < -32767.5f ? -32768 : \ - ((x) > 32766.5f ? 32767 : (spx_int16_t)floor(.5 + (x)))) -#endif - - -#if defined (CONFIG_TI_C54X) || defined (CONFIG_TI_C55X) - -/* 2 on TI C5x DSP */ -#define BYTES_PER_CHAR 2 -#define BITS_PER_CHAR 16 -#define LOG2_BITS_PER_CHAR 4 - -#else - -#define BYTES_PER_CHAR 1 -#define BITS_PER_CHAR 8 -#define LOG2_BITS_PER_CHAR 3 - -#endif - - - -#ifdef FIXED_DEBUG -extern long long spx_mips; -#endif - - -#endif diff --git a/speex/libspeexdsp/bfin.h b/speex/libspeexdsp/bfin.h deleted file mode 100644 index b934cf2f139ea6d3c1c9803ee2f46b077097f861..0000000000000000000000000000000000000000 --- a/speex/libspeexdsp/bfin.h +++ /dev/null @@ -1,15 +0,0 @@ -/* Common Blackfin assembly defines - * - * Copyright (C) 2005-2009 Analog Devices - */ - -#if __GNUC__ <= 3 -/* GCC-3.4 and older did not use hardware loops and thus did not have - * register constraints for declaring clobbers. - */ -# define BFIN_HWLOOP0_REGS -# define BFIN_HWLOOP1_REGS -#else -# define BFIN_HWLOOP0_REGS , "LB0", "LT0", "LC0" -# define BFIN_HWLOOP1_REGS , "LB1", "LT1", "LC1" -#endif diff --git a/speex/libspeexdsp/buffer.c b/speex/libspeexdsp/buffer.c deleted file mode 100644 index b06a1554345c274a2925d4050a5b96a0baa3d473..0000000000000000000000000000000000000000 --- a/speex/libspeexdsp/buffer.c +++ /dev/null @@ -1,176 +0,0 @@ -/* Copyright (C) 2007 Jean-Marc Valin - - File: buffer.c - This is a very simple ring buffer implementation. It is not thread-safe - so you need to do your own locking. - - 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. - - 3. The name of the author may not be used to endorse or promote products - derived from this software without specific prior written permission. - - 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. -*/ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - - -#include "os_support.h" -#include "arch.h" -#include "speex/speex_buffer.h" - -struct SpeexBuffer_ { - char *data; - int size; - int read_ptr; - int write_ptr; - int available; -}; - -EXPORT SpeexBuffer *speex_buffer_init(int size) -{ - SpeexBuffer *st = speex_alloc(sizeof(SpeexBuffer)); - st->data = speex_alloc(size); - st->size = size; - st->read_ptr = 0; - st->write_ptr = 0; - st->available = 0; - return st; -} - -EXPORT void speex_buffer_destroy(SpeexBuffer *st) -{ - speex_free(st->data); - speex_free(st); -} - -EXPORT int speex_buffer_write(SpeexBuffer *st, void *_data, int len) -{ - int end; - int end1; - char *data = _data; - if (len > st->size) - { - data += len-st->size; - len = st->size; - } - end = st->write_ptr + len; - end1 = end; - if (end1 > st->size) - end1 = st->size; - SPEEX_COPY(st->data + st->write_ptr, data, end1 - st->write_ptr); - if (end > st->size) - { - end -= st->size; - SPEEX_COPY(st->data, data+end1 - st->write_ptr, end); - } - st->available += len; - if (st->available > st->size) - { - st->available = st->size; - st->read_ptr = st->write_ptr; - } - st->write_ptr += len; - if (st->write_ptr > st->size) - st->write_ptr -= st->size; - return len; -} - -EXPORT int speex_buffer_writezeros(SpeexBuffer *st, int len) -{ - /* This is almost the same as for speex_buffer_write() but using - SPEEX_MEMSET() instead of SPEEX_COPY(). Update accordingly. */ - int end; - int end1; - if (len > st->size) - { - len = st->size; - } - end = st->write_ptr + len; - end1 = end; - if (end1 > st->size) - end1 = st->size; - SPEEX_MEMSET(st->data + st->write_ptr, 0, end1 - st->write_ptr); - if (end > st->size) - { - end -= st->size; - SPEEX_MEMSET(st->data, 0, end); - } - st->available += len; - if (st->available > st->size) - { - st->available = st->size; - st->read_ptr = st->write_ptr; - } - st->write_ptr += len; - if (st->write_ptr > st->size) - st->write_ptr -= st->size; - return len; -} - -EXPORT int speex_buffer_read(SpeexBuffer *st, void *_data, int len) -{ - int end, end1; - char *data = _data; - if (len > st->available) - { - SPEEX_MEMSET(data+st->available, 0, len - st->available); - len = st->available; - } - end = st->read_ptr + len; - end1 = end; - if (end1 > st->size) - end1 = st->size; - SPEEX_COPY(data, st->data + st->read_ptr, end1 - st->read_ptr); - - if (end > st->size) - { - end -= st->size; - SPEEX_COPY(data+end1 - st->read_ptr, st->data, end); - } - st->available -= len; - st->read_ptr += len; - if (st->read_ptr > st->size) - st->read_ptr -= st->size; - return len; -} - -EXPORT int speex_buffer_get_available(SpeexBuffer *st) -{ - return st->available; -} - -EXPORT int speex_buffer_resize(SpeexBuffer *st, int len) -{ - int old_len = st->size; - if (len > old_len) - { - st->data = speex_realloc(st->data, len); - /* FIXME: move data/pointers properly for growing the buffer */ - } else { - /* FIXME: move data/pointers properly for shrinking the buffer */ - st->data = speex_realloc(st->data, len); - } - return len; -} diff --git a/speex/libspeexdsp/echo_diagnostic.m b/speex/libspeexdsp/echo_diagnostic.m deleted file mode 100644 index aebf390672a10af34ffe85152de626e8fb090b6a..0000000000000000000000000000000000000000 --- a/speex/libspeexdsp/echo_diagnostic.m +++ /dev/null @@ -1,72 +0,0 @@ -% Attempts to diagnose AEC problems from recorded samples -% -% out = echo_diagnostic(rec_file, play_file, out_file, tail_length) -% -% Computes the full matrix inversion to cancel echo from the -% recording 'rec_file' using the far end signal 'play_file' using -% a filter length of 'tail_length'. The output is saved to 'out_file'. -function out = echo_diagnostic(rec_file, play_file, out_file, tail_length) - -F=fopen(rec_file,'rb'); -rec=fread(F,Inf,'short'); -fclose (F); -F=fopen(play_file,'rb'); -play=fread(F,Inf,'short'); -fclose (F); - -rec = [rec; zeros(1024,1)]; -play = [play; zeros(1024,1)]; - -N = length(rec); -corr = real(ifft(fft(rec).*conj(fft(play)))); -acorr = real(ifft(fft(play).*conj(fft(play)))); - -[a,b] = max(corr); - -if b > N/2 - b = b-N; -end -printf ("Far end to near end delay is %d samples\n", b); -if (b > .3*tail_length) - printf ('This is too much delay, try delaying the far-end signal a bit\n'); -else if (b < 0) - printf ('You have a negative delay, the echo canceller has no chance to cancel anything!\n'); - else - printf ('Delay looks OK.\n'); - end - end -end -N2 = round(N/2); -corr1 = real(ifft(fft(rec(1:N2)).*conj(fft(play(1:N2))))); -corr2 = real(ifft(fft(rec(N2+1:end)).*conj(fft(play(N2+1:end))))); - -[a,b1] = max(corr1); -if b1 > N2/2 - b1 = b1-N2; -end -[a,b2] = max(corr2); -if b2 > N2/2 - b2 = b2-N2; -end -drift = (b1-b2)/N2; -printf ('Drift estimate is %f%% (%d samples)\n', 100*drift, b1-b2); -if abs(b1-b2) < 10 - printf ('A drift of a few (+-10) samples is normal.\n'); -else - if abs(b1-b2) < 30 - printf ('There may be (not sure) excessive clock drift. Is the capture and playback done on the same soundcard?\n'); - else - printf ('Your clock is drifting! No way the AEC will be able to do anything with that. Most likely, you''re doing capture and playback from two different cards.\n'); - end - end -end -acorr(1) = .001+1.00001*acorr(1); -AtA = toeplitz(acorr(1:tail_length)); -bb = corr(1:tail_length); -h = AtA\bb; - -out = (rec - filter(h, 1, play)); - -F=fopen(out_file,'w'); -fwrite(F,out,'short'); -fclose (F); diff --git a/speex/libspeexdsp/fftwrap.c b/speex/libspeexdsp/fftwrap.c deleted file mode 100644 index 4573479d006ce63be67f50e8cfc474380b257388..0000000000000000000000000000000000000000 --- a/speex/libspeexdsp/fftwrap.c +++ /dev/null @@ -1,448 +0,0 @@ -/* Copyright (C) 2005-2006 Jean-Marc Valin - File: fftwrap.c - - Wrapper for various FFTs - - 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 - -#include "arch.h" -#include "os_support.h" - -#define MAX_FFT_SIZE 2048 - -#ifdef FIXED_POINT -static int maximize_range(spx_word16_t *in, spx_word16_t *out, spx_word16_t bound, int len) -{ - int i, shift; - spx_word16_t max_val = 0; - for (i=0;imax_val) - max_val = in[i]; - if (-in[i]>max_val) - max_val = -in[i]; - } - shift=0; - while (max_val <= (bound>>1) && max_val != 0) - { - max_val <<= 1; - shift++; - } - for (i=0;i - -void *spx_fft_init(int size) -{ - struct drft_lookup *table; - table = speex_alloc(sizeof(struct drft_lookup)); - spx_drft_init((struct drft_lookup *)table, size); - return (void*)table; -} - -void spx_fft_destroy(void *table) -{ - spx_drft_clear(table); - speex_free(table); -} - -void spx_fft(void *table, float *in, float *out) -{ - if (in==out) - { - int i; - float scale = 1./((struct drft_lookup *)table)->n; - speex_warning("FFT should not be done in-place"); - for (i=0;i<((struct drft_lookup *)table)->n;i++) - out[i] = scale*in[i]; - } else { - int i; - float scale = 1./((struct drft_lookup *)table)->n; - for (i=0;i<((struct drft_lookup *)table)->n;i++) - out[i] = scale*in[i]; - } - spx_drft_forward((struct drft_lookup *)table, out); -} - -void spx_ifft(void *table, float *in, float *out) -{ - if (in==out) - { - speex_warning("FFT should not be done in-place"); - } else { - int i; - for (i=0;i<((struct drft_lookup *)table)->n;i++) - out[i] = in[i]; - } - spx_drft_backward((struct drft_lookup *)table, out); -} - -#elif defined(USE_INTEL_MKL) -#include - -struct mkl_config { - DFTI_DESCRIPTOR_HANDLE desc; - int N; -}; - -void *spx_fft_init(int size) -{ - struct mkl_config *table = (struct mkl_config *) speex_alloc(sizeof(struct mkl_config)); - table->N = size; - DftiCreateDescriptor(&table->desc, DFTI_SINGLE, DFTI_REAL, 1, size); - DftiSetValue(table->desc, DFTI_PACKED_FORMAT, DFTI_PACK_FORMAT); - DftiSetValue(table->desc, DFTI_PLACEMENT, DFTI_NOT_INPLACE); - DftiSetValue(table->desc, DFTI_FORWARD_SCALE, 1.0f / size); - DftiCommitDescriptor(table->desc); - return table; -} - -void spx_fft_destroy(void *table) -{ - struct mkl_config *t = (struct mkl_config *) table; - DftiFreeDescriptor(t->desc); - speex_free(table); -} - -void spx_fft(void *table, spx_word16_t *in, spx_word16_t *out) -{ - struct mkl_config *t = (struct mkl_config *) table; - DftiComputeForward(t->desc, in, out); -} - -void spx_ifft(void *table, spx_word16_t *in, spx_word16_t *out) -{ - struct mkl_config *t = (struct mkl_config *) table; - DftiComputeBackward(t->desc, in, out); -} - -#elif defined(USE_INTEL_IPP) - -#include - -struct ipp_fft_config -{ - IppsDFTSpec_R_32f *dftSpec; - Ipp8u *buffer; -}; - -void *spx_fft_init(int size) -{ - int bufferSize = 0; - int hint; - struct ipp_fft_config *table; - - table = (struct ipp_fft_config *)speex_alloc(sizeof(struct ipp_fft_config)); - - /* there appears to be no performance difference between ippAlgHintFast and - ippAlgHintAccurate when using the with the floating point version - of the fft. */ - hint = ippAlgHintAccurate; - - ippsDFTInitAlloc_R_32f(&table->dftSpec, size, IPP_FFT_DIV_FWD_BY_N, hint); - - ippsDFTGetBufSize_R_32f(table->dftSpec, &bufferSize); - table->buffer = ippsMalloc_8u(bufferSize); - - return table; -} - -void spx_fft_destroy(void *table) -{ - struct ipp_fft_config *t = (struct ipp_fft_config *)table; - ippsFree(t->buffer); - ippsDFTFree_R_32f(t->dftSpec); - speex_free(t); -} - -void spx_fft(void *table, spx_word16_t *in, spx_word16_t *out) -{ - struct ipp_fft_config *t = (struct ipp_fft_config *)table; - ippsDFTFwd_RToPack_32f(in, out, t->dftSpec, t->buffer); -} - -void spx_ifft(void *table, spx_word16_t *in, spx_word16_t *out) -{ - struct ipp_fft_config *t = (struct ipp_fft_config *)table; - ippsDFTInv_PackToR_32f(in, out, t->dftSpec, t->buffer); -} - -#elif defined(USE_GPL_FFTW3) - -#include - -struct fftw_config { - float *in; - float *out; - fftwf_plan fft; - fftwf_plan ifft; - int N; -}; - -void *spx_fft_init(int size) -{ - struct fftw_config *table = (struct fftw_config *) speex_alloc(sizeof(struct fftw_config)); - table->in = fftwf_malloc(sizeof(float) * (size+2)); - table->out = fftwf_malloc(sizeof(float) * (size+2)); - - table->fft = fftwf_plan_dft_r2c_1d(size, table->in, (fftwf_complex *) table->out, FFTW_PATIENT); - table->ifft = fftwf_plan_dft_c2r_1d(size, (fftwf_complex *) table->in, table->out, FFTW_PATIENT); - - table->N = size; - return table; -} - -void spx_fft_destroy(void *table) -{ - struct fftw_config *t = (struct fftw_config *) table; - fftwf_destroy_plan(t->fft); - fftwf_destroy_plan(t->ifft); - fftwf_free(t->in); - fftwf_free(t->out); - speex_free(table); -} - - -void spx_fft(void *table, spx_word16_t *in, spx_word16_t *out) -{ - int i; - struct fftw_config *t = (struct fftw_config *) table; - const int N = t->N; - float *iptr = t->in; - float *optr = t->out; - const float m = 1.0 / N; - for(i=0;ifft); - - out[0] = optr[0]; - for(i=1;iN; - float *iptr = t->in; - float *optr = t->out; - - iptr[0] = in[0]; - iptr[1] = 0.0f; - for(i=1;iifft); - - for(i=0;iforward = kiss_fftr_alloc(size,0,NULL,NULL); - table->backward = kiss_fftr_alloc(size,1,NULL,NULL); - table->N = size; - return table; -} - -void spx_fft_destroy(void *table) -{ - struct kiss_config *t = (struct kiss_config *)table; - kiss_fftr_free(t->forward); - kiss_fftr_free(t->backward); - speex_free(table); -} - -#ifdef FIXED_POINT - -void spx_fft(void *table, spx_word16_t *in, spx_word16_t *out) -{ - int shift; - struct kiss_config *t = (struct kiss_config *)table; - shift = maximize_range(in, in, 32000, t->N); - kiss_fftr2(t->forward, in, out); - renorm_range(in, in, shift, t->N); - renorm_range(out, out, shift, t->N); -} - -#else - -void spx_fft(void *table, spx_word16_t *in, spx_word16_t *out) -{ - int i; - float scale; - struct kiss_config *t = (struct kiss_config *)table; - scale = 1./t->N; - kiss_fftr2(t->forward, in, out); - for (i=0;iN;i++) - out[i] *= scale; -} -#endif - -void spx_ifft(void *table, spx_word16_t *in, spx_word16_t *out) -{ - struct kiss_config *t = (struct kiss_config *)table; - kiss_fftri2(t->backward, in, out); -} - - -#else - -#error No other FFT implemented - -#endif - - -#ifdef FIXED_POINT -/*#include "smallft.h"*/ - - -void spx_fft_float(void *table, float *in, float *out) -{ - int i; -#ifdef USE_SMALLFT - int N = ((struct drft_lookup *)table)->n; -#elif defined(USE_KISS_FFT) - int N = ((struct kiss_config *)table)->N; -#else -#endif -#ifdef VAR_ARRAYS - spx_word16_t _in[N]; - spx_word16_t _out[N]; -#else - spx_word16_t _in[MAX_FFT_SIZE]; - spx_word16_t _out[MAX_FFT_SIZE]; -#endif - for (i=0;iN); - scale = 1./((struct kiss_config *)table)->N; - for (i=0;i<((struct kiss_config *)table)->N;i++) - out[i] = scale*in[i]; - spx_drft_forward(&t, out); - spx_drft_clear(&t); - } -#endif -} - -void spx_ifft_float(void *table, float *in, float *out) -{ - int i; -#ifdef USE_SMALLFT - int N = ((struct drft_lookup *)table)->n; -#elif defined(USE_KISS_FFT) - int N = ((struct kiss_config *)table)->N; -#else -#endif -#ifdef VAR_ARRAYS - spx_word16_t _in[N]; - spx_word16_t _out[N]; -#else - spx_word16_t _in[MAX_FFT_SIZE]; - spx_word16_t _out[MAX_FFT_SIZE]; -#endif - for (i=0;iN); - for (i=0;i<((struct kiss_config *)table)->N;i++) - out[i] = in[i]; - spx_drft_backward(&t, out); - spx_drft_clear(&t); - } -#endif -} - -#else - -void spx_fft_float(void *table, float *in, float *out) -{ - spx_fft(table, in, out); -} -void spx_ifft_float(void *table, float *in, float *out) -{ - spx_ifft(table, in, out); -} - -#endif diff --git a/speex/libspeexdsp/fftwrap.h b/speex/libspeexdsp/fftwrap.h deleted file mode 100644 index 2c0742559c11f9ab686654a2dc6cacf54bb58dc1..0000000000000000000000000000000000000000 --- a/speex/libspeexdsp/fftwrap.h +++ /dev/null @@ -1,58 +0,0 @@ -/* Copyright (C) 2005 Jean-Marc Valin - File: fftwrap.h - - Wrapper for various FFTs - - 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 FFTWRAP_H -#define FFTWRAP_H - -#include "arch.h" - -/** Compute tables for an FFT */ -void *spx_fft_init(int size); - -/** Destroy tables for an FFT */ -void spx_fft_destroy(void *table); - -/** Forward (real to half-complex) transform */ -void spx_fft(void *table, spx_word16_t *in, spx_word16_t *out); - -/** Backward (half-complex to real) transform */ -void spx_ifft(void *table, spx_word16_t *in, spx_word16_t *out); - -/** Forward (real to half-complex) transform of float data */ -void spx_fft_float(void *table, float *in, float *out); - -/** Backward (half-complex to real) transform of float data */ -void spx_ifft_float(void *table, float *in, float *out); - -#endif diff --git a/speex/libspeexdsp/filterbank.c b/speex/libspeexdsp/filterbank.c deleted file mode 100644 index c8fdd7a2a16a5cadf23d640920b333aa9fcf14ba..0000000000000000000000000000000000000000 --- a/speex/libspeexdsp/filterbank.c +++ /dev/null @@ -1,227 +0,0 @@ -/* Copyright (C) 2006 Jean-Marc Valin */ -/** - @file filterbank.c - @brief Converting between psd and filterbank - */ -/* - 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. - - 3. The name of the author may not be used to endorse or promote products - derived from this software without specific prior written permission. - - 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. -*/ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "filterbank.h" -#include "arch.h" -#include -#include "math_approx.h" -#include "os_support.h" - -#ifdef FIXED_POINT - -#define toBARK(n) (MULT16_16(26829,spx_atan(SHR32(MULT16_16(97,n),2))) + MULT16_16(4588,spx_atan(MULT16_32_Q15(20,MULT16_16(n,n)))) + MULT16_16(3355,n)) - -#else -#define toBARK(n) (13.1f*atan(.00074f*(n))+2.24f*atan((n)*(n)*1.85e-8f)+1e-4f*(n)) -#endif - -#define toMEL(n) (2595.f*log10(1.f+(n)/700.f)) - -FilterBank *filterbank_new(int banks, spx_word32_t sampling, int len, int type) -{ - FilterBank *bank; - spx_word32_t df; - spx_word32_t max_mel, mel_interval; - int i; - int id1; - int id2; - df = DIV32(SHL32(sampling,15),MULT16_16(2,len)); - max_mel = toBARK(EXTRACT16(sampling/2)); - mel_interval = PDIV32(max_mel,banks-1); - - bank = (FilterBank*)speex_alloc(sizeof(FilterBank)); - bank->nb_banks = banks; - bank->len = len; - bank->bank_left = (int*)speex_alloc(len*sizeof(int)); - bank->bank_right = (int*)speex_alloc(len*sizeof(int)); - bank->filter_left = (spx_word16_t*)speex_alloc(len*sizeof(spx_word16_t)); - bank->filter_right = (spx_word16_t*)speex_alloc(len*sizeof(spx_word16_t)); - /* Think I can safely disable normalisation that for fixed-point (and probably float as well) */ -#ifndef FIXED_POINT - bank->scaling = (float*)speex_alloc(banks*sizeof(float)); -#endif - for (i=0;i max_mel) - break; -#ifdef FIXED_POINT - id1 = DIV32(mel,mel_interval); -#else - id1 = (int)(floor(mel/mel_interval)); -#endif - if (id1>banks-2) - { - id1 = banks-2; - val = Q15_ONE; - } else { - val = DIV32_16(mel - id1*mel_interval,EXTRACT16(PSHR32(mel_interval,15))); - } - id2 = id1+1; - bank->bank_left[i] = id1; - bank->filter_left[i] = SUB16(Q15_ONE,val); - bank->bank_right[i] = id2; - bank->filter_right[i] = val; - } - - /* Think I can safely disable normalisation for fixed-point (and probably float as well) */ -#ifndef FIXED_POINT - for (i=0;inb_banks;i++) - bank->scaling[i] = 0; - for (i=0;ilen;i++) - { - int id = bank->bank_left[i]; - bank->scaling[id] += bank->filter_left[i]; - id = bank->bank_right[i]; - bank->scaling[id] += bank->filter_right[i]; - } - for (i=0;inb_banks;i++) - bank->scaling[i] = Q15_ONE/(bank->scaling[i]); -#endif - return bank; -} - -void filterbank_destroy(FilterBank *bank) -{ - speex_free(bank->bank_left); - speex_free(bank->bank_right); - speex_free(bank->filter_left); - speex_free(bank->filter_right); -#ifndef FIXED_POINT - speex_free(bank->scaling); -#endif - speex_free(bank); -} - -void filterbank_compute_bank32(FilterBank *bank, spx_word32_t *ps, spx_word32_t *mel) -{ - int i; - for (i=0;inb_banks;i++) - mel[i] = 0; - - for (i=0;ilen;i++) - { - int id; - id = bank->bank_left[i]; - mel[id] += MULT16_32_P15(bank->filter_left[i],ps[i]); - id = bank->bank_right[i]; - mel[id] += MULT16_32_P15(bank->filter_right[i],ps[i]); - } - /* Think I can safely disable normalisation that for fixed-point (and probably float as well) */ -#ifndef FIXED_POINT - /*for (i=0;inb_banks;i++) - mel[i] = MULT16_32_P15(Q15(bank->scaling[i]),mel[i]); - */ -#endif -} - -void filterbank_compute_psd16(FilterBank *bank, spx_word16_t *mel, spx_word16_t *ps) -{ - int i; - for (i=0;ilen;i++) - { - spx_word32_t tmp; - int id1, id2; - id1 = bank->bank_left[i]; - id2 = bank->bank_right[i]; - tmp = MULT16_16(mel[id1],bank->filter_left[i]); - tmp += MULT16_16(mel[id2],bank->filter_right[i]); - ps[i] = EXTRACT16(PSHR32(tmp,15)); - } -} - - -#ifndef FIXED_POINT -void filterbank_compute_bank(FilterBank *bank, float *ps, float *mel) -{ - int i; - for (i=0;inb_banks;i++) - mel[i] = 0; - - for (i=0;ilen;i++) - { - int id = bank->bank_left[i]; - mel[id] += bank->filter_left[i]*ps[i]; - id = bank->bank_right[i]; - mel[id] += bank->filter_right[i]*ps[i]; - } - for (i=0;inb_banks;i++) - mel[i] *= bank->scaling[i]; -} - -void filterbank_compute_psd(FilterBank *bank, float *mel, float *ps) -{ - int i; - for (i=0;ilen;i++) - { - int id = bank->bank_left[i]; - ps[i] = mel[id]*bank->filter_left[i]; - id = bank->bank_right[i]; - ps[i] += mel[id]*bank->filter_right[i]; - } -} - -void filterbank_psy_smooth(FilterBank *bank, float *ps, float *mask) -{ - /* Low freq slope: 14 dB/Bark*/ - /* High freq slope: 9 dB/Bark*/ - /* Noise vs tone: 5 dB difference */ - /* FIXME: Temporary kludge */ - float bark[100]; - int i; - /* Assumes 1/3 Bark resolution */ - float decay_low = 0.34145f; - float decay_high = 0.50119f; - filterbank_compute_bank(bank, ps, bark); - for (i=1;inb_banks;i++) - { - /*float decay_high = 13-1.6*log10(bark[i-1]); - decay_high = pow(10,(-decay_high/30.f));*/ - bark[i] = bark[i] + decay_high*bark[i-1]; - } - for (i=bank->nb_banks-2;i>=0;i--) - { - bark[i] = bark[i] + decay_low*bark[i+1]; - } - filterbank_compute_psd(bank, bark, mask); -} - -#endif diff --git a/speex/libspeexdsp/filterbank.h b/speex/libspeexdsp/filterbank.h deleted file mode 100644 index 3e889a22f7913ada9949d62e714fb71db332b081..0000000000000000000000000000000000000000 --- a/speex/libspeexdsp/filterbank.h +++ /dev/null @@ -1,66 +0,0 @@ -/* Copyright (C) 2006 Jean-Marc Valin */ -/** - @file filterbank.h - @brief Converting between psd and filterbank - */ -/* - 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. - - 3. The name of the author may not be used to endorse or promote products - derived from this software without specific prior written permission. - - 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 FILTERBANK_H -#define FILTERBANK_H - -#include "arch.h" - -typedef struct { - int *bank_left; - int *bank_right; - spx_word16_t *filter_left; - spx_word16_t *filter_right; -#ifndef FIXED_POINT - float *scaling; -#endif - int nb_banks; - int len; -} FilterBank; - - -FilterBank *filterbank_new(int banks, spx_word32_t sampling, int len, int type); - -void filterbank_destroy(FilterBank *bank); - -void filterbank_compute_bank32(FilterBank *bank, spx_word32_t *ps, spx_word32_t *mel); - -void filterbank_compute_psd16(FilterBank *bank, spx_word16_t *mel, spx_word16_t *psd); - -#ifndef FIXED_POINT -void filterbank_compute_bank(FilterBank *bank, float *psd, float *mel); -void filterbank_compute_psd(FilterBank *bank, float *mel, float *psd); -#endif - - -#endif diff --git a/speex/libspeexdsp/fixed_arm4.h b/speex/libspeexdsp/fixed_arm4.h deleted file mode 100644 index 223478c9083955231293b0b89d62f15d29177f90..0000000000000000000000000000000000000000 --- a/speex/libspeexdsp/fixed_arm4.h +++ /dev/null @@ -1,148 +0,0 @@ -/* Copyright (C) 2004 Jean-Marc Valin */ -/** - @file fixed_arm4.h - @brief ARM4 fixed-point operations -*/ -/* - 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 FIXED_ARM4_H -#define FIXED_ARM4_H - -#undef MULT16_32_Q14 -static inline spx_word32_t MULT16_32_Q14(spx_word16_t x, spx_word32_t y) { - int res; - int dummy; - asm ( - "smull %0,%1,%2,%3 \n\t" - "mov %0, %0, lsr #14 \n\t" - "add %0, %0, %1, lsl #18 \n\t" - : "=&r"(res), "=&r" (dummy) - : "r"(y),"r"((int)x)); - return(res); -} - -#undef MULT16_32_Q15 -static inline spx_word32_t MULT16_32_Q15(spx_word16_t x, spx_word32_t y) { - int res; - int dummy; - asm ( - "smull %0,%1,%2,%3 \n\t" - "mov %0, %0, lsr #15 \n\t" - "add %0, %0, %1, lsl #17 \n\t" - : "=&r"(res), "=&r" (dummy) - : "r"(y),"r"((int)x)); - return(res); -} - -#undef DIV32_16 -static inline short DIV32_16(int a, int b) -{ - int res=0; - int dead1, dead2, dead3, dead4, dead5; - __asm__ __volatile__ ( - "\teor %5, %0, %1\n" - "\tmovs %4, %0\n" - "\trsbmi %0, %0, #0 \n" - "\tmovs %4, %1\n" - "\trsbmi %1, %1, #0 \n" - "\tmov %4, #1\n" - - "\tsubs %3, %0, %1, asl #14 \n" - "\tmovpl %0, %3 \n" - "\torrpl %2, %2, %4, asl #14 \n" - - "\tsubs %3, %0, %1, asl #13 \n" - "\tmovpl %0, %3 \n" - "\torrpl %2, %2, %4, asl #13 \n" - - "\tsubs %3, %0, %1, asl #12 \n" - "\tmovpl %0, %3 \n" - "\torrpl %2, %2, %4, asl #12 \n" - - "\tsubs %3, %0, %1, asl #11 \n" - "\tmovpl %0, %3 \n" - "\torrpl %2, %2, %4, asl #11 \n" - - "\tsubs %3, %0, %1, asl #10 \n" - "\tmovpl %0, %3 \n" - "\torrpl %2, %2, %4, asl #10 \n" - - "\tsubs %3, %0, %1, asl #9 \n" - "\tmovpl %0, %3 \n" - "\torrpl %2, %2, %4, asl #9 \n" - - "\tsubs %3, %0, %1, asl #8 \n" - "\tmovpl %0, %3 \n" - "\torrpl %2, %2, %4, asl #8 \n" - - "\tsubs %3, %0, %1, asl #7 \n" - "\tmovpl %0, %3 \n" - "\torrpl %2, %2, %4, asl #7 \n" - - "\tsubs %3, %0, %1, asl #6 \n" - "\tmovpl %0, %3 \n" - "\torrpl %2, %2, %4, asl #6 \n" - - "\tsubs %3, %0, %1, asl #5 \n" - "\tmovpl %0, %3 \n" - "\torrpl %2, %2, %4, asl #5 \n" - - "\tsubs %3, %0, %1, asl #4 \n" - "\tmovpl %0, %3 \n" - "\torrpl %2, %2, %4, asl #4 \n" - - "\tsubs %3, %0, %1, asl #3 \n" - "\tmovpl %0, %3 \n" - "\torrpl %2, %2, %4, asl #3 \n" - - "\tsubs %3, %0, %1, asl #2 \n" - "\tmovpl %0, %3 \n" - "\torrpl %2, %2, %4, asl #2 \n" - - "\tsubs %3, %0, %1, asl #1 \n" - "\tmovpl %0, %3 \n" - "\torrpl %2, %2, %4, asl #1 \n" - - "\tsubs %3, %0, %1 \n" - "\tmovpl %0, %3 \n" - "\torrpl %2, %2, %4 \n" - - "\tmovs %5, %5, lsr #31 \n" - "\trsbne %2, %2, #0 \n" - : "=r" (dead1), "=r" (dead2), "=r" (res), - "=r" (dead3), "=r" (dead4), "=r" (dead5) - : "0" (a), "1" (b), "2" (res) - : "cc" - ); - return res; -} - - -#endif diff --git a/speex/libspeexdsp/fixed_arm5e.h b/speex/libspeexdsp/fixed_arm5e.h deleted file mode 100644 index aa565efc370610b7aca2862c5fa81809ebf1ab4a..0000000000000000000000000000000000000000 --- a/speex/libspeexdsp/fixed_arm5e.h +++ /dev/null @@ -1,178 +0,0 @@ -/* Copyright (C) 2003 Jean-Marc Valin */ -/** - @file fixed_arm5e.h - @brief ARM-tuned fixed-point operations -*/ -/* - 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 FIXED_ARM5E_H -#define FIXED_ARM5E_H - -#undef MULT16_16 -static inline spx_word32_t MULT16_16(spx_word16_t x, spx_word16_t y) { - int res; - asm ("smulbb %0,%1,%2;\n" - : "=&r"(res) - : "%r"(x),"r"(y)); - return(res); -} - -#undef MAC16_16 -static inline spx_word32_t MAC16_16(spx_word32_t a, spx_word16_t x, spx_word32_t y) { - int res; - asm ("smlabb %0,%1,%2,%3;\n" - : "=&r"(res) - : "%r"(x),"r"(y),"r"(a)); - return(res); -} - -#undef MULT16_32_Q15 -static inline spx_word32_t MULT16_32_Q15(spx_word16_t x, spx_word32_t y) { - int res; - asm ("smulwb %0,%1,%2;\n" - : "=&r"(res) - : "%r"(y<<1),"r"(x)); - return(res); -} - -#undef MAC16_32_Q15 -static inline spx_word32_t MAC16_32_Q15(spx_word32_t a, spx_word16_t x, spx_word32_t y) { - int res; - asm ("smlawb %0,%1,%2,%3;\n" - : "=&r"(res) - : "%r"(y<<1),"r"(x),"r"(a)); - return(res); -} - -#undef MULT16_32_Q11 -static inline spx_word32_t MULT16_32_Q11(spx_word16_t x, spx_word32_t y) { - int res; - asm ("smulwb %0,%1,%2;\n" - : "=&r"(res) - : "%r"(y<<5),"r"(x)); - return(res); -} - -#undef MAC16_32_Q11 -static inline spx_word32_t MAC16_32_Q11(spx_word32_t a, spx_word16_t x, spx_word32_t y) { - int res; - asm ("smlawb %0,%1,%2,%3;\n" - : "=&r"(res) - : "%r"(y<<5),"r"(x),"r"(a)); - return(res); -} - -#undef DIV32_16 -static inline short DIV32_16(int a, int b) -{ - int res=0; - int dead1, dead2, dead3, dead4, dead5; - __asm__ __volatile__ ( - "\teor %5, %0, %1\n" - "\tmovs %4, %0\n" - "\trsbmi %0, %0, #0 \n" - "\tmovs %4, %1\n" - "\trsbmi %1, %1, #0 \n" - "\tmov %4, #1\n" - - "\tsubs %3, %0, %1, asl #14 \n" - "\torrpl %2, %2, %4, asl #14 \n" - "\tmovpl %0, %3 \n" - - "\tsubs %3, %0, %1, asl #13 \n" - "\torrpl %2, %2, %4, asl #13 \n" - "\tmovpl %0, %3 \n" - - "\tsubs %3, %0, %1, asl #12 \n" - "\torrpl %2, %2, %4, asl #12 \n" - "\tmovpl %0, %3 \n" - - "\tsubs %3, %0, %1, asl #11 \n" - "\torrpl %2, %2, %4, asl #11 \n" - "\tmovpl %0, %3 \n" - - "\tsubs %3, %0, %1, asl #10 \n" - "\torrpl %2, %2, %4, asl #10 \n" - "\tmovpl %0, %3 \n" - - "\tsubs %3, %0, %1, asl #9 \n" - "\torrpl %2, %2, %4, asl #9 \n" - "\tmovpl %0, %3 \n" - - "\tsubs %3, %0, %1, asl #8 \n" - "\torrpl %2, %2, %4, asl #8 \n" - "\tmovpl %0, %3 \n" - - "\tsubs %3, %0, %1, asl #7 \n" - "\torrpl %2, %2, %4, asl #7 \n" - "\tmovpl %0, %3 \n" - - "\tsubs %3, %0, %1, asl #6 \n" - "\torrpl %2, %2, %4, asl #6 \n" - "\tmovpl %0, %3 \n" - - "\tsubs %3, %0, %1, asl #5 \n" - "\torrpl %2, %2, %4, asl #5 \n" - "\tmovpl %0, %3 \n" - - "\tsubs %3, %0, %1, asl #4 \n" - "\torrpl %2, %2, %4, asl #4 \n" - "\tmovpl %0, %3 \n" - - "\tsubs %3, %0, %1, asl #3 \n" - "\torrpl %2, %2, %4, asl #3 \n" - "\tmovpl %0, %3 \n" - - "\tsubs %3, %0, %1, asl #2 \n" - "\torrpl %2, %2, %4, asl #2 \n" - "\tmovpl %0, %3 \n" - - "\tsubs %3, %0, %1, asl #1 \n" - "\torrpl %2, %2, %4, asl #1 \n" - "\tmovpl %0, %3 \n" - - "\tsubs %3, %0, %1 \n" - "\torrpl %2, %2, %4 \n" - "\tmovpl %0, %3 \n" - - "\tmovs %5, %5, lsr #31 \n" - "\trsbne %2, %2, #0 \n" - : "=r" (dead1), "=r" (dead2), "=r" (res), - "=r" (dead3), "=r" (dead4), "=r" (dead5) - : "0" (a), "1" (b), "2" (res) - : "memory", "cc" - ); - return res; -} - - - - -#endif diff --git a/speex/libspeexdsp/fixed_bfin.h b/speex/libspeexdsp/fixed_bfin.h deleted file mode 100644 index 646a48375f698c20f8b3b437b166d84902afbbad..0000000000000000000000000000000000000000 --- a/speex/libspeexdsp/fixed_bfin.h +++ /dev/null @@ -1,176 +0,0 @@ -/* Copyright (C) 2005 Analog Devices - Author: Jean-Marc Valin */ -/** - @file fixed_bfin.h - @brief Blackfin fixed-point operations -*/ -/* - 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 FIXED_BFIN_H -#define FIXED_BFIN_H - -#include "bfin.h" - -#undef PDIV32_16 -static inline spx_word16_t PDIV32_16(spx_word32_t a, spx_word16_t b) -{ - spx_word32_t res, bb; - bb = b; - a += b>>1; - __asm__ ( - "P0 = 15;\n\t" - "R0 = %1;\n\t" - "R1 = %2;\n\t" - //"R0 = R0 + R1;\n\t" - "R0 <<= 1;\n\t" - "DIVS (R0, R1);\n\t" - "LOOP divide%= LC0 = P0;\n\t" - "LOOP_BEGIN divide%=;\n\t" - "DIVQ (R0, R1);\n\t" - "LOOP_END divide%=;\n\t" - "R0 = R0.L;\n\t" - "%0 = R0;\n\t" - : "=m" (res) - : "m" (a), "m" (bb) - : "P0", "R0", "R1", "ASTAT" BFIN_HWLOOP0_REGS); - return res; -} - -#undef DIV32_16 -static inline spx_word16_t DIV32_16(spx_word32_t a, spx_word16_t b) -{ - spx_word32_t res, bb; - bb = b; - /* Make the roundinf consistent with the C version - (do we need to do that?)*/ - if (a<0) - a += (b-1); - __asm__ ( - "P0 = 15;\n\t" - "R0 = %1;\n\t" - "R1 = %2;\n\t" - "R0 <<= 1;\n\t" - "DIVS (R0, R1);\n\t" - "LOOP divide%= LC0 = P0;\n\t" - "LOOP_BEGIN divide%=;\n\t" - "DIVQ (R0, R1);\n\t" - "LOOP_END divide%=;\n\t" - "R0 = R0.L;\n\t" - "%0 = R0;\n\t" - : "=m" (res) - : "m" (a), "m" (bb) - : "P0", "R0", "R1", "ASTAT" BFIN_HWLOOP0_REGS); - return res; -} - -#undef MAX16 -static inline spx_word16_t MAX16(spx_word16_t a, spx_word16_t b) -{ - spx_word32_t res; - __asm__ ( - "%1 = %1.L (X);\n\t" - "%2 = %2.L (X);\n\t" - "%0 = MAX(%1,%2);" - : "=d" (res) - : "%d" (a), "d" (b) - : "ASTAT" - ); - return res; -} - -#undef MULT16_32_Q15 -static inline spx_word32_t MULT16_32_Q15(spx_word16_t a, spx_word32_t b) -{ - spx_word32_t res; - __asm__ - ( - "A1 = %2.L*%1.L (M);\n\t" - "A1 = A1 >>> 15;\n\t" - "%0 = (A1 += %2.L*%1.H) ;\n\t" - : "=&W" (res), "=&d" (b) - : "d" (a), "1" (b) - : "A1", "ASTAT" - ); - return res; -} - -#undef MAC16_32_Q15 -static inline spx_word32_t MAC16_32_Q15(spx_word32_t c, spx_word16_t a, spx_word32_t b) -{ - spx_word32_t res; - __asm__ - ( - "A1 = %2.L*%1.L (M);\n\t" - "A1 = A1 >>> 15;\n\t" - "%0 = (A1 += %2.L*%1.H);\n\t" - "%0 = %0 + %4;\n\t" - : "=&W" (res), "=&d" (b) - : "d" (a), "1" (b), "d" (c) - : "A1", "ASTAT" - ); - return res; -} - -#undef MULT16_32_Q14 -static inline spx_word32_t MULT16_32_Q14(spx_word16_t a, spx_word32_t b) -{ - spx_word32_t res; - __asm__ - ( - "%2 <<= 1;\n\t" - "A1 = %1.L*%2.L (M);\n\t" - "A1 = A1 >>> 15;\n\t" - "%0 = (A1 += %1.L*%2.H);\n\t" - : "=W" (res), "=d" (a), "=d" (b) - : "1" (a), "2" (b) - : "A1", "ASTAT" - ); - return res; -} - -#undef MAC16_32_Q14 -static inline spx_word32_t MAC16_32_Q14(spx_word32_t c, spx_word16_t a, spx_word32_t b) -{ - spx_word32_t res; - __asm__ - ( - "%1 <<= 1;\n\t" - "A1 = %2.L*%1.L (M);\n\t" - "A1 = A1 >>> 15;\n\t" - "%0 = (A1 += %2.L*%1.H);\n\t" - "%0 = %0 + %4;\n\t" - : "=&W" (res), "=&d" (b) - : "d" (a), "1" (b), "d" (c) - : "A1", "ASTAT" - ); - return res; -} - -#endif diff --git a/speex/libspeexdsp/fixed_debug.h b/speex/libspeexdsp/fixed_debug.h deleted file mode 100644 index 4d5fe11113f8d5b842c329f0a1fd10349b788a73..0000000000000000000000000000000000000000 --- a/speex/libspeexdsp/fixed_debug.h +++ /dev/null @@ -1,487 +0,0 @@ -/* Copyright (C) 2003 Jean-Marc Valin */ -/** - @file fixed_debug.h - @brief Fixed-point operations with debugging -*/ -/* - 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 FIXED_DEBUG_H -#define FIXED_DEBUG_H - -#include - -extern long long spx_mips; -#define MIPS_INC spx_mips++, - -#define QCONST16(x,bits) ((spx_word16_t)(.5+(x)*(((spx_word32_t)1)<<(bits)))) -#define QCONST32(x,bits) ((spx_word32_t)(.5+(x)*(((spx_word32_t)1)<<(bits)))) - - -#define VERIFY_SHORT(x) ((x)<=32767&&(x)>=-32768) -#define VERIFY_INT(x) ((x)<=2147483647LL&&(x)>=-2147483648LL) - -static inline short NEG16(int x) -{ - int res; - if (!VERIFY_SHORT(x)) - { - fprintf (stderr, "NEG16: input is not short: %d\n", (int)x); - } - res = -x; - if (!VERIFY_SHORT(res)) - fprintf (stderr, "NEG16: output is not short: %d\n", (int)res); - spx_mips++; - return res; -} -static inline int NEG32(long long x) -{ - long long res; - if (!VERIFY_INT(x)) - { - fprintf (stderr, "NEG16: input is not int: %d\n", (int)x); - } - res = -x; - if (!VERIFY_INT(res)) - fprintf (stderr, "NEG16: output is not int: %d\n", (int)res); - spx_mips++; - return res; -} - -#define EXTRACT16(x) _EXTRACT16(x, __FILE__, __LINE__) -static inline short _EXTRACT16(int x, char *file, int line) -{ - int res; - if (!VERIFY_SHORT(x)) - { - fprintf (stderr, "EXTRACT16: input is not short: %d in %s: line %d\n", x, file, line); - } - res = x; - spx_mips++; - return res; -} - -#define EXTEND32(x) _EXTEND32(x, __FILE__, __LINE__) -static inline int _EXTEND32(int x, char *file, int line) -{ - int res; - if (!VERIFY_SHORT(x)) - { - fprintf (stderr, "EXTEND32: input is not short: %d in %s: line %d\n", x, file, line); - } - res = x; - spx_mips++; - return res; -} - -#define SHR16(a, shift) _SHR16(a, shift, __FILE__, __LINE__) -static inline short _SHR16(int a, int shift, char *file, int line) -{ - int res; - if (!VERIFY_SHORT(a) || !VERIFY_SHORT(shift)) - { - fprintf (stderr, "SHR16: inputs are not short: %d >> %d in %s: line %d\n", a, shift, file, line); - } - res = a>>shift; - if (!VERIFY_SHORT(res)) - fprintf (stderr, "SHR16: output is not short: %d in %s: line %d\n", res, file, line); - spx_mips++; - return res; -} -#define SHL16(a, shift) _SHL16(a, shift, __FILE__, __LINE__) -static inline short _SHL16(int a, int shift, char *file, int line) -{ - int res; - if (!VERIFY_SHORT(a) || !VERIFY_SHORT(shift)) - { - fprintf (stderr, "SHL16: inputs are not short: %d %d in %s: line %d\n", a, shift, file, line); - } - res = a<>shift; - if (!VERIFY_INT(res)) - { - fprintf (stderr, "SHR32: output is not int: %d\n", (int)res); - } - spx_mips++; - return res; -} -static inline int SHL32(long long a, int shift) -{ - long long res; - if (!VERIFY_INT(a) || !VERIFY_SHORT(shift)) - { - fprintf (stderr, "SHL32: inputs are not int: %d %d\n", (int)a, shift); - } - res = a<>1))),shift)) -#define PSHR32(a,shift) (SHR32(ADD32((a),((EXTEND32(1)<<((shift))>>1))),shift)) -#define VSHR32(a, shift) (((shift)>0) ? SHR32(a, shift) : SHL32(a, -(shift))) - -#define SATURATE16(x,a) (((x)>(a) ? (a) : (x)<-(a) ? -(a) : (x))) -#define SATURATE32(x,a) (((x)>(a) ? (a) : (x)<-(a) ? -(a) : (x))) - -//#define SHR(a,shift) ((a) >> (shift)) -//#define SHL(a,shift) ((a) << (shift)) - -#define ADD16(a, b) _ADD16(a, b, __FILE__, __LINE__) -static inline short _ADD16(int a, int b, char *file, int line) -{ - int res; - if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b)) - { - fprintf (stderr, "ADD16: inputs are not short: %d %d in %s: line %d\n", a, b, file, line); - } - res = a+b; - if (!VERIFY_SHORT(res)) - { - fprintf (stderr, "ADD16: output is not short: %d+%d=%d in %s: line %d\n", a,b,res, file, line); - } - spx_mips++; - return res; -} - -#define SUB16(a, b) _SUB16(a, b, __FILE__, __LINE__) -static inline short _SUB16(int a, int b, char *file, int line) -{ - int res; - if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b)) - { - fprintf (stderr, "SUB16: inputs are not short: %d %d in %s: line %d\n", a, b, file, line); - } - res = a-b; - if (!VERIFY_SHORT(res)) - fprintf (stderr, "SUB16: output is not short: %d in %s: line %d\n", res, file, line); - spx_mips++; - return res; -} - -#define ADD32(a, b) _ADD32(a, b, __FILE__, __LINE__) -static inline int _ADD32(long long a, long long b, char *file, int line) -{ - long long res; - if (!VERIFY_INT(a) || !VERIFY_INT(b)) - { - fprintf (stderr, "ADD32: inputs are not int: %d %d in %s: line %d\n", (int)a, (int)b, file, line); - } - res = a+b; - if (!VERIFY_INT(res)) - { - fprintf (stderr, "ADD32: output is not int: %d in %s: line %d\n", (int)res, file, line); - } - spx_mips++; - return res; -} - -static inline int SUB32(long long a, long long b) -{ - long long res; - if (!VERIFY_INT(a) || !VERIFY_INT(b)) - { - fprintf (stderr, "SUB32: inputs are not int: %d %d\n", (int)a, (int)b); - } - res = a-b; - if (!VERIFY_INT(res)) - fprintf (stderr, "SUB32: output is not int: %d\n", (int)res); - spx_mips++; - return res; -} - -#define ADD64(a,b) (MIPS_INC(a)+(b)) - -/* result fits in 16 bits */ -static inline short MULT16_16_16(int a, int b) -{ - int res; - if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b)) - { - fprintf (stderr, "MULT16_16_16: inputs are not short: %d %d\n", a, b); - } - res = a*b; - if (!VERIFY_SHORT(res)) - fprintf (stderr, "MULT16_16_16: output is not short: %d\n", res); - spx_mips++; - return res; -} - -#define MULT16_16(a, b) _MULT16_16(a, b, __FILE__, __LINE__) -static inline int _MULT16_16(int a, int b, char *file, int line) -{ - long long res; - if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b)) - { - fprintf (stderr, "MULT16_16: inputs are not short: %d %d in %s: line %d\n", a, b, file, line); - } - res = ((long long)a)*b; - if (!VERIFY_INT(res)) - fprintf (stderr, "MULT16_16: output is not int: %d in %s: line %d\n", (int)res, file, line); - spx_mips++; - return res; -} - -#define MAC16_16(c,a,b) (spx_mips--,ADD32((c),MULT16_16((a),(b)))) -#define MAC16_16_Q11(c,a,b) (EXTRACT16(ADD16((c),EXTRACT16(SHR32(MULT16_16((a),(b)),11))))) -#define MAC16_16_Q13(c,a,b) (EXTRACT16(ADD16((c),EXTRACT16(SHR32(MULT16_16((a),(b)),13))))) -#define MAC16_16_P13(c,a,b) (EXTRACT16(ADD32((c),SHR32(ADD32(4096,MULT16_16((a),(b))),13)))) - - -#define MULT16_32_QX(a, b, Q) _MULT16_32_QX(a, b, Q, __FILE__, __LINE__) -static inline int _MULT16_32_QX(int a, long long b, int Q, char *file, int line) -{ - long long res; - if (!VERIFY_SHORT(a) || !VERIFY_INT(b)) - { - fprintf (stderr, "MULT16_32_Q%d: inputs are not short+int: %d %d in %s: line %d\n", Q, (int)a, (int)b, file, line); - } - if (ABS32(b)>=(EXTEND32(1)<<(15+Q))) - fprintf (stderr, "MULT16_32_Q%d: second operand too large: %d %d in %s: line %d\n", Q, (int)a, (int)b, file, line); - res = (((long long)a)*(long long)b) >> Q; - if (!VERIFY_INT(res)) - fprintf (stderr, "MULT16_32_Q%d: output is not int: %d*%d=%d in %s: line %d\n", Q, (int)a, (int)b,(int)res, file, line); - spx_mips+=5; - return res; -} - -static inline int MULT16_32_PX(int a, long long b, int Q) -{ - long long res; - if (!VERIFY_SHORT(a) || !VERIFY_INT(b)) - { - fprintf (stderr, "MULT16_32_P%d: inputs are not short+int: %d %d\n", Q, (int)a, (int)b); - } - if (ABS32(b)>=(EXTEND32(1)<<(15+Q))) - fprintf (stderr, "MULT16_32_Q%d: second operand too large: %d %d\n", Q, (int)a, (int)b); - res = ((((long long)a)*(long long)b) + ((EXTEND32(1)<>1))>> Q; - if (!VERIFY_INT(res)) - fprintf (stderr, "MULT16_32_P%d: output is not int: %d*%d=%d\n", Q, (int)a, (int)b,(int)res); - spx_mips+=5; - return res; -} - - -#define MULT16_32_Q11(a,b) MULT16_32_QX(a,b,11) -#define MAC16_32_Q11(c,a,b) ADD32((c),MULT16_32_Q11((a),(b))) -#define MULT16_32_Q12(a,b) MULT16_32_QX(a,b,12) -#define MULT16_32_Q13(a,b) MULT16_32_QX(a,b,13) -#define MULT16_32_Q14(a,b) MULT16_32_QX(a,b,14) -#define MULT16_32_Q15(a,b) MULT16_32_QX(a,b,15) -#define MULT16_32_P15(a,b) MULT16_32_PX(a,b,15) -#define MAC16_32_Q15(c,a,b) ADD32((c),MULT16_32_Q15((a),(b))) - -static inline int SATURATE(int a, int b) -{ - if (a>b) - a=b; - if (a<-b) - a = -b; - return a; -} - -static inline int MULT16_16_Q11_32(int a, int b) -{ - long long res; - if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b)) - { - fprintf (stderr, "MULT16_16_Q11: inputs are not short: %d %d\n", a, b); - } - res = ((long long)a)*b; - res >>= 11; - if (!VERIFY_INT(res)) - fprintf (stderr, "MULT16_16_Q11: output is not short: %d*%d=%d\n", (int)a, (int)b, (int)res); - spx_mips+=3; - return res; -} -static inline short MULT16_16_Q13(int a, int b) -{ - long long res; - if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b)) - { - fprintf (stderr, "MULT16_16_Q13: inputs are not short: %d %d\n", a, b); - } - res = ((long long)a)*b; - res >>= 13; - if (!VERIFY_SHORT(res)) - fprintf (stderr, "MULT16_16_Q13: output is not short: %d*%d=%d\n", a, b, (int)res); - spx_mips+=3; - return res; -} -static inline short MULT16_16_Q14(int a, int b) -{ - long long res; - if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b)) - { - fprintf (stderr, "MULT16_16_Q14: inputs are not short: %d %d\n", a, b); - } - res = ((long long)a)*b; - res >>= 14; - if (!VERIFY_SHORT(res)) - fprintf (stderr, "MULT16_16_Q14: output is not short: %d\n", (int)res); - spx_mips+=3; - return res; -} -static inline short MULT16_16_Q15(int a, int b) -{ - long long res; - if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b)) - { - fprintf (stderr, "MULT16_16_Q15: inputs are not short: %d %d\n", a, b); - } - res = ((long long)a)*b; - res >>= 15; - if (!VERIFY_SHORT(res)) - { - fprintf (stderr, "MULT16_16_Q15: output is not short: %d\n", (int)res); - } - spx_mips+=3; - return res; -} - -static inline short MULT16_16_P13(int a, int b) -{ - long long res; - if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b)) - { - fprintf (stderr, "MULT16_16_P13: inputs are not short: %d %d\n", a, b); - } - res = ((long long)a)*b; - res += 4096; - if (!VERIFY_INT(res)) - fprintf (stderr, "MULT16_16_P13: overflow: %d*%d=%d\n", a, b, (int)res); - res >>= 13; - if (!VERIFY_SHORT(res)) - fprintf (stderr, "MULT16_16_P13: output is not short: %d*%d=%d\n", a, b, (int)res); - spx_mips+=4; - return res; -} -static inline short MULT16_16_P14(int a, int b) -{ - long long res; - if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b)) - { - fprintf (stderr, "MULT16_16_P14: inputs are not short: %d %d\n", a, b); - } - res = ((long long)a)*b; - res += 8192; - if (!VERIFY_INT(res)) - fprintf (stderr, "MULT16_16_P14: overflow: %d*%d=%d\n", a, b, (int)res); - res >>= 14; - if (!VERIFY_SHORT(res)) - fprintf (stderr, "MULT16_16_P14: output is not short: %d*%d=%d\n", a, b, (int)res); - spx_mips+=4; - return res; -} -static inline short MULT16_16_P15(int a, int b) -{ - long long res; - if (!VERIFY_SHORT(a) || !VERIFY_SHORT(b)) - { - fprintf (stderr, "MULT16_16_P15: inputs are not short: %d %d\n", a, b); - } - res = ((long long)a)*b; - res += 16384; - if (!VERIFY_INT(res)) - fprintf (stderr, "MULT16_16_P15: overflow: %d*%d=%d\n", a, b, (int)res); - res >>= 15; - if (!VERIFY_SHORT(res)) - fprintf (stderr, "MULT16_16_P15: output is not short: %d*%d=%d\n", a, b, (int)res); - spx_mips+=4; - return res; -} - -#define DIV32_16(a, b) _DIV32_16(a, b, __FILE__, __LINE__) - -static inline int _DIV32_16(long long a, long long b, char *file, int line) -{ - long long res; - if (b==0) - { - fprintf(stderr, "DIV32_16: divide by zero: %d/%d in %s: line %d\n", (int)a, (int)b, file, line); - return 0; - } - if (!VERIFY_INT(a) || !VERIFY_SHORT(b)) - { - fprintf (stderr, "DIV32_16: inputs are not int/short: %d %d in %s: line %d\n", (int)a, (int)b, file, line); - } - res = a/b; - if (!VERIFY_SHORT(res)) - { - fprintf (stderr, "DIV32_16: output is not short: %d / %d = %d in %s: line %d\n", (int)a,(int)b,(int)res, file, line); - if (res>32767) - res = 32767; - if (res<-32768) - res = -32768; - } - spx_mips+=20; - return res; -} - -#define DIV32(a, b) _DIV32(a, b, __FILE__, __LINE__) -static inline int _DIV32(long long a, long long b, char *file, int line) -{ - long long res; - if (b==0) - { - fprintf(stderr, "DIV32: divide by zero: %d/%d in %s: line %d\n", (int)a, (int)b, file, line); - return 0; - } - - if (!VERIFY_INT(a) || !VERIFY_INT(b)) - { - fprintf (stderr, "DIV32: inputs are not int/short: %d %d in %s: line %d\n", (int)a, (int)b, file, line); - } - res = a/b; - if (!VERIFY_INT(res)) - fprintf (stderr, "DIV32: output is not int: %d in %s: line %d\n", (int)res, file, line); - spx_mips+=36; - return res; -} -#define PDIV32(a,b) DIV32(ADD32((a),(b)>>1),b) -#define PDIV32_16(a,b) DIV32_16(ADD32((a),(b)>>1),b) - -#endif diff --git a/speex/libspeexdsp/fixed_generic.h b/speex/libspeexdsp/fixed_generic.h deleted file mode 100644 index 12d27aac551d7c48d7f974dd258658340d475a36..0000000000000000000000000000000000000000 --- a/speex/libspeexdsp/fixed_generic.h +++ /dev/null @@ -1,110 +0,0 @@ -/* Copyright (C) 2003 Jean-Marc Valin */ -/** - @file fixed_generic.h - @brief Generic fixed-point operations -*/ -/* - 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 FIXED_GENERIC_H -#define FIXED_GENERIC_H - -#define QCONST16(x,bits) ((spx_word16_t)(.5+(x)*(((spx_word32_t)1)<<(bits)))) -#define QCONST32(x,bits) ((spx_word32_t)(.5+(x)*(((spx_word32_t)1)<<(bits)))) - -#define NEG16(x) (-(x)) -#define NEG32(x) (-(x)) -#define EXTRACT16(x) ((spx_word16_t)(x)) -#define EXTEND32(x) ((spx_word32_t)(x)) -#define SHR16(a,shift) ((a) >> (shift)) -#define SHL16(a,shift) ((a) << (shift)) -#define SHR32(a,shift) ((a) >> (shift)) -#define SHL32(a,shift) ((a) << (shift)) -#define PSHR16(a,shift) (SHR16((a)+((1<<((shift))>>1)),shift)) -#define PSHR32(a,shift) (SHR32((a)+((EXTEND32(1)<<((shift))>>1)),shift)) -#define VSHR32(a, shift) (((shift)>0) ? SHR32(a, shift) : SHL32(a, -(shift))) -#define SATURATE16(x,a) (((x)>(a) ? (a) : (x)<-(a) ? -(a) : (x))) -#define SATURATE32(x,a) (((x)>(a) ? (a) : (x)<-(a) ? -(a) : (x))) - -#define SATURATE32PSHR(x,shift,a) (((x)>=(SHL32(a,shift))) ? (a) : \ - (x)<=-(SHL32(a,shift)) ? -(a) : \ - (PSHR32(x, shift))) - -#define SHR(a,shift) ((a) >> (shift)) -#define SHL(a,shift) ((spx_word32_t)(a) << (shift)) -#define PSHR(a,shift) (SHR((a)+((EXTEND32(1)<<((shift))>>1)),shift)) -#define SATURATE(x,a) (((x)>(a) ? (a) : (x)<-(a) ? -(a) : (x))) - - -#define ADD16(a,b) ((spx_word16_t)((spx_word16_t)(a)+(spx_word16_t)(b))) -#define SUB16(a,b) ((spx_word16_t)(a)-(spx_word16_t)(b)) -#define ADD32(a,b) ((spx_word32_t)(a)+(spx_word32_t)(b)) -#define SUB32(a,b) ((spx_word32_t)(a)-(spx_word32_t)(b)) - - -/* result fits in 16 bits */ -#define MULT16_16_16(a,b) ((((spx_word16_t)(a))*((spx_word16_t)(b)))) - -/* (spx_word32_t)(spx_word16_t) gives TI compiler a hint that it's 16x16->32 multiply */ -#define MULT16_16(a,b) (((spx_word32_t)(spx_word16_t)(a))*((spx_word32_t)(spx_word16_t)(b))) - -#define MAC16_16(c,a,b) (ADD32((c),MULT16_16((a),(b)))) -#define MULT16_32_Q12(a,b) ADD32(MULT16_16((a),SHR((b),12)), SHR(MULT16_16((a),((b)&0x00000fff)),12)) -#define MULT16_32_Q13(a,b) ADD32(MULT16_16((a),SHR((b),13)), SHR(MULT16_16((a),((b)&0x00001fff)),13)) -#define MULT16_32_Q14(a,b) ADD32(MULT16_16((a),SHR((b),14)), SHR(MULT16_16((a),((b)&0x00003fff)),14)) - -#define MULT16_32_Q11(a,b) ADD32(MULT16_16((a),SHR((b),11)), SHR(MULT16_16((a),((b)&0x000007ff)),11)) -#define MAC16_32_Q11(c,a,b) ADD32(c,ADD32(MULT16_16((a),SHR((b),11)), SHR(MULT16_16((a),((b)&0x000007ff)),11))) - -#define MULT16_32_P15(a,b) ADD32(MULT16_16((a),SHR((b),15)), PSHR(MULT16_16((a),((b)&0x00007fff)),15)) -#define MULT16_32_Q15(a,b) ADD32(MULT16_16((a),SHR((b),15)), SHR(MULT16_16((a),((b)&0x00007fff)),15)) -#define MAC16_32_Q15(c,a,b) ADD32(c,ADD32(MULT16_16((a),SHR((b),15)), SHR(MULT16_16((a),((b)&0x00007fff)),15))) - - -#define MAC16_16_Q11(c,a,b) (ADD32((c),SHR(MULT16_16((a),(b)),11))) -#define MAC16_16_Q13(c,a,b) (ADD32((c),SHR(MULT16_16((a),(b)),13))) -#define MAC16_16_P13(c,a,b) (ADD32((c),SHR(ADD32(4096,MULT16_16((a),(b))),13))) - -#define MULT16_16_Q11_32(a,b) (SHR(MULT16_16((a),(b)),11)) -#define MULT16_16_Q13(a,b) (SHR(MULT16_16((a),(b)),13)) -#define MULT16_16_Q14(a,b) (SHR(MULT16_16((a),(b)),14)) -#define MULT16_16_Q15(a,b) (SHR(MULT16_16((a),(b)),15)) - -#define MULT16_16_P13(a,b) (SHR(ADD32(4096,MULT16_16((a),(b))),13)) -#define MULT16_16_P14(a,b) (SHR(ADD32(8192,MULT16_16((a),(b))),14)) -#define MULT16_16_P15(a,b) (SHR(ADD32(16384,MULT16_16((a),(b))),15)) - -#define MUL_16_32_R15(a,bh,bl) ADD32(MULT16_16((a),(bh)), SHR(MULT16_16((a),(bl)),15)) - -#define DIV32_16(a,b) ((spx_word16_t)(((spx_word32_t)(a))/((spx_word16_t)(b)))) -#define PDIV32_16(a,b) ((spx_word16_t)(((spx_word32_t)(a)+((spx_word16_t)(b)>>1))/((spx_word16_t)(b)))) -#define DIV32(a,b) (((spx_word32_t)(a))/((spx_word32_t)(b))) -#define PDIV32(a,b) (((spx_word32_t)(a)+((spx_word16_t)(b)>>1))/((spx_word32_t)(b))) - -#endif diff --git a/speex/libspeexdsp/jitter.c b/speex/libspeexdsp/jitter.c deleted file mode 100644 index a9c0dd31ecb7aa5314a2ad6ddd1da3904b59e01a..0000000000000000000000000000000000000000 --- a/speex/libspeexdsp/jitter.c +++ /dev/null @@ -1,839 +0,0 @@ -/* Copyright (C) 2002 Jean-Marc Valin - File: speex_jitter.h - - Adaptive jitter buffer for Speex - - 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. - -*/ - -/* -TODO: -- Add short-term estimate -- Defensive programming - + warn when last returned < last desired (begative buffering) - + warn if update_delay not called between get() and tick() or is called twice in a row -- Linked list structure for holding the packets instead of the current fixed-size array - + return memory to a pool - + allow pre-allocation of the pool - + optional max number of elements -- Statistics - + drift - + loss - + late - + jitter - + buffering delay -*/ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - - -#include "arch.h" -#include "speex/speex_jitter.h" -#include "os_support.h" - -#ifndef NULL -#define NULL 0 -#endif - -#define SPEEX_JITTER_MAX_BUFFER_SIZE 200 /**< Maximum number of packets in jitter buffer */ - -#define TSUB(a,b) ((spx_int32_t)((a)-(b))) - -#define GT32(a,b) (((spx_int32_t)((a)-(b)))>0) -#define GE32(a,b) (((spx_int32_t)((a)-(b)))>=0) -#define LT32(a,b) (((spx_int32_t)((a)-(b)))<0) -#define LE32(a,b) (((spx_int32_t)((a)-(b)))<=0) - -#define ROUND_DOWN(x, step) ((x)<0 ? ((x)-(step)+1)/(step)*(step) : (x)/(step)*(step)) - -#define MAX_TIMINGS 40 -#define MAX_BUFFERS 3 -#define TOP_DELAY 40 - -/** Buffer that keeps the time of arrival of the latest packets */ -struct TimingBuffer { - int filled; /**< Number of entries occupied in "timing" and "counts"*/ - int curr_count; /**< Number of packet timings we got (including those we discarded) */ - spx_int32_t timing[MAX_TIMINGS]; /**< Sorted list of all timings ("latest" packets first) */ - spx_int16_t counts[MAX_TIMINGS]; /**< Order the packets were put in (will be used for short-term estimate) */ -}; - -static void tb_init(struct TimingBuffer *tb) -{ - tb->filled = 0; - tb->curr_count = 0; -} - -/* Add the timing of a new packet to the TimingBuffer */ -static void tb_add(struct TimingBuffer *tb, spx_int16_t timing) -{ - int pos; - /* Discard packet that won't make it into the list because they're too early */ - if (tb->filled >= MAX_TIMINGS && timing >= tb->timing[tb->filled-1]) - { - tb->curr_count++; - return; - } - - /* Find where the timing info goes in the sorted list */ - pos = 0; - /* FIXME: Do bisection instead of linear search */ - while (posfilled && timing >= tb->timing[pos]) - { - pos++; - } - - speex_assert(pos <= tb->filled && pos < MAX_TIMINGS); - - /* Shift everything so we can perform the insertion */ - if (pos < tb->filled) - { - int move_size = tb->filled-pos; - if (tb->filled == MAX_TIMINGS) - move_size -= 1; - SPEEX_MOVE(&tb->timing[pos+1], &tb->timing[pos], move_size); - SPEEX_MOVE(&tb->counts[pos+1], &tb->counts[pos], move_size); - } - /* Insert */ - tb->timing[pos] = timing; - tb->counts[pos] = tb->curr_count; - - tb->curr_count++; - if (tb->filledfilled++; -} - - - -/** Jitter buffer structure */ -struct JitterBuffer_ { - spx_uint32_t pointer_timestamp; /**< Timestamp of what we will *get* next */ - spx_uint32_t last_returned_timestamp; /**< Useful for getting the next packet with the same timestamp (for fragmented media) */ - spx_uint32_t next_stop; /**< Estimated time the next get() will be called */ - - spx_int32_t buffered; /**< Amount of data we think is still buffered by the application (timestamp units)*/ - - JitterBufferPacket packets[SPEEX_JITTER_MAX_BUFFER_SIZE]; /**< Packets stored in the buffer */ - spx_uint32_t arrival[SPEEX_JITTER_MAX_BUFFER_SIZE]; /**< Packet arrival time (0 means it was late, even though it's a valid timestamp) */ - - void (*destroy) (void *); /**< Callback for destroying a packet */ - - spx_int32_t delay_step; /**< Size of the steps when adjusting buffering (timestamp units) */ - spx_int32_t concealment_size; /**< Size of the packet loss concealment "units" */ - int reset_state; /**< True if state was just reset */ - int buffer_margin; /**< How many frames we want to keep in the buffer (lower bound) */ - int late_cutoff; /**< How late must a packet be for it not to be considered at all */ - int interp_requested; /**< An interpolation is requested by speex_jitter_update_delay() */ - int auto_adjust; /**< Whether to automatically adjust the delay at any time */ - - struct TimingBuffer _tb[MAX_BUFFERS]; /**< Don't use those directly */ - struct TimingBuffer *timeBuffers[MAX_BUFFERS]; /**< Storing arrival time of latest frames so we can compute some stats */ - int window_size; /**< Total window over which the late frames are counted */ - int subwindow_size; /**< Sub-window size for faster computation */ - int max_late_rate; /**< Absolute maximum amount of late packets tolerable (in percent) */ - int latency_tradeoff; /**< Latency equivalent of losing one percent of packets */ - int auto_tradeoff; /**< Latency equivalent of losing one percent of packets (automatic default) */ - - int lost_count; /**< Number of consecutive lost packets */ -}; - -/** Based on available data, this computes the optimal delay for the jitter buffer. - The optimised function is in timestamp units and is: - cost = delay + late_factor*[number of frames that would be late if we used that delay] - @param tb Array of buffers - @param late_factor Equivalent cost of a late frame (in timestamp units) - */ -static spx_int16_t compute_opt_delay(JitterBuffer *jitter) -{ - int i; - spx_int16_t opt=0; - spx_int32_t best_cost=0x7fffffff; - int late = 0; - int pos[MAX_BUFFERS]; - int tot_count; - float late_factor; - int penalty_taken = 0; - int best = 0; - int worst = 0; - spx_int32_t deltaT; - struct TimingBuffer *tb; - - tb = jitter->_tb; - - /* Number of packet timings we have received (including those we didn't keep) */ - tot_count = 0; - for (i=0;ilatency_tradeoff != 0) - late_factor = jitter->latency_tradeoff * 100.0f / tot_count; - else - late_factor = jitter->auto_tradeoff * jitter->window_size/tot_count; - - /*fprintf(stderr, "late_factor = %f\n", late_factor);*/ - for (i=0;idelay_step); - pos[next]++; - - /* Actual cost function that tells us how bad using this delay would be */ - cost = -latest + late_factor*late; - /*fprintf(stderr, "cost %d = %d + %f * %d\n", cost, -latest, late_factor, late);*/ - if (cost < best_cost) - { - best_cost = cost; - opt = latest; - } - } else { - break; - } - - /* For the next timing we will consider, there will be one more late packet to count */ - late++; - /* Two-frame penalty if we're going to increase the amount of late frames (hysteresis) */ - if (latest >= 0 && !penalty_taken) - { - penalty_taken = 1; - late+=4; - } - } - - deltaT = best-worst; - /* This is a default "automatic latency tradeoff" when none is provided */ - jitter->auto_tradeoff = 1 + deltaT/TOP_DELAY; - /*fprintf(stderr, "auto_tradeoff = %d (%d %d %d)\n", jitter->auto_tradeoff, best, worst, i);*/ - - /* FIXME: Compute a short-term estimate too and combine with the long-term one */ - - /* Prevents reducing the buffer size when we haven't really had much data */ - if (tot_count < TOP_DELAY && opt > 0) - return 0; - return opt; -} - - -/** Initialise jitter buffer */ -EXPORT JitterBuffer *jitter_buffer_init(int step_size) -{ - JitterBuffer *jitter = (JitterBuffer*)speex_alloc(sizeof(JitterBuffer)); - if (jitter) - { - int i; - spx_int32_t tmp; - for (i=0;ipackets[i].data=NULL; - jitter->delay_step = step_size; - jitter->concealment_size = step_size; - /*FIXME: Should this be 0 or 1?*/ - jitter->buffer_margin = 0; - jitter->late_cutoff = 50; - jitter->destroy = NULL; - jitter->latency_tradeoff = 0; - jitter->auto_adjust = 1; - tmp = 4; - jitter_buffer_ctl(jitter, JITTER_BUFFER_SET_MAX_LATE_RATE, &tmp); - jitter_buffer_reset(jitter); - } - return jitter; -} - -/** Reset jitter buffer */ -EXPORT void jitter_buffer_reset(JitterBuffer *jitter) -{ - int i; - for (i=0;ipackets[i].data) - { - if (jitter->destroy) - jitter->destroy(jitter->packets[i].data); - else - speex_free(jitter->packets[i].data); - jitter->packets[i].data = NULL; - } - } - /* Timestamp is actually undefined at this point */ - jitter->pointer_timestamp = 0; - jitter->next_stop = 0; - jitter->reset_state = 1; - jitter->lost_count = 0; - jitter->buffered = 0; - jitter->auto_tradeoff = 32000; - - for (i=0;i_tb[i]); - jitter->timeBuffers[i] = &jitter->_tb[i]; - } - /*fprintf (stderr, "reset\n");*/ -} - -/** Destroy jitter buffer */ -EXPORT void jitter_buffer_destroy(JitterBuffer *jitter) -{ - jitter_buffer_reset(jitter); - speex_free(jitter); -} - -/** Take the following timing into consideration for future calculations */ -static void update_timings(JitterBuffer *jitter, spx_int32_t timing) -{ - if (timing < -32767) - timing = -32767; - if (timing > 32767) - timing = 32767; - /* If the current sub-window is full, perform a rotation and discard oldest sub-widow */ - if (jitter->timeBuffers[0]->curr_count >= jitter->subwindow_size) - { - int i; - /*fprintf(stderr, "Rotate buffer\n");*/ - struct TimingBuffer *tmp = jitter->timeBuffers[MAX_BUFFERS-1]; - for (i=MAX_BUFFERS-1;i>=1;i--) - jitter->timeBuffers[i] = jitter->timeBuffers[i-1]; - jitter->timeBuffers[0] = tmp; - tb_init(jitter->timeBuffers[0]); - } - tb_add(jitter->timeBuffers[0], timing); -} - -/** Compensate all timings when we do an adjustment of the buffering */ -static void shift_timings(JitterBuffer *jitter, spx_int16_t amount) -{ - int i, j; - for (i=0;itimeBuffers[i]->filled;j++) - jitter->timeBuffers[i]->timing[j] += amount; - } -} - - -/** Put one packet into the jitter buffer */ -EXPORT void jitter_buffer_put(JitterBuffer *jitter, const JitterBufferPacket *packet) -{ - int i,j; - int late; - /*fprintf (stderr, "put packet %d %d\n", timestamp, span);*/ - - /* Cleanup buffer (remove old packets that weren't played) */ - if (!jitter->reset_state) - { - for (i=0;ipackets[i].data && LE32(jitter->packets[i].timestamp + jitter->packets[i].span, jitter->pointer_timestamp)) - { - /*fprintf (stderr, "cleaned (not played)\n");*/ - if (jitter->destroy) - jitter->destroy(jitter->packets[i].data); - else - speex_free(jitter->packets[i].data); - jitter->packets[i].data = NULL; - } - } - } - - /*fprintf(stderr, "arrival: %d %d %d\n", packet->timestamp, jitter->next_stop, jitter->pointer_timestamp);*/ - /* Check if packet is late (could still be useful though) */ - if (!jitter->reset_state && LT32(packet->timestamp, jitter->next_stop)) - { - update_timings(jitter, ((spx_int32_t)packet->timestamp) - ((spx_int32_t)jitter->next_stop) - jitter->buffer_margin); - late = 1; - } else { - late = 0; - } - - /* For some reason, the consumer has failed the last 20 fetches. Make sure this packet is - * used to resync. */ - if (jitter->lost_count>20) - { - jitter_buffer_reset(jitter); - } - - /* Only insert the packet if it's not hopelessly late (i.e. totally useless) */ - if (jitter->reset_state || GE32(packet->timestamp+packet->span+jitter->delay_step, jitter->pointer_timestamp)) - { - - /*Find an empty slot in the buffer*/ - for (i=0;ipackets[i].data==NULL) - break; - } - - /*No place left in the buffer, need to make room for it by discarding the oldest packet */ - if (i==SPEEX_JITTER_MAX_BUFFER_SIZE) - { - int earliest=jitter->packets[0].timestamp; - i=0; - for (j=1;jpackets[i].data || LT32(jitter->packets[j].timestamp,earliest)) - { - earliest = jitter->packets[j].timestamp; - i=j; - } - } - if (jitter->destroy) - jitter->destroy(jitter->packets[i].data); - else - speex_free(jitter->packets[i].data); - jitter->packets[i].data=NULL; - /*fprintf (stderr, "Buffer is full, discarding earliest frame %d (currently at %d)\n", timestamp, jitter->pointer_timestamp);*/ - } - - /* Copy packet in buffer */ - if (jitter->destroy) - { - jitter->packets[i].data = packet->data; - } else { - jitter->packets[i].data=(char*)speex_alloc(packet->len); - for (j=0;jlen;j++) - jitter->packets[i].data[j]=packet->data[j]; - } - jitter->packets[i].timestamp=packet->timestamp; - jitter->packets[i].span=packet->span; - jitter->packets[i].len=packet->len; - jitter->packets[i].sequence=packet->sequence; - jitter->packets[i].user_data=packet->user_data; - if (jitter->reset_state || late) - jitter->arrival[i] = 0; - else - jitter->arrival[i] = jitter->next_stop; - } - - -} - -/** Get one packet from the jitter buffer */ -EXPORT int jitter_buffer_get(JitterBuffer *jitter, JitterBufferPacket *packet, spx_int32_t desired_span, spx_int32_t *start_offset) -{ - int i; - unsigned int j; - spx_int16_t opt; - - if (start_offset != NULL) - *start_offset = 0; - - /* Syncing on the first call */ - if (jitter->reset_state) - { - int found = 0; - /* Find the oldest packet */ - spx_uint32_t oldest=0; - for (i=0;ipackets[i].data && (!found || LT32(jitter->packets[i].timestamp,oldest))) - { - oldest = jitter->packets[i].timestamp; - found = 1; - } - } - if (found) - { - jitter->reset_state=0; - jitter->pointer_timestamp = oldest; - jitter->next_stop = oldest; - } else { - packet->timestamp = 0; - packet->span = jitter->interp_requested; - return JITTER_BUFFER_MISSING; - } - } - - - jitter->last_returned_timestamp = jitter->pointer_timestamp; - - if (jitter->interp_requested != 0) - { - packet->timestamp = jitter->pointer_timestamp; - packet->span = jitter->interp_requested; - - /* Increment the pointer because it got decremented in the delay update */ - jitter->pointer_timestamp += jitter->interp_requested; - packet->len = 0; - /*fprintf (stderr, "Deferred interpolate\n");*/ - - jitter->interp_requested = 0; - - jitter->buffered = packet->span - desired_span; - - return JITTER_BUFFER_INSERTION; - } - - /* Searching for the packet that fits best */ - - /* Search the buffer for a packet with the right timestamp and spanning the whole current chunk */ - for (i=0;ipackets[i].data && jitter->packets[i].timestamp==jitter->pointer_timestamp && GE32(jitter->packets[i].timestamp+jitter->packets[i].span,jitter->pointer_timestamp+desired_span)) - break; - } - - /* If no match, try for an "older" packet that still spans (fully) the current chunk */ - if (i==SPEEX_JITTER_MAX_BUFFER_SIZE) - { - for (i=0;ipackets[i].data && LE32(jitter->packets[i].timestamp, jitter->pointer_timestamp) && GE32(jitter->packets[i].timestamp+jitter->packets[i].span,jitter->pointer_timestamp+desired_span)) - break; - } - } - - /* If still no match, try for an "older" packet that spans part of the current chunk */ - if (i==SPEEX_JITTER_MAX_BUFFER_SIZE) - { - for (i=0;ipackets[i].data && LE32(jitter->packets[i].timestamp, jitter->pointer_timestamp) && GT32(jitter->packets[i].timestamp+jitter->packets[i].span,jitter->pointer_timestamp)) - break; - } - } - - /* If still no match, try for earliest packet possible */ - if (i==SPEEX_JITTER_MAX_BUFFER_SIZE) - { - int found = 0; - spx_uint32_t best_time=0; - int best_span=0; - int besti=0; - for (i=0;ipackets[i].data && LT32(jitter->packets[i].timestamp,jitter->pointer_timestamp+desired_span) && GE32(jitter->packets[i].timestamp,jitter->pointer_timestamp)) - { - if (!found || LT32(jitter->packets[i].timestamp,best_time) || (jitter->packets[i].timestamp==best_time && GT32(jitter->packets[i].span,best_span))) - { - best_time = jitter->packets[i].timestamp; - best_span = jitter->packets[i].span; - besti = i; - found = 1; - } - } - } - if (found) - { - i=besti; - /*fprintf (stderr, "incomplete: %d %d %d %d\n", jitter->packets[i].timestamp, jitter->pointer_timestamp, chunk_size, jitter->packets[i].span);*/ - } - } - - /* If we find something */ - if (i!=SPEEX_JITTER_MAX_BUFFER_SIZE) - { - spx_int32_t offset; - - /* We (obviously) haven't lost this packet */ - jitter->lost_count = 0; - - /* In this case, 0 isn't as a valid timestamp */ - if (jitter->arrival[i] != 0) - { - update_timings(jitter, ((spx_int32_t)jitter->packets[i].timestamp) - ((spx_int32_t)jitter->arrival[i]) - jitter->buffer_margin); - } - - - /* Copy packet */ - if (jitter->destroy) - { - packet->data = jitter->packets[i].data; - packet->len = jitter->packets[i].len; - } else { - if (jitter->packets[i].len > packet->len) - { - speex_warning_int("jitter_buffer_get(): packet too large to fit. Size is", jitter->packets[i].len); - } else { - packet->len = jitter->packets[i].len; - } - for (j=0;jlen;j++) - packet->data[j] = jitter->packets[i].data[j]; - /* Remove packet */ - speex_free(jitter->packets[i].data); - } - jitter->packets[i].data = NULL; - /* Set timestamp and span (if requested) */ - offset = (spx_int32_t)jitter->packets[i].timestamp-(spx_int32_t)jitter->pointer_timestamp; - if (start_offset != NULL) - *start_offset = offset; - else if (offset != 0) - speex_warning_int("jitter_buffer_get() discarding non-zero start_offset", offset); - - packet->timestamp = jitter->packets[i].timestamp; - jitter->last_returned_timestamp = packet->timestamp; - - packet->span = jitter->packets[i].span; - packet->sequence = jitter->packets[i].sequence; - packet->user_data = jitter->packets[i].user_data; - /* Point to the end of the current packet */ - jitter->pointer_timestamp = jitter->packets[i].timestamp+jitter->packets[i].span; - - jitter->buffered = packet->span - desired_span; - - if (start_offset != NULL) - jitter->buffered += *start_offset; - - return JITTER_BUFFER_OK; - } - - - /* If we haven't found anything worth returning */ - - /*fprintf (stderr, "not found\n");*/ - jitter->lost_count++; - /*fprintf (stderr, "m");*/ - /*fprintf (stderr, "lost_count = %d\n", jitter->lost_count);*/ - - opt = compute_opt_delay(jitter); - - /* Should we force an increase in the buffer or just do normal interpolation? */ - if (opt < 0) - { - /* Need to increase buffering */ - - /* Shift histogram to compensate */ - shift_timings(jitter, -opt); - - packet->timestamp = jitter->pointer_timestamp; - packet->span = -opt; - /* Don't move the pointer_timestamp forward */ - packet->len = 0; - - jitter->buffered = packet->span - desired_span; - return JITTER_BUFFER_INSERTION; - /*jitter->pointer_timestamp -= jitter->delay_step;*/ - /*fprintf (stderr, "Forced to interpolate\n");*/ - } else { - /* Normal packet loss */ - packet->timestamp = jitter->pointer_timestamp; - - desired_span = ROUND_DOWN(desired_span, jitter->concealment_size); - packet->span = desired_span; - jitter->pointer_timestamp += desired_span; - packet->len = 0; - - jitter->buffered = packet->span - desired_span; - return JITTER_BUFFER_MISSING; - /*fprintf (stderr, "Normal loss\n");*/ - } - - -} - -EXPORT int jitter_buffer_get_another(JitterBuffer *jitter, JitterBufferPacket *packet) -{ - int i, j; - for (i=0;ipackets[i].data && jitter->packets[i].timestamp==jitter->last_returned_timestamp) - break; - } - if (i!=SPEEX_JITTER_MAX_BUFFER_SIZE) - { - /* Copy packet */ - packet->len = jitter->packets[i].len; - if (jitter->destroy) - { - packet->data = jitter->packets[i].data; - } else { - for (j=0;jlen;j++) - packet->data[j] = jitter->packets[i].data[j]; - /* Remove packet */ - speex_free(jitter->packets[i].data); - } - jitter->packets[i].data = NULL; - packet->timestamp = jitter->packets[i].timestamp; - packet->span = jitter->packets[i].span; - packet->sequence = jitter->packets[i].sequence; - packet->user_data = jitter->packets[i].user_data; - return JITTER_BUFFER_OK; - } else { - packet->data = NULL; - packet->len = 0; - packet->span = 0; - return JITTER_BUFFER_MISSING; - } -} - -/* Let the jitter buffer know it's the right time to adjust the buffering delay to the network conditions */ -static int _jitter_buffer_update_delay(JitterBuffer *jitter, JitterBufferPacket *packet, spx_int32_t *start_offset) -{ - spx_int16_t opt = compute_opt_delay(jitter); - /*fprintf(stderr, "opt adjustment is %d ", opt);*/ - - if (opt < 0) - { - shift_timings(jitter, -opt); - - jitter->pointer_timestamp += opt; - jitter->interp_requested = -opt; - /*fprintf (stderr, "Decision to interpolate %d samples\n", -opt);*/ - } else if (opt > 0) - { - shift_timings(jitter, -opt); - jitter->pointer_timestamp += opt; - /*fprintf (stderr, "Decision to drop %d samples\n", opt);*/ - } - - return opt; -} - -/* Let the jitter buffer know it's the right time to adjust the buffering delay to the network conditions */ -EXPORT int jitter_buffer_update_delay(JitterBuffer *jitter, JitterBufferPacket *packet, spx_int32_t *start_offset) -{ - /* If the programmer calls jitter_buffer_update_delay() directly, - automatically disable auto-adjustment */ - jitter->auto_adjust = 0; - - return _jitter_buffer_update_delay(jitter, packet, start_offset); -} - -/** Get pointer timestamp of jitter buffer */ -EXPORT int jitter_buffer_get_pointer_timestamp(JitterBuffer *jitter) -{ - return jitter->pointer_timestamp; -} - -EXPORT void jitter_buffer_tick(JitterBuffer *jitter) -{ - /* Automatically-adjust the buffering delay if requested */ - if (jitter->auto_adjust) - _jitter_buffer_update_delay(jitter, NULL, NULL); - - if (jitter->buffered >= 0) - { - jitter->next_stop = jitter->pointer_timestamp - jitter->buffered; - } else { - jitter->next_stop = jitter->pointer_timestamp; - speex_warning_int("jitter buffer sees negative buffering, your code might be broken. Value is ", jitter->buffered); - } - jitter->buffered = 0; -} - -EXPORT void jitter_buffer_remaining_span(JitterBuffer *jitter, spx_uint32_t rem) -{ - /* Automatically-adjust the buffering delay if requested */ - if (jitter->auto_adjust) - _jitter_buffer_update_delay(jitter, NULL, NULL); - - if (jitter->buffered < 0) - speex_warning_int("jitter buffer sees negative buffering, your code might be broken. Value is ", jitter->buffered); - jitter->next_stop = jitter->pointer_timestamp - rem; -} - - -/* Used like the ioctl function to control the jitter buffer parameters */ -EXPORT int jitter_buffer_ctl(JitterBuffer *jitter, int request, void *ptr) -{ - int count, i; - switch(request) - { - case JITTER_BUFFER_SET_MARGIN: - jitter->buffer_margin = *(spx_int32_t*)ptr; - break; - case JITTER_BUFFER_GET_MARGIN: - *(spx_int32_t*)ptr = jitter->buffer_margin; - break; - case JITTER_BUFFER_GET_AVALIABLE_COUNT: - count = 0; - for (i=0;ipackets[i].data && LE32(jitter->pointer_timestamp, jitter->packets[i].timestamp)) - { - count++; - } - } - *(spx_int32_t*)ptr = count; - break; - case JITTER_BUFFER_SET_DESTROY_CALLBACK: - jitter->destroy = (void (*) (void *))ptr; - break; - case JITTER_BUFFER_GET_DESTROY_CALLBACK: - *(void (**) (void *))ptr = jitter->destroy; - break; - case JITTER_BUFFER_SET_DELAY_STEP: - jitter->delay_step = *(spx_int32_t*)ptr; - break; - case JITTER_BUFFER_GET_DELAY_STEP: - *(spx_int32_t*)ptr = jitter->delay_step; - break; - case JITTER_BUFFER_SET_CONCEALMENT_SIZE: - jitter->concealment_size = *(spx_int32_t*)ptr; - break; - case JITTER_BUFFER_GET_CONCEALMENT_SIZE: - *(spx_int32_t*)ptr = jitter->concealment_size; - break; - case JITTER_BUFFER_SET_MAX_LATE_RATE: - jitter->max_late_rate = *(spx_int32_t*)ptr; - jitter->window_size = 100*TOP_DELAY/jitter->max_late_rate; - jitter->subwindow_size = jitter->window_size/MAX_BUFFERS; - break; - case JITTER_BUFFER_GET_MAX_LATE_RATE: - *(spx_int32_t*)ptr = jitter->max_late_rate; - break; - case JITTER_BUFFER_SET_LATE_COST: - jitter->latency_tradeoff = *(spx_int32_t*)ptr; - break; - case JITTER_BUFFER_GET_LATE_COST: - *(spx_int32_t*)ptr = jitter->latency_tradeoff; - break; - default: - speex_warning_int("Unknown jitter_buffer_ctl request: ", request); - return -1; - } - return 0; -} - diff --git a/speex/libspeexdsp/kiss_fft.c b/speex/libspeexdsp/kiss_fft.c deleted file mode 100644 index 285e557983710069cc624e7d11c663754ac29999..0000000000000000000000000000000000000000 --- a/speex/libspeexdsp/kiss_fft.c +++ /dev/null @@ -1,523 +0,0 @@ -/* -Copyright (c) 2003-2004, Mark Borgerding -Copyright (c) 2005-2007, Jean-Marc Valin - -All rights reserved. - -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 author nor the names of any 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 COPYRIGHT OWNER 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 "_kiss_fft_guts.h" -#include "arch.h" -#include "os_support.h" - -/* The guts header contains all the multiplication and addition macros that are defined for - fixed or floating point complex numbers. It also delares the kf_ internal functions. - */ - -static void kf_bfly2( - kiss_fft_cpx * Fout, - const size_t fstride, - const kiss_fft_cfg st, - int m, - int N, - int mm - ) -{ - kiss_fft_cpx * Fout2; - kiss_fft_cpx * tw1; - kiss_fft_cpx t; - if (!st->inverse) { - int i,j; - kiss_fft_cpx * Fout_beg = Fout; - for (i=0;itwiddles; - for(j=0;jr , tw1->r),MULT16_16(Fout2->i , tw1->i)), 1); - ti = SHR32(ADD32(MULT16_16(Fout2->i , tw1->r),MULT16_16(Fout2->r , tw1->i)), 1); - tw1 += fstride; - Fout2->r = PSHR32(SUB32(SHL32(EXTEND32(Fout->r), 14), tr), 15); - Fout2->i = PSHR32(SUB32(SHL32(EXTEND32(Fout->i), 14), ti), 15); - Fout->r = PSHR32(ADD32(SHL32(EXTEND32(Fout->r), 14), tr), 15); - Fout->i = PSHR32(ADD32(SHL32(EXTEND32(Fout->i), 14), ti), 15); - ++Fout2; - ++Fout; - } - } - } else { - int i,j; - kiss_fft_cpx * Fout_beg = Fout; - for (i=0;itwiddles; - for(j=0;jinverse) - { - kiss_fft_cpx * Fout_beg = Fout; - for (i=0;itwiddles; - for (j=0;jtwiddles; - for (j=0;jr = PSHR16(Fout->r, 2); - Fout->i = PSHR16(Fout->i, 2); - C_SUB( scratch[5] , *Fout, scratch[1] ); - C_ADDTO(*Fout, scratch[1]); - C_ADD( scratch[3] , scratch[0] , scratch[2] ); - C_SUB( scratch[4] , scratch[0] , scratch[2] ); - Fout[m2].r = PSHR16(Fout[m2].r, 2); - Fout[m2].i = PSHR16(Fout[m2].i, 2); - C_SUB( Fout[m2], *Fout, scratch[3] ); - tw1 += fstride; - tw2 += fstride*2; - tw3 += fstride*3; - C_ADDTO( *Fout , scratch[3] ); - - Fout[m].r = scratch[5].r + scratch[4].i; - Fout[m].i = scratch[5].i - scratch[4].r; - Fout[m3].r = scratch[5].r - scratch[4].i; - Fout[m3].i = scratch[5].i + scratch[4].r; - ++Fout; - } - } - } -} - -static void kf_bfly3( - kiss_fft_cpx * Fout, - const size_t fstride, - const kiss_fft_cfg st, - size_t m - ) -{ - size_t k=m; - const size_t m2 = 2*m; - kiss_fft_cpx *tw1,*tw2; - kiss_fft_cpx scratch[5]; - kiss_fft_cpx epi3; - epi3 = st->twiddles[fstride*m]; - - tw1=tw2=st->twiddles; - - do{ - if (!st->inverse) { - C_FIXDIV(*Fout,3); C_FIXDIV(Fout[m],3); C_FIXDIV(Fout[m2],3); - } - - C_MUL(scratch[1],Fout[m] , *tw1); - C_MUL(scratch[2],Fout[m2] , *tw2); - - C_ADD(scratch[3],scratch[1],scratch[2]); - C_SUB(scratch[0],scratch[1],scratch[2]); - tw1 += fstride; - tw2 += fstride*2; - - Fout[m].r = Fout->r - HALF_OF(scratch[3].r); - Fout[m].i = Fout->i - HALF_OF(scratch[3].i); - - C_MULBYSCALAR( scratch[0] , epi3.i ); - - C_ADDTO(*Fout,scratch[3]); - - Fout[m2].r = Fout[m].r + scratch[0].i; - Fout[m2].i = Fout[m].i - scratch[0].r; - - Fout[m].r -= scratch[0].i; - Fout[m].i += scratch[0].r; - - ++Fout; - }while(--k); -} - -static void kf_bfly5( - kiss_fft_cpx * Fout, - const size_t fstride, - const kiss_fft_cfg st, - int m - ) -{ - kiss_fft_cpx *Fout0,*Fout1,*Fout2,*Fout3,*Fout4; - int u; - kiss_fft_cpx scratch[13]; - kiss_fft_cpx * twiddles = st->twiddles; - kiss_fft_cpx *tw; - kiss_fft_cpx ya,yb; - ya = twiddles[fstride*m]; - yb = twiddles[fstride*2*m]; - - Fout0=Fout; - Fout1=Fout0+m; - Fout2=Fout0+2*m; - Fout3=Fout0+3*m; - Fout4=Fout0+4*m; - - tw=st->twiddles; - for ( u=0; uinverse) { - C_FIXDIV( *Fout0,5); C_FIXDIV( *Fout1,5); C_FIXDIV( *Fout2,5); C_FIXDIV( *Fout3,5); C_FIXDIV( *Fout4,5); - } - scratch[0] = *Fout0; - - C_MUL(scratch[1] ,*Fout1, tw[u*fstride]); - C_MUL(scratch[2] ,*Fout2, tw[2*u*fstride]); - C_MUL(scratch[3] ,*Fout3, tw[3*u*fstride]); - C_MUL(scratch[4] ,*Fout4, tw[4*u*fstride]); - - C_ADD( scratch[7],scratch[1],scratch[4]); - C_SUB( scratch[10],scratch[1],scratch[4]); - C_ADD( scratch[8],scratch[2],scratch[3]); - C_SUB( scratch[9],scratch[2],scratch[3]); - - Fout0->r += scratch[7].r + scratch[8].r; - Fout0->i += scratch[7].i + scratch[8].i; - - scratch[5].r = scratch[0].r + S_MUL(scratch[7].r,ya.r) + S_MUL(scratch[8].r,yb.r); - scratch[5].i = scratch[0].i + S_MUL(scratch[7].i,ya.r) + S_MUL(scratch[8].i,yb.r); - - scratch[6].r = S_MUL(scratch[10].i,ya.i) + S_MUL(scratch[9].i,yb.i); - scratch[6].i = -S_MUL(scratch[10].r,ya.i) - S_MUL(scratch[9].r,yb.i); - - C_SUB(*Fout1,scratch[5],scratch[6]); - C_ADD(*Fout4,scratch[5],scratch[6]); - - scratch[11].r = scratch[0].r + S_MUL(scratch[7].r,yb.r) + S_MUL(scratch[8].r,ya.r); - scratch[11].i = scratch[0].i + S_MUL(scratch[7].i,yb.r) + S_MUL(scratch[8].i,ya.r); - scratch[12].r = - S_MUL(scratch[10].i,yb.i) + S_MUL(scratch[9].i,ya.i); - scratch[12].i = S_MUL(scratch[10].r,yb.i) - S_MUL(scratch[9].r,ya.i); - - C_ADD(*Fout2,scratch[11],scratch[12]); - C_SUB(*Fout3,scratch[11],scratch[12]); - - ++Fout0;++Fout1;++Fout2;++Fout3;++Fout4; - } -} - -/* perform the butterfly for one stage of a mixed radix FFT */ -static void kf_bfly_generic( - kiss_fft_cpx * Fout, - const size_t fstride, - const kiss_fft_cfg st, - int m, - int p - ) -{ - int u,k,q1,q; - kiss_fft_cpx * twiddles = st->twiddles; - kiss_fft_cpx t; - kiss_fft_cpx scratchbuf[17]; - int Norig = st->nfft; - - /*CHECKBUF(scratchbuf,nscratchbuf,p);*/ - if (p>17) - speex_fatal("KissFFT: max radix supported is 17"); - - for ( u=0; uinverse) { - C_FIXDIV(scratchbuf[q1],p); - } - k += m; - } - - k=u; - for ( q1=0 ; q1

=Norig) twidx-=Norig; - C_MUL(t,scratchbuf[q] , twiddles[twidx] ); - C_ADDTO( Fout[ k ] ,t); - } - k += m; - } - } -} - -static -void kf_shuffle( - kiss_fft_cpx * Fout, - const kiss_fft_cpx * f, - const size_t fstride, - int in_stride, - int * factors, - const kiss_fft_cfg st - ) -{ - const int p=*factors++; /* the radix */ - const int m=*factors++; /* stage's fft length/p */ - - /*printf ("fft %d %d %d %d %d %d\n", p*m, m, p, s2, fstride*in_stride, N);*/ - if (m==1) - { - int j; - for (j=0;j32000 || (spx_int32_t)p*(spx_int32_t)p > n) - p = n; /* no more factors, skip to end */ - } - n /= p; - *facbuf++ = p; - *facbuf++ = n; - } while (n > 1); -} -/* - * - * User-callable function to allocate all necessary storage space for the fft. - * - * The return value is a contiguous block of memory, allocated with malloc. As such, - * It can be freed with free(), rather than a kiss_fft-specific function. - * */ -kiss_fft_cfg kiss_fft_alloc(int nfft,int inverse_fft,void * mem,size_t * lenmem ) -{ - kiss_fft_cfg st=NULL; - size_t memneeded = sizeof(struct kiss_fft_state) - + sizeof(kiss_fft_cpx)*(nfft-1); /* twiddle factors*/ - - if ( lenmem==NULL ) { - st = ( kiss_fft_cfg)KISS_FFT_MALLOC( memneeded ); - }else{ - if (mem != NULL && *lenmem >= memneeded) - st = (kiss_fft_cfg)mem; - *lenmem = memneeded; - } - if (st) { - int i; - st->nfft=nfft; - st->inverse = inverse_fft; -#ifdef FIXED_POINT - for (i=0;iinverse) - phase = -phase; - kf_cexp2(st->twiddles+i, DIV32(SHL32(phase,17),nfft)); - } -#else - for (i=0;iinverse) - phase *= -1; - kf_cexp(st->twiddles+i, phase ); - } -#endif - kf_factor(nfft,st->factors); - } - return st; -} - - - - -void kiss_fft_stride(kiss_fft_cfg st,const kiss_fft_cpx *fin,kiss_fft_cpx *fout,int in_stride) -{ - if (fin == fout) - { - speex_fatal("In-place FFT not supported"); - /*CHECKBUF(tmpbuf,ntmpbuf,st->nfft); - kf_work(tmpbuf,fin,1,in_stride, st->factors,st); - SPEEX_MOVE(fout,tmpbuf,st->nfft);*/ - } else { - kf_shuffle( fout, fin, 1,in_stride, st->factors,st); - kf_work( fout, fin, 1,in_stride, st->factors,st, 1, in_stride, 1); - } -} - -void kiss_fft(kiss_fft_cfg cfg,const kiss_fft_cpx *fin,kiss_fft_cpx *fout) -{ - kiss_fft_stride(cfg,fin,fout,1); -} - diff --git a/speex/libspeexdsp/kiss_fft.h b/speex/libspeexdsp/kiss_fft.h deleted file mode 100644 index bb19eadbd9e4832c187c52d6f3430dd13b6803eb..0000000000000000000000000000000000000000 --- a/speex/libspeexdsp/kiss_fft.h +++ /dev/null @@ -1,108 +0,0 @@ -#ifndef KISS_FFT_H -#define KISS_FFT_H - -#include -#include -#include "arch.h" - -#ifdef __cplusplus -extern "C" { -#endif - -/* - ATTENTION! - If you would like a : - -- a utility that will handle the caching of fft objects - -- real-only (no imaginary time component ) FFT - -- a multi-dimensional FFT - -- a command-line utility to perform ffts - -- a command-line utility to perform fast-convolution filtering - - Then see kfc.h kiss_fftr.h kiss_fftnd.h fftutil.c kiss_fastfir.c - in the tools/ directory. -*/ - -#ifdef USE_SIMD -# include -# define kiss_fft_scalar __m128 -#define KISS_FFT_MALLOC(nbytes) memalign(16,nbytes) -#else -#define KISS_FFT_MALLOC speex_alloc -#endif - - -#ifdef FIXED_POINT -#include "arch.h" -# define kiss_fft_scalar spx_int16_t -#else -# ifndef kiss_fft_scalar -/* default is float */ -# define kiss_fft_scalar float -# endif -#endif - -typedef struct { - kiss_fft_scalar r; - kiss_fft_scalar i; -}kiss_fft_cpx; - -typedef struct kiss_fft_state* kiss_fft_cfg; - -/* - * kiss_fft_alloc - * - * Initialize a FFT (or IFFT) algorithm's cfg/state buffer. - * - * typical usage: kiss_fft_cfg mycfg=kiss_fft_alloc(1024,0,NULL,NULL); - * - * The return value from fft_alloc is a cfg buffer used internally - * by the fft routine or NULL. - * - * If lenmem is NULL, then kiss_fft_alloc will allocate a cfg buffer using malloc. - * The returned value should be free()d when done to avoid memory leaks. - * - * The state can be placed in a user supplied buffer 'mem': - * If lenmem is not NULL and mem is not NULL and *lenmem is large enough, - * then the function places the cfg in mem and the size used in *lenmem - * and returns mem. - * - * If lenmem is not NULL and ( mem is NULL or *lenmem is not large enough), - * then the function returns NULL and places the minimum cfg - * buffer size in *lenmem. - * */ - -kiss_fft_cfg kiss_fft_alloc(int nfft,int inverse_fft,void * mem,size_t * lenmem); - -/* - * kiss_fft(cfg,in_out_buf) - * - * Perform an FFT on a complex input buffer. - * for a forward FFT, - * fin should be f[0] , f[1] , ... ,f[nfft-1] - * fout will be F[0] , F[1] , ... ,F[nfft-1] - * Note that each element is complex and can be accessed like - f[k].r and f[k].i - * */ -void kiss_fft(kiss_fft_cfg cfg,const kiss_fft_cpx *fin,kiss_fft_cpx *fout); - -/* - A more generic version of the above function. It reads its input from every Nth sample. - * */ -void kiss_fft_stride(kiss_fft_cfg cfg,const kiss_fft_cpx *fin,kiss_fft_cpx *fout,int fin_stride); - -/* If kiss_fft_alloc allocated a buffer, it is one contiguous - buffer and can be simply free()d when no longer needed*/ -#define kiss_fft_free speex_free - -/* - Cleans up some memory that gets managed internally. Not necessary to call, but it might clean up - your compiler output to call this before you exit. -*/ -void kiss_fft_cleanup(void); - - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/speex/libspeexdsp/kiss_fftr.c b/speex/libspeexdsp/kiss_fftr.c deleted file mode 100644 index 827e0b14df9675d61d0cd9618f1bd3603ad205be..0000000000000000000000000000000000000000 --- a/speex/libspeexdsp/kiss_fftr.c +++ /dev/null @@ -1,297 +0,0 @@ -/* -Copyright (c) 2003-2004, Mark Borgerding - -All rights reserved. - -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 author nor the names of any 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 COPYRIGHT OWNER 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 "os_support.h" -#include "kiss_fftr.h" -#include "_kiss_fft_guts.h" - -struct kiss_fftr_state{ - kiss_fft_cfg substate; - kiss_fft_cpx * tmpbuf; - kiss_fft_cpx * super_twiddles; -#ifdef USE_SIMD - long pad; -#endif -}; - -kiss_fftr_cfg kiss_fftr_alloc(int nfft,int inverse_fft,void * mem,size_t * lenmem) -{ - int i; - kiss_fftr_cfg st = NULL; - size_t subsize, memneeded; - - if (nfft & 1) { - speex_warning("Real FFT optimization must be even.\n"); - return NULL; - } - nfft >>= 1; - - kiss_fft_alloc (nfft, inverse_fft, NULL, &subsize); - memneeded = sizeof(struct kiss_fftr_state) + subsize + sizeof(kiss_fft_cpx) * ( nfft * 2); - - if (lenmem == NULL) { - st = (kiss_fftr_cfg) KISS_FFT_MALLOC (memneeded); - } else { - if (*lenmem >= memneeded) - st = (kiss_fftr_cfg) mem; - *lenmem = memneeded; - } - if (!st) - return NULL; - - st->substate = (kiss_fft_cfg) (st + 1); /*just beyond kiss_fftr_state struct */ - st->tmpbuf = (kiss_fft_cpx *) (((char *) st->substate) + subsize); - st->super_twiddles = st->tmpbuf + nfft; - kiss_fft_alloc(nfft, inverse_fft, st->substate, &subsize); - -#ifdef FIXED_POINT - for (i=0;i>1); - if (!inverse_fft) - phase = -phase; - kf_cexp2(st->super_twiddles+i, DIV32(SHL32(phase,16),nfft)); - } -#else - for (i=0;isuper_twiddles+i, phase ); - } -#endif - return st; -} - -void kiss_fftr(kiss_fftr_cfg st,const kiss_fft_scalar *timedata,kiss_fft_cpx *freqdata) -{ - /* input buffer timedata is stored row-wise */ - int k,ncfft; - kiss_fft_cpx fpnk,fpk,f1k,f2k,tw,tdc; - - if ( st->substate->inverse) { - speex_fatal("kiss fft usage error: improper alloc\n"); - } - - ncfft = st->substate->nfft; - - /*perform the parallel fft of two real signals packed in real,imag*/ - kiss_fft( st->substate , (const kiss_fft_cpx*)timedata, st->tmpbuf ); - /* The real part of the DC element of the frequency spectrum in st->tmpbuf - * contains the sum of the even-numbered elements of the input time sequence - * The imag part is the sum of the odd-numbered elements - * - * The sum of tdc.r and tdc.i is the sum of the input time sequence. - * yielding DC of input time sequence - * The difference of tdc.r - tdc.i is the sum of the input (dot product) [1,-1,1,-1... - * yielding Nyquist bin of input time sequence - */ - - tdc.r = st->tmpbuf[0].r; - tdc.i = st->tmpbuf[0].i; - C_FIXDIV(tdc,2); - CHECK_OVERFLOW_OP(tdc.r ,+, tdc.i); - CHECK_OVERFLOW_OP(tdc.r ,-, tdc.i); - freqdata[0].r = tdc.r + tdc.i; - freqdata[ncfft].r = tdc.r - tdc.i; -#ifdef USE_SIMD - freqdata[ncfft].i = freqdata[0].i = _mm_set1_ps(0); -#else - freqdata[ncfft].i = freqdata[0].i = 0; -#endif - - for ( k=1;k <= ncfft/2 ; ++k ) { - fpk = st->tmpbuf[k]; - fpnk.r = st->tmpbuf[ncfft-k].r; - fpnk.i = - st->tmpbuf[ncfft-k].i; - C_FIXDIV(fpk,2); - C_FIXDIV(fpnk,2); - - C_ADD( f1k, fpk , fpnk ); - C_SUB( f2k, fpk , fpnk ); - C_MUL( tw , f2k , st->super_twiddles[k]); - - freqdata[k].r = HALF_OF(f1k.r + tw.r); - freqdata[k].i = HALF_OF(f1k.i + tw.i); - freqdata[ncfft-k].r = HALF_OF(f1k.r - tw.r); - freqdata[ncfft-k].i = HALF_OF(tw.i - f1k.i); - } -} - -void kiss_fftri(kiss_fftr_cfg st,const kiss_fft_cpx *freqdata, kiss_fft_scalar *timedata) -{ - /* input buffer timedata is stored row-wise */ - int k, ncfft; - - if (st->substate->inverse == 0) { - speex_fatal("kiss fft usage error: improper alloc\n"); - } - - ncfft = st->substate->nfft; - - st->tmpbuf[0].r = freqdata[0].r + freqdata[ncfft].r; - st->tmpbuf[0].i = freqdata[0].r - freqdata[ncfft].r; - /*C_FIXDIV(st->tmpbuf[0],2);*/ - - for (k = 1; k <= ncfft / 2; ++k) { - kiss_fft_cpx fk, fnkc, fek, fok, tmp; - fk = freqdata[k]; - fnkc.r = freqdata[ncfft - k].r; - fnkc.i = -freqdata[ncfft - k].i; - /*C_FIXDIV( fk , 2 ); - C_FIXDIV( fnkc , 2 );*/ - - C_ADD (fek, fk, fnkc); - C_SUB (tmp, fk, fnkc); - C_MUL (fok, tmp, st->super_twiddles[k]); - C_ADD (st->tmpbuf[k], fek, fok); - C_SUB (st->tmpbuf[ncfft - k], fek, fok); -#ifdef USE_SIMD - st->tmpbuf[ncfft - k].i *= _mm_set1_ps(-1.0); -#else - st->tmpbuf[ncfft - k].i *= -1; -#endif - } - kiss_fft (st->substate, st->tmpbuf, (kiss_fft_cpx *) timedata); -} - -void kiss_fftr2(kiss_fftr_cfg st,const kiss_fft_scalar *timedata,kiss_fft_scalar *freqdata) -{ - /* input buffer timedata is stored row-wise */ - int k,ncfft; - kiss_fft_cpx f2k,tdc; - spx_word32_t f1kr, f1ki, twr, twi; - - if ( st->substate->inverse) { - speex_fatal("kiss fft usage error: improper alloc\n"); - } - - ncfft = st->substate->nfft; - - /*perform the parallel fft of two real signals packed in real,imag*/ - kiss_fft( st->substate , (const kiss_fft_cpx*)timedata, st->tmpbuf ); - /* The real part of the DC element of the frequency spectrum in st->tmpbuf - * contains the sum of the even-numbered elements of the input time sequence - * The imag part is the sum of the odd-numbered elements - * - * The sum of tdc.r and tdc.i is the sum of the input time sequence. - * yielding DC of input time sequence - * The difference of tdc.r - tdc.i is the sum of the input (dot product) [1,-1,1,-1... - * yielding Nyquist bin of input time sequence - */ - - tdc.r = st->tmpbuf[0].r; - tdc.i = st->tmpbuf[0].i; - C_FIXDIV(tdc,2); - CHECK_OVERFLOW_OP(tdc.r ,+, tdc.i); - CHECK_OVERFLOW_OP(tdc.r ,-, tdc.i); - freqdata[0] = tdc.r + tdc.i; - freqdata[2*ncfft-1] = tdc.r - tdc.i; - - for ( k=1;k <= ncfft/2 ; ++k ) - { - /*fpk = st->tmpbuf[k]; - fpnk.r = st->tmpbuf[ncfft-k].r; - fpnk.i = - st->tmpbuf[ncfft-k].i; - C_FIXDIV(fpk,2); - C_FIXDIV(fpnk,2); - - C_ADD( f1k, fpk , fpnk ); - C_SUB( f2k, fpk , fpnk ); - - C_MUL( tw , f2k , st->super_twiddles[k]); - - freqdata[2*k-1] = HALF_OF(f1k.r + tw.r); - freqdata[2*k] = HALF_OF(f1k.i + tw.i); - freqdata[2*(ncfft-k)-1] = HALF_OF(f1k.r - tw.r); - freqdata[2*(ncfft-k)] = HALF_OF(tw.i - f1k.i); - */ - - /*f1k.r = PSHR32(ADD32(EXTEND32(st->tmpbuf[k].r), EXTEND32(st->tmpbuf[ncfft-k].r)),1); - f1k.i = PSHR32(SUB32(EXTEND32(st->tmpbuf[k].i), EXTEND32(st->tmpbuf[ncfft-k].i)),1); - f2k.r = PSHR32(SUB32(EXTEND32(st->tmpbuf[k].r), EXTEND32(st->tmpbuf[ncfft-k].r)),1); - f2k.i = SHR32(ADD32(EXTEND32(st->tmpbuf[k].i), EXTEND32(st->tmpbuf[ncfft-k].i)),1); - - C_MUL( tw , f2k , st->super_twiddles[k]); - - freqdata[2*k-1] = HALF_OF(f1k.r + tw.r); - freqdata[2*k] = HALF_OF(f1k.i + tw.i); - freqdata[2*(ncfft-k)-1] = HALF_OF(f1k.r - tw.r); - freqdata[2*(ncfft-k)] = HALF_OF(tw.i - f1k.i); - */ - f2k.r = SHR32(SUB32(EXTEND32(st->tmpbuf[k].r), EXTEND32(st->tmpbuf[ncfft-k].r)),1); - f2k.i = PSHR32(ADD32(EXTEND32(st->tmpbuf[k].i), EXTEND32(st->tmpbuf[ncfft-k].i)),1); - - f1kr = SHL32(ADD32(EXTEND32(st->tmpbuf[k].r), EXTEND32(st->tmpbuf[ncfft-k].r)),13); - f1ki = SHL32(SUB32(EXTEND32(st->tmpbuf[k].i), EXTEND32(st->tmpbuf[ncfft-k].i)),13); - - twr = SHR32(SUB32(MULT16_16(f2k.r,st->super_twiddles[k].r),MULT16_16(f2k.i,st->super_twiddles[k].i)), 1); - twi = SHR32(ADD32(MULT16_16(f2k.i,st->super_twiddles[k].r),MULT16_16(f2k.r,st->super_twiddles[k].i)), 1); - -#ifdef FIXED_POINT - freqdata[2*k-1] = PSHR32(f1kr + twr, 15); - freqdata[2*k] = PSHR32(f1ki + twi, 15); - freqdata[2*(ncfft-k)-1] = PSHR32(f1kr - twr, 15); - freqdata[2*(ncfft-k)] = PSHR32(twi - f1ki, 15); -#else - freqdata[2*k-1] = .5f*(f1kr + twr); - freqdata[2*k] = .5f*(f1ki + twi); - freqdata[2*(ncfft-k)-1] = .5f*(f1kr - twr); - freqdata[2*(ncfft-k)] = .5f*(twi - f1ki); - -#endif - } -} - -void kiss_fftri2(kiss_fftr_cfg st,const kiss_fft_scalar *freqdata,kiss_fft_scalar *timedata) -{ - /* input buffer timedata is stored row-wise */ - int k, ncfft; - - if (st->substate->inverse == 0) { - speex_fatal ("kiss fft usage error: improper alloc\n"); - } - - ncfft = st->substate->nfft; - - st->tmpbuf[0].r = freqdata[0] + freqdata[2*ncfft-1]; - st->tmpbuf[0].i = freqdata[0] - freqdata[2*ncfft-1]; - /*C_FIXDIV(st->tmpbuf[0],2);*/ - - for (k = 1; k <= ncfft / 2; ++k) { - kiss_fft_cpx fk, fnkc, fek, fok, tmp; - fk.r = freqdata[2*k-1]; - fk.i = freqdata[2*k]; - fnkc.r = freqdata[2*(ncfft - k)-1]; - fnkc.i = -freqdata[2*(ncfft - k)]; - /*C_FIXDIV( fk , 2 ); - C_FIXDIV( fnkc , 2 );*/ - - C_ADD (fek, fk, fnkc); - C_SUB (tmp, fk, fnkc); - C_MUL (fok, tmp, st->super_twiddles[k]); - C_ADD (st->tmpbuf[k], fek, fok); - C_SUB (st->tmpbuf[ncfft - k], fek, fok); -#ifdef USE_SIMD - st->tmpbuf[ncfft - k].i *= _mm_set1_ps(-1.0); -#else - st->tmpbuf[ncfft - k].i *= -1; -#endif - } - kiss_fft (st->substate, st->tmpbuf, (kiss_fft_cpx *) timedata); -} diff --git a/speex/libspeexdsp/kiss_fftr.h b/speex/libspeexdsp/kiss_fftr.h deleted file mode 100644 index 8cfeda138a550fd6468582ab86e2e2da2b155360..0000000000000000000000000000000000000000 --- a/speex/libspeexdsp/kiss_fftr.h +++ /dev/null @@ -1,51 +0,0 @@ -#ifndef KISS_FTR_H -#define KISS_FTR_H - -#include "kiss_fft.h" -#ifdef __cplusplus -extern "C" { -#endif - - -/* - - Real optimized version can save about 45% cpu time vs. complex fft of a real seq. - - - - */ - -typedef struct kiss_fftr_state *kiss_fftr_cfg; - - -kiss_fftr_cfg kiss_fftr_alloc(int nfft,int inverse_fft,void * mem, size_t * lenmem); -/* - nfft must be even - - If you don't care to allocate space, use mem = lenmem = NULL -*/ - - -void kiss_fftr(kiss_fftr_cfg cfg,const kiss_fft_scalar *timedata,kiss_fft_cpx *freqdata); -/* - input timedata has nfft scalar points - output freqdata has nfft/2+1 complex points -*/ - -void kiss_fftr2(kiss_fftr_cfg st,const kiss_fft_scalar *timedata,kiss_fft_scalar *freqdata); - -void kiss_fftri(kiss_fftr_cfg cfg,const kiss_fft_cpx *freqdata,kiss_fft_scalar *timedata); - -void kiss_fftri2(kiss_fftr_cfg st,const kiss_fft_scalar *freqdata, kiss_fft_scalar *timedata); - -/* - input freqdata has nfft/2+1 complex points - output timedata has nfft scalar points -*/ - -#define kiss_fftr_free speex_free - -#ifdef __cplusplus -} -#endif -#endif diff --git a/speex/libspeexdsp/math_approx.h b/speex/libspeexdsp/math_approx.h deleted file mode 100644 index 596dfdc1b7a51722d379fe74342daf7da704be61..0000000000000000000000000000000000000000 --- a/speex/libspeexdsp/math_approx.h +++ /dev/null @@ -1,332 +0,0 @@ -/* Copyright (C) 2002 Jean-Marc Valin */ -/** - @file math_approx.h - @brief Various math approximation functions for Speex -*/ -/* - 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 MATH_APPROX_H -#define MATH_APPROX_H - -#include "arch.h" - -#ifndef FIXED_POINT - -#define spx_sqrt sqrt -#define spx_acos acos -#define spx_exp exp -#define spx_cos_norm(x) (cos((.5f*M_PI)*(x))) -#define spx_atan atan - -/** Generate a pseudo-random number */ -static inline spx_word16_t speex_rand(spx_word16_t std, spx_int32_t *seed) -{ - const unsigned int jflone = 0x3f800000; - const unsigned int jflmsk = 0x007fffff; - union {int i; float f;} ran; - *seed = 1664525 * *seed + 1013904223; - ran.i = jflone | (jflmsk & *seed); - ran.f -= 1.5; - return 3.4642*std*ran.f; -} - - -#endif - - -static inline spx_int16_t spx_ilog2(spx_uint32_t x) -{ - int r=0; - if (x>=(spx_int32_t)65536) - { - x >>= 16; - r += 16; - } - if (x>=256) - { - x >>= 8; - r += 8; - } - if (x>=16) - { - x >>= 4; - r += 4; - } - if (x>=4) - { - x >>= 2; - r += 2; - } - if (x>=2) - { - r += 1; - } - return r; -} - -static inline spx_int16_t spx_ilog4(spx_uint32_t x) -{ - int r=0; - if (x>=(spx_int32_t)65536) - { - x >>= 16; - r += 8; - } - if (x>=256) - { - x >>= 8; - r += 4; - } - if (x>=16) - { - x >>= 4; - r += 2; - } - if (x>=4) - { - r += 1; - } - return r; -} - -#ifdef FIXED_POINT - -/** Generate a pseudo-random number */ -static inline spx_word16_t speex_rand(spx_word16_t std, spx_int32_t *seed) -{ - spx_word32_t res; - *seed = 1664525 * *seed + 1013904223; - res = MULT16_16(EXTRACT16(SHR32(*seed,16)),std); - return EXTRACT16(PSHR32(SUB32(res, SHR32(res, 3)),14)); -} - -/* sqrt(x) ~= 0.22178 + 1.29227*x - 0.77070*x^2 + 0.25723*x^3 (for .25 < x < 1) */ -/*#define C0 3634 -#define C1 21173 -#define C2 -12627 -#define C3 4215*/ - -/* sqrt(x) ~= 0.22178 + 1.29227*x - 0.77070*x^2 + 0.25659*x^3 (for .25 < x < 1) */ -#define C0 3634 -#define C1 21173 -#define C2 -12627 -#define C3 4204 - -static inline spx_word16_t spx_sqrt(spx_word32_t x) -{ - int k; - spx_word32_t rt; - k = spx_ilog4(x)-6; - x = VSHR32(x, (k<<1)); - rt = ADD16(C0, MULT16_16_Q14(x, ADD16(C1, MULT16_16_Q14(x, ADD16(C2, MULT16_16_Q14(x, (C3))))))); - rt = VSHR32(rt,7-k); - return rt; -} - -/* log(x) ~= -2.18151 + 4.20592*x - 2.88938*x^2 + 0.86535*x^3 (for .5 < x < 1) */ - - -#define A1 16469 -#define A2 2242 -#define A3 1486 - -static inline spx_word16_t spx_acos(spx_word16_t x) -{ - int s=0; - spx_word16_t ret; - spx_word16_t sq; - if (x<0) - { - s=1; - x = NEG16(x); - } - x = SUB16(16384,x); - - x = x >> 1; - sq = MULT16_16_Q13(x, ADD16(A1, MULT16_16_Q13(x, ADD16(A2, MULT16_16_Q13(x, (A3)))))); - ret = spx_sqrt(SHL32(EXTEND32(sq),13)); - - /*ret = spx_sqrt(67108864*(-1.6129e-04 + 2.0104e+00*f + 2.7373e-01*f*f + 1.8136e-01*f*f*f));*/ - if (s) - ret = SUB16(25736,ret); - return ret; -} - - -#define K1 8192 -#define K2 -4096 -#define K3 340 -#define K4 -10 - -static inline spx_word16_t spx_cos(spx_word16_t x) -{ - spx_word16_t x2; - - if (x<12868) - { - x2 = MULT16_16_P13(x,x); - return ADD32(K1, MULT16_16_P13(x2, ADD32(K2, MULT16_16_P13(x2, ADD32(K3, MULT16_16_P13(K4, x2)))))); - } else { - x = SUB16(25736,x); - x2 = MULT16_16_P13(x,x); - return SUB32(-K1, MULT16_16_P13(x2, ADD32(K2, MULT16_16_P13(x2, ADD32(K3, MULT16_16_P13(K4, x2)))))); - } -} - -#define L1 32767 -#define L2 -7651 -#define L3 8277 -#define L4 -626 - -static inline spx_word16_t _spx_cos_pi_2(spx_word16_t x) -{ - spx_word16_t x2; - - x2 = MULT16_16_P15(x,x); - return ADD16(1,MIN16(32766,ADD32(SUB16(L1,x2), MULT16_16_P15(x2, ADD32(L2, MULT16_16_P15(x2, ADD32(L3, MULT16_16_P15(L4, x2)))))))); -} - -static inline spx_word16_t spx_cos_norm(spx_word32_t x) -{ - x = x&0x0001ffff; - if (x>SHL32(EXTEND32(1), 16)) - x = SUB32(SHL32(EXTEND32(1), 17),x); - if (x&0x00007fff) - { - if (x14) - return 0x7fffffff; - else if (integer < -15) - return 0; - frac = SHL16(x-SHL16(integer,11),3); - frac = ADD16(D0, MULT16_16_Q14(frac, ADD16(D1, MULT16_16_Q14(frac, ADD16(D2 , MULT16_16_Q14(D3,frac)))))); - return VSHR32(EXTEND32(frac), -integer-2); -} - -/* Input in Q11 format, output in Q16 */ -static inline spx_word32_t spx_exp(spx_word16_t x) -{ - if (x>21290) - return 0x7fffffff; - else if (x<-21290) - return 0; - else - return spx_exp2(MULT16_16_P14(23637,x)); -} -#define M1 32767 -#define M2 -21 -#define M3 -11943 -#define M4 4936 - -static inline spx_word16_t spx_atan01(spx_word16_t x) -{ - return MULT16_16_P15(x, ADD32(M1, MULT16_16_P15(x, ADD32(M2, MULT16_16_P15(x, ADD32(M3, MULT16_16_P15(M4, x))))))); -} - -#undef M1 -#undef M2 -#undef M3 -#undef M4 - -/* Input in Q15, output in Q14 */ -static inline spx_word16_t spx_atan(spx_word32_t x) -{ - if (x <= 32767) - { - return SHR16(spx_atan01(x),1); - } else { - int e = spx_ilog2(x); - if (e>=29) - return 25736; - x = DIV32_16(SHL32(EXTEND32(32767),29-e), EXTRACT16(SHR32(x, e-14))); - return SUB16(25736, SHR16(spx_atan01(x),1)); - } -} -#else - -#ifndef M_PI -#define M_PI 3.14159265358979323846 /* pi */ -#endif - -#define C1 0.9999932946f -#define C2 -0.4999124376f -#define C3 0.0414877472f -#define C4 -0.0012712095f - - -#define SPX_PI_2 1.5707963268 -static inline spx_word16_t spx_cos(spx_word16_t x) -{ - if (x>16) - -#else - -static const spx_float_t MIN_LEAK = .005f; - -/* Constants for the two-path filter */ -static const spx_float_t VAR1_SMOOTH = .36f; -static const spx_float_t VAR2_SMOOTH = .7225f; -static const spx_float_t VAR1_UPDATE = .5f; -static const spx_float_t VAR2_UPDATE = .25f; -static const spx_float_t VAR_BACKTRACK = 4.f; -#define TOP16(x) (x) -#endif - - -#define PLAYBACK_DELAY 2 - -void speex_echo_get_residual(SpeexEchoState *st, spx_word32_t *Yout, int len); - - -/** Speex echo cancellation state. */ -struct SpeexEchoState_ { - int frame_size; /**< Number of samples processed each time */ - int window_size; - int M; - int cancel_count; - int adapted; - int saturated; - int screwed_up; - int C; /** Number of input channels (microphones) */ - int K; /** Number of output channels (loudspeakers) */ - spx_int32_t sampling_rate; - spx_word16_t spec_average; - spx_word16_t beta0; - spx_word16_t beta_max; - spx_word32_t sum_adapt; - spx_word16_t leak_estimate; - - spx_word16_t *e; /* scratch */ - spx_word16_t *x; /* Far-end input buffer (2N) */ - spx_word16_t *X; /* Far-end buffer (M+1 frames) in frequency domain */ - spx_word16_t *input; /* scratch */ - spx_word16_t *y; /* scratch */ - spx_word16_t *last_y; - spx_word16_t *Y; /* scratch */ - spx_word16_t *E; - spx_word32_t *PHI; /* scratch */ - spx_word32_t *W; /* (Background) filter weights */ -#ifdef TWO_PATH - spx_word16_t *foreground; /* Foreground filter weights */ - spx_word32_t Davg1; /* 1st recursive average of the residual power difference */ - spx_word32_t Davg2; /* 2nd recursive average of the residual power difference */ - spx_float_t Dvar1; /* Estimated variance of 1st estimator */ - spx_float_t Dvar2; /* Estimated variance of 2nd estimator */ -#endif - spx_word32_t *power; /* Power of the far-end signal */ - spx_float_t *power_1;/* Inverse power of far-end */ - spx_word16_t *wtmp; /* scratch */ -#ifdef FIXED_POINT - spx_word16_t *wtmp2; /* scratch */ -#endif - spx_word32_t *Rf; /* scratch */ - spx_word32_t *Yf; /* scratch */ - spx_word32_t *Xf; /* scratch */ - spx_word32_t *Eh; - spx_word32_t *Yh; - spx_float_t Pey; - spx_float_t Pyy; - spx_word16_t *window; - spx_word16_t *prop; - void *fft_table; - spx_word16_t *memX, *memD, *memE; - spx_word16_t preemph; - spx_word16_t notch_radius; - spx_mem_t *notch_mem; - - /* NOTE: If you only use speex_echo_cancel() and want to save some memory, remove this */ - spx_int16_t *play_buf; - int play_buf_pos; - int play_buf_started; -}; - -static inline void filter_dc_notch16(const spx_int16_t *in, spx_word16_t radius, spx_word16_t *out, int len, spx_mem_t *mem, int stride) -{ - int i; - spx_word16_t den2; -#ifdef FIXED_POINT - den2 = MULT16_16_Q15(radius,radius) + MULT16_16_Q15(QCONST16(.7,15),MULT16_16_Q15(32767-radius,32767-radius)); -#else - den2 = radius*radius + .7*(1-radius)*(1-radius); -#endif - /*printf ("%d %d %d %d %d %d\n", num[0], num[1], num[2], den[0], den[1], den[2]);*/ - for (i=0;i>= 1; - while(len--) - { - spx_word32_t part=0; - part = MAC16_16(part,*x++,*y++); - part = MAC16_16(part,*x++,*y++); - /* HINT: If you had a 40-bit accumulator, you could shift only at the end */ - sum = ADD32(sum,SHR32(part,6)); - } - return sum; -} - -/** Compute power spectrum of a half-complex (packed) vector */ -static inline void power_spectrum(const spx_word16_t *X, spx_word32_t *ps, int N) -{ - int i, j; - ps[0]=MULT16_16(X[0],X[0]); - for (i=1,j=1;i max_sum) - max_sum = prop[i]; - } - for (i=0;i -static FILE *rFile=NULL, *pFile=NULL, *oFile=NULL; - -static void dump_audio(const spx_int16_t *rec, const spx_int16_t *play, const spx_int16_t *out, int len) -{ - if (!(rFile && pFile && oFile)) - { - speex_fatal("Dump files not open"); - } - fwrite(rec, sizeof(spx_int16_t), len, rFile); - fwrite(play, sizeof(spx_int16_t), len, pFile); - fwrite(out, sizeof(spx_int16_t), len, oFile); -} -#endif - -/** Creates a new echo canceller state */ -EXPORT SpeexEchoState *speex_echo_state_init(int frame_size, int filter_length) -{ - return speex_echo_state_init_mc(frame_size, filter_length, 1, 1); -} - -EXPORT SpeexEchoState *speex_echo_state_init_mc(int frame_size, int filter_length, int nb_mic, int nb_speakers) -{ - int i,N,M, C, K; - SpeexEchoState *st = (SpeexEchoState *)speex_alloc(sizeof(SpeexEchoState)); - - st->K = nb_speakers; - st->C = nb_mic; - C=st->C; - K=st->K; -#ifdef DUMP_ECHO_CANCEL_DATA - if (rFile || pFile || oFile) - speex_fatal("Opening dump files twice"); - rFile = fopen("aec_rec.sw", "wb"); - pFile = fopen("aec_play.sw", "wb"); - oFile = fopen("aec_out.sw", "wb"); -#endif - - st->frame_size = frame_size; - st->window_size = 2*frame_size; - N = st->window_size; - M = st->M = (filter_length+st->frame_size-1)/frame_size; - st->cancel_count=0; - st->sum_adapt = 0; - st->saturated = 0; - st->screwed_up = 0; - /* This is the default sampling rate */ - st->sampling_rate = 8000; - st->spec_average = DIV32_16(SHL32(EXTEND32(st->frame_size), 15), st->sampling_rate); -#ifdef FIXED_POINT - st->beta0 = DIV32_16(SHL32(EXTEND32(st->frame_size), 16), st->sampling_rate); - st->beta_max = DIV32_16(SHL32(EXTEND32(st->frame_size), 14), st->sampling_rate); -#else - st->beta0 = (2.0f*st->frame_size)/st->sampling_rate; - st->beta_max = (.5f*st->frame_size)/st->sampling_rate; -#endif - st->leak_estimate = 0; - - st->fft_table = spx_fft_init(N); - - st->e = (spx_word16_t*)speex_alloc(C*N*sizeof(spx_word16_t)); - st->x = (spx_word16_t*)speex_alloc(K*N*sizeof(spx_word16_t)); - st->input = (spx_word16_t*)speex_alloc(C*st->frame_size*sizeof(spx_word16_t)); - st->y = (spx_word16_t*)speex_alloc(C*N*sizeof(spx_word16_t)); - st->last_y = (spx_word16_t*)speex_alloc(C*N*sizeof(spx_word16_t)); - st->Yf = (spx_word32_t*)speex_alloc((st->frame_size+1)*sizeof(spx_word32_t)); - st->Rf = (spx_word32_t*)speex_alloc((st->frame_size+1)*sizeof(spx_word32_t)); - st->Xf = (spx_word32_t*)speex_alloc((st->frame_size+1)*sizeof(spx_word32_t)); - st->Yh = (spx_word32_t*)speex_alloc((st->frame_size+1)*sizeof(spx_word32_t)); - st->Eh = (spx_word32_t*)speex_alloc((st->frame_size+1)*sizeof(spx_word32_t)); - - st->X = (spx_word16_t*)speex_alloc(K*(M+1)*N*sizeof(spx_word16_t)); - st->Y = (spx_word16_t*)speex_alloc(C*N*sizeof(spx_word16_t)); - st->E = (spx_word16_t*)speex_alloc(C*N*sizeof(spx_word16_t)); - st->W = (spx_word32_t*)speex_alloc(C*K*M*N*sizeof(spx_word32_t)); -#ifdef TWO_PATH - st->foreground = (spx_word16_t*)speex_alloc(M*N*C*K*sizeof(spx_word16_t)); -#endif - st->PHI = (spx_word32_t*)speex_alloc(N*sizeof(spx_word32_t)); - st->power = (spx_word32_t*)speex_alloc((frame_size+1)*sizeof(spx_word32_t)); - st->power_1 = (spx_float_t*)speex_alloc((frame_size+1)*sizeof(spx_float_t)); - st->window = (spx_word16_t*)speex_alloc(N*sizeof(spx_word16_t)); - st->prop = (spx_word16_t*)speex_alloc(M*sizeof(spx_word16_t)); - st->wtmp = (spx_word16_t*)speex_alloc(N*sizeof(spx_word16_t)); -#ifdef FIXED_POINT - st->wtmp2 = (spx_word16_t*)speex_alloc(N*sizeof(spx_word16_t)); - for (i=0;i>1;i++) - { - st->window[i] = (16383-SHL16(spx_cos(DIV32_16(MULT16_16(25736,i<<1),N)),1)); - st->window[N-i-1] = st->window[i]; - } -#else - for (i=0;iwindow[i] = .5-.5*cos(2*M_PI*i/N); -#endif - for (i=0;i<=st->frame_size;i++) - st->power_1[i] = FLOAT_ONE; - for (i=0;iW[i] = 0; - { - spx_word32_t sum = 0; - /* Ratio of ~10 between adaptation rate of first and last block */ - spx_word16_t decay = SHR32(spx_exp(NEG16(DIV32_16(QCONST16(2.4,11),M))),1); - st->prop[0] = QCONST16(.7, 15); - sum = EXTEND32(st->prop[0]); - for (i=1;iprop[i] = MULT16_16_Q15(st->prop[i-1], decay); - sum = ADD32(sum, EXTEND32(st->prop[i])); - } - for (i=M-1;i>=0;i--) - { - st->prop[i] = DIV32(MULT16_16(QCONST16(.8f,15), st->prop[i]),sum); - } - } - - st->memX = (spx_word16_t*)speex_alloc(K*sizeof(spx_word16_t)); - st->memD = (spx_word16_t*)speex_alloc(C*sizeof(spx_word16_t)); - st->memE = (spx_word16_t*)speex_alloc(C*sizeof(spx_word16_t)); - st->preemph = QCONST16(.9,15); - if (st->sampling_rate<12000) - st->notch_radius = QCONST16(.9, 15); - else if (st->sampling_rate<24000) - st->notch_radius = QCONST16(.982, 15); - else - st->notch_radius = QCONST16(.992, 15); - - st->notch_mem = (spx_mem_t*)speex_alloc(2*C*sizeof(spx_mem_t)); - st->adapted = 0; - st->Pey = st->Pyy = FLOAT_ONE; - -#ifdef TWO_PATH - st->Davg1 = st->Davg2 = 0; - st->Dvar1 = st->Dvar2 = FLOAT_ZERO; -#endif - - st->play_buf = (spx_int16_t*)speex_alloc(K*(PLAYBACK_DELAY+1)*st->frame_size*sizeof(spx_int16_t)); - st->play_buf_pos = PLAYBACK_DELAY*st->frame_size; - st->play_buf_started = 0; - - return st; -} - -/** Resets echo canceller state */ -EXPORT void speex_echo_state_reset(SpeexEchoState *st) -{ - int i, M, N, C, K; - st->cancel_count=0; - st->screwed_up = 0; - N = st->window_size; - M = st->M; - C=st->C; - K=st->K; - for (i=0;iW[i] = 0; -#ifdef TWO_PATH - for (i=0;iforeground[i] = 0; -#endif - for (i=0;iX[i] = 0; - for (i=0;i<=st->frame_size;i++) - { - st->power[i] = 0; - st->power_1[i] = FLOAT_ONE; - st->Eh[i] = 0; - st->Yh[i] = 0; - } - for (i=0;iframe_size;i++) - { - st->last_y[i] = 0; - } - for (i=0;iE[i] = 0; - } - for (i=0;ix[i] = 0; - } - for (i=0;i<2*C;i++) - st->notch_mem[i] = 0; - for (i=0;imemD[i]=st->memE[i]=0; - for (i=0;imemX[i]=0; - - st->saturated = 0; - st->adapted = 0; - st->sum_adapt = 0; - st->Pey = st->Pyy = FLOAT_ONE; -#ifdef TWO_PATH - st->Davg1 = st->Davg2 = 0; - st->Dvar1 = st->Dvar2 = FLOAT_ZERO; -#endif - for (i=0;i<3*st->frame_size;i++) - st->play_buf[i] = 0; - st->play_buf_pos = PLAYBACK_DELAY*st->frame_size; - st->play_buf_started = 0; - -} - -/** Destroys an echo canceller state */ -EXPORT void speex_echo_state_destroy(SpeexEchoState *st) -{ - spx_fft_destroy(st->fft_table); - - speex_free(st->e); - speex_free(st->x); - speex_free(st->input); - speex_free(st->y); - speex_free(st->last_y); - speex_free(st->Yf); - speex_free(st->Rf); - speex_free(st->Xf); - speex_free(st->Yh); - speex_free(st->Eh); - - speex_free(st->X); - speex_free(st->Y); - speex_free(st->E); - speex_free(st->W); -#ifdef TWO_PATH - speex_free(st->foreground); -#endif - speex_free(st->PHI); - speex_free(st->power); - speex_free(st->power_1); - speex_free(st->window); - speex_free(st->prop); - speex_free(st->wtmp); -#ifdef FIXED_POINT - speex_free(st->wtmp2); -#endif - speex_free(st->memX); - speex_free(st->memD); - speex_free(st->memE); - speex_free(st->notch_mem); - - speex_free(st->play_buf); - speex_free(st); - -#ifdef DUMP_ECHO_CANCEL_DATA - fclose(rFile); - fclose(pFile); - fclose(oFile); - rFile = pFile = oFile = NULL; -#endif -} - -EXPORT void speex_echo_capture(SpeexEchoState *st, const spx_int16_t *rec, spx_int16_t *out) -{ - int i; - /*speex_warning_int("capture with fill level ", st->play_buf_pos/st->frame_size);*/ - st->play_buf_started = 1; - if (st->play_buf_pos>=st->frame_size) - { - speex_echo_cancellation(st, rec, st->play_buf, out); - st->play_buf_pos -= st->frame_size; - for (i=0;iplay_buf_pos;i++) - st->play_buf[i] = st->play_buf[i+st->frame_size]; - } else { - speex_warning("No playback frame available (your application is buggy and/or got xruns)"); - if (st->play_buf_pos!=0) - { - speex_warning("internal playback buffer corruption?"); - st->play_buf_pos = 0; - } - for (i=0;iframe_size;i++) - out[i] = rec[i]; - } -} - -EXPORT void speex_echo_playback(SpeexEchoState *st, const spx_int16_t *play) -{ - /*speex_warning_int("playback with fill level ", st->play_buf_pos/st->frame_size);*/ - if (!st->play_buf_started) - { - speex_warning("discarded first playback frame"); - return; - } - if (st->play_buf_pos<=PLAYBACK_DELAY*st->frame_size) - { - int i; - for (i=0;iframe_size;i++) - st->play_buf[st->play_buf_pos+i] = play[i]; - st->play_buf_pos += st->frame_size; - if (st->play_buf_pos <= (PLAYBACK_DELAY-1)*st->frame_size) - { - speex_warning("Auto-filling the buffer (your application is buggy and/or got xruns)"); - for (i=0;iframe_size;i++) - st->play_buf[st->play_buf_pos+i] = play[i]; - st->play_buf_pos += st->frame_size; - } - } else { - speex_warning("Had to discard a playback frame (your application is buggy and/or got xruns)"); - } -} - -/** Performs echo cancellation on a frame (deprecated, last arg now ignored) */ -EXPORT void speex_echo_cancel(SpeexEchoState *st, const spx_int16_t *in, const spx_int16_t *far_end, spx_int16_t *out, spx_int32_t *Yout) -{ - speex_echo_cancellation(st, in, far_end, out); -} - -/** Performs echo cancellation on a frame */ -EXPORT void speex_echo_cancellation(SpeexEchoState *st, const spx_int16_t *in, const spx_int16_t *far_end, spx_int16_t *out) -{ - int i,j, chan, speak; - int N,M, C, K; - spx_word32_t Syy,See,Sxx,Sdd, Sff; -#ifdef TWO_PATH - spx_word32_t Dbf; - int update_foreground; -#endif - spx_word32_t Sey; - spx_word16_t ss, ss_1; - spx_float_t Pey = FLOAT_ONE, Pyy=FLOAT_ONE; - spx_float_t alpha, alpha_1; - spx_word16_t RER; - spx_word32_t tmp32; - - N = st->window_size; - M = st->M; - C = st->C; - K = st->K; - - st->cancel_count++; -#ifdef FIXED_POINT - ss=DIV32_16(11469,M); - ss_1 = SUB16(32767,ss); -#else - ss=.35/M; - ss_1 = 1-ss; -#endif - - for (chan = 0; chan < C; chan++) - { - /* Apply a notch filter to make sure DC doesn't end up causing problems */ - filter_dc_notch16(in+chan, st->notch_radius, st->input+chan*st->frame_size, st->frame_size, st->notch_mem+2*chan, C); - /* Copy input data to buffer and apply pre-emphasis */ - /* Copy input data to buffer */ - for (i=0;iframe_size;i++) - { - spx_word32_t tmp32; - /* FIXME: This core has changed a bit, need to merge properly */ - tmp32 = SUB32(EXTEND32(st->input[chan*st->frame_size+i]), EXTEND32(MULT16_16_P15(st->preemph, st->memD[chan]))); -#ifdef FIXED_POINT - if (tmp32 > 32767) - { - tmp32 = 32767; - if (st->saturated == 0) - st->saturated = 1; - } - if (tmp32 < -32767) - { - tmp32 = -32767; - if (st->saturated == 0) - st->saturated = 1; - } -#endif - st->memD[chan] = st->input[chan*st->frame_size+i]; - st->input[chan*st->frame_size+i] = EXTRACT16(tmp32); - } - } - - for (speak = 0; speak < K; speak++) - { - for (i=0;iframe_size;i++) - { - spx_word32_t tmp32; - st->x[speak*N+i] = st->x[speak*N+i+st->frame_size]; - tmp32 = SUB32(EXTEND32(far_end[i*K+speak]), EXTEND32(MULT16_16_P15(st->preemph, st->memX[speak]))); -#ifdef FIXED_POINT - /*FIXME: If saturation occurs here, we need to freeze adaptation for M frames (not just one) */ - if (tmp32 > 32767) - { - tmp32 = 32767; - st->saturated = M+1; - } - if (tmp32 < -32767) - { - tmp32 = -32767; - st->saturated = M+1; - } -#endif - st->x[speak*N+i+st->frame_size] = EXTRACT16(tmp32); - st->memX[speak] = far_end[i*K+speak]; - } - } - - for (speak = 0; speak < K; speak++) - { - /* Shift memory: this could be optimized eventually*/ - for (j=M-1;j>=0;j--) - { - for (i=0;iX[(j+1)*N*K+speak*N+i] = st->X[j*N*K+speak*N+i]; - } - /* Convert x (echo input) to frequency domain */ - spx_fft(st->fft_table, st->x+speak*N, &st->X[speak*N]); - } - - Sxx = 0; - for (speak = 0; speak < K; speak++) - { - Sxx += mdf_inner_prod(st->x+speak*N+st->frame_size, st->x+speak*N+st->frame_size, st->frame_size); - power_spectrum_accum(st->X+speak*N, st->Xf, N); - } - - Sff = 0; - for (chan = 0; chan < C; chan++) - { -#ifdef TWO_PATH - /* Compute foreground filter */ - spectral_mul_accum16(st->X, st->foreground+chan*N*K*M, st->Y+chan*N, N, M*K); - spx_ifft(st->fft_table, st->Y+chan*N, st->e+chan*N); - for (i=0;iframe_size;i++) - st->e[chan*N+i] = SUB16(st->input[chan*st->frame_size+i], st->e[chan*N+i+st->frame_size]); - Sff += mdf_inner_prod(st->e+chan*N, st->e+chan*N, st->frame_size); -#endif - } - - /* Adjust proportional adaption rate */ - /* FIXME: Adjust that for C, K*/ - if (st->adapted) - mdf_adjust_prop (st->W, N, M, C*K, st->prop); - /* Compute weight gradient */ - if (st->saturated == 0) - { - for (chan = 0; chan < C; chan++) - { - for (speak = 0; speak < K; speak++) - { - for (j=M-1;j>=0;j--) - { - weighted_spectral_mul_conj(st->power_1, FLOAT_SHL(PSEUDOFLOAT(st->prop[j]),-15), &st->X[(j+1)*N*K+speak*N], st->E+chan*N, st->PHI, N); - for (i=0;iW[chan*N*K*M + j*N*K + speak*N + i] += st->PHI[i]; - } - } - } - } else { - st->saturated--; - } - - /* FIXME: MC conversion required */ - /* Update weight to prevent circular convolution (MDF / AUMDF) */ - for (chan = 0; chan < C; chan++) - { - for (speak = 0; speak < K; speak++) - { - for (j=0;jcancel_count%(M-1) == j-1) - { -#ifdef FIXED_POINT - for (i=0;iwtmp2[i] = EXTRACT16(PSHR32(st->W[chan*N*K*M + j*N*K + speak*N + i],NORMALIZE_SCALEDOWN+16)); - spx_ifft(st->fft_table, st->wtmp2, st->wtmp); - for (i=0;iframe_size;i++) - { - st->wtmp[i]=0; - } - for (i=st->frame_size;iwtmp[i]=SHL16(st->wtmp[i],NORMALIZE_SCALEUP); - } - spx_fft(st->fft_table, st->wtmp, st->wtmp2); - /* The "-1" in the shift is a sort of kludge that trades less efficient update speed for decrease noise */ - for (i=0;iW[chan*N*K*M + j*N*K + speak*N + i] -= SHL32(EXTEND32(st->wtmp2[i]),16+NORMALIZE_SCALEDOWN-NORMALIZE_SCALEUP-1); -#else - spx_ifft(st->fft_table, &st->W[chan*N*K*M + j*N*K + speak*N], st->wtmp); - for (i=st->frame_size;iwtmp[i]=0; - } - spx_fft(st->fft_table, st->wtmp, &st->W[chan*N*K*M + j*N*K + speak*N]); -#endif - } - } - } - } - - /* So we can use power_spectrum_accum */ - for (i=0;i<=st->frame_size;i++) - st->Rf[i] = st->Yf[i] = st->Xf[i] = 0; - - Dbf = 0; - See = 0; -#ifdef TWO_PATH - /* Difference in response, this is used to estimate the variance of our residual power estimate */ - for (chan = 0; chan < C; chan++) - { - spectral_mul_accum(st->X, st->W+chan*N*K*M, st->Y+chan*N, N, M*K); - spx_ifft(st->fft_table, st->Y+chan*N, st->y+chan*N); - for (i=0;iframe_size;i++) - st->e[chan*N+i] = SUB16(st->e[chan*N+i+st->frame_size], st->y[chan*N+i+st->frame_size]); - Dbf += 10+mdf_inner_prod(st->e+chan*N, st->e+chan*N, st->frame_size); - for (i=0;iframe_size;i++) - st->e[chan*N+i] = SUB16(st->input[chan*st->frame_size+i], st->y[chan*N+i+st->frame_size]); - See += mdf_inner_prod(st->e+chan*N, st->e+chan*N, st->frame_size); - } -#endif - -#ifndef TWO_PATH - Sff = See; -#endif - -#ifdef TWO_PATH - /* Logic for updating the foreground filter */ - - /* For two time windows, compute the mean of the energy difference, as well as the variance */ - st->Davg1 = ADD32(MULT16_32_Q15(QCONST16(.6f,15),st->Davg1), MULT16_32_Q15(QCONST16(.4f,15),SUB32(Sff,See))); - st->Davg2 = ADD32(MULT16_32_Q15(QCONST16(.85f,15),st->Davg2), MULT16_32_Q15(QCONST16(.15f,15),SUB32(Sff,See))); - st->Dvar1 = FLOAT_ADD(FLOAT_MULT(VAR1_SMOOTH, st->Dvar1), FLOAT_MUL32U(MULT16_32_Q15(QCONST16(.4f,15),Sff), MULT16_32_Q15(QCONST16(.4f,15),Dbf))); - st->Dvar2 = FLOAT_ADD(FLOAT_MULT(VAR2_SMOOTH, st->Dvar2), FLOAT_MUL32U(MULT16_32_Q15(QCONST16(.15f,15),Sff), MULT16_32_Q15(QCONST16(.15f,15),Dbf))); - - /* Equivalent float code: - st->Davg1 = .6*st->Davg1 + .4*(Sff-See); - st->Davg2 = .85*st->Davg2 + .15*(Sff-See); - st->Dvar1 = .36*st->Dvar1 + .16*Sff*Dbf; - st->Dvar2 = .7225*st->Dvar2 + .0225*Sff*Dbf; - */ - - update_foreground = 0; - /* Check if we have a statistically significant reduction in the residual echo */ - /* Note that this is *not* Gaussian, so we need to be careful about the longer tail */ - if (FLOAT_GT(FLOAT_MUL32U(SUB32(Sff,See),ABS32(SUB32(Sff,See))), FLOAT_MUL32U(Sff,Dbf))) - update_foreground = 1; - else if (FLOAT_GT(FLOAT_MUL32U(st->Davg1, ABS32(st->Davg1)), FLOAT_MULT(VAR1_UPDATE,(st->Dvar1)))) - update_foreground = 1; - else if (FLOAT_GT(FLOAT_MUL32U(st->Davg2, ABS32(st->Davg2)), FLOAT_MULT(VAR2_UPDATE,(st->Dvar2)))) - update_foreground = 1; - - /* Do we update? */ - if (update_foreground) - { - st->Davg1 = st->Davg2 = 0; - st->Dvar1 = st->Dvar2 = FLOAT_ZERO; - /* Copy background filter to foreground filter */ - for (i=0;iforeground[i] = EXTRACT16(PSHR32(st->W[i],16)); - /* Apply a smooth transition so as to not introduce blocking artifacts */ - for (chan = 0; chan < C; chan++) - for (i=0;iframe_size;i++) - st->e[chan*N+i+st->frame_size] = MULT16_16_Q15(st->window[i+st->frame_size],st->e[chan*N+i+st->frame_size]) + MULT16_16_Q15(st->window[i],st->y[chan*N+i+st->frame_size]); - } else { - int reset_background=0; - /* Otherwise, check if the background filter is significantly worse */ - if (FLOAT_GT(FLOAT_MUL32U(NEG32(SUB32(Sff,See)),ABS32(SUB32(Sff,See))), FLOAT_MULT(VAR_BACKTRACK,FLOAT_MUL32U(Sff,Dbf)))) - reset_background = 1; - if (FLOAT_GT(FLOAT_MUL32U(NEG32(st->Davg1), ABS32(st->Davg1)), FLOAT_MULT(VAR_BACKTRACK,st->Dvar1))) - reset_background = 1; - if (FLOAT_GT(FLOAT_MUL32U(NEG32(st->Davg2), ABS32(st->Davg2)), FLOAT_MULT(VAR_BACKTRACK,st->Dvar2))) - reset_background = 1; - if (reset_background) - { - /* Copy foreground filter to background filter */ - for (i=0;iW[i] = SHL32(EXTEND32(st->foreground[i]),16); - /* We also need to copy the output so as to get correct adaptation */ - for (chan = 0; chan < C; chan++) - { - for (i=0;iframe_size;i++) - st->y[chan*N+i+st->frame_size] = st->e[chan*N+i+st->frame_size]; - for (i=0;iframe_size;i++) - st->e[chan*N+i] = SUB16(st->input[chan*st->frame_size+i], st->y[chan*N+i+st->frame_size]); - } - See = Sff; - st->Davg1 = st->Davg2 = 0; - st->Dvar1 = st->Dvar2 = FLOAT_ZERO; - } - } -#endif - - Sey = Syy = Sdd = 0; - for (chan = 0; chan < C; chan++) - { - /* Compute error signal (for the output with de-emphasis) */ - for (i=0;iframe_size;i++) - { - spx_word32_t tmp_out; -#ifdef TWO_PATH - tmp_out = SUB32(EXTEND32(st->input[chan*st->frame_size+i]), EXTEND32(st->e[chan*N+i+st->frame_size])); -#else - tmp_out = SUB32(EXTEND32(st->input[chan*st->frame_size+i]), EXTEND32(st->y[chan*N+i+st->frame_size])); -#endif - tmp_out = ADD32(tmp_out, EXTEND32(MULT16_16_P15(st->preemph, st->memE[chan]))); - /* This is an arbitrary test for saturation in the microphone signal */ - if (in[i*C+chan] <= -32000 || in[i*C+chan] >= 32000) - { - if (st->saturated == 0) - st->saturated = 1; - } - out[i*C+chan] = WORD2INT(tmp_out); - st->memE[chan] = tmp_out; - } - -#ifdef DUMP_ECHO_CANCEL_DATA - dump_audio(in, far_end, out, st->frame_size); -#endif - - /* Compute error signal (filter update version) */ - for (i=0;iframe_size;i++) - { - st->e[chan*N+i+st->frame_size] = st->e[chan*N+i]; - st->e[chan*N+i] = 0; - } - - /* Compute a bunch of correlations */ - /* FIXME: bad merge */ - Sey += mdf_inner_prod(st->e+chan*N+st->frame_size, st->y+chan*N+st->frame_size, st->frame_size); - Syy += mdf_inner_prod(st->y+chan*N+st->frame_size, st->y+chan*N+st->frame_size, st->frame_size); - Sdd += mdf_inner_prod(st->input+chan*st->frame_size, st->input+chan*st->frame_size, st->frame_size); - - /* Convert error to frequency domain */ - spx_fft(st->fft_table, st->e+chan*N, st->E+chan*N); - for (i=0;iframe_size;i++) - st->y[i+chan*N] = 0; - spx_fft(st->fft_table, st->y+chan*N, st->Y+chan*N); - - /* Compute power spectrum of echo (X), error (E) and filter response (Y) */ - power_spectrum_accum(st->E+chan*N, st->Rf, N); - power_spectrum_accum(st->Y+chan*N, st->Yf, N); - - } - - /*printf ("%f %f %f %f\n", Sff, See, Syy, Sdd, st->update_cond);*/ - - /* Do some sanity check */ - if (!(Syy>=0 && Sxx>=0 && See >= 0) -#ifndef FIXED_POINT - || !(Sff < N*1e9 && Syy < N*1e9 && Sxx < N*1e9) -#endif - ) - { - /* Things have gone really bad */ - st->screwed_up += 50; - for (i=0;iframe_size*C;i++) - out[i] = 0; - } else if (SHR32(Sff, 2) > ADD32(Sdd, SHR32(MULT16_16(N, 10000),6))) - { - /* AEC seems to add lots of echo instead of removing it, let's see if it will improve */ - st->screwed_up++; - } else { - /* Everything's fine */ - st->screwed_up=0; - } - if (st->screwed_up>=50) - { - speex_warning("The echo canceller started acting funny and got slapped (reset). It swears it will behave now."); - speex_echo_state_reset(st); - return; - } - - /* Add a small noise floor to make sure not to have problems when dividing */ - See = MAX32(See, SHR32(MULT16_16(N, 100),6)); - - for (speak = 0; speak < K; speak++) - { - Sxx += mdf_inner_prod(st->x+speak*N+st->frame_size, st->x+speak*N+st->frame_size, st->frame_size); - power_spectrum_accum(st->X+speak*N, st->Xf, N); - } - - - /* Smooth far end energy estimate over time */ - for (j=0;j<=st->frame_size;j++) - st->power[j] = MULT16_32_Q15(ss_1,st->power[j]) + 1 + MULT16_32_Q15(ss,st->Xf[j]); - - /* Compute filtered spectra and (cross-)correlations */ - for (j=st->frame_size;j>=0;j--) - { - spx_float_t Eh, Yh; - Eh = PSEUDOFLOAT(st->Rf[j] - st->Eh[j]); - Yh = PSEUDOFLOAT(st->Yf[j] - st->Yh[j]); - Pey = FLOAT_ADD(Pey,FLOAT_MULT(Eh,Yh)); - Pyy = FLOAT_ADD(Pyy,FLOAT_MULT(Yh,Yh)); -#ifdef FIXED_POINT - st->Eh[j] = MAC16_32_Q15(MULT16_32_Q15(SUB16(32767,st->spec_average),st->Eh[j]), st->spec_average, st->Rf[j]); - st->Yh[j] = MAC16_32_Q15(MULT16_32_Q15(SUB16(32767,st->spec_average),st->Yh[j]), st->spec_average, st->Yf[j]); -#else - st->Eh[j] = (1-st->spec_average)*st->Eh[j] + st->spec_average*st->Rf[j]; - st->Yh[j] = (1-st->spec_average)*st->Yh[j] + st->spec_average*st->Yf[j]; -#endif - } - - Pyy = FLOAT_SQRT(Pyy); - Pey = FLOAT_DIVU(Pey,Pyy); - - /* Compute correlation updatete rate */ - tmp32 = MULT16_32_Q15(st->beta0,Syy); - if (tmp32 > MULT16_32_Q15(st->beta_max,See)) - tmp32 = MULT16_32_Q15(st->beta_max,See); - alpha = FLOAT_DIV32(tmp32, See); - alpha_1 = FLOAT_SUB(FLOAT_ONE, alpha); - /* Update correlations (recursive average) */ - st->Pey = FLOAT_ADD(FLOAT_MULT(alpha_1,st->Pey) , FLOAT_MULT(alpha,Pey)); - st->Pyy = FLOAT_ADD(FLOAT_MULT(alpha_1,st->Pyy) , FLOAT_MULT(alpha,Pyy)); - if (FLOAT_LT(st->Pyy, FLOAT_ONE)) - st->Pyy = FLOAT_ONE; - /* We don't really hope to get better than 33 dB (MIN_LEAK-3dB) attenuation anyway */ - if (FLOAT_LT(st->Pey, FLOAT_MULT(MIN_LEAK,st->Pyy))) - st->Pey = FLOAT_MULT(MIN_LEAK,st->Pyy); - if (FLOAT_GT(st->Pey, st->Pyy)) - st->Pey = st->Pyy; - /* leak_estimate is the linear regression result */ - st->leak_estimate = FLOAT_EXTRACT16(FLOAT_SHL(FLOAT_DIVU(st->Pey, st->Pyy),14)); - /* This looks like a stupid bug, but it's right (because we convert from Q14 to Q15) */ - if (st->leak_estimate > 16383) - st->leak_estimate = 32767; - else - st->leak_estimate = SHL16(st->leak_estimate,1); - /*printf ("%f\n", st->leak_estimate);*/ - - /* Compute Residual to Error Ratio */ -#ifdef FIXED_POINT - tmp32 = MULT16_32_Q15(st->leak_estimate,Syy); - tmp32 = ADD32(SHR32(Sxx,13), ADD32(tmp32, SHL32(tmp32,1))); - /* Check for y in e (lower bound on RER) */ - { - spx_float_t bound = PSEUDOFLOAT(Sey); - bound = FLOAT_DIVU(FLOAT_MULT(bound, bound), PSEUDOFLOAT(ADD32(1,Syy))); - if (FLOAT_GT(bound, PSEUDOFLOAT(See))) - tmp32 = See; - else if (tmp32 < FLOAT_EXTRACT32(bound)) - tmp32 = FLOAT_EXTRACT32(bound); - } - if (tmp32 > SHR32(See,1)) - tmp32 = SHR32(See,1); - RER = FLOAT_EXTRACT16(FLOAT_SHL(FLOAT_DIV32(tmp32,See),15)); -#else - RER = (.0001*Sxx + 3.*MULT16_32_Q15(st->leak_estimate,Syy)) / See; - /* Check for y in e (lower bound on RER) */ - if (RER < Sey*Sey/(1+See*Syy)) - RER = Sey*Sey/(1+See*Syy); - if (RER > .5) - RER = .5; -#endif - - /* We consider that the filter has had minimal adaptation if the following is true*/ - if (!st->adapted && st->sum_adapt > SHL32(EXTEND32(M),15) && MULT16_32_Q15(st->leak_estimate,Syy) > MULT16_32_Q15(QCONST16(.03f,15),Syy)) - { - st->adapted = 1; - } - - if (st->adapted) - { - /* Normal learning rate calculation once we're past the minimal adaptation phase */ - for (i=0;i<=st->frame_size;i++) - { - spx_word32_t r, e; - /* Compute frequency-domain adaptation mask */ - r = MULT16_32_Q15(st->leak_estimate,SHL32(st->Yf[i],3)); - e = SHL32(st->Rf[i],3)+1; -#ifdef FIXED_POINT - if (r>SHR32(e,1)) - r = SHR32(e,1); -#else - if (r>.5*e) - r = .5*e; -#endif - r = MULT16_32_Q15(QCONST16(.7,15),r) + MULT16_32_Q15(QCONST16(.3,15),(spx_word32_t)(MULT16_32_Q15(RER,e))); - /*st->power_1[i] = adapt_rate*r/(e*(1+st->power[i]));*/ - st->power_1[i] = FLOAT_SHL(FLOAT_DIV32_FLOAT(r,FLOAT_MUL32U(e,st->power[i]+10)),WEIGHT_SHIFT+16); - } - } else { - /* Temporary adaption rate if filter is not yet adapted enough */ - spx_word16_t adapt_rate=0; - - if (Sxx > SHR32(MULT16_16(N, 1000),6)) - { - tmp32 = MULT16_32_Q15(QCONST16(.25f, 15), Sxx); -#ifdef FIXED_POINT - if (tmp32 > SHR32(See,2)) - tmp32 = SHR32(See,2); -#else - if (tmp32 > .25*See) - tmp32 = .25*See; -#endif - adapt_rate = FLOAT_EXTRACT16(FLOAT_SHL(FLOAT_DIV32(tmp32, See),15)); - } - for (i=0;i<=st->frame_size;i++) - st->power_1[i] = FLOAT_SHL(FLOAT_DIV32(EXTEND32(adapt_rate),ADD32(st->power[i],10)),WEIGHT_SHIFT+1); - - - /* How much have we adapted so far? */ - st->sum_adapt = ADD32(st->sum_adapt,adapt_rate); - } - - /* FIXME: MC conversion required */ - for (i=0;iframe_size;i++) - st->last_y[i] = st->last_y[st->frame_size+i]; - if (st->adapted) - { - /* If the filter is adapted, take the filtered echo */ - for (i=0;iframe_size;i++) - st->last_y[st->frame_size+i] = in[i]-out[i]; - } else { - /* If filter isn't adapted yet, all we can do is take the far end signal directly */ - /* moved earlier: for (i=0;ilast_y[i] = st->x[i];*/ - } - -} - -/* Compute spectrum of estimated echo for use in an echo post-filter */ -void speex_echo_get_residual(SpeexEchoState *st, spx_word32_t *residual_echo, int len) -{ - int i; - spx_word16_t leak2; - int N; - - N = st->window_size; - - /* Apply hanning window (should pre-compute it)*/ - for (i=0;iy[i] = MULT16_16_Q15(st->window[i],st->last_y[i]); - - /* Compute power spectrum of the echo */ - spx_fft(st->fft_table, st->y, st->Y); - power_spectrum(st->Y, residual_echo, N); - -#ifdef FIXED_POINT - if (st->leak_estimate > 16383) - leak2 = 32767; - else - leak2 = SHL16(st->leak_estimate, 1); -#else - if (st->leak_estimate>.5) - leak2 = 1; - else - leak2 = 2*st->leak_estimate; -#endif - /* Estimate residual echo */ - for (i=0;i<=st->frame_size;i++) - residual_echo[i] = (spx_int32_t)MULT16_32_Q15(leak2,residual_echo[i]); - -} - -EXPORT int speex_echo_ctl(SpeexEchoState *st, int request, void *ptr) -{ - switch(request) - { - - case SPEEX_ECHO_GET_FRAME_SIZE: - (*(int*)ptr) = st->frame_size; - break; - case SPEEX_ECHO_SET_SAMPLING_RATE: - st->sampling_rate = (*(int*)ptr); - st->spec_average = DIV32_16(SHL32(EXTEND32(st->frame_size), 15), st->sampling_rate); -#ifdef FIXED_POINT - st->beta0 = DIV32_16(SHL32(EXTEND32(st->frame_size), 16), st->sampling_rate); - st->beta_max = DIV32_16(SHL32(EXTEND32(st->frame_size), 14), st->sampling_rate); -#else - st->beta0 = (2.0f*st->frame_size)/st->sampling_rate; - st->beta_max = (.5f*st->frame_size)/st->sampling_rate; -#endif - if (st->sampling_rate<12000) - st->notch_radius = QCONST16(.9, 15); - else if (st->sampling_rate<24000) - st->notch_radius = QCONST16(.982, 15); - else - st->notch_radius = QCONST16(.992, 15); - break; - case SPEEX_ECHO_GET_SAMPLING_RATE: - (*(int*)ptr) = st->sampling_rate; - break; - case SPEEX_ECHO_GET_IMPULSE_RESPONSE_SIZE: - /*FIXME: Implement this for multiple channels */ - *((spx_int32_t *)ptr) = st->M * st->frame_size; - break; - case SPEEX_ECHO_GET_IMPULSE_RESPONSE: - { - int M = st->M, N = st->window_size, n = st->frame_size, i, j; - spx_int32_t *filt = (spx_int32_t *) ptr; - for(j=0;jwtmp2[i] = EXTRACT16(PSHR32(st->W[j*N+i],16+NORMALIZE_SCALEDOWN)); - spx_ifft(st->fft_table, st->wtmp2, st->wtmp); -#else - spx_ifft(st->fft_table, &st->W[j*N], st->wtmp); -#endif - for(i=0;iwtmp[i]), WEIGHT_SHIFT-NORMALIZE_SCALEDOWN); - } - } - break; - default: - speex_warning_int("Unknown speex_echo_ctl request: ", request); - return -1; - } - return 0; -} diff --git a/speex/libspeexdsp/misc_bfin.h b/speex/libspeexdsp/misc_bfin.h deleted file mode 100644 index 4e27681c95462e9d014c0213d2d73279f4281aa7..0000000000000000000000000000000000000000 --- a/speex/libspeexdsp/misc_bfin.h +++ /dev/null @@ -1,56 +0,0 @@ -/* Copyright (C) 2005 Analog Devices */ -/** - @file misc_bfin.h - @author Jean-Marc Valin - @brief Various compatibility routines for Speex (Blackfin version) -*/ -/* - 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. -*/ - -#include "bfin.h" - -#define OVERRIDE_SPEEX_MOVE -void *speex_move (void *dest, void *src, int n) -{ - __asm__ __volatile__ - ( - "L0 = 0;\n\t" - "I0 = %0;\n\t" - "R0 = [I0++];\n\t" - "LOOP move%= LC0 = %2;\n\t" - "LOOP_BEGIN move%=;\n\t" - "[%1++] = R0 || R0 = [I0++];\n\t" - "LOOP_END move%=;\n\t" - "[%1++] = R0;\n\t" - : "=a" (src), "=a" (dest) - : "a" ((n>>2)-1), "0" (src), "1" (dest) - : "R0", "I0", "L0", "memory" BFIN_HWLOOP0_REGS - ); - return dest; -} diff --git a/speex/libspeexdsp/os_support.h b/speex/libspeexdsp/os_support.h deleted file mode 100644 index 0db31a61df1b497de71585f7ff3df80f6926c841..0000000000000000000000000000000000000000 --- a/speex/libspeexdsp/os_support.h +++ /dev/null @@ -1,169 +0,0 @@ -/* Copyright (C) 2007 Jean-Marc Valin - - File: os_support.h - This is the (tiny) OS abstraction layer. Aside from math.h, this is the - only place where system headers are allowed. - - 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. - - 3. The name of the author may not be used to endorse or promote products - derived from this software without specific prior written permission. - - 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 OS_SUPPORT_H -#define OS_SUPPORT_H - -#include -#include -#include - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif -#ifdef OS_SUPPORT_CUSTOM -#include "os_support_custom.h" -#endif - -/** Speex wrapper for calloc. To do your own dynamic allocation, all you need to do is replace this function, speex_realloc and speex_free - NOTE: speex_alloc needs to CLEAR THE MEMORY */ -#ifndef OVERRIDE_SPEEX_ALLOC -static inline void *speex_alloc (int size) -{ - /* WARNING: this is not equivalent to malloc(). If you want to use malloc() - or your own allocator, YOU NEED TO CLEAR THE MEMORY ALLOCATED. Otherwise - you will experience strange bugs */ - return calloc(size,1); -} -#endif - -/** Same as speex_alloc, except that the area is only needed inside a Speex call (might cause problem with wideband though) */ -#ifndef OVERRIDE_SPEEX_ALLOC_SCRATCH -static inline void *speex_alloc_scratch (int size) -{ - /* Scratch space doesn't need to be cleared */ - return calloc(size,1); -} -#endif - -/** Speex wrapper for realloc. To do your own dynamic allocation, all you need to do is replace this function, speex_alloc and speex_free */ -#ifndef OVERRIDE_SPEEX_REALLOC -static inline void *speex_realloc (void *ptr, int size) -{ - return realloc(ptr, size); -} -#endif - -/** Speex wrapper for calloc. To do your own dynamic allocation, all you need to do is replace this function, speex_realloc and speex_alloc */ -#ifndef OVERRIDE_SPEEX_FREE -static inline void speex_free (void *ptr) -{ - free(ptr); -} -#endif - -/** Same as speex_free, except that the area is only needed inside a Speex call (might cause problem with wideband though) */ -#ifndef OVERRIDE_SPEEX_FREE_SCRATCH -static inline void speex_free_scratch (void *ptr) -{ - free(ptr); -} -#endif - -/** Copy n elements from src to dst. The 0* term provides compile-time type checking */ -#ifndef OVERRIDE_SPEEX_COPY -#define SPEEX_COPY(dst, src, n) (memcpy((dst), (src), (n)*sizeof(*(dst)) + 0*((dst)-(src)) )) -#endif - -/** Copy n elements from src to dst, allowing overlapping regions. The 0* term - provides compile-time type checking */ -#ifndef OVERRIDE_SPEEX_MOVE -#define SPEEX_MOVE(dst, src, n) (memmove((dst), (src), (n)*sizeof(*(dst)) + 0*((dst)-(src)) )) -#endif - -/** For n elements worth of memory, set every byte to the value of c, starting at address dst */ -#ifndef OVERRIDE_SPEEX_MEMSET -#define SPEEX_MEMSET(dst, c, n) (memset((dst), (c), (n)*sizeof(*(dst)))) -#endif - - -#ifndef OVERRIDE_SPEEX_FATAL -static inline void _speex_fatal(const char *str, const char *file, int line) -{ - fprintf (stderr, "Fatal (internal) error in %s, line %d: %s\n", file, line, str); - exit(1); -} -#endif - -#ifndef OVERRIDE_SPEEX_WARNING -static inline void speex_warning(const char *str) -{ -#ifndef DISABLE_WARNINGS - fprintf (stderr, "warning: %s\n", str); -#endif -} -#endif - -#ifndef OVERRIDE_SPEEX_WARNING_INT -static inline void speex_warning_int(const char *str, int val) -{ -#ifndef DISABLE_WARNINGS - fprintf (stderr, "warning: %s %d\n", str, val); -#endif -} -#endif - -#ifndef OVERRIDE_SPEEX_NOTIFY -static inline void speex_notify(const char *str) -{ -#ifndef DISABLE_NOTIFICATIONS - fprintf (stderr, "notification: %s\n", str); -#endif -} -#endif - -#ifndef OVERRIDE_SPEEX_PUTC -/** Speex wrapper for putc */ -static inline void _speex_putc(int ch, void *file) -{ - FILE *f = (FILE *)file; - fprintf(f, "%c", ch); -} -#endif - -#define speex_fatal(str) _speex_fatal(str, __FILE__, __LINE__); -#define speex_assert(cond) {if (!(cond)) {speex_fatal("assertion failed: " #cond);}} - -#ifndef RELEASE -static inline void print_vec(float *vec, int len, char *name) -{ - int i; - printf ("%s ", name); - for (i=0;i -#include "speex/speex_preprocess.h" -#include "speex/speex_echo.h" -#include "arch.h" -#include "fftwrap.h" -#include "filterbank.h" -#include "math_approx.h" -#include "os_support.h" - -#define LOUDNESS_EXP 5.f -#define AMP_SCALE .001f -#define AMP_SCALE_1 1000.f - -#define NB_BANDS 24 - -#define SPEECH_PROB_START_DEFAULT QCONST16(0.35f,15) -#define SPEECH_PROB_CONTINUE_DEFAULT QCONST16(0.20f,15) -#define NOISE_SUPPRESS_DEFAULT -15 -#define ECHO_SUPPRESS_DEFAULT -40 -#define ECHO_SUPPRESS_ACTIVE_DEFAULT -15 - -#ifndef NULL -#define NULL 0 -#endif - -#define SQR(x) ((x)*(x)) -#define SQR16(x) (MULT16_16((x),(x))) -#define SQR16_Q15(x) (MULT16_16_Q15((x),(x))) - -#ifdef FIXED_POINT -static inline spx_word16_t DIV32_16_Q8(spx_word32_t a, spx_word32_t b) -{ - if (SHR32(a,7) >= b) - { - return 32767; - } else { - if (b>=QCONST32(1,23)) - { - a = SHR32(a,8); - b = SHR32(b,8); - } - if (b>=QCONST32(1,19)) - { - a = SHR32(a,4); - b = SHR32(b,4); - } - if (b>=QCONST32(1,15)) - { - a = SHR32(a,4); - b = SHR32(b,4); - } - a = SHL32(a,8); - return PDIV32_16(a,b); - } - -} -static inline spx_word16_t DIV32_16_Q15(spx_word32_t a, spx_word32_t b) -{ - if (SHR32(a,15) >= b) - { - return 32767; - } else { - if (b>=QCONST32(1,23)) - { - a = SHR32(a,8); - b = SHR32(b,8); - } - if (b>=QCONST32(1,19)) - { - a = SHR32(a,4); - b = SHR32(b,4); - } - if (b>=QCONST32(1,15)) - { - a = SHR32(a,4); - b = SHR32(b,4); - } - a = SHL32(a,15)-a; - return DIV32_16(a,b); - } -} -#define SNR_SCALING 256.f -#define SNR_SCALING_1 0.0039062f -#define SNR_SHIFT 8 - -#define FRAC_SCALING 32767.f -#define FRAC_SCALING_1 3.0518e-05 -#define FRAC_SHIFT 1 - -#define EXPIN_SCALING 2048.f -#define EXPIN_SCALING_1 0.00048828f -#define EXPIN_SHIFT 11 -#define EXPOUT_SCALING_1 1.5259e-05 - -#define NOISE_SHIFT 7 - -#else - -#define DIV32_16_Q8(a,b) ((a)/(b)) -#define DIV32_16_Q15(a,b) ((a)/(b)) -#define SNR_SCALING 1.f -#define SNR_SCALING_1 1.f -#define SNR_SHIFT 0 -#define FRAC_SCALING 1.f -#define FRAC_SCALING_1 1.f -#define FRAC_SHIFT 0 -#define NOISE_SHIFT 0 - -#define EXPIN_SCALING 1.f -#define EXPIN_SCALING_1 1.f -#define EXPOUT_SCALING_1 1.f - -#endif - -/** Speex pre-processor state. */ -struct SpeexPreprocessState_ { - /* Basic info */ - int frame_size; /**< Number of samples processed each time */ - int ps_size; /**< Number of points in the power spectrum */ - int sampling_rate; /**< Sampling rate of the input/output */ - int nbands; - FilterBank *bank; - - /* Parameters */ - int denoise_enabled; - int vad_enabled; - int dereverb_enabled; - spx_word16_t reverb_decay; - spx_word16_t reverb_level; - spx_word16_t speech_prob_start; - spx_word16_t speech_prob_continue; - int noise_suppress; - int echo_suppress; - int echo_suppress_active; - SpeexEchoState *echo_state; - - spx_word16_t speech_prob; /**< Probability last frame was speech */ - - /* DSP-related arrays */ - spx_word16_t *frame; /**< Processing frame (2*ps_size) */ - spx_word16_t *ft; /**< Processing frame in freq domain (2*ps_size) */ - spx_word32_t *ps; /**< Current power spectrum */ - spx_word16_t *gain2; /**< Adjusted gains */ - spx_word16_t *gain_floor; /**< Minimum gain allowed */ - spx_word16_t *window; /**< Analysis/Synthesis window */ - spx_word32_t *noise; /**< Noise estimate */ - spx_word32_t *reverb_estimate; /**< Estimate of reverb energy */ - spx_word32_t *old_ps; /**< Power spectrum for last frame */ - spx_word16_t *gain; /**< Ephraim Malah gain */ - spx_word16_t *prior; /**< A-priori SNR */ - spx_word16_t *post; /**< A-posteriori SNR */ - - spx_word32_t *S; /**< Smoothed power spectrum */ - spx_word32_t *Smin; /**< See Cohen paper */ - spx_word32_t *Stmp; /**< See Cohen paper */ - int *update_prob; /**< Probability of speech presence for noise update */ - - spx_word16_t *zeta; /**< Smoothed a priori SNR */ - spx_word32_t *echo_noise; - spx_word32_t *residual_echo; - - /* Misc */ - spx_word16_t *inbuf; /**< Input buffer (overlapped analysis) */ - spx_word16_t *outbuf; /**< Output buffer (for overlap and add) */ - - /* AGC stuff, only for floating point for now */ -#ifndef FIXED_POINT - int agc_enabled; - float agc_level; - float loudness_accum; - float *loudness_weight; /**< Perceptual loudness curve */ - float loudness; /**< Loudness estimate */ - float agc_gain; /**< Current AGC gain */ - float max_gain; /**< Maximum gain allowed */ - float max_increase_step; /**< Maximum increase in gain from one frame to another */ - float max_decrease_step; /**< Maximum decrease in gain from one frame to another */ - float prev_loudness; /**< Loudness of previous frame */ - float init_max; /**< Current gain limit during initialisation */ -#endif - int nb_adapt; /**< Number of frames used for adaptation so far */ - int was_speech; - int min_count; /**< Number of frames processed so far */ - void *fft_lookup; /**< Lookup table for the FFT */ -#ifdef FIXED_POINT - int frame_shift; -#endif -}; - - -static void conj_window(spx_word16_t *w, int len) -{ - int i; - for (i=0;i19) - return ADD32(EXTEND32(Q15_ONE),EXTEND32(DIV32_16(QCONST32(.1296,23), SHR32(xx,EXPIN_SHIFT-SNR_SHIFT)))); - frac = SHL32(xx-SHL32(ind,10),5); - return SHL32(DIV32_16(PSHR32(MULT16_16(Q15_ONE-frac,table[ind]) + MULT16_16(frac,table[ind+1]),7),(spx_sqrt(SHL32(xx,15)+6711))),7); -} - -static inline spx_word16_t qcurve(spx_word16_t x) -{ - x = MAX16(x, 1); - return DIV32_16(SHL32(EXTEND32(32767),9),ADD16(512,MULT16_16_Q15(QCONST16(.60f,15),DIV32_16(32767,x)))); -} - -/* Compute the gain floor based on different floors for the background noise and residual echo */ -static void compute_gain_floor(int noise_suppress, int effective_echo_suppress, spx_word32_t *noise, spx_word32_t *echo, spx_word16_t *gain_floor, int len) -{ - int i; - - if (noise_suppress > effective_echo_suppress) - { - spx_word16_t noise_gain, gain_ratio; - noise_gain = EXTRACT16(MIN32(Q15_ONE,SHR32(spx_exp(MULT16_16(QCONST16(0.11513,11),noise_suppress)),1))); - gain_ratio = EXTRACT16(MIN32(Q15_ONE,SHR32(spx_exp(MULT16_16(QCONST16(.2302585f,11),effective_echo_suppress-noise_suppress)),1))); - - /* gain_floor = sqrt [ (noise*noise_floor + echo*echo_floor) / (noise+echo) ] */ - for (i=0;i19) - return FRAC_SCALING*(1+.1296/x); - frac = 2*x-integer; - return FRAC_SCALING*((1-frac)*table[ind] + frac*table[ind+1])/sqrt(x+.0001f); -} - -static inline spx_word16_t qcurve(spx_word16_t x) -{ - return 1.f/(1.f+.15f/(SNR_SCALING_1*x)); -} - -static void compute_gain_floor(int noise_suppress, int effective_echo_suppress, spx_word32_t *noise, spx_word32_t *echo, spx_word16_t *gain_floor, int len) -{ - int i; - float echo_floor; - float noise_floor; - - noise_floor = exp(.2302585f*noise_suppress); - echo_floor = exp(.2302585f*effective_echo_suppress); - - /* Compute the gain floor based on different floors for the background noise and residual echo */ - for (i=0;iframe_size = frame_size; - - /* Round ps_size down to the nearest power of two */ -#if 0 - i=1; - st->ps_size = st->frame_size; - while(1) - { - if (st->ps_size & ~i) - { - st->ps_size &= ~i; - i<<=1; - } else { - break; - } - } - - - if (st->ps_size < 3*st->frame_size/4) - st->ps_size = st->ps_size * 3 / 2; -#else - st->ps_size = st->frame_size; -#endif - - N = st->ps_size; - N3 = 2*N - st->frame_size; - N4 = st->frame_size - N3; - - st->sampling_rate = sampling_rate; - st->denoise_enabled = 1; - st->vad_enabled = 0; - st->dereverb_enabled = 0; - st->reverb_decay = 0; - st->reverb_level = 0; - st->noise_suppress = NOISE_SUPPRESS_DEFAULT; - st->echo_suppress = ECHO_SUPPRESS_DEFAULT; - st->echo_suppress_active = ECHO_SUPPRESS_ACTIVE_DEFAULT; - - st->speech_prob_start = SPEECH_PROB_START_DEFAULT; - st->speech_prob_continue = SPEECH_PROB_CONTINUE_DEFAULT; - - st->echo_state = NULL; - - st->nbands = NB_BANDS; - M = st->nbands; - st->bank = filterbank_new(M, sampling_rate, N, 1); - - st->frame = (spx_word16_t*)speex_alloc(2*N*sizeof(spx_word16_t)); - st->window = (spx_word16_t*)speex_alloc(2*N*sizeof(spx_word16_t)); - st->ft = (spx_word16_t*)speex_alloc(2*N*sizeof(spx_word16_t)); - - st->ps = (spx_word32_t*)speex_alloc((N+M)*sizeof(spx_word32_t)); - st->noise = (spx_word32_t*)speex_alloc((N+M)*sizeof(spx_word32_t)); - st->echo_noise = (spx_word32_t*)speex_alloc((N+M)*sizeof(spx_word32_t)); - st->residual_echo = (spx_word32_t*)speex_alloc((N+M)*sizeof(spx_word32_t)); - st->reverb_estimate = (spx_word32_t*)speex_alloc((N+M)*sizeof(spx_word32_t)); - st->old_ps = (spx_word32_t*)speex_alloc((N+M)*sizeof(spx_word32_t)); - st->prior = (spx_word16_t*)speex_alloc((N+M)*sizeof(spx_word16_t)); - st->post = (spx_word16_t*)speex_alloc((N+M)*sizeof(spx_word16_t)); - st->gain = (spx_word16_t*)speex_alloc((N+M)*sizeof(spx_word16_t)); - st->gain2 = (spx_word16_t*)speex_alloc((N+M)*sizeof(spx_word16_t)); - st->gain_floor = (spx_word16_t*)speex_alloc((N+M)*sizeof(spx_word16_t)); - st->zeta = (spx_word16_t*)speex_alloc((N+M)*sizeof(spx_word16_t)); - - st->S = (spx_word32_t*)speex_alloc(N*sizeof(spx_word32_t)); - st->Smin = (spx_word32_t*)speex_alloc(N*sizeof(spx_word32_t)); - st->Stmp = (spx_word32_t*)speex_alloc(N*sizeof(spx_word32_t)); - st->update_prob = (int*)speex_alloc(N*sizeof(int)); - - st->inbuf = (spx_word16_t*)speex_alloc(N3*sizeof(spx_word16_t)); - st->outbuf = (spx_word16_t*)speex_alloc(N3*sizeof(spx_word16_t)); - - conj_window(st->window, 2*N3); - for (i=2*N3;i<2*st->ps_size;i++) - st->window[i]=Q15_ONE; - - if (N4>0) - { - for (i=N3-1;i>=0;i--) - { - st->window[i+N3+N4]=st->window[i+N3]; - st->window[i+N3]=1; - } - } - for (i=0;inoise[i]=QCONST32(1.f,NOISE_SHIFT); - st->reverb_estimate[i]=0; - st->old_ps[i]=1; - st->gain[i]=Q15_ONE; - st->post[i]=SHL16(1, SNR_SHIFT); - st->prior[i]=SHL16(1, SNR_SHIFT); - } - - for (i=0;iupdate_prob[i] = 1; - for (i=0;iinbuf[i]=0; - st->outbuf[i]=0; - } -#ifndef FIXED_POINT - st->agc_enabled = 0; - st->agc_level = 8000; - st->loudness_weight = (float*)speex_alloc(N*sizeof(float)); - for (i=0;iloudness_weight[i] = .5f*(1.f/(1.f+ff/8000.f))+1.f*exp(-.5f*(ff-3800.f)*(ff-3800.f)/9e5f);*/ - st->loudness_weight[i] = .35f-.35f*ff/16000.f+.73f*exp(-.5f*(ff-3800)*(ff-3800)/9e5f); - if (st->loudness_weight[i]<.01f) - st->loudness_weight[i]=.01f; - st->loudness_weight[i] *= st->loudness_weight[i]; - } - /*st->loudness = pow(AMP_SCALE*st->agc_level,LOUDNESS_EXP);*/ - st->loudness = 1e-15; - st->agc_gain = 1; - st->max_gain = 30; - st->max_increase_step = exp(0.11513f * 12.*st->frame_size / st->sampling_rate); - st->max_decrease_step = exp(-0.11513f * 40.*st->frame_size / st->sampling_rate); - st->prev_loudness = 1; - st->init_max = 1; -#endif - st->was_speech = 0; - - st->fft_lookup = spx_fft_init(2*N); - - st->nb_adapt=0; - st->min_count=0; - return st; -} - -EXPORT void speex_preprocess_state_destroy(SpeexPreprocessState *st) -{ - speex_free(st->frame); - speex_free(st->ft); - speex_free(st->ps); - speex_free(st->gain2); - speex_free(st->gain_floor); - speex_free(st->window); - speex_free(st->noise); - speex_free(st->reverb_estimate); - speex_free(st->old_ps); - speex_free(st->gain); - speex_free(st->prior); - speex_free(st->post); -#ifndef FIXED_POINT - speex_free(st->loudness_weight); -#endif - speex_free(st->echo_noise); - speex_free(st->residual_echo); - - speex_free(st->S); - speex_free(st->Smin); - speex_free(st->Stmp); - speex_free(st->update_prob); - speex_free(st->zeta); - - speex_free(st->inbuf); - speex_free(st->outbuf); - - spx_fft_destroy(st->fft_lookup); - filterbank_destroy(st->bank); - speex_free(st); -} - -/* FIXME: The AGC doesn't work yet with fixed-point*/ -#ifndef FIXED_POINT -static void speex_compute_agc(SpeexPreprocessState *st, spx_word16_t Pframe, spx_word16_t *ft) -{ - int i; - int N = st->ps_size; - float target_gain; - float loudness=1.f; - float rate; - - for (i=2;ips[i]* st->loudness_weight[i]; - } - loudness=sqrt(loudness); - /*if (loudness < 2*pow(st->loudness, 1.0/LOUDNESS_EXP) && - loudness*2 > pow(st->loudness, 1.0/LOUDNESS_EXP))*/ - if (Pframe>.3f) - { - /*rate=2.0f*Pframe*Pframe/(1+st->nb_loudness_adapt);*/ - rate = .03*Pframe*Pframe; - st->loudness = (1-rate)*st->loudness + (rate)*pow(AMP_SCALE*loudness, LOUDNESS_EXP); - st->loudness_accum = (1-rate)*st->loudness_accum + rate; - if (st->init_max < st->max_gain && st->nb_adapt > 20) - st->init_max *= 1.f + .1f*Pframe*Pframe; - } - /*printf ("%f %f %f %f\n", Pframe, loudness, pow(st->loudness, 1.0f/LOUDNESS_EXP), st->loudness2);*/ - - target_gain = AMP_SCALE*st->agc_level*pow(st->loudness/(1e-4+st->loudness_accum), -1.0f/LOUDNESS_EXP); - - if ((Pframe>.5 && st->nb_adapt > 20) || target_gain < st->agc_gain) - { - if (target_gain > st->max_increase_step*st->agc_gain) - target_gain = st->max_increase_step*st->agc_gain; - if (target_gain < st->max_decrease_step*st->agc_gain && loudness < 10*st->prev_loudness) - target_gain = st->max_decrease_step*st->agc_gain; - if (target_gain > st->max_gain) - target_gain = st->max_gain; - if (target_gain > st->init_max) - target_gain = st->init_max; - - st->agc_gain = target_gain; - } - /*fprintf (stderr, "%f %f %f\n", loudness, (float)AMP_SCALE_1*pow(st->loudness, 1.0f/LOUDNESS_EXP), st->agc_gain);*/ - - for (i=0;i<2*N;i++) - ft[i] *= st->agc_gain; - st->prev_loudness = loudness; -} -#endif - -static void preprocess_analysis(SpeexPreprocessState *st, spx_int16_t *x) -{ - int i; - int N = st->ps_size; - int N3 = 2*N - st->frame_size; - int N4 = st->frame_size - N3; - spx_word32_t *ps=st->ps; - - /* 'Build' input frame */ - for (i=0;iframe[i]=st->inbuf[i]; - for (i=0;iframe_size;i++) - st->frame[N3+i]=x[i]; - - /* Update inbuf */ - for (i=0;iinbuf[i]=x[N4+i]; - - /* Windowing */ - for (i=0;i<2*N;i++) - st->frame[i] = MULT16_16_Q15(st->frame[i], st->window[i]); - -#ifdef FIXED_POINT - { - spx_word16_t max_val=0; - for (i=0;i<2*N;i++) - max_val = MAX16(max_val, ABS16(st->frame[i])); - st->frame_shift = 14-spx_ilog2(EXTEND32(max_val)); - for (i=0;i<2*N;i++) - st->frame[i] = SHL16(st->frame[i], st->frame_shift); - } -#endif - - /* Perform FFT */ - spx_fft(st->fft_lookup, st->frame, st->ft); - - /* Power spectrum */ - ps[0]=MULT16_16(st->ft[0],st->ft[0]); - for (i=1;ift[2*i-1],st->ft[2*i-1]) + MULT16_16(st->ft[2*i],st->ft[2*i]); - for (i=0;ips[i] = PSHR32(st->ps[i], 2*st->frame_shift); - - filterbank_compute_bank32(st->bank, ps, ps+N); -} - -static void update_noise_prob(SpeexPreprocessState *st) -{ - int i; - int min_range; - int N = st->ps_size; - - for (i=1;iS[i] = MULT16_32_Q15(QCONST16(.8f,15),st->S[i]) + MULT16_32_Q15(QCONST16(.05f,15),st->ps[i-1]) - + MULT16_32_Q15(QCONST16(.1f,15),st->ps[i]) + MULT16_32_Q15(QCONST16(.05f,15),st->ps[i+1]); - st->S[0] = MULT16_32_Q15(QCONST16(.8f,15),st->S[0]) + MULT16_32_Q15(QCONST16(.2f,15),st->ps[0]); - st->S[N-1] = MULT16_32_Q15(QCONST16(.8f,15),st->S[N-1]) + MULT16_32_Q15(QCONST16(.2f,15),st->ps[N-1]); - - if (st->nb_adapt==1) - { - for (i=0;iSmin[i] = st->Stmp[i] = 0; - } - - if (st->nb_adapt < 100) - min_range = 15; - else if (st->nb_adapt < 1000) - min_range = 50; - else if (st->nb_adapt < 10000) - min_range = 150; - else - min_range = 300; - if (st->min_count > min_range) - { - st->min_count = 0; - for (i=0;iSmin[i] = MIN32(st->Stmp[i], st->S[i]); - st->Stmp[i] = st->S[i]; - } - } else { - for (i=0;iSmin[i] = MIN32(st->Smin[i], st->S[i]); - st->Stmp[i] = MIN32(st->Stmp[i], st->S[i]); - } - } - for (i=0;iS[i]) > st->Smin[i]) - st->update_prob[i] = 1; - else - st->update_prob[i] = 0; - /*fprintf (stderr, "%f ", st->S[i]/st->Smin[i]);*/ - /*fprintf (stderr, "%f ", st->update_prob[i]);*/ - } - -} - -#define NOISE_OVERCOMPENS 1. - -void speex_echo_get_residual(SpeexEchoState *st, spx_word32_t *Yout, int len); - -EXPORT int speex_preprocess(SpeexPreprocessState *st, spx_int16_t *x, spx_int32_t *echo) -{ - return speex_preprocess_run(st, x); -} - -EXPORT int speex_preprocess_run(SpeexPreprocessState *st, spx_int16_t *x) -{ - int i; - int M; - int N = st->ps_size; - int N3 = 2*N - st->frame_size; - int N4 = st->frame_size - N3; - spx_word32_t *ps=st->ps; - spx_word32_t Zframe; - spx_word16_t Pframe; - spx_word16_t beta, beta_1; - spx_word16_t effective_echo_suppress; - - st->nb_adapt++; - if (st->nb_adapt>20000) - st->nb_adapt = 20000; - st->min_count++; - - beta = MAX16(QCONST16(.03,15),DIV32_16(Q15_ONE,st->nb_adapt)); - beta_1 = Q15_ONE-beta; - M = st->nbands; - /* Deal with residual echo if provided */ - if (st->echo_state) - { - speex_echo_get_residual(st->echo_state, st->residual_echo, N); -#ifndef FIXED_POINT - /* If there are NaNs or ridiculous values, it'll show up in the DC and we just reset everything to zero */ - if (!(st->residual_echo[0] >=0 && st->residual_echo[0]residual_echo[i] = 0; - } -#endif - for (i=0;iecho_noise[i] = MAX32(MULT16_32_Q15(QCONST16(.6f,15),st->echo_noise[i]), st->residual_echo[i]); - filterbank_compute_bank32(st->bank, st->echo_noise, st->echo_noise+N); - } else { - for (i=0;iecho_noise[i] = 0; - } - preprocess_analysis(st, x); - - update_noise_prob(st); - - /* Noise estimation always updated for the 10 first frames */ - /*if (st->nb_adapt<10) - { - for (i=1;iupdate_prob[i] = 0; - } - */ - - /* Update the noise estimate for the frequencies where it can be */ - for (i=0;iupdate_prob[i] || st->ps[i] < PSHR32(st->noise[i], NOISE_SHIFT)) - st->noise[i] = MAX32(EXTEND32(0),MULT16_32_Q15(beta_1,st->noise[i]) + MULT16_32_Q15(beta,SHL32(st->ps[i],NOISE_SHIFT))); - } - filterbank_compute_bank32(st->bank, st->noise, st->noise+N); - - /* Special case for first frame */ - if (st->nb_adapt==1) - for (i=0;iold_ps[i] = ps[i]; - - /* Compute a posteriori SNR */ - for (i=0;inoise[i],NOISE_SHIFT)) , st->echo_noise[i]) , st->reverb_estimate[i]); - - /* A posteriori SNR = ps/noise - 1*/ - st->post[i] = SUB16(DIV32_16_Q8(ps[i],tot_noise), QCONST16(1.f,SNR_SHIFT)); - st->post[i]=MIN16(st->post[i], QCONST16(100.f,SNR_SHIFT)); - - /* Computing update gamma = .1 + .9*(old/(old+noise))^2 */ - gamma = QCONST16(.1f,15)+MULT16_16_Q15(QCONST16(.89f,15),SQR16_Q15(DIV32_16_Q15(st->old_ps[i],ADD32(st->old_ps[i],tot_noise)))); - - /* A priori SNR update = gamma*max(0,post) + (1-gamma)*old/noise */ - st->prior[i] = EXTRACT16(PSHR32(ADD32(MULT16_16(gamma,MAX16(0,st->post[i])), MULT16_16(Q15_ONE-gamma,DIV32_16_Q8(st->old_ps[i],tot_noise))), 15)); - st->prior[i]=MIN16(st->prior[i], QCONST16(100.f,SNR_SHIFT)); - } - - /*print_vec(st->post, N+M, "");*/ - - /* Recursive average of the a priori SNR. A bit smoothed for the psd components */ - st->zeta[0] = PSHR32(ADD32(MULT16_16(QCONST16(.7f,15),st->zeta[0]), MULT16_16(QCONST16(.3f,15),st->prior[0])),15); - for (i=1;izeta[i] = PSHR32(ADD32(ADD32(ADD32(MULT16_16(QCONST16(.7f,15),st->zeta[i]), MULT16_16(QCONST16(.15f,15),st->prior[i])), - MULT16_16(QCONST16(.075f,15),st->prior[i-1])), MULT16_16(QCONST16(.075f,15),st->prior[i+1])),15); - for (i=N-1;izeta[i] = PSHR32(ADD32(MULT16_16(QCONST16(.7f,15),st->zeta[i]), MULT16_16(QCONST16(.3f,15),st->prior[i])),15); - - /* Speech probability of presence for the entire frame is based on the average filterbank a priori SNR */ - Zframe = 0; - for (i=N;izeta[i])); - Pframe = QCONST16(.1f,15)+MULT16_16_Q15(QCONST16(.899f,15),qcurve(DIV32_16(Zframe,st->nbands))); - - effective_echo_suppress = EXTRACT16(PSHR32(ADD32(MULT16_16(SUB16(Q15_ONE,Pframe), st->echo_suppress), MULT16_16(Pframe, st->echo_suppress_active)),15)); - - compute_gain_floor(st->noise_suppress, effective_echo_suppress, st->noise+N, st->echo_noise+N, st->gain_floor+N, M); - - /* Compute Ephraim & Malah gain speech probability of presence for each critical band (Bark scale) - Technically this is actually wrong because the EM gaim assumes a slightly different probability - distribution */ - for (i=N;iprior[i]), 15), ADD16(st->prior[i], SHL32(1,SNR_SHIFT))); - theta = MULT16_32_P15(prior_ratio, QCONST32(1.f,EXPIN_SHIFT)+SHL32(EXTEND32(st->post[i]),EXPIN_SHIFT-SNR_SHIFT)); - - MM = hypergeom_gain(theta); - /* Gain with bound */ - st->gain[i] = EXTRACT16(MIN32(Q15_ONE, MULT16_32_Q15(prior_ratio, MM))); - /* Save old Bark power spectrum */ - st->old_ps[i] = MULT16_32_P15(QCONST16(.2f,15),st->old_ps[i]) + MULT16_32_P15(MULT16_16_P15(QCONST16(.8f,15),SQR16_Q15(st->gain[i])),ps[i]); - - P1 = QCONST16(.199f,15)+MULT16_16_Q15(QCONST16(.8f,15),qcurve (st->zeta[i])); - q = Q15_ONE-MULT16_16_Q15(Pframe,P1); -#ifdef FIXED_POINT - theta = MIN32(theta, EXTEND32(32767)); -/*Q8*/tmp = MULT16_16_Q15((SHL32(1,SNR_SHIFT)+st->prior[i]),EXTRACT16(MIN32(Q15ONE,SHR32(spx_exp(-EXTRACT16(theta)),1)))); - tmp = MIN16(QCONST16(3.,SNR_SHIFT), tmp); /* Prevent overflows in the next line*/ -/*Q8*/tmp = EXTRACT16(PSHR32(MULT16_16(PDIV32_16(SHL32(EXTEND32(q),8),(Q15_ONE-q)),tmp),8)); - st->gain2[i]=DIV32_16(SHL32(EXTEND32(32767),SNR_SHIFT), ADD16(256,tmp)); -#else - st->gain2[i]=1/(1.f + (q/(1.f-q))*(1+st->prior[i])*exp(-theta)); -#endif - } - /* Convert the EM gains and speech prob to linear frequency */ - filterbank_compute_psd16(st->bank,st->gain2+N, st->gain2); - filterbank_compute_psd16(st->bank,st->gain+N, st->gain); - - /* Use 1 for linear gain resolution (best) or 0 for Bark gain resolution (faster) */ - if (1) - { - filterbank_compute_psd16(st->bank,st->gain_floor+N, st->gain_floor); - - /* Compute gain according to the Ephraim-Malah algorithm -- linear frequency */ - for (i=0;iprior[i]), 15), ADD16(st->prior[i], SHL32(1,SNR_SHIFT))); - theta = MULT16_32_P15(prior_ratio, QCONST32(1.f,EXPIN_SHIFT)+SHL32(EXTEND32(st->post[i]),EXPIN_SHIFT-SNR_SHIFT)); - - /* Optimal estimator for loudness domain */ - MM = hypergeom_gain(theta); - /* EM gain with bound */ - g = EXTRACT16(MIN32(Q15_ONE, MULT16_32_Q15(prior_ratio, MM))); - /* Interpolated speech probability of presence */ - p = st->gain2[i]; - - /* Constrain the gain to be close to the Bark scale gain */ - if (MULT16_16_Q15(QCONST16(.333f,15),g) > st->gain[i]) - g = MULT16_16(3,st->gain[i]); - st->gain[i] = g; - - /* Save old power spectrum */ - st->old_ps[i] = MULT16_32_P15(QCONST16(.2f,15),st->old_ps[i]) + MULT16_32_P15(MULT16_16_P15(QCONST16(.8f,15),SQR16_Q15(st->gain[i])),ps[i]); - - /* Apply gain floor */ - if (st->gain[i] < st->gain_floor[i]) - st->gain[i] = st->gain_floor[i]; - - /* Exponential decay model for reverberation (unused) */ - /*st->reverb_estimate[i] = st->reverb_decay*st->reverb_estimate[i] + st->reverb_decay*st->reverb_level*st->gain[i]*st->gain[i]*st->ps[i];*/ - - /* Take into account speech probability of presence (loudness domain MMSE estimator) */ - /* gain2 = [p*sqrt(gain)+(1-p)*sqrt(gain _floor) ]^2 */ - tmp = MULT16_16_P15(p,spx_sqrt(SHL32(EXTEND32(st->gain[i]),15))) + MULT16_16_P15(SUB16(Q15_ONE,p),spx_sqrt(SHL32(EXTEND32(st->gain_floor[i]),15))); - st->gain2[i]=SQR16_Q15(tmp); - - /* Use this if you want a log-domain MMSE estimator instead */ - /*st->gain2[i] = pow(st->gain[i], p) * pow(st->gain_floor[i],1.f-p);*/ - } - } else { - for (i=N;igain2[i]; - st->gain[i] = MAX16(st->gain[i], st->gain_floor[i]); - tmp = MULT16_16_P15(p,spx_sqrt(SHL32(EXTEND32(st->gain[i]),15))) + MULT16_16_P15(SUB16(Q15_ONE,p),spx_sqrt(SHL32(EXTEND32(st->gain_floor[i]),15))); - st->gain2[i]=SQR16_Q15(tmp); - } - filterbank_compute_psd16(st->bank,st->gain2+N, st->gain2); - } - - /* If noise suppression is off, don't apply the gain (but then why call this in the first place!) */ - if (!st->denoise_enabled) - { - for (i=0;igain2[i]=Q15_ONE; - } - - /* Apply computed gain */ - for (i=1;ift[2*i-1] = MULT16_16_P15(st->gain2[i],st->ft[2*i-1]); - st->ft[2*i] = MULT16_16_P15(st->gain2[i],st->ft[2*i]); - } - st->ft[0] = MULT16_16_P15(st->gain2[0],st->ft[0]); - st->ft[2*N-1] = MULT16_16_P15(st->gain2[N-1],st->ft[2*N-1]); - - /*FIXME: This *will* not work for fixed-point */ -#ifndef FIXED_POINT - if (st->agc_enabled) - speex_compute_agc(st, Pframe, st->ft); -#endif - - /* Inverse FFT with 1/N scaling */ - spx_ifft(st->fft_lookup, st->ft, st->frame); - /* Scale back to original (lower) amplitude */ - for (i=0;i<2*N;i++) - st->frame[i] = PSHR16(st->frame[i], st->frame_shift); - - /*FIXME: This *will* not work for fixed-point */ -#ifndef FIXED_POINT - if (st->agc_enabled) - { - float max_sample=0; - for (i=0;i<2*N;i++) - if (fabs(st->frame[i])>max_sample) - max_sample = fabs(st->frame[i]); - if (max_sample>28000.f) - { - float damp = 28000.f/max_sample; - for (i=0;i<2*N;i++) - st->frame[i] *= damp; - } - } -#endif - - /* Synthesis window (for WOLA) */ - for (i=0;i<2*N;i++) - st->frame[i] = MULT16_16_Q15(st->frame[i], st->window[i]); - - /* Perform overlap and add */ - for (i=0;ioutbuf[i]), EXTEND32(st->frame[i]))); - for (i=0;iframe[N3+i]; - - /* Update outbuf */ - for (i=0;ioutbuf[i] = st->frame[st->frame_size+i]; - - /* FIXME: This VAD is a kludge */ - st->speech_prob = Pframe; - if (st->vad_enabled) - { - if (st->speech_prob > st->speech_prob_start || (st->was_speech && st->speech_prob > st->speech_prob_continue)) - { - st->was_speech=1; - return 1; - } else - { - st->was_speech=0; - return 0; - } - } else { - return 1; - } -} - -EXPORT void speex_preprocess_estimate_update(SpeexPreprocessState *st, spx_int16_t *x) -{ - int i; - int N = st->ps_size; - int N3 = 2*N - st->frame_size; - int M; - spx_word32_t *ps=st->ps; - - M = st->nbands; - st->min_count++; - - preprocess_analysis(st, x); - - update_noise_prob(st); - - for (i=1;iupdate_prob[i] || st->ps[i] < PSHR32(st->noise[i],NOISE_SHIFT)) - { - st->noise[i] = MULT16_32_Q15(QCONST16(.95f,15),st->noise[i]) + MULT16_32_Q15(QCONST16(.05f,15),SHL32(st->ps[i],NOISE_SHIFT)); - } - } - - for (i=0;ioutbuf[i] = MULT16_16_Q15(x[st->frame_size-N3+i],st->window[st->frame_size+i]); - - /* Save old power spectrum */ - for (i=0;iold_ps[i] = ps[i]; - - for (i=0;ireverb_estimate[i] = MULT16_32_Q15(st->reverb_decay, st->reverb_estimate[i]); -} - - -EXPORT int speex_preprocess_ctl(SpeexPreprocessState *state, int request, void *ptr) -{ - int i; - SpeexPreprocessState *st; - st=(SpeexPreprocessState*)state; - switch(request) - { - case SPEEX_PREPROCESS_SET_DENOISE: - st->denoise_enabled = (*(spx_int32_t*)ptr); - break; - case SPEEX_PREPROCESS_GET_DENOISE: - (*(spx_int32_t*)ptr) = st->denoise_enabled; - break; -#ifndef FIXED_POINT - case SPEEX_PREPROCESS_SET_AGC: - st->agc_enabled = (*(spx_int32_t*)ptr); - break; - case SPEEX_PREPROCESS_GET_AGC: - (*(spx_int32_t*)ptr) = st->agc_enabled; - break; -#ifndef DISABLE_FLOAT_API - case SPEEX_PREPROCESS_SET_AGC_LEVEL: - st->agc_level = (*(float*)ptr); - if (st->agc_level<1) - st->agc_level=1; - if (st->agc_level>32768) - st->agc_level=32768; - break; - case SPEEX_PREPROCESS_GET_AGC_LEVEL: - (*(float*)ptr) = st->agc_level; - break; -#endif /* #ifndef DISABLE_FLOAT_API */ - case SPEEX_PREPROCESS_SET_AGC_INCREMENT: - st->max_increase_step = exp(0.11513f * (*(spx_int32_t*)ptr)*st->frame_size / st->sampling_rate); - break; - case SPEEX_PREPROCESS_GET_AGC_INCREMENT: - (*(spx_int32_t*)ptr) = floor(.5+8.6858*log(st->max_increase_step)*st->sampling_rate/st->frame_size); - break; - case SPEEX_PREPROCESS_SET_AGC_DECREMENT: - st->max_decrease_step = exp(0.11513f * (*(spx_int32_t*)ptr)*st->frame_size / st->sampling_rate); - break; - case SPEEX_PREPROCESS_GET_AGC_DECREMENT: - (*(spx_int32_t*)ptr) = floor(.5+8.6858*log(st->max_decrease_step)*st->sampling_rate/st->frame_size); - break; - case SPEEX_PREPROCESS_SET_AGC_MAX_GAIN: - st->max_gain = exp(0.11513f * (*(spx_int32_t*)ptr)); - break; - case SPEEX_PREPROCESS_GET_AGC_MAX_GAIN: - (*(spx_int32_t*)ptr) = floor(.5+8.6858*log(st->max_gain)); - break; -#endif - case SPEEX_PREPROCESS_SET_VAD: - speex_warning("The VAD has been replaced by a hack pending a complete rewrite"); - st->vad_enabled = (*(spx_int32_t*)ptr); - break; - case SPEEX_PREPROCESS_GET_VAD: - (*(spx_int32_t*)ptr) = st->vad_enabled; - break; - - case SPEEX_PREPROCESS_SET_DEREVERB: - st->dereverb_enabled = (*(spx_int32_t*)ptr); - for (i=0;ips_size;i++) - st->reverb_estimate[i]=0; - break; - case SPEEX_PREPROCESS_GET_DEREVERB: - (*(spx_int32_t*)ptr) = st->dereverb_enabled; - break; - - case SPEEX_PREPROCESS_SET_DEREVERB_LEVEL: - /* FIXME: Re-enable when de-reverberation is actually enabled again */ - /*st->reverb_level = (*(float*)ptr);*/ - break; - case SPEEX_PREPROCESS_GET_DEREVERB_LEVEL: - /* FIXME: Re-enable when de-reverberation is actually enabled again */ - /*(*(float*)ptr) = st->reverb_level;*/ - break; - - case SPEEX_PREPROCESS_SET_DEREVERB_DECAY: - /* FIXME: Re-enable when de-reverberation is actually enabled again */ - /*st->reverb_decay = (*(float*)ptr);*/ - break; - case SPEEX_PREPROCESS_GET_DEREVERB_DECAY: - /* FIXME: Re-enable when de-reverberation is actually enabled again */ - /*(*(float*)ptr) = st->reverb_decay;*/ - break; - - case SPEEX_PREPROCESS_SET_PROB_START: - *(spx_int32_t*)ptr = MIN32(100,MAX32(0, *(spx_int32_t*)ptr)); - st->speech_prob_start = DIV32_16(MULT16_16(Q15ONE,*(spx_int32_t*)ptr), 100); - break; - case SPEEX_PREPROCESS_GET_PROB_START: - (*(spx_int32_t*)ptr) = MULT16_16_Q15(st->speech_prob_start, 100); - break; - - case SPEEX_PREPROCESS_SET_PROB_CONTINUE: - *(spx_int32_t*)ptr = MIN32(100,MAX32(0, *(spx_int32_t*)ptr)); - st->speech_prob_continue = DIV32_16(MULT16_16(Q15ONE,*(spx_int32_t*)ptr), 100); - break; - case SPEEX_PREPROCESS_GET_PROB_CONTINUE: - (*(spx_int32_t*)ptr) = MULT16_16_Q15(st->speech_prob_continue, 100); - break; - - case SPEEX_PREPROCESS_SET_NOISE_SUPPRESS: - st->noise_suppress = -ABS(*(spx_int32_t*)ptr); - break; - case SPEEX_PREPROCESS_GET_NOISE_SUPPRESS: - (*(spx_int32_t*)ptr) = st->noise_suppress; - break; - case SPEEX_PREPROCESS_SET_ECHO_SUPPRESS: - st->echo_suppress = -ABS(*(spx_int32_t*)ptr); - break; - case SPEEX_PREPROCESS_GET_ECHO_SUPPRESS: - (*(spx_int32_t*)ptr) = st->echo_suppress; - break; - case SPEEX_PREPROCESS_SET_ECHO_SUPPRESS_ACTIVE: - st->echo_suppress_active = -ABS(*(spx_int32_t*)ptr); - break; - case SPEEX_PREPROCESS_GET_ECHO_SUPPRESS_ACTIVE: - (*(spx_int32_t*)ptr) = st->echo_suppress_active; - break; - case SPEEX_PREPROCESS_SET_ECHO_STATE: - st->echo_state = (SpeexEchoState*)ptr; - break; - case SPEEX_PREPROCESS_GET_ECHO_STATE: - (*(SpeexEchoState**)ptr) = (SpeexEchoState*)st->echo_state; - break; -#ifndef FIXED_POINT - case SPEEX_PREPROCESS_GET_AGC_LOUDNESS: - (*(spx_int32_t*)ptr) = pow(st->loudness, 1.0/LOUDNESS_EXP); - break; - case SPEEX_PREPROCESS_GET_AGC_GAIN: - (*(spx_int32_t*)ptr) = floor(.5+8.6858*log(st->agc_gain)); - break; -#endif - case SPEEX_PREPROCESS_GET_PSD_SIZE: - case SPEEX_PREPROCESS_GET_NOISE_PSD_SIZE: - (*(spx_int32_t*)ptr) = st->ps_size; - break; - case SPEEX_PREPROCESS_GET_PSD: - for(i=0;ips_size;i++) - ((spx_int32_t *)ptr)[i] = (spx_int32_t) st->ps[i]; - break; - case SPEEX_PREPROCESS_GET_NOISE_PSD: - for(i=0;ips_size;i++) - ((spx_int32_t *)ptr)[i] = (spx_int32_t) PSHR32(st->noise[i], NOISE_SHIFT); - break; - case SPEEX_PREPROCESS_GET_PROB: - (*(spx_int32_t*)ptr) = MULT16_16_Q15(st->speech_prob, 100); - break; -#ifndef FIXED_POINT - case SPEEX_PREPROCESS_SET_AGC_TARGET: - st->agc_level = (*(spx_int32_t*)ptr); - if (st->agc_level<1) - st->agc_level=1; - if (st->agc_level>32768) - st->agc_level=32768; - break; - case SPEEX_PREPROCESS_GET_AGC_TARGET: - (*(spx_int32_t*)ptr) = st->agc_level; - break; -#endif - default: - speex_warning_int("Unknown speex_preprocess_ctl request: ", request); - return -1; - } - return 0; -} - -#ifdef FIXED_DEBUG -long long spx_mips=0; -#endif - diff --git a/speex/libspeexdsp/pseudofloat.h b/speex/libspeexdsp/pseudofloat.h deleted file mode 100644 index ed5ab14b05f44050b755d94dcee31d24a941f221..0000000000000000000000000000000000000000 --- a/speex/libspeexdsp/pseudofloat.h +++ /dev/null @@ -1,379 +0,0 @@ -/* Copyright (C) 2005 Jean-Marc Valin */ -/** - @file pseudofloat.h - @brief Pseudo-floating point - * This header file provides a lightweight floating point type for - * use on fixed-point platforms when a large dynamic range is - * required. The new type is not compatible with the 32-bit IEEE format, - * it is not even remotely as accurate as 32-bit floats, and is not - * even guaranteed to produce even remotely correct results for code - * other than Speex. It makes all kinds of shortcuts that are acceptable - * for Speex, but may not be acceptable for your application. You're - * quite welcome to reuse this code and improve it, but don't assume - * it works out of the box. Most likely, it doesn't. - */ -/* - 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 PSEUDOFLOAT_H -#define PSEUDOFLOAT_H - -#include "arch.h" -#include "os_support.h" -#include "math_approx.h" -#include - -#ifdef FIXED_POINT - -typedef struct { - spx_int16_t m; - spx_int16_t e; -} spx_float_t; - -static const spx_float_t FLOAT_ZERO = {0,0}; -static const spx_float_t FLOAT_ONE = {16384,-14}; -static const spx_float_t FLOAT_HALF = {16384,-15}; - -#define MIN(a,b) ((a)<(b)?(a):(b)) -static inline spx_float_t PSEUDOFLOAT(spx_int32_t x) -{ - int e=0; - int sign=0; - if (x<0) - { - sign = 1; - x = -x; - } - if (x==0) - { - spx_float_t r = {0,0}; - return r; - } - e = spx_ilog2(ABS32(x))-14; - x = VSHR32(x, e); - if (sign) - { - spx_float_t r; - r.m = -x; - r.e = e; - return r; - } - else - { - spx_float_t r; - r.m = x; - r.e = e; - return r; - } -} - - -static inline spx_float_t FLOAT_ADD(spx_float_t a, spx_float_t b) -{ - spx_float_t r; - if (a.m==0) - return b; - else if (b.m==0) - return a; - if ((a).e > (b).e) - { - r.m = ((a).m>>1) + ((b).m>>MIN(15,(a).e-(b).e+1)); - r.e = (a).e+1; - } - else - { - r.m = ((b).m>>1) + ((a).m>>MIN(15,(b).e-(a).e+1)); - r.e = (b).e+1; - } - if (r.m>0) - { - if (r.m<16384) - { - r.m<<=1; - r.e-=1; - } - } else { - if (r.m>-16384) - { - r.m<<=1; - r.e-=1; - } - } - /*printf ("%f + %f = %f\n", REALFLOAT(a), REALFLOAT(b), REALFLOAT(r));*/ - return r; -} - -static inline spx_float_t FLOAT_SUB(spx_float_t a, spx_float_t b) -{ - spx_float_t r; - if (a.m==0) - return b; - else if (b.m==0) - return a; - if ((a).e > (b).e) - { - r.m = ((a).m>>1) - ((b).m>>MIN(15,(a).e-(b).e+1)); - r.e = (a).e+1; - } - else - { - r.m = ((a).m>>MIN(15,(b).e-(a).e+1)) - ((b).m>>1); - r.e = (b).e+1; - } - if (r.m>0) - { - if (r.m<16384) - { - r.m<<=1; - r.e-=1; - } - } else { - if (r.m>-16384) - { - r.m<<=1; - r.e-=1; - } - } - /*printf ("%f + %f = %f\n", REALFLOAT(a), REALFLOAT(b), REALFLOAT(r));*/ - return r; -} - -static inline int FLOAT_LT(spx_float_t a, spx_float_t b) -{ - if (a.m==0) - return b.m>0; - else if (b.m==0) - return a.m<0; - if ((a).e > (b).e) - return ((a).m>>1) < ((b).m>>MIN(15,(a).e-(b).e+1)); - else - return ((b).m>>1) > ((a).m>>MIN(15,(b).e-(a).e+1)); - -} - -static inline int FLOAT_GT(spx_float_t a, spx_float_t b) -{ - return FLOAT_LT(b,a); -} - -static inline spx_float_t FLOAT_MULT(spx_float_t a, spx_float_t b) -{ - spx_float_t r; - r.m = (spx_int16_t)((spx_int32_t)(a).m*(b).m>>15); - r.e = (a).e+(b).e+15; - if (r.m>0) - { - if (r.m<16384) - { - r.m<<=1; - r.e-=1; - } - } else { - if (r.m>-16384) - { - r.m<<=1; - r.e-=1; - } - } - /*printf ("%f * %f = %f\n", REALFLOAT(a), REALFLOAT(b), REALFLOAT(r));*/ - return r; -} - -static inline spx_float_t FLOAT_AMULT(spx_float_t a, spx_float_t b) -{ - spx_float_t r; - r.m = (spx_int16_t)((spx_int32_t)(a).m*(b).m>>15); - r.e = (a).e+(b).e+15; - return r; -} - - -static inline spx_float_t FLOAT_SHL(spx_float_t a, int b) -{ - spx_float_t r; - r.m = a.m; - r.e = a.e+b; - return r; -} - -static inline spx_int16_t FLOAT_EXTRACT16(spx_float_t a) -{ - if (a.e<0) - return EXTRACT16((EXTEND32(a.m)+(EXTEND32(1)<<(-a.e-1)))>>-a.e); - else - return a.m<>-a.e; - else - return EXTEND32(a.m)<=SHL32(EXTEND32(b.m-1),15)) - { - a >>= 1; - e++; - } - r.m = DIV32_16(a,b.m); - r.e = e-b.e; - return r; -} - - -/* Do NOT attempt to divide by a negative number */ -static inline spx_float_t FLOAT_DIV32(spx_word32_t a, spx_word32_t b) -{ - int e0=0,e=0; - spx_float_t r; - if (a==0) - { - return FLOAT_ZERO; - } - if (b>32767) - { - e0 = spx_ilog2(b)-14; - b = VSHR32(b, e0); - e0 = -e0; - } - e = spx_ilog2(ABS32(a))-spx_ilog2(b-1)-15; - a = VSHR32(a, e); - if (ABS32(a)>=SHL32(EXTEND32(b-1),15)) - { - a >>= 1; - e++; - } - e += e0; - r.m = DIV32_16(a,b); - r.e = e; - return r; -} - -/* Do NOT attempt to divide by a negative number */ -static inline spx_float_t FLOAT_DIVU(spx_float_t a, spx_float_t b) -{ - int e=0; - spx_int32_t num; - spx_float_t r; - if (b.m<=0) - { - speex_warning_int("Attempted to divide by", b.m); - return FLOAT_ONE; - } - num = a.m; - a.m = ABS16(a.m); - while (a.m >= b.m) - { - e++; - a.m >>= 1; - } - num = num << (15-e); - r.m = DIV32_16(num,b.m); - r.e = a.e-b.e-15+e; - return r; -} - -static inline spx_float_t FLOAT_SQRT(spx_float_t a) -{ - spx_float_t r; - spx_int32_t m; - m = SHL32(EXTEND32(a.m), 14); - r.e = a.e - 14; - if (r.e & 1) - { - r.e -= 1; - m <<= 1; - } - r.e >>= 1; - r.m = spx_sqrt(m); - return r; -} - -#else - -#define spx_float_t float -#define FLOAT_ZERO 0.f -#define FLOAT_ONE 1.f -#define FLOAT_HALF 0.5f -#define PSEUDOFLOAT(x) (x) -#define FLOAT_MULT(a,b) ((a)*(b)) -#define FLOAT_AMULT(a,b) ((a)*(b)) -#define FLOAT_MUL32(a,b) ((a)*(b)) -#define FLOAT_DIV32(a,b) ((a)/(b)) -#define FLOAT_EXTRACT16(a) (a) -#define FLOAT_EXTRACT32(a) (a) -#define FLOAT_ADD(a,b) ((a)+(b)) -#define FLOAT_SUB(a,b) ((a)-(b)) -#define REALFLOAT(x) (x) -#define FLOAT_DIV32_FLOAT(a,b) ((a)/(b)) -#define FLOAT_MUL32U(a,b) ((a)*(b)) -#define FLOAT_SHL(a,b) (a) -#define FLOAT_LT(a,b) ((a)<(b)) -#define FLOAT_GT(a,b) ((a)>(b)) -#define FLOAT_DIVU(a,b) ((a)/(b)) -#define FLOAT_SQRT(a) (spx_sqrt(a)) - -#endif - -#endif diff --git a/speex/libspeexdsp/resample.c b/speex/libspeexdsp/resample.c deleted file mode 100644 index cd0601c1b7c0aa7edb26cee298c0057b4695e7c9..0000000000000000000000000000000000000000 --- a/speex/libspeexdsp/resample.c +++ /dev/null @@ -1,1241 +0,0 @@ -/* Copyright (C) 2007-2008 Jean-Marc Valin - Copyright (C) 2008 Thorvald Natvig - - File: resample.c - Arbitrary resampling code - - 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. - - 3. The name of the author may not be used to endorse or promote products - derived from this software without specific prior written permission. - - 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. -*/ - -/* - The design goals of this code are: - - Very fast algorithm - - SIMD-friendly algorithm - - Low memory requirement - - Good *perceptual* quality (and not best SNR) - - Warning: This resampler is relatively new. Although I think I got rid of - all the major bugs and I don't expect the API to change anymore, there - may be something I've missed. So use with caution. - - This algorithm is based on this original resampling algorithm: - Smith, Julius O. Digital Audio Resampling Home Page - Center for Computer Research in Music and Acoustics (CCRMA), - Stanford University, 2007. - Web published at https://ccrma.stanford.edu/~jos/resample/. - - There is one main difference, though. This resampler uses cubic - interpolation instead of linear interpolation in the above paper. This - makes the table much smaller and makes it possible to compute that table - on a per-stream basis. In turn, being able to tweak the table for each - stream makes it possible to both reduce complexity on simple ratios - (e.g. 2/3), and get rid of the rounding operations in the inner loop. - The latter both reduces CPU time and makes the algorithm more SIMD-friendly. -*/ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#ifdef OUTSIDE_SPEEX -#include -static void *speex_alloc(int size) {return calloc(size,1);} -static void *speex_realloc(void *ptr, int size) {return realloc(ptr, size);} -static void speex_free(void *ptr) {free(ptr);} -#ifndef EXPORT -#define EXPORT -#endif -#include "speex_resampler.h" -#include "arch.h" -#else /* OUTSIDE_SPEEX */ - -#include "speex/speex_resampler.h" -#include "arch.h" -#include "os_support.h" -#endif /* OUTSIDE_SPEEX */ - -#include -#include - -#ifndef M_PI -#define M_PI 3.14159265358979323846 -#endif - -#define IMAX(a,b) ((a) > (b) ? (a) : (b)) -#define IMIN(a,b) ((a) < (b) ? (a) : (b)) - -#ifndef NULL -#define NULL 0 -#endif - -#ifndef UINT32_MAX -#define UINT32_MAX 4294967295U -#endif - -#ifdef USE_SSE -#include "resample_sse.h" -#endif - -#ifdef USE_NEON -#include "resample_neon.h" -#endif - -/* Numer of elements to allocate on the stack */ -#ifdef VAR_ARRAYS -#define FIXED_STACK_ALLOC 8192 -#else -#define FIXED_STACK_ALLOC 1024 -#endif - -#define EXPORT __attribute__((visibility("default"))) - -typedef int (*resampler_basic_func)(SpeexResamplerState *, spx_uint32_t , const spx_word16_t *, spx_uint32_t *, spx_word16_t *, spx_uint32_t *); - -struct SpeexResamplerState_ { - spx_uint32_t in_rate; - spx_uint32_t out_rate; - spx_uint32_t num_rate; - spx_uint32_t den_rate; - - int quality; - spx_uint32_t nb_channels; - spx_uint32_t filt_len; - spx_uint32_t mem_alloc_size; - spx_uint32_t buffer_size; - int int_advance; - int frac_advance; - float cutoff; - spx_uint32_t oversample; - int initialised; - int started; - - /* These are per-channel */ - spx_int32_t *last_sample; - spx_uint32_t *samp_frac_num; - spx_uint32_t *magic_samples; - - spx_word16_t *mem; - spx_word16_t *sinc_table; - spx_uint32_t sinc_table_length; - resampler_basic_func resampler_ptr; - - int in_stride; - int out_stride; -} ; - -static const double kaiser12_table[68] = { - 0.99859849, 1.00000000, 0.99859849, 0.99440475, 0.98745105, 0.97779076, - 0.96549770, 0.95066529, 0.93340547, 0.91384741, 0.89213598, 0.86843014, - 0.84290116, 0.81573067, 0.78710866, 0.75723148, 0.72629970, 0.69451601, - 0.66208321, 0.62920216, 0.59606986, 0.56287762, 0.52980938, 0.49704014, - 0.46473455, 0.43304576, 0.40211431, 0.37206735, 0.34301800, 0.31506490, - 0.28829195, 0.26276832, 0.23854851, 0.21567274, 0.19416736, 0.17404546, - 0.15530766, 0.13794294, 0.12192957, 0.10723616, 0.09382272, 0.08164178, - 0.07063950, 0.06075685, 0.05193064, 0.04409466, 0.03718069, 0.03111947, - 0.02584161, 0.02127838, 0.01736250, 0.01402878, 0.01121463, 0.00886058, - 0.00691064, 0.00531256, 0.00401805, 0.00298291, 0.00216702, 0.00153438, - 0.00105297, 0.00069463, 0.00043489, 0.00025272, 0.00013031, 0.0000527734, - 0.00001000, 0.00000000}; -/* -static const double kaiser12_table[36] = { - 0.99440475, 1.00000000, 0.99440475, 0.97779076, 0.95066529, 0.91384741, - 0.86843014, 0.81573067, 0.75723148, 0.69451601, 0.62920216, 0.56287762, - 0.49704014, 0.43304576, 0.37206735, 0.31506490, 0.26276832, 0.21567274, - 0.17404546, 0.13794294, 0.10723616, 0.08164178, 0.06075685, 0.04409466, - 0.03111947, 0.02127838, 0.01402878, 0.00886058, 0.00531256, 0.00298291, - 0.00153438, 0.00069463, 0.00025272, 0.0000527734, 0.00000500, 0.00000000}; -*/ -static const double kaiser10_table[36] = { - 0.99537781, 1.00000000, 0.99537781, 0.98162644, 0.95908712, 0.92831446, - 0.89005583, 0.84522401, 0.79486424, 0.74011713, 0.68217934, 0.62226347, - 0.56155915, 0.50119680, 0.44221549, 0.38553619, 0.33194107, 0.28205962, - 0.23636152, 0.19515633, 0.15859932, 0.12670280, 0.09935205, 0.07632451, - 0.05731132, 0.04193980, 0.02979584, 0.02044510, 0.01345224, 0.00839739, - 0.00488951, 0.00257636, 0.00115101, 0.00035515, 0.00000000, 0.00000000}; - -static const double kaiser8_table[36] = { - 0.99635258, 1.00000000, 0.99635258, 0.98548012, 0.96759014, 0.94302200, - 0.91223751, 0.87580811, 0.83439927, 0.78875245, 0.73966538, 0.68797126, - 0.63451750, 0.58014482, 0.52566725, 0.47185369, 0.41941150, 0.36897272, - 0.32108304, 0.27619388, 0.23465776, 0.19672670, 0.16255380, 0.13219758, - 0.10562887, 0.08273982, 0.06335451, 0.04724088, 0.03412321, 0.02369490, - 0.01563093, 0.00959968, 0.00527363, 0.00233883, 0.00050000, 0.00000000}; - -static const double kaiser6_table[36] = { - 0.99733006, 1.00000000, 0.99733006, 0.98935595, 0.97618418, 0.95799003, - 0.93501423, 0.90755855, 0.87598009, 0.84068475, 0.80211977, 0.76076565, - 0.71712752, 0.67172623, 0.62508937, 0.57774224, 0.53019925, 0.48295561, - 0.43647969, 0.39120616, 0.34752997, 0.30580127, 0.26632152, 0.22934058, - 0.19505503, 0.16360756, 0.13508755, 0.10953262, 0.08693120, 0.06722600, - 0.05031820, 0.03607231, 0.02432151, 0.01487334, 0.00752000, 0.00000000}; - -struct FuncDef { - const double *table; - int oversample; -}; - -static const struct FuncDef kaiser12_funcdef = {kaiser12_table, 64}; -#define KAISER12 (&kaiser12_funcdef) -static const struct FuncDef kaiser10_funcdef = {kaiser10_table, 32}; -#define KAISER10 (&kaiser10_funcdef) -static const struct FuncDef kaiser8_funcdef = {kaiser8_table, 32}; -#define KAISER8 (&kaiser8_funcdef) -static const struct FuncDef kaiser6_funcdef = {kaiser6_table, 32}; -#define KAISER6 (&kaiser6_funcdef) - -struct QualityMapping { - int base_length; - int oversample; - float downsample_bandwidth; - float upsample_bandwidth; - const struct FuncDef *window_func; -}; - - -/* This table maps conversion quality to internal parameters. There are two - reasons that explain why the up-sampling bandwidth is larger than the - down-sampling bandwidth: - 1) When up-sampling, we can assume that the spectrum is already attenuated - close to the Nyquist rate (from an A/D or a previous resampling filter) - 2) Any aliasing that occurs very close to the Nyquist rate will be masked - by the sinusoids/noise just below the Nyquist rate (guaranteed only for - up-sampling). -*/ -static const struct QualityMapping quality_map[11] = { - { 8, 4, 0.830f, 0.860f, KAISER6 }, /* Q0 */ - { 16, 4, 0.850f, 0.880f, KAISER6 }, /* Q1 */ - { 32, 4, 0.882f, 0.910f, KAISER6 }, /* Q2 */ /* 82.3% cutoff ( ~60 dB stop) 6 */ - { 48, 8, 0.895f, 0.917f, KAISER8 }, /* Q3 */ /* 84.9% cutoff ( ~80 dB stop) 8 */ - { 64, 8, 0.921f, 0.940f, KAISER8 }, /* Q4 */ /* 88.7% cutoff ( ~80 dB stop) 8 */ - { 80, 16, 0.922f, 0.940f, KAISER10}, /* Q5 */ /* 89.1% cutoff (~100 dB stop) 10 */ - { 96, 16, 0.940f, 0.945f, KAISER10}, /* Q6 */ /* 91.5% cutoff (~100 dB stop) 10 */ - {128, 16, 0.950f, 0.950f, KAISER10}, /* Q7 */ /* 93.1% cutoff (~100 dB stop) 10 */ - {160, 16, 0.960f, 0.960f, KAISER10}, /* Q8 */ /* 94.5% cutoff (~100 dB stop) 10 */ - {192, 32, 0.968f, 0.968f, KAISER12}, /* Q9 */ /* 95.5% cutoff (~100 dB stop) 10 */ - {256, 32, 0.975f, 0.975f, KAISER12}, /* Q10 */ /* 96.6% cutoff (~100 dB stop) 10 */ -}; -/*8,24,40,56,80,104,128,160,200,256,320*/ -static double compute_func(float x, const struct FuncDef *func) -{ - float y, frac; - double interp[4]; - int ind; - y = x*func->oversample; - ind = (int)floor(y); - frac = (y-ind); - /* CSE with handle the repeated powers */ - interp[3] = -0.1666666667*frac + 0.1666666667*(frac*frac*frac); - interp[2] = frac + 0.5*(frac*frac) - 0.5*(frac*frac*frac); - /*interp[2] = 1.f - 0.5f*frac - frac*frac + 0.5f*frac*frac*frac;*/ - interp[0] = -0.3333333333*frac + 0.5*(frac*frac) - 0.1666666667*(frac*frac*frac); - /* Just to make sure we don't have rounding problems */ - interp[1] = 1.f-interp[3]-interp[2]-interp[0]; - - /*sum = frac*accum[1] + (1-frac)*accum[2];*/ - return interp[0]*func->table[ind] + interp[1]*func->table[ind+1] + interp[2]*func->table[ind+2] + interp[3]*func->table[ind+3]; -} - -#if 0 -#include -int main(int argc, char **argv) -{ - int i; - for (i=0;i<256;i++) - { - printf ("%f\n", compute_func(i/256., KAISER12)); - } - return 0; -} -#endif - -#ifdef FIXED_POINT -/* The slow way of computing a sinc for the table. Should improve that some day */ -static spx_word16_t sinc(float cutoff, float x, int N, const struct FuncDef *window_func) -{ - /*fprintf (stderr, "%f ", x);*/ - float xx = x * cutoff; - if (fabs(x)<1e-6f) - return WORD2INT(32768.*cutoff); - else if (fabs(x) > .5f*N) - return 0; - /*FIXME: Can it really be any slower than this? */ - return WORD2INT(32768.*cutoff*sin(M_PI*xx)/(M_PI*xx) * compute_func(fabs(2.*x/N), window_func)); -} -#else -/* The slow way of computing a sinc for the table. Should improve that some day */ -static spx_word16_t sinc(float cutoff, float x, int N, const struct FuncDef *window_func) -{ - /*fprintf (stderr, "%f ", x);*/ - float xx = x * cutoff; - if (fabs(x)<1e-6) - return cutoff; - else if (fabs(x) > .5*N) - return 0; - /*FIXME: Can it really be any slower than this? */ - return cutoff*sin(M_PI*xx)/(M_PI*xx) * compute_func(fabs(2.*x/N), window_func); -} -#endif - -#ifdef FIXED_POINT -static void cubic_coef(spx_word16_t x, spx_word16_t interp[4]) -{ - /* Compute interpolation coefficients. I'm not sure whether this corresponds to cubic interpolation - but I know it's MMSE-optimal on a sinc */ - spx_word16_t x2, x3; - x2 = MULT16_16_P15(x, x); - x3 = MULT16_16_P15(x, x2); - interp[0] = PSHR32(MULT16_16(QCONST16(-0.16667f, 15),x) + MULT16_16(QCONST16(0.16667f, 15),x3),15); - interp[1] = EXTRACT16(EXTEND32(x) + SHR32(SUB32(EXTEND32(x2),EXTEND32(x3)),1)); - interp[3] = PSHR32(MULT16_16(QCONST16(-0.33333f, 15),x) + MULT16_16(QCONST16(.5f,15),x2) - MULT16_16(QCONST16(0.16667f, 15),x3),15); - /* Just to make sure we don't have rounding problems */ - interp[2] = Q15_ONE-interp[0]-interp[1]-interp[3]; - if (interp[2]<32767) - interp[2]+=1; -} -#else -static void cubic_coef(spx_word16_t frac, spx_word16_t interp[4]) -{ - /* Compute interpolation coefficients. I'm not sure whether this corresponds to cubic interpolation - but I know it's MMSE-optimal on a sinc */ - interp[0] = -0.16667f*frac + 0.16667f*frac*frac*frac; - interp[1] = frac + 0.5f*frac*frac - 0.5f*frac*frac*frac; - /*interp[2] = 1.f - 0.5f*frac - frac*frac + 0.5f*frac*frac*frac;*/ - interp[3] = -0.33333f*frac + 0.5f*frac*frac - 0.16667f*frac*frac*frac; - /* Just to make sure we don't have rounding problems */ - interp[2] = 1.-interp[0]-interp[1]-interp[3]; -} -#endif - -static int resampler_basic_direct_single(SpeexResamplerState *st, spx_uint32_t channel_index, const spx_word16_t *in, spx_uint32_t *in_len, spx_word16_t *out, spx_uint32_t *out_len) -{ - const int N = st->filt_len; - int out_sample = 0; - int last_sample = st->last_sample[channel_index]; - spx_uint32_t samp_frac_num = st->samp_frac_num[channel_index]; - const spx_word16_t *sinc_table = st->sinc_table; - const int out_stride = st->out_stride; - const int int_advance = st->int_advance; - const int frac_advance = st->frac_advance; - const spx_uint32_t den_rate = st->den_rate; - spx_word32_t sum; - - while (!(last_sample >= (spx_int32_t)*in_len || out_sample >= (spx_int32_t)*out_len)) - { - const spx_word16_t *sinct = & sinc_table[samp_frac_num*N]; - const spx_word16_t *iptr = & in[last_sample]; - -#ifndef OVERRIDE_INNER_PRODUCT_SINGLE - int j; - sum = 0; - for(j=0;j= den_rate) - { - samp_frac_num -= den_rate; - last_sample++; - } - } - - st->last_sample[channel_index] = last_sample; - st->samp_frac_num[channel_index] = samp_frac_num; - return out_sample; -} - -#ifdef FIXED_POINT -#else -/* This is the same as the previous function, except with a double-precision accumulator */ -static int resampler_basic_direct_double(SpeexResamplerState *st, spx_uint32_t channel_index, const spx_word16_t *in, spx_uint32_t *in_len, spx_word16_t *out, spx_uint32_t *out_len) -{ - const int N = st->filt_len; - int out_sample = 0; - int last_sample = st->last_sample[channel_index]; - spx_uint32_t samp_frac_num = st->samp_frac_num[channel_index]; - const spx_word16_t *sinc_table = st->sinc_table; - const int out_stride = st->out_stride; - const int int_advance = st->int_advance; - const int frac_advance = st->frac_advance; - const spx_uint32_t den_rate = st->den_rate; - double sum; - - while (!(last_sample >= (spx_int32_t)*in_len || out_sample >= (spx_int32_t)*out_len)) - { - const spx_word16_t *sinct = & sinc_table[samp_frac_num*N]; - const spx_word16_t *iptr = & in[last_sample]; - -#ifndef OVERRIDE_INNER_PRODUCT_DOUBLE - int j; - double accum[4] = {0,0,0,0}; - - for(j=0;j= den_rate) - { - samp_frac_num -= den_rate; - last_sample++; - } - } - - st->last_sample[channel_index] = last_sample; - st->samp_frac_num[channel_index] = samp_frac_num; - return out_sample; -} -#endif - -static int resampler_basic_interpolate_single(SpeexResamplerState *st, spx_uint32_t channel_index, const spx_word16_t *in, spx_uint32_t *in_len, spx_word16_t *out, spx_uint32_t *out_len) -{ - const int N = st->filt_len; - int out_sample = 0; - int last_sample = st->last_sample[channel_index]; - spx_uint32_t samp_frac_num = st->samp_frac_num[channel_index]; - const int out_stride = st->out_stride; - const int int_advance = st->int_advance; - const int frac_advance = st->frac_advance; - const spx_uint32_t den_rate = st->den_rate; - spx_word32_t sum; - - while (!(last_sample >= (spx_int32_t)*in_len || out_sample >= (spx_int32_t)*out_len)) - { - const spx_word16_t *iptr = & in[last_sample]; - - const int offset = samp_frac_num*st->oversample/st->den_rate; -#ifdef FIXED_POINT - const spx_word16_t frac = PDIV32(SHL32((samp_frac_num*st->oversample) % st->den_rate,15),st->den_rate); -#else - const spx_word16_t frac = ((float)((samp_frac_num*st->oversample) % st->den_rate))/st->den_rate; -#endif - spx_word16_t interp[4]; - - -#ifndef OVERRIDE_INTERPOLATE_PRODUCT_SINGLE - int j; - spx_word32_t accum[4] = {0,0,0,0}; - - for(j=0;jsinc_table[4+(j+1)*st->oversample-offset-2]); - accum[1] += MULT16_16(curr_in,st->sinc_table[4+(j+1)*st->oversample-offset-1]); - accum[2] += MULT16_16(curr_in,st->sinc_table[4+(j+1)*st->oversample-offset]); - accum[3] += MULT16_16(curr_in,st->sinc_table[4+(j+1)*st->oversample-offset+1]); - } - - cubic_coef(frac, interp); - sum = MULT16_32_Q15(interp[0],SHR32(accum[0], 1)) + MULT16_32_Q15(interp[1],SHR32(accum[1], 1)) + MULT16_32_Q15(interp[2],SHR32(accum[2], 1)) + MULT16_32_Q15(interp[3],SHR32(accum[3], 1)); - sum = SATURATE32PSHR(sum, 15, 32767); -#else - cubic_coef(frac, interp); - sum = interpolate_product_single(iptr, st->sinc_table + st->oversample + 4 - offset - 2, N, st->oversample, interp); -#endif - - out[out_stride * out_sample++] = sum; - last_sample += int_advance; - samp_frac_num += frac_advance; - if (samp_frac_num >= den_rate) - { - samp_frac_num -= den_rate; - last_sample++; - } - } - - st->last_sample[channel_index] = last_sample; - st->samp_frac_num[channel_index] = samp_frac_num; - return out_sample; -} - -#ifdef FIXED_POINT -#else -/* This is the same as the previous function, except with a double-precision accumulator */ -static int resampler_basic_interpolate_double(SpeexResamplerState *st, spx_uint32_t channel_index, const spx_word16_t *in, spx_uint32_t *in_len, spx_word16_t *out, spx_uint32_t *out_len) -{ - const int N = st->filt_len; - int out_sample = 0; - int last_sample = st->last_sample[channel_index]; - spx_uint32_t samp_frac_num = st->samp_frac_num[channel_index]; - const int out_stride = st->out_stride; - const int int_advance = st->int_advance; - const int frac_advance = st->frac_advance; - const spx_uint32_t den_rate = st->den_rate; - spx_word32_t sum; - - while (!(last_sample >= (spx_int32_t)*in_len || out_sample >= (spx_int32_t)*out_len)) - { - const spx_word16_t *iptr = & in[last_sample]; - - const int offset = samp_frac_num*st->oversample/st->den_rate; -#ifdef FIXED_POINT - const spx_word16_t frac = PDIV32(SHL32((samp_frac_num*st->oversample) % st->den_rate,15),st->den_rate); -#else - const spx_word16_t frac = ((float)((samp_frac_num*st->oversample) % st->den_rate))/st->den_rate; -#endif - spx_word16_t interp[4]; - - -#ifndef OVERRIDE_INTERPOLATE_PRODUCT_DOUBLE - int j; - double accum[4] = {0,0,0,0}; - - for(j=0;jsinc_table[4+(j+1)*st->oversample-offset-2]); - accum[1] += MULT16_16(curr_in,st->sinc_table[4+(j+1)*st->oversample-offset-1]); - accum[2] += MULT16_16(curr_in,st->sinc_table[4+(j+1)*st->oversample-offset]); - accum[3] += MULT16_16(curr_in,st->sinc_table[4+(j+1)*st->oversample-offset+1]); - } - - cubic_coef(frac, interp); - sum = MULT16_32_Q15(interp[0],accum[0]) + MULT16_32_Q15(interp[1],accum[1]) + MULT16_32_Q15(interp[2],accum[2]) + MULT16_32_Q15(interp[3],accum[3]); -#else - cubic_coef(frac, interp); - sum = interpolate_product_double(iptr, st->sinc_table + st->oversample + 4 - offset - 2, N, st->oversample, interp); -#endif - - out[out_stride * out_sample++] = PSHR32(sum,15); - last_sample += int_advance; - samp_frac_num += frac_advance; - if (samp_frac_num >= den_rate) - { - samp_frac_num -= den_rate; - last_sample++; - } - } - - st->last_sample[channel_index] = last_sample; - st->samp_frac_num[channel_index] = samp_frac_num; - return out_sample; -} -#endif - -/* This resampler is used to produce zero output in situations where memory - for the filter could not be allocated. The expected numbers of input and - output samples are still processed so that callers failing to check error - codes are not surprised, possibly getting into infinite loops. */ -static int resampler_basic_zero(SpeexResamplerState *st, spx_uint32_t channel_index, const spx_word16_t *in, spx_uint32_t *in_len, spx_word16_t *out, spx_uint32_t *out_len) -{ - int out_sample = 0; - int last_sample = st->last_sample[channel_index]; - spx_uint32_t samp_frac_num = st->samp_frac_num[channel_index]; - const int out_stride = st->out_stride; - const int int_advance = st->int_advance; - const int frac_advance = st->frac_advance; - const spx_uint32_t den_rate = st->den_rate; - - (void)in; - while (!(last_sample >= (spx_int32_t)*in_len || out_sample >= (spx_int32_t)*out_len)) - { - out[out_stride * out_sample++] = 0; - last_sample += int_advance; - samp_frac_num += frac_advance; - if (samp_frac_num >= den_rate) - { - samp_frac_num -= den_rate; - last_sample++; - } - } - - st->last_sample[channel_index] = last_sample; - st->samp_frac_num[channel_index] = samp_frac_num; - return out_sample; -} - -static int multiply_frac(spx_uint32_t *result, spx_uint32_t value, spx_uint32_t num, spx_uint32_t den) -{ - spx_uint32_t major = value / den; - spx_uint32_t remain = value % den; - /* TODO: Could use 64 bits operation to check for overflow. But only guaranteed in C99+ */ - if (remain > UINT32_MAX / num || major > UINT32_MAX / num - || major * num > UINT32_MAX - remain * num / den) - return RESAMPLER_ERR_OVERFLOW; - *result = remain * num / den + major * num; - return RESAMPLER_ERR_SUCCESS; -} - -static int update_filter(SpeexResamplerState *st) -{ - spx_uint32_t old_length = st->filt_len; - spx_uint32_t old_alloc_size = st->mem_alloc_size; - int use_direct; - spx_uint32_t min_sinc_table_length; - spx_uint32_t min_alloc_size; - - st->int_advance = st->num_rate/st->den_rate; - st->frac_advance = st->num_rate%st->den_rate; - st->oversample = quality_map[st->quality].oversample; - st->filt_len = quality_map[st->quality].base_length; - - if (st->num_rate > st->den_rate) - { - /* down-sampling */ - st->cutoff = quality_map[st->quality].downsample_bandwidth * st->den_rate / st->num_rate; - if (multiply_frac(&st->filt_len,st->filt_len,st->num_rate,st->den_rate) != RESAMPLER_ERR_SUCCESS) - goto fail; - /* Round up to make sure we have a multiple of 8 for SSE */ - st->filt_len = ((st->filt_len-1)&(~0x7))+8; - if (2*st->den_rate < st->num_rate) - st->oversample >>= 1; - if (4*st->den_rate < st->num_rate) - st->oversample >>= 1; - if (8*st->den_rate < st->num_rate) - st->oversample >>= 1; - if (16*st->den_rate < st->num_rate) - st->oversample >>= 1; - if (st->oversample < 1) - st->oversample = 1; - } else { - /* up-sampling */ - st->cutoff = quality_map[st->quality].upsample_bandwidth; - } - -#ifdef RESAMPLE_FULL_SINC_TABLE - use_direct = 1; - if (INT_MAX/sizeof(spx_word16_t)/st->den_rate < st->filt_len) - goto fail; -#else - /* Choose the resampling type that requires the least amount of memory */ - use_direct = st->filt_len*st->den_rate <= st->filt_len*st->oversample+8 - && INT_MAX/sizeof(spx_word16_t)/st->den_rate >= st->filt_len; -#endif - if (use_direct) - { - min_sinc_table_length = st->filt_len*st->den_rate; - } else { - if ((INT_MAX/sizeof(spx_word16_t)-8)/st->oversample < st->filt_len) - goto fail; - - min_sinc_table_length = st->filt_len*st->oversample+8; - } - if (st->sinc_table_length < min_sinc_table_length) - { - spx_word16_t *sinc_table = (spx_word16_t *)speex_realloc(st->sinc_table,min_sinc_table_length*sizeof(spx_word16_t)); - if (!sinc_table) - goto fail; - - st->sinc_table = sinc_table; - st->sinc_table_length = min_sinc_table_length; - } - if (use_direct) - { - spx_uint32_t i; - for (i=0;iden_rate;i++) - { - spx_int32_t j; - for (j=0;jfilt_len;j++) - { - st->sinc_table[i*st->filt_len+j] = sinc(st->cutoff,((j-(spx_int32_t)st->filt_len/2+1)-((float)i)/st->den_rate), st->filt_len, quality_map[st->quality].window_func); - } - } -#ifdef FIXED_POINT - st->resampler_ptr = resampler_basic_direct_single; -#else - if (st->quality>8) - st->resampler_ptr = resampler_basic_direct_double; - else - st->resampler_ptr = resampler_basic_direct_single; -#endif - /*fprintf (stderr, "resampler uses direct sinc table and normalised cutoff %f\n", cutoff);*/ - } else { - spx_int32_t i; - for (i=-4;i<(spx_int32_t)(st->oversample*st->filt_len+4);i++) - st->sinc_table[i+4] = sinc(st->cutoff,(i/(float)st->oversample - st->filt_len/2), st->filt_len, quality_map[st->quality].window_func); -#ifdef FIXED_POINT - st->resampler_ptr = resampler_basic_interpolate_single; -#else - if (st->quality>8) - st->resampler_ptr = resampler_basic_interpolate_double; - else - st->resampler_ptr = resampler_basic_interpolate_single; -#endif - /*fprintf (stderr, "resampler uses interpolated sinc table and normalised cutoff %f\n", cutoff);*/ - } - - /* Here's the place where we update the filter memory to take into account - the change in filter length. It's probably the messiest part of the code - due to handling of lots of corner cases. */ - - /* Adding buffer_size to filt_len won't overflow here because filt_len - could be multiplied by sizeof(spx_word16_t) above. */ - min_alloc_size = st->filt_len-1 + st->buffer_size; - if (min_alloc_size > st->mem_alloc_size) - { - spx_word16_t *mem; - if (INT_MAX/sizeof(spx_word16_t)/st->nb_channels < min_alloc_size) - goto fail; - else if (!(mem = (spx_word16_t*)speex_realloc(st->mem, st->nb_channels*min_alloc_size * sizeof(*mem)))) - goto fail; - - st->mem = mem; - st->mem_alloc_size = min_alloc_size; - } - if (!st->started) - { - spx_uint32_t i; - for (i=0;inb_channels*st->mem_alloc_size;i++) - st->mem[i] = 0; - /*speex_warning("reinit filter");*/ - } else if (st->filt_len > old_length) - { - spx_uint32_t i; - /* Increase the filter length */ - /*speex_warning("increase filter size");*/ - for (i=st->nb_channels;i--;) - { - spx_uint32_t j; - spx_uint32_t olen = old_length; - /*if (st->magic_samples[i])*/ - { - /* Try and remove the magic samples as if nothing had happened */ - - /* FIXME: This is wrong but for now we need it to avoid going over the array bounds */ - olen = old_length + 2*st->magic_samples[i]; - for (j=old_length-1+st->magic_samples[i];j--;) - st->mem[i*st->mem_alloc_size+j+st->magic_samples[i]] = st->mem[i*old_alloc_size+j]; - for (j=0;jmagic_samples[i];j++) - st->mem[i*st->mem_alloc_size+j] = 0; - st->magic_samples[i] = 0; - } - if (st->filt_len > olen) - { - /* If the new filter length is still bigger than the "augmented" length */ - /* Copy data going backward */ - for (j=0;jmem[i*st->mem_alloc_size+(st->filt_len-2-j)] = st->mem[i*st->mem_alloc_size+(olen-2-j)]; - /* Then put zeros for lack of anything better */ - for (;jfilt_len-1;j++) - st->mem[i*st->mem_alloc_size+(st->filt_len-2-j)] = 0; - /* Adjust last_sample */ - st->last_sample[i] += (st->filt_len - olen)/2; - } else { - /* Put back some of the magic! */ - st->magic_samples[i] = (olen - st->filt_len)/2; - for (j=0;jfilt_len-1+st->magic_samples[i];j++) - st->mem[i*st->mem_alloc_size+j] = st->mem[i*st->mem_alloc_size+j+st->magic_samples[i]]; - } - } - } else if (st->filt_len < old_length) - { - spx_uint32_t i; - /* Reduce filter length, this a bit tricky. We need to store some of the memory as "magic" - samples so they can be used directly as input the next time(s) */ - for (i=0;inb_channels;i++) - { - spx_uint32_t j; - spx_uint32_t old_magic = st->magic_samples[i]; - st->magic_samples[i] = (old_length - st->filt_len)/2; - /* We must copy some of the memory that's no longer used */ - /* Copy data going backward */ - for (j=0;jfilt_len-1+st->magic_samples[i]+old_magic;j++) - st->mem[i*st->mem_alloc_size+j] = st->mem[i*st->mem_alloc_size+j+st->magic_samples[i]]; - st->magic_samples[i] += old_magic; - } - } - return RESAMPLER_ERR_SUCCESS; - -fail: - st->resampler_ptr = resampler_basic_zero; - /* st->mem may still contain consumed input samples for the filter. - Restore filt_len so that filt_len - 1 still points to the position after - the last of these samples. */ - st->filt_len = old_length; - return RESAMPLER_ERR_ALLOC_FAILED; -} - -EXPORT SpeexResamplerState *speex_resampler_init(spx_uint32_t nb_channels, spx_uint32_t in_rate, spx_uint32_t out_rate, int quality, int *err) -{ - return speex_resampler_init_frac(nb_channels, in_rate, out_rate, in_rate, out_rate, quality, err); -} - -EXPORT SpeexResamplerState *speex_resampler_init_frac(spx_uint32_t nb_channels, spx_uint32_t ratio_num, spx_uint32_t ratio_den, spx_uint32_t in_rate, spx_uint32_t out_rate, int quality, int *err) -{ - SpeexResamplerState *st; - int filter_err; - - if (nb_channels == 0 || ratio_num == 0 || ratio_den == 0 || quality > 10 || quality < 0) - { - if (err) - *err = RESAMPLER_ERR_INVALID_ARG; - return NULL; - } - st = (SpeexResamplerState *)speex_alloc(sizeof(SpeexResamplerState)); - if (!st) - { - if (err) - *err = RESAMPLER_ERR_ALLOC_FAILED; - return NULL; - } - st->initialised = 0; - st->started = 0; - st->in_rate = 0; - st->out_rate = 0; - st->num_rate = 0; - st->den_rate = 0; - st->quality = -1; - st->sinc_table_length = 0; - st->mem_alloc_size = 0; - st->filt_len = 0; - st->mem = 0; - st->resampler_ptr = 0; - - st->cutoff = 1.f; - st->nb_channels = nb_channels; - st->in_stride = 1; - st->out_stride = 1; - - st->buffer_size = 160; - - /* Per channel data */ - if (!(st->last_sample = (spx_int32_t*)speex_alloc(nb_channels*sizeof(spx_int32_t)))) - goto fail; - if (!(st->magic_samples = (spx_uint32_t*)speex_alloc(nb_channels*sizeof(spx_uint32_t)))) - goto fail; - if (!(st->samp_frac_num = (spx_uint32_t*)speex_alloc(nb_channels*sizeof(spx_uint32_t)))) - goto fail; - - speex_resampler_set_quality(st, quality); - speex_resampler_set_rate_frac(st, ratio_num, ratio_den, in_rate, out_rate); - - filter_err = update_filter(st); - if (filter_err == RESAMPLER_ERR_SUCCESS) - { - st->initialised = 1; - } else { - speex_resampler_destroy(st); - st = NULL; - } - if (err) - *err = filter_err; - - return st; - -fail: - if (err) - *err = RESAMPLER_ERR_ALLOC_FAILED; - speex_resampler_destroy(st); - return NULL; -} - -EXPORT void speex_resampler_destroy(SpeexResamplerState *st) -{ - speex_free(st->mem); - speex_free(st->sinc_table); - speex_free(st->last_sample); - speex_free(st->magic_samples); - speex_free(st->samp_frac_num); - speex_free(st); -} - -static int speex_resampler_process_native(SpeexResamplerState *st, spx_uint32_t channel_index, spx_uint32_t *in_len, spx_word16_t *out, spx_uint32_t *out_len) -{ - int j=0; - const int N = st->filt_len; - int out_sample = 0; - spx_word16_t *mem = st->mem + channel_index * st->mem_alloc_size; - spx_uint32_t ilen; - - st->started = 1; - - /* Call the right resampler through the function ptr */ - out_sample = st->resampler_ptr(st, channel_index, mem, in_len, out, out_len); - - if (st->last_sample[channel_index] < (spx_int32_t)*in_len) - *in_len = st->last_sample[channel_index]; - *out_len = out_sample; - st->last_sample[channel_index] -= *in_len; - - ilen = *in_len; - - for(j=0;jmagic_samples[channel_index]; - spx_word16_t *mem = st->mem + channel_index * st->mem_alloc_size; - const int N = st->filt_len; - - speex_resampler_process_native(st, channel_index, &tmp_in_len, *out, &out_len); - - st->magic_samples[channel_index] -= tmp_in_len; - - /* If we couldn't process all "magic" input samples, save the rest for next time */ - if (st->magic_samples[channel_index]) - { - spx_uint32_t i; - for (i=0;imagic_samples[channel_index];i++) - mem[N-1+i]=mem[N-1+i+tmp_in_len]; - } - *out += out_len*st->out_stride; - return out_len; -} - -#ifdef FIXED_POINT -EXPORT int speex_resampler_process_int(SpeexResamplerState *st, spx_uint32_t channel_index, const spx_int16_t *in, spx_uint32_t *in_len, spx_int16_t *out, spx_uint32_t *out_len) -#else -EXPORT int speex_resampler_process_float(SpeexResamplerState *st, spx_uint32_t channel_index, const float *in, spx_uint32_t *in_len, float *out, spx_uint32_t *out_len) -#endif -{ - int j; - spx_uint32_t ilen = *in_len; - spx_uint32_t olen = *out_len; - spx_word16_t *x = st->mem + channel_index * st->mem_alloc_size; - const int filt_offs = st->filt_len - 1; - const spx_uint32_t xlen = st->mem_alloc_size - filt_offs; - const int istride = st->in_stride; - - if (st->magic_samples[channel_index]) - olen -= speex_resampler_magic(st, channel_index, &out, olen); - if (! st->magic_samples[channel_index]) { - while (ilen && olen) { - spx_uint32_t ichunk = (ilen > xlen) ? xlen : ilen; - spx_uint32_t ochunk = olen; - - if (in) { - for(j=0;jout_stride; - if (in) - in += ichunk * istride; - } - } - *in_len -= ilen; - *out_len -= olen; - return st->resampler_ptr == resampler_basic_zero ? RESAMPLER_ERR_ALLOC_FAILED : RESAMPLER_ERR_SUCCESS; -} - -#ifdef FIXED_POINT -EXPORT int speex_resampler_process_float(SpeexResamplerState *st, spx_uint32_t channel_index, const float *in, spx_uint32_t *in_len, float *out, spx_uint32_t *out_len) -#else -EXPORT int speex_resampler_process_int(SpeexResamplerState *st, spx_uint32_t channel_index, const spx_int16_t *in, spx_uint32_t *in_len, spx_int16_t *out, spx_uint32_t *out_len) -#endif -{ - int j; - const int istride_save = st->in_stride; - const int ostride_save = st->out_stride; - spx_uint32_t ilen = *in_len; - spx_uint32_t olen = *out_len; - spx_word16_t *x = st->mem + channel_index * st->mem_alloc_size; - const spx_uint32_t xlen = st->mem_alloc_size - (st->filt_len - 1); -#ifdef VAR_ARRAYS - const unsigned int ylen = (olen < FIXED_STACK_ALLOC) ? olen : FIXED_STACK_ALLOC; - spx_word16_t ystack[ylen]; -#else - const unsigned int ylen = FIXED_STACK_ALLOC; - spx_word16_t ystack[FIXED_STACK_ALLOC]; -#endif - - st->out_stride = 1; - - while (ilen && olen) { - spx_word16_t *y = ystack; - spx_uint32_t ichunk = (ilen > xlen) ? xlen : ilen; - spx_uint32_t ochunk = (olen > ylen) ? ylen : olen; - spx_uint32_t omagic = 0; - - if (st->magic_samples[channel_index]) { - omagic = speex_resampler_magic(st, channel_index, &y, ochunk); - ochunk -= omagic; - olen -= omagic; - } - if (! st->magic_samples[channel_index]) { - if (in) { - for(j=0;jfilt_len-1]=WORD2INT(in[j*istride_save]); -#else - x[j+st->filt_len-1]=in[j*istride_save]; -#endif - } else { - for(j=0;jfilt_len-1]=0; - } - - speex_resampler_process_native(st, channel_index, &ichunk, y, &ochunk); - } else { - ichunk = 0; - ochunk = 0; - } - - for (j=0;jout_stride = ostride_save; - *in_len -= ilen; - *out_len -= olen; - - return st->resampler_ptr == resampler_basic_zero ? RESAMPLER_ERR_ALLOC_FAILED : RESAMPLER_ERR_SUCCESS; -} - -EXPORT int speex_resampler_process_interleaved_float(SpeexResamplerState *st, const float *in, spx_uint32_t *in_len, float *out, spx_uint32_t *out_len) -{ - spx_uint32_t i; - int istride_save, ostride_save; - spx_uint32_t bak_out_len = *out_len; - spx_uint32_t bak_in_len = *in_len; - istride_save = st->in_stride; - ostride_save = st->out_stride; - st->in_stride = st->out_stride = st->nb_channels; - for (i=0;inb_channels;i++) - { - *out_len = bak_out_len; - *in_len = bak_in_len; - if (in != NULL) - speex_resampler_process_float(st, i, in+i, in_len, out+i, out_len); - else - speex_resampler_process_float(st, i, NULL, in_len, out+i, out_len); - } - st->in_stride = istride_save; - st->out_stride = ostride_save; - return st->resampler_ptr == resampler_basic_zero ? RESAMPLER_ERR_ALLOC_FAILED : RESAMPLER_ERR_SUCCESS; -} - -EXPORT int speex_resampler_process_interleaved_int(SpeexResamplerState *st, const spx_int16_t *in, spx_uint32_t *in_len, spx_int16_t *out, spx_uint32_t *out_len) -{ - spx_uint32_t i; - int istride_save, ostride_save; - spx_uint32_t bak_out_len = *out_len; - spx_uint32_t bak_in_len = *in_len; - istride_save = st->in_stride; - ostride_save = st->out_stride; - st->in_stride = st->out_stride = st->nb_channels; - for (i=0;inb_channels;i++) - { - *out_len = bak_out_len; - *in_len = bak_in_len; - if (in != NULL) - speex_resampler_process_int(st, i, in+i, in_len, out+i, out_len); - else - speex_resampler_process_int(st, i, NULL, in_len, out+i, out_len); - } - st->in_stride = istride_save; - st->out_stride = ostride_save; - return st->resampler_ptr == resampler_basic_zero ? RESAMPLER_ERR_ALLOC_FAILED : RESAMPLER_ERR_SUCCESS; -} - -EXPORT int speex_resampler_set_rate(SpeexResamplerState *st, spx_uint32_t in_rate, spx_uint32_t out_rate) -{ - return speex_resampler_set_rate_frac(st, in_rate, out_rate, in_rate, out_rate); -} - -EXPORT void speex_resampler_get_rate(SpeexResamplerState *st, spx_uint32_t *in_rate, spx_uint32_t *out_rate) -{ - *in_rate = st->in_rate; - *out_rate = st->out_rate; -} - -static inline spx_uint32_t compute_gcd(spx_uint32_t a, spx_uint32_t b) -{ - while (b != 0) - { - spx_uint32_t temp = a; - - a = b; - b = temp % b; - } - return a; -} - -EXPORT int speex_resampler_set_rate_frac(SpeexResamplerState *st, spx_uint32_t ratio_num, spx_uint32_t ratio_den, spx_uint32_t in_rate, spx_uint32_t out_rate) -{ - spx_uint32_t fact; - spx_uint32_t old_den; - spx_uint32_t i; - - if (ratio_num == 0 || ratio_den == 0) - return RESAMPLER_ERR_INVALID_ARG; - - if (st->in_rate == in_rate && st->out_rate == out_rate && st->num_rate == ratio_num && st->den_rate == ratio_den) - return RESAMPLER_ERR_SUCCESS; - - old_den = st->den_rate; - st->in_rate = in_rate; - st->out_rate = out_rate; - st->num_rate = ratio_num; - st->den_rate = ratio_den; - - fact = compute_gcd(st->num_rate, st->den_rate); - - st->num_rate /= fact; - st->den_rate /= fact; - - if (old_den > 0) - { - for (i=0;inb_channels;i++) - { - if (multiply_frac(&st->samp_frac_num[i],st->samp_frac_num[i],st->den_rate,old_den) != RESAMPLER_ERR_SUCCESS) - return RESAMPLER_ERR_OVERFLOW; - /* Safety net */ - if (st->samp_frac_num[i] >= st->den_rate) - st->samp_frac_num[i] = st->den_rate-1; - } - } - - if (st->initialised) - return update_filter(st); - return RESAMPLER_ERR_SUCCESS; -} - -EXPORT void speex_resampler_get_ratio(SpeexResamplerState *st, spx_uint32_t *ratio_num, spx_uint32_t *ratio_den) -{ - *ratio_num = st->num_rate; - *ratio_den = st->den_rate; -} - -EXPORT int speex_resampler_set_quality(SpeexResamplerState *st, int quality) -{ - if (quality > 10 || quality < 0) - return RESAMPLER_ERR_INVALID_ARG; - if (st->quality == quality) - return RESAMPLER_ERR_SUCCESS; - st->quality = quality; - if (st->initialised) - return update_filter(st); - return RESAMPLER_ERR_SUCCESS; -} - -EXPORT void speex_resampler_get_quality(SpeexResamplerState *st, int *quality) -{ - *quality = st->quality; -} - -EXPORT void speex_resampler_set_input_stride(SpeexResamplerState *st, spx_uint32_t stride) -{ - st->in_stride = stride; -} - -EXPORT void speex_resampler_get_input_stride(SpeexResamplerState *st, spx_uint32_t *stride) -{ - *stride = st->in_stride; -} - -EXPORT void speex_resampler_set_output_stride(SpeexResamplerState *st, spx_uint32_t stride) -{ - st->out_stride = stride; -} - -EXPORT void speex_resampler_get_output_stride(SpeexResamplerState *st, spx_uint32_t *stride) -{ - *stride = st->out_stride; -} - -EXPORT int speex_resampler_get_input_latency(SpeexResamplerState *st) -{ - return st->filt_len / 2; -} - -EXPORT int speex_resampler_get_output_latency(SpeexResamplerState *st) -{ - return ((st->filt_len / 2) * st->den_rate + (st->num_rate >> 1)) / st->num_rate; -} - -EXPORT int speex_resampler_skip_zeros(SpeexResamplerState *st) -{ - spx_uint32_t i; - for (i=0;inb_channels;i++) - st->last_sample[i] = st->filt_len/2; - return RESAMPLER_ERR_SUCCESS; -} - -EXPORT int speex_resampler_reset_mem(SpeexResamplerState *st) -{ - spx_uint32_t i; - for (i=0;inb_channels;i++) - { - st->last_sample[i] = 0; - st->magic_samples[i] = 0; - st->samp_frac_num[i] = 0; - } - for (i=0;inb_channels*st->mem_alloc_size;i++) - st->mem[i] = 0; - return RESAMPLER_ERR_SUCCESS; -} - -EXPORT const char *speex_resampler_strerror(int err) -{ - switch (err) - { - case RESAMPLER_ERR_SUCCESS: - return "Success."; - case RESAMPLER_ERR_ALLOC_FAILED: - return "Memory allocation failed."; - case RESAMPLER_ERR_BAD_STATE: - return "Bad resampler state."; - case RESAMPLER_ERR_INVALID_ARG: - return "Invalid argument."; - case RESAMPLER_ERR_PTR_OVERLAP: - return "Input and output buffers overlap."; - default: - return "Unknown error. Bad error code or strange version mismatch."; - } -} diff --git a/speex/libspeexdsp/resample_neon.h b/speex/libspeexdsp/resample_neon.h deleted file mode 100644 index e14ffe197194d12ebb45b912ad8462bb1ff479bd..0000000000000000000000000000000000000000 --- a/speex/libspeexdsp/resample_neon.h +++ /dev/null @@ -1,339 +0,0 @@ -/* Copyright (C) 2007-2008 Jean-Marc Valin - * Copyright (C) 2008 Thorvald Natvig - * Copyright (C) 2011 Texas Instruments - * author Jyri Sarha - */ -/** - @file resample_neon.h - @brief Resampler functions (NEON version) -*/ -/* - 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 FIXED_POINT -#if defined(__aarch64__) -static inline int32_t saturate_32bit_to_16bit(int32_t a) { - int32_t ret; - asm ("fmov s0, %w[a]\n" - "sqxtn h0, s0\n" - "sxtl v0.4s, v0.4h\n" - "fmov %w[ret], s0\n" - : [ret] "=r" (ret) - : [a] "r" (a) - : "v0" ); - return ret; -} -#elif defined(__thumb2__) -static inline int32_t saturate_32bit_to_16bit(int32_t a) { - int32_t ret; - asm ("ssat %[ret], #16, %[a]" - : [ret] "=r" (ret) - : [a] "r" (a) - : ); - return ret; -} -#else -static inline int32_t saturate_32bit_to_16bit(int32_t a) { - int32_t ret; - asm ("vmov.s32 d0[0], %[a]\n" - "vqmovn.s32 d0, q0\n" - "vmov.s16 %[ret], d0[0]\n" - : [ret] "=r" (ret) - : [a] "r" (a) - : "q0"); - return ret; -} -#endif -#undef WORD2INT -#define WORD2INT(x) (saturate_32bit_to_16bit(x)) - -#define OVERRIDE_INNER_PRODUCT_SINGLE -/* Only works when len % 4 == 0 and len >= 4 */ -#if defined(__aarch64__) -static inline int32_t inner_product_single(const int16_t *a, const int16_t *b, unsigned int len) -{ - int32_t ret; - uint32_t remainder = len % 16; - len = len - remainder; - - asm volatile (" cmp %w[len], #0\n" - " b.ne 1f\n" - " ld1 {v16.4h}, [%[b]], #8\n" - " ld1 {v20.4h}, [%[a]], #8\n" - " subs %w[remainder], %w[remainder], #4\n" - " smull v0.4s, v16.4h, v20.4h\n" - " b.ne 4f\n" - " b 5f\n" - "1:" - " ld1 {v16.4h, v17.4h, v18.4h, v19.4h}, [%[b]], #32\n" - " ld1 {v20.4h, v21.4h, v22.4h, v23.4h}, [%[a]], #32\n" - " subs %w[len], %w[len], #16\n" - " smull v0.4s, v16.4h, v20.4h\n" - " smlal v0.4s, v17.4h, v21.4h\n" - " smlal v0.4s, v18.4h, v22.4h\n" - " smlal v0.4s, v19.4h, v23.4h\n" - " b.eq 3f\n" - "2:" - " ld1 {v16.4h, v17.4h, v18.4h, v19.4h}, [%[b]], #32\n" - " ld1 {v20.4h, v21.4h, v22.4h, v23.4h}, [%[a]], #32\n" - " subs %w[len], %w[len], #16\n" - " smlal v0.4s, v16.4h, v20.4h\n" - " smlal v0.4s, v17.4h, v21.4h\n" - " smlal v0.4s, v18.4h, v22.4h\n" - " smlal v0.4s, v19.4h, v23.4h\n" - " b.ne 2b\n" - "3:" - " cmp %w[remainder], #0\n" - " b.eq 5f\n" - "4:" - " ld1 {v18.4h}, [%[b]], #8\n" - " ld1 {v22.4h}, [%[a]], #8\n" - " subs %w[remainder], %w[remainder], #4\n" - " smlal v0.4s, v18.4h, v22.4h\n" - " b.ne 4b\n" - "5:" - " saddlv d0, v0.4s\n" - " sqxtn s0, d0\n" - " sqrshrn h0, s0, #15\n" - " sxtl v0.4s, v0.4h\n" - " fmov %w[ret], s0\n" - : [ret] "=r" (ret), [a] "+r" (a), [b] "+r" (b), - [len] "+r" (len), [remainder] "+r" (remainder) - : - : "cc", "v0", - "v16", "v17", "v18", "v19", "v20", "v21", "v22", "v23"); - return ret; -} -#else -static inline int32_t inner_product_single(const int16_t *a, const int16_t *b, unsigned int len) -{ - int32_t ret; - uint32_t remainder = len % 16; - len = len - remainder; - - asm volatile (" cmp %[len], #0\n" - " bne 1f\n" - " vld1.16 {d16}, [%[b]]!\n" - " vld1.16 {d20}, [%[a]]!\n" - " subs %[remainder], %[remainder], #4\n" - " vmull.s16 q0, d16, d20\n" - " beq 5f\n" - " b 4f\n" - "1:" - " vld1.16 {d16, d17, d18, d19}, [%[b]]!\n" - " vld1.16 {d20, d21, d22, d23}, [%[a]]!\n" - " subs %[len], %[len], #16\n" - " vmull.s16 q0, d16, d20\n" - " vmlal.s16 q0, d17, d21\n" - " vmlal.s16 q0, d18, d22\n" - " vmlal.s16 q0, d19, d23\n" - " beq 3f\n" - "2:" - " vld1.16 {d16, d17, d18, d19}, [%[b]]!\n" - " vld1.16 {d20, d21, d22, d23}, [%[a]]!\n" - " subs %[len], %[len], #16\n" - " vmlal.s16 q0, d16, d20\n" - " vmlal.s16 q0, d17, d21\n" - " vmlal.s16 q0, d18, d22\n" - " vmlal.s16 q0, d19, d23\n" - " bne 2b\n" - "3:" - " cmp %[remainder], #0\n" - " beq 5f\n" - "4:" - " vld1.16 {d16}, [%[b]]!\n" - " vld1.16 {d20}, [%[a]]!\n" - " subs %[remainder], %[remainder], #4\n" - " vmlal.s16 q0, d16, d20\n" - " bne 4b\n" - "5:" - " vaddl.s32 q0, d0, d1\n" - " vadd.s64 d0, d0, d1\n" - " vqmovn.s64 d0, q0\n" - " vqrshrn.s32 d0, q0, #15\n" - " vmov.s16 %[ret], d0[0]\n" - : [ret] "=r" (ret), [a] "+r" (a), [b] "+r" (b), - [len] "+r" (len), [remainder] "+r" (remainder) - : - : "cc", "q0", - "d16", "d17", "d18", "d19", "d20", "d21", "d22", "d23"); - - return ret; -} -#endif // !defined(__aarch64__) - -#elif defined(FLOATING_POINT) -#if defined(__aarch64__) -static inline int32_t saturate_float_to_16bit(float a) { - int32_t ret; - asm ("fcvtas s1, %s[a]\n" - "sqxtn h1, s1\n" - "sxtl v1.4s, v1.4h\n" - "fmov %w[ret], s1\n" - : [ret] "=r" (ret) - : [a] "w" (a) - : "v1"); - return ret; -} -#else -static inline int32_t saturate_float_to_16bit(float a) { - int32_t ret; - asm ("vmov.f32 d0[0], %[a]\n" - "vcvt.s32.f32 d0, d0, #15\n" - "vqrshrn.s32 d0, q0, #15\n" - "vmov.s16 %[ret], d0[0]\n" - : [ret] "=r" (ret) - : [a] "r" (a) - : "q0"); - return ret; -} -#endif - -#undef WORD2INT -#define WORD2INT(x) (saturate_float_to_16bit(x)) - -#define OVERRIDE_INNER_PRODUCT_SINGLE -/* Only works when len % 4 == 0 and len >= 4 */ -#if defined(__aarch64__) -static inline float inner_product_single(const float *a, const float *b, unsigned int len) -{ - float ret; - uint32_t remainder = len % 16; - len = len - remainder; - - asm volatile (" cmp %w[len], #0\n" - " b.ne 1f\n" - " ld1 {v16.4s}, [%[b]], #16\n" - " ld1 {v20.4s}, [%[a]], #16\n" - " subs %w[remainder], %w[remainder], #4\n" - " fmul v1.4s, v16.4s, v20.4s\n" - " b.ne 4f\n" - " b 5f\n" - "1:" - " ld1 {v16.4s, v17.4s, v18.4s, v19.4s}, [%[b]], #64\n" - " ld1 {v20.4s, v21.4s, v22.4s, v23.4s}, [%[a]], #64\n" - " subs %w[len], %w[len], #16\n" - " fmul v1.4s, v16.4s, v20.4s\n" - " fmul v2.4s, v17.4s, v21.4s\n" - " fmul v3.4s, v18.4s, v22.4s\n" - " fmul v4.4s, v19.4s, v23.4s\n" - " b.eq 3f\n" - "2:" - " ld1 {v16.4s, v17.4s, v18.4s, v19.4s}, [%[b]], #64\n" - " ld1 {v20.4s, v21.4s, v22.4s, v23.4s}, [%[a]], #64\n" - " subs %w[len], %w[len], #16\n" - " fmla v1.4s, v16.4s, v20.4s\n" - " fmla v2.4s, v17.4s, v21.4s\n" - " fmla v3.4s, v18.4s, v22.4s\n" - " fmla v4.4s, v19.4s, v23.4s\n" - " b.ne 2b\n" - "3:" - " fadd v16.4s, v1.4s, v2.4s\n" - " fadd v17.4s, v3.4s, v4.4s\n" - " cmp %w[remainder], #0\n" - " fadd v1.4s, v16.4s, v17.4s\n" - " b.eq 5f\n" - "4:" - " ld1 {v18.4s}, [%[b]], #16\n" - " ld1 {v22.4s}, [%[a]], #16\n" - " subs %w[remainder], %w[remainder], #4\n" - " fmla v1.4s, v18.4s, v22.4s\n" - " b.ne 4b\n" - "5:" - " faddp v1.4s, v1.4s, v1.4s\n" - " faddp %[ret].4s, v1.4s, v1.4s\n" - : [ret] "=w" (ret), [a] "+r" (a), [b] "+r" (b), - [len] "+r" (len), [remainder] "+r" (remainder) - : - : "cc", "v1", "v2", "v3", "v4", - "v16", "v17", "v18", "v19", "v20", "v21", "v22", "v23"); - return ret; -} -#else -static inline float inner_product_single(const float *a, const float *b, unsigned int len) -{ - float ret; - uint32_t remainder = len % 16; - len = len - remainder; - - asm volatile (" cmp %[len], #0\n" - " bne 1f\n" - " vld1.32 {q4}, [%[b]]!\n" - " vld1.32 {q8}, [%[a]]!\n" - " subs %[remainder], %[remainder], #4\n" - " vmul.f32 q0, q4, q8\n" - " bne 4f\n" - " b 5f\n" - "1:" - " vld1.32 {q4, q5}, [%[b]]!\n" - " vld1.32 {q8, q9}, [%[a]]!\n" - " vld1.32 {q6, q7}, [%[b]]!\n" - " vld1.32 {q10, q11}, [%[a]]!\n" - " subs %[len], %[len], #16\n" - " vmul.f32 q0, q4, q8\n" - " vmul.f32 q1, q5, q9\n" - " vmul.f32 q2, q6, q10\n" - " vmul.f32 q3, q7, q11\n" - " beq 3f\n" - "2:" - " vld1.32 {q4, q5}, [%[b]]!\n" - " vld1.32 {q8, q9}, [%[a]]!\n" - " vld1.32 {q6, q7}, [%[b]]!\n" - " vld1.32 {q10, q11}, [%[a]]!\n" - " subs %[len], %[len], #16\n" - " vmla.f32 q0, q4, q8\n" - " vmla.f32 q1, q5, q9\n" - " vmla.f32 q2, q6, q10\n" - " vmla.f32 q3, q7, q11\n" - " bne 2b\n" - "3:" - " vadd.f32 q4, q0, q1\n" - " vadd.f32 q5, q2, q3\n" - " cmp %[remainder], #0\n" - " vadd.f32 q0, q4, q5\n" - " beq 5f\n" - "4:" - " vld1.32 {q6}, [%[b]]!\n" - " vld1.32 {q10}, [%[a]]!\n" - " subs %[remainder], %[remainder], #4\n" - " vmla.f32 q0, q6, q10\n" - " bne 4b\n" - "5:" - " vadd.f32 d0, d0, d1\n" - " vpadd.f32 d0, d0, d0\n" - " vmov.f32 %[ret], d0[0]\n" - : [ret] "=r" (ret), [a] "+r" (a), [b] "+r" (b), - [len] "+l" (len), [remainder] "+l" (remainder) - : - : "cc", "q0", "q1", "q2", "q3", - "q4", "q5", "q6", "q7", "q8", "q9", "q10", "q11"); - return ret; -} -#endif // defined(__aarch64__) -#endif diff --git a/speex/libspeexdsp/resample_sse.h b/speex/libspeexdsp/resample_sse.h deleted file mode 100644 index 00dc29465b34b31f72aadf75ce895ffb76399cb3..0000000000000000000000000000000000000000 --- a/speex/libspeexdsp/resample_sse.h +++ /dev/null @@ -1,128 +0,0 @@ -/* Copyright (C) 2007-2008 Jean-Marc Valin - * Copyright (C) 2008 Thorvald Natvig - */ -/** - @file resample_sse.h - @brief Resampler functions (SSE version) -*/ -/* - 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. -*/ - -#include - -#define OVERRIDE_INNER_PRODUCT_SINGLE -static inline float inner_product_single(const float *a, const float *b, unsigned int len) -{ - int i; - float ret; - __m128 sum = _mm_setzero_ps(); - for (i=0;i -#define OVERRIDE_INNER_PRODUCT_DOUBLE - -static inline double inner_product_double(const float *a, const float *b, unsigned int len) -{ - int i; - double ret; - __m128d sum = _mm_setzero_pd(); - __m128 t; - for (i=0;i -#include - -#ifndef M_PI -#define M_PI 3.14159265358979323846 /* pi */ -#endif - -#define ALLPASS_ORDER 20 - -struct SpeexDecorrState_ { - int rate; - int channels; - int frame_size; -#ifdef VORBIS_PSYCHO - VorbisPsy *psy; - struct drft_lookup lookup; - float *wola_mem; - float *curve; -#endif - float *vorbis_win; - int seed; - float *y; - - /* Per-channel stuff */ - float *buff; - float (*ring)[ALLPASS_ORDER]; - int *ringID; - int *order; - float *alpha; -}; - - - -EXPORT SpeexDecorrState *speex_decorrelate_new(int rate, int channels, int frame_size) -{ - int i, ch; - SpeexDecorrState *st = speex_alloc(sizeof(SpeexDecorrState)); - st->rate = rate; - st->channels = channels; - st->frame_size = frame_size; -#ifdef VORBIS_PSYCHO - st->psy = vorbis_psy_init(rate, 2*frame_size); - spx_drft_init(&st->lookup, 2*frame_size); - st->wola_mem = speex_alloc(frame_size*sizeof(float)); - st->curve = speex_alloc(frame_size*sizeof(float)); -#endif - st->y = speex_alloc(frame_size*sizeof(float)); - - st->buff = speex_alloc(channels*2*frame_size*sizeof(float)); - st->ringID = speex_alloc(channels*sizeof(int)); - st->order = speex_alloc(channels*sizeof(int)); - st->alpha = speex_alloc(channels*sizeof(float)); - st->ring = speex_alloc(channels*ALLPASS_ORDER*sizeof(float)); - - /*FIXME: The +20 is there only as a kludge for ALL_PASS_OLA*/ - st->vorbis_win = speex_alloc((2*frame_size+20)*sizeof(float)); - for (i=0;i<2*frame_size;i++) - st->vorbis_win[i] = sin(.5*M_PI* sin(M_PI*i/(2*frame_size))*sin(M_PI*i/(2*frame_size)) ); - st->seed = rand(); - - for (ch=0;chring[ch][i] = 0; - st->ringID[ch] = 0; - st->alpha[ch] = 0; - st->order[ch] = 10; - } - return st; -} - -static float uni_rand(int *seed) -{ - const unsigned int jflone = 0x3f800000; - const unsigned int jflmsk = 0x007fffff; - union {int i; float f;} ran; - *seed = 1664525 * *seed + 1013904223; - ran.i = jflone | (jflmsk & *seed); - ran.f -= 1.5; - return 2*ran.f; -} - -static unsigned int irand(int *seed) -{ - *seed = 1664525 * *seed + 1013904223; - return ((unsigned int)*seed)>>16; -} - - -EXPORT void speex_decorrelate(SpeexDecorrState *st, const spx_int16_t *in, spx_int16_t *out, int strength) -{ - int ch; - float amount; - - if (strength<0) - strength = 0; - if (strength>100) - strength = 100; - - amount = .01*strength; - for (ch=0;chchannels;ch++) - { - int i; - int N=2*st->frame_size; - float beta, beta2; - float *x; - float max_alpha = 0; - - float *buff; - float *ring; - int ringID; - int order; - float alpha; - - buff = st->buff+ch*2*st->frame_size; - ring = st->ring[ch]; - ringID = st->ringID[ch]; - order = st->order[ch]; - alpha = st->alpha[ch]; - - for (i=0;iframe_size;i++) - buff[i] = buff[i+st->frame_size]; - for (i=0;iframe_size;i++) - buff[i+st->frame_size] = in[i*st->channels+ch]; - - x = buff+st->frame_size; - - if (amount>1) - beta = 1-sqrt(.4*amount); - else - beta = 1-0.63246*amount; - if (beta<0) - beta = 0; - - beta2 = beta; - for (i=0;iframe_size;i++) - { - st->y[i] = alpha*(x[i-ALLPASS_ORDER+order]-beta*x[i-ALLPASS_ORDER+order-1])*st->vorbis_win[st->frame_size+i+order] - + x[i-ALLPASS_ORDER]*st->vorbis_win[st->frame_size+i] - - alpha*(ring[ringID] - - beta*ring[ringID+1>=order?0:ringID+1]); - ring[ringID++]=st->y[i]; - st->y[i] *= st->vorbis_win[st->frame_size+i]; - if (ringID>=order) - ringID=0; - } - order = order+(irand(&st->seed)%3)-1; - if (order < 5) - order = 5; - if (order > 10) - order = 10; - /*order = 5+(irand(&st->seed)%6);*/ - max_alpha = pow(.96+.04*(amount-1),order); - if (max_alpha > .98/(1.+beta2)) - max_alpha = .98/(1.+beta2); - - alpha = alpha + .4*uni_rand(&st->seed); - if (alpha > max_alpha) - alpha = max_alpha; - if (alpha < -max_alpha) - alpha = -max_alpha; - for (i=0;iframe_size;i++) - { - float tmp = alpha*(x[i-ALLPASS_ORDER+order]-beta*x[i-ALLPASS_ORDER+order-1])*st->vorbis_win[i+order] - + x[i-ALLPASS_ORDER]*st->vorbis_win[i] - - alpha*(ring[ringID] - - beta*ring[ringID+1>=order?0:ringID+1]); - ring[ringID++]=tmp; - tmp *= st->vorbis_win[i]; - if (ringID>=order) - ringID=0; - st->y[i] += tmp; - } - -#ifdef VORBIS_PSYCHO - float frame[N]; - float scale = 1./N; - for (i=0;i<2*st->frame_size;i++) - frame[i] = buff[i]; - //float coef = .5*0.78130; - float coef = M_PI*0.075063 * 0.93763 * amount * .8 * 0.707; - compute_curve(st->psy, buff, st->curve); - for (i=1;iframe_size;i++) - { - float x1,x2; - float gain; - do { - x1 = uni_rand(&st->seed); - x2 = uni_rand(&st->seed); - } while (x1*x1+x2*x2 > 1.); - gain = coef*sqrt(.1+st->curve[i]); - frame[2*i-1] = gain*x1; - frame[2*i] = gain*x2; - } - frame[0] = coef*uni_rand(&st->seed)*sqrt(.1+st->curve[0]); - frame[2*st->frame_size-1] = coef*uni_rand(&st->seed)*sqrt(.1+st->curve[st->frame_size-1]); - spx_drft_backward(&st->lookup,frame); - for (i=0;i<2*st->frame_size;i++) - frame[i] *= st->vorbis_win[i]; -#endif - - for (i=0;iframe_size;i++) - { -#ifdef VORBIS_PSYCHO - float tmp = st->y[i] + frame[i] + st->wola_mem[i]; - st->wola_mem[i] = frame[i+st->frame_size]; -#else - float tmp = st->y[i]; -#endif - if (tmp>32767) - tmp = 32767; - if (tmp < -32767) - tmp = -32767; - out[i*st->channels+ch] = tmp; - } - - st->ringID[ch] = ringID; - st->order[ch] = order; - st->alpha[ch] = alpha; - - } -} - -EXPORT void speex_decorrelate_destroy(SpeexDecorrState *st) -{ -#ifdef VORBIS_PSYCHO - vorbis_psy_destroy(st->psy); - speex_free(st->wola_mem); - speex_free(st->curve); -#endif - speex_free(st->buff); - speex_free(st->ring); - speex_free(st->ringID); - speex_free(st->alpha); - speex_free(st->vorbis_win); - speex_free(st->order); - speex_free(st->y); - speex_free(st); -} diff --git a/speex/libspeexdsp/smallft.c b/speex/libspeexdsp/smallft.c deleted file mode 100644 index 82c3b0a4a11decb72f36a52ed2b1ebc7ace975c1..0000000000000000000000000000000000000000 --- a/speex/libspeexdsp/smallft.c +++ /dev/null @@ -1,1261 +0,0 @@ -/******************************************************************** - * * - * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. * - * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS * - * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE * - * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. * - * * - * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 * - * by the XIPHOPHORUS Company http://www.xiph.org/ * - * * - ******************************************************************** - - function: *unnormalized* fft transform - last mod: $Id: smallft.c,v 1.19 2003/10/08 05:12:37 jm Exp $ - - ********************************************************************/ - -/* FFT implementation from OggSquish, minus cosine transforms, - * minus all but radix 2/4 case. In Vorbis we only need this - * cut-down version. - * - * To do more than just power-of-two sized vectors, see the full - * version I wrote for NetLib. - * - * Note that the packing is a little strange; rather than the FFT r/i - * packing following R_0, I_n, R_1, I_1, R_2, I_2 ... R_n-1, I_n-1, - * it follows R_0, R_1, I_1, R_2, I_2 ... R_n-1, I_n-1, I_n like the - * FORTRAN version - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include "smallft.h" -#include "arch.h" -#include "os_support.h" - -static void drfti1(int n, float *wa, int *ifac){ - static int ntryh[4] = { 4,2,3,5 }; - static float tpi = 6.28318530717958648f; - float arg,argh,argld,fi; - int ntry=0,i,j=-1; - int k1, l1, l2, ib; - int ld, ii, ip, is, nq, nr; - int ido, ipm, nfm1; - int nl=n; - int nf=0; - - L101: - j++; - if (j < 4) - ntry=ntryh[j]; - else - ntry+=2; - - L104: - nq=nl/ntry; - nr=nl-ntry*nq; - if (nr!=0) goto L101; - - nf++; - ifac[nf+1]=ntry; - nl=nq; - if(ntry!=2)goto L107; - if(nf==1)goto L107; - - for (i=1;i>1; - ipp2=ip; - idp2=ido; - nbd=(ido-1)>>1; - t0=l1*ido; - t10=ip*ido; - - if(ido==1)goto L119; - for(ik=0;ikl1){ - for(j=1;j>1; - ipp2=ip; - ipph=(ip+1)>>1; - if(idol1)goto L139; - - is= -ido-1; - t1=0; - for(j=1;jn==1)return; - drftf1(l->n,data,l->trigcache,l->trigcache+l->n,l->splitcache); -} - -void spx_drft_backward(struct drft_lookup *l,float *data){ - if (l->n==1)return; - drftb1(l->n,data,l->trigcache,l->trigcache+l->n,l->splitcache); -} - -void spx_drft_init(struct drft_lookup *l,int n) -{ - l->n=n; - l->trigcache=(float*)speex_alloc(3*n*sizeof(*l->trigcache)); - l->splitcache=(int*)speex_alloc(32*sizeof(*l->splitcache)); - fdrffti(n, l->trigcache, l->splitcache); -} - -void spx_drft_clear(struct drft_lookup *l) -{ - if(l) - { - if(l->trigcache) - speex_free(l->trigcache); - if(l->splitcache) - speex_free(l->splitcache); - } -} diff --git a/speex/libspeexdsp/smallft.h b/speex/libspeexdsp/smallft.h deleted file mode 100644 index 446e2f65b198462122fa39085f64a4ebf93af90b..0000000000000000000000000000000000000000 --- a/speex/libspeexdsp/smallft.h +++ /dev/null @@ -1,46 +0,0 @@ -/******************************************************************** - * * - * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. * - * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS * - * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE * - * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. * - * * - * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 * - * by the XIPHOPHORUS Company http://www.xiph.org/ * - * * - ******************************************************************** - - function: fft transform - last mod: $Id: smallft.h,v 1.3 2003/09/16 18:35:45 jm Exp $ - - ********************************************************************/ -/** - @file smallft.h - @brief Discrete Rotational Fourier Transform (DRFT) -*/ - -#ifndef _V_SMFT_H_ -#define _V_SMFT_H_ - - -#ifdef __cplusplus -extern "C" { -#endif - -/** Discrete Rotational Fourier Transform lookup */ -struct drft_lookup{ - int n; - float *trigcache; - int *splitcache; -}; - -extern void spx_drft_forward(struct drft_lookup *l,float *data); -extern void spx_drft_backward(struct drft_lookup *l,float *data); -extern void spx_drft_init(struct drft_lookup *l,int n); -extern void spx_drft_clear(struct drft_lookup *l); - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/speex/libspeexdsp/stack_alloc.h b/speex/libspeexdsp/stack_alloc.h deleted file mode 100644 index 6c56334f86ac5ec4dee08629fb92e92e64815125..0000000000000000000000000000000000000000 --- a/speex/libspeexdsp/stack_alloc.h +++ /dev/null @@ -1,115 +0,0 @@ -/* Copyright (C) 2002 Jean-Marc Valin */ -/** - @file stack_alloc.h - @brief Temporary memory allocation on stack -*/ -/* - 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 STACK_ALLOC_H -#define STACK_ALLOC_H - -#ifdef USE_ALLOCA -# ifdef WIN32 -# include -# else -# ifdef HAVE_ALLOCA_H -# include -# else -# include -# endif -# endif -#endif - -/** - * @def ALIGN(stack, size) - * - * Aligns the stack to a 'size' boundary - * - * @param stack Stack - * @param size New size boundary - */ - -/** - * @def PUSH(stack, size, type) - * - * Allocates 'size' elements of type 'type' on the stack - * - * @param stack Stack - * @param size Number of elements - * @param type Type of element - */ - -/** - * @def VARDECL(var) - * - * Declare variable on stack - * - * @param var Variable to declare - */ - -/** - * @def ALLOC(var, size, type) - * - * Allocate 'size' elements of 'type' on stack - * - * @param var Name of variable to allocate - * @param size Number of elements - * @param type Type of element - */ - -#ifdef ENABLE_VALGRIND - -#include - -#define ALIGN(stack, size) ((stack) += ((size) - (long)(stack)) & ((size) - 1)) - -#define PUSH(stack, size, type) (VALGRIND_MAKE_NOACCESS(stack, 1000),ALIGN((stack),sizeof(type)),VALGRIND_MAKE_WRITABLE(stack, ((size)*sizeof(type))),(stack)+=((size)*sizeof(type)),(type*)((stack)-((size)*sizeof(type)))) - -#else - -#define ALIGN(stack, size) ((stack) += ((size) - (long)(stack)) & ((size) - 1)) - -#define PUSH(stack, size, type) (ALIGN((stack),sizeof(type)),(stack)+=((size)*sizeof(type)),(type*)((stack)-((size)*sizeof(type)))) - -#endif - -#if defined(VAR_ARRAYS) -#define VARDECL(var) -#define ALLOC(var, size, type) type var[size] -#elif defined(USE_ALLOCA) -#define VARDECL(var) var -#define ALLOC(var, size, type) var = alloca(sizeof(type)*(size)) -#else -#define VARDECL(var) var -#define ALLOC(var, size, type) var = PUSH(stack, size, type) -#endif - - -#endif diff --git a/speex/libspeexdsp/testdenoise.c b/speex/libspeexdsp/testdenoise.c deleted file mode 100644 index adebe941e420ef3d9b3509a137766e83206ef187..0000000000000000000000000000000000000000 --- a/speex/libspeexdsp/testdenoise.c +++ /dev/null @@ -1,44 +0,0 @@ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "speex/speex_preprocess.h" -#include - -#define NN 160 - -int main() -{ - short in[NN]; - int i; - SpeexPreprocessState *st; - int count=0; - float f; - - st = speex_preprocess_state_init(NN, 8000); - i=1; - speex_preprocess_ctl(st, SPEEX_PREPROCESS_SET_DENOISE, &i); - i=0; - speex_preprocess_ctl(st, SPEEX_PREPROCESS_SET_AGC, &i); - i=8000; - speex_preprocess_ctl(st, SPEEX_PREPROCESS_SET_AGC_LEVEL, &i); - i=0; - speex_preprocess_ctl(st, SPEEX_PREPROCESS_SET_DEREVERB, &i); - f=.0; - speex_preprocess_ctl(st, SPEEX_PREPROCESS_SET_DEREVERB_DECAY, &f); - f=.0; - speex_preprocess_ctl(st, SPEEX_PREPROCESS_SET_DEREVERB_LEVEL, &f); - while (1) - { - int vad; - fread(in, sizeof(short), NN, stdin); - if (feof(stdin)) - break; - vad = speex_preprocess_run(st, in); - /*fprintf (stderr, "%d\n", vad);*/ - fwrite(in, sizeof(short), NN, stdout); - count++; - } - speex_preprocess_state_destroy(st); - return 0; -} diff --git a/speex/libspeexdsp/testecho.c b/speex/libspeexdsp/testecho.c deleted file mode 100644 index 1624dc2a31872ffa6b2e25a9cd926f417da219d8..0000000000000000000000000000000000000000 --- a/speex/libspeexdsp/testecho.c +++ /dev/null @@ -1,53 +0,0 @@ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "speex/speex_echo.h" -#include "speex/speex_preprocess.h" -#include -#include -#include -#include -#include - - -#define NN 128 -#define TAIL 1024 - -int main(int argc, char **argv) -{ - FILE *echo_fd, *ref_fd, *e_fd; - short echo_buf[NN], ref_buf[NN], e_buf[NN]; - SpeexEchoState *st; - SpeexPreprocessState *den; - int sampleRate = 8000; - - if (argc != 4) - { - fprintf(stderr, "testecho mic_signal.sw speaker_signal.sw output.sw\n"); - exit(1); - } - echo_fd = fopen(argv[2], "rb"); - ref_fd = fopen(argv[1], "rb"); - e_fd = fopen(argv[3], "wb"); - - st = speex_echo_state_init(NN, TAIL); - den = speex_preprocess_state_init(NN, sampleRate); - speex_echo_ctl(st, SPEEX_ECHO_SET_SAMPLING_RATE, &sampleRate); - speex_preprocess_ctl(den, SPEEX_PREPROCESS_SET_ECHO_STATE, st); - - while (!feof(ref_fd) && !feof(echo_fd)) - { - fread(ref_buf, sizeof(short), NN, ref_fd); - fread(echo_buf, sizeof(short), NN, echo_fd); - speex_echo_cancellation(st, ref_buf, echo_buf, e_buf); - speex_preprocess_run(den, e_buf); - fwrite(e_buf, sizeof(short), NN, e_fd); - } - speex_echo_state_destroy(st); - speex_preprocess_state_destroy(den); - fclose(e_fd); - fclose(echo_fd); - fclose(ref_fd); - return 0; -} diff --git a/speex/libspeexdsp/testjitter.c b/speex/libspeexdsp/testjitter.c deleted file mode 100644 index 399dfe956caaf67fa838012929f1316074606cb7..0000000000000000000000000000000000000000 --- a/speex/libspeexdsp/testjitter.c +++ /dev/null @@ -1,75 +0,0 @@ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "speex/speex_jitter.h" -#include - -union jbpdata { - unsigned int idx; - unsigned char data[4]; -}; - -void synthIn(JitterBufferPacket *in, int idx, int span) { - union jbpdata d; - d.idx = idx; - - in->data = d.data; - in->len = sizeof(d); - in->timestamp = idx * 10; - in->span = span * 10; - in->sequence = idx; - in->user_data = 0; -} - -void jitterFill(JitterBuffer *jb) { - char buffer[65536]; - JitterBufferPacket in, out; - int i; - - out.data = buffer; - - jitter_buffer_reset(jb); - - for(i=0;i<100;++i) { - synthIn(&in, i, 1); - jitter_buffer_put(jb, &in); - - out.len = 65536; - if (jitter_buffer_get(jb, &out, 10, NULL) != JITTER_BUFFER_OK) { - printf("Fill test failed iteration %d\n", i); - } - if (out.timestamp != i * 10) { - printf("Fill test expected %d got %d\n", i*10, out.timestamp); - } - jitter_buffer_tick(jb); - } -} - -int main() -{ - char buffer[65536]; - JitterBufferPacket in, out; - int i; - - JitterBuffer *jb = jitter_buffer_init(10); - - out.data = buffer; - - /* Frozen sender case */ - jitterFill(jb); - for(i=0;i<100;++i) { - out.len = 65536; - jitter_buffer_get(jb, &out, 10, NULL); - jitter_buffer_tick(jb); - } - synthIn(&in, 100, 1); - jitter_buffer_put(jb, &in); - out.len = 65536; - if (jitter_buffer_get(jb, &out, 10, NULL) != JITTER_BUFFER_OK) { - printf("Failed frozen sender resynchronize\n"); - } else { - printf("Frozen sender: Jitter %d\n", out.timestamp - 100*10); - } - return 0; -} diff --git a/speex/libspeexdsp/testresample.c b/speex/libspeexdsp/testresample.c deleted file mode 100644 index 7ed866756fd5fb745567351c7d6a1233e6b2ae3a..0000000000000000000000000000000000000000 --- a/speex/libspeexdsp/testresample.c +++ /dev/null @@ -1,86 +0,0 @@ -/* Copyright (C) 2007 Jean-Marc Valin - - File: testresample.c - Testing the resampling code - - 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. - - 3. The name of the author may not be used to endorse or promote products - derived from this software without specific prior written permission. - - 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. -*/ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "speex/speex_resampler.h" -#include -#include -#include - -#define NN 256 - -int main() -{ - spx_uint32_t i; - short *in; - short *out; - float *fin, *fout; - int count = 0; - SpeexResamplerState *st = speex_resampler_init(1, 8000, 12000, 10, NULL); - speex_resampler_set_rate(st, 96000, 44100); - speex_resampler_skip_zeros(st); - - in = malloc(NN*sizeof(short)); - out = malloc(2*NN*sizeof(short)); - fin = malloc(NN*sizeof(float)); - fout = malloc(2*NN*sizeof(float)); - while (1) - { - spx_uint32_t in_len; - spx_uint32_t out_len; - fread(in, sizeof(short), NN, stdin); - if (feof(stdin)) - break; - for (i=0;i -#include -#include - -#define PERIOD 32 -#define INBLOCK 1024 -#define RATE 48000 - -int main() -{ - spx_uint32_t i; - float *fin, *fout; - int rate = 1000, off = 0, avail = INBLOCK; - SpeexResamplerState *st = speex_resampler_init(1, RATE, RATE, 4, NULL); - speex_resampler_set_rate(st, RATE, rate); - speex_resampler_skip_zeros(st); - - fin = malloc(INBLOCK*2*sizeof(float)); - for (i=0; i ", rate, off, in_len, out_len); - - speex_resampler_process_float(st, 0, fin + off, &in_len, fout, &out_len); - - fprintf (stderr, "%d %d\n", in_len, out_len); - off += in_len; - avail = avail - in_len + INBLOCK; - - if (off >= INBLOCK) - off -= INBLOCK; - - fwrite(fout, sizeof(float), out_len, stdout); - - rate += 100; - if (rate > 128000) - break; - - speex_resampler_set_rate(st, RATE, rate); - } - speex_resampler_destroy(st); - free(fin); - free(fout); - return 0; -} - diff --git a/speex/libspeexdsp/vorbis_psy.h b/speex/libspeexdsp/vorbis_psy.h deleted file mode 100644 index 19ea9c3cf2758beb4f9ba1416e003e70f1c692a7..0000000000000000000000000000000000000000 --- a/speex/libspeexdsp/vorbis_psy.h +++ /dev/null @@ -1,97 +0,0 @@ -/* Copyright (C) 2005 Jean-Marc Valin, CSIRO, Christopher Montgomery - File: vorbis_psy.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. - - - 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 VORBIS_PSY_H -#define VORBIS_PSY_H - -#ifdef VORBIS_PSYCHO - -#include "smallft.h" -#define P_BANDS 17 /* 62Hz to 16kHz */ -#define NOISE_COMPAND_LEVELS 40 - - -#define todB(x) ((x)>1e-13?log((x)*(x))*4.34294480f:-30) -#define fromdB(x) (exp((x)*.11512925f)) - -/* The bark scale equations are approximations, since the original - table was somewhat hand rolled. The below are chosen to have the - best possible fit to the rolled tables, thus their somewhat odd - appearance (these are more accurate and over a longer range than - the oft-quoted bark equations found in the texts I have). The - approximations are valid from 0 - 30kHz (nyquist) or so. - - all f in Hz, z in Bark */ - -#define toBARK(n) (13.1f*atan(.00074f*(n))+2.24f*atan((n)*(n)*1.85e-8f)+1e-4f*(n)) -#define fromBARK(z) (102.f*(z)-2.f*pow(z,2.f)+.4f*pow(z,3.f)+pow(1.46f,z)-1.f) - -/* Frequency to octave. We arbitrarily declare 63.5 Hz to be octave - 0.0 */ - -#define toOC(n) (log(n)*1.442695f-5.965784f) -#define fromOC(o) (exp(((o)+5.965784f)*.693147f)) - - -typedef struct { - - float noisewindowlo; - float noisewindowhi; - int noisewindowlomin; - int noisewindowhimin; - int noisewindowfixed; - float noiseoff[P_BANDS]; - float noisecompand[NOISE_COMPAND_LEVELS]; - -} VorbisPsyInfo; - - - -typedef struct { - int n; - int rate; - struct drft_lookup lookup; - VorbisPsyInfo *vi; - - float *window; - float *noiseoffset; - long *bark; - -} VorbisPsy; - - -VorbisPsy *vorbis_psy_init(int rate, int size); -void vorbis_psy_destroy(VorbisPsy *psy); -void compute_curve(VorbisPsy *psy, float *audio, float *curve); -void curve_to_lpc(VorbisPsy *psy, float *curve, float *awk1, float *awk2, int ord); - -#endif -#endif diff --git a/speex/macosx/English.lproj/InfoPlist.strings b/speex/macosx/English.lproj/InfoPlist.strings deleted file mode 100644 index 2f37a321a253f3da87d6ffa01b760eccb8bee210..0000000000000000000000000000000000000000 --- a/speex/macosx/English.lproj/InfoPlist.strings +++ /dev/null @@ -1,3 +0,0 @@ -/* Localized versions of Info.plist keys */ - -CFBundleName = "Speex"; diff --git a/speex/macosx/Info.plist b/speex/macosx/Info.plist deleted file mode 100644 index 1d1c47c81841391e07206f48d1c79a3da11e8592..0000000000000000000000000000000000000000 --- a/speex/macosx/Info.plist +++ /dev/null @@ -1,30 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - Speex - CFBundleGetInfoString - Speex framework 1.1.12svn, Copyright © 2002-2006 Xiph.Org Foundation - CFBundleIconFile - - CFBundleIdentifier - org.xiph.speex - CFBundleInfoDictionaryVersion - 6.0 - CFBundlePackageType - FMWK - CFBundleShortVersionString - 1.1.12svn - CFBundleSignature - ???? - CFBundleVersion - 1.1.12d1 - NSHumanReadableCopyright - Speex framework 1.1.12svn, Copyright © 2002-2006 Xiph.Org Foundation - CSResourcesFileMapped - - - diff --git a/speex/macosx/Speex.xcodeproj/project.pbxproj b/speex/macosx/Speex.xcodeproj/project.pbxproj deleted file mode 100644 index 8a04da26cfb55e6c08d7c8de58819025e6a07aed..0000000000000000000000000000000000000000 --- a/speex/macosx/Speex.xcodeproj/project.pbxproj +++ /dev/null @@ -1,538 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 42; - objects = { - -/* Begin PBXBuildFile section */ - 37CA8DF00DD73408005C8CB6 /* buffer.c in Sources */ = {isa = PBXBuildFile; fileRef = 37CA8DED0DD73408005C8CB6 /* buffer.c */; }; - 37CA8DF10DD73408005C8CB6 /* resample.c in Sources */ = {isa = PBXBuildFile; fileRef = 37CA8DEE0DD73408005C8CB6 /* resample.c */; }; - 37CA8DF30DD73408005C8CB6 /* buffer.c in Sources */ = {isa = PBXBuildFile; fileRef = 37CA8DED0DD73408005C8CB6 /* buffer.c */; }; - 37CA8DF40DD73408005C8CB6 /* resample.c in Sources */ = {isa = PBXBuildFile; fileRef = 37CA8DEE0DD73408005C8CB6 /* resample.c */; }; - 37CA8DF60DD73424005C8CB6 /* resample_sse.h in Headers */ = {isa = PBXBuildFile; fileRef = 37CA8DEF0DD73408005C8CB6 /* resample_sse.h */; }; - 37CA8DF90DD7347D005C8CB6 /* speex_buffer.h in Headers */ = {isa = PBXBuildFile; fileRef = 37CA8DF70DD7347D005C8CB6 /* speex_buffer.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 37CA8DFA0DD7347D005C8CB6 /* speex_resampler.h in Headers */ = {isa = PBXBuildFile; fileRef = 37CA8DF80DD7347D005C8CB6 /* speex_resampler.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 37CA8E000DD7352A005C8CB6 /* os_support.h in Headers */ = {isa = PBXBuildFile; fileRef = 37CA8DFF0DD7352A005C8CB6 /* os_support.h */; }; - 73814AFF0907FB8200C478FC /* speex_echo.h in Headers */ = {isa = PBXBuildFile; fileRef = 73814AF30907FB8200C478FC /* speex_echo.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 73814B000907FB8200C478FC /* speex_header.h in Headers */ = {isa = PBXBuildFile; fileRef = 73814AF40907FB8200C478FC /* speex_header.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 73814B010907FB8200C478FC /* speex_jitter.h in Headers */ = {isa = PBXBuildFile; fileRef = 73814AF50907FB8200C478FC /* speex_jitter.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 73814B020907FB8200C478FC /* speex_preprocess.h in Headers */ = {isa = PBXBuildFile; fileRef = 73814AF60907FB8200C478FC /* speex_preprocess.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 73814B030907FB8200C478FC /* speex_stereo.h in Headers */ = {isa = PBXBuildFile; fileRef = 73814AF70907FB8200C478FC /* speex_stereo.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 73814B040907FB8200C478FC /* speex_types.h in Headers */ = {isa = PBXBuildFile; fileRef = 73814AF80907FB8200C478FC /* speex_types.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 73814B060907FBAB00C478FC /* speex_callbacks.h in Headers */ = {isa = PBXBuildFile; fileRef = 73814AF10907FB8200C478FC /* speex_callbacks.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 73814B750907FC9900C478FC /* jitter.c in Sources */ = {isa = PBXBuildFile; fileRef = 73814B280907FC9900C478FC /* jitter.c */; }; - 73814B8E0907FC9900C478FC /* preprocess.c in Sources */ = {isa = PBXBuildFile; fileRef = 73814B410907FC9900C478FC /* preprocess.c */; }; - 73814B930907FC9900C478FC /* smallft.c in Sources */ = {isa = PBXBuildFile; fileRef = 73814B460907FC9900C478FC /* smallft.c */; }; - 738837440B1934D0005C7A69 /* mdf.c in Sources */ = {isa = PBXBuildFile; fileRef = 73814B390907FC9900C478FC /* mdf.c */; }; - 738837540B193581005C7A69 /* _kiss_fft_guts.h in Headers */ = {isa = PBXBuildFile; fileRef = 738837460B193581005C7A69 /* _kiss_fft_guts.h */; }; - 738837550B193581005C7A69 /* fftwrap.c in Sources */ = {isa = PBXBuildFile; fileRef = 738837470B193581005C7A69 /* fftwrap.c */; }; - 738837560B193581005C7A69 /* fftwrap.h in Headers */ = {isa = PBXBuildFile; fileRef = 738837480B193581005C7A69 /* fftwrap.h */; }; - 738837570B193581005C7A69 /* filterbank.c in Sources */ = {isa = PBXBuildFile; fileRef = 738837490B193581005C7A69 /* filterbank.c */; }; - 738837580B193581005C7A69 /* filterbank.h in Headers */ = {isa = PBXBuildFile; fileRef = 7388374A0B193581005C7A69 /* filterbank.h */; }; - 738837590B193581005C7A69 /* kiss_fft.c in Sources */ = {isa = PBXBuildFile; fileRef = 7388374B0B193581005C7A69 /* kiss_fft.c */; }; - 7388375A0B193581005C7A69 /* kiss_fft.h in Headers */ = {isa = PBXBuildFile; fileRef = 7388374C0B193581005C7A69 /* kiss_fft.h */; }; - 7388375B0B193581005C7A69 /* kiss_fftr.c in Sources */ = {isa = PBXBuildFile; fileRef = 7388374D0B193581005C7A69 /* kiss_fftr.c */; }; - 7388375C0B193581005C7A69 /* kiss_fftr.h in Headers */ = {isa = PBXBuildFile; fileRef = 7388374E0B193581005C7A69 /* kiss_fftr.h */; }; - 7388375D0B193581005C7A69 /* lsp_bfin.h in Headers */ = {isa = PBXBuildFile; fileRef = 7388374F0B193581005C7A69 /* lsp_bfin.h */; }; - 7388375E0B193581005C7A69 /* pseudofloat.h in Headers */ = {isa = PBXBuildFile; fileRef = 738837500B193581005C7A69 /* pseudofloat.h */; }; - 7388375F0B193581005C7A69 /* quant_lsp_bfin.h in Headers */ = {isa = PBXBuildFile; fileRef = 738837510B193581005C7A69 /* quant_lsp_bfin.h */; }; - 738837600B193581005C7A69 /* vorbis_psy.c in Sources */ = {isa = PBXBuildFile; fileRef = 738837520B193581005C7A69 /* vorbis_psy.c */; }; - 738837610B193581005C7A69 /* vorbis_psy.h in Headers */ = {isa = PBXBuildFile; fileRef = 738837530B193581005C7A69 /* vorbis_psy.h */; }; - 738837830B193791005C7A69 /* fftwrap.c in Sources */ = {isa = PBXBuildFile; fileRef = 738837470B193581005C7A69 /* fftwrap.c */; }; - 738837840B193792005C7A69 /* filterbank.c in Sources */ = {isa = PBXBuildFile; fileRef = 738837490B193581005C7A69 /* filterbank.c */; }; - 7388378B0B1937A0005C7A69 /* jitter.c in Sources */ = {isa = PBXBuildFile; fileRef = 73814B280907FC9900C478FC /* jitter.c */; }; - 7388378C0B1937A4005C7A69 /* kiss_fft.c in Sources */ = {isa = PBXBuildFile; fileRef = 7388374B0B193581005C7A69 /* kiss_fft.c */; }; - 7388378D0B1937A9005C7A69 /* kiss_fftr.c in Sources */ = {isa = PBXBuildFile; fileRef = 7388374D0B193581005C7A69 /* kiss_fftr.c */; }; - 738837940B1937BB005C7A69 /* mdf.c in Sources */ = {isa = PBXBuildFile; fileRef = 73814B390907FC9900C478FC /* mdf.c */; }; - 738837980B1937C2005C7A69 /* preprocess.c in Sources */ = {isa = PBXBuildFile; fileRef = 73814B410907FC9900C478FC /* preprocess.c */; }; - 7388379B0B1937C9005C7A69 /* smallft.c in Sources */ = {isa = PBXBuildFile; fileRef = 73814B460907FC9900C478FC /* smallft.c */; }; - 738837A10B1937DD005C7A69 /* vorbis_psy.c in Sources */ = {isa = PBXBuildFile; fileRef = 738837520B193581005C7A69 /* vorbis_psy.c */; }; - 8D07F2C00486CC7A007CD1D0 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C1666FE841158C02AAC07 /* InfoPlist.strings */; }; -/* End PBXBuildFile section */ - -/* Begin PBXFileReference section */ - 089C1667FE841158C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = ""; }; - 32BAE0B70371A74B00C91783 /* Speex_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Speex_Prefix.pch; sourceTree = ""; }; - 37CA8DED0DD73408005C8CB6 /* buffer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = buffer.c; path = ../libspeex/buffer.c; sourceTree = SOURCE_ROOT; }; - 37CA8DEE0DD73408005C8CB6 /* resample.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = resample.c; path = ../libspeex/resample.c; sourceTree = SOURCE_ROOT; }; - 37CA8DEF0DD73408005C8CB6 /* resample_sse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = resample_sse.h; path = ../libspeex/resample_sse.h; sourceTree = SOURCE_ROOT; }; - 37CA8DF70DD7347D005C8CB6 /* speex_buffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = speex_buffer.h; sourceTree = ""; }; - 37CA8DF80DD7347D005C8CB6 /* speex_resampler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = speex_resampler.h; sourceTree = ""; }; - 37CA8DFF0DD7352A005C8CB6 /* os_support.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = os_support.h; path = ../libspeex/os_support.h; sourceTree = SOURCE_ROOT; }; - 73814AEF0907FB8200C478FC /* speex.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = speex.h; sourceTree = ""; }; - 73814AF10907FB8200C478FC /* speex_callbacks.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = speex_callbacks.h; sourceTree = ""; }; - 73814AF30907FB8200C478FC /* speex_echo.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = speex_echo.h; sourceTree = ""; }; - 73814AF40907FB8200C478FC /* speex_header.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = speex_header.h; sourceTree = ""; }; - 73814AF50907FB8200C478FC /* speex_jitter.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = speex_jitter.h; sourceTree = ""; }; - 73814AF60907FB8200C478FC /* speex_preprocess.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = speex_preprocess.h; sourceTree = ""; }; - 73814AF70907FB8200C478FC /* speex_stereo.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = speex_stereo.h; sourceTree = ""; }; - 73814AF80907FB8200C478FC /* speex_types.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = speex_types.h; sourceTree = ""; }; - 73814B0C0907FC9900C478FC /* arch.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = arch.h; path = ../libspeex/arch.h; sourceTree = SOURCE_ROOT; }; - 73814B1E0907FC9900C478FC /* fixed_arm4.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = fixed_arm4.h; path = ../libspeex/fixed_arm4.h; sourceTree = SOURCE_ROOT; }; - 73814B1F0907FC9900C478FC /* fixed_arm5e.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = fixed_arm5e.h; path = ../libspeex/fixed_arm5e.h; sourceTree = SOURCE_ROOT; }; - 73814B200907FC9900C478FC /* fixed_bfin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = fixed_bfin.h; path = ../libspeex/fixed_bfin.h; sourceTree = SOURCE_ROOT; }; - 73814B210907FC9900C478FC /* fixed_debug.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = fixed_debug.h; path = ../libspeex/fixed_debug.h; sourceTree = SOURCE_ROOT; }; - 73814B220907FC9900C478FC /* fixed_generic.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = fixed_generic.h; path = ../libspeex/fixed_generic.h; sourceTree = SOURCE_ROOT; }; - 73814B280907FC9900C478FC /* jitter.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = jitter.c; path = ../libspeex/jitter.c; sourceTree = SOURCE_ROOT; }; - 73814B380907FC9900C478FC /* math_approx.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = math_approx.h; path = ../libspeex/math_approx.h; sourceTree = SOURCE_ROOT; }; - 73814B390907FC9900C478FC /* mdf.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = mdf.c; path = ../libspeex/mdf.c; sourceTree = SOURCE_ROOT; }; - 73814B3A0907FC9900C478FC /* misc_bfin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = misc_bfin.h; path = ../libspeex/misc_bfin.h; sourceTree = SOURCE_ROOT; }; - 73814B410907FC9900C478FC /* preprocess.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = preprocess.c; path = ../libspeex/preprocess.c; sourceTree = SOURCE_ROOT; }; - 73814B460907FC9900C478FC /* smallft.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = smallft.c; path = ../libspeex/smallft.c; sourceTree = SOURCE_ROOT; }; - 73814B470907FC9900C478FC /* smallft.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = smallft.h; path = ../libspeex/smallft.h; sourceTree = SOURCE_ROOT; }; - 73814B4B0907FC9900C478FC /* stack_alloc.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = stack_alloc.h; path = ../libspeex/stack_alloc.h; sourceTree = SOURCE_ROOT; }; - 73814B4D0907FC9900C478FC /* testdenoise.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = testdenoise.c; path = ../libspeex/testdenoise.c; sourceTree = SOURCE_ROOT; }; - 73814B4E0907FC9900C478FC /* testecho.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = testecho.c; path = ../libspeex/testecho.c; sourceTree = SOURCE_ROOT; }; - 738837460B193581005C7A69 /* _kiss_fft_guts.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = _kiss_fft_guts.h; path = ../libspeex/_kiss_fft_guts.h; sourceTree = SOURCE_ROOT; }; - 738837470B193581005C7A69 /* fftwrap.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = fftwrap.c; path = ../libspeex/fftwrap.c; sourceTree = SOURCE_ROOT; }; - 738837480B193581005C7A69 /* fftwrap.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = fftwrap.h; path = ../libspeex/fftwrap.h; sourceTree = SOURCE_ROOT; }; - 738837490B193581005C7A69 /* filterbank.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = filterbank.c; path = ../libspeex/filterbank.c; sourceTree = SOURCE_ROOT; }; - 7388374A0B193581005C7A69 /* filterbank.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = filterbank.h; path = ../libspeex/filterbank.h; sourceTree = SOURCE_ROOT; }; - 7388374B0B193581005C7A69 /* kiss_fft.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = kiss_fft.c; path = ../libspeex/kiss_fft.c; sourceTree = SOURCE_ROOT; }; - 7388374C0B193581005C7A69 /* kiss_fft.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = kiss_fft.h; path = ../libspeex/kiss_fft.h; sourceTree = SOURCE_ROOT; }; - 7388374D0B193581005C7A69 /* kiss_fftr.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = kiss_fftr.c; path = ../libspeex/kiss_fftr.c; sourceTree = SOURCE_ROOT; }; - 7388374E0B193581005C7A69 /* kiss_fftr.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = kiss_fftr.h; path = ../libspeex/kiss_fftr.h; sourceTree = SOURCE_ROOT; }; - 7388374F0B193581005C7A69 /* lsp_bfin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = lsp_bfin.h; path = ../libspeex/lsp_bfin.h; sourceTree = SOURCE_ROOT; }; - 738837500B193581005C7A69 /* pseudofloat.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = pseudofloat.h; path = ../libspeex/pseudofloat.h; sourceTree = SOURCE_ROOT; }; - 738837510B193581005C7A69 /* quant_lsp_bfin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = quant_lsp_bfin.h; path = ../libspeex/quant_lsp_bfin.h; sourceTree = SOURCE_ROOT; }; - 738837520B193581005C7A69 /* vorbis_psy.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = vorbis_psy.c; path = ../libspeex/vorbis_psy.c; sourceTree = SOURCE_ROOT; }; - 738837530B193581005C7A69 /* vorbis_psy.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = vorbis_psy.h; path = ../libspeex/vorbis_psy.h; sourceTree = SOURCE_ROOT; }; - 738837770B193667005C7A69 /* libspeex.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libspeex.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 8D07F2C70486CC7A007CD1D0 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = ""; }; - 8D07F2C80486CC7A007CD1D0 /* Speex.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Speex.framework; sourceTree = BUILT_PRODUCTS_DIR; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 738837750B193667005C7A69 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 8D07F2C30486CC7A007CD1D0 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 034768DDFF38A45A11DB9C8B /* Products */ = { - isa = PBXGroup; - children = ( - 8D07F2C80486CC7A007CD1D0 /* Speex.framework */, - 738837770B193667005C7A69 /* libspeex.a */, - ); - name = Products; - sourceTree = ""; - }; - 0867D691FE84028FC02AAC07 /* Speex */ = { - isa = PBXGroup; - children = ( - 08FB77ACFE841707C02AAC07 /* Source */, - 73814AEB0907FB6400C478FC /* Headers */, - 089C1665FE841158C02AAC07 /* Resources */, - 0867D69AFE84028FC02AAC07 /* External Frameworks and Libraries */, - 034768DDFF38A45A11DB9C8B /* Products */, - ); - name = Speex; - sourceTree = ""; - }; - 0867D69AFE84028FC02AAC07 /* External Frameworks and Libraries */ = { - isa = PBXGroup; - children = ( - ); - name = "External Frameworks and Libraries"; - sourceTree = ""; - }; - 089C1665FE841158C02AAC07 /* Resources */ = { - isa = PBXGroup; - children = ( - 8D07F2C70486CC7A007CD1D0 /* Info.plist */, - 089C1666FE841158C02AAC07 /* InfoPlist.strings */, - ); - name = Resources; - sourceTree = ""; - }; - 08FB77ACFE841707C02AAC07 /* Source */ = { - isa = PBXGroup; - children = ( - 37CA8DFF0DD7352A005C8CB6 /* os_support.h */, - 37CA8DED0DD73408005C8CB6 /* buffer.c */, - 37CA8DEE0DD73408005C8CB6 /* resample.c */, - 37CA8DEF0DD73408005C8CB6 /* resample_sse.h */, - 738837460B193581005C7A69 /* _kiss_fft_guts.h */, - 738837470B193581005C7A69 /* fftwrap.c */, - 738837480B193581005C7A69 /* fftwrap.h */, - 738837490B193581005C7A69 /* filterbank.c */, - 7388374A0B193581005C7A69 /* filterbank.h */, - 7388374B0B193581005C7A69 /* kiss_fft.c */, - 7388374C0B193581005C7A69 /* kiss_fft.h */, - 7388374D0B193581005C7A69 /* kiss_fftr.c */, - 7388374E0B193581005C7A69 /* kiss_fftr.h */, - 738837500B193581005C7A69 /* pseudofloat.h */, - 738837520B193581005C7A69 /* vorbis_psy.c */, - 738837530B193581005C7A69 /* vorbis_psy.h */, - 73814B0C0907FC9900C478FC /* arch.h */, - 73814B1E0907FC9900C478FC /* fixed_arm4.h */, - 73814B1F0907FC9900C478FC /* fixed_arm5e.h */, - 73814B200907FC9900C478FC /* fixed_bfin.h */, - 73814B210907FC9900C478FC /* fixed_debug.h */, - 73814B220907FC9900C478FC /* fixed_generic.h */, - 73814B280907FC9900C478FC /* jitter.c */, - 73814B380907FC9900C478FC /* math_approx.h */, - 73814B390907FC9900C478FC /* mdf.c */, - 73814B3A0907FC9900C478FC /* misc_bfin.h */, - 73814B410907FC9900C478FC /* preprocess.c */, - 73814B460907FC9900C478FC /* smallft.c */, - 73814B470907FC9900C478FC /* smallft.h */, - 73814B4B0907FC9900C478FC /* stack_alloc.h */, - 73814B4D0907FC9900C478FC /* testdenoise.c */, - 73814B4E0907FC9900C478FC /* testecho.c */, - 32BAE0B70371A74B00C91783 /* Speex_Prefix.pch */, - ); - name = Source; - sourceTree = ""; - }; - 73814AEB0907FB6400C478FC /* Headers */ = { - isa = PBXGroup; - children = ( - 73814AEC0907FB8200C478FC /* speex */, - ); - name = Headers; - sourceTree = ""; - }; - 73814AEC0907FB8200C478FC /* speex */ = { - isa = PBXGroup; - children = ( - 73814AEF0907FB8200C478FC /* speex.h */, - 37CA8DF70DD7347D005C8CB6 /* speex_buffer.h */, - 73814AF30907FB8200C478FC /* speex_echo.h */, - 73814AF40907FB8200C478FC /* speex_header.h */, - 73814AF50907FB8200C478FC /* speex_jitter.h */, - 73814AF60907FB8200C478FC /* speex_preprocess.h */, - 37CA8DF80DD7347D005C8CB6 /* speex_resampler.h */, - 73814AF80907FB8200C478FC /* speex_types.h */, - ); - name = speex; - path = ../include/speex; - sourceTree = SOURCE_ROOT; - }; -/* End PBXGroup section */ - -/* Begin PBXHeadersBuildPhase section */ - 738837730B193667005C7A69 /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 8D07F2BD0486CC7A007CD1D0 /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - 73814AFF0907FB8200C478FC /* speex_echo.h in Headers */, - 73814B000907FB8200C478FC /* speex_header.h in Headers */, - 73814B010907FB8200C478FC /* speex_jitter.h in Headers */, - 73814B020907FB8200C478FC /* speex_preprocess.h in Headers */, - 73814B030907FB8200C478FC /* speex_stereo.h in Headers */, - 73814B040907FB8200C478FC /* speex_types.h in Headers */, - 73814B060907FBAB00C478FC /* speex_callbacks.h in Headers */, - 73814B080907FBAE00C478FC /* speex.h in Headers */, - 738837540B193581005C7A69 /* _kiss_fft_guts.h in Headers */, - 738837560B193581005C7A69 /* fftwrap.h in Headers */, - 738837580B193581005C7A69 /* filterbank.h in Headers */, - 7388375A0B193581005C7A69 /* kiss_fft.h in Headers */, - 7388375C0B193581005C7A69 /* kiss_fftr.h in Headers */, - 7388375D0B193581005C7A69 /* lsp_bfin.h in Headers */, - 7388375E0B193581005C7A69 /* pseudofloat.h in Headers */, - 7388375F0B193581005C7A69 /* quant_lsp_bfin.h in Headers */, - 738837610B193581005C7A69 /* vorbis_psy.h in Headers */, - 37CA8DF60DD73424005C8CB6 /* resample_sse.h in Headers */, - 37CA8DF90DD7347D005C8CB6 /* speex_buffer.h in Headers */, - 37CA8DFA0DD7347D005C8CB6 /* speex_resampler.h in Headers */, - 37CA8E000DD7352A005C8CB6 /* os_support.h in Headers */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXHeadersBuildPhase section */ - -/* Begin PBXNativeTarget section */ - 738837760B193667005C7A69 /* libspeex (static) */ = { - isa = PBXNativeTarget; - buildConfigurationList = 738837780B193687005C7A69 /* Build configuration list for PBXNativeTarget "libspeex (static)" */; - buildPhases = ( - 738837730B193667005C7A69 /* Headers */, - 738837740B193667005C7A69 /* Sources */, - 738837750B193667005C7A69 /* Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = "libspeex (static)"; - productName = speex; - productReference = 738837770B193667005C7A69 /* libspeex.a */; - productType = "com.apple.product-type.library.static"; - }; - 8D07F2BC0486CC7A007CD1D0 /* Speex */ = { - isa = PBXNativeTarget; - buildConfigurationList = 73814ADF0907FB1E00C478FC /* Build configuration list for PBXNativeTarget "Speex" */; - buildPhases = ( - 8D07F2BD0486CC7A007CD1D0 /* Headers */, - 8D07F2BF0486CC7A007CD1D0 /* Resources */, - 8D07F2C10486CC7A007CD1D0 /* Sources */, - 8D07F2C30486CC7A007CD1D0 /* Frameworks */, - 8D07F2C50486CC7A007CD1D0 /* Rez */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = Speex; - productInstallPath = "$(HOME)/Library/Frameworks"; - productName = Speex; - productReference = 8D07F2C80486CC7A007CD1D0 /* Speex.framework */; - productType = "com.apple.product-type.framework"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 0867D690FE84028FC02AAC07 /* Project object */ = { - isa = PBXProject; - buildConfigurationList = 73814AE30907FB1E00C478FC /* Build configuration list for PBXProject "Speex" */; - compatibilityVersion = "Xcode 2.4"; - hasScannedForEncodings = 1; - mainGroup = 0867D691FE84028FC02AAC07 /* Speex */; - productRefGroup = 034768DDFF38A45A11DB9C8B /* Products */; - projectDirPath = ""; - projectRoot = ..; - targets = ( - 8D07F2BC0486CC7A007CD1D0 /* Speex */, - 738837760B193667005C7A69 /* libspeex (static) */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - 8D07F2BF0486CC7A007CD1D0 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 8D07F2C00486CC7A007CD1D0 /* InfoPlist.strings in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXRezBuildPhase section */ - 8D07F2C50486CC7A007CD1D0 /* Rez */ = { - isa = PBXRezBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXRezBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 738837740B193667005C7A69 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 738837830B193791005C7A69 /* fftwrap.c in Sources */, - 738837840B193792005C7A69 /* filterbank.c in Sources */, - 7388378B0B1937A0005C7A69 /* jitter.c in Sources */, - 7388378C0B1937A4005C7A69 /* kiss_fft.c in Sources */, - 7388378D0B1937A9005C7A69 /* kiss_fftr.c in Sources */, - 738837940B1937BB005C7A69 /* mdf.c in Sources */, - 738837980B1937C2005C7A69 /* preprocess.c in Sources */, - 7388379B0B1937C9005C7A69 /* smallft.c in Sources */, - 738837A10B1937DD005C7A69 /* vorbis_psy.c in Sources */, - 37CA8DF30DD73408005C8CB6 /* buffer.c in Sources */, - 37CA8DF40DD73408005C8CB6 /* resample.c in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 8D07F2C10486CC7A007CD1D0 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 73814B750907FC9900C478FC /* jitter.c in Sources */, - 73814B8E0907FC9900C478FC /* preprocess.c in Sources */, - 73814B930907FC9900C478FC /* smallft.c in Sources */, - 738837440B1934D0005C7A69 /* mdf.c in Sources */, - 738837550B193581005C7A69 /* fftwrap.c in Sources */, - 738837570B193581005C7A69 /* filterbank.c in Sources */, - 738837590B193581005C7A69 /* kiss_fft.c in Sources */, - 7388375B0B193581005C7A69 /* kiss_fftr.c in Sources */, - 738837600B193581005C7A69 /* vorbis_psy.c in Sources */, - 37CA8DF00DD73408005C8CB6 /* buffer.c in Sources */, - 37CA8DF10DD73408005C8CB6 /* resample.c in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin PBXVariantGroup section */ - 089C1666FE841158C02AAC07 /* InfoPlist.strings */ = { - isa = PBXVariantGroup; - children = ( - 089C1667FE841158C02AAC07 /* English */, - ); - name = InfoPlist.strings; - sourceTree = ""; - }; -/* End PBXVariantGroup section */ - -/* Begin XCBuildConfiguration section */ - 73814AE00907FB1E00C478FC /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - COPY_PHASE_STRIP = NO; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - FRAMEWORK_VERSION = A; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = Speex_Prefix.pch; - INFOPLIST_FILE = Info.plist; - INSTALL_PATH = /Library/Frameworks; - LIBRARY_STYLE = DYNAMIC; - MACH_O_TYPE = mh_dylib; - PRODUCT_NAME = Speex; - WRAPPER_EXTENSION = framework; - ZERO_LINK = YES; - }; - name = Debug; - }; - 73814AE10907FB1E00C478FC /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - COPY_PHASE_STRIP = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - FRAMEWORK_VERSION = A; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = Speex_Prefix.pch; - INFOPLIST_FILE = Info.plist; - INSTALL_PATH = /Library/Frameworks; - LIBRARY_STYLE = DYNAMIC; - MACH_O_TYPE = mh_dylib; - PRODUCT_NAME = Speex; - WRAPPER_EXTENSION = framework; - ZERO_LINK = NO; - }; - name = Release; - }; - 73814AE40907FB1E00C478FC /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "$(inherited)", - __MACOSX__, - FLOATING_POINT, - "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_PROJECT_1)", - ); - GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_PROJECT_1 = "EXPORT=__attribute__((visibility(\\\"default\\\")))"; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; - }; - name = Debug; - }; - 73814AE50907FB1E00C478FC /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ARCHS = ( - ppc, - i386, - ); - GCC_OPTIMIZATION_LEVEL = 3; - GCC_PREPROCESSOR_DEFINITIONS = ( - "$(inherited)", - __MACOSX__, - FLOATING_POINT, - "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_PROJECT_1)", - ); - GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_PROJECT_1 = "EXPORT=__attribute__((visibility(\\\"default\\\")))"; - OTHER_CFLAGS = ( - "$(OTHER_CFLAGS)", - "-falign-loops=16", - ); - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; - }; - name = Release; - }; - 738837790B193687005C7A69 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - INSTALL_PATH = /usr/local/lib; - PREBINDING = NO; - PRODUCT_NAME = speex; - ZERO_LINK = YES; - }; - name = Debug; - }; - 7388377A0B193687005C7A69 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - COPY_PHASE_STRIP = YES; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - INSTALL_PATH = /usr/local/lib; - PREBINDING = NO; - PRODUCT_NAME = speex; - ZERO_LINK = NO; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 73814ADF0907FB1E00C478FC /* Build configuration list for PBXNativeTarget "Speex" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 73814AE00907FB1E00C478FC /* Debug */, - 73814AE10907FB1E00C478FC /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 73814AE30907FB1E00C478FC /* Build configuration list for PBXProject "Speex" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 73814AE40907FB1E00C478FC /* Debug */, - 73814AE50907FB1E00C478FC /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 738837780B193687005C7A69 /* Build configuration list for PBXNativeTarget "libspeex (static)" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 738837790B193687005C7A69 /* Debug */, - 7388377A0B193687005C7A69 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = 0867D690FE84028FC02AAC07 /* Project object */; -} diff --git a/speex/macosx/Speex_Prefix.pch b/speex/macosx/Speex_Prefix.pch deleted file mode 100644 index 13abf5e4171f0b02d4a2994c816bdaae4d31f01f..0000000000000000000000000000000000000000 --- a/speex/macosx/Speex_Prefix.pch +++ /dev/null @@ -1,5 +0,0 @@ -// -// Prefix header for all source files of the 'Speex' target in the 'Speex' project. -// - -#include diff --git a/speex/macosx/Speex_UB.xcodeproj/project.pbxproj b/speex/macosx/Speex_UB.xcodeproj/project.pbxproj deleted file mode 100644 index 1cd5f2e41bc4417c42fe4a3aaf8c0dfc7d23e258..0000000000000000000000000000000000000000 --- a/speex/macosx/Speex_UB.xcodeproj/project.pbxproj +++ /dev/null @@ -1,435 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 42; - objects = { - -/* Begin PBXBuildFile section */ - 73814AFF0907FB8200C478FC /* speex_echo.h in Headers */ = {isa = PBXBuildFile; fileRef = 73814AF30907FB8200C478FC /* speex_echo.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 73814B000907FB8200C478FC /* speex_header.h in Headers */ = {isa = PBXBuildFile; fileRef = 73814AF40907FB8200C478FC /* speex_header.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 73814B010907FB8200C478FC /* speex_jitter.h in Headers */ = {isa = PBXBuildFile; fileRef = 73814AF50907FB8200C478FC /* speex_jitter.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 73814B020907FB8200C478FC /* speex_preprocess.h in Headers */ = {isa = PBXBuildFile; fileRef = 73814AF60907FB8200C478FC /* speex_preprocess.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 73814B030907FB8200C478FC /* speex_stereo.h in Headers */ = {isa = PBXBuildFile; fileRef = 73814AF70907FB8200C478FC /* speex_stereo.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 73814B040907FB8200C478FC /* speex_types.h in Headers */ = {isa = PBXBuildFile; fileRef = 73814AF80907FB8200C478FC /* speex_types.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 73814B060907FBAB00C478FC /* speex_callbacks.h in Headers */ = {isa = PBXBuildFile; fileRef = 73814AF10907FB8200C478FC /* speex_callbacks.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 73814B070907FBAD00C478FC /* speex_bits.h in Headers */ = {isa = PBXBuildFile; fileRef = 73814AF00907FB8200C478FC /* speex_bits.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 73814B080907FBAE00C478FC /* speex.h in Headers */ = {isa = PBXBuildFile; fileRef = 73814AEF0907FB8200C478FC /* speex.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 73814B750907FC9900C478FC /* jitter.c in Sources */ = {isa = PBXBuildFile; fileRef = 73814B280907FC9900C478FC /* jitter.c */; }; - 73814B840907FC9900C478FC /* math_approx.c in Sources */ = {isa = PBXBuildFile; fileRef = 73814B370907FC9900C478FC /* math_approx.c */; }; - 73814B880907FC9900C478FC /* misc.c in Sources */ = {isa = PBXBuildFile; fileRef = 73814B3B0907FC9900C478FC /* misc.c */; }; - 73814B8E0907FC9900C478FC /* preprocess.c in Sources */ = {isa = PBXBuildFile; fileRef = 73814B410907FC9900C478FC /* preprocess.c */; }; - 73814B930907FC9900C478FC /* smallft.c in Sources */ = {isa = PBXBuildFile; fileRef = 73814B460907FC9900C478FC /* smallft.c */; }; - 8D07F2C00486CC7A007CD1D0 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C1666FE841158C02AAC07 /* InfoPlist.strings */; }; -/* End PBXBuildFile section */ - -/* Begin PBXBuildStyle section */ - 4F0BB7EC011F40E904CA0E50 /* Development */ = { - isa = PBXBuildStyle; - buildSettings = { - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - ZERO_LINK = YES; - }; - name = Development; - }; - 4F0BB7ED011F40E904CA0E50 /* Deployment */ = { - isa = PBXBuildStyle; - buildSettings = { - COPY_PHASE_STRIP = YES; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - ZERO_LINK = NO; - }; - name = Deployment; - }; -/* End PBXBuildStyle section */ - -/* Begin PBXFileReference section */ - 089C1667FE841158C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = ""; }; - 32BAE0B70371A74B00C91783 /* Speex_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Speex_Prefix.pch; sourceTree = ""; }; - 73814AEF0907FB8200C478FC /* speex.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = speex.h; sourceTree = ""; }; - 73814AF00907FB8200C478FC /* speex_bits.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = speex_bits.h; sourceTree = ""; }; - 73814AF10907FB8200C478FC /* speex_callbacks.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = speex_callbacks.h; sourceTree = ""; }; - 73814AF30907FB8200C478FC /* speex_echo.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = speex_echo.h; sourceTree = ""; }; - 73814AF40907FB8200C478FC /* speex_header.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = speex_header.h; sourceTree = ""; }; - 73814AF50907FB8200C478FC /* speex_jitter.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = speex_jitter.h; sourceTree = ""; }; - 73814AF60907FB8200C478FC /* speex_preprocess.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = speex_preprocess.h; sourceTree = ""; }; - 73814AF70907FB8200C478FC /* speex_stereo.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = speex_stereo.h; sourceTree = ""; }; - 73814AF80907FB8200C478FC /* speex_types.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = speex_types.h; sourceTree = ""; }; - 73814B0C0907FC9900C478FC /* arch.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = arch.h; path = ../libspeex/arch.h; sourceTree = SOURCE_ROOT; }; - 73814B1E0907FC9900C478FC /* fixed_arm4.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = fixed_arm4.h; path = ../libspeex/fixed_arm4.h; sourceTree = SOURCE_ROOT; }; - 73814B1F0907FC9900C478FC /* fixed_arm5e.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = fixed_arm5e.h; path = ../libspeex/fixed_arm5e.h; sourceTree = SOURCE_ROOT; }; - 73814B200907FC9900C478FC /* fixed_bfin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = fixed_bfin.h; path = ../libspeex/fixed_bfin.h; sourceTree = SOURCE_ROOT; }; - 73814B210907FC9900C478FC /* fixed_debug.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = fixed_debug.h; path = ../libspeex/fixed_debug.h; sourceTree = SOURCE_ROOT; }; - 73814B220907FC9900C478FC /* fixed_generic.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = fixed_generic.h; path = ../libspeex/fixed_generic.h; sourceTree = SOURCE_ROOT; }; - 73814B280907FC9900C478FC /* jitter.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = jitter.c; path = ../libspeex/jitter.c; sourceTree = SOURCE_ROOT; }; - 73814B370907FC9900C478FC /* math_approx.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = math_approx.c; path = ../libspeex/math_approx.c; sourceTree = SOURCE_ROOT; }; - 73814B380907FC9900C478FC /* math_approx.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = math_approx.h; path = ../libspeex/math_approx.h; sourceTree = SOURCE_ROOT; }; - 73814B390907FC9900C478FC /* mdf.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = mdf.c; path = ../libspeex/mdf.c; sourceTree = SOURCE_ROOT; }; - 73814B3A0907FC9900C478FC /* misc_bfin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = misc_bfin.h; path = ../libspeex/misc_bfin.h; sourceTree = SOURCE_ROOT; }; - 73814B3B0907FC9900C478FC /* misc.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = misc.c; path = ../libspeex/misc.c; sourceTree = SOURCE_ROOT; }; - 73814B3C0907FC9900C478FC /* misc.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = misc.h; path = ../libspeex/misc.h; sourceTree = SOURCE_ROOT; }; - 73814B3E0907FC9900C478FC /* modes.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = modes.h; path = ../libspeex/modes.h; sourceTree = SOURCE_ROOT; }; - 73814B410907FC9900C478FC /* preprocess.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = preprocess.c; path = ../libspeex/preprocess.c; sourceTree = SOURCE_ROOT; }; - 73814B460907FC9900C478FC /* smallft.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = smallft.c; path = ../libspeex/smallft.c; sourceTree = SOURCE_ROOT; }; - 73814B470907FC9900C478FC /* smallft.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = smallft.h; path = ../libspeex/smallft.h; sourceTree = SOURCE_ROOT; }; - 73814B4B0907FC9900C478FC /* stack_alloc.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = stack_alloc.h; path = ../libspeex/stack_alloc.h; sourceTree = SOURCE_ROOT; }; - 73814B4D0907FC9900C478FC /* testdenoise.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = testdenoise.c; path = ../libspeex/testdenoise.c; sourceTree = SOURCE_ROOT; }; - 73814B4E0907FC9900C478FC /* testecho.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = testecho.c; path = ../libspeex/testecho.c; sourceTree = SOURCE_ROOT; }; - 8D07F2C70486CC7A007CD1D0 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = ""; }; - 8D07F2C80486CC7A007CD1D0 /* Speex.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Speex.framework; sourceTree = BUILT_PRODUCTS_DIR; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 8D07F2C30486CC7A007CD1D0 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 034768DDFF38A45A11DB9C8B /* Products */ = { - isa = PBXGroup; - children = ( - 8D07F2C80486CC7A007CD1D0 /* Speex.framework */, - ); - name = Products; - sourceTree = ""; - }; - 0867D691FE84028FC02AAC07 /* Speex */ = { - isa = PBXGroup; - children = ( - 08FB77ACFE841707C02AAC07 /* Source */, - 73814AEB0907FB6400C478FC /* Headers */, - 089C1665FE841158C02AAC07 /* Resources */, - 0867D69AFE84028FC02AAC07 /* External Frameworks and Libraries */, - 034768DDFF38A45A11DB9C8B /* Products */, - ); - name = Speex; - sourceTree = ""; - }; - 0867D69AFE84028FC02AAC07 /* External Frameworks and Libraries */ = { - isa = PBXGroup; - children = ( - ); - name = "External Frameworks and Libraries"; - sourceTree = ""; - }; - 089C1665FE841158C02AAC07 /* Resources */ = { - isa = PBXGroup; - children = ( - 8D07F2C70486CC7A007CD1D0 /* Info.plist */, - 089C1666FE841158C02AAC07 /* InfoPlist.strings */, - ); - name = Resources; - sourceTree = ""; - }; - 08FB77ACFE841707C02AAC07 /* Source */ = { - isa = PBXGroup; - children = ( - 73814B0C0907FC9900C478FC /* arch.h */, - 73814B1E0907FC9900C478FC /* fixed_arm4.h */, - 73814B1F0907FC9900C478FC /* fixed_arm5e.h */, - 73814B200907FC9900C478FC /* fixed_bfin.h */, - 73814B210907FC9900C478FC /* fixed_debug.h */, - 73814B220907FC9900C478FC /* fixed_generic.h */, - 73814B280907FC9900C478FC /* jitter.c */, - 73814B370907FC9900C478FC /* math_approx.c */, - 73814B380907FC9900C478FC /* math_approx.h */, - 73814B390907FC9900C478FC /* mdf.c */, - 73814B3A0907FC9900C478FC /* misc_bfin.h */, - 73814B3B0907FC9900C478FC /* misc.c */, - 73814B3C0907FC9900C478FC /* misc.h */, - 73814B410907FC9900C478FC /* preprocess.c */, - 73814B460907FC9900C478FC /* smallft.c */, - 73814B470907FC9900C478FC /* smallft.h */, - 73814B4B0907FC9900C478FC /* stack_alloc.h */, - 73814B4D0907FC9900C478FC /* testdenoise.c */, - 73814B4E0907FC9900C478FC /* testecho.c */, - 32BAE0B70371A74B00C91783 /* Speex_Prefix.pch */, - ); - name = Source; - sourceTree = ""; - }; - 73814AEB0907FB6400C478FC /* Headers */ = { - isa = PBXGroup; - children = ( - 73814AEC0907FB8200C478FC /* speex */, - ); - name = Headers; - sourceTree = ""; - }; - 73814AEC0907FB8200C478FC /* speex */ = { - isa = PBXGroup; - children = ( - 73814AEF0907FB8200C478FC /* speex.h */, - 73814AF00907FB8200C478FC /* speex_bits.h */, - 73814AF10907FB8200C478FC /* speex_callbacks.h */, - 73814AF30907FB8200C478FC /* speex_echo.h */, - 73814AF40907FB8200C478FC /* speex_header.h */, - 73814AF50907FB8200C478FC /* speex_jitter.h */, - 73814AF60907FB8200C478FC /* speex_preprocess.h */, - 73814AF70907FB8200C478FC /* speex_stereo.h */, - 73814AF80907FB8200C478FC /* speex_types.h */, - ); - name = speex; - path = ../include/speex; - sourceTree = SOURCE_ROOT; - }; -/* End PBXGroup section */ - -/* Begin PBXHeadersBuildPhase section */ - 8D07F2BD0486CC7A007CD1D0 /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - 73814AFF0907FB8200C478FC /* speex_echo.h in Headers */, - 73814B000907FB8200C478FC /* speex_header.h in Headers */, - 73814B010907FB8200C478FC /* speex_jitter.h in Headers */, - 73814B020907FB8200C478FC /* speex_preprocess.h in Headers */, - 73814B030907FB8200C478FC /* speex_stereo.h in Headers */, - 73814B040907FB8200C478FC /* speex_types.h in Headers */, - 73814B060907FBAB00C478FC /* speex_callbacks.h in Headers */, - 73814B070907FBAD00C478FC /* speex_bits.h in Headers */, - 73814B080907FBAE00C478FC /* speex.h in Headers */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXHeadersBuildPhase section */ - -/* Begin PBXNativeTarget section */ - 8D07F2BC0486CC7A007CD1D0 /* Speex */ = { - isa = PBXNativeTarget; - buildConfigurationList = 73814ADF0907FB1E00C478FC /* Build configuration list for PBXNativeTarget "Speex" */; - buildPhases = ( - 8D07F2BD0486CC7A007CD1D0 /* Headers */, - 8D07F2BF0486CC7A007CD1D0 /* Resources */, - 8D07F2C10486CC7A007CD1D0 /* Sources */, - 8D07F2C30486CC7A007CD1D0 /* Frameworks */, - 8D07F2C50486CC7A007CD1D0 /* Rez */, - ); - buildRules = ( - ); - buildSettings = { - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - FRAMEWORK_VERSION = A; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = Speex_Prefix.pch; - INFOPLIST_FILE = Info.plist; - INSTALL_PATH = "$(HOME)/Library/Frameworks"; - LIBRARY_STYLE = DYNAMIC; - PRODUCT_NAME = Speex; - WRAPPER_EXTENSION = framework; - }; - dependencies = ( - ); - name = Speex; - productInstallPath = "$(HOME)/Library/Frameworks"; - productName = Speex; - productReference = 8D07F2C80486CC7A007CD1D0 /* Speex.framework */; - productType = "com.apple.product-type.framework"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 0867D690FE84028FC02AAC07 /* Project object */ = { - isa = PBXProject; - buildConfigurationList = 73814AE30907FB1E00C478FC /* Build configuration list for PBXProject "Speex_UB" */; - buildSettings = { - }; - buildStyles = ( - 4F0BB7EC011F40E904CA0E50 /* Development */, - 4F0BB7ED011F40E904CA0E50 /* Deployment */, - ); - hasScannedForEncodings = 1; - mainGroup = 0867D691FE84028FC02AAC07 /* Speex */; - productRefGroup = 034768DDFF38A45A11DB9C8B /* Products */; - projectDirPath = ""; - targets = ( - 8D07F2BC0486CC7A007CD1D0 /* Speex */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - 8D07F2BF0486CC7A007CD1D0 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 8D07F2C00486CC7A007CD1D0 /* InfoPlist.strings in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXRezBuildPhase section */ - 8D07F2C50486CC7A007CD1D0 /* Rez */ = { - isa = PBXRezBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXRezBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 8D07F2C10486CC7A007CD1D0 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 73814B750907FC9900C478FC /* jitter.c in Sources */, - 73814B840907FC9900C478FC /* math_approx.c in Sources */, - 73814B880907FC9900C478FC /* misc.c in Sources */, - 73814B8E0907FC9900C478FC /* preprocess.c in Sources */, - 73814B930907FC9900C478FC /* smallft.c in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin PBXVariantGroup section */ - 089C1666FE841158C02AAC07 /* InfoPlist.strings */ = { - isa = PBXVariantGroup; - children = ( - 089C1667FE841158C02AAC07 /* English */, - ); - name = InfoPlist.strings; - sourceTree = ""; - }; -/* End PBXVariantGroup section */ - -/* Begin XCBuildConfiguration section */ - 73814AE00907FB1E00C478FC /* Development */ = { - isa = XCBuildConfiguration; - buildSettings = { - COPY_PHASE_STRIP = NO; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - FRAMEWORK_VERSION = A; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = Speex_Prefix.pch; - INFOPLIST_FILE = Info.plist; - INSTALL_PATH = /Library/Frameworks; - LIBRARY_STYLE = DYNAMIC; - MACH_O_TYPE = mh_dylib; - PRODUCT_NAME = Speex; - WRAPPER_EXTENSION = framework; - ZERO_LINK = YES; - }; - name = Development; - }; - 73814AE10907FB1E00C478FC /* Deployment */ = { - isa = XCBuildConfiguration; - buildSettings = { - COPY_PHASE_STRIP = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - FRAMEWORK_VERSION = A; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = Speex_Prefix.pch; - INFOPLIST_FILE = Info.plist; - INSTALL_PATH = /Library/Frameworks; - LIBRARY_STYLE = DYNAMIC; - MACH_O_TYPE = mh_dylib; - PRODUCT_NAME = Speex; - WRAPPER_EXTENSION = framework; - ZERO_LINK = NO; - }; - name = Deployment; - }; - 73814AE20907FB1E00C478FC /* Default */ = { - isa = XCBuildConfiguration; - buildSettings = { - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - FRAMEWORK_VERSION = A; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = Speex_Prefix.pch; - INFOPLIST_FILE = Info.plist; - INSTALL_PATH = /Library/Frameworks; - LIBRARY_STYLE = DYNAMIC; - MACH_O_TYPE = mh_dylib; - PRODUCT_NAME = Speex; - WRAPPER_EXTENSION = framework; - }; - name = Default; - }; - 73814AE40907FB1E00C478FC /* Development */ = { - isa = XCBuildConfiguration; - buildSettings = { - ARCHS = ( - ppc, - i386, - ); - GCC_PREPROCESSOR_DEFINITIONS = __MACOSX__; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; - }; - name = Development; - }; - 73814AE50907FB1E00C478FC /* Deployment */ = { - isa = XCBuildConfiguration; - buildSettings = { - ARCHS = ( - ppc, - i386, - ); - GCC_PREPROCESSOR_DEFINITIONS = __MACOSX__; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; - }; - name = Deployment; - }; - 73814AE60907FB1E00C478FC /* Default */ = { - isa = XCBuildConfiguration; - buildSettings = { - ARCHS = ( - ppc, - i386, - ); - GCC_PREPROCESSOR_DEFINITIONS = __MACOSX__; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; - }; - name = Default; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 73814ADF0907FB1E00C478FC /* Build configuration list for PBXNativeTarget "Speex" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 73814AE00907FB1E00C478FC /* Development */, - 73814AE10907FB1E00C478FC /* Deployment */, - 73814AE20907FB1E00C478FC /* Default */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Default; - }; - 73814AE30907FB1E00C478FC /* Build configuration list for PBXProject "Speex_UB" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 73814AE40907FB1E00C478FC /* Development */, - 73814AE50907FB1E00C478FC /* Deployment */, - 73814AE60907FB1E00C478FC /* Default */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Default; - }; -/* End XCConfigurationList section */ - }; - rootObject = 0867D690FE84028FC02AAC07 /* Project object */; -} diff --git a/speex/regression-fixes/1-resampler_unsigned_fix.patch b/speex/regression-fixes/1-resampler_unsigned_fix.patch deleted file mode 100644 index 99a4c8a6d3795e9141973a037df5d2e9004a8975..0000000000000000000000000000000000000000 --- a/speex/regression-fixes/1-resampler_unsigned_fix.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/libspeex/resample.c b/libspeex/resample.c -index 4403f78..48ffcef 100644 ---- a/libspeex/resample.c -+++ b/libspeex/resample.c -@@ -561,10 +561,10 @@ static void update_filter(SpeexResamplerState *st) - } - for (i=0;iden_rate;i++) - { -- spx_uint32_t j; -+ spx_int32_t j; - for (j=0;jfilt_len;j++) - { -- st->sinc_table[i*st->filt_len+j] = sinc(st->cutoff,((j-st->filt_len/2+1)-((float)i)/st->den_rate), st->filt_len, quality_map[st->quality].window_func); -+ st->sinc_table[i*st->filt_len+j] = sinc(st->cutoff,((j-(spx_int32_t)st->filt_len/2+1)-((float)i)/st->den_rate), st->filt_len, quality_map[st->quality].window_func); - } - } - #ifdef FIXED_POINT diff --git a/speex/regressions b/speex/regressions deleted file mode 100644 index 2a176317237131b1bcdb495108a855ba3d4b2c48..0000000000000000000000000000000000000000 --- a/speex/regressions +++ /dev/null @@ -1,4 +0,0 @@ -1: 723f644e09333a0230383eae4af1f3aa3e46e1c3 (r12736): broke resampler badly -Changed the sign of a bunch of parameters in the API. Tons of signed/unsigned changes in the code as a consequence of that. Hopefully this will be the last change to the API. -Fixed: 2007-08-11 - diff --git a/speex/speexdsp.pc.in b/speex/speexdsp.pc.in deleted file mode 100644 index 6c6d26f3ab6e9b6bc95dcac2c601ee0e9c45b15b..0000000000000000000000000000000000000000 --- a/speex/speexdsp.pc.in +++ /dev/null @@ -1,15 +0,0 @@ -# libspeexdsp pkg-config source file - -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: speexdsp -Description: Speexdsp is a speech processing library that goes along with the Speex codec -Version: @PACKAGE_VERSION@ -Requires: @FFT_PKGCONFIG@ -Conflicts: -Libs: -L${libdir} -lspeexdsp -Libs.private: @LIBM@ -Cflags: -I${includedir} diff --git a/speex/symbian/Makefile.am b/speex/symbian/Makefile.am deleted file mode 100644 index 6cdaf24b4b1b02f8a74f00ec4a94d1170e2b310d..0000000000000000000000000000000000000000 --- a/speex/symbian/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -## Process this file with automake to produce Makefile.in. -*-Makefile-*- - -# Disable automatic dependency tracking if using other tools than gcc and gmake -#AUTOMAKE_OPTIONS = no-dependencies - -EXTRA_DIST = bld.inf config.h speex.mmp diff --git a/speex/symbian/bld.inf b/speex/symbian/bld.inf deleted file mode 100644 index da5ef4875277a6d808b3f35ebe6234dcc2710e77..0000000000000000000000000000000000000000 --- a/speex/symbian/bld.inf +++ /dev/null @@ -1,49 +0,0 @@ -/* - Copyright (C) 2003 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: - - - 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 CSIRO Australia 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 ORGANISATION 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. -*/ - -PRJ_EXPORTS - -..\include\speex\speex_bits.h \epoc32\include\speex\speex_bits.h -..\include\speex\speex_callbacks.h \epoc32\include\speex\speex_callbacks.h -..\include\speex\speex_config_types.h \epoc32\include\speex\speex_config_types.h -..\include\speex\speex_echo.h \epoc32\include\speex\speex_echo.h -..\include\speex\speex.h \epoc32\include\speex\speex.h -..\include\speex\speex_header.h \epoc32\include\speex\speex_header.h -..\include\speex\speex_jitter.h \epoc32\include\speex\speex_jitter.h -..\include\speex\speex_preprocess.h \epoc32\include\speex\speex_preprocess.h -..\include\speex\speex_stereo.h \epoc32\include\speex\speex_stereo.h -..\include\speex\speex_types.h \epoc32\include\speex\speex_types.h - - -PRJ_MMPFILES - -speex.mmp diff --git a/speex/symbian/speex.mmp b/speex/symbian/speex.mmp deleted file mode 100644 index 6274e4dea3790f9bd40dbea38ec644391ca5ae7c..0000000000000000000000000000000000000000 --- a/speex/symbian/speex.mmp +++ /dev/null @@ -1,40 +0,0 @@ -/* - Copyright (C) 2003 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: - - - 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 CSIRO Australia 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 ORGANISATION 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. -*/ - -TARGET speex.lib -TARGETTYPE lib -UID 0 -MACRO HAVE_CONFIG_H -SOURCEPATH ..\libspeex -SOURCE buffer.c fftwrap.c filterbank.c jitter.c kiss_fft.c kiss_fftr.c mdf.c preprocess.c resample.c scal.c smallft.c -USERINCLUDE . ..\include\speex -SYSTEMINCLUDE \epoc32\include \epoc32\include\libc ..\include diff --git a/speex/ti/Makefile.am b/speex/ti/Makefile.am deleted file mode 100644 index fd3c496245ef122c95727340e7df3c960887fc01..0000000000000000000000000000000000000000 --- a/speex/ti/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -## Process this file with automake to produce Makefile.in. -*-Makefile-*- - -# Disable automatic dependency tracking if using other tools than gcc and gmake -#AUTOMAKE_OPTIONS = no-dependencies - -SUBDIRS = speex_C54_test speex_C55_test speex_C64_test - -EXTRA_DIST = config.h os_support_custom.h - diff --git a/speex/ti/os_support_custom.h b/speex/ti/os_support_custom.h deleted file mode 100644 index 8f832cf64a3992c975f629ac682292aa063bbf74..0000000000000000000000000000000000000000 --- a/speex/ti/os_support_custom.h +++ /dev/null @@ -1,128 +0,0 @@ -/* Copyright (C) 2007 Psi Systems, Inc. - Author: Jean-Marc Valin - File: os_support_custom.h - Memory Allocation overrides to allow user control rather than C alloc/free. - - 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 MANUAL_ALLOC - -/* To avoid changing the Speex call model, this file relies on four static variables - The user main creates two linear buffers, and initializes spxGlobalHeap/ScratchPtr - to point to the start of the two buffers, and initializes spxGlobalHeap/ScratchEnd - to point to the first address following the last byte of the two buffers. - - This mechanism allows, for example, data caching for multichannel applications, - where the Speex state is swapped from a large slow memory to a small fast memory - each time the codec runs. - - Persistent data is allocated in spxGlobalHeap (instead of calloc), while scratch - data is allocated in spxGlobalScratch. -*/ - -extern char *spxGlobalHeapPtr, *spxGlobalHeapEnd; -extern char *spxGlobalScratchPtr, *spxGlobalScratchEnd; - -/* Make sure that all structures are aligned to largest type */ -#define BLOCK_MASK (sizeof(long double)-1) -extern inline void speex_warning(const char *str); - -#define OVERRIDE_SPEEX_ALLOC -static inline void *speex_alloc (int size) -{ - void *ptr; - - ptr = (void *) (((int)spxGlobalHeapPtr + BLOCK_MASK) & ~BLOCK_MASK); //Start on 8 boundary - - spxGlobalHeapPtr = (char *)((int)ptr + size); // Update pointer to next free location - - if (spxGlobalHeapPtr > spxGlobalHeapEnd ) - { -#ifdef VERBOSE_ALLOC - fprintf (stderr, "insufficient space for persistent alloc request %d bytes\n", size); -#endif - return 0; - } - -#ifdef VERBOSE_ALLOC - fprintf (stderr, "Persist Allocated %d chars at %x, %d remaining\n", size, ptr, ((int)spxGlobalHeapEnd - (int)spxGlobalHeapPtr)); -#endif - memset(ptr, 0, size); - return ptr; -} - -#define OVERRIDE_SPEEX_ALLOC_SCRATCH -static inline void *speex_alloc_scratch (int size) -{ - void *ptr; - - ptr = (void *) (((int)spxGlobalScratchPtr + BLOCK_MASK) & ~BLOCK_MASK); //Start on 8 boundary - - spxGlobalScratchPtr = (char *)((int)ptr + size); // Update pointer to next free location - - if (spxGlobalScratchPtr > spxGlobalScratchEnd ) - { -#ifdef VERBOSE_ALLOC - fprintf (stderr, "insufficient space for scratch alloc request %d bytes\n", size); -#endif - return 0; - } - -#ifdef VERBOSE_ALLOC - fprintf (stderr, "Scratch Allocated %d chars at %x, %d remaining\n", size, ptr, ((int)spxGlobalScratchEnd - (int)spxGlobalScratchPtr)); -#endif - memset(ptr, 0, size); - return ptr; -} - -#define OVERRIDE_SPEEX_REALLOC -static inline void *speex_realloc (void *ptr, int size) -{ -#ifdef VERBOSE_ALLOC - speex_warning("realloc attempted, not allowed"); -#endif - return 0; -} - -#define OVERRIDE_SPEEX_FREE -static inline void speex_free (void *ptr) -{ -#ifdef VERBOSE_ALLOC - speex_warning("at speex_free"); -#endif -} -#define OVERRIDE_SPEEX_FREE_SCRATCH -static inline void speex_free_scratch (void *ptr) -{ -#ifdef VERBOSE_ALLOC - speex_warning("at speex_free_scratch"); -#endif -} - -#endif /* !MANUAL_ALLOC */ diff --git a/speex/ti/speex_C54_test/Makefile.am b/speex/ti/speex_C54_test/Makefile.am deleted file mode 100644 index f7b10bc4c5701d4ea3d668ed675ed364e583a456..0000000000000000000000000000000000000000 --- a/speex/ti/speex_C54_test/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -## Process this file with automake to produce Makefile.in. -*-Makefile-*- - -# Disable automatic dependency tracking if using other tools than gcc and gmake -#AUTOMAKE_OPTIONS = no-dependencies - -EXTRA_DIST = speex_C54_test.cmd speex_C54_test.pjt - - diff --git a/speex/ti/speex_C54_test/speex_C54_test.cmd b/speex/ti/speex_C54_test/speex_C54_test.cmd deleted file mode 100644 index 4989a35f7ca9f3063a9e24203e17f7919d41d935..0000000000000000000000000000000000000000 --- a/speex/ti/speex_C54_test/speex_C54_test.cmd +++ /dev/null @@ -1,71 +0,0 @@ -/* Copyright (C) 2005 Psi Systems, Inc. - File: speex_C54_test.cmd - Linker command file with memory allocation for TI TMS320VC5416 processor - for use with TI Code Composer (TM) DSP development tools. - - 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. -*/ - --c --stack 0x2000 --heap 0x1000 /* If private memory allocation is used for Speex */ -/*-heap 0x6000 /* If calloc is used for Speex */ --lrts_ext.lib - -MEMORY -{ -/* PAGE 0: P_DARAM03: origin = 0x80, len = 0x7f00*/ - PAGE 0: P_DARAM03: origin = 0x5000, len = 0x2f80 - PAGE 0: VECT: origin = 0x7f80, len = 0x80 - PAGE 0: P_DARAM47: origin = 0x18000, len = 0x8000 - PAGE 0: SARAM03: origin = 0x28000, len = 0x8000 - PAGE 0: SARAM47: origin = 0x38000, len = 0x8000 - - PAGE 1: USERREGS: origin = 0x60, len = 0x1a - PAGE 1: BIOSREGS: origin = 0x7c, len = 0x4 - PAGE 1: CSLREGS: origin = 0x7a, len = 0x2 - D_DARAM03: origin = 0x80, len = 0x4f80 - D_DARAM47: origin = 0x8000, len = 0x8000 -} - -SECTIONS -{ - .vectors: {} > VECT PAGE 0 - .bootmem: {rts_ext.lib (.text)} > P_DARAM03 PAGE 0 -/* .bootmem: {} > P_DARAM03 PAGE 0 */ - .text: {} > SARAM03 PAGE 0 - .cinit: {} > SARAM03 PAGE 0 - .switch: {} > SARAM03 PAGE 0 - .bss: {} > D_DARAM03 | D_DARAM47 PAGE 1 - .far: {} > D_DARAM03 | D_DARAM47 PAGE 1 - .const: {} > D_DARAM03 | D_DARAM47 PAGE 1 - .sysmem: {} > D_DARAM47 PAGE 1 - .cio: {} > D_DARAM03 | D_DARAM47 PAGE 1 - .stack: {} > D_DARAM03 | D_DARAM47 PAGE 1 - .myheap: {} > D_DARAM47 PAGE 1 -} diff --git a/speex/ti/speex_C54_test/speex_C54_test.pjt b/speex/ti/speex_C54_test/speex_C54_test.pjt deleted file mode 100644 index e74bb1ba0722e397f6e968f31cde39aa62695055..0000000000000000000000000000000000000000 --- a/speex/ti/speex_C54_test/speex_C54_test.pjt +++ /dev/null @@ -1,44 +0,0 @@ -; Code Composer Project File, Version 2.0 (do not modify or remove this line) - -[Project Settings] -ProjectDir="C:\Speex\speex_14274\ti\speex_C54_test\" -ProjectType=Executable -CPUFamily=TMS320C54XX -Tool="Compiler" -Tool="CustomBuilder" -Tool="DspBiosBuilder" -Tool="Linker" -Config="Debug" -Config="Release" - -[Source Files] -Source="..\..\libspeexdsp\buffer.c" -Source="..\..\libspeexdsp\fftwrap.c" -Source="..\..\libspeexdsp\filterbank.c" -Source="..\..\libspeexdsp\jitter.c" -Source="..\..\libspeexdsp\kiss_fft.c" -Source="..\..\libspeexdsp\kiss_fftr.c" -Source="..\..\libspeexdsp\mdf.c" -Source="..\..\libspeexdsp\preprocess.c" -Source="..\..\libspeexdsp\resample.c" -Source="..\..\libspeexdsp\scal.c" -Source="speex_C54_test.cmd" - -["Compiler" Settings: "Debug"] -Options=-g -q -o3 -fr"..\ti\speex_C54_test\Debug" -i"..\ti" -i"..\include" -d"_DEBUG" -d"CONFIG_TI_C54X" -d"HAVE_CONFIG_H" -d"NO_LONGLONG" -mf -ms - -["Compiler" Settings: "Release"] -Options=-q -o2 -fr"..\ti\speex_C54_test\Release" -i"..\ti" -i"..\include" -d"CONFIG_TI_C54X" -d"HAVE_CONFIG_H" -d"NO_LONGLONG" -mf -ms - -["DspBiosBuilder" Settings: "Debug"] -Options=-v54 - -["DspBiosBuilder" Settings: "Release"] -Options=-v54 - -["Linker" Settings: "Debug"] -Options=-q -c -heap4096 -m".\Debug\speex_C54_test.map" -o".\Debug\speex_C54_test.out" -stack4096 -w -x - -["Linker" Settings: "Release"] -Options=-q -c -m".\Release\speex_C54_test.map" -o".\Release\speex_C54_test.out" -w -x - diff --git a/speex/ti/speex_C55_test/Makefile.am b/speex/ti/speex_C55_test/Makefile.am deleted file mode 100644 index 6c89ed7c151f660bf28186da52ba9552d74d4d51..0000000000000000000000000000000000000000 --- a/speex/ti/speex_C55_test/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -## Process this file with automake to produce Makefile.in. -*-Makefile-*- - -# Disable automatic dependency tracking if using other tools than gcc and gmake -#AUTOMAKE_OPTIONS = no-dependencies - -EXTRA_DIST = speex_C55_test.cmd speex_C55_test.pjt diff --git a/speex/ti/speex_C55_test/speex_C55_test.cmd b/speex/ti/speex_C55_test/speex_C55_test.cmd deleted file mode 100644 index 17cbf01dcb86865f6d53cd59636bd0cd3f091f6d..0000000000000000000000000000000000000000 --- a/speex/ti/speex_C55_test/speex_C55_test.cmd +++ /dev/null @@ -1,65 +0,0 @@ -/* Copyright (C) 2005 Psi Systems, Inc. - File: speex_C55_test.cmd - Linker command file with memory allocation for TI TMS320VC5509A processor - for use with TI Code Composer (TM) DSP development tools. - - 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. -*/ - --c --stack 0x1c00 --heap 0x1000 /* If private memory allocation is used for Speex */ -/*-heap 0x6000 / * If calloc is used for Speex */ --sysstack 0x200 --lrts55.lib - -MEMORY -{ - DARAM: origin = 0x200, len = 0x7e00 - DARAM_B: origin = 0x8000, len = 0x8000 - VECT: origin = 0x100, len = 0x100 - SARAM_A: origin = 0x10000, len = 0x10000 - SARAM_B: origin = 0x20000, len = 0x20000 -} - -SECTIONS -{ - .vectors: {} > VECT - .bootmem: {} > DARAM - .text: {} > SARAM_B - .cinit: {} > SARAM_B - .switch: {} > SARAM_B - .bss: {} > DARAM -/* .far: {} > DARAM*/ - .const: {} > DARAM - .sysmem: {} > DARAM_B - .cio: {} > DARAM - .stack: {} > DARAM - .sysstack: {} > DARAM - .myheap: {} > SARAM_A -} diff --git a/speex/ti/speex_C55_test/speex_C55_test.pjt b/speex/ti/speex_C55_test/speex_C55_test.pjt deleted file mode 100644 index a4e0cd5ff151910a54e803ba92448d2cb8e9daad..0000000000000000000000000000000000000000 --- a/speex/ti/speex_C55_test/speex_C55_test.pjt +++ /dev/null @@ -1,44 +0,0 @@ -; Code Composer Project File, Version 2.0 (do not modify or remove this line) - -[Project Settings] -ProjectDir="C:\Speex\speex_14274\ti\speex_C55_test\" -ProjectType=Executable -CPUFamily=TMS320C55XX -Tool="Compiler" -Tool="CustomBuilder" -Tool="DspBiosBuilder" -Tool="Linker" -Config="Debug" -Config="Release" - -[Source Files] -Source="..\..\libspeexdsp\buffer.c" -Source="..\..\libspeexdsp\fftwrap.c" -Source="..\..\libspeexdsp\filterbank.c" -Source="..\..\libspeexdsp\jitter.c" -Source="..\..\libspeexdsp\kiss_fft.c" -Source="..\..\libspeexdsp\kiss_fftr.c" -Source="..\..\libspeexdsp\mdf.c" -Source="..\..\libspeexdsp\preprocess.c" -Source="..\..\libspeexdsp\resample.c" -Source="..\..\libspeexdsp\scal.c" -Source="speex_C55_test.cmd" - -["Compiler" Settings: "Debug"] -Options=-g -q -o3 -fr"..\ti\speex_C55_test\Debug" -i"..\ti" -i"..\include" -d"_DEBUG" -d"CONFIG_TI_C55X" -d"HAVE_CONFIG_H" -mn - -["Compiler" Settings: "Release"] -Options=-q -o2 -fr"..\ti\speex_C55_test\Release" -i"..\ti" -i"..\include" -d"CONFIG_TI_C55X" -d"HAVE_CONFIG_H" -mn - -["DspBiosBuilder" Settings: "Debug"] -Options=-v55 - -["DspBiosBuilder" Settings: "Release"] -Options=-v55 - -["Linker" Settings: "Debug"] -Options=-q -c -m".\Debug\speex_C55_test.map" -o".\Debug\speex_C55_test.out" -w -x - -["Linker" Settings: "Release"] -Options=-q -c -m".\Release\speex_C55_test.map" -o".\Release\speex_C55_test.out" -w -x - diff --git a/speex/ti/speex_C64_test/Makefile.am b/speex/ti/speex_C64_test/Makefile.am deleted file mode 100644 index 14ea2baaeab51546af17cb562f7b332481709749..0000000000000000000000000000000000000000 --- a/speex/ti/speex_C64_test/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -## Process this file with automake to produce Makefile.in. -*-Makefile-*- - -# Disable automatic dependency tracking if using other tools than gcc and gmake -#AUTOMAKE_OPTIONS = no-dependencies - -EXTRA_DIST = speex_C64_test.cmd speex_C64_test.pjt diff --git a/speex/ti/speex_C64_test/speex_C64_test.cmd b/speex/ti/speex_C64_test/speex_C64_test.cmd deleted file mode 100644 index 1e023db65f12688f12cb4953fe44888470c3edd5..0000000000000000000000000000000000000000 --- a/speex/ti/speex_C64_test/speex_C64_test.cmd +++ /dev/null @@ -1,59 +0,0 @@ -/* Copyright (C) 2005 Psi Systems, Inc. - File: speex_C64_test.cmd - Linker command file with memory allocation for TI TMS320C6415 processor - for use with TI Code Composer (TM) DSP development tools. - - 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. -*/ - --stack 0x10000 --heap 0x10000 - - -MEMORY -{ - VECRAM : origin = 0x0, len = 0x200 - IPRAM : origin = 0x200, len = 0x40000 - IDRAM : origin = 0x80000, len = 0x70000 -} - -SECTIONS -{ - .vectors > VECRAM - .text > IPRAM - - .bss > IDRAM - .cinit > IDRAM - .const > IDRAM - .far > IDRAM - .stack > IDRAM - .cio > IDRAM - .sysmem > IDRAM - .switch > IDRAM - .myheap > IDRAM -} diff --git a/speex/ti/speex_C64_test/speex_C64_test.pjt b/speex/ti/speex_C64_test/speex_C64_test.pjt deleted file mode 100644 index f4767d06872beb6740da987c9ee7d4ec58541a32..0000000000000000000000000000000000000000 --- a/speex/ti/speex_C64_test/speex_C64_test.pjt +++ /dev/null @@ -1,45 +0,0 @@ -; Code Composer Project File, Version 2.0 (do not modify or remove this line) - -[Project Settings] -ProjectDir="C:\Speex\speex_14274\ti\speex_C64_test\" -ProjectType=Executable -CPUFamily=TMS320C64XX -Tool="Compiler" -Tool="CustomBuilder" -Tool="DspBiosBuilder" -Tool="Linker" -Config="Debug" -Config="Release" - -[Source Files] -Source="..\..\..\..\CCStudio_v3.1\C6000\cgtools\lib\rts6400.lib" -Source="..\..\libspeexdsp\buffer.c" -Source="..\..\libspeexdsp\fftwrap.c" -Source="..\..\libspeexdsp\filterbank.c" -Source="..\..\libspeexdsp\jitter.c" -Source="..\..\libspeexdsp\kiss_fft.c" -Source="..\..\libspeexdsp\kiss_fftr.c" -Source="..\..\libspeexdsp\mdf.c" -Source="..\..\libspeexdsp\preprocess.c" -Source="..\..\libspeexdsp\resample.c" -Source="..\..\libspeexdsp\scal.c" -Source="speex_C64_test.cmd" - -["Compiler" Settings: "Debug"] -Options=-g -o3 -fr"$(Proj_dir)\Debug" -i"..\ti" -i"..\include" -d"_DEBUG" -d"CONFIG_TI_C6X" -d"HAVE_CONFIG_H" -mv6400 - -["Compiler" Settings: "Release"] -Options=-o3 -fr"$(Proj_dir)\Release" -i"..\ti" -i"..\include" -d"HAVE_CONFIG_H" -mv6400 - -["DspBiosBuilder" Settings: "Debug"] -Options=-v6x - -["DspBiosBuilder" Settings: "Release"] -Options=-v6x - -["Linker" Settings: "Debug"] -Options=-c -m".\Debug\speex_C64_test.map" -o".\Debug\speex_C64_test.out" -w -x - -["Linker" Settings: "Release"] -Options=-c -m".\Release\speex_C64_test.map" -o".\Release\speex_C64_test.out" -w -x - diff --git a/speex/tmv/_kiss_fft_guts_tm.h b/speex/tmv/_kiss_fft_guts_tm.h deleted file mode 100644 index 55c30490504a2abafa00071235d2ab5e0f758319..0000000000000000000000000000000000000000 --- a/speex/tmv/_kiss_fft_guts_tm.h +++ /dev/null @@ -1,188 +0,0 @@ -/* Copyright (C) 2007 Hong Zhiqian */ -/** - @file _kiss_fft_guts_tm.h - @author Hong Zhiqian - @brief Various compatibility routines for Speex (TriMedia version) -*/ -/* - 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 _KISS_FFT_GUTS_TM_ -#define _KISS_FFT_GUTS_TM_ - -#ifdef TM_ASM - -#include - -#ifdef FIXED_POINT - -#undef sround -#define sround(x) sex16(((x) + (1<<(FRACBITS-1)) ) >> FRACBITS) - -#undef MIN -#undef MAX -#define MIN(a,b) imin(a,b) -#define MAX(a,b) imax(a,b) - -#define TM_MUL(res,a,b) \ - { register int a0, a1, b0, b1; \ - \ - a0 = sex16((a)); \ - a1 = asri(16,(a)); \ - b0 = sex16((b)); \ - b1 = asri(16,(b)); \ - (res)= pack16lsb( \ - sround(ifir16((a),funshift2((b),(b)))), \ - sround(a0*b0-a1*b1)); \ - } \ - -#define TM_ADD(res,a,b) \ - { (res)=dspidualadd((a),(b)); \ - } \ - -#define TM_SUB(res,a,b) \ - { (res)=dspidualsub((a),(b)); \ - } \ - -#define TM_SHR(res,a,shift) \ - { (res)=dualasr((a),(shift)); \ - } \ - -#define TM_DIV(res,c,frac) \ - { register int c1, c0; \ - \ - c1 = asri(16,(c)); \ - c0 = sex16((c)); \ - (res) = pack16lsb(sround(c1 * (32767/(frac))), sround(c0 * (32767/(frac))));\ - } \ - -#define TM_NEGMSB(res, a) \ - { (res) = pack16lsb((ineg(asri(16,(a)))), (a)); \ - } \ - -#else - -#undef MIN -#undef MAX -#define MIN(a,b) fmin(a,b) -#define MAX(a,b) fmax(a,b) - -#endif -#endif - -#undef CHECKBUF -#define CHECKBUF(buf,nbuf,n) \ - { \ - if ( nbuf < (size_t)(n) ) { \ - speex_free(buf); \ - buf = (kiss_fft_cpx*)KISS_FFT_MALLOC(sizeof(kiss_fft_cpx)*(n)); \ - nbuf = (size_t)(n); \ - } \ - } \ - -#undef C_ADD -#define C_ADD( res, a,b) \ - { \ - CHECK_OVERFLOW_OP((a).r,+,(b).r) \ - CHECK_OVERFLOW_OP((a).i,+,(b).i) \ - (res).r=(a).r+(b).r; (res).i=(a).i+(b).i; \ - } \ - - -#undef C_SUB -#define C_SUB( res, a,b) \ - { \ - CHECK_OVERFLOW_OP((a).r,-,(b).r) \ - CHECK_OVERFLOW_OP((a).i,-,(b).i) \ - (res).r=(a).r-(b).r; (res).i=(a).i-(b).i; \ - } \ - -#undef C_ADDTO -#define C_ADDTO( res , a) \ - { \ - CHECK_OVERFLOW_OP((res).r,+,(a).r) \ - CHECK_OVERFLOW_OP((res).i,+,(a).i) \ - (res).r += (a).r; (res).i += (a).i; \ - } \ - -#undef C_SUBFROM -#define C_SUBFROM( res, a) \ - { \ - CHECK_OVERFLOW_OP((res).r,-,(a).r) \ - CHECK_OVERFLOW_OP((res).i,-,(a).i) \ - (res).r -= (a).r; (res).i -= (a).i; \ - } \ - -#undef kf_cexp -#define kf_cexp(x,phase) \ - { (x)->r = KISS_FFT_COS(phase); \ - (x)->i = KISS_FFT_SIN(phase); } \ - -#undef kf_cexp2 -#define kf_cexp2(x,phase) \ - { (x)->r = spx_cos_norm((phase)); \ - (x)->i = spx_cos_norm((phase)-32768); } \ - - -#ifdef FIXED_POINT - -#undef C_MUL -#define C_MUL(m,a,b) \ - { (m).r = sround( smul((a).r,(b).r) - smul((a).i,(b).i) ); \ - (m).i = sround( smul((a).r,(b).i) + smul((a).i,(b).r) ); } \ - -#undef C_FIXDIV -#define C_FIXDIV(c,div) \ - { DIVSCALAR( (c).r , div); \ - DIVSCALAR( (c).i , div); } \ - -#undef C_MULBYSCALAR -#define C_MULBYSCALAR( c, s ) \ - { (c).r = sround( smul( (c).r , s ) ) ; \ - (c).i = sround( smul( (c).i , s ) ) ; } \ - -#else - -#undef C_MUL -#define C_MUL(m,a,b) \ - { (m).r = (a).r*(b).r - (a).i*(b).i; \ - (m).i = (a).r*(b).i + (a).i*(b).r; } \ - - -#undef C_MULBYSCALAR -#define C_MULBYSCALAR( c, s ) \ - { (c).r *= (s); \ - (c).i *= (s); } \ - - - -#endif - -#endif - diff --git a/speex/tmv/fftwrap_tm.h b/speex/tmv/fftwrap_tm.h deleted file mode 100644 index ac1564fe4f7f7fa3151fc35e9ef575116544b33d..0000000000000000000000000000000000000000 --- a/speex/tmv/fftwrap_tm.h +++ /dev/null @@ -1,233 +0,0 @@ -/* Copyright (C) 2007 Hong Zhiqian */ -/** - @file fftwrap_tm.h - @author Hong Zhiqian - @brief Various compatibility routines for Speex (TriMedia version) -*/ -/* - 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. -*/ -#include -#include "profile_tm.h" - -#ifdef FIXED_POINT - -#define OVERRIDE_MAXIMIZE_RANGE -static int maximize_range(Int16 *in, Int16 *out, int bound, int len) -{ - register int max_val=0; - register int shift=0; - register int i, j; - - TMDEBUG_ALIGNMEM(in); - TMDEBUG_ALIGNMEM(out); - - MAXIMIZERANGE_START(); - - len >>= 1; - - for ( i=0 ; i>1) && max_val != 0 ) - { max_val <<= 1; - shift++; - } - - if ( shift != 0 ) - { - for ( i=0,j=0 ; i>1); - s = pack16lsb(s,s); - - len >>= 1; - l = len & (int)0xFFFFFFFE; - - for ( i=0,j=0 ; i>= 1; - - for( i=1 ; i -#include "profile_tm.h" - -#ifdef FIXED_POINT - -#define OVERRIDE_FILTERBANK_COMPUTE_BANK32 -void filterbank_compute_bank32(FilterBank * restrict bank, spx_word32_t * restrict ps, spx_word32_t * restrict mel) -{ - register int i, j, k, banks, len, zero, s; - register int * restrict left; - register int * restrict right; - register int * restrict bleft; - register int * restrict bright; - - left = (int*)bank->filter_left; - right = (int*)bank->filter_right; - bleft = (int*)bank->bank_left; - bright = (int*)bank->bank_right; - - TMDEBUG_ALIGNMEM(ps); - TMDEBUG_ALIGNMEM(mel); - TMDEBUG_ALIGNMEM(left); - TMDEBUG_ALIGNMEM(right); - TMDEBUG_ALIGNMEM(bleft); - TMDEBUG_ALIGNMEM(bright); - - FILTERBANKCOMPUTEBANK32_START(); - - banks = bank->nb_banks << 2; - zero = 0; - len = bank->len; - s = (1<<((15))>>1); - -#if (TM_UNROLL && TM_UNROLL_FILTERBANKCOMPUTEBANK32) -#pragma TCS_unroll=2 -#pragma TCS_unrollexact=1 -#endif - for ( i=0 ; i> 15; - ps0_lsb = ps0 & 0x00007fff; - left0 = sex16(left10); - right0 = sex16(right10); - - _mel += left0 * ps0_msb + ((left0 * ps0_lsb + s ) >> 15); - mel[il0]= _mel; - _mel = ld32x(mel,ir0); - _mel += right0 * ps0_msb + ((right0 * ps0_lsb + s ) >> 15); - mel[ir0]= _mel; - - ps1 = ld32x(ps,j); - il1 = ld32x(bleft,j); - _mel = ld32x(mel,il1); - ir1 = ld32x(bright,j); - - left1 = asri(16,left10); - right1 = asri(16,right10); - ps1_msb = ps1 >> 15; - ps1_lsb = ps1 & 0x00007fff; - - _mel += left1 * ps1_msb + ((left1 * ps1_lsb + s ) >> 15); - mel[il1]= _mel; - _mel = ld32x(mel,ir1); - _mel += right1 * ps1_msb + ((right1 * ps1_lsb + s ) >> 15); - mel[ir1]= _mel; - } -#if (TM_UNROLL && TM_UNROLL_FILTERBANKCOMPUTEBANK32) -#pragma TCS_unrollexact=0 -#pragma TCS_unroll=0 -#endif - - FILTERBANKCOMPUTEBANK32_STOP(); -} - -#define OVERRIDE_FILTERBANK_COMPUTE_PSD16 -void filterbank_compute_psd16(FilterBank * restrict bank, spx_word16_t * restrict mel, spx_word16_t * restrict ps) -{ - register int i, j, k, len, s; - register int * restrict left; - register int * restrict right; - register int * restrict bleft; - register int * restrict bright; - - left = (int*)bank->filter_left; - right = (int*)bank->filter_right; - bleft = (int*)bank->bank_left; - bright = (int*)bank->bank_right; - - TMDEBUG_ALIGNMEM(ps); - TMDEBUG_ALIGNMEM(mel); - TMDEBUG_ALIGNMEM(left); - TMDEBUG_ALIGNMEM(right); - TMDEBUG_ALIGNMEM(bleft); - TMDEBUG_ALIGNMEM(bright); - - FILTERBANKCOMPUTEPSD16_START(); - - len = bank->len; - s = (1<<((15))>>1); - -#if (TM_UNROLL && TM_UNROLL_FILTERBANKCOMPUTEPSD16) -#pragma TCS_unroll=2 -#pragma TCS_unrollexact=1 -#endif - for ( i=0,j=0,k=0 ; i>= 15; - - il1 = ld32x(bleft, i+1); - ir1 = ld32x(bright,i+1); - mell1 = mel[il1]; - melr1 = mel[ir1]; - mel1 = pack16lsb(mell1, melr1); - lr1 = pack16msb(left10, right10); - - acc1 += ifir16(mel1, lr1); - acc1 >>= 15; - - ps10 = pack16lsb(acc1, acc0); - - st32d(j, ps, ps10); - } -#if (TM_UNROLL && TM_UNROLL_FILTERBANKCOMPUTEPSD16) -#pragma TCS_unrollexact=0 -#pragma TCS_unroll=0 -#endif - - FILTERBANKCOMPUTEPSD16_STOP(); -} - -#else - -#define OVERRIDE_FILTERBANK_COMPUTE_BANK32 -void filterbank_compute_bank32(FilterBank * restrict bank, float * restrict ps, float * restrict mel) -{ - register int i, banks, len; - register int * restrict bleft, * restrict bright; - register float * restrict left, * restrict right; - - banks = bank->nb_banks; - len = bank->len; - bleft = bank->bank_left; - bright= bank->bank_right; - left = bank->filter_left; - right = bank->filter_right; - - FILTERBANKCOMPUTEBANK32_START(); - - memset(mel, 0, banks * sizeof(float)); - -#if (TM_UNROLL && TM_UNROLL_FILTERBANKCOMPUTEBANK32) -#pragma TCS_unroll=4 -#pragma TCS_unrollexact=1 -#endif - for ( i=0 ; ilen; - bleft = bank->bank_left; - bright= bank->bank_right; - left = bank->filter_left; - right = bank->filter_right; - - FILTERBANKCOMPUTEPSD16_START(); - -#if (TM_UNROLL && TM_UNROLL_FILTERBANKCOMPUTEPSD16) -#pragma TCS_unroll=4 -#pragma TCS_unrollexact=1 -#endif - for ( i=0 ; i - - -#undef SATURATE -#undef SATURATE16 -#undef SATURATE32 -#define SATURATE(x,a) iclipi(x,a) -#define SATURATE16(x,a) iclipi(x,a) -#define SATURATE32(x,a) iclipi(x,a) - -#undef EXTEND32 -#define EXTEND32(x) sex16(x) - -#undef NEG16 -#undef NEG32 -#define NEG16(x) ineg((int)(x)) -#define NEG32(x) ineg(x) - -#undef ABS -#undef ABS16 -#undef ABS32 -#define ABS(x) iabs(x) -#define ABS32(x) iabs(x) -#define ABS16(x) iabs((int)(x)) - -#undef MIN16 -#undef MIN32 -#define MIN16(a,b) imin((int)(a),(int)(b)) -#define MIN32(a,b) imin(a,b) - -#undef MAX16 -#undef MAX32 -#define MAX16(a,b) imax((int)(a),(int)(b)) -#define MAX32(a,b) imax(a,b) - -#undef ADD16 -#undef SUB16 -#undef ADD32 -#undef SUB32 -#undef MULT16_16 -#undef MULT16_16_16 - -#define ADD16(a,b) ((int)(a) + (int)(b)) -#define SUB16(a,b) ((int)(a) - (int)(b)) -#define ADD32(a,b) ((int)(a) + (int)(b)) -#define SUB32(a,b) ((int)(a) - (int)(b)) -#define MULT16_16_16(a,b) ((int)(a) * (int)(b)) -#define MULT16_16(a,b) ((int)(a) * (int)(b)) - -#if TM_DEBUGMEM_ALIGNNMENT -#include -#define TMDEBUG_ALIGNMEM(x) \ - { if( ((int)(x) & (int)(0x00000003)) != 0 ) \ - { printf("memory not align. file: %s, line: %d\n", __FILE__, __LINE__); \ - } \ - } - -#else -#define TMDEBUG_ALIGNMEM(x) -#endif - -#endif - diff --git a/speex/tmv/kiss_fft_tm.h b/speex/tmv/kiss_fft_tm.h deleted file mode 100644 index 5390bac19adb1881daa6ae3b4249d9bc0d74fcef..0000000000000000000000000000000000000000 --- a/speex/tmv/kiss_fft_tm.h +++ /dev/null @@ -1,599 +0,0 @@ -/* Copyright (C) 2007 Hong Zhiqian */ -/** - @file kiss_fft_tm.h - @author Hong Zhiqian - @brief Various compatibility routines for Speex (TriMedia version) -*/ -/* - 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. -*/ - -#include "_kiss_fft_guts_tm.h" - -#ifdef TM_ASM - -#include "profile_tm.h" - -#ifdef FIXED_POINT - -#define OVERRIDE_KFBFLY2 -static void kf_bfly2( - kiss_fft_cpx *Fout, - const int fstride, - const kiss_fft_cfg st, - int m - ) -{ - register int * restrict Fout2; - register int * restrict tw1 = (int*)st->twiddles; - register int i, j; - register int _inv = !st->inverse; - - Fout2 = (int*)Fout + m; - - for ( i=0,j=0 ; iinverse; - - tw3 = tw2 = tw1 = (int*)st->twiddles; - fstride2 = fstride << 1; - fstride3 = fstride * 3; - - Fout1 = (int*)Fout + m; - Fout2 = (int*)Fout + (m << 1); - Fout3 = (int*)Fout + (m * 3); - - - for ( i=0,j=0 ; iinverse; - - tw1 = tw2 = (int*)st->twiddles; - Fout1 = (int*)Fout + m; - Fout2 = (int*)Fout + (m << 1); - epi = tw1[fstride*m]; - epi = pack16lsb(epi,epi); - fstride2 = fstride << 1; - - for ( i=0,j=0 ; iinverse; - - - Fout1=(int*)Fout+m; - Fout2=(int*)Fout+(m<<1); - Fout3=(int*)Fout+(3 *m); - Fout4=(int*)Fout+(m<<2); - - tw1 = tw2 = tw3 = tw4 = (int*)st->twiddles; - - i = tw1[fstride*m]; - yab_lsb = tw1[fstride*(m<<1)]; - yab_msb = pack16msb(i, yab_lsb); - yab_lsb = pack16lsb(i, yab_lsb); - yba_msb = funshift2(-sex16(yab_msb), yab_msb); - yba_lsb = funshift2(yab_lsb, yab_lsb); - - fstride2 = fstride << 1; - fstride3 = fstride * 3; - fstride4 = fstride << 2; - - for ( i=0,j=0 ; iinverse; - register int i, j, k, l; - register int * restrict twiddles = (int*)st->twiddles; - register int Norig = st->nfft; - - CHECKBUF(scratchbuf,nscratchbuf,p); - - for ( i=0; i=Norig ) - { twidx -= Norig; - } - - sc = ld32x(scratchbuf,l); - tw = ld32x(twiddles,twidx); - - TM_MUL(sc, sc, tw); - TM_ADD(f10, f10, sc); - } - st32d(k<<2, Fout, f10); - } - } -} - -#else - -#define OVERRIDE_KFBFLY2 -static void kf_bfly2( - kiss_fft_cpx * Fout, - const size_t fstride, - const kiss_fft_cfg st, - int m - ) -{ - register kiss_fft_cpx * restrict Fout2; - register kiss_fft_cpx * restrict tw1 = st->twiddles; - - Fout2 = Fout + m; - - do - { - register kiss_fft_cpx _fout2, _fout, t; - - _fout2 = *Fout2; - _fout = *Fout; - - C_MUL ( t, _fout2, *tw1); - C_SUB (_fout2, _fout, t); - C_ADD (_fout, _fout, t); - - *Fout2 = _fout2; - *Fout = _fout; - - tw1 += fstride; - ++Fout2; - ++Fout; - - } while ( --m ); -} - -#define OVERRIDE_KFBFLY4 -static void kf_bfly4( - kiss_fft_cpx * Fout, - const int fstride, - const kiss_fft_cfg st, - int m - ) -{ - register kiss_fft_cpx * restrict tw1,* restrict tw2,* restrict tw3; - register kiss_fft_cpx * restrict Fout1, * restrict Fout2, * restrict Fout3; - register int _inv = !st->inverse; - - tw3 = tw2 = tw1 = st->twiddles; - - Fout1 = Fout + m; - Fout2 = Fout + (m << 1); - Fout3 = Fout + (m * 3); - - do { - - register kiss_fft_cpx _fout; - register kiss_fft_cpx sc0, sc1, sc2, sc3, sc4, sc5; - - _fout = *Fout; - - C_MUL( sc0,*Fout1, *tw1); - C_MUL( sc1,*Fout2, *tw2); - C_MUL( sc2,*Fout3, *tw3); - C_SUB( sc5, _fout, sc1); - C_ADD( _fout, _fout, sc1); - C_ADD( sc3, sc0, sc2); - C_SUB( sc4, sc0, sc2); - C_SUB(*Fout2, _fout, sc3); - C_ADD( *Fout, _fout, sc3); - - tw1 += fstride; - tw2 += (fstride << 1); - tw3 += (fstride * 3); - - if ( _inv ) - { - Fout1->r = sc5.r + sc4.i; - Fout1->i = sc5.i - sc4.r; - Fout3->r = sc5.r - sc4.i; - Fout3->i = sc5.i + sc4.r; - } - else - { Fout1->r = sc5.r - sc4.i; - Fout1->i = sc5.i + sc4.r; - Fout3->r = sc5.r + sc4.i; - Fout3->i = sc5.i - sc4.r; - } - - - ++Fout; ++Fout1; ++Fout2; ++Fout3; - - } while(--m); -} - -#define OVERRIDE_KFBFLY3 -static void kf_bfly3( - kiss_fft_cpx * Fout, - const int fstride, - const kiss_fft_cfg st, - int m - ) -{ - register kiss_fft_cpx * restrict Fout1, * restrict Fout2; - register kiss_fft_cpx * restrict tw1,* restrict tw2; - register float epi; - - tw1 = tw2 = st->twiddles; - epi = st->twiddles[fstride*m].i; - Fout1 = Fout + m; - Fout2 = Fout + (m << 1); - - do { - - register kiss_fft_cpx _fout; - register kiss_fft_cpx sc0, sc1, sc2, sc3; - - _fout = *Fout; - - C_MUL( sc1, *Fout1, *tw1); - C_MUL( sc2, *Fout2, *tw2); - C_ADD( sc3, sc1, sc2); - C_SUB( sc0, sc1, sc2); - tw1 += fstride; - tw2 += (fstride << 1); - - sc1.r = _fout.r - HALF_OF(sc3.r); - sc1.i = _fout.i - HALF_OF(sc3.i); - - C_MULBYSCALAR(sc0, epi); - C_ADD(*Fout, _fout, sc3); - - Fout2->r = sc1.r + sc0.i; - Fout2->i = sc1.i - sc0.r; - - Fout1->r = sc1.i - sc0.i; - Fout1->i = sc1.r + sc0.r; - - ++Fout; ++Fout1; ++Fout2; - - } while(--m); -} - -#define OVERRIDE_KFBFLY5 -static void kf_bfly5( - kiss_fft_cpx * Fout, - const size_t fstride, - const kiss_fft_cfg st, - int m - ) -{ - register kiss_fft_cpx * restrict Fout1,* restrict Fout2,* restrict Fout3,* restrict Fout4; - register int u; - register kiss_fft_cpx *tw; - register float yar, yai, ybr, ybi; - - Fout1=Fout+m; - Fout2=Fout+(m<<1); - Fout3=Fout+(m*3); - Fout4=Fout+(m<<2); - - tw = st->twiddles; - yar = tw[fstride*m].r; - yai = tw[fstride*m].i; - ybr = tw[fstride*2*m].r; - ybi = tw[fstride*2*m].i; - - for ( u=0; ur = sc0.r + sc7.r + sc8.r; - Fout->i = sc0.i + sc7.i + sc8.i; - - sc5.r = sc0.r + S_MUL(sc7.r,yar) + S_MUL(sc8.r,ybr); - sc5.i = sc0.i + S_MUL(sc7.i,yar) + S_MUL(sc8.i,ybr); - - sc6.r = S_MUL(sc10.i,yai) + S_MUL(sc9.i,ybi); - sc6.i = -S_MUL(sc10.r,yai) - S_MUL(sc9.r,ybi); - - C_SUB(*Fout1,sc5,sc6); - C_ADD(*Fout4,sc5,sc6); - - sc11.r = sc0.r + S_MUL(sc7.r,ybr) + S_MUL(sc8.r,yar); - sc11.i = sc0.i + S_MUL(sc7.i,ybr) + S_MUL(sc8.i,yar); - sc12.r = - S_MUL(sc10.i,ybi) + S_MUL(sc9.i,yai); - sc12.i = S_MUL(sc10.r,ybi) - S_MUL(sc9.r,yai); - C_ADD(*Fout2,sc11,sc12); - C_SUB(*Fout3,sc11,sc12); - - ++Fout1; ++Fout2; ++Fout3; ++Fout4; - } -} - - -#endif - -#endif diff --git a/speex/tmv/kiss_fftr_tm.h b/speex/tmv/kiss_fftr_tm.h deleted file mode 100644 index 8faf10e5de9021f7a0d61d8b8dea59417dbf0954..0000000000000000000000000000000000000000 --- a/speex/tmv/kiss_fftr_tm.h +++ /dev/null @@ -1,235 +0,0 @@ -/* Copyright (C) 2007 Hong Zhiqian */ -/** - @file kiss_fftr_tm.h - @author Hong Zhiqian - @brief Various compatibility routines for Speex (TriMedia version) -*/ -/* - 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. -*/ -#include "_kiss_fft_guts_tm.h" - -#ifdef TM_ASM - -#include "profile_tm.h" - -#ifdef FIXED_POINT - -#define TM_NDIV(res,c,frac) \ - { register int c1, c0; \ - \ - c1 = -asri(16,(c)); \ - c0 = sex16((c)); \ - (res) = pack16lsb(sround(c1 * (32767/(frac))), sround(c0 * (32767/(frac))));\ - } - - -#define OVERRIDE_KISS_FFTR -void kiss_fftr(kiss_fftr_cfg st,const kiss_fft_scalar * restrict timedata, kiss_fft_cpx * restrict freqdata) -{ - register int ncfft, ncfft2, k; - register int * restrict tmpbuf; - register int * restrict twiddles; - - ncfft = st->substate->nfft; - ncfft2 = ncfft >> 1; - tmpbuf = (int*)st->tmpbuf; - twiddles = (int*)st->super_twiddles; - - TMDEBUG_ALIGNMEM(timedata); - TMDEBUG_ALIGNMEM(freqdata); - TMDEBUG_ALIGNMEM(tmpbuf); - TMDEBUG_ALIGNMEM(twiddles); - - kiss_fft(st->substate , (const kiss_fft_cpx*)timedata, st->tmpbuf); - - { - register int tdcr, tdci; - tdcr = sround(st->tmpbuf[0].r * (32767/2)); - tdci = sround(st->tmpbuf[0].i * (32767/2)); - - freqdata[0].r = tdcr + tdci; - freqdata[ncfft].r = tdcr - tdci; - freqdata[ncfft].i = freqdata[0].i = 0; - } - - for ( k=1 ; k <= ncfft2 ; ++k ) - { - register int fpk, fpnk, i, tw, f1k, f2k; - register int fq1, fq2; - - i = ncfft-k; - - fpk = ld32x(tmpbuf,k); - tw = ld32x(twiddles,k); - fpnk = ld32x(tmpbuf,i); - - TM_DIV(fpk, fpk, 2); - TM_NDIV(fpnk,fpnk,2); - - TM_ADD( f1k, fpk , fpnk ); - TM_SUB( f2k, fpk , fpnk ); - TM_MUL( tw , f2k, tw ); - TM_ADD( fq1, f1k, tw ); - TM_SHR( fq1, fq1, 1 ); - TM_SUB( fq2, f1k, tw ); - TM_NEGMSB( fq2, fq2 ); - TM_SHR( fq2, fq2, 1 ); - - - st32d( k<<2, freqdata, fq1 ); - st32d( i<<2, freqdata, fq2 ); - } -} - -#define OVERRIDE_KISS_FFTRI -void kiss_fftri(kiss_fftr_cfg st,const kiss_fft_cpx * restrict freqdata,kiss_fft_scalar * restrict timedata) -{ - register int k, ncfft, ncfft2; - register int * restrict tmpbuf; - register int * restrict twiddles; - - ncfft = st->substate->nfft; - ncfft2 = ncfft >> 1; - tmpbuf = (int*)st->tmpbuf; - twiddles = (int*)st->super_twiddles; - - TMDEBUG_ALIGNMEM(freqdata); - TMDEBUG_ALIGNMEM(timedata); - TMDEBUG_ALIGNMEM(tmpbuf); - TMDEBUG_ALIGNMEM(twiddles); - - { - register int fqr, fqnr; - - fqr = freqdata[0].r; - fqnr = freqdata[ncfft].r; - - st->tmpbuf[0].r = fqr + fqnr; - st->tmpbuf[0].i = fqr - fqnr; - } - - for ( k=1 ; k <= ncfft2 ; ++k ) - { - register int fk, fnkc, i, tw, fek, fok, tmp; - register int tbk, tbn; - - i = ncfft-k; - - fk = ld32x(freqdata,k); - tw = ld32x(twiddles,k); - fnkc = pack16lsb(-freqdata[i].i, freqdata[i].r); - - TM_ADD (fek, fk, fnkc); - TM_SUB (tmp, fk, fnkc); - TM_MUL (fok, tmp, tw ); - TM_ADD (tbk, fek, fok); - TM_SUB (tbn, fek, fok); - TM_NEGMSB(tbn, tbn); - - st32d(k<<2, tmpbuf, tbk); - st32d(i<<2, tmpbuf, tbn); - } - kiss_fft (st->substate, st->tmpbuf, (kiss_fft_cpx *) timedata); -} - -#else - -#define OVERRIDE_KISS_FFTR -void kiss_fftr(kiss_fftr_cfg st,const kiss_fft_scalar * restrict timedata,kiss_fft_cpx * restrict freqdata) -{ - register kiss_fft_cpx fpnk, fpk, f1k, f2k, twk; - register int k, ncfft; - register kiss_fft_cpx * restrict tmpbuf, * restrict tw; - register float tdcr, tdci; - - ncfft = st->substate->nfft; - tmpbuf= st->tmpbuf; - tw = st->super_twiddles; - - kiss_fft( st->substate , (const kiss_fft_cpx*)timedata, tmpbuf ); - - tdcr = tmpbuf[0].r; - tdci = tmpbuf[0].i; - - freqdata[0].r = tdcr + tdci; - freqdata[ncfft].r = tdcr - tdci; - freqdata[ncfft].i = freqdata[0].i = 0; - - for ( k=1;k <= ncfft/2 ; ++k ) - { - fpk = tmpbuf[k]; - fpnk.r = tmpbuf[ncfft-k].r; - fpnk.i = -tmpbuf[ncfft-k].i; - - C_ADD( f1k, fpk , fpnk ); - C_SUB( f2k, fpk , fpnk ); - C_MUL( twk, f2k , tw[k]); - - freqdata[k].r = HALF_OF(f1k.r + twk.r); - freqdata[k].i = HALF_OF(f1k.i + twk.i); - freqdata[ncfft-k].r = HALF_OF(f1k.r - twk.r); - freqdata[ncfft-k].i = HALF_OF(twk.i - f1k.i); - } -} - -#define OVERRIDE_KISS_FFTRI -void kiss_fftri(kiss_fftr_cfg st,const kiss_fft_cpx * restrict freqdata,kiss_fft_scalar * restrict timedata) -{ - register int k, ncfft; - register kiss_fft_cpx * restrict tmpbuf, * restrict tw; - - - ncfft = st->substate->nfft; - tmpbuf= st->tmpbuf; - tw = st->super_twiddles; - - tmpbuf[0].r = freqdata[0].r + freqdata[ncfft].r; - tmpbuf[0].i = freqdata[0].r - freqdata[ncfft].r; - - for (k = 1; k <= ncfft / 2; ++k) - { - register kiss_fft_cpx fk, fnkc, fek, fok, tmp; - fk = freqdata[k]; - fnkc.r = freqdata[ncfft - k].r; - fnkc.i = -freqdata[ncfft - k].i; - - C_ADD (fek, fk, fnkc); - C_SUB (tmp, fk, fnkc); - C_MUL (fok,tmp,tw[k]); - C_ADD (tmpbuf[k],fek, fok); - C_SUB (tmp, fek, fok); - tmpbuf[ncfft - k].r = tmp.r; - tmpbuf[ncfft - k].i = -tmp.i; - } - kiss_fft (st->substate, st->tmpbuf, (kiss_fft_cpx *) timedata); -} - -#endif -#endif - diff --git a/speex/tmv/mdf_tm.h b/speex/tmv/mdf_tm.h deleted file mode 100644 index e7430be165ce773c9a70a83c9c3c6b17480c5f52..0000000000000000000000000000000000000000 --- a/speex/tmv/mdf_tm.h +++ /dev/null @@ -1,1192 +0,0 @@ -/* Copyright (C) 2007 Hong Zhiqian */ -/** - @file mdf_tm.h - @author Hong Zhiqian - @brief Various compatibility routines for Speex (TriMedia version) -*/ -/* - 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. -*/ -#include -#include "profile_tm.h" - -// shifted power spectrum to fftwrap.c so that optimisation can be shared between mdf.c and preprocess.c -#define OVERRIDE_POWER_SPECTRUM - -#ifdef FIXED_POINT - -#else - -#define OVERRIDE_FILTER_DC_NOTCH16 -void filter_dc_notch16( - const spx_int16_t * restrict in, - float radius, - float * restrict out, - int len, - float * restrict mem -) -{ - register int i; - register float den2, r1; - register float mem0, mem1; - - FILTERDCNOTCH16_START(); - - r1 = 1 - radius; - den2 = (radius * radius) + (0.7 * r1 * r1); - mem0 = mem[0]; - mem1 = mem[1]; - -#if (TM_UNROLL && TM_UNROLL_FILTERDCNOTCH16) -#pragma TCS_unroll=4 -#pragma TCS_unrollexact=1 -#endif - for ( i=0 ; i>= 1; - -#if (TM_UNROLL && TM_UNROLL_MDFINNERPRODUCT) -#pragma TCS_unroll=4 -#pragma TCS_unrollexact=1 -#endif - while(len--) - { - register float acc0, acc1; - - acc0 = (*x++) * (*y++); - acc1 = (*x++) * (*y++); - - sum += acc0 + acc1; - } -#if (TM_UNROLL && TM_UNROLL_MDFINNERPRODUCT) -#pragma TCS_unrollexact=0 -#pragma TCS_unroll=0 -#endif - - MDFINNERPROD_STOP(); - - return sum; -} - -#define OVERRIDE_SPECTRAL_MUL_ACCUM -void spectral_mul_accum( - const float * restrict X, - const float * restrict Y, - float * restrict acc, - int N, int M -) -{ - register int i, j; - register float Xi, Yi, Xii, Yii; - register int _N; - - SPECTRALMULACCUM_START(); - - acc[0] = X[0] * Y[0]; - _N = N-1; - - for ( i=1 ; i<_N ; i+=2 ) - { - Xi = X[i]; - Yi = Y[i]; - Xii = X[i+1]; - Yii = Y[i+1]; - - acc[i] = (Xi * Yi - Xii * Yii); - acc[i+1]= (Xii * Yi + Xi * Yii); - } - - acc[_N] = X[_N] * Y[_N]; - - for ( j=1,X+=N,Y+=N ; j max_sum, propi, max_sum); - } - - for ( i=0 ; iwindow; - last_y = st->last_y; - y = st->y; - N = st->window_size; - - -#if (TM_UNROLL && TM_UNROLL_SPEEXECHOGETRESIDUAL) -#pragma TCS_unroll=4 -#pragma TCS_unrollexact=1 -#endif - for (i=0;ifft_table, st->y, st->Y); - power_spectrum(st->Y, residual_echo, N); - - leake = st->leak_estimate; - leak2 = fmux(leake > .5, 1, 2 * leake); - N = st->frame_size; - -#if (TM_UNROLL && TM_UNROLL_SPEEXECHOGETRESIDUAL) -#pragma TCS_unroll=4 -#pragma TCS_unrollexact=1 -#endif - for ( i=0 ; ipreemph; - register spx_word16_t memX = st->memX; - register spx_word16_t memD = st->memD; - register spx_word16_t * restrict input = st->input; - register int i; -#ifdef FIXED_POINT - register int saturated = st->saturated; -#endif - -#if (TM_UNROLL && TM_UNROLL_SPEEXECHOCANCELLATION) -#pragma TCS_unroll=4 -#pragma TCS_unrollexact=1 -#endif - for ( i=0 ; i 32767, M+1, saturated); - tmp32 = iclipi(tmp32,32767); -#endif - - x[i] = EXTRACT16(tmp32); - memX = far_endi; - tmp32 = SUB32(EXTEND32(inputi), EXTEND32(MULT16_16_P15(preemph, memD))); - -#ifdef FIXED_POINT - saturated = mux( ((tmp32 > 32767) && (saturated == 0)), 1, - mux( ((tmp32 <-32767) && (saturated == 0)), 1, saturated )); - tmp32 = iclipi(tmp32,32767); -#endif - memD = inputi; - input[i] = tmp32; - } -#if (TM_UNROLL && TM_UNROLL_SPEEXECHOCANCELLATION) -#pragma TCS_unrollexact=0 -#pragma TCS_unroll=0 -#endif - - st->memD = memD; - st->memX = memX; - -#ifdef FIXED_POINT - st->saturated = saturated; -#endif -} - -void mdf_sub( - spx_word16_t * restrict dest, - const spx_word16_t * restrict src1, - const spx_word16_t * restrict src2, - int framesize -) -{ - register int i; - -#if (TM_UNROLL && TM_UNROLL_SPEEXECHOCANCELLATION) -#pragma TCS_unroll=4 -#pragma TCS_unrollexact=1 -#endif - -#ifdef FIXED_POINT - for ( i=0,framesize<<=1 ; iPHI; - - for (j=M-1;j>=0;j--) - { - register spx_word32_t * restrict W = &(st->W[j*N]); - - weighted_spectral_mul_conj( - st->power_1, - FLOAT_SHL(PSEUDOFLOAT(st->prop[j]),-15), - &X[(j+1)*N], - st->E, - st->PHI, - N); -#if (TM_UNROLL && TM_UNROLL_SPEEXECHOCANCELLATION) -#pragma TCS_unroll=4 -#pragma TCS_unrollexact=1 -#endif - for (i=0;icancel_count; - register spx_word16_t * restrict wtmp = st->wtmp; -#ifdef FIXED_POINT - register spx_word16_t * restrict wtmp2 = st->wtmp2; - register int i; -#endif - - for ( j=0 ; jW[j*N]); - - if (j==0 || cancel_count%(M-1) == j-1) - { -#ifdef FIXED_POINT - -#if (TM_UNROLL && TM_UNROLL_SPEEXECHOCANCELLATION) -#pragma TCS_unroll=4 -#pragma TCS_unrollexact=1 -#endif - for ( i=0 ; ifft_table, wtmp2, wtmp); - memset(wtmp, 0, framesize * sizeof(spx_word16_t)); - -#if (TM_UNROLL && TM_UNROLL_SPEEXECHOCANCELLATION) -#pragma TCS_unroll=4 -#pragma TCS_unrollexact=1 -#endif - for (j=framesize; jfft_table, wtmp, wtmp2); - -#if (TM_UNROLL && TM_UNROLL_SPEEXECHOCANCELLATION) -#pragma TCS_unroll=4 -#pragma TCS_unrollexact=1 -#endif - for (i=0;ifft_table, W, wtmp); - memset(&wtmp[framesize], 0, (N-framesize) * sizeof(spx_word16_t)); - spx_fft(st->fft_table, wtmp, W); -#endif - } - } -} - -#ifdef TWO_PATH -// first four parameters is passed by registers -// generate faster performance with 4 parameters functions -spx_word32_t mdf_update_foreground( - SpeexEchoState * restrict st, - spx_word32_t Dbf, - spx_word32_t Sff, - spx_word32_t See -) -{ - register spx_word32_t Davg1 = st->Davg1; - register spx_word32_t Davg2 = st->Davg2; - register spx_word32_t Dvar1 = st->Dvar1; - register spx_word32_t Dvar2 = st->Dvar2; - register spx_word16_t * restrict input = st->input; - register int framesize = st->frame_size; - register spx_word16_t * restrict xx = st->x + framesize; - register spx_word16_t * restrict y = st->y + framesize; - register spx_word16_t * restrict ee = st->e + framesize; - register int update_foreground; - register int i; - register int N = st->window_size; - register int M = st->M; - -#ifdef FIXED_POINT - register spx_word32_t sc0 = SUB32(Sff,See); - register spx_float_t sc1 = FLOAT_MUL32U(Sff,Dbf); - - Davg1 = ADD32(MULT16_32_Q15(QCONST16(.6f,15),Davg1), MULT16_32_Q15(QCONST16(.4f,15),sc0)); - Davg2 = ADD32(MULT16_32_Q15(QCONST16(.85f,15),Davg2), MULT16_32_Q15(QCONST16(.15f,15),sc0)); - Dvar1 = FLOAT_ADD( - FLOAT_MULT(VAR1_SMOOTH,Dvar1), - FLOAT_MUL32U(MULT16_32_Q15(QCONST16(.4f,15),Sff), - MULT16_32_Q15(QCONST16(.4f,15),Dbf))); - Dvar2 = FLOAT_ADD( - FLOAT_MULT(VAR2_SMOOTH,Dvar2), - FLOAT_MUL32U(MULT16_32_Q15(QCONST16(.15f,15),Sff), - MULT16_32_Q15(QCONST16(.15f,15),Dbf))); -#else - register spx_word32_t sc0 = Sff - See; - register spx_word32_t sc1 = Sff * Dbf; - - Davg1 = .6*Davg1 + .4*sc0; - Davg2 = .85*Davg2 + .15*sc0; - Dvar1 = VAR1_SMOOTH*Dvar1 + .16*sc1; - Dvar2 = VAR2_SMOOTH*Dvar2 + .0225*sc1; -#endif - - update_foreground = - mux( FLOAT_GT(FLOAT_MUL32U(sc0, VABS(sc0)), sc1), 1, - mux( FLOAT_GT(FLOAT_MUL32U(Davg1, VABS(Davg1)), FLOAT_MULT(VAR1_UPDATE,(Dvar1))), 1, - mux( FLOAT_GT(FLOAT_MUL32U(Davg2, VABS(Davg2)), FLOAT_MULT(VAR2_UPDATE,(Dvar2))), 1, 0))); - - if ( update_foreground ) - { - register spx_word16_t * restrict windowf = st->window + framesize; - register spx_word16_t * restrict window = st->window; - - st->Davg1 = st->Davg2 = 0; - st->Dvar1 = st->Dvar2 = FLOAT_ZERO; - - memcpy(st->foreground, st->W, N*M*sizeof(spx_word32_t)); - -#if (TM_UNROLL && TM_UNROLL_SPEEXECHOCANCELLATION) -#pragma TCS_unroll=4 -#pragma TCS_unrollexact=1 -#endif - for ( i=0 ; iW, st->foreground, N*M*sizeof(spx_word32_t)); - memcpy(y, ee, framesize * sizeof(spx_word16_t)); - mdf_sub(xx,input,y,framesize); - See = Sff; - st->Davg1 = st->Davg2 = 0; - st->Dvar1 = st->Dvar2 = FLOAT_ZERO; - } else - { - st->Davg1 = Davg1; - st->Davg2 = Davg2; - st->Dvar1 = Dvar1; - st->Dvar2 = Dvar2; - } - } - - return See; -} -#endif - -void mdf_compute_error_signal( - SpeexEchoState * restrict st, - const spx_int16_t * restrict in, - spx_int16_t * restrict out, - int framesize -) -{ - register spx_word16_t preemph = st->preemph; - register spx_word16_t memE = st->memE; - register int saturated = st->saturated; - register spx_word16_t * restrict e = st->e; - register spx_word16_t * restrict ee = st->e + framesize; - register spx_word16_t * restrict input = st->input; - register spx_word16_t * restrict xx = st->x + framesize; - register int i; - -#if (TM_UNROLL && TM_UNROLL_SPEEXECHOCANCELLATION) -#pragma TCS_unroll=4 -#pragma TCS_unrollexact=1 -#endif - for ( i=0 ; i 32767, 32767, - fmux( tmp_out < -32768, -32768, tmp_out)); -#endif - - tmp_out = ADD32(tmp_out, EXTEND32(MULT16_16_P15(preemph,memE))); - flg = iabs(ini) >= 32000; - tmp_out = VMUX( flg, 0, tmp_out); - saturated = mux( flg && (saturated == 0), 1, saturated); - - out[i] = (spx_int16_t)tmp_out; - memE = tmp_out; - } -#if (TM_UNROLL && TM_UNROLL_SPEEXECHOCANCELLATION) -#pragma TCS_unrollexact=0 -#pragma TCS_unroll=0 -#endif - - st->memE = memE; - st->saturated = saturated; - memset(e, 0, framesize * sizeof(spx_word16_t)); - memcpy(ee, xx, framesize * sizeof(spx_word16_t)); -} - -inline int mdf_check( - SpeexEchoState * restrict st, - spx_int16_t * out, - spx_word32_t Syy, - spx_word32_t Sxx, - spx_word32_t See, - spx_word32_t Sff, - spx_word32_t Sdd -) -{ - register int N = st->window_size; - register spx_word32_t N1e9 = N * 1e9; - register int screwed_up = st->screwed_up; - register int framesize = st->frame_size; - - if (!(Syy>=0 && Sxx>=0 && See >= 0) -#ifndef FIXED_POINT - || !(Sff < N1e9 && Syy < N1e9 && Sxx < N1e9 ) -#endif - ) - { - screwed_up += 50; - memset(out, 0, framesize * sizeof(spx_int16_t)); - - } else - { screwed_up = mux( SHR32(Sff, 2) > ADD32(Sdd, SHR32(MULT16_16(N, 10000),6)), screwed_up+1, 0); - } - - st->screwed_up = screwed_up; - - return screwed_up; -} - -void mdf_smooth( - spx_word32_t * restrict power, - spx_word32_t * restrict Xf, - int framesize, - int M -) -{ - register spx_word16_t ss, ss_1, pf, xff; - register int j; - -#ifdef FIXED_POINT - ss=DIV32_16(11469,M); - ss_1 = SUB16(32767,ss); -#else - ss=.35/M; - ss_1 = 1-ss; -#endif - -#if (TM_UNROLL && TM_UNROLL_SPEEXECHOCANCELLATION) -#pragma TCS_unroll=4 -#pragma TCS_unrollexact=1 -#endif - for ( j=0 ; jspec_average; - register spx_word32_t * restrict pRf = st->Rf; - register spx_word32_t * restrict pYf = st->Yf; - register spx_word32_t * restrict pEh = st->Eh; - register spx_word32_t * restrict pYh = st->Yh; - register spx_word16_t beta0 = st->beta0; - register spx_word16_t beta_max = st->beta_max; - register spx_float_t alpha, alpha_1; - register spx_word32_t tmp32, tmpx; - register spx_float_t sPey = st->Pey; - register spx_float_t sPyy = st->Pyy; - register spx_float_t tmp; - register spx_word16_t leak_estimate; - register int j; - register spx_float_t Eh, Yh; - register spx_word32_t _Ehj, _Rfj, _Yfj, _Yhj; - -#ifdef FIXED_POINT - register spx_word16_t spec_average1 = SUB16(32767,spec_average); -#else - register spx_word16_t spec_average1 = 1 - spec_average; -#endif - -#if (TM_UNROLL && TM_UNROLL_SPEEXECHOCANCELLATION) -#pragma TCS_unroll=4 -#pragma TCS_unrollexact=1 -#endif - for (j=framesize; j>0 ; --j) - { - _Ehj = pEh[j]; - _Rfj = pRf[j]; - _Yfj = pYf[j]; - _Yhj = pYh[j]; - - Eh = PSEUDOFLOAT(_Rfj - _Ehj); - Yh = PSEUDOFLOAT(_Yfj - _Yhj); - - Pey = FLOAT_ADD(Pey,FLOAT_MULT(Eh,Yh)); - Pyy = FLOAT_ADD(Pyy,FLOAT_MULT(Yh,Yh)); - - pEh[j] = MAC16_32_Q15(MULT16_32_Q15(spec_average1, _Ehj), spec_average, _Rfj); - pYh[j] = MAC16_32_Q15(MULT16_32_Q15(spec_average1, _Yhj), spec_average, _Yfj); - } -#if (TM_UNROLL && TM_UNROLL_SPEEXECHOCANCELLATION) -#pragma TCS_unrollexact=0 -#pragma TCS_unroll=0 -#endif - _Ehj = pEh[0]; - _Rfj = pRf[0]; - _Yfj = pYf[0]; - _Yhj = pYh[0]; - - Eh = PSEUDOFLOAT(_Rfj - _Ehj); - Yh = PSEUDOFLOAT(_Yfj - _Yhj); - - Pey = FLOAT_ADD(Pey,FLOAT_MULT(Eh,Yh)); - Pyy = FLOAT_ADD(Pyy,FLOAT_MULT(Yh,Yh)); - - pEh[0] = MAC16_32_Q15(MULT16_32_Q15(spec_average1, _Ehj), spec_average, _Rfj); - pYh[0] = MAC16_32_Q15(MULT16_32_Q15(spec_average1, _Yhj), spec_average, _Yfj); - - Pyy = FLOAT_SQRT(Pyy); - Pey = FLOAT_DIVU(Pey,Pyy); - - tmp32 = MULT16_32_Q15(beta0,Syy); - tmpx = MULT16_32_Q15(beta_max,See); - tmp32 = VMUX(tmp32 > tmpx, tmpx, tmp32); - alpha = FLOAT_DIV32(tmp32, See); - alpha_1 = FLOAT_SUB(FLOAT_ONE, alpha); - - sPey = FLOAT_ADD(FLOAT_MULT(alpha_1,sPey) , FLOAT_MULT(alpha,Pey)); - sPyy = FLOAT_ADD(FLOAT_MULT(alpha_1,sPyy) , FLOAT_MULT(alpha,Pyy)); - tmp = FLOAT_MULT(MIN_LEAK,sPyy); - -#ifndef FIXED_POINT - sPyy = VMUX(FLOAT_LT(sPyy, FLOAT_ONE), FLOAT_ONE, sPyy); - sPey = VMUX(FLOAT_LT(sPey, tmp), tmp, sPey); - sPey = VMUX(FLOAT_LT(sPey, sPyy), sPey, sPyy); -#else - sPyy = FLOAT_LT(sPyy, FLOAT_ONE) ? FLOAT_ONE : sPyy; - sPey = FLOAT_LT(sPey, tmp) ? tmp : sPey; - sPey = FLOAT_LT(sPey, sPyy) ? sPey : sPyy; -#endif - - leak_estimate = FLOAT_EXTRACT16(FLOAT_SHL(FLOAT_DIVU(sPey, sPyy),14)); - - leak_estimate = VMUX( leak_estimate > 16383, 32767, SHL16(leak_estimate,1)); - st->Pey = sPey; - st->Pyy = sPyy; - st->leak_estimate = leak_estimate; -} - -inline spx_word16_t mdf_compute_RER( - spx_word32_t See, - spx_word32_t Syy, - spx_word32_t Sey, - spx_word32_t Sxx, - spx_word16_t leake -) -{ - register spx_word16_t RER; - -#ifdef FIXED_POINT - register spx_word32_t tmp32; - register spx_word32_t tmp; - spx_float_t bound = PSEUDOFLOAT(Sey); - - tmp32 = MULT16_32_Q15(leake,Syy); - tmp32 = ADD32(SHR32(Sxx,13), ADD32(tmp32, SHL32(tmp32,1))); - - bound = FLOAT_DIVU(FLOAT_MULT(bound, bound), PSEUDOFLOAT(ADD32(1,Syy))); - tmp = FLOAT_EXTRACT32(bound); - tmp32 = imux( FLOAT_GT(bound, PSEUDOFLOAT(See)), See, - imux( tmp32 < tmp, tmp, tmp32)); - - tmp = SHR32(See,1); - tmp32 = imux(tmp32 > tmp, tmp, tmp32); - RER = FLOAT_EXTRACT16(FLOAT_SHL(FLOAT_DIV32(tmp32,See),15)); -#else - register spx_word32_t r0; - - r0 = (Sey * Sey)/(1 + See * Syy); - - RER = (.0001*Sxx + 3.* MULT16_32_Q15(leake,Syy)) / See; - RER = fmux( RER < r0, r0, RER); - RER = fmux( RER > .5, .5, RER); -#endif - - return RER; -} - -void mdf_adapt( - SpeexEchoState * restrict st, - spx_word16_t RER, - spx_word32_t Syy, - spx_word32_t See, - spx_word32_t Sxx -) -{ - register spx_float_t * restrict power_1 = st->power_1; - register spx_word32_t * restrict power = st->power; - register int adapted = st->adapted; - register spx_word32_t sum_adapt = st->sum_adapt; - register spx_word16_t leake = st->leak_estimate; - register int framesize = st->frame_size; - register int i; - register int M = st->M; - - adapted = mux( !adapted && sum_adapt > QCONST32(M,15) && - MULT16_32_Q15(leake,Syy) > MULT16_32_Q15(QCONST16(.03f,15),Syy), 1, adapted); - - if ( adapted ) - { register spx_word32_t * restrict Yf = st->Yf; - register spx_word32_t * restrict Rf = st->Rf; - register spx_word32_t r, e, e2; - -#if (TM_UNROLL && TM_UNROLL_SPEEXECHOCANCELLATION) -#pragma TCS_unroll=4 -#pragma TCS_unrollexact=1 -#endif - for ( i=0 ; i e2, e2, r); -#else - e2 = e * .5; - r = fmux( r > e2, e2, r); -#endif - - r = MULT16_32_Q15(QCONST16(.7,15),r) + - MULT16_32_Q15(QCONST16(.3,15),(spx_word32_t)(MULT16_32_Q15(RER,e))); - - power_1[i] = FLOAT_SHL(FLOAT_DIV32_FLOAT(r,FLOAT_MUL32U(e,power[i]+10)),WEIGHT_SHIFT+16); - } -#if (TM_UNROLL && TM_UNROLL_SPEEXECHOCANCELLATION) -#pragma TCS_unrollexact=0 -#pragma TCS_unroll=0 -#endif - - r = SHL32(Yf[framesize],3); - r = MULT16_32_Q15(leake,r); - e = SHL32(Rf[framesize],3)+1; - -#ifdef FIXED_POINT - e2 = SHR32(e,1); - r = mux( r > e2, e2, r); -#else - e2 = e * .5; - r = fmux( r > e2, e2, r); -#endif - - r = MULT16_32_Q15(QCONST16(.7,15),r) + - MULT16_32_Q15(QCONST16(.3,15),(spx_word32_t)(MULT16_32_Q15(RER,e))); - - power_1[framesize] = FLOAT_SHL(FLOAT_DIV32_FLOAT(r,FLOAT_MUL32U(e,power[framesize]+10)),WEIGHT_SHIFT+16); - - } else - { - register spx_word16_t adapt_rate=0; - register int N = st->window_size; - - if ( Sxx > SHR32(MULT16_16(N, 1000),6) ) - { register spx_word32_t tmp32, tmp32q; - - tmp32 = MULT16_32_Q15(QCONST16(.25f, 15), Sxx); -#ifdef FIXED_POINT - tmp32q = SHR32(See,2); - tmp32 = mux(tmp32 > tmp32q, tmp32q, tmp32); -#else - tmp32q = 0.25 * See; - tmp32 = fmux(tmp32 > tmp32q, tmp32q, tmp32); -#endif - adapt_rate = FLOAT_EXTRACT16(FLOAT_SHL(FLOAT_DIV32(tmp32, See),15)); - } - -#if (TM_UNROLL && TM_UNROLL_SPEEXECHOCANCELLATION) -#pragma TCS_unroll=4 -#pragma TCS_unrollexact=1 -#endif - for (i=0;isum_adapt = sum_adapt; - st->adapted = adapted; -} - -#define OVERRIDE_ECHO_CANCELLATION -void speex_echo_cancellation( - SpeexEchoState * restrict st, - const spx_int16_t * restrict in, - const spx_int16_t * restrict far_end, - spx_int16_t * restrict out -) -{ - register int framesize = st->frame_size; - register spx_word16_t * restrict x = st->x; - register spx_word16_t * restrict xx = st->x + framesize; - register spx_word16_t * restrict yy = st->y + framesize; - register spx_word16_t * restrict ee = st->e + framesize; - register spx_word32_t Syy, See, Sxx, Sdd, Sff; - register spx_word16_t RER; - register spx_word32_t Sey; - register int j; - register int N,M; -#ifdef TWO_PATH - register spx_word32_t Dbf; -#endif - - N = st->window_size; - M = st->M; - st->cancel_count++; - - filter_dc_notch16(in, st->notch_radius, st->input, framesize, st->notch_mem); - mdf_preemph(st, xx, far_end, framesize); - - { - - register spx_word16_t * restrict X = st->X; - - for ( j=M-1 ; j>=0 ; j-- ) - { register spx_word16_t * restrict Xdes = &(X[(j+1)*N]); - register spx_word16_t * restrict Xsrc = &(X[j*N]); - - memcpy(Xdes, Xsrc, N * sizeof(spx_word16_t)); - } - - spx_fft(st->fft_table, x, X); - memcpy(st->last_y, st->x, N * sizeof(spx_word16_t)); - Sxx = mdf_inner_prod(xx, xx, framesize); - memcpy(x, xx, framesize * sizeof(spx_word16_t)); - -#ifdef TWO_PATH - spectral_mul_accum(st->X, st->foreground, st->Y, N, M); - spx_ifft(st->fft_table, st->Y, st->e); - mdf_sub(xx, st->input, ee, framesize); - Sff = mdf_inner_prod(xx, xx, framesize); -#endif - - mdf_adjust_prop (st->W, N, M, st->prop); - - if (st->saturated == 0) - { mdf_compute_weight_gradient(st, X, N, M); - } else - { st->saturated--; - } - } - - mdf_update_weight(st, N, M, framesize); - spectral_mul_accum(st->X, st->W, st->Y, N, M); - spx_ifft(st->fft_table, st->Y, st->y); - -#ifdef TWO_PATH - mdf_sub(xx, ee, yy, framesize); - Dbf = 10+mdf_inner_prod(xx, xx, framesize); -#endif - - mdf_sub(xx, st->input, yy, framesize); - See = mdf_inner_prod(xx, xx, framesize); - -#ifndef TWO_PATH - Sff = See; -#else - See = mdf_update_foreground(st,Dbf,Sff,See); -#endif - - - mdf_compute_error_signal(st, in, out, framesize); - Sey = mdf_inner_prod(ee, yy, framesize); - Syy = mdf_inner_prod(yy, yy, framesize); - Sdd = mdf_inner_prod(st->input, st->input, framesize); - - if ( mdf_check(st,out,Syy,Sxx,See,Sff,Sdd) >= 50 ) - { speex_warning("The echo canceller started acting funny and got slapped (reset). It swears it will behave now."); - speex_echo_state_reset(st); - return; - } - - See = MAX32(See, SHR32(MULT16_16(N, 100),6)); - spx_fft(st->fft_table, st->e, st->E); - memset(st->y, 0, framesize * sizeof(spx_word16_t)); - spx_fft(st->fft_table, st->y, st->Y); - power_spectrum(st->E, st->Rf, N); - power_spectrum(st->Y, st->Yf, N); - power_spectrum(st->X, st->Xf, N); - - mdf_smooth(st->power,st->Xf,framesize, M); - mdf_compute_filtered_spectra_crosscorrelations(st,Syy,See,framesize); - RER = mdf_compute_RER(See,Syy,Sey,Sxx,st->leak_estimate); - mdf_adapt(st, RER, Syy, See, Sxx); - - if ( st->adapted ) - { register spx_word16_t * restrict last_yy = st->last_y + framesize; - - memcpy(st->last_y, last_yy, framesize * sizeof(spx_word16_t)); - mdf_sub_int(last_yy, in, out, framesize); - - } -} - - - diff --git a/speex/tmv/misc_tm.h b/speex/tmv/misc_tm.h deleted file mode 100644 index 181ea8073f81343a63e2a3c75968fe73dce60011..0000000000000000000000000000000000000000 --- a/speex/tmv/misc_tm.h +++ /dev/null @@ -1,92 +0,0 @@ -/* Copyright (C) 2007 Hong Zhiqian */ -/** - @file misc_tm.h - @author Hong Zhiqian - @brief Various compatibility routines for Speex (TriMedia version) -*/ -/* - 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. -*/ -#include - - -#if TM_PROFILE -int __profile_begin; -int __profile_end; -#endif - -#define OVERRIDE_SPEEX_ALLOC -void *speex_alloc (int size) -{ - void *ptr; - - if ( tmmlMalloc(0, size, (pVoid*)&ptr, tmmlMallocCacheAligned | tmmlMallocCleared) != TM_OK ) - { return NULL; - } - - return ptr; -} - - -#define OVERRIDE_SPEEX_ALLOC_SCRATCH -void *speex_alloc_scratch (int size) -{ - void *ptr; - - if ( tmmlMalloc(0, size, (pVoid*)&ptr, tmmlMallocCacheAligned | tmmlMallocCleared) != TM_OK ) - { return NULL; - } - - return ptr; -} - - -#define OVERRIDE_SPEEX_REALLOC -void *speex_realloc (void *ptr, int size) -{ - if ( tmmlRealloc(0, size, (pVoid)ptr, (pVoid*)&ptr, tmmlMallocCacheAligned | tmmlMallocCleared) != TM_OK ) - { return NULL; - } - - return ptr; -} - - -#define OVERRIDE_SPEEX_FREE -void speex_free (void *ptr) -{ - tmmlFree(ptr); -} - - -#define OVERRIDE_SPEEX_FREE_SCRATCH -void speex_free_scratch (void *ptr) -{ - tmmlFree(ptr); -} - diff --git a/speex/tmv/preprocess_tm.h b/speex/tmv/preprocess_tm.h deleted file mode 100644 index acbf2cffa06e1f0f7f0eb15716d9ba0d40d54963..0000000000000000000000000000000000000000 --- a/speex/tmv/preprocess_tm.h +++ /dev/null @@ -1,1135 +0,0 @@ -/* Copyright (C) 2007 Hong Zhiqian */ -/** - @file preprocess_tm.h - @author Hong Zhiqian - @brief Various compatibility routines for Speex (TriMedia version) -*/ -/* - 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. -*/ -#include -#include "profile_tm.h" - -#ifdef FIXED_POINT -#define OVERRIDE_PREPROCESS_ANALYSIS -static void preprocess_analysis(SpeexPreprocessState * restrict st, spx_int16_t * restrict x) -{ - register int i, j, framesize = st->frame_size; - register int N = st->ps_size; - register int N3 = 2*N - framesize; - register int N4 = framesize - N3; - register int * restrict ps = st->ps; - register int * restrict frame; - register int * restrict inbuf; - register int * restrict ptr; - register int max_val; - - frame = (int*)(st->frame); - inbuf = (int*)(st->inbuf); - ptr = (int*)(st->frame+N3); - - TMDEBUG_ALIGNMEM(x); - TMDEBUG_ALIGNMEM(frame); - TMDEBUG_ALIGNMEM(inbuf); - - PREPROCESSANAYLSIS_START(); - - N3 >>= 1; - framesize >>= 1; - max_val = 0; - - for ( i=0,j=0 ; iwindow ; i> 15; - r1 = (asri(16,f10) * asri(16,w10)) >> 15; - - max_val = imax(iabs(sex16(r0)), max_val); - max_val = imax(iabs(sex16(r1)), max_val); - - r0 = pack16lsb(r1, r0); - st32d(j, frame, r0); - } -#if (TM_UNROLL && TM_UNROLL_PREPROCESSANALYSIS) -#pragma TCS_unrollexact=0 -#pragma TCS_unroll=0 -#endif - - max_val = 14 - spx_ilog2(max_val); - st->frame_shift = max_val; - - if ( max_val != 0 ) - { -#if (TM_UNROLL && TM_UNROLL_PREPROCESSANALYSIS) -#pragma TCS_unroll=4 -#pragma TCS_unrollexact=1 -#endif - for ( i=0,j=0 ; ifft_lookup, st->frame, st->ft); - power_spectrum(st->ft, ps, N << 1); - -#if (TM_UNROLL && TM_UNROLL_PREPROCESSANALYSIS) -#pragma TCS_unroll=4 -#pragma TCS_unrollexact=1 -#endif - for ( i=0,ptr=(int*)st->ps,max_val<<=1,j=((1<<((max_val))>>1)) ;i> max_val; - } -#if (TM_UNROLL && TM_UNROLL_PREPROCESSANALYSIS) -#pragma TCS_unrollexact=0 -#pragma TCS_unroll=0 -#endif - - filterbank_compute_bank32(st->bank, ps, ps+N); - - PREPROCESSANAYLSIS_STOP(); -} - -#define _MULT16_32_Q15(a,b,c) ADD32(MULT16_16((a),(b)), SHR(MULT16_16((a),(c)),15)) - -#define OVERRIDE_UPDATE_NOISE_PROB -static void update_noise_prob(SpeexPreprocessState * restrict st) -{ - register int i; - register int min_range, nb_adapt; - register int N = st->ps_size; - register int * restrict Smin = (int*)st->Smin; - register int * restrict Stmp = (int*)st->Stmp; - register int * restrict S = (int*)st->S; - - UPDATENOISEPROB_START(); - - { - register int psi_lsb, psi_msb, ips_lsb, ips_msb, psii_lsb, psii_msb; - register int psiii_lsb, psiii_msb; - register int q8, q05, q2, q1; - register int *ps = (int*)st->ps; - register int si_lsb, si_msb, sii_lsb, sii_msb; - - q8 = QCONST16(.8f,15); - q05 = QCONST16(.05f,15); - q2 = QCONST16(.2f,15); - q1 = QCONST16(.1f,15); - - ips_lsb = ps[0]; - psi_lsb = ps[1]; - si_lsb = S[0]; - ips_msb = ips_lsb >> 15; - psi_msb = psi_lsb >> 15; - si_msb = si_lsb >> 15; - - ips_lsb &= 0x00007fff; - psi_lsb &= 0x00007fff; - si_lsb &= 0x00007fff; - - S[0] = _MULT16_32_Q15(q8,si_msb,si_lsb) + _MULT16_32_Q15(q2,ips_msb,ips_lsb); - - for ( i=1 ; i> 15; - si_msb = si_lsb >> 15; - si_lsb &= 0x00007fff; - psii_lsb &= 0x00007fff; - - S[i]= _MULT16_32_Q15(q8,si_msb,si_lsb) + - _MULT16_32_Q15(q05,ips_msb,ips_lsb) + - _MULT16_32_Q15(q1,psi_msb,psi_lsb) + - _MULT16_32_Q15(q05,psii_msb,psii_lsb); - - psiii_lsb = ps[i+2]; - sii_lsb = S[i+1]; - - sii_msb = sii_lsb >> 15; - psiii_msb= psiii_lsb >> 15; - sii_lsb &= 0x00007fff; - psiii_lsb&= 0x00007fff; - - S[i+1]= _MULT16_32_Q15(q8,sii_msb,sii_lsb) + - _MULT16_32_Q15(q05,psi_msb,psi_lsb) + - _MULT16_32_Q15(q1,psii_msb,psii_lsb) + - _MULT16_32_Q15(q05,psiii_msb,psiii_lsb); - - ips_lsb = psii_lsb; - ips_msb = psii_msb; - psi_lsb = psiii_lsb; - psi_msb = psiii_msb; - } - - S[N-1] = MULT16_32_Q15(q8,S[N-1]) + MULT16_32_Q15(q2,ps[N-1]); - } - - nb_adapt = st->nb_adapt; - - if ( nb_adapt==1 ) - { for ( i=0 ; imin_count > min_range ) - { - st->min_count = 0; - -#if (TM_UNROLL && TM_UNROLL_UPDATENOISEPROB) -#pragma TCS_unroll=2 -#pragma TCS_unrollexact=1 -#endif - for ( i=0 ; iupdate_prob; - - q4 = QCONST16(.4f,15); - -#if (TM_UNROLL && TM_UNROLL_UPDATENOISEPROB) -#pragma TCS_unroll=4 -#pragma TCS_unrollexact=1 -#endif - for ( i=0 ; i ADD32(smini,20), 1, 0); - } -#if (TM_UNROLL && TM_UNROLL_UPDATENOISEPROB) -#pragma TCS_unrollexact=0 -#pragma TCS_unroll=0 -#endif - } - - UPDATENOISEPROB_STOP(); -} - -#else - -#define OVERRIDE_PREPROCESS_ANALYSIS -static void preprocess_analysis(SpeexPreprocessState * restrict st, spx_int16_t * restrict x) -{ - register int i; - register int framesize = st->frame_size; - register int N = st->ps_size; - register int N3 = 2*N - framesize; - register int N4 = framesize - N3; - register float * restrict ps = st->ps; - register float * restrict frame = st->frame; - register float * restrict inbuf = st->inbuf; - - PREPROCESSANAYLSIS_START(); - -#if (TM_UNROLL && TM_UNROLL_PREPROCESSANALYSIS) -#pragma TCS_unroll=4 -#pragma TCS_unrollexact=1 -#endif - for ( i=0 ; iwindow; - -#if (TM_UNROLL && TM_UNROLL_PREPROCESSANALYSIS) -#pragma TCS_unroll=4 -#pragma TCS_unrollexact=1 -#endif - for ( i=0 ; i<2*N ; ++i ) - { - frame[i] = frame[i] * inbuf[i]; - } -#if (TM_UNROLL && TM_UNROLL_PREPROCESSANALYSIS) -#pragma TCS_unrollexact=0 -#pragma TCS_unroll=0 -#endif - - spx_fft(st->fft_lookup, frame, st->ft); - power_spectrum(st->ft, ps, N << 1); - filterbank_compute_bank32(st->bank, ps, ps+N); - - PREPROCESSANAYLSIS_STOP(); -} - - -#define OVERRIDE_UPDATE_NOISE_PROB -static void update_noise_prob(SpeexPreprocessState * restrict st) -{ - - register float * restrict S = st->S; - register float * restrict ps = st->ps; - register int N = st->ps_size; - register int min_range; - register int i; - register int nb_adapt; - register float * restrict Smin = st->Smin; - register float * restrict Stmp = st->Stmp; - - UPDATENOISEPROB_START(); - - { - register float ips, psi; - - ips = ps[0]; - psi = ps[1]; - - S[0] = .8f * S[0] + .2f * ips; - - for ( i=1 ; inb_adapt; - - if ( nb_adapt==1 ) - { - for (i=0;iStmp[i] = 0; - } - - min_range = mux(nb_adapt < 100, 15, - mux(nb_adapt < 1000, 50, - mux(nb_adapt < 10000, 150, 300))); - - - if ( st->min_count > min_range ) - { - st->min_count = 0; -#if (TM_UNROLL && TM_UNROLL_UPDATENOISEPROB) -#pragma TCS_unroll=4 -#pragma TCS_unrollexact=1 -#endif - for ( i=0 ; iSmin; - -#if (TM_UNROLL && TM_UNROLL_UPDATENOISEPROB) -#pragma TCS_unroll=4 -#pragma TCS_unrollexact=1 -#endif - for ( i=0 ; iupdate_prob; - -#if (TM_UNROLL && TM_UNROLL_UPDATENOISEPROB) -#pragma TCS_unroll=4 -#pragma TCS_unrollexact=1 -#endif - for (i=0;i (smini + 20.f), 1, 0); - - } -#if (TM_UNROLL && TM_UNROLL_UPDATENOISEPROB) -#pragma TCS_unrollexact=0 -#pragma TCS_unroll=0 -#endif - } - - UPDATENOISEPROB_STOP(); -} - - -#define OVERRIDE_COMPUTE_GAIN_FLOOR -static void compute_gain_floor( - int noise_suppress, - int effective_echo_suppress, - float * restrict noise, - float * restrict echo, - float * gain_floor, - int len -) -{ - register int i; - register float echo_floor; - register float noise_floor; - - COMPUTEGAINFLOOR_START(); - - noise_floor = exp(.2302585f*noise_suppress); - echo_floor = exp(.2302585f*effective_echo_suppress); - -#if (TM_UNROLL && TM_UNROLL_COMPUTEGAINFLOOR) -#pragma TCS_unroll=4 -#pragma TCS_unrollexact=1 -#endif - for (i=0;iecho_state) - { - register spx_word32_t * restrict r_echo = st->residual_echo; - register spx_word32_t * restrict e_noise = st->echo_noise; - register int i; - -#ifndef FIXED_POINT - register spx_word32_t r; -#endif - - speex_echo_get_residual(st->echo_state, r_echo, N); - -#ifndef FIXED_POINT - r = r_echo[0]; - if (!(r >=0 && r < N*1e9f) ) - { - memset(r_echo, 0, N * sizeof(spx_word32_t)); - } -#endif - -#if (TM_UNROLL && TM_UNROLL_SPEEXPREPROCESSRUN) -#pragma TCS_unroll=4 -#pragma TCS_unrollexact=1 -#endif - for (i=0;ibank, e_noise, e_noise+N); - - } else - { memset(st->echo_noise, 0, (NM) * sizeof(spx_word32_t)); - } -} - -void preprocess_update_noise( - SpeexPreprocessState * restrict st, - spx_word32_t * restrict ps, - int N -) -{ - register spx_word16_t beta, beta_1; - register int * restrict up = st->update_prob; - register spx_word32_t * restrict noise = st->noise; - register int i; - - beta = MAX16(QCONST16(.03,15),DIV32_16(Q15_ONE,st->nb_adapt)); - beta_1 = Q15_ONE-beta; - -#if (TM_UNROLL && TM_UNROLL_SPEEXPREPROCESSRUN) -#pragma TCS_unroll=4 -#pragma TCS_unrollexact=1 -#endif - for (i=0;ibank, noise, noise+N); -} - -void preprocess_compute_SNR( - SpeexPreprocessState * restrict st, - spx_word32_t * restrict ps, - int NM -) -{ - register spx_word32_t * restrict noise = st->noise; - register spx_word32_t * restrict echo = st->echo_noise; - register spx_word32_t * restrict reverb = st->reverb_estimate; - register spx_word16_t * restrict post = st->post; - register spx_word32_t * restrict old_ps = st->old_ps; - register spx_word16_t * restrict prior = st->prior; - register int i; - -#if (TM_UNROLL && TM_UNROLL_SPEEXPREPROCESSRUN) -#pragma TCS_unroll=4 -#pragma TCS_unrollexact=1 -#endif - for ( i=0 ; izeta; - register spx_word16_t * restrict prior = st->prior; - register spx_word32_t Zframe; - register spx_word16_t iprior, priori; - register int _N = N-1; - register int i; - - iprior = prior[0]; - priori = prior[1]; - zeta[0] = PSHR32(ADD32(MULT16_16(QCONST16(.7f,15),zeta[0]), MULT16_16(QCONST16(.3f,15),iprior)),15); - -#if (TM_UNROLL && TM_UNROLL_SPEEXPREPROCESSRUN) -#pragma TCS_unroll=2 -#pragma TCS_unrollexact=1 -#endif - for ( i=1 ; i<_N ; i++) - { register spx_word16_t zetai = zeta[i]; - register spx_word16_t priorii = prior[i+1]; - - zeta[i] = PSHR32(ADD32(ADD32(ADD32(MULT16_16(QCONST16(.7f,15),zetai), MULT16_16(QCONST16(.15f,15),priori)), - MULT16_16(QCONST16(.075f,15),iprior)), MULT16_16(QCONST16(.075f,15),priorii)),15); - - iprior = priori; - priori = priorii; - } -#if (TM_UNROLL && TM_UNROLL_SPEEXPREPROCESSRUN) -#pragma TCS_unrollexact=0 -#pragma TCS_unroll=0 -#endif - - for (i=_N; izeta; - register spx_word16_t * restrict prior = st->prior; - register spx_word16_t * restrict gain = st->gain; - register spx_word32_t * restrict old_ps = st->old_ps; - register spx_word16_t * restrict post = st->post; - register spx_word16_t * restrict gain2 = st->gain2; - register int i; - register int N=st->ps_size; - - for ( i=N ; ibank,gain2+N, gain2); - filterbank_compute_psd16(st->bank,gain+N, gain); -} - -void preprocess_compute_linear_gain( - SpeexPreprocessState * restrict st, - spx_word32_t * restrict ps, - int N -) -{ - register spx_word16_t * restrict gain_floor = st->gain_floor; - register spx_word16_t * restrict prior = st->prior; - register spx_word16_t * restrict gain = st->gain; - register spx_word32_t * restrict old_ps = st->old_ps; - register spx_word16_t * restrict post = st->post; - register spx_word16_t * restrict gain2 = st->gain2; - register int i; - - filterbank_compute_psd16(st->bank,gain_floor+N,gain_floor); - -#if (TM_UNROLL && TM_UNROLL_SPEEXPREPROCESSRUN) -#pragma TCS_unroll=4 -#pragma TCS_unrollexact=1 -#endif - for (i=0;iprior[i]), 15), ADD16(prior[i], SHL32(1,SNR_SHIFT))); - theta = MULT16_32_P15(prior_ratio, QCONST32(1.f,EXPIN_SHIFT)+SHL32(EXTEND32(post[i]),EXPIN_SHIFT-SNR_SHIFT)); - MM = hypergeom_gain(theta); - - g = EXTRACT16(MIN32(Q15_ONE, MULT16_32_Q15(prior_ratio, MM))); - p = gain2[i]; - - g = VMUX( MULT16_16_Q15(QCONST16(.333f,15),g) > gain[i], MULT16_16(3,gain[i]), g); - - old_ps[i]= MULT16_32_P15(QCONST16(.2f,15),old_ps[i]) + - MULT16_32_P15(MULT16_16_P15(QCONST16(.8f,15),SQR16_Q15(g)),ps[i]); - - g = VMUX( g < gfi, gfi, g ); - gain[i] = g; - - tmp = MULT16_16_P15(p,spx_sqrt(SHL32(EXTEND32(g),15))) + - MULT16_16_P15(SUB16(Q15_ONE,p),spx_sqrt(SHL32(EXTEND32(gfi),15))); - - gain2[i]=SQR16_Q15(tmp); - - /* Use this if you want a log-domain MMSE estimator instead */ - /* gain2[i] = pow(g, p) * pow(gfi,1.f-p);*/ - } -#if (TM_UNROLL && TM_UNROLL_SPEEXPREPROCESSRUN) -#pragma TCS_unrollexact=0 -#pragma TCS_unroll=0 -#endif -} - - -#if 0 -void preprocess_compute_bark_gain( - SpeexPreprocessState * restrict st, - int N, - int NM -) -{ - register spx_word16_t * restrict gain_floor = st->gain_floor; - register spx_word16_t * restrict gain = st->gain; - register spx_word16_t * restrict gain2 = st->gain2; - register int i; - - for (i=N;ibank,gain2+N, gain2); -} -#endif - -void preprocess_apply_gain( - SpeexPreprocessState * restrict st, - int N -) -{ - register spx_word16_t * restrict ft = st->ft; - register spx_word16_t * restrict gain2 = st->gain2; - register int j, i; - - ft[0] = MULT16_16_P15(gain2[0],ft[0]); - - for (i=1,j=1; iframe; - register int shift = st->frame_shift; - register int i; - register int N2 = N << 1; - -#if (TM_UNROLL && TM_UNROLL_SPEEXPREPROCESSRUN) -#pragma TCS_unroll=4 -#pragma TCS_unrollexact=1 -#endif - for ( i=0 ; iframe; - register int i; - register int N2 = N << 1; - -#if (TM_UNROLL && TM_UNROLL_SPEEXPREPROCESSRUN) -#pragma TCS_unroll=4 -#pragma TCS_unrollexact=1 -#endif - for (i=0;i max_sample, framei, max_sample); - } -#if (TM_UNROLL && TM_UNROLL_SPEEXPREPROCESSRUN) -#pragma TCS_unrollexact=0 -#pragma TCS_unroll=0 -#endif - - if ( max_sample > 28000.f ) - { - float damp = 28000.f/max_sample; - -#if (TM_UNROLL && TM_UNROLL_SPEEXPREPROCESSRUN) -#pragma TCS_unroll=4 -#pragma TCS_unrollexact=1 -#endif - for ( i=0 ; i< N2 ; i++ ) - { frame[i] *= damp; - } -#if (TM_UNROLL && TM_UNROLL_SPEEXPREPROCESSRUN) -#pragma TCS_unrollexact=0 -#pragma TCS_unroll=0 -#endif - } -} -#endif - - -void preprocess_update( - SpeexPreprocessState * restrict st, - spx_int16_t * restrict x, - int N -) -{ - register spx_word16_t * restrict frame = st->frame; - register spx_word16_t * restrict window = st->window; - register spx_word16_t * restrict outbuf = st->outbuf; - register int framesize = st->frame_size; - register int N2 = N << 1; - register int N3 = N2 - framesize; - register int N4 = (framesize) - N3; - register int i; - -#if (TM_UNROLL && TM_UNROLL_SPEEXPREPROCESSRUN) -#pragma TCS_unroll=4 -#pragma TCS_unrollexact=1 -#endif - for ( i=0 ; ips; - register spx_word32_t Zframe; - register spx_word16_t Pframe; - - st->nb_adapt++; - st->min_count++; - N = st->ps_size; - M = st->nbands; - NM = N + M; - - preprocess_residue_echo(st, N, NM); - preprocess_analysis(st, x); - update_noise_prob(st); - preprocess_update_noise(st, ps, N); - - if ( st->nb_adapt == 1 ) - { memcpy(st->old_ps, ps, (NM) * sizeof(spx_word32_t)); - } - - preprocess_compute_SNR(st, ps, NM); - Zframe = preprocess_smooth_SNR(st, N, NM); - - - { - register spx_word16_t effective_echo_suppress; - - Pframe = QCONST16(.1f,15)+MULT16_16_Q15(QCONST16(.899f,15),qcurve(DIV32_16(Zframe,M))); - effective_echo_suppress = EXTRACT16(PSHR32(ADD32(MULT16_16(SUB16(Q15_ONE,Pframe), st->echo_suppress), - MULT16_16(Pframe, st->echo_suppress_active)),15)); - compute_gain_floor(st->noise_suppress, effective_echo_suppress, st->noise+N, st->echo_noise+N, st->gain_floor+N, M); - - } - - preprocess_compute_emgain(st, ps, Pframe, NM); - preprocess_compute_linear_gain(st, ps, N); - - - if (!st->denoise_enabled) - { - register spx_word16_t * restrict gain2 = st->gain2; - -#if (TM_UNROLL && TM_UNROLL_SPEEXPREPROCESSRUN) -#pragma TCS_unroll=4 -#pragma TCS_unrollexact=1 -#endif - for ( i=0 ; iagc_enabled) - { speex_compute_agc(st, Pframe, st->ft); - } -#endif - - - spx_ifft(st->fft_lookup, st->ft, st->frame); - -#ifdef FIXED_POINT - preprocess_scale(st, N); -#endif - -#ifndef FIXED_POINT - if ( st->agc_enabled ) - { preprocess_apply_agc(st, N); - } -#endif - - preprocess_update(st, x, N); - - if ( st->vad_enabled ) - { - if (Pframe > st->speech_prob_start || (st->was_speech && Pframe > st->speech_prob_continue)) - { st->was_speech=1; - return 1; - - } else - { st->was_speech=0; - return 0; - } - } else - { return 1; - } -} diff --git a/speex/tmv/profile_tm.h b/speex/tmv/profile_tm.h deleted file mode 100644 index f93ab6e6cb2c3ffce99f47be9b29c7a833954b50..0000000000000000000000000000000000000000 --- a/speex/tmv/profile_tm.h +++ /dev/null @@ -1,407 +0,0 @@ -/* Copyright (C) 2007 Hong Zhiqian */ -/** - @file profile_tm.h - @author Hong Zhiqian - @brief Various compatibility routines for Speex (TriMedia version) -*/ -/* - 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. -*/ -/** -* @remarks This file provide some capabilities to measure clock cycles. -* Use this if unable to compile with TriMedia profile options -*/ - -extern int __profile_begin; -extern int __profile_end; - -#if TM_PROFILE -#define PROFILE_START() \ - { \ - __profile_begin = cycles(); \ - } \ - -#define PROFILE_STOP() \ - { \ - __profile_end = cycles(); \ - printf("%s\t%d\n", __FUNCTION__, end - begin); \ - } \ - -#else -#define PROFILE_START() -#define PROFILE_STOP() -#endif - -#if TM_PROFILE_SPXAUTOCORR -#define _SPX_AUTOCORR_START() PROFILE_START() -#define _SPX_AUTOCORR_STOP() PROFILE_STOP() -#else -#define _SPX_AUTOCORR_START() -#define _SPX_AUTOCORR_STOP() -#endif - -#if TM_PROFILE_INNERPROD -#define INNERPROD_START() PROFILE_START() -#define INNERPROD_STOP() PROFILE_STOP() -#else -#define INNERPROD_START() -#define INNERPROD_STOP() -#endif - -#if TM_PROFILE_PITCHXCORR -#define PITCHXCORR_START() PROFILE_START() -#define PITCHXCORR_STOP() PROFILE_STOP() -#else -#define PITCHXCORR_START() -#define PITCHXCORR_STOP() -#endif - -#if TM_PROFILE_COMPUTEPITCHERROR -#define COMPUTEPITCHERROR_START() PROFILE_START() -#define COMPUTEPITCHERROR_STOP() PROFILE_STOP() -#else -#define COMPUTEPITCHERROR_START() -#define COMPUTEPITCHERROR_STOP() -#endif - -#if TM_PROFILE_PITCHGAINSEARCH3TAPVQ -#define PITCHGAINSEARCH3TAPVQ_START() PROFILE_START() -#define PITCHGAINSEARCH3TAPVQ_STOP() PROFILE_STOP() -#else -#define PITCHGAINSEARCH3TAPVQ_START() -#define PITCHGAINSEARCH3TAPVQ_STOP() -#endif - -#if TM_PROFILE_OPENLOOPNBESTPITCH -#define OPENLOOPNBESTPITCH_START() PROFILE_START() -#define OPENLOOPNBESTPITCH_STOP() PROFILE_STOP() -#else -#define OPENLOOPNBESTPITCH_START() -#define OPENLOOPNBESTPITCH_STOP() -#endif - - -#if TM_PROFILE_LSP_INTERPOLATE -#define LSPINTERPOLATE_START() PROFILE_START() -#define LSPINTERPOLATE_STOP() PROFILE_STOP() -#else -#define LSPINTERPOLATE_START() -#define LSPINTERPOLATE_STOP() -#endif - -#if TM_PROFILE_CHEBPOLYEVA -#define CHEBPOLYEVA_START() PROFILE_START() -#define CHEBPOLYEVA_STOP() PROFILE_STOP() -#else -#define CHEBPOLYEVA_START() -#define CHEBPOLYEVA_STOP() -#endif - - -#if TM_PROFILE_COMPUTEQUANTWEIGHTS -#define COMPUTEQUANTWEIGHTS_START() PROFILE_START() -#define COMPUTEQUANTWEIGHTS_STOP() PROFILE_STOP() -#else -#define COMPUTEQUANTWEIGHTS_START() -#define COMPUTEQUANTWEIGHTS_STOP() -#endif - -#if TM_PROFILE_LSPQUANT -#define LSPQUANT_START() PROFILE_START() -#define LSPQUANT_STOP() PROFILE_STOP() -#else -#define LSPQUANT_START() -#define LSPQUANT_STOP() -#endif - -#if TM_PROFILE_LSPWEIGHTQUANT -#define LSPWEIGHTQUANT_START() PROFILE_START() -#define LSPWEIGHTQUANT_STOP() PROFILE_STOP() -#else -#define LSPWEIGHTQUANT_START() -#define LSPWEIGHTQUANT_STOP() -#endif - -#if TM_PROFILE_FIRMEM16 -#define FIRMEM16_START() PROFILE_START() -#define FIRMEM16_STOP() PROFILE_STOP() -#else -#define FIRMEM16_START() -#define FIRMEM16_STOP() -#endif - -#if TM_PROFILE_IIRMEM16 -#define IIRMEM16_START() PROFILE_START() -#define IIRMEM16_STOP() PROFILE_STOP() -#else -#define IIRMEM16_START() -#define IIRMEM16_STOP() -#endif - -#if TM_PROFILE_FILTERMEM16 -#define FILTERMEM16_START() PROFILE_START() -#define FILTERMEM16_STOP() PROFILE_STOP() -#else -#define FILTERMEM16_START() -#define FILTERMEM16_STOP() -#endif - -#if TM_PROFILE_COMPUTERMS16 -#define COMPUTERMS16_START() PROFILE_START() -#define COMPUTERMS16_STOP() PROFILE_STOP() -#else -#define COMPUTERMS16_START() -#define COMPUTERMS16_STOP() -#endif - -#if TM_PROFILE_NORMALIZE16 -#define NORMALIZE16_START() PROFILE_START() -#define NORMALIZE16_STOP() PROFILE_STOP() -#else -#define NORMALIZE16_START() -#define NORMALIZE16_STOP() -#endif - -#if TM_PROFILE_BWLPC -#define BWLPC_START() PROFILE_START() -#define BWLPC_STOP() PROFILE_STOP() -#else -#define BWLPC_START() -#define BWLPC_STOP() -#endif - -#if TM_PROFILE_HIGHPASS -#define HIGHPASS_START() PROFILE_START() -#define HIGHPASS_STOP() PROFILE_STOP() -#else -#define HIGHPASS_START() -#define HIGHPASS_STOP() -#endif - -#if TM_PROFILE_SIGNALMUL -#define SIGNALMUL_START() PROFILE_START() -#define SIGNALMUL_STOP() PROFILE_STOP() -#else -#define SIGNALMUL_START() -#define SIGNALMUL_STOP() -#endif - -#if TM_PROFILE_SIGNALDIV -#define SIGNALDIV_START() PROFILE_START() -#define SIGNALDIV_STOP() PROFILE_STOP() -#else -#define SIGNALDIV_START() -#define SIGNALDIV_STOP() -#endif - -#if TM_PROFILE_COMPUTEIMPULSERESPONSE -#define COMPUTEIMPULSERESPONSE_START() PROFILE_START() -#define COMPUTEIMPULSERESPONSE_STOP() PROFILE_STOP() -#else -#define COMPUTEIMPULSERESPONSE_START() -#define COMPUTEIMPULSERESPONSE_STOP() -#endif - -#if TM_PROFILE_COMPUTEWEIGHTEDCODEBOOK -#define COMPUTEWEIGHTEDCODEBOOK_START() PROFILE_START() -#define COMPUTEWEIGHTEDCODEBOOK_STOP() PROFILE_STOP() -#else -#define COMPUTEWEIGHTEDCODEBOOK_START() -#define COMPUTEWEIGHTEDCODEBOOK_STOP() -#endif - -#if TM_PROFILE_TARGETUPDATE -#define TARGETUPDATE_START() PROFILE_START() -#define TARGETUPDATE_STOP() PROFILE_STOP() -#else -#define TARGETUPDATE_START() -#define TARGETUPDATE_STOP() -#endif - - -#if TM_PROFILE_VQNBEST -#define VQNBEST_START() PROFILE_START() -#define VQNBEST_STOP() PROFILE_STOP() -#else -#define VQNBEST_START() -#define VQNBEST_STOP() -#endif - -#if TM_PROFILE_VQNBESTSIGN -#define VQNBESTSIGN_START() PROFILE_START() -#define VQNBESTSIGN_STOP() PROFILE_STOP() -#else -#define VQNBESTSIGN_START() -#define VQNBESTSIGN_STOP() -#endif - -#if TM_PROFILE_PREPROCESSANALYSIS -#define PREPROCESSANAYLSIS_START() PROFILE_START() -#define PREPROCESSANAYLSIS_STOP() PROFILE_STOP() -#else -#define PREPROCESSANAYLSIS_START() -#define PREPROCESSANAYLSIS_STOP() -#endif - -#if TM_PROFILE_UPDATENOISEPROB -#define UPDATENOISEPROB_START() PROFILE_START() -#define UPDATENOISEPROB_STOP() PROFILE_STOP() -#else -#define UPDATENOISEPROB_START() -#define UPDATENOISEPROB_STOP() -#endif - -#if TM_PROFILE_COMPUTEGAINFLOOR -#define COMPUTEGAINFLOOR_START() PROFILE_START() -#define COMPUTEGAINFLOOR_STOP() PROFILE_STOP() -#else -#define COMPUTEGAINFLOOR_START() -#define COMPUTEGAINFLOOR_STOP() -#endif - -#if TM_PROFILE_FILTERDCNOTCH16 -#define FILTERDCNOTCH16_START() PROFILE_START() -#define FILTERDCNOTCH16_STOP() PROFILE_STOP() -#else -#define FILTERDCNOTCH16_START() -#define FILTERDCNOTCH16_STOP() -#endif - -#if TM_PROFILE_MDFINNERPROD -#define MDFINNERPROD_START() PROFILE_START() -#define MDFINNERPROD_STOP() PROFILE_STOP() -#else -#define MDFINNERPROD_START() -#define MDFINNERPROD_STOP() -#endif - -#if TM_PROFILE_SPECTRALMULACCUM -#define SPECTRALMULACCUM_START() PROFILE_START() -#define SPECTRALMULACCUM_STOP() PROFILE_STOP() -#else -#define SPECTRALMULACCUM_START() -#define SPECTRALMULACCUM_STOP() -#endif - -#if TM_PROFILE_WEIGHTEDSPECTRALMULCONJ -#define WEIGHTEDSPECTRALMULCONJ_START() PROFILE_START() -#define WEIGHTEDSPECTRALMULCONJ_STOP() PROFILE_STOP() -#else -#define WEIGHTEDSPECTRALMULCONJ_START() -#define WEIGHTEDSPECTRALMULCONJ_STOP() -#endif - -#if TM_PROFILE_MDFADJUSTPROP -#define MDFADJUSTPROP_START() PROFILE_START() -#define MDFADJUSTPROP_STOP() PROFILE_STOP() -#else -#define MDFADJUSTPROP_START() -#define MDFADJUSTPROP_STOP() -#endif - -#if TM_PROFILE_SPEEXECHOGETRESIDUAL -#define SPEEXECHOGETRESIDUAL_START() PROFILE_START() -#define SPEEXECHOGETRESIDUAL_STOP() PROFILE_STOP() -#else -#define SPEEXECHOGETRESIDUAL_START() -#define SPEEXECHOGETRESIDUAL_STOP() -#endif - -#if TM_PROFILE_LSPENFORCEMARGIN -#define LSPENFORCEMARGIN_START() PROFILE_START() -#define LSPENFORCEMARGIN_STOP() PROFILE_STOP() -#else -#define LSPENFORCEMARGIN_START() -#define LSPENFORCEMARGIN_STOP() -#endif - -#if TM_PROFILE_LSPTOLPC -#define LSPTOLPC_START() PROFILE_START() -#define LSPTOLPC_STOP() PROFILE_STOP() -#else -#define LSPTOLPC_START() -#define LSPTOLPC_STOP() -#endif - -#if TM_PROFILE_MAXIMIZERANGE -#define MAXIMIZERANGE_START() PROFILE_START() -#define MAXIMIZERANGE_STOP() PROFILE_STOP() -#else -#define MAXIMIZERANGE_START() -#define MAXIMIZERANGE_STOP() -#endif - -#if TM_PROFILE_RENORMRANGE -#define RENORMRANGE_START() PROFILE_START() -#define RENORMRANGE_STOP() PROFILE_STOP() -#else -#define RENORMRANGE_START() -#define RENORMRANGE_STOP() -#endif - -#if TM_PROFILE_POWERSPECTRUM -#define POWERSPECTRUM_START() PROFILE_START() -#define POWERSPECTRUM_STOP() PROFILE_STOP() -#else -#define POWERSPECTRUM_START() -#define POWERSPECTRUM_STOP() -#endif - -#if TM_PROFILE_QMFSYNTH -#define QMFSYNTH_START() PROFILE_START() -#define QMFSYNTH_STOP() PROFILE_STOP() -#else -#define QMFSYNTH_START() -#define QMFSYNTH_STOP() -#endif - -#if TM_PROFILE_QMFDECOMP -#define QMFDECOMP_START() PROFILE_START() -#define QMFDECOMP_STOP() PROFILE_STOP() -#else -#define QMFDECOMP_START() -#define QMFDECOMP_STOP() -#endif - -#if TM_PROFILE_FILTERBANKCOMPUTEBANK32 -#define FILTERBANKCOMPUTEBANK32_START() PROFILE_START() -#define FILTERBANKCOMPUTEBANK32_STOP() PROFILE_STOP() -#else -#define FILTERBANKCOMPUTEBANK32_START() -#define FILTERBANKCOMPUTEBANK32_STOP() -#endif - -#if TM_PROFILE_FILTERBANKCOMPUTEPSD16 -#define FILTERBANKCOMPUTEPSD16_START() PROFILE_START() -#define FILTERBANKCOMPUTEPSD16_STOP() PROFILE_STOP() -#else -#define FILTERBANKCOMPUTEPSD16_START() -#define FILTERBANKCOMPUTEPSD16_STOP() -#endif - - diff --git a/speex/tmv/speex_config_types.h b/speex/tmv/speex_config_types.h deleted file mode 100644 index 3166f6c146163b96213c2224f6fcb9332f21d157..0000000000000000000000000000000000000000 --- a/speex/tmv/speex_config_types.h +++ /dev/null @@ -1,31 +0,0 @@ -#ifndef __SPEEX_TYPES_H__ -#define __SPEEX_TYPES_H__ - -#ifdef __TCS__ - -#include - - - -typedef Int16 spx_int16_t; -typedef UInt16 spx_uint16_t; -typedef Int32 spx_int32_t; -typedef UInt32 spx_uint32_t; - -#ifdef FIXED_POINT -#define VMUX(a,b,c) mux((a),(b),(c)) -#define VABS(a) iabs((a)) -#define VMAX(a,b) imax((a),(b)) -#define VMIN(a,b) imin((a),(b)) -#else -#define VMUX(a,b,c) fmux((a),(b),(c)) -#define VABS(a) fabs((a)) -#define VMAX(a,b) fmax((a),(b)) -#define VMIN(a,b) fmin((a),(b)) -#endif - -#endif - - -#endif - diff --git a/speex/win32/Makefile.am b/speex/win32/Makefile.am deleted file mode 100644 index 63388316d699f237f1d2567ad26b67c3d376695b..0000000000000000000000000000000000000000 --- a/speex/win32/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -## Process this file with automake to produce Makefile.in. -*-Makefile-*- - -# Disable automatic dependency tracking if using other tools than gcc and gmake -#AUTOMAKE_OPTIONS = no-dependencies - -SUBDIRS = libspeexdsp VS2003 VS2005 VS2008 - -EXTRA_DIST = speex.iss config.h libspeexdsp.def diff --git a/speex/win32/VS2003/Makefile.am b/speex/win32/VS2003/Makefile.am deleted file mode 100644 index 02f81d7bcca0a36ff8dcbd38c07ca66b9532b9dd..0000000000000000000000000000000000000000 --- a/speex/win32/VS2003/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -## Process this file with automake to produce Makefile.in. -*-Makefile-*- - -# Disable automatic dependency tracking if using other tools than gcc and gmake -#AUTOMAKE_OPTIONS = no-dependencies - -SUBDIRS = libspeexdsp tests - -EXTRA_DIST = libspeexdsp.sln diff --git a/speex/win32/VS2003/libspeexdsp.sln b/speex/win32/VS2003/libspeexdsp.sln deleted file mode 100644 index 7697f7497d2a1a3de187e19b47ed598f76ad71bd..0000000000000000000000000000000000000000 --- a/speex/win32/VS2003/libspeexdsp.sln +++ /dev/null @@ -1,116 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 8.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testdenoise", "tests\testdenoise.vcproj", "{961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}" - ProjectSection(ProjectDependencies) = postProject - {03207781-0D1C-4DB3-A71D-45C608F28DBD} = {03207781-0D1C-4DB3-A71D-45C608F28DBD} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testecho", "tests\testecho.vcproj", "{961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}" - ProjectSection(ProjectDependencies) = postProject - {03207781-0D1C-4DB3-A71D-45C608F28DBD} = {03207781-0D1C-4DB3-A71D-45C608F28DBD} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testresample", "tests\testresample.vcproj", "{961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}" - ProjectSection(ProjectDependencies) = postProject - {03207781-0D1C-4DB3-A71D-45C608F28DBD} = {03207781-0D1C-4DB3-A71D-45C608F28DBD} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspeexdsp", "libspeexdsp\libspeexdsp.vcproj", "{03207781-0D1C-4DB3-A71D-45C608F28DBD}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfiguration) = preSolution - Debug = Debug - Release = Release - Release_Dynamic_SSE = Release_Dynamic_SSE - Release_Static_SSE = Release_Static_SSE - EndGlobalSection - GlobalSection(ProjectDependencies) = postSolution - EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Debug.ActiveCfg = Debug|Win32 - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Debug.Build.0 = Debug|Win32 - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release.ActiveCfg = Release|Win32 - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release.Build.0 = Release|Win32 - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_Dynamic_SSE.ActiveCfg = Release_Dynamic_SSE|Win32 - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_Dynamic_SSE.Build.0 = Release_Dynamic_SSE|Win32 - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_Static_SSE.ActiveCfg = Release_Static_SSE|Win32 - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_Static_SSE.Build.0 = Release_Static_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Debug.ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Debug.Build.0 = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release.ActiveCfg = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release.Build.0 = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_Dynamic_SSE.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_Dynamic_SSE.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_Static_SSE.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_Static_SSE.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Debug.ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Debug.Build.0 = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release.ActiveCfg = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release.Build.0 = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_Dynamic_SSE.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_Dynamic_SSE.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_Static_SSE.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_Static_SSE.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Debug.ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Debug.Build.0 = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release.ActiveCfg = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release.Build.0 = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release_Dynamic_SSE.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release_Dynamic_SSE.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release_Static_SSE.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release_Static_SSE.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Debug.ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Debug.Build.0 = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release.ActiveCfg = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release.Build.0 = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release_Dynamic_SSE.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release_Dynamic_SSE.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release_Static_SSE.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release_Static_SSE.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Debug.ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Debug.Build.0 = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Release.ActiveCfg = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Release.Build.0 = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Release_Dynamic_SSE.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Release_Dynamic_SSE.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Release_Static_SSE.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Release_Static_SSE.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Debug.ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Debug.Build.0 = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Release.ActiveCfg = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Release.Build.0 = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Release_Dynamic_SSE.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Release_Dynamic_SSE.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Release_Static_SSE.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Release_Static_SSE.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Debug.ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Debug.Build.0 = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release.ActiveCfg = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release.Build.0 = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release_Dynamic_SSE.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release_Dynamic_SSE.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release_Static_SSE.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release_Static_SSE.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Debug.ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Debug.Build.0 = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release.ActiveCfg = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release.Build.0 = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release_Dynamic_SSE.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release_Dynamic_SSE.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release_Static_SSE.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release_Static_SSE.Build.0 = Release_SSE|Win32 - {03207781-0D1C-4DB3-A71D-45C608F28DBD}.Debug.ActiveCfg = Debug|Win32 - {03207781-0D1C-4DB3-A71D-45C608F28DBD}.Debug.Build.0 = Debug|Win32 - {03207781-0D1C-4DB3-A71D-45C608F28DBD}.Release.ActiveCfg = Release|Win32 - {03207781-0D1C-4DB3-A71D-45C608F28DBD}.Release.Build.0 = Release|Win32 - {03207781-0D1C-4DB3-A71D-45C608F28DBD}.Release_Dynamic_SSE.ActiveCfg = Release_Dynamic_SSE|Win32 - {03207781-0D1C-4DB3-A71D-45C608F28DBD}.Release_Dynamic_SSE.Build.0 = Release_Dynamic_SSE|Win32 - {03207781-0D1C-4DB3-A71D-45C608F28DBD}.Release_Static_SSE.ActiveCfg = Release_Static_SSE|Win32 - {03207781-0D1C-4DB3-A71D-45C608F28DBD}.Release_Static_SSE.Build.0 = Release_Static_SSE|Win32 - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution - EndGlobalSection -EndGlobal diff --git a/speex/win32/VS2003/libspeexdsp/Makefile.am b/speex/win32/VS2003/libspeexdsp/Makefile.am deleted file mode 100644 index 9f72976dcc1ff597546357c7cba1868d96e293b8..0000000000000000000000000000000000000000 --- a/speex/win32/VS2003/libspeexdsp/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -## Process this file with automake to produce Makefile.in. -*-Makefile-*- - -# Disable automatic dependency tracking if using other tools than gcc and gmake -#AUTOMAKE_OPTIONS = no-dependencies - -EXTRA_DIST = libspeexdsp.vcproj - - diff --git a/speex/win32/VS2003/libspeexdsp/libspeexdsp.vcproj b/speex/win32/VS2003/libspeexdsp/libspeexdsp.vcproj deleted file mode 100644 index 7010455b487553c03ea2a644cb0a6b695b2cc46b..0000000000000000000000000000000000000000 --- a/speex/win32/VS2003/libspeexdsp/libspeexdsp.vcproj +++ /dev/null @@ -1,345 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/speex/win32/VS2003/tests/Makefile.am b/speex/win32/VS2003/tests/Makefile.am deleted file mode 100644 index 38caed807d6fe79037a7a29409f2b23038b27cc3..0000000000000000000000000000000000000000 --- a/speex/win32/VS2003/tests/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -## Process this file with automake to produce Makefile.in. -*-Makefile-*- - -# Disable automatic dependency tracking if using other tools than gcc and gmake -#AUTOMAKE_OPTIONS = no-dependencies - -EXTRA_DIST = testdenoise.vcproj testecho.vcproj testresample.vcproj - - diff --git a/speex/win32/VS2003/tests/testdenoise.vcproj b/speex/win32/VS2003/tests/testdenoise.vcproj deleted file mode 100644 index 82cfa41c290e9b149f36506ee7be2b584bc24320..0000000000000000000000000000000000000000 --- a/speex/win32/VS2003/tests/testdenoise.vcproj +++ /dev/null @@ -1,213 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/speex/win32/VS2003/tests/testecho.vcproj b/speex/win32/VS2003/tests/testecho.vcproj deleted file mode 100644 index 4405f24ac2fa5921b589a635b7c3276291587478..0000000000000000000000000000000000000000 --- a/speex/win32/VS2003/tests/testecho.vcproj +++ /dev/null @@ -1,213 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/speex/win32/VS2003/tests/testresample.vcproj b/speex/win32/VS2003/tests/testresample.vcproj deleted file mode 100644 index f512ca647c7ac2d401300802f56cc9fc130a1de8..0000000000000000000000000000000000000000 --- a/speex/win32/VS2003/tests/testresample.vcproj +++ /dev/null @@ -1,213 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/speex/win32/VS2005/Makefile.am b/speex/win32/VS2005/Makefile.am deleted file mode 100644 index 02f81d7bcca0a36ff8dcbd38c07ca66b9532b9dd..0000000000000000000000000000000000000000 --- a/speex/win32/VS2005/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -## Process this file with automake to produce Makefile.in. -*-Makefile-*- - -# Disable automatic dependency tracking if using other tools than gcc and gmake -#AUTOMAKE_OPTIONS = no-dependencies - -SUBDIRS = libspeexdsp tests - -EXTRA_DIST = libspeexdsp.sln diff --git a/speex/win32/VS2005/libspeexdsp.sln b/speex/win32/VS2005/libspeexdsp.sln deleted file mode 100644 index 7bcc08af5030f107fce2ba950a2609e8f00430fa..0000000000000000000000000000000000000000 --- a/speex/win32/VS2005/libspeexdsp.sln +++ /dev/null @@ -1,231 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspeexdsp", "libspeexdsp\libspeexdsp.vcproj", "{E42FDC95-7243-4219-9EA4-ACCE4AB97197}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testdenoise", "tests\testdenoise.vcproj", "{961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}" - ProjectSection(ProjectDependencies) = postProject - {E42FDC95-7243-4219-9EA4-ACCE4AB97197} = {E42FDC95-7243-4219-9EA4-ACCE4AB97197} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testecho", "tests\testecho.vcproj", "{961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}" - ProjectSection(ProjectDependencies) = postProject - {E42FDC95-7243-4219-9EA4-ACCE4AB97197} = {E42FDC95-7243-4219-9EA4-ACCE4AB97197} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testresample", "tests\testresample.vcproj", "{961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}" - ProjectSection(ProjectDependencies) = postProject - {E42FDC95-7243-4219-9EA4-ACCE4AB97197} = {E42FDC95-7243-4219-9EA4-ACCE4AB97197} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug_RTL_dll|Win32 = Debug_RTL_dll|Win32 - Debug_WM5_PPC_ARM|Win32 = Debug_WM5_PPC_ARM|Win32 - Debug|Win32 = Debug|Win32 - Release_Dynamic_SSE|Win32 = Release_Dynamic_SSE|Win32 - Release_Dynamic|Win32 = Release_Dynamic|Win32 - Release_RTL_dll|Win32 = Release_RTL_dll|Win32 - Release_SSE|Win32 = Release_SSE|Win32 - Release_SSE2|Win32 = Release_SSE2|Win32 - Release_WM5_PPC_ARM|Win32 = Release_WM5_PPC_ARM|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Debug_RTL_dll|Win32.ActiveCfg = Debug_RTL_dll|Win32 - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Debug_RTL_dll|Win32.Build.0 = Debug_RTL_dll|Win32 - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Debug_WM5_PPC_ARM|Win32.ActiveCfg = Debug_WM5_PPC_ARM|Win32 - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Debug_WM5_PPC_ARM|Win32.Build.0 = Debug_WM5_PPC_ARM|Win32 - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Debug|Win32.ActiveCfg = Debug|Win32 - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Debug|Win32.Build.0 = Debug|Win32 - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_Dynamic_SSE|Win32.ActiveCfg = Release_Dynamic_SSE|Win32 - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_Dynamic_SSE|Win32.Build.0 = Release_Dynamic_SSE|Win32 - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_Dynamic|Win32.ActiveCfg = Release_Dynamic|Win32 - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_Dynamic|Win32.Build.0 = Release_Dynamic|Win32 - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_RTL_dll|Win32.ActiveCfg = Release_RTL_dll|Win32 - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_RTL_dll|Win32.Build.0 = Release_RTL_dll|Win32 - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_SSE|Win32.ActiveCfg = Release_SSE|Win32 - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_SSE|Win32.Build.0 = Release_SSE|Win32 - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_SSE2|Win32.ActiveCfg = Release_SSE2|Win32 - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_SSE2|Win32.Build.0 = Release_SSE2|Win32 - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_WM5_PPC_ARM|Win32.ActiveCfg = Release_WM5_PPC_ARM|Win32 - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_WM5_PPC_ARM|Win32.Build.0 = Release_WM5_PPC_ARM|Win32 - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release|Win32.ActiveCfg = Release|Win32 - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release|Win32.Build.0 = Release|Win32 - {E42FDC95-7243-4219-9EA4-ACCE4AB97197}.Debug_RTL_dll|Win32.ActiveCfg = Debug_RTL_dll|Win32 - {E42FDC95-7243-4219-9EA4-ACCE4AB97197}.Debug_RTL_dll|Win32.Build.0 = Debug_RTL_dll|Win32 - {E42FDC95-7243-4219-9EA4-ACCE4AB97197}.Debug_WM5_PPC_ARM|Win32.ActiveCfg = Debug_WM5_PPC_ARM|Win32 - {E42FDC95-7243-4219-9EA4-ACCE4AB97197}.Debug_WM5_PPC_ARM|Win32.Build.0 = Debug_WM5_PPC_ARM|Win32 - {E42FDC95-7243-4219-9EA4-ACCE4AB97197}.Debug|Win32.ActiveCfg = Debug|Win32 - {E42FDC95-7243-4219-9EA4-ACCE4AB97197}.Debug|Win32.Build.0 = Debug|Win32 - {E42FDC95-7243-4219-9EA4-ACCE4AB97197}.Release_Dynamic_SSE|Win32.ActiveCfg = Release_Dynamic_SSE|Win32 - {E42FDC95-7243-4219-9EA4-ACCE4AB97197}.Release_Dynamic_SSE|Win32.Build.0 = Release_Dynamic_SSE|Win32 - {E42FDC95-7243-4219-9EA4-ACCE4AB97197}.Release_Dynamic|Win32.ActiveCfg = Release_Dynamic|Win32 - {E42FDC95-7243-4219-9EA4-ACCE4AB97197}.Release_Dynamic|Win32.Build.0 = Release_Dynamic|Win32 - {E42FDC95-7243-4219-9EA4-ACCE4AB97197}.Release_RTL_dll|Win32.ActiveCfg = Release_RTL_dll|Win32 - {E42FDC95-7243-4219-9EA4-ACCE4AB97197}.Release_RTL_dll|Win32.Build.0 = Release_RTL_dll|Win32 - {E42FDC95-7243-4219-9EA4-ACCE4AB97197}.Release_SSE|Win32.ActiveCfg = Release_SSE|Win32 - {E42FDC95-7243-4219-9EA4-ACCE4AB97197}.Release_SSE|Win32.Build.0 = Release_SSE|Win32 - {E42FDC95-7243-4219-9EA4-ACCE4AB97197}.Release_SSE2|Win32.ActiveCfg = Release_SSE2|Win32 - {E42FDC95-7243-4219-9EA4-ACCE4AB97197}.Release_SSE2|Win32.Build.0 = Release_SSE2|Win32 - {E42FDC95-7243-4219-9EA4-ACCE4AB97197}.Release_WM5_PPC_ARM|Win32.ActiveCfg = Release|Win32 - {E42FDC95-7243-4219-9EA4-ACCE4AB97197}.Release_WM5_PPC_ARM|Win32.Build.0 = Release|Win32 - {E42FDC95-7243-4219-9EA4-ACCE4AB97197}.Release|Win32.ActiveCfg = Release|Win32 - {E42FDC95-7243-4219-9EA4-ACCE4AB97197}.Release|Win32.Build.0 = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Debug_RTL_dll|Win32.ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Debug_RTL_dll|Win32.Build.0 = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Debug_WM5_PPC_ARM|Win32.ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Debug|Win32.ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Debug|Win32.Build.0 = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_Dynamic_SSE|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_Dynamic_SSE|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_Dynamic|Win32.ActiveCfg = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_Dynamic|Win32.Build.0 = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_RTL_dll|Win32.ActiveCfg = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_RTL_dll|Win32.Build.0 = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_SSE|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_SSE|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_SSE2|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_SSE2|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_WM5_PPC_ARM|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_WM5_PPC_ARM|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release|Win32.ActiveCfg = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release|Win32.Build.0 = Release|Win32 - {CD6043D1-D5E7-46D0-854F-00BB1BC308FC}.Debug_RTL_dll|Win32.ActiveCfg = Debug|Win32 - {CD6043D1-D5E7-46D0-854F-00BB1BC308FC}.Debug_RTL_dll|Win32.Build.0 = Debug|Win32 - {CD6043D1-D5E7-46D0-854F-00BB1BC308FC}.Debug_WM5_PPC_ARM|Win32.ActiveCfg = Debug|Win32 - {CD6043D1-D5E7-46D0-854F-00BB1BC308FC}.Debug|Win32.ActiveCfg = Debug|Win32 - {CD6043D1-D5E7-46D0-854F-00BB1BC308FC}.Debug|Win32.Build.0 = Debug|Win32 - {CD6043D1-D5E7-46D0-854F-00BB1BC308FC}.Release_Dynamic_SSE|Win32.ActiveCfg = Release_SSE|Win32 - {CD6043D1-D5E7-46D0-854F-00BB1BC308FC}.Release_Dynamic_SSE|Win32.Build.0 = Release_SSE|Win32 - {CD6043D1-D5E7-46D0-854F-00BB1BC308FC}.Release_Dynamic|Win32.ActiveCfg = Release|Win32 - {CD6043D1-D5E7-46D0-854F-00BB1BC308FC}.Release_Dynamic|Win32.Build.0 = Release|Win32 - {CD6043D1-D5E7-46D0-854F-00BB1BC308FC}.Release_RTL_dll|Win32.ActiveCfg = Release|Win32 - {CD6043D1-D5E7-46D0-854F-00BB1BC308FC}.Release_RTL_dll|Win32.Build.0 = Release|Win32 - {CD6043D1-D5E7-46D0-854F-00BB1BC308FC}.Release_SSE|Win32.ActiveCfg = Release_SSE|Win32 - {CD6043D1-D5E7-46D0-854F-00BB1BC308FC}.Release_SSE|Win32.Build.0 = Release_SSE|Win32 - {CD6043D1-D5E7-46D0-854F-00BB1BC308FC}.Release_SSE2|Win32.ActiveCfg = Release_SSE|Win32 - {CD6043D1-D5E7-46D0-854F-00BB1BC308FC}.Release_SSE2|Win32.Build.0 = Release_SSE|Win32 - {CD6043D1-D5E7-46D0-854F-00BB1BC308FC}.Release_WM5_PPC_ARM|Win32.ActiveCfg = Release_SSE|Win32 - {CD6043D1-D5E7-46D0-854F-00BB1BC308FC}.Release_WM5_PPC_ARM|Win32.Build.0 = Release_SSE|Win32 - {CD6043D1-D5E7-46D0-854F-00BB1BC308FC}.Release|Win32.ActiveCfg = Release|Win32 - {CD6043D1-D5E7-46D0-854F-00BB1BC308FC}.Release|Win32.Build.0 = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Debug_RTL_dll|Win32.ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Debug_RTL_dll|Win32.Build.0 = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Debug_WM5_PPC_ARM|Win32.ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Debug|Win32.ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Debug|Win32.Build.0 = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release_Dynamic_SSE|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release_Dynamic_SSE|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release_Dynamic|Win32.ActiveCfg = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release_Dynamic|Win32.Build.0 = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release_RTL_dll|Win32.ActiveCfg = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release_RTL_dll|Win32.Build.0 = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release_SSE|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release_SSE|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release_SSE2|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release_SSE2|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release_WM5_PPC_ARM|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release_WM5_PPC_ARM|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release|Win32.ActiveCfg = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release|Win32.Build.0 = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Debug_RTL_dll|Win32.ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Debug_RTL_dll|Win32.Build.0 = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Debug_WM5_PPC_ARM|Win32.ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Debug|Win32.ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Debug|Win32.Build.0 = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release_Dynamic_SSE|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release_Dynamic_SSE|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release_Dynamic|Win32.ActiveCfg = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release_Dynamic|Win32.Build.0 = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release_RTL_dll|Win32.ActiveCfg = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release_RTL_dll|Win32.Build.0 = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release_SSE|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release_SSE|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release_SSE2|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release_SSE2|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release_WM5_PPC_ARM|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release_WM5_PPC_ARM|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release|Win32.ActiveCfg = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release|Win32.Build.0 = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Debug_RTL_dll|Win32.ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Debug_RTL_dll|Win32.Build.0 = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Debug_WM5_PPC_ARM|Win32.ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Debug|Win32.ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Debug|Win32.Build.0 = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Release_Dynamic_SSE|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Release_Dynamic_SSE|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Release_Dynamic|Win32.ActiveCfg = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Release_Dynamic|Win32.Build.0 = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Release_RTL_dll|Win32.ActiveCfg = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Release_RTL_dll|Win32.Build.0 = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Release_SSE|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Release_SSE|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Release_SSE2|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Release_SSE2|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Release_WM5_PPC_ARM|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Release_WM5_PPC_ARM|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Release|Win32.ActiveCfg = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Release|Win32.Build.0 = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Debug_RTL_dll|Win32.ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Debug_RTL_dll|Win32.Build.0 = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Debug_WM5_PPC_ARM|Win32.ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Debug|Win32.ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Debug|Win32.Build.0 = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Release_Dynamic_SSE|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Release_Dynamic_SSE|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Release_Dynamic|Win32.ActiveCfg = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Release_Dynamic|Win32.Build.0 = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Release_RTL_dll|Win32.ActiveCfg = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Release_RTL_dll|Win32.Build.0 = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Release_SSE|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Release_SSE|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Release_SSE2|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Release_SSE2|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Release_WM5_PPC_ARM|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Release_WM5_PPC_ARM|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Release|Win32.ActiveCfg = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Release|Win32.Build.0 = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Debug_RTL_dll|Win32.ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Debug_RTL_dll|Win32.Build.0 = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Debug_WM5_PPC_ARM|Win32.ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Debug|Win32.ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Debug|Win32.Build.0 = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release_Dynamic_SSE|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release_Dynamic_SSE|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release_Dynamic|Win32.ActiveCfg = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release_Dynamic|Win32.Build.0 = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release_RTL_dll|Win32.ActiveCfg = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release_RTL_dll|Win32.Build.0 = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release_SSE|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release_SSE|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release_SSE2|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release_SSE2|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release_WM5_PPC_ARM|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release_WM5_PPC_ARM|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release|Win32.ActiveCfg = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release|Win32.Build.0 = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Debug_RTL_dll|Win32.ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Debug_RTL_dll|Win32.Build.0 = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Debug_WM5_PPC_ARM|Win32.ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Debug|Win32.ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Debug|Win32.Build.0 = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release_Dynamic_SSE|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release_Dynamic_SSE|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release_Dynamic|Win32.ActiveCfg = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release_Dynamic|Win32.Build.0 = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release_RTL_dll|Win32.ActiveCfg = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release_RTL_dll|Win32.Build.0 = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release_SSE|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release_SSE|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release_SSE2|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release_SSE2|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release_WM5_PPC_ARM|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release_WM5_PPC_ARM|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release|Win32.ActiveCfg = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/speex/win32/VS2005/libspeexdsp/Makefile.am b/speex/win32/VS2005/libspeexdsp/Makefile.am deleted file mode 100644 index 9f72976dcc1ff597546357c7cba1868d96e293b8..0000000000000000000000000000000000000000 --- a/speex/win32/VS2005/libspeexdsp/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -## Process this file with automake to produce Makefile.in. -*-Makefile-*- - -# Disable automatic dependency tracking if using other tools than gcc and gmake -#AUTOMAKE_OPTIONS = no-dependencies - -EXTRA_DIST = libspeexdsp.vcproj - - diff --git a/speex/win32/VS2005/libspeexdsp/libspeexdsp.vcproj b/speex/win32/VS2005/libspeexdsp/libspeexdsp.vcproj deleted file mode 100644 index aef817b5288feaee9367543a19f6230d724af9b0..0000000000000000000000000000000000000000 --- a/speex/win32/VS2005/libspeexdsp/libspeexdsp.vcproj +++ /dev/null @@ -1,1628 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/speex/win32/VS2005/tests/Makefile.am b/speex/win32/VS2005/tests/Makefile.am deleted file mode 100644 index 38caed807d6fe79037a7a29409f2b23038b27cc3..0000000000000000000000000000000000000000 --- a/speex/win32/VS2005/tests/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -## Process this file with automake to produce Makefile.in. -*-Makefile-*- - -# Disable automatic dependency tracking if using other tools than gcc and gmake -#AUTOMAKE_OPTIONS = no-dependencies - -EXTRA_DIST = testdenoise.vcproj testecho.vcproj testresample.vcproj - - diff --git a/speex/win32/VS2005/tests/testdenoise.vcproj b/speex/win32/VS2005/tests/testdenoise.vcproj deleted file mode 100644 index dfab1a241757095b92bb82fb91aff71acccff5a3..0000000000000000000000000000000000000000 --- a/speex/win32/VS2005/tests/testdenoise.vcproj +++ /dev/null @@ -1,307 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/speex/win32/VS2005/tests/testecho.vcproj b/speex/win32/VS2005/tests/testecho.vcproj deleted file mode 100644 index f2e7240dbb1bf5930bf9d9c408e7f4453ee714dc..0000000000000000000000000000000000000000 --- a/speex/win32/VS2005/tests/testecho.vcproj +++ /dev/null @@ -1,307 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/speex/win32/VS2005/tests/testresample.vcproj b/speex/win32/VS2005/tests/testresample.vcproj deleted file mode 100644 index 9bb7c28f1db36f8388092e4e3daafbe7c0292f8c..0000000000000000000000000000000000000000 --- a/speex/win32/VS2005/tests/testresample.vcproj +++ /dev/null @@ -1,307 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/speex/win32/VS2008/Makefile.am b/speex/win32/VS2008/Makefile.am deleted file mode 100644 index 02f81d7bcca0a36ff8dcbd38c07ca66b9532b9dd..0000000000000000000000000000000000000000 --- a/speex/win32/VS2008/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -## Process this file with automake to produce Makefile.in. -*-Makefile-*- - -# Disable automatic dependency tracking if using other tools than gcc and gmake -#AUTOMAKE_OPTIONS = no-dependencies - -SUBDIRS = libspeexdsp tests - -EXTRA_DIST = libspeexdsp.sln diff --git a/speex/win32/VS2008/libspeexdsp.sln b/speex/win32/VS2008/libspeexdsp.sln deleted file mode 100644 index f1c70cb7fc8cee49cebb2940bea6faf35eb80e4b..0000000000000000000000000000000000000000 --- a/speex/win32/VS2008/libspeexdsp.sln +++ /dev/null @@ -1,411 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testdenoise", "tests\testdenoise.vcproj", "{961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}" - ProjectSection(ProjectDependencies) = postProject - {03207781-0D1C-4DB3-A71D-45C608F28DBD} = {03207781-0D1C-4DB3-A71D-45C608F28DBD} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testecho", "tests\testecho.vcproj", "{961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}" - ProjectSection(ProjectDependencies) = postProject - {03207781-0D1C-4DB3-A71D-45C608F28DBD} = {03207781-0D1C-4DB3-A71D-45C608F28DBD} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testresample", "tests\testresample.vcproj", "{961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}" - ProjectSection(ProjectDependencies) = postProject - {03207781-0D1C-4DB3-A71D-45C608F28DBD} = {03207781-0D1C-4DB3-A71D-45C608F28DBD} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspeexdsp", "libspeexdsp\libspeexdsp.vcproj", "{03207781-0D1C-4DB3-A71D-45C608F28DBD}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug_RTL_dll|Win32 = Debug_RTL_dll|Win32 - Debug_RTL_dll|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) = Debug_RTL_dll|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) - Debug_WM5_PPC_ARM|Win32 = Debug_WM5_PPC_ARM|Win32 - Debug_WM5_PPC_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) = Debug_WM5_PPC_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) - Debug|Win32 = Debug|Win32 - Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) - Release_Dynamic_SSE|Win32 = Release_Dynamic_SSE|Win32 - Release_Dynamic_SSE|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) = Release_Dynamic_SSE|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) - Release_Dynamic|Win32 = Release_Dynamic|Win32 - Release_Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) = Release_Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) - Release_RTL_dll|Win32 = Release_RTL_dll|Win32 - Release_RTL_dll|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) = Release_RTL_dll|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) - Release_SSE|Win32 = Release_SSE|Win32 - Release_SSE|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) = Release_SSE|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) - Release_SSE2|Win32 = Release_SSE2|Win32 - Release_SSE2|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) = Release_SSE2|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) - Release_Static_SSE|Win32 = Release_Static_SSE|Win32 - Release_Static_SSE|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) = Release_Static_SSE|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) - Release_WM5_PPC_ARM|Win32 = Release_WM5_PPC_ARM|Win32 - Release_WM5_PPC_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) = Release_WM5_PPC_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) - Release|Win32 = Release|Win32 - Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Debug_RTL_dll|Win32.ActiveCfg = Debug_RTL_dll|Win32 - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Debug_RTL_dll|Win32.Build.0 = Debug_RTL_dll|Win32 - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Debug_RTL_dll|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug_RTL_dll|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Debug_RTL_dll|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Debug_RTL_dll|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Debug_RTL_dll|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Debug_RTL_dll|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Debug_WM5_PPC_ARM|Win32.ActiveCfg = Debug_WM5_PPC_ARM|Win32 - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Debug_WM5_PPC_ARM|Win32.Build.0 = Debug_WM5_PPC_ARM|Win32 - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Debug_WM5_PPC_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug_WM5_PPC_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Debug_WM5_PPC_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Debug_WM5_PPC_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Debug_WM5_PPC_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Debug_WM5_PPC_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Debug|Win32.ActiveCfg = Debug|Win32 - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Debug|Win32.Build.0 = Debug|Win32 - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_Dynamic_SSE|Win32.ActiveCfg = Release_Dynamic_SSE|Win32 - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_Dynamic_SSE|Win32.Build.0 = Release_Dynamic_SSE|Win32 - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_Dynamic_SSE|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_Dynamic_SSE|Win32 - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_Dynamic_SSE|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release_Dynamic_SSE|Win32 - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_Dynamic|Win32.ActiveCfg = Release_Dynamic|Win32 - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_Dynamic|Win32.Build.0 = Release_Dynamic|Win32 - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release_Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Release_Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_RTL_dll|Win32.ActiveCfg = Release_RTL_dll|Win32 - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_RTL_dll|Win32.Build.0 = Release_RTL_dll|Win32 - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_RTL_dll|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_RTL_dll|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_RTL_dll|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release_RTL_dll|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_RTL_dll|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Release_RTL_dll|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_SSE|Win32.ActiveCfg = Release_SSE|Win32 - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_SSE|Win32.Build.0 = Release_SSE|Win32 - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_SSE|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_SSE|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_SSE|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release_SSE|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_SSE|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Release_SSE|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_SSE2|Win32.ActiveCfg = Release_SSE2|Win32 - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_SSE2|Win32.Build.0 = Release_SSE2|Win32 - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_SSE2|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_SSE2|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_SSE2|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release_SSE2|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_SSE2|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Release_SSE2|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_Static_SSE|Win32.ActiveCfg = Release_Static_SSE|Win32 - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_Static_SSE|Win32.Build.0 = Release_Static_SSE|Win32 - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_Static_SSE|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_Static_SSE|Win32 - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_Static_SSE|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release_Static_SSE|Win32 - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_WM5_PPC_ARM|Win32.ActiveCfg = Release_WM5_PPC_ARM|Win32 - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_WM5_PPC_ARM|Win32.Build.0 = Release_WM5_PPC_ARM|Win32 - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_WM5_PPC_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_WM5_PPC_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_WM5_PPC_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release_WM5_PPC_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release_WM5_PPC_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Release_WM5_PPC_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release|Win32.ActiveCfg = Release|Win32 - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release|Win32.Build.0 = Release|Win32 - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) - {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I) - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Debug_RTL_dll|Win32.ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Debug_RTL_dll|Win32.Build.0 = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Debug_RTL_dll|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Debug_WM5_PPC_ARM|Win32.ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Debug_WM5_PPC_ARM|Win32.Build.0 = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Debug_WM5_PPC_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Debug|Win32.ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Debug|Win32.Build.0 = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_Dynamic_SSE|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_Dynamic_SSE|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_Dynamic_SSE|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_Dynamic_SSE|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_Dynamic|Win32.ActiveCfg = Release_SSE2|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_Dynamic|Win32.Build.0 = Release_SSE2|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_SSE2|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_RTL_dll|Win32.ActiveCfg = Release_SSE2|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_RTL_dll|Win32.Build.0 = Release_SSE2|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_RTL_dll|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_SSE2|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_SSE|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_SSE|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_SSE|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_SSE2|Win32.ActiveCfg = Release_SSE2|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_SSE2|Win32.Build.0 = Release_SSE2|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_SSE2|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_SSE2|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_Static_SSE|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_Static_SSE|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_Static_SSE|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_Static_SSE|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_WM5_PPC_ARM|Win32.ActiveCfg = Release_SSE2|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_WM5_PPC_ARM|Win32.Build.0 = Release_SSE2|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release_WM5_PPC_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_SSE2|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release|Win32.ActiveCfg = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release|Win32.Build.0 = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA8}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release|Win32 - {CD6043D1-D5E7-46D0-854F-00BB1BC308FC}.Debug_RTL_dll|Win32.ActiveCfg = Debug|Win32 - {CD6043D1-D5E7-46D0-854F-00BB1BC308FC}.Debug_RTL_dll|Win32.Build.0 = Debug|Win32 - {CD6043D1-D5E7-46D0-854F-00BB1BC308FC}.Debug_RTL_dll|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32 - {CD6043D1-D5E7-46D0-854F-00BB1BC308FC}.Debug_WM5_PPC_ARM|Win32.ActiveCfg = Debug|Win32 - {CD6043D1-D5E7-46D0-854F-00BB1BC308FC}.Debug_WM5_PPC_ARM|Win32.Build.0 = Debug|Win32 - {CD6043D1-D5E7-46D0-854F-00BB1BC308FC}.Debug_WM5_PPC_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32 - {CD6043D1-D5E7-46D0-854F-00BB1BC308FC}.Debug|Win32.ActiveCfg = Debug|Win32 - {CD6043D1-D5E7-46D0-854F-00BB1BC308FC}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32 - {CD6043D1-D5E7-46D0-854F-00BB1BC308FC}.Release_Dynamic_SSE|Win32.ActiveCfg = Release_SSE2|Win32 - {CD6043D1-D5E7-46D0-854F-00BB1BC308FC}.Release_Dynamic_SSE|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_SSE2|Win32 - {CD6043D1-D5E7-46D0-854F-00BB1BC308FC}.Release_Dynamic|Win32.ActiveCfg = Release_SSE2|Win32 - {CD6043D1-D5E7-46D0-854F-00BB1BC308FC}.Release_Dynamic|Win32.Build.0 = Release_SSE2|Win32 - {CD6043D1-D5E7-46D0-854F-00BB1BC308FC}.Release_Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_SSE2|Win32 - {CD6043D1-D5E7-46D0-854F-00BB1BC308FC}.Release_RTL_dll|Win32.ActiveCfg = Release_SSE2|Win32 - {CD6043D1-D5E7-46D0-854F-00BB1BC308FC}.Release_RTL_dll|Win32.Build.0 = Release_SSE2|Win32 - {CD6043D1-D5E7-46D0-854F-00BB1BC308FC}.Release_RTL_dll|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_SSE2|Win32 - {CD6043D1-D5E7-46D0-854F-00BB1BC308FC}.Release_SSE|Win32.ActiveCfg = Release_SSE|Win32 - {CD6043D1-D5E7-46D0-854F-00BB1BC308FC}.Release_SSE|Win32.Build.0 = Release_SSE|Win32 - {CD6043D1-D5E7-46D0-854F-00BB1BC308FC}.Release_SSE|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_SSE|Win32 - {CD6043D1-D5E7-46D0-854F-00BB1BC308FC}.Release_SSE2|Win32.ActiveCfg = Release_SSE2|Win32 - {CD6043D1-D5E7-46D0-854F-00BB1BC308FC}.Release_SSE2|Win32.Build.0 = Release_SSE2|Win32 - {CD6043D1-D5E7-46D0-854F-00BB1BC308FC}.Release_SSE2|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_SSE2|Win32 - {CD6043D1-D5E7-46D0-854F-00BB1BC308FC}.Release_Static_SSE|Win32.ActiveCfg = Release_SSE2|Win32 - {CD6043D1-D5E7-46D0-854F-00BB1BC308FC}.Release_Static_SSE|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_SSE2|Win32 - {CD6043D1-D5E7-46D0-854F-00BB1BC308FC}.Release_WM5_PPC_ARM|Win32.ActiveCfg = Release_SSE2|Win32 - {CD6043D1-D5E7-46D0-854F-00BB1BC308FC}.Release_WM5_PPC_ARM|Win32.Build.0 = Release_SSE2|Win32 - {CD6043D1-D5E7-46D0-854F-00BB1BC308FC}.Release_WM5_PPC_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_SSE2|Win32 - {CD6043D1-D5E7-46D0-854F-00BB1BC308FC}.Release|Win32.ActiveCfg = Release|Win32 - {CD6043D1-D5E7-46D0-854F-00BB1BC308FC}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Debug_RTL_dll|Win32.ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Debug_RTL_dll|Win32.Build.0 = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Debug_RTL_dll|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Debug_WM5_PPC_ARM|Win32.ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Debug_WM5_PPC_ARM|Win32.Build.0 = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Debug_WM5_PPC_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Debug|Win32.ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Debug|Win32.Build.0 = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release_Dynamic_SSE|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release_Dynamic_SSE|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release_Dynamic_SSE|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release_Dynamic_SSE|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release_Dynamic|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release_Dynamic|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release_Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release_RTL_dll|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release_RTL_dll|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release_RTL_dll|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release_SSE|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release_SSE|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release_SSE|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release_SSE2|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release_SSE2|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release_SSE2|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release_Static_SSE|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release_Static_SSE|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release_Static_SSE|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release_Static_SSE|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release_WM5_PPC_ARM|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release_WM5_PPC_ARM|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release_WM5_PPC_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release|Win32.ActiveCfg = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release|Win32.Build.0 = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DA9}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Debug_RTL_dll|Win32.ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Debug_RTL_dll|Win32.Build.0 = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Debug_RTL_dll|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Debug_WM5_PPC_ARM|Win32.ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Debug_WM5_PPC_ARM|Win32.Build.0 = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Debug_WM5_PPC_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Debug|Win32.ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Debug|Win32.Build.0 = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release_Dynamic_SSE|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release_Dynamic_SSE|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release_Dynamic_SSE|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release_Dynamic_SSE|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release_Dynamic|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release_Dynamic|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release_Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release_RTL_dll|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release_RTL_dll|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release_RTL_dll|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release_SSE|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release_SSE|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release_SSE|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release_SSE2|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release_SSE2|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release_SSE2|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release_Static_SSE|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release_Static_SSE|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release_Static_SSE|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release_Static_SSE|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release_WM5_PPC_ARM|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release_WM5_PPC_ARM|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release_WM5_PPC_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release|Win32.ActiveCfg = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release|Win32.Build.0 = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAA}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Debug_RTL_dll|Win32.ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Debug_RTL_dll|Win32.Build.0 = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Debug_RTL_dll|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Debug_WM5_PPC_ARM|Win32.ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Debug_WM5_PPC_ARM|Win32.Build.0 = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Debug_WM5_PPC_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Debug|Win32.ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Debug|Win32.Build.0 = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Release_Dynamic_SSE|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Release_Dynamic_SSE|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Release_Dynamic_SSE|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Release_Dynamic_SSE|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Release_Dynamic|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Release_Dynamic|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Release_Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Release_RTL_dll|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Release_RTL_dll|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Release_RTL_dll|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Release_SSE|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Release_SSE|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Release_SSE|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Release_SSE2|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Release_SSE2|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Release_SSE2|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Release_Static_SSE|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Release_Static_SSE|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Release_Static_SSE|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Release_Static_SSE|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Release_WM5_PPC_ARM|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Release_WM5_PPC_ARM|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Release_WM5_PPC_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Release|Win32.ActiveCfg = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Release|Win32.Build.0 = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAE}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Debug_RTL_dll|Win32.ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Debug_RTL_dll|Win32.Build.0 = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Debug_RTL_dll|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Debug_WM5_PPC_ARM|Win32.ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Debug_WM5_PPC_ARM|Win32.Build.0 = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Debug_WM5_PPC_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Debug|Win32.ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Debug|Win32.Build.0 = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Release_Dynamic_SSE|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Release_Dynamic_SSE|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Release_Dynamic_SSE|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Release_Dynamic_SSE|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Release_Dynamic|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Release_Dynamic|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Release_Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Release_RTL_dll|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Release_RTL_dll|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Release_RTL_dll|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Release_SSE|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Release_SSE|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Release_SSE|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Release_SSE2|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Release_SSE2|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Release_SSE2|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Release_Static_SSE|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Release_Static_SSE|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Release_Static_SSE|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Release_Static_SSE|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Release_WM5_PPC_ARM|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Release_WM5_PPC_ARM|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Release_WM5_PPC_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Release|Win32.ActiveCfg = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Release|Win32.Build.0 = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAC}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Debug_RTL_dll|Win32.ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Debug_RTL_dll|Win32.Build.0 = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Debug_RTL_dll|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Debug_WM5_PPC_ARM|Win32.ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Debug_WM5_PPC_ARM|Win32.Build.0 = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Debug_WM5_PPC_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Debug|Win32.ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Debug|Win32.Build.0 = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release_Dynamic_SSE|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release_Dynamic_SSE|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release_Dynamic_SSE|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release_Dynamic_SSE|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release_Dynamic|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release_Dynamic|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release_Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release_RTL_dll|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release_RTL_dll|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release_RTL_dll|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release_SSE|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release_SSE|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release_SSE|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release_SSE2|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release_SSE2|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release_SSE2|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release_Static_SSE|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release_Static_SSE|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release_Static_SSE|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release_Static_SSE|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release_WM5_PPC_ARM|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release_WM5_PPC_ARM|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release_WM5_PPC_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release|Win32.ActiveCfg = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release|Win32.Build.0 = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAD}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Debug_RTL_dll|Win32.ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Debug_RTL_dll|Win32.Build.0 = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Debug_RTL_dll|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Debug_WM5_PPC_ARM|Win32.ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Debug_WM5_PPC_ARM|Win32.Build.0 = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Debug_WM5_PPC_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Debug|Win32.ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Debug|Win32.Build.0 = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Debug|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release_Dynamic_SSE|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release_Dynamic_SSE|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release_Dynamic_SSE|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release_Dynamic_SSE|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release_Dynamic|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release_Dynamic|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release_Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release_RTL_dll|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release_RTL_dll|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release_RTL_dll|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release_SSE|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release_SSE|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release_SSE|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release_SSE2|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release_SSE2|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release_SSE2|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release_Static_SSE|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release_Static_SSE|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release_Static_SSE|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release_Static_SSE|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release_WM5_PPC_ARM|Win32.ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release_WM5_PPC_ARM|Win32.Build.0 = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release_WM5_PPC_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_SSE|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release|Win32.ActiveCfg = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release|Win32.Build.0 = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Win32 - {961B8359-1393-4EF7-B8E0-67B6FE1C6DAB}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release|Win32 - {03207781-0D1C-4DB3-A71D-45C608F28DBD}.Debug_RTL_dll|Win32.ActiveCfg = Debug|Win32 - {03207781-0D1C-4DB3-A71D-45C608F28DBD}.Debug_RTL_dll|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32 - {03207781-0D1C-4DB3-A71D-45C608F28DBD}.Debug_WM5_PPC_ARM|Win32.ActiveCfg = Debug|Win32 - {03207781-0D1C-4DB3-A71D-45C608F28DBD}.Debug_WM5_PPC_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32 - {03207781-0D1C-4DB3-A71D-45C608F28DBD}.Debug|Win32.ActiveCfg = Debug|Win32 - {03207781-0D1C-4DB3-A71D-45C608F28DBD}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32 - {03207781-0D1C-4DB3-A71D-45C608F28DBD}.Release_Dynamic_SSE|Win32.ActiveCfg = Release_Dynamic_SSE|Win32 - {03207781-0D1C-4DB3-A71D-45C608F28DBD}.Release_Dynamic_SSE|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_Dynamic_SSE|Win32 - {03207781-0D1C-4DB3-A71D-45C608F28DBD}.Release_Dynamic|Win32.ActiveCfg = Release_Dynamic_SSE|Win32 - {03207781-0D1C-4DB3-A71D-45C608F28DBD}.Release_Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_Dynamic_SSE|Win32 - {03207781-0D1C-4DB3-A71D-45C608F28DBD}.Release_RTL_dll|Win32.ActiveCfg = Release_Static_SSE|Win32 - {03207781-0D1C-4DB3-A71D-45C608F28DBD}.Release_RTL_dll|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_Static_SSE|Win32 - {03207781-0D1C-4DB3-A71D-45C608F28DBD}.Release_SSE|Win32.ActiveCfg = Release_Static_SSE|Win32 - {03207781-0D1C-4DB3-A71D-45C608F28DBD}.Release_SSE|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_Static_SSE|Win32 - {03207781-0D1C-4DB3-A71D-45C608F28DBD}.Release_SSE2|Win32.ActiveCfg = Release_Static_SSE|Win32 - {03207781-0D1C-4DB3-A71D-45C608F28DBD}.Release_SSE2|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_Static_SSE|Win32 - {03207781-0D1C-4DB3-A71D-45C608F28DBD}.Release_Static_SSE|Win32.ActiveCfg = Release_Static_SSE|Win32 - {03207781-0D1C-4DB3-A71D-45C608F28DBD}.Release_Static_SSE|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_Static_SSE|Win32 - {03207781-0D1C-4DB3-A71D-45C608F28DBD}.Release_WM5_PPC_ARM|Win32.ActiveCfg = Release_Static_SSE|Win32 - {03207781-0D1C-4DB3-A71D-45C608F28DBD}.Release_WM5_PPC_ARM|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release_Static_SSE|Win32 - {03207781-0D1C-4DB3-A71D-45C608F28DBD}.Release|Win32.ActiveCfg = Release|Win32 - {03207781-0D1C-4DB3-A71D-45C608F28DBD}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/speex/win32/VS2008/libspeexdsp/Makefile.am b/speex/win32/VS2008/libspeexdsp/Makefile.am deleted file mode 100644 index 9f72976dcc1ff597546357c7cba1868d96e293b8..0000000000000000000000000000000000000000 --- a/speex/win32/VS2008/libspeexdsp/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -## Process this file with automake to produce Makefile.in. -*-Makefile-*- - -# Disable automatic dependency tracking if using other tools than gcc and gmake -#AUTOMAKE_OPTIONS = no-dependencies - -EXTRA_DIST = libspeexdsp.vcproj - - diff --git a/speex/win32/VS2008/libspeexdsp/libspeexdsp.vcproj b/speex/win32/VS2008/libspeexdsp/libspeexdsp.vcproj deleted file mode 100644 index 6349872cff320f4fbc9cec6014ac6fe22b0a4cd7..0000000000000000000000000000000000000000 --- a/speex/win32/VS2008/libspeexdsp/libspeexdsp.vcproj +++ /dev/null @@ -1,474 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/speex/win32/VS2008/tests/Makefile.am b/speex/win32/VS2008/tests/Makefile.am deleted file mode 100644 index 38caed807d6fe79037a7a29409f2b23038b27cc3..0000000000000000000000000000000000000000 --- a/speex/win32/VS2008/tests/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -## Process this file with automake to produce Makefile.in. -*-Makefile-*- - -# Disable automatic dependency tracking if using other tools than gcc and gmake -#AUTOMAKE_OPTIONS = no-dependencies - -EXTRA_DIST = testdenoise.vcproj testecho.vcproj testresample.vcproj - - diff --git a/speex/win32/VS2008/tests/testdenoise.vcproj b/speex/win32/VS2008/tests/testdenoise.vcproj deleted file mode 100644 index c344ae8b3892898b0bc3fe18269bf232aa17dede..0000000000000000000000000000000000000000 --- a/speex/win32/VS2008/tests/testdenoise.vcproj +++ /dev/null @@ -1,305 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/speex/win32/VS2008/tests/testecho.vcproj b/speex/win32/VS2008/tests/testecho.vcproj deleted file mode 100644 index cdd4f98a433c69c649404d12687af9b6b02df62c..0000000000000000000000000000000000000000 --- a/speex/win32/VS2008/tests/testecho.vcproj +++ /dev/null @@ -1,305 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/speex/win32/VS2008/tests/testresample.vcproj b/speex/win32/VS2008/tests/testresample.vcproj deleted file mode 100644 index 52f1e4cc42a6668479c40db2c7b84c326b47fcd7..0000000000000000000000000000000000000000 --- a/speex/win32/VS2008/tests/testresample.vcproj +++ /dev/null @@ -1,305 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/speex/win32/libspeexdsp.def b/speex/win32/libspeexdsp.def deleted file mode 100644 index 45fc69d9d7e5b6d7a838752aff86dced3db38ab5..0000000000000000000000000000000000000000 --- a/speex/win32/libspeexdsp.def +++ /dev/null @@ -1,76 +0,0 @@ -LIBRARY libspeexdsp -EXPORTS - - -; -; speex_buffer.h -; -speex_buffer_init -speex_buffer_destroy -speex_buffer_write -speex_buffer_writezeros -speex_buffer_read -speex_buffer_get_available -speex_buffer_resize - -; -; speex_echo.h -; -speex_echo_state_init -speex_echo_state_init_mc -speex_echo_state_destroy -speex_echo_cancellation -speex_echo_cancel -speex_echo_capture -speex_echo_playback -speex_echo_state_reset -speex_echo_ctl -speex_decorrelate_new -speex_decorrelate -speex_decorrelate_destroy - -; -; speex_jitter.h -; -jitter_buffer_init -jitter_buffer_reset -jitter_buffer_destroy -jitter_buffer_put -jitter_buffer_get -jitter_buffer_get_pointer_timestamp -jitter_buffer_tick -jitter_buffer_update_delay - -; -; speex_preprocess.h -; -speex_preprocess_state_init -speex_preprocess_state_destroy -speex_preprocess_run -speex_preprocess -speex_preprocess_estimate_update -speex_preprocess_ctl - -; -; speex_resampler.h -; -speex_resampler_init -speex_resampler_init_frac -speex_resampler_destroy -speex_resampler_process_float -speex_resampler_process_int -speex_resampler_process_interleaved_float -speex_resampler_process_interleaved_int -speex_resampler_set_rate -speex_resampler_get_rate -speex_resampler_set_rate_frac -speex_resampler_get_ratio -speex_resampler_set_quality -speex_resampler_get_quality -speex_resampler_set_input_stride -speex_resampler_get_input_stride -speex_resampler_set_output_stride -speex_resampler_get_output_stride -speex_resampler_skip_zeros -speex_resampler_reset_mem -speex_resampler_strerror diff --git a/speex/win32/libspeexdsp/Makefile.am b/speex/win32/libspeexdsp/Makefile.am deleted file mode 100644 index b35b4685d299045be7936af9ac05522e42b25a7e..0000000000000000000000000000000000000000 --- a/speex/win32/libspeexdsp/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -## Process this file with automake to produce Makefile.in. -*-Makefile-*- - -# Disable automatic dependency tracking if using other tools than gcc and gmake -#AUTOMAKE_OPTIONS = no-dependencies - -EXTRA_DIST = libspeexdsp.dsw libspeexdsp.dsp libspeexdsp_dynamic.dsp diff --git a/speex/win32/libspeexdsp/libspeexdsp.dsp b/speex/win32/libspeexdsp/libspeexdsp.dsp deleted file mode 100644 index 10f2c1aa0957ba4897c21dcaa644ec22379fc334..0000000000000000000000000000000000000000 --- a/speex/win32/libspeexdsp/libspeexdsp.dsp +++ /dev/null @@ -1,228 +0,0 @@ -# Microsoft Developer Studio Project File - Name="libspeexdsp" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=libspeexdsp - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "libspeexdsp.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "libspeexdsp.mak" CFG="libspeexdsp - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "libspeexdsp - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "libspeexdsp - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "libspeexdsp - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -F90=df.exe -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MD /W1 /GX- /O2 /I "../../include" /I "../" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x419 /d "NDEBUG" -# ADD RSC /l 0x809 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\lib\libspeexdsp.lib" - -!ELSEIF "$(CFG)" == "libspeexdsp - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "libspeexdsp___Win32_Debug" -# PROP BASE Intermediate_Dir "libspeexdsp___Win32_Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "libspeexdsp___Win32_Debug" -# PROP Intermediate_Dir "libspeexdsp___Win32_Debug" -# PROP Target_Dir "" -F90=df.exe -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm- /GX- /Zi /Od /I "../../include" /I "../" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /FD /GZ /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x419 /d "_DEBUG" -# ADD RSC /l 0x809 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\lib\libspeexdsp.lib" - -!ENDIF - -# Begin Target - -# Name "libspeexdsp - Win32 Release" -# Name "libspeexdsp - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\..\libspeex\buffer.c -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\fftwrap.c -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\filterbank.c -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\jitter.c -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\kiss_fft.c -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\kiss_fftr.c -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\mdf.c -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\preprocess.c -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\resample.c -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\scal.c -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\smallft.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\..\libspeex\_kiss_fft_guts.h -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\arch.h -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\fftwrap.h -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\filterbank.h -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\fixed_debug.h -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\fixed_generic.h -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\kiss_fft.h -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\kiss_fftr.h -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\math_approx.h -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\os_support.h -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\pseudofloat.h -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\smallft.h -# End Source File -# End Group -# Begin Group "Public Header Files" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\include\speex\speex.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\speex\speex_bits.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\speex\speex_buffer.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\speex\speex_echo.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\speex\speex_jitter.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\speex\speex_preprocess.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\speex\speex_resampler.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\speex\speex_types.h -# End Source File -# End Group -# Begin Source File - -SOURCE=..\config.h -# End Source File -# End Target -# End Project diff --git a/speex/win32/libspeexdsp/libspeexdsp.dsw b/speex/win32/libspeexdsp/libspeexdsp.dsw deleted file mode 100644 index 814f2ae9cdc2a4dde6cde8637aad2b3695a5d26b..0000000000000000000000000000000000000000 --- a/speex/win32/libspeexdsp/libspeexdsp.dsw +++ /dev/null @@ -1,41 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "libspeexdsp"=.\libspeexdsp.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "libspeexdsp_dynamic"=.\libspeexdsp_dynamic.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/speex/win32/libspeexdsp/libspeexdsp_dynamic.dsp b/speex/win32/libspeexdsp/libspeexdsp_dynamic.dsp deleted file mode 100644 index 28096619bfc0a920535140a76afbac8172f2c2c8..0000000000000000000000000000000000000000 --- a/speex/win32/libspeexdsp/libspeexdsp_dynamic.dsp +++ /dev/null @@ -1,237 +0,0 @@ -# Microsoft Developer Studio Project File - Name="libspeexdsp_dynamic" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=libspeexdsp_dynamic - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "libspeexdsp_dynamic.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "libspeexdsp_dynamic.mak" CFG="libspeexdsp_dynamic - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "libspeexdsp_dynamic - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "libspeexdsp_dynamic - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "libspeexdsp_dynamic - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "libspeexdsp_dynamic___Win32_Release" -# PROP BASE Intermediate_Dir "libspeexdsp_dynamic___Win32_Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Dynamic_Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBSPEEX_DYNAMIC_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../include" /I "../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HAVE_CONFIG_H" /FD /c -# SUBTRACT CPP /YX -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\bin\libspeexdsp.dll" /implib:"..\..\lib\libspeexdsp.lib" - -!ELSEIF "$(CFG)" == "libspeexdsp_dynamic - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "libspeexdsp_dynamic___Win32_Debug" -# PROP BASE Intermediate_Dir "libspeexdsp_dynamic___Win32_Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Dynamic_Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBSPEEX_DYNAMIC_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../include" /I "../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HAVE_CONFIG_H" /FD /GZ /c -# SUBTRACT CPP /YX -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\bin\libspeexdsp.dll" /implib:"..\..\lib\libspeexdsp.lib" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "libspeexdsp_dynamic - Win32 Release" -# Name "libspeexdsp_dynamic - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\..\libspeex\buffer.c -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\fftwrap.c -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\filterbank.c -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\jitter.c -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\kiss_fft.c -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\kiss_fftr.c -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\mdf.c -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\preprocess.c -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\resample.c -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\scal.c -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\smallft.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\..\libspeex\_kiss_fft_guts.h -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\arch.h -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\fftwrap.h -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\filterbank.h -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\fixed_debug.h -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\fixed_generic.h -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\kiss_fft.h -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\kiss_fftr.h -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\math_approx.h -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\os_support.h -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\pseudofloat.h -# End Source File -# Begin Source File - -SOURCE=..\..\libspeex\smallft.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\speex\speex_buffer.h -# End Source File -# End Group -# Begin Group "Public Header Files" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\include\speex\speex.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\speex\speex_bits.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\speex\speex_echo.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\speex\speex_jitter.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\speex\speex_preprocess.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\speex\speex_resampler.h -# End Source File -# Begin Source File - -SOURCE=..\..\include\speex\speex_types.h -# End Source File -# End Group -# Begin Source File - -SOURCE=..\config.h -# End Source File -# Begin Source File - -SOURCE=..\libspeexdsp.def -# End Source File -# End Target -# End Project diff --git a/speex/win32/speex.iss b/speex/win32/speex.iss deleted file mode 100644 index 6700cfe280cd5ed1c6dca03dd81a0d9b5fefe736..0000000000000000000000000000000000000000 --- a/speex/win32/speex.iss +++ /dev/null @@ -1,47 +0,0 @@ -; Script generated by the Inno Setup Script Wizard. -; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! - -[Setup] -AppName=Speex -AppVerName=Speex V1.1.6 -AppPublisherURL=http://www.speex.org -AppSupportURL=http://www.speex.org -AppUpdatesURL=http://www.speex.org -DefaultDirName={pf}\Speex -DefaultGroupName=Speex -AllowNoIcons=yes -LicenseFile=..\COPYING -InfoAfterFile=..\README -OutputDir=. -OutputBaseFilename=speex_win32_1.1.6_setup -; uncomment the following line if you want your installation to run on NT 3.51 too. -; MinVersion=4,3.51 - -[Tasks] -;Name: "desktopicon"; Description: "Create a &desktop icon"; GroupDescription: "Additional icons:"; MinVersion: 4,4 - -[Dirs] -Name: "{app}" -Name: "{app}\doc" -Name: "{app}\html" -Name: "{app}\libspeex" -Name: "{app}\libspeex\include" - -[Files] -Source: "speexdec\Release\speexdec.exe"; DestDir: "{app}"; Flags: ignoreversion -Source: "speexenc\Release\speexenc.exe"; DestDir: "{app}"; Flags: ignoreversion -Source: "libspeex\Release\libspeex.lib"; DestDir: "{app}\libspeex"; Flags: ignoreversion -Source: "libspeex\Release\libspeex.exp"; DestDir: "{app}\libspeex"; Flags: ignoreversion -Source: "libspeex\Release\libspeex.dll"; DestDir: "{app}\libspeex"; Flags: ignoreversion -Source: "..\include\speex\speex.h"; DestDir: "{app}\libspeex\include"; Flags: ignoreversion -Source: "..\include\speex\speex_bits.h"; DestDir: "{app}\libspeex\include"; Flags: ignoreversion -Source: "..\include\speex\speex_callbacks.h"; DestDir: "{app}\libspeex\include"; Flags: ignoreversion -Source: "..\include\speex\speex_echo.h"; DestDir: "{app}\libspeex\include"; Flags: ignoreversion -Source: "..\include\speex\speex_header.h"; DestDir: "{app}\libspeex\include"; Flags: ignoreversion -Source: "..\include\speex\speex_jitter.h"; DestDir: "{app}\libspeex\include"; Flags: ignoreversion -Source: "..\include\speex\speex_preprocess.h"; DestDir: "{app}\libspeex\include"; Flags: ignoreversion -Source: "..\include\speex\speex_stereo.h"; DestDir: "{app}\libspeex\include"; Flags: ignoreversion -Source: "..\doc\manual.pdf"; DestDir: "{app}\doc"; Flags: ignoreversion - -[Run] -