From f2550b0ab1e64387025f2314dc93cb7decafa1f0 Mon Sep 17 00:00:00 2001 From: "Earle F. Philhower, III" Date: Tue, 12 Dec 2017 14:04:13 -0800 Subject: [PATCH] Remove debugging stack() calls --- src/libhelix-mp3/imdct.c | 8 ++++---- src/libhelix-mp3/mp3dec.c | 2 +- src/libhelix-mp3/scalfact.c | 2 +- src/libhelix-mp3/stproc.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/libhelix-mp3/imdct.c b/src/libhelix-mp3/imdct.c index 7897af0..e24c50a 100644 --- a/src/libhelix-mp3/imdct.c +++ b/src/libhelix-mp3/imdct.c @@ -267,7 +267,7 @@ static __inline void idct9(int *x) int a19, a20, a21, a22, a23, a24, a25, a26, a27; int m1, m3, m5, m6, m7, m8, m9, m10, m11, m12; int x0, x1, x2, x3, x4, x5, x6, x7, x8; -stack(__FUNCTION__, __FILE__, __LINE__); + x0 = x[0]; x1 = x[1]; x2 = x[2]; x3 = x[3]; x4 = x[4]; x5 = x[5]; x6 = x[6]; x7 = x[7]; x8 = x[8]; @@ -377,7 +377,7 @@ const int fastWin36[18] PROGMEM = { int acc1, acc2, s, d, t, mOut; int xo, xe, c, *xp, yLo, yHi; const int *cp, *wp; -stack(__FUNCTION__, __FILE__, __LINE__); + acc1 = acc2 = 0; xCurr += 17; @@ -544,7 +544,7 @@ static __inline void imdct12 (int *x, int *out) { int i, es, mOut, yLo, xBuf[18], xPrevWin[18]; /* need temp buffer for reordering short blocks */ const int *wp; -stack(__FUNCTION__, __FILE__, __LINE__); + es = 0; /* 7 gb is always adequate for accumulator loop + idct12 + window + overlap */ if (gb < 7) { @@ -627,7 +627,7 @@ stack(__FUNCTION__, __FILE__, __LINE__); int xPrevWin[18], currWinIdx, prevWinIdx; int i, j, nBlocksOut, nonZero, mOut; int fiBit, xp; -stack(__FUNCTION__, __FILE__, __LINE__); + ASSERT(bc->nBlocksLong <= NBANDS); ASSERT(bc->nBlocksTotal <= NBANDS); ASSERT(bc->nBlocksPrev <= NBANDS); diff --git a/src/libhelix-mp3/mp3dec.c b/src/libhelix-mp3/mp3dec.c index 65d74ec..5e68c7a 100644 --- a/src/libhelix-mp3/mp3dec.c +++ b/src/libhelix-mp3/mp3dec.c @@ -293,7 +293,7 @@ int MP3Decode(HMP3Decoder hMP3Decoder, unsigned char **inbuf, int *bytesLeft, sh #ifdef PROFILE long time; #endif -stack(__FUNCTION__, __FILE__, __LINE__); + if (!mp3DecInfo) return ERR_MP3_NULL_POINTER; diff --git a/src/libhelix-mp3/scalfact.c b/src/libhelix-mp3/scalfact.c index b229a46..4937e45 100644 --- a/src/libhelix-mp3/scalfact.c +++ b/src/libhelix-mp3/scalfact.c @@ -212,7 +212,7 @@ static void UnpackSFMPEG2(BitStreamInfo *bsi, SideInfoSub *sis, ScaleFactorInfoS int slen[4], nr[4]; int sfCompress, preFlag, intensityScale; (void)gr; -stack(__FUNCTION__, __FILE__, __LINE__); + sfCompress = sis->sfCompress; preFlag = 0; intensityScale = 0; diff --git a/src/libhelix-mp3/stproc.c b/src/libhelix-mp3/stproc.c index ed124de..7782a21 100644 --- a/src/libhelix-mp3/stproc.c +++ b/src/libhelix-mp3/stproc.c @@ -112,7 +112,7 @@ void IntensityProcMPEG1(int x[MAX_NCHAN][MAX_NSAMP], int nSamps, FrameHeader *fh int cbStartL=0, cbStartS=0, cbEndL=0, cbEndS=0; int *isfTab; (void)mixFlag; -stack(__FUNCTION__, __FILE__, __LINE__); + /* NOTE - this works fine for mixed blocks, as long as the switch point starts in the * short block section (i.e. on or after sample 36 = sfBand->l[8] = 3*sfBand->s[3] * is this a safe assumption? @@ -219,7 +219,7 @@ void IntensityProcMPEG2(int x[MAX_NCHAN][MAX_NSAMP], int nSamps, FrameHeader *fh int isf, sfIdx, tmp, il[23]; int *isfTab; int cbStartL, cbStartS, cbEndL, cbEndS; -stack(__FUNCTION__, __FILE__, __LINE__); + (void)mixFlag; isfTab = (int *)ISFMpeg2[sfjs->intensityScale][midSideFlag];