Minor cleanup -- nothing to see here
authorJean-Marc Valin <jmvalin@jmvalin.ca>
Sun, 29 Dec 2013 23:45:49 +0000 (18:45 -0500)
committerJean-Marc Valin <jmvalin@jmvalin.ca>
Sun, 29 Dec 2013 23:45:49 +0000 (18:45 -0500)
celt/celt_decoder.c
celt/celt_encoder.c
celt/modes.h

index 288ed55..61bf1da 100644 (file)
@@ -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)
    {
index 8a1c748..ba07a3c 100644 (file)
@@ -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;
index c8340f9..be813cc 100644 (file)
 
 #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;