Commit f13a1da0 authored by Chris Knadle's avatar Chris Knadle
Browse files

New upstream version 1.3.0+dfsg

parent 85608c7e
jobs:
- job: Windows
strategy:
matrix:
MSVC_2015:
MUMBLE_QT: qt5
MUMBLE_HOST: x86_64-pc-windows-msvc
MSVC_2015_NO_PCH:
MUMBLE_QT: qt5
MUMBLE_HOST: x86_64-pc-windows-msvc
MUMBLE_NO_PCH: 1
steps:
- script: git submodule --quiet update --init --recursive
displayName: 'Fetch submodules'
- powershell: |
Set-ExecutionPolicy Bypass -Scope Process -Force; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))
choco install 7zip.install -y
displayName: 'Install 7-Zip via Chocolatey'
- powershell: scripts/azure-pipelines/install-environment.ps1
displayName: 'Install build environment'
- powershell: scripts/azure-pipelines/build.ps1
displayName: 'Build'
......@@ -5,7 +5,7 @@
#---------------------------------------------------------------------------
DOXYFILE_ENCODING = UTF-8
PROJECT_NAME = CELT
PROJECT_NUMBER = 0.11.4
PROJECT_NUMBER = 0.11.1
OUTPUT_DIRECTORY = doc/API
CREATE_SUBDIRS = NO
OUTPUT_LANGUAGE = English
......
......@@ -5,7 +5,7 @@
#---------------------------------------------------------------------------
DOXYFILE_ENCODING = UTF-8
PROJECT_NAME = CELT
PROJECT_NUMBER = 0.11.4
PROJECT_NUMBER = 0.11.1
OUTPUT_DIRECTORY = doc/devel
CREATE_SUBDIRS = NO
OUTPUT_LANGUAGE = English
......
......@@ -12,7 +12,7 @@ DIST_SUBDIRS = libcelt tests tools
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = celt.pc
EXTRA_DIST = celt.pc.in Doxyfile Doxyfile.devel msvc/config.h
EXTRA_DIST = celt.pc.in Doxyfile Doxyfile.devel
rpm: dist
rpmbuild -ta ${PACKAGE}-${VERSION}.tar.gz
The celt codec design and implementation have been merged into
the IETF Codec Working Group's "Opus" codec. As such, this
repository is no longer under active development.
Please see https://git.xiph.org/?p=opus.git
and https://git.xiph.org/?p=users/jm/opus-tools.git for more
current work. Visit http://opus-codec.org/ for more
information.
We apologize for any inconvenience this has caused.
......@@ -6,7 +6,7 @@ AM_CONFIG_HEADER([config.h])
CELT_MAJOR_VERSION=0
CELT_MINOR_VERSION=11
CELT_MICRO_VERSION=4
CELT_MICRO_VERSION=1
CELT_EXTRA_VERSION=
CELT_VERSION=$CELT_MAJOR_VERSION.$CELT_MINOR_VERSION.$CELT_MICRO_VERSION$CELT_EXTRA_VERSION
LIBCELT_SUFFIX=0
......
CC = gcc
CFLAGS = -c -O2 -g
LIBS = -lm
OBJS = bands.o celt.o cwrs.o entcode.o entdec.o entenc.o kiss_fft.o \
kiss_fftr.o laplace.o mdct.o modes.o pitch.o \
quant_bands.o rangedec.o rangeenc.o rate.o testcelt.o vq.o plc.o
.c.o:
$(CC) $(CFLAGS) $<
testcelt: $(OBJS)
$(CC) -o $@ $(OBJS) $(LIBS)
clean:
rm -f testcelt *.o
/* Copyright (C) 2003-2008 Jean-Marc Valin */
/**
@file arch.h
@brief Various architecture definitions for CELT
*/
/*
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
- Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
- Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
- Neither the name of the Xiph.org Foundation nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION
OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef ARCH_H
#define ARCH_H
#include "celt_types.h"
#define CELT_SIG_SCALE 32768.
#define celt_fatal(str) _celt_fatal(str, __FILE__, __LINE__);
#ifdef ENABLE_ASSERTIONS
#define celt_assert(cond) {if (!(cond)) \
{celt_fatal("assertion failed: " #cond);}}
#define celt_assert2(cond, message) {if (!(cond)) \
{celt_fatal("assertion failed: " #cond "\n" message);}}
#else
#define celt_assert(cond)
#define celt_assert2(cond, message)
#endif
#define ABS(x) ((x) < 0 ? (-(x)) : (x))
#define ABS16(x) ((x) < 0 ? (-(x)) : (x))
#define MIN16(a,b) ((a) < (b) ? (a) : (b))
#define MAX16(a,b) ((a) > (b) ? (a) : (b))
#define ABS32(x) ((x) < 0 ? (-(x)) : (x))
#define MIN32(a,b) ((a) < (b) ? (a) : (b))
#define MAX32(a,b) ((a) > (b) ? (a) : (b))
#define IMIN(a,b) ((a) < (b) ? (a) : (b))
#define IMAX(a,b) ((a) > (b) ? (a) : (b))
#define float2int(flt) ((int)(floor(.5+flt)))
#define SCALEIN(a) ((a)*CELT_SIG_SCALE)
#define SCALEOUT(a) ((a)*(1/CELT_SIG_SCALE))
#ifndef GLOBAL_STACK_SIZE
#ifdef FIXED_POINT
#define GLOBAL_STACK_SIZE 25000
#else
#define GLOBAL_STACK_SIZE 40000
#endif
#endif
#endif /* ARCH_H */
#!/bin/sh
./convert_source.sh
./ietf_source.sh
#codec draft
xml2rfc draft-valin-celt-codec.xml draft-valin-celt-codec.html
xml2rfc draft-valin-celt-codec.xml draft-valin-celt-codec.txt
#RTP draft
xml2rfc draft-valin-celt-rtp-profile.xml draft-valin-celt-rtp-profile.html
xml2rfc draft-valin-celt-rtp-profile.xml draft-valin-celt-rtp-profile.txt
#ifndef _CELT_TYPES_H
#define _CELT_TYPES_H
typedef short celt_int16;
typedef unsigned short celt_uint16;
typedef int celt_int32;
typedef unsigned int celt_uint32;
typedef long long celt_int64;
typedef unsigned long long celt_uint64;
#endif /* _CELT_TYPES_H */
/* config.h. Generated from config.h.in by configure. */
/* config.h.in. Generated from configure.ac by autoheader. */
/* This is a build of CELT */
#define CELT_BUILD /**/
/* Version extra */
#define CELT_EXTRA_VERSION ""
/* Version major */
#define CELT_MAJOR_VERSION 0
/* Version micro */
#define CELT_MICRO_VERSION 2
/* Version minor */
#define CELT_MINOR_VERSION 5
/* Complete version string */
#define CELT_VERSION "0.6.0"
#define restrict
#!/bin/sh
mkdir -p source
for i in `ls ../../libcelt | grep '\.[ch]$'`
do
#echo "<section anchor=\"$i\" title=\"$i\">" > source/$i
#echo '<t>' >> source/$i
#echo '<figure><artwork><![CDATA[' >> source/$i
echo '#include "substitutions.h"' > tata.c
echo 'SOURCE_CODE_BEGIN' >> tata.c
if echo $i | grep '\.h' > /dev/null; then
cat ../../libcelt/$i | sed -e 's/=\*/= \*/' -e 's/=-/= -/' -e 's/\t/ /g' -e 's/^#/\/\/PREPROCESS_REMOVE#/' >> tata.c
else
cat ../../libcelt/$i | sed -e 's/=\*/= \*/' -e 's/=-/= -/' -e 's/\t/ /g' -e 's/^#include/\/\/PREPROCESS_REMOVE#include/' | sed 's/^#define/\/\/PREPROCESS_REMOVE#define/'>> tata.c
fi
#cat ../../libcelt/$i | sed 's/^#/\/\/PREPROCESS_REMOVE#/' >> tata.c
#cat ../../libcelt/$i | sed 's/^#include/\/\/PREPROCESS_REMOVE#include/' | sed 's/^#define/\/\/PREPROCESS_REMOVE#define/'>> tata.c
gcc -DHAVE_CONFIG_H -C -E -nostdinc tata.c | grep -v '^#' | sed 's/\/\/PREPROCESS_REMOVE//' | perl -ne 'if ($begin) {print $_} if (/SOURCE_CODE_BEGIN/) {$begin=1}' > tata2.c
#cat ../../libcelt/$i >> tata.c
#gcc -C -E -nostdinc tata.c -fdirectives-only | perl -ne 'if ($begin) {print $_} if (/SOURCE_CODE_BEGIN/) {$begin=1}' > tata2.c
indent -nsc -ncdb -original -sob -i2 -bl -bli0 --no-tabs -l69 --format-all-comments tata2.c -o tata.c
cat tata.c | grep -v 'include.*float_cast' | ./wrap_lines > source/$i
#cat tata.c > source/$i
#indent --no-tabs -l72 --format-all-comments ../../libcelt/$i -o tata.c
#cat tata.c >> source/$i
#echo ']]></artwork></figure>' >> source/$i
#echo '</t>' >> source/$i
#echo '</section>' >> source/$i
done
cp arch.h source/arch.h
cp celt_types.h source/celt_types.h
cp config.h source/config.h
cp Makefile.ietf source/Makefile
rm source/mfrng*.c
rm source/dump_modes*
rm source/header*
rm source/fixed*
This diff is collapsed.
#!/bin/sh
mkdir -p xml_source
for i in `ls source/ | grep '\.[ch]$'` Makefile
do
echo "<section anchor=\"$i\" title=\"$i\">" > xml_source/$i
echo '<t>' >> xml_source/$i
echo '<figure><artwork><![CDATA[' >> xml_source/$i
cat source/$i >> xml_source/$i
echo ']]></artwork></figure>' >> xml_source/$i
echo '</t>' >> xml_source/$i
echo '</section>' >> xml_source/$i
done
\ No newline at end of file
#define IMUL32(a,b) ((a)*(b))
#define UMUL32(a,b) ((a)*(b))
#define UMUL16_16(a,b) ((a)*(b))
#define celt_word16 float
#define celt_word32 float
#define celt_sig float
#define celt_norm float
#define celt_ener float
#define celt_pgain float
#define celt_mask float
#define UADD32(a,b) ((a)+(b))
#define USUB32(a,b) ((a)-(b))
#define Q15ONE 1.0f
#define Q30ONE 1.0f
#define NORM_SCALING 1.f
#define NORM_SCALING_1 1.f
#define ENER_SCALING 1.f
#define ENER_SCALING_1 1.f
#define PGAIN_SCALING 1.f
#define PGAIN_SCALING_1 1.f
#define DB_SCALING 1.f
#define DB_SCALING_1 1.f
#define EPSILON 1e-15f
#define VERY_SMALL 1e-15f
#define VERY_LARGE32 1e15f
#define VERY_LARGE16 1e15f
#define Q15_ONE 1.f
#define Q15_ONE_1 1.f
#define QCONST16(x,bits) (x)
#define QCONST32(x,bits) (x)
#define NEG16(x) (-(x))
#define NEG32(x) (-(x))
#define EXTRACT16(x) (x)
#define EXTEND32(x) (x)
#define SHR16(a,shift) (a)
#define SHL16(a,shift) (a)
#define SHR32(a,shift) (a)
#define SHL32(a,shift) (a)
#define PSHR16(a,shift) (a)
#define PSHR32(a,shift) (a)
#define VSHR32(a,shift) (a)
#define SATURATE16(x,a) (x)
#define SATURATE32(x,a) (x)
#define PSHR(a,shift) (a)
#define SHR(a,shift) (a)
#define SHL(a,shift) (a)
#define SATURATE(x,a) (x)
#define ROUND16(a,shift) (a)
#define HALF32(x) (.5f*(x))
#define ADD16(a,b) ((a)+(b))
#define SUB16(a,b) ((a)-(b))
#define ADD32(a,b) ((a)+(b))
#define SUB32(a,b) ((a)-(b))
#define MULT16_16_16(a,b) ((a)*(b))
#define MULT16_16(a,b) ((a)*(b))
#define MAC16_16(c,a,b) ((c)+(a)*(b))
#define MULT16_32_Q11(a,b) ((a)*(b))
#define MULT16_32_Q13(a,b) ((a)*(b))
#define MULT16_32_Q14(a,b) ((a)*(b))
#define MULT16_32_Q15(a,b) ((a)*(b))
#define MULT16_32_Q16(a,b) ((a)*(b))
#define MULT16_32_P15(a,b) ((a)*(b))
#define MULT32_32_Q31(a,b) ((a)*(b))
#define MAC16_32_Q11(c,a,b) ((c)+(a)*(b))
#define MAC16_32_Q15(c,a,b) ((c)+(a)*(b))
#define MAC16_16_Q11(c,a,b) ((c)+(a)*(b))
#define MAC16_16_Q13(c,a,b) ((c)+(a)*(b))
#define MAC16_16_P13(c,a,b) ((c)+(a)*(b))
#define MULT16_16_Q11_32(a,b) ((a)*(b))
#define MULT16_16_Q13(a,b) ((a)*(b))
#define MULT16_16_Q14(a,b) ((a)*(b))
#define MULT16_16_Q15(a,b) ((a)*(b))
#define MULT16_16_P15(a,b) ((a)*(b))
#define MULT16_16_P13(a,b) ((a)*(b))
#define MULT16_16_P14(a,b) ((a)*(b))
#define DIV32_16(a,b) ((a)/(b))
#define PDIV32_16(a,b) ((a)/(b))
#define DIV32(a,b) ((a)/(b))
#define PDIV32(a,b) ((a)/(b))
#define PRINT_MIPS(x)
#include <string.h>
#include <stdio.h>
int main()
{
int comment = 0;
int col = 0;
char c0, c1;
c0 = getchar();
while (!feof(stdin))
{
c1 = getchar();
if (c1==9)
c1 = 32;
if (col < 71 || c0 == 10) {
putchar(c0);
} else {
if (c1 == 10 || c1 == 13)
{
putchar(c0);
} else {
putchar ('\\');
/*printf ("%d %d %d", col, c0, c1);*/
putchar (10);
putchar (c0);
col=0;
}
}
col++;
if (c0 == 10)
col=0;
c0 = c1;
}
}
\ No newline at end of file
......@@ -1161,7 +1161,7 @@ static unsigned quant_band(int encode, const CELTMode *m, int i, celt_norm *X, c
void quant_all_bands(int encode, const CELTMode *m, int start, int end,
celt_norm *_X, celt_norm *_Y, unsigned char *collapse_masks, const celt_ener *bandE, int *pulses,
int shortBlocks, int spread, int dual_stereo, int intensity, int *tf_res, int resynth,
celt_int32 total_bits, celt_int32 balance, ec_ctx *ec, int LM, int codedBands, celt_uint32 *seed)
celt_int32 total_bits, celt_int32 balance, ec_ctx *ec, int LM, int codedBands, ec_uint32 *seed)
{
int i;
celt_int32 remaining_bits;
......
......@@ -84,7 +84,7 @@ void haar1(celt_norm *X, int N0, int stride);
void quant_all_bands(int encode, const CELTMode *m, int start, int end,
celt_norm * X, celt_norm * Y, unsigned char *collapse_masks, const celt_ener *bandE, int *pulses,
int time_domain, int fold, int dual_stereo, int intensity, int *tf_res, int resynth,
celt_int32 total_bits, celt_int32 balance, ec_ctx *ec, int M, int codedBands, celt_uint32 *seed);
celt_int32 total_bits, celt_int32 balance, ec_ctx *ec, int M, int codedBands, ec_uint32 *seed);
void stereo_decision(const CELTMode *m, celt_norm * restrict X, int *stereo_mode, int len, int M);
......
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment