From bc5cedf26ff213b6d35ca892f79c20ecf100c825 Mon Sep 17 00:00:00 2001
From: Jean-Marc Valin <Jean-Marc.Valin@csiro.au>
Date: Thu, 6 Dec 2007 15:18:25 +1100
Subject: [PATCH] Linking with libentcode
---
Makefile.am | 2 +-
libcelt/Makefile.am | 5 ++++-
libcelt/celt.c | 7 +++++++
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 0095dfa13..2370d575a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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
diff --git a/libcelt/Makefile.am b/libcelt/Makefile.am
index 42a6060bf..87f870b68 100644
--- a/libcelt/Makefile.am
+++ b/libcelt/Makefile.am
@@ -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
diff --git a/libcelt/celt.c b/libcelt/celt.c
index 0fdb6701a..1434f8d3e 100644
--- a/libcelt/celt.c
+++ b/libcelt/celt.c
@@ -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);
--
GitLab