eden-emu/opus
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Linking with libentcode

Browse source
This commit is contained in:
Jean-Marc Valin 2007-12-06 15:18:25 +11:00
parent 2ec8d9e522
commit bc5cedf26f
3 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile.am
View file

@ -5,7 +5,7 @@
AUTOMAKE_OPTIONS = 1.6 AUTOMAKE_OPTIONS = 1.6
#Fools KDevelop into including all files #Fools KDevelop into including all files
SUBDIRS = libcelt libentcode SUBDIRS = libentcode libcelt
rpm: dist rpm: dist
rpmbuild -ta ${PACKAGE}-${VERSION}.tar.gz rpmbuild -ta ${PACKAGE}-${VERSION}.tar.gz

5
libcelt/Makefile.am
View file

@ -21,4 +21,7 @@ noinst_HEADERS = arch.h bands.h celt.h cwrs.h fftwrap.h mdct.h modes.h \
noinst_PROGRAMS = testcelt noinst_PROGRAMS = testcelt
testcelt_SOURCES = testcelt.c testcelt_SOURCES = testcelt.c
testcelt_LDADD = $(top_builddir)/libcelt/libcelt.la testcelt_LDADD = $(top_builddir)/libentcode/libentcode.la \
$(top_builddir)/libcelt/libcelt.la
INCLUDES = -I$(top_srcdir)/libentcode
libcelt_la_LIBADD = $(top_builddir)/libentcode/libentcode.la

7
libcelt/celt.c
View file

@ -37,6 +37,7 @@
#include "fftwrap.h" #include "fftwrap.h"
#include "bands.h" #include "bands.h"
#include "modes.h" #include "modes.h"
#include "probenc.h"
#define MAX_PERIOD 1024 #define MAX_PERIOD 1024
@ -46,6 +47,9 @@ struct CELTState_ {
int block_size; int block_size;
int nb_blocks; int nb_blocks;
ec_byte_buffer buf;
ec_enc enc;
float preemph; float preemph;
float preemph_memE; float preemph_memE;
float preemph_memD; float preemph_memD;
@ -75,6 +79,9 @@ CELTState *celt_encoder_new(const CELTMode *mode)
st->block_size = N; st->block_size = N;
st->nb_blocks = B; st->nb_blocks = B;
ec_byte_writeinit(&st->buf);
ec_enc_init(&st->enc,&st->buf);
mdct_init(&st->mdct_lookup, 2*N); mdct_init(&st->mdct_lookup, 2*N);
st->fft = spx_fft_init(MAX_PERIOD); st->fft = spx_fft_init(MAX_PERIOD);