summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Dröge <slomo@circular-chaos.org>2007-03-22 15:52:51 +0000
committerSebastian Dröge <slomo@circular-chaos.org>2007-03-22 15:52:51 +0000
commit8d8d278b9aec1df81fbc7c7cb3fe7aad999cb0d4 (patch)
tree1ba0c1f89db8c2aeac5da14b4fae22fe05494144
parentdd4e39e60f8bd0061371b4727808969e4d69e4fc (diff)
downloadgst-plugins-bad-8d8d278b9aec1df81fbc7c7cb3fe7aad999cb0d4.tar.gz
gst-plugins-bad-8d8d278b9aec1df81fbc7c7cb3fe7aad999cb0d4.tar.bz2
gst-plugins-bad-8d8d278b9aec1df81fbc7c7cb3fe7aad999cb0d4.zip
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.
-rw-r--r--ChangeLog12
-rw-r--r--ext/wavpack/gstwavpackenc.c2
-rw-r--r--ext/wavpack/gstwavpackparse.c6
3 files changed, 15 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index e8ff0874..27551c81 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2007-03-22 Sebastian Dröge <slomo@circular-chaos.org>
+
+ * 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.
+
2007-03-22 Thomas Vander Stichele <thomas at apestaart dot org>
* gst-libs/gst/app/Makefile.am:
diff --git a/ext/wavpack/gstwavpackenc.c b/ext/wavpack/gstwavpackenc.c
index fbeb2c7f..57610136 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 c484a10d..7d72f063 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;
}