gst/adder/gstadder.c (gst_adder_src_event, gst_adder_collected, gst_adder_change_stat...

Original commit message from CVS:
* gst/adder/gstadder.c (gst_adder_src_event, gst_adder_collected,
gst_adder_change_state):
* gst/adder/gstadder.h (bps, offset, collect_event, segment,
segment_pending, segment_position, segment_rate):
Handle playback-rate on adder.

diff --git a/ChangeLog b/ChangeLog
index bb57bcf6da20941a86e3fb4125231f1941e67990..f6fb585fecf6be06b06a59330bae0f882680a7db 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-05-08  Stefan Kost  <ensonic@users.sf.net>
+
+       * gst/adder/gstadder.c (gst_adder_src_event, gst_adder_collected,
+         gst_adder_change_state):
+       * gst/adder/gstadder.h (bps, offset, collect_event, segment,
+         segment_pending, segment_position, segment_rate):
+         Handle playback-rate on adder.
+
 2007-05-07  Michael Smith <msmith@fluendo.com>
 
        * ext/theora/gsttheoradec.h:

diff --git a/gst/adder/gstadder.c b/gst/adder/gstadder.c
index fd582f2addea4ccf5dc100c3fd91f14e5acb9859..23ced05b7f93b7d34b84bdb21f8d307bfcb67157 100644 (file)
--- a/gst/adder/gstadder.c
+++ b/gst/adder/gstadder.c
@@ -443,9 +443,9 @@ gst_adder_src_event (GstPad * pad, GstEvent * event)
       GstSeekType curtype;
       gint64 cur;
 
-      /* parse the flushing flag */
-      gst_event_parse_seek (event, NULL, NULL, &flags, &curtype, &cur, NULL,
-          NULL);
+      /* parse the seek parameters */
+      gst_event_parse_seek (event, &adder->segment_rate, NULL, &flags, &curtype,
+          &cur, NULL, NULL);
 
       /* check if we are flushing */
       if (flags & GST_SEEK_FLAG_FLUSH) {
@@ -741,6 +741,7 @@ gst_adder_collected (GstCollectPads * pads, gpointer user_data)
     GstEvent *event;
 
     /* FIXME, use rate/applied_rate as set on all sinkpads.
+     * - currently we just set rate as received from last seek-event
      * We could potentially figure out the duration as well using
      * the current segment positions and the stated stop positions.
      * Also we just start from stream time 0 which is rather
@@ -752,7 +753,7 @@ gst_adder_collected (GstCollectPads * pads, gpointer user_data)
      * the later streams would be delayed until the stream times
      * match.
      */
-    event = gst_event_new_new_segment_full (FALSE, 1.0,
+    event = gst_event_new_new_segment_full (FALSE, adder->segment_rate,
         1.0, GST_FORMAT_TIME, adder->timestamp, -1, adder->segment_position);
 
     gst_pad_push_event (adder->srcpad, event);
@@ -812,6 +813,7 @@ gst_adder_change_state (GstElement * element, GstStateChange transition)
       adder->offset = 0;
       adder->segment_pending = TRUE;
       adder->segment_position = 0;
+      adder->segment_rate = 1.0;
       gst_segment_init (&adder->segment, GST_FORMAT_UNDEFINED);
       gst_collect_pads_start (adder->collect);
       break;

diff --git a/gst/adder/gstadder.h b/gst/adder/gstadder.h
index 62c990a0f101dc0548cf5142df564b61b0410ede..62075c01e40aebb57dce76000692ff9280553328 100644 (file)
--- a/gst/adder/gstadder.h
+++ b/gst/adder/gstadder.h
@@ -72,7 +72,7 @@ struct _GstAdder {
   gboolean        is_signed;
 
   /* number of bytes per sample, actually width/8 * channels */
-  gint            bps; 
+  gint            bps;
 
   /* function to add samples */
   GstAdderFunction func;
@@ -80,12 +80,13 @@ struct _GstAdder {
   /* counters to keep track of timestamps */
   gint64          timestamp;
   gint64          offset;
-  
+
   /* sink event handling */
   GstPadEventFunction  collect_event;
   GstSegment      segment;
   gboolean        segment_pending;
   guint64         segment_position;
+  gdouble         segment_rate;
 };
 
 struct _GstAdderClass {