Commit bc5cedf2 authored by Jean-Marc Valin's avatar Jean-Marc Valin
Browse files

Linking with libentcode

parent 2ec8d9e5
......@@ -5,7 +5,7 @@
AUTOMAKE_OPTIONS = 1.6
#Fools KDevelop into including all files
SUBDIRS = libcelt libentcode
SUBDIRS = libentcode libcelt
rpm: dist
rpmbuild -ta ${PACKAGE}-${VERSION}.tar.gz
......@@ -21,4 +21,7 @@ noinst_HEADERS = arch.h bands.h celt.h cwrs.h fftwrap.h mdct.h modes.h \
noinst_PROGRAMS = testcelt
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
......@@ -37,6 +37,7 @@
#include "fftwrap.h"
#include "bands.h"
#include "modes.h"
#include "probenc.h"
#define MAX_PERIOD 1024
......@@ -46,6 +47,9 @@ struct CELTState_ {
int block_size;
int nb_blocks;
ec_byte_buffer buf;
ec_enc enc;
float preemph;
float preemph_memE;
float preemph_memD;
......@@ -75,6 +79,9 @@ CELTState *celt_encoder_new(const CELTMode *mode)
st->block_size = N;
st->nb_blocks = B;
ec_byte_writeinit(&st->buf);
ec_enc_init(&st->enc,&st->buf);
mdct_init(&st->mdct_lookup, 2*N);
st->fft = spx_fft_init(MAX_PERIOD);
......
Supports Markdown
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