mirror of
https://github.com/mumble-voip/mumble.git
synced 2025-03-15 21:14:59 +00:00
Add CELT 0.10.0
This commit is contained in:
Benjamin Jemlich
parent
d82a608e5c
commit
83dcdc3fd9
10 changed files with 427 additions and 4 deletions
3
.gitmodules
vendored
3
.gitmodules
vendored
|
|
@ -7,3 +7,6 @@
|
|||
[submodule "celt-0.9.0-src"]
|
||||
path = celt-0.9.0-src
|
||||
url = git://git.xiph.org/celt.git/
|
||||
[submodule "celt-0.10.0-src"]
|
||||
path = celt-0.10.0-src
|
||||
url = git://git.xiph.org/celt.git/
|
||||
|
|
|
|||
62
celt-0.10.0-build/celt-0.10.0-build.pro
Normal file
62
celt-0.10.0-build/celt-0.10.0-build.pro
Normal file
|
|
@ -0,0 +1,62 @@
|
|||
include(../compiler.pri)
|
||||
|
||||
BUILDDIR=$$basename(PWD)
|
||||
SOURCEDIR=$$replace(BUILDDIR,-build,-src)
|
||||
VERSION=$$replace(BUILDDIR,-build,)
|
||||
VERSION=$$replace(VERSION,celt-,)
|
||||
|
||||
!exists(../$$SOURCEDIR/COPYING) {
|
||||
message("The $$SOURCEDIR/ directory was not found. You need to do one of the following:")
|
||||
message("")
|
||||
message("Option 1: Use CELT Git:")
|
||||
message("git submodule init")
|
||||
message("git submodule update")
|
||||
message("")
|
||||
message("Option 2: Use system celt libraries (it's your job to ensure you have all of them):")
|
||||
message("qmake CONFIG+=no-bundled-celt -recursive")
|
||||
message("")
|
||||
error("Aborting configuration")
|
||||
}
|
||||
|
||||
TEMPLATE = lib
|
||||
CONFIG -= qt
|
||||
CONFIG += debug_and_release
|
||||
CONFIG -= warn_on
|
||||
CONFIG += warn_off
|
||||
VPATH = ../$$SOURCEDIR/libcelt
|
||||
TARGET = celt0
|
||||
DEFINES += HAVE_CONFIG_H
|
||||
TARGET_VERSION_EXT = .$$VERSION
|
||||
|
||||
QMAKE_CFLAGS -= -fPIE -pie
|
||||
|
||||
win32 {
|
||||
DEFINES += WIN32 _WIN32
|
||||
INCLUDEPATH += ../$$BUILDDIR/win32
|
||||
|
||||
CONFIG(sse2) {
|
||||
TARGET_VERSION_EXT = .$${VERSION}.sse2
|
||||
} else {
|
||||
QMAKE_CFLAGS_RELEASE -= -arch:SSE
|
||||
QMAKE_CFLAGS_DEBUG -= -arch:SSE
|
||||
}
|
||||
}
|
||||
|
||||
unix {
|
||||
INCLUDEPATH += ../$$BUILDDIR
|
||||
}
|
||||
|
||||
DIST = config.h
|
||||
|
||||
SOURCES *= bands.c celt.c cwrs.c entcode.c entdec.c entenc.c header.c kiss_fft.c laplace.c mathops.c mdct.c modes.c pitch.c plc.c quant_bands.c rangedec.c rangeenc.c rate.c vq.c
|
||||
|
||||
CONFIG(debug, debug|release) {
|
||||
CONFIG += console
|
||||
DESTDIR = ../debug
|
||||
}
|
||||
|
||||
CONFIG(release, debug|release) {
|
||||
DESTDIR = ../release
|
||||
}
|
||||
|
||||
include(../symbols.pri)
|
||||
181
celt-0.10.0-build/config.h
Normal file
181
celt-0.10.0-build/config.h
Normal file
|
|
@ -0,0 +1,181 @@
|
|||
/* config.h. Generated from config.h.in by configure. */
|
||||
/* config.h.in. Generated from configure.ac by autoheader. */
|
||||
|
||||
/* Define if building universal (internal helper macro) */
|
||||
/* #undef AC_APPLE_UNIVERSAL_BUILD */
|
||||
|
||||
/* This is a build of CELT */
|
||||
#define CELT_BUILD /**/
|
||||
|
||||
/* Version extra */
|
||||
#define CELT_EXTRA_VERSION ""
|
||||
|
||||
/* Version major */
|
||||
#define CELT_MAJOR_VERSION 0
|
||||
|
||||
/* Version micro */
|
||||
#define CELT_MICRO_VERSION 0
|
||||
|
||||
/* Version minor */
|
||||
#define CELT_MINOR_VERSION 10
|
||||
|
||||
/* Complete version string */
|
||||
#define CELT_VERSION "0.10.0"
|
||||
|
||||
/* Compile as fixed-point */
|
||||
/* #undef DOUBLE_PRECISION */
|
||||
|
||||
/* Assertions */
|
||||
/* #undef ENABLE_ASSERTIONS */
|
||||
|
||||
/* Postfilter */
|
||||
/* #undef ENABLE_POSTFILTER */
|
||||
|
||||
/* Debug fixed-point implementation */
|
||||
/* #undef FIXED_DEBUG */
|
||||
|
||||
/* Compile as fixed-point */
|
||||
/* #undef FIXED_POINT */
|
||||
|
||||
/* Compile as floating-point */
|
||||
#define FLOATING_POINT /**/
|
||||
|
||||
/* Float approximations */
|
||||
/* #undef FLOAT_APPROX */
|
||||
|
||||
/* Define to 1 if you have the <alloca.h> header file. */
|
||||
#define HAVE_ALLOCA_H 1
|
||||
|
||||
/* Define to 1 if you have the <dlfcn.h> header file. */
|
||||
#define HAVE_DLFCN_H 1
|
||||
|
||||
/* Define to 1 if you have the <getopt.h> header file. */
|
||||
#define HAVE_GETOPT_H 1
|
||||
|
||||
/* Define to 1 if you have the `getopt_long' function. */
|
||||
#define HAVE_GETOPT_LONG 1
|
||||
|
||||
/* Define to 1 if you have the <inttypes.h> header file. */
|
||||
#define HAVE_INTTYPES_H 1
|
||||
|
||||
/* Define to 1 if you have the `m' library (-lm). */
|
||||
#define HAVE_LIBM 1
|
||||
|
||||
/* Define to 1 if you have the `winmm' library (-lwinmm). */
|
||||
/* #undef HAVE_LIBWINMM */
|
||||
|
||||
/* Define if you have C99's lrint function. */
|
||||
#define HAVE_LRINT 1
|
||||
|
||||
/* Define if you have C99's lrintf function. */
|
||||
#define HAVE_LRINTF 1
|
||||
|
||||
/* Define to 1 if you have the <memory.h> header file. */
|
||||
#define HAVE_MEMORY_H 1
|
||||
|
||||
/* Define to 1 if you have the <stdint.h> header file. */
|
||||
#define HAVE_STDINT_H 1
|
||||
|
||||
/* Define to 1 if you have the <stdlib.h> header file. */
|
||||
#define HAVE_STDLIB_H 1
|
||||
|
||||
/* Define to 1 if you have the <strings.h> header file. */
|
||||
#define HAVE_STRINGS_H 1
|
||||
|
||||
/* Define to 1 if you have the <string.h> header file. */
|
||||
#define HAVE_STRING_H 1
|
||||
|
||||
/* Define to 1 if you have the <sys/audioio.h> header file. */
|
||||
/* #undef HAVE_SYS_AUDIOIO_H */
|
||||
|
||||
/* Define to 1 if you have the <sys/soundcard.h> header file. */
|
||||
#define HAVE_SYS_SOUNDCARD_H 1
|
||||
|
||||
/* Define to 1 if you have the <sys/stat.h> header file. */
|
||||
#define HAVE_SYS_STAT_H 1
|
||||
|
||||
/* Define to 1 if you have the <sys/types.h> header file. */
|
||||
#define HAVE_SYS_TYPES_H 1
|
||||
|
||||
/* Define to 1 if you have the <unistd.h> header file. */
|
||||
#define HAVE_UNISTD_H 1
|
||||
|
||||
/* Define to the sub-directory in which libtool stores uninstalled libraries.
|
||||
*/
|
||||
#define LT_OBJDIR ".libs/"
|
||||
|
||||
/* Compile as fixed-point */
|
||||
/* #undef MIXED_PRECISION */
|
||||
|
||||
/* Define to the address where bug reports for this package should be sent. */
|
||||
#define PACKAGE_BUGREPORT ""
|
||||
|
||||
/* Define to the full name of this package. */
|
||||
#define PACKAGE_NAME ""
|
||||
|
||||
/* Define to the full name and version of this package. */
|
||||
#define PACKAGE_STRING ""
|
||||
|
||||
/* Define to the one symbol short name of this package. */
|
||||
#define PACKAGE_TARNAME ""
|
||||
|
||||
/* Define to the version of this package. */
|
||||
#define PACKAGE_VERSION ""
|
||||
|
||||
/* The size of `int', as computed by sizeof. */
|
||||
#define SIZEOF_INT 4
|
||||
|
||||
/* The size of `long', as computed by sizeof. */
|
||||
#define SIZEOF_LONG 8
|
||||
|
||||
/* The size of `long long', as computed by sizeof. */
|
||||
#define SIZEOF_LONG_LONG 8
|
||||
|
||||
/* The size of `short', as computed by sizeof. */
|
||||
#define SIZEOF_SHORT 2
|
||||
|
||||
/* Static modes */
|
||||
/* #undef STATIC_MODES */
|
||||
|
||||
/* Define to 1 if you have the ANSI C header files. */
|
||||
#define STDC_HEADERS 1
|
||||
|
||||
/* Make use of alloca */
|
||||
/* #undef USE_ALLOCA */
|
||||
|
||||
/* Use C99 variable-size arrays */
|
||||
#define VAR_ARRAYS /**/
|
||||
|
||||
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
|
||||
significant byte first (like Motorola and SPARC, unlike Intel). */
|
||||
#if defined AC_APPLE_UNIVERSAL_BUILD
|
||||
# if defined __BIG_ENDIAN__
|
||||
# define WORDS_BIGENDIAN 1
|
||||
# endif
|
||||
#else
|
||||
# ifndef WORDS_BIGENDIAN
|
||||
/* # undef WORDS_BIGENDIAN */
|
||||
# endif
|
||||
#endif
|
||||
|
||||
/* Define to empty if `const' does not conform to ANSI C. */
|
||||
/* #undef const */
|
||||
|
||||
/* Define to `__inline__' or `__inline' if that's what the C compiler
|
||||
calls it, or to nothing if 'inline' is not supported under any name. */
|
||||
#ifndef __cplusplus
|
||||
/* #undef inline */
|
||||
#endif
|
||||
|
||||
/* Define to the equivalent of the C99 'restrict' keyword, or to
|
||||
nothing if this is not supported. Do not define if restrict is
|
||||
supported directly. */
|
||||
#define restrict __restrict
|
||||
/* Work around a bug in Sun C++: it does not support _Restrict, even
|
||||
though the corresponding Sun C compiler does, which causes
|
||||
"#define restrict _Restrict" in the previous line. Perhaps some future
|
||||
version of Sun C++ will work with _Restrict; if so, it'll probably
|
||||
define __RESTRICT, just as Sun C does. */
|
||||
#if defined __SUNPRO_CC && !defined __RESTRICT
|
||||
# define _Restrict
|
||||
#endif
|
||||
168
celt-0.10.0-build/win32/config.h
Normal file
168
celt-0.10.0-build/win32/config.h
Normal file
|
|
@ -0,0 +1,168 @@
|
|||
/* config.h. Generated from config.h.in by configure. */
|
||||
/* config.h.in. Generated from configure.ac by autoheader. */
|
||||
|
||||
/* Define if building universal (internal helper macro) */
|
||||
/* #undef AC_APPLE_UNIVERSAL_BUILD */
|
||||
|
||||
/* This is a build of CELT */
|
||||
#define CELT_BUILD /**/
|
||||
|
||||
/* Version extra */
|
||||
#define CELT_EXTRA_VERSION ""
|
||||
|
||||
/* Version major */
|
||||
#define CELT_MAJOR_VERSION 0
|
||||
|
||||
/* Version micro */
|
||||
#define CELT_MICRO_VERSION 0
|
||||
|
||||
/* Version minor */
|
||||
#define CELT_MINOR_VERSION 10
|
||||
|
||||
/* Complete version string */
|
||||
#define CELT_VERSION "0.10.0"
|
||||
|
||||
/* Assertions */
|
||||
/* #undef ENABLE_ASSERTIONS */
|
||||
|
||||
/* Postfilter */
|
||||
/* #undef ENABLE_POSTFILTER */
|
||||
|
||||
/* Debug fixed-point implementation */
|
||||
/* #undef FIXED_DEBUG */
|
||||
|
||||
/* Compile as fixed-point */
|
||||
/* #undef FIXED_POINT */
|
||||
|
||||
/* Compile as floating-point */
|
||||
#define FLOATING_POINT /**/
|
||||
|
||||
/* Float approximations */
|
||||
/* #undef FLOAT_APPROX */
|
||||
|
||||
/* Define to 1 if you have the <alloca.h> header file. */
|
||||
#define HAVE_ALLOCA_H 1
|
||||
|
||||
/* Define to 1 if you have the <dlfcn.h> header file. */
|
||||
#define HAVE_DLFCN_H 1
|
||||
|
||||
/* Define to 1 if you have the <getopt.h> header file. */
|
||||
#define HAVE_GETOPT_H 1
|
||||
|
||||
/* Define to 1 if you have the `getopt_long' function. */
|
||||
#define HAVE_GETOPT_LONG 1
|
||||
|
||||
/* Define to 1 if you have the <inttypes.h> header file. */
|
||||
// #define HAVE_INTTYPES_H 1
|
||||
|
||||
/* Define to 1 if you have the `m' library (-lm). */
|
||||
#define HAVE_LIBM 1
|
||||
|
||||
/* Define to 1 if you have the `winmm' library (-lwinmm). */
|
||||
/* #undef HAVE_LIBWINMM */
|
||||
|
||||
/* Define if you have C99's lrint function. */
|
||||
// #define HAVE_LRINT 1
|
||||
|
||||
/* Define if you have C99's lrintf function. */
|
||||
// #define HAVE_LRINTF 1
|
||||
|
||||
/* Define to 1 if you have the <memory.h> header file. */
|
||||
#define HAVE_MEMORY_H 1
|
||||
|
||||
/* Define to 1 if you have the <stdint.h> header file. */
|
||||
// #define HAVE_STDINT_H 1
|
||||
|
||||
/* Define to 1 if you have the <stdlib.h> header file. */
|
||||
#define HAVE_STDLIB_H 1
|
||||
|
||||
/* Define to 1 if you have the <strings.h> header file. */
|
||||
#define HAVE_STRINGS_H 1
|
||||
|
||||
/* Define to 1 if you have the <string.h> header file. */
|
||||
#define HAVE_STRING_H 1
|
||||
|
||||
/* Define to 1 if you have the <sys/audioio.h> header file. */
|
||||
/* #undef HAVE_SYS_AUDIOIO_H */
|
||||
|
||||
/* Define to 1 if you have the <sys/soundcard.h> header file. */
|
||||
#define HAVE_SYS_SOUNDCARD_H 1
|
||||
|
||||
/* Define to 1 if you have the <sys/stat.h> header file. */
|
||||
#define HAVE_SYS_STAT_H 1
|
||||
|
||||
/* Define to 1 if you have the <sys/types.h> header file. */
|
||||
#define HAVE_SYS_TYPES_H 1
|
||||
|
||||
/* Define to 1 if you have the <unistd.h> header file. */
|
||||
#define HAVE_UNISTD_H 1
|
||||
|
||||
/* Define to the sub-directory in which libtool stores uninstalled libraries.
|
||||
*/
|
||||
#define LT_OBJDIR ".libs/"
|
||||
|
||||
/* Define to the address where bug reports for this package should be sent. */
|
||||
#define PACKAGE_BUGREPORT ""
|
||||
|
||||
/* Define to the full name of this package. */
|
||||
#define PACKAGE_NAME ""
|
||||
|
||||
/* Define to the full name and version of this package. */
|
||||
#define PACKAGE_STRING ""
|
||||
|
||||
/* Define to the one symbol short name of this package. */
|
||||
#define PACKAGE_TARNAME ""
|
||||
|
||||
/* Define to the version of this package. */
|
||||
#define PACKAGE_VERSION ""
|
||||
|
||||
/* The size of `int', as computed by sizeof. */
|
||||
#define SIZEOF_INT 4
|
||||
|
||||
/* The size of `long', as computed by sizeof. */
|
||||
#define SIZEOF_LONG 4
|
||||
|
||||
/* The size of `long long', as computed by sizeof. */
|
||||
#define SIZEOF_LONG_LONG 8
|
||||
|
||||
/* The size of `short', as computed by sizeof. */
|
||||
#define SIZEOF_SHORT 2
|
||||
|
||||
/* Static modes */
|
||||
/* #undef STATIC_MODES */
|
||||
|
||||
/* Define to 1 if you have the ANSI C header files. */
|
||||
#define STDC_HEADERS 1
|
||||
|
||||
/* Make use of alloca */
|
||||
/* #undef USE_ALLOCA */
|
||||
#define USE_ALLOCA 1
|
||||
|
||||
/* Use C99 variable-size arrays */
|
||||
// #define VAR_ARRAYS /**/
|
||||
|
||||
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
|
||||
significant byte first (like Motorola and SPARC, unlike Intel). */
|
||||
#if defined AC_APPLE_UNIVERSAL_BUILD
|
||||
# if defined __BIG_ENDIAN__
|
||||
# define WORDS_BIGENDIAN 1
|
||||
# endif
|
||||
#else
|
||||
# ifndef WORDS_BIGENDIAN
|
||||
/* # undef WORDS_BIGENDIAN */
|
||||
# endif
|
||||
#endif
|
||||
|
||||
/* Define to empty if `const' does not conform to ANSI C. */
|
||||
/* #undef const */
|
||||
|
||||
/* Define to `__inline__' or `__inline' if that's what the C compiler
|
||||
calls it, or to nothing if 'inline' is not supported under any name. */
|
||||
#ifndef __cplusplus
|
||||
#define inline __inline
|
||||
#endif
|
||||
|
||||
/* Define to the equivalent of the C99 'restrict' keyword, or to
|
||||
nothing if this is not supported. Do not define if restrict is
|
||||
supported directly. */
|
||||
#define restrict
|
||||
1
celt-0.10.0-src
Submodule
1
celt-0.10.0-src
Submodule
|
|
@ -0,0 +1 @@
|
|||
Subproject commit 88bab52abcbe8a223ad4175884866f423d5919db
|
||||
|
|
@ -126,7 +126,7 @@
|
|||
#define SIZEOF_INT 4
|
||||
|
||||
/* The size of `long', as computed by sizeof. */
|
||||
#define SIZEOF_LONG 4
|
||||
#define SIZEOF_LONG 8
|
||||
|
||||
/* The size of `long long', as computed by sizeof. */
|
||||
#define SIZEOF_LONG_LONG 8
|
||||
|
|
|
|||
|
|
@ -159,7 +159,7 @@
|
|||
/* Define to `__inline__' or `__inline' if that's what the C compiler
|
||||
calls it, or to nothing if 'inline' is not supported under any name. */
|
||||
#ifndef __cplusplus
|
||||
#define inline
|
||||
#define inline __inline
|
||||
#endif
|
||||
|
||||
/* Define to the equivalent of the C99 'restrict' keyword, or to
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit 1ad93cf485b344abc9f8c67e4120fdb29536ea03
|
||||
Subproject commit 99a19474a0eb683893664d60a33adc4dc3ec1e4f
|
||||
2
main.pro
2
main.pro
|
|
@ -12,7 +12,7 @@ CONFIG *= ordered debug_and_release
|
|||
SUBDIRS *= speexbuild
|
||||
}
|
||||
!CONFIG(no-bundled-celt) {
|
||||
SUBDIRS *= celt-0.7.0-build celt-0.9.0-build
|
||||
SUBDIRS *= celt-0.7.0-build celt-0.9.0-build celt-0.10.0-build
|
||||
}
|
||||
!CONFIG(no-11x) {
|
||||
SUBDIRS *= src/mumble11x
|
||||
|
|
|
|||
|
|
@ -66,6 +66,14 @@ void CodecInit::initialize() {
|
|||
}
|
||||
|
||||
codec = new CELTCodec080(QLatin1String("0.9.0"));
|
||||
if (codec->isValid()) {
|
||||
codec->report();
|
||||
g.qmCodecs.insert(codec->bitstreamVersion(), codec);
|
||||
} else {
|
||||
delete codec;
|
||||
}
|
||||
|
||||
codec = new CELTCodec080(QLatin1String("0.10.0"));
|
||||
if (codec->isValid()) {
|
||||
codec->report();
|
||||
g.qmCodecs.insert(codec->bitstreamVersion(), codec);
|
||||
|
|
|
|||
Loading…
Reference in a new issue