summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--ext/wavpack/gstwavpackdec.c12
2 files changed, 12 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 1c23c90c..47c7d0f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2007-03-22 Sebastian Dröge <slomo@circular-chaos.org>
+ * ext/wavpack/gstwavpackdec.c: (gst_wavpack_dec_chain):
+ Revert to use gst_pad_alloc_buffer() here. We can and should use it.
+ Thanks to Jan and Mike for noticing my mistake.
+
+2007-03-22 Sebastian Dröge <slomo@circular-chaos.org>
+
* ext/wavpack/gstwavpackenc.c: (gst_wavpack_enc_class_init),
(gst_wavpack_enc_init), (gst_wavpack_enc_chain),
(gst_wavpack_enc_rewrite_first_block):
diff --git a/ext/wavpack/gstwavpackdec.c b/ext/wavpack/gstwavpackdec.c
index a20d5d05..19171173 100644
--- a/ext/wavpack/gstwavpackdec.c
+++ b/ext/wavpack/gstwavpackdec.c
@@ -359,14 +359,14 @@ gst_wavpack_dec_chain (GstPad * pad, GstBuffer * buf)
if (decoded != wph.block_samples)
goto decode_error;
- /* alloc output buffer. Can't use gst_pad_alloc_buffer() because of
- * possible clipping which will cause problems with BaseTransform
- * elements because of the unit size */
+ /* alloc output buffer */
unpacked_size = wph.block_samples * (dec->width / 8) * dec->channels;
- outbuf = gst_buffer_new_and_alloc (unpacked_size);
- gst_buffer_set_caps (outbuf, GST_PAD_CAPS (dec->srcpad));
+ ret = gst_pad_alloc_buffer (dec->srcpad, GST_BUFFER_OFFSET (buf),
+ unpacked_size, GST_PAD_CAPS (dec->srcpad), &outbuf);
+ if (ret != GST_FLOW_OK)
+ goto out;
- /* put samples into output buffer */
+ /* put samples into the output buffer */
gst_wavpack_dec_format_samples (dec, GST_BUFFER_DATA (outbuf),
unpack_buf, wph.block_samples);
gst_buffer_stamp (outbuf, buf);