summaryrefslogtreecommitdiffstats
path: root/gst
diff options
context:
space:
mode:
authorSebastian Dröge <slomo@circular-chaos.org>2007-11-09 17:27:00 +0000
committerSebastian Dröge <slomo@circular-chaos.org>2007-11-09 17:27:00 +0000
commitd4085d9387e96b2c26d423378b065f4e9ca67d02 (patch)
tree3cd031d81beeab5529958d031a5d26669dae86af /gst
parentce9011f06a4dde8d1798d8a928b3940e86d7abd3 (diff)
gst/spectrum/gstspectrum.c: Now do the scaling right for real. Also initialize a previously uninitialized variable.
Original commit message from CVS: * gst/spectrum/gstspectrum.c: Now do the scaling right for real. Also initialize a previously uninitialized variable.
Diffstat (limited to 'gst')
-rw-r--r--gst/spectrum/gstspectrum.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/gst/spectrum/gstspectrum.c b/gst/spectrum/gstspectrum.c
index f2f654a6..3b2f19fc 100644
--- a/gst/spectrum/gstspectrum.c
+++ b/gst/spectrum/gstspectrum.c
@@ -517,10 +517,9 @@ process_s##width (GstSpectrum *spectrum, const gint##width *samples) \
\
/* Calculate magnitude in db */ \
for (i = 0; i < spectrum->bands; i++) { \
- gdouble val; \
+ gdouble val = 0.0; \
val = (gdouble) freqdata[i].r * (gdouble) freqdata[i].r; \
val += (gdouble) freqdata[i].i * (gdouble) freqdata[i].i; \
- val *= nfft; \
val /= max*max; \
val = 10.0 * log10 (val); \
if (val > spectrum->threshold) \
@@ -585,10 +584,10 @@ process_f##width (GstSpectrum *spectrum, const g##type *samples) \
\
/* Calculate magnitude in db */ \
for (i = 0; i < spectrum->bands; i++) { \
- gdouble val; \
+ gdouble val = 0.0; \
val = freqdata[i].r * freqdata[i].r; \
val += freqdata[i].i * freqdata[i].i; \
- val /= nfft; \
+ val /= nfft*nfft; \
val = 10.0 * log10 (val); \
if (val > spectrum->threshold) \
val -= spectrum->threshold; \