From bd2773206d47f2aff574e01b120ea7919c5bb069 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Fri, 6 Oct 2006 11:31:11 +0000 Subject: [PATCH] gst/spectrum/gstspectrum.c: Fix mem leak, avoid unnecessary memcpy. Original commit message from CVS: * gst/spectrum/gstspectrum.c: (gst_spectrum_transform_ip): Fix mem leak, avoid unnecessary memcpy. --- ChangeLog | 5 +++++ gst/spectrum/gstspectrum.c | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 55940f29a0..e70cf3fdf4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-10-06 Tim-Philipp Müller + + * gst/spectrum/gstspectrum.c: (gst_spectrum_transform_ip): + Fix mem leak, avoid unnecessary memcpy. + 2006-10-06 Stefan Kost * gst/spectrum/gstspectrum.c: (gst_spectrum_init), diff --git a/gst/spectrum/gstspectrum.c b/gst/spectrum/gstspectrum.c index 390bd06231..70e5ecae5a 100644 --- a/gst/spectrum/gstspectrum.c +++ b/gst/spectrum/gstspectrum.c @@ -355,7 +355,6 @@ static GstFlowReturn gst_spectrum_transform_ip (GstBaseTransform * trans, GstBuffer * in) { GstSpectrum *spectrum = GST_SPECTRUM (trans); - gint16 *samples; gint wanted; gint i, j, k; gint32 acc; @@ -373,9 +372,10 @@ gst_spectrum_transform_ip (GstBaseTransform * trans, GstBuffer * in) /* FIXME: 4.0 was 2.0 before, but that include the mirrored spectrum */ step = (gfloat) spectrum->len / (spectrum->bands * 4.0); - while (gst_adapter_available (spectrum->adapter) > wanted) { + while (gst_adapter_available (spectrum->adapter) >= wanted) { + const gint16 *samples; - samples = (gint16 *) gst_adapter_take (spectrum->adapter, wanted); + samples = (const gint16 *) gst_adapter_peek (spectrum->adapter, wanted); for (i = 0, j = 0; i < spectrum->len; i++) { for (k = 0, acc = 0; k < spectrum->channels; k++) @@ -413,6 +413,8 @@ gst_spectrum_transform_ip (GstBaseTransform * trans, GstBuffer * in) } spectrum->num_frames = 0; } + + gst_adapter_flush (spectrum->adapter, wanted); } return GST_FLOW_OK;