diff options
author | Sebastian Dröge <slomo@circular-chaos.org> | 2007-07-24 04:57:20 +0000 |
---|---|---|
committer | Sebastian Dröge <slomo@circular-chaos.org> | 2007-07-24 04:57:20 +0000 |
commit | 645141a6ff29dfd7039e963f3ce6964506da1004 (patch) | |
tree | 2f32e5f661956500b6d269f4eff42d0d5ecf7beb /ext/wavpack/gstwavpackdec.c | |
parent | 98ec7850a3c3789402526dbdf5a40b55096ae6ca (diff) |
Use the new buffer clipping function from gstaudio here and require gst-plugins-base CVS.
Original commit message from CVS:
* configure.ac:
* ext/wavpack/gstwavpackdec.c: (gst_wavpack_dec_reset),
(gst_wavpack_dec_chain), (gst_wavpack_dec_sink_event):
Use the new buffer clipping function from gstaudio here and
require gst-plugins-base CVS.
* tests/check/elements/wavpackdec.c: (GST_START_TEST):
For framed Wavpack buffers we require a valid timestamp.
Diffstat (limited to 'ext/wavpack/gstwavpackdec.c')
-rw-r--r-- | ext/wavpack/gstwavpackdec.c | 48 |
1 files changed, 4 insertions, 44 deletions
diff --git a/ext/wavpack/gstwavpackdec.c b/ext/wavpack/gstwavpackdec.c index f763a8ee..7ed14c4b 100644 --- a/ext/wavpack/gstwavpackdec.c +++ b/ext/wavpack/gstwavpackdec.c @@ -129,7 +129,7 @@ gst_wavpack_dec_reset (GstWavpackDec * dec) dec->sample_rate = 0; dec->depth = 0; - gst_segment_init (&dec->segment, GST_FORMAT_UNDEFINED); + gst_segment_init (&dec->segment, GST_FORMAT_TIME); dec->next_block_index = 0; } @@ -202,47 +202,6 @@ gst_wavpack_dec_sink_set_caps (GstPad * pad, GstCaps * caps) return TRUE; } -static gboolean -gst_wavpack_dec_clip_outgoing_buffer (GstWavpackDec * dec, GstBuffer * buf) -{ - gint64 start, stop, cstart, cstop, diff; - - if (dec->segment.format != GST_FORMAT_TIME) - return TRUE; - - start = GST_BUFFER_TIMESTAMP (buf); - stop = start + GST_BUFFER_DURATION (buf); - - if (gst_segment_clip (&dec->segment, GST_FORMAT_TIME, - start, stop, &cstart, &cstop)) { - - diff = cstart - start; - if (diff > 0) { - GST_BUFFER_TIMESTAMP (buf) = cstart; - GST_BUFFER_DURATION (buf) -= diff; - - diff = 4 * dec->channels - * GST_CLOCK_TIME_TO_FRAMES (diff, dec->sample_rate); - GST_BUFFER_DATA (buf) += diff; - GST_BUFFER_SIZE (buf) -= diff; - } - - diff = stop - cstop; - if (diff > 0) { - GST_BUFFER_DURATION (buf) -= diff; - - diff = 4 * dec->channels - * GST_CLOCK_TIME_TO_FRAMES (diff, dec->sample_rate); - GST_BUFFER_SIZE (buf) -= diff; - } - } else { - GST_DEBUG_OBJECT (dec, "buffer is outside configured segment"); - return FALSE; - } - - return TRUE; -} - static void gst_wavpack_dec_post_tags (GstWavpackDec * dec) { @@ -375,7 +334,8 @@ gst_wavpack_dec_chain (GstPad * pad, GstBuffer * buf) if (decoded != wph.block_samples) goto decode_error; - if (gst_wavpack_dec_clip_outgoing_buffer (dec, outbuf)) { + if ((outbuf = gst_audio_buffer_clip (outbuf, &dec->segment, + dec->sample_rate, 4 * dec->channels))) { GST_LOG_OBJECT (dec, "pushing buffer with time %" GST_TIME_FORMAT, GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (outbuf))); ret = gst_pad_push (dec->srcpad, outbuf); @@ -438,7 +398,7 @@ gst_wavpack_dec_sink_event (GstPad * pad, GstEvent * event) gst_segment_set_newsegment (&dec->segment, is_update, rate, fmt, start, end, base); } else { - gst_segment_init (&dec->segment, GST_FORMAT_UNDEFINED); + gst_segment_init (&dec->segment, GST_FORMAT_TIME); } break; } |