From 20dd20b2e9e9fb2f395572928ad1ab7b63810120 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Thu, 22 Mar 2007 15:52:51 +0000 Subject: [PATCH] ext/wavpack/gstwavpackenc.c: Send the new segment event in time format instead of bytes. This allows "wavpackenc ! wa... Original commit message from CVS: * ext/wavpack/gstwavpackenc.c: (gst_wavpack_enc_push_block): Send the new segment event in time format instead of bytes. This allows "wavpackenc ! wavpackdec ! someaudiosink" pipelines. * ext/wavpack/gstwavpackparse.c: (gst_wavpack_parse_plugin_init): Accept framed and non-framed input, wavpackparse doesn't care. To prevent "wavpackparse ! wavpackparse ! ..." pipelines lower the rank of wavpackparse by one. This allows "wavpackenc ! wavpackparse ! ..." pipelines. --- ext/wavpack/gstwavpackenc.c | 2 +- ext/wavpack/gstwavpackparse.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/ext/wavpack/gstwavpackenc.c b/ext/wavpack/gstwavpackenc.c index fbeb2c7fcf..57610136e0 100644 --- a/ext/wavpack/gstwavpackenc.c +++ b/ext/wavpack/gstwavpackenc.c @@ -619,7 +619,7 @@ gst_wavpack_enc_push_block (void *id, void *data, int32_t count) if (wph.block_index == 0) { gst_pad_push_event (pad, gst_event_new_new_segment (FALSE, - 1.0, GST_FORMAT_BYTES, 0, GST_BUFFER_OFFSET_NONE, 0)); + 1.0, GST_FORMAT_TIME, 0, GST_BUFFER_OFFSET_NONE, 0)); /* save header for later reference, so we can re-send it later on * EOS with fixed up values for total sample count etc. */ diff --git a/ext/wavpack/gstwavpackparse.c b/ext/wavpack/gstwavpackparse.c index c484a10d9b..7d72f0636d 100644 --- a/ext/wavpack/gstwavpackparse.c +++ b/ext/wavpack/gstwavpackparse.c @@ -56,9 +56,7 @@ GST_DEBUG_CATEGORY_STATIC (gst_wavpack_parse_debug); static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, - GST_STATIC_CAPS ("audio/x-wavpack, " - "framed = (boolean) false; " - "audio/x-wavpack-correction, " "framed = (boolean) false") + GST_STATIC_CAPS ("audio/x-wavpack; " "audio/x-wavpack-correction") ); static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src", @@ -1173,7 +1171,7 @@ gboolean gst_wavpack_parse_plugin_init (GstPlugin * plugin) { if (!gst_element_register (plugin, "wavpackparse", - GST_RANK_PRIMARY, GST_TYPE_WAVPACK_PARSE)) { + GST_RANK_PRIMARY - 1, GST_TYPE_WAVPACK_PARSE)) { return FALSE; }