From 02fa913c32f43a3855db4ccc98b87f3018f672db Mon Sep 17 00:00:00 2001
From: Jean-Marc Valin <Jean-Marc.Valin@csiro.au>
Date: Wed, 20 Feb 2008 12:09:29 +1100
Subject: [PATCH] More C89 fixes, making sure to include config.h from all
source files.
---
libcelt/bitrdec.c | 4 ++++
libcelt/bitree.c | 4 ++++
libcelt/bitrenc.c | 4 ++++
libcelt/celt.c | 19 ++++++++++++++-----
libcelt/cwrs.c | 5 +++++
libcelt/entcode.c | 4 ++++
libcelt/entdec.c | 4 ++++
libcelt/entenc.c | 4 ++++
libcelt/laplace.c | 4 ++++
libcelt/mdct.c | 4 ++++
libcelt/modes.c | 4 ++++
libcelt/pitch.c | 3 +++
libcelt/psy.c | 4 ++++
libcelt/quant_bands.c | 3 +++
libcelt/quant_pitch.c | 4 ++++
libcelt/rangedec.c | 4 ++++
libcelt/rangeenc.c | 4 ++++
libcelt/rate.c | 4 ++++
libcelt/vq.c | 4 ++++
19 files changed, 85 insertions(+), 5 deletions(-)
diff --git a/libcelt/bitrdec.c b/libcelt/bitrdec.c
index d5bb2e15..9db568ad 100644
--- a/libcelt/bitrdec.c
+++ b/libcelt/bitrdec.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "bitree.h"
int ec_bitree_find_and_update(unsigned *_this,int _sz,int _split,
diff --git a/libcelt/bitree.c b/libcelt/bitree.c
index e7617486..a84ffd3b 100644
--- a/libcelt/bitree.c
+++ b/libcelt/bitree.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "bitree.h"
void ec_bitree_to_counts(unsigned *_this,int _sz,int _split){
diff --git a/libcelt/bitrenc.c b/libcelt/bitrenc.c
index c65eb296..e0ca1154 100644
--- a/libcelt/bitrenc.c
+++ b/libcelt/bitrenc.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "bitrenc.h"
void ec_bitree_update(unsigned *_this,int _sz,int _sym,int _val){
diff --git a/libcelt/celt.c b/libcelt/celt.c
index 572f8569..8365276a 100644
--- a/libcelt/celt.c
+++ b/libcelt/celt.c
@@ -29,6 +29,10 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "os_support.h"
#include "mdct.h"
#include <math.h>
@@ -82,10 +86,11 @@ struct CELTEncoder {
CELTEncoder *celt_encoder_new(const CELTMode *mode)
{
int i, N, B, C, N4;
+ CELTEncoder *st;
N = mode->mdctSize;
B = mode->nbMdctBlocks;
C = mode->nbChannels;
- CELTEncoder *st = celt_alloc(sizeof(CELTEncoder));
+ st = celt_alloc(sizeof(CELTEncoder));
st->mode = mode;
st->frame_size = B*N;
@@ -153,13 +158,15 @@ static float compute_mdcts(mdct_lookup *mdct_lookup, float *window, float *in, f
{
int i, c;
float E = 1e-15;
+ VARDECL(float *x);
+ VARDECL(float *tmp);
+ ALLOC(x, 2*N, float);
+ ALLOC(tmp, N, float);
for (c=0;c<C;c++)
{
for (i=0;i<B;i++)
{
int j;
- float x[2*N];
- float tmp[N];
for (j=0;j<2*N;j++)
{
x[j] = window[j]*in[C*i*N+C*j+c];
@@ -177,14 +184,16 @@ static float compute_mdcts(mdct_lookup *mdct_lookup, float *window, float *in, f
static void compute_inv_mdcts(mdct_lookup *mdct_lookup, float *window, float *X, float *out_mem, float *mdct_overlap, int N, int overlap, int B, int C)
{
int i, c, N4;
+ VARDECL(float *x);
+ VARDECL(float *tmp);
+ ALLOC(x, 2*N, float);
+ ALLOC(tmp, N, float);
N4 = (N-overlap)/2;
for (c=0;c<C;c++)
{
for (i=0;i<B;i++)
{
int j;
- float x[2*N];
- float tmp[N];
/* De-interleaving the sub-frames */
for (j=0;j<N;j++)
tmp[j] = X[C*B*j+C*i+c];
diff --git a/libcelt/cwrs.c b/libcelt/cwrs.c
index af20945c..dc288058 100644
--- a/libcelt/cwrs.c
+++ b/libcelt/cwrs.c
@@ -32,6 +32,11 @@
/* Functions for encoding and decoding pulse vectors. For more details, see:
http://people.xiph.org/~tterribe/notes/cwrs.html
*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <stdlib.h>
#include "cwrs.h"
diff --git a/libcelt/entcode.c b/libcelt/entcode.c
index e1ca492d..fe356061 100644
--- a/libcelt/entcode.c
+++ b/libcelt/entcode.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "entcode.h"
diff --git a/libcelt/entdec.c b/libcelt/entdec.c
index e5617ba0..c6d4314b 100644
--- a/libcelt/entdec.c
+++ b/libcelt/entdec.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <stddef.h>
#include "entdec.h"
diff --git a/libcelt/entenc.c b/libcelt/entenc.c
index 62ef8844..99f7fbbe 100644
--- a/libcelt/entenc.c
+++ b/libcelt/entenc.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <stdlib.h>
#include <string.h>
#include "entenc.h"
diff --git a/libcelt/laplace.c b/libcelt/laplace.c
index 3abed2a6..087c05c0 100644
--- a/libcelt/laplace.c
+++ b/libcelt/laplace.c
@@ -29,6 +29,10 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "entenc.h"
#include "entdec.h"
diff --git a/libcelt/mdct.c b/libcelt/mdct.c
index 5dfd548c..cbbfc875 100644
--- a/libcelt/mdct.c
+++ b/libcelt/mdct.c
@@ -42,6 +42,10 @@
and scaling in many places.
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "mdct.h"
#include "kiss_fft.h"
#include <math.h>
diff --git a/libcelt/modes.c b/libcelt/modes.c
index b4d0b8f1..496f242c 100644
--- a/libcelt/modes.c
+++ b/libcelt/modes.c
@@ -29,6 +29,10 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "celt.h"
#include "modes.h"
#include "rate.h"
diff --git a/libcelt/pitch.c b/libcelt/pitch.c
index 6f0e245c..8a2e572c 100644
--- a/libcelt/pitch.c
+++ b/libcelt/pitch.c
@@ -20,6 +20,9 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
#include <stdio.h>
#include <math.h>
diff --git a/libcelt/psy.c b/libcelt/psy.c
index 9b8762dd..0dec6cce 100644
--- a/libcelt/psy.c
+++ b/libcelt/psy.c
@@ -29,6 +29,10 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "psy.h"
#include <math.h>
#include "os_support.h"
diff --git a/libcelt/quant_bands.c b/libcelt/quant_bands.c
index 34480068..5ea71c94 100644
--- a/libcelt/quant_bands.c
+++ b/libcelt/quant_bands.c
@@ -29,6 +29,9 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
#include "quant_bands.h"
#include "laplace.h"
diff --git a/libcelt/quant_pitch.c b/libcelt/quant_pitch.c
index 6b6adfd4..2935ba74 100644
--- a/libcelt/quant_pitch.c
+++ b/libcelt/quant_pitch.c
@@ -29,6 +29,10 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "quant_pitch.h"
#include <math.h>
#include "pgain_table.h"
diff --git a/libcelt/rangedec.c b/libcelt/rangedec.c
index 84726f36..4ff10d8f 100644
--- a/libcelt/rangedec.c
+++ b/libcelt/rangedec.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <stddef.h>
#include "entdec.h"
#include "mfrngcod.h"
diff --git a/libcelt/rangeenc.c b/libcelt/rangeenc.c
index f8ff3e36..885854f7 100644
--- a/libcelt/rangeenc.c
+++ b/libcelt/rangeenc.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <stddef.h>
#include "entenc.h"
#include "mfrngcod.h"
diff --git a/libcelt/rate.c b/libcelt/rate.c
index 6b5a5901..06358fc5 100644
--- a/libcelt/rate.c
+++ b/libcelt/rate.c
@@ -29,6 +29,10 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <math.h>
#include "modes.h"
#include "cwrs.h"
diff --git a/libcelt/vq.c b/libcelt/vq.c
index d4638927..5f6e4d80 100644
--- a/libcelt/vq.c
+++ b/libcelt/vq.c
@@ -29,6 +29,10 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <math.h>
#include <stdlib.h>
#include "cwrs.h"
--
GitLab