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.
This commit is contained in:
Tim-Philipp Müller 2006-10-06 11:31:11 +00:00
parent 538303c8aa
commit bd2773206d
2 changed files with 10 additions and 3 deletions

View file

@ -1,3 +1,8 @@
2006-10-06 Tim-Philipp Müller <tim at centricular dot net>
* gst/spectrum/gstspectrum.c: (gst_spectrum_transform_ip):
Fix mem leak, avoid unnecessary memcpy.
2006-10-06 Stefan Kost <ensonic@users.sf.net> 2006-10-06 Stefan Kost <ensonic@users.sf.net>
* gst/spectrum/gstspectrum.c: (gst_spectrum_init), * gst/spectrum/gstspectrum.c: (gst_spectrum_init),

View file

@ -355,7 +355,6 @@ static GstFlowReturn
gst_spectrum_transform_ip (GstBaseTransform * trans, GstBuffer * in) gst_spectrum_transform_ip (GstBaseTransform * trans, GstBuffer * in)
{ {
GstSpectrum *spectrum = GST_SPECTRUM (trans); GstSpectrum *spectrum = GST_SPECTRUM (trans);
gint16 *samples;
gint wanted; gint wanted;
gint i, j, k; gint i, j, k;
gint32 acc; 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 */ /* FIXME: 4.0 was 2.0 before, but that include the mirrored spectrum */
step = (gfloat) spectrum->len / (spectrum->bands * 4.0); 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 (i = 0, j = 0; i < spectrum->len; i++) {
for (k = 0, acc = 0; k < spectrum->channels; k++) 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; spectrum->num_frames = 0;
} }
gst_adapter_flush (spectrum->adapter, wanted);
} }
return GST_FLOW_OK; return GST_FLOW_OK;