From e1f846208e5d584673fc171009ada085538c7c56 Mon Sep 17 00:00:00 2001
From: Jean-Marc Valin <jmvalin@jmvalin.ca>
Date: Sun, 29 Dec 2013 18:45:49 -0500
Subject: [PATCH] Minor cleanup -- nothing to see here
---
celt/celt_decoder.c | 2 +-
celt/celt_encoder.c | 2 +-
celt/modes.h | 8 --------
3 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/celt/celt_decoder.c b/celt/celt_decoder.c
index 288ed55e3..61bf1da02 100644
--- a/celt/celt_decoder.c
+++ b/celt/celt_decoder.c
@@ -264,7 +264,7 @@ void compute_inv_mdcts(const CELTMode *mode, int shortBlocks, celt_sig *X,
int B;
int N;
int shift;
- const int overlap = OVERLAP(mode);
+ const int overlap = mode->overlap;
if (shortBlocks)
{
diff --git a/celt/celt_encoder.c b/celt/celt_encoder.c
index 8a1c7483e..ba07a3c38 100644
--- a/celt/celt_encoder.c
+++ b/celt/celt_encoder.c
@@ -416,7 +416,7 @@ int patch_transient_decision(opus_val16 *newE, opus_val16 *oldE, int nbEBands,
static void compute_mdcts(const CELTMode *mode, int shortBlocks, celt_sig * OPUS_RESTRICT in,
celt_sig * OPUS_RESTRICT out, int C, int CC, int LM, int upsample)
{
- const int overlap = OVERLAP(mode);
+ const int overlap = mode->overlap;
int N;
int B;
int shift;
diff --git a/celt/modes.h b/celt/modes.h
index c8340f987..be813ccc8 100644
--- a/celt/modes.h
+++ b/celt/modes.h
@@ -39,14 +39,6 @@
#define MAX_PERIOD 1024
-#ifndef OVERLAP
-#define OVERLAP(mode) ((mode)->overlap)
-#endif
-
-#ifndef FRAMESIZE
-#define FRAMESIZE(mode) ((mode)->mdctSize)
-#endif
-
typedef struct {
int size;
const opus_int16 *index;
--
GitLab