Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(426)

Unified Diff: webrtc/modules/audio_coding/codecs/g722/g722_decode.c

Issue 1820023004: Remove all uses of the HAVE_CONFIG_H define. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/media/engine/webrtcvoiceengine.cc ('k') | webrtc/modules/audio_coding/codecs/g722/g722_encode.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/modules/audio_coding/codecs/g722/g722_decode.c
diff --git a/webrtc/modules/audio_coding/codecs/g722/g722_decode.c b/webrtc/modules/audio_coding/codecs/g722/g722_decode.c
index 952a7d037f61a5e0a2cdc1d01bf4229ff1c0ff3e..4ebdb583644443c0752910aadf14ab377cf11cdf 100644
--- a/webrtc/modules/audio_coding/codecs/g722/g722_decode.c
+++ b/webrtc/modules/audio_coding/codecs/g722/g722_decode.c
@@ -7,7 +7,7 @@
*
* Copyright (C) 2005 Steve Underwood
*
- * Despite my general liking of the GPL, I place my own contributions
+ * Despite my general liking of the GPL, I place my own contributions
* to this code in the public domain for the benefit of all mankind -
* even the slimy ones who might try to proprietize my work and use it
* to my detriment.
@@ -30,10 +30,6 @@
/*! \file */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <memory.h>
#include <stdio.h>
#include <stdlib.h>
@@ -125,7 +121,7 @@ static void block4(G722DecoderState *s, int band, int d)
s->band[band].d[i] = s->band[band].d[i - 1];
s->band[band].b[i] = s->band[band].bp[i];
}
-
+
for (i = 2; i > 0; i--)
{
s->band[band].r[i] = s->band[band].r[i - 1];
@@ -201,9 +197,9 @@ size_t WebRtc_g722_decode(G722DecoderState *s, int16_t amp[],
static const int wh[3] = {0, -214, 798};
static const int rh2[4] = {2, 1, 2, 1};
static const int qm2[4] = {-7408, -1616, 7408, 1616};
- static const int qm4[16] =
+ static const int qm4[16] =
{
- 0, -20456, -12896, -8968,
+ 0, -20456, -12896, -8968,
-6288, -4240, -2584, -1200,
20456, 12896, 8968, 6288,
4240, 2584, 1200, 0
@@ -323,7 +319,7 @@ size_t WebRtc_g722_decode(G722DecoderState *s, int16_t amp[],
else if (wd1 > 18432)
wd1 = 18432;
s->band[0].nb = wd1;
-
+
/* Block 3L, SCALEL */
wd1 = (s->band[0].nb >> 6) & 31;
wd2 = 8 - (s->band[0].nb >> 11);
@@ -331,7 +327,7 @@ size_t WebRtc_g722_decode(G722DecoderState *s, int16_t amp[],
s->band[0].det = wd3 << 2;
block4(s, 0, dlowt);
-
+
if (!s->eight_k)
{
/* Block 2H, INVQAH */
@@ -354,7 +350,7 @@ size_t WebRtc_g722_decode(G722DecoderState *s, int16_t amp[],
else if (wd1 > 22528)
wd1 = 22528;
s->band[1].nb = wd1;
-
+
/* Block 3H, SCALEH */
wd1 = (s->band[1].nb >> 6) & 31;
wd2 = 10 - (s->band[1].nb >> 11);
« no previous file with comments | « webrtc/media/engine/webrtcvoiceengine.cc ('k') | webrtc/modules/audio_coding/codecs/g722/g722_encode.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698