ext/faad/gstfaad.c: Added GstSegment to control segments.

Original commit message from CVS:
* ext/faad/gstfaad.c: (gst_faad_class_init), (gst_faad_init),
(gst_faad_dispose), (gst_faad_sink_event), (clip_outgoing_buffer),
(gst_faad_chain), (gst_faad_change_state):
Added GstSegment to control segments.
Added clipping/dropping of outgoing buffers in order to have accurate
seeking working properly.

diff --git a/ChangeLog b/ChangeLog
index 0ad1bc588c180aabad6537e955f022764bee986e..0ebe0b69017d8a092c690c089622391d2df7f725 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-05-31  Edward Hervey  <edward@fluendo.com>
+
+       * ext/faad/gstfaad.c: (gst_faad_class_init), (gst_faad_init),
+       (gst_faad_dispose), (gst_faad_sink_event), (clip_outgoing_buffer),
+       (gst_faad_chain), (gst_faad_change_state):
+       Added GstSegment to control segments.
+       Added clipping/dropping of outgoing buffers in order to have accurate
+       seeking working properly.
+
 2006-05-28  Tim-Philipp Müller  <tim at centricular dot net>
 
        Patch by: Lutz Müller  <lutz at topfrose de>

diff --git a/common b/common
index 2f06c5cbc778e158d2429b09efc6740ff5281295..b0fd90b1cfb51107e8a511a1f3983a06bdd18638 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 2f06c5cbc778e158d2429b09efc6740ff5281295
+Subproject commit b0fd90b1cfb51107e8a511a1f3983a06bdd18638

diff --git a/ext/faad/gstfaad.c b/ext/faad/gstfaad.c
index c17c32a86d3844dbcd889646a7c5956c62dea2c5..f7a06ecea5d25d3fdf29f8aa9e0d986cd52e4c5c 100644 (file)
--- a/ext/faad/gstfaad.c
+++ b/ext/faad/gstfaad.c
@@ -113,6 +113,7 @@ static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src",
 static void gst_faad_base_init (GstFaadClass * klass);
 static void gst_faad_class_init (GstFaadClass * klass);
 static void gst_faad_init (GstFaad * faad);
+static void gst_faad_dispose (GObject * object);
 
 static gboolean gst_faad_setcaps (GstPad * pad, GstCaps * caps);
 static GstCaps *gst_faad_srcgetcaps (GstPad * pad);
@@ -172,10 +173,13 @@ gst_faad_base_init (GstFaadClass * klass)
 static void
 gst_faad_class_init (GstFaadClass * klass)
 {
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
   GstElementClass *gstelement_class = GST_ELEMENT_CLASS (klass);
 
   parent_class = g_type_class_peek_parent (klass);
 
+  gobject_class->dispose = GST_DEBUG_FUNCPTR (gst_faad_dispose);
+
   gstelement_class->change_state = GST_DEBUG_FUNCPTR (gst_faad_change_state);
 }
 
@@ -195,6 +199,7 @@ gst_faad_init (GstFaad * faad)
   faad->sum_dur_out = 0;
   faad->packetised = FALSE;
   faad->error_count = 0;
+  faad->segment = gst_segment_new ();
 
   faad->sinkpad = gst_pad_new_from_static_template (&sink_template, "sink");
   gst_element_add_pad (GST_ELEMENT (faad), faad->sinkpad);
@@ -216,6 +221,20 @@ gst_faad_init (GstFaad * faad)
   gst_element_add_pad (GST_ELEMENT (faad), faad->srcpad);
 }
 
+static void
+gst_faad_dispose (GObject * object)
+{
+  GstFaad *faad = GST_FAAD (object);
+
+  if (faad->segment) {
+    gst_segment_free (faad->segment);
+    faad->segment = NULL;
+  }
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+
+}
+
 static void
 gst_faad_send_tags (GstFaad * faad)
 {
@@ -778,6 +797,8 @@ gst_faad_sink_event (GstPad * pad, GstEvent * event)
         GST_DEBUG ("Got NEWSEGMENT event in GST_FORMAT_TIME, passing on (%"
             GST_TIME_FORMAT " - %" GST_TIME_FORMAT ")", GST_TIME_ARGS (start),
             GST_TIME_ARGS (end));
+        gst_segment_set_newsegment (faad->segment, is_update, rate, fmt, start,
+            end, base);
       } else if (fmt == GST_FORMAT_BYTES) {
         gint64 new_start = 0;
         gint64 new_end = -1;
@@ -800,6 +821,9 @@ gst_faad_sink_event (GstPad * pad, GstEvent * event)
         event = gst_event_new_new_segment (is_update, rate,
             GST_FORMAT_TIME, new_start, new_end, new_start);
 
+        gst_segment_set_newsegment (faad->segment, is_update, rate,
+            GST_FORMAT_TIME, new_start, new_end, new_start);
+
         GST_DEBUG ("Sending new NEWSEGMENT event, time %" GST_TIME_FORMAT
             " - %" GST_TIME_FORMAT, GST_TIME_ARGS (new_start),
             GST_TIME_ARGS (new_end));
@@ -1074,6 +1098,55 @@ looks_like_valid_header (guint8 * input_data, guint input_size)
   return TRUE;
 }
 
+/*
+  clips buffer to currently configured segment. Returns FALSE if the buffer 
+  has to be dropped.
+*/
+
+static gboolean
+clip_outgoing_buffer (GstFaad * faad, GstBuffer * buffer)
+{
+  gint64 start, stop, cstart, cstop, diff;
+  gboolean res = TRUE;
+
+  if (faad->segment->format != GST_FORMAT_TIME)
+    goto beach;
+
+  start = GST_BUFFER_TIMESTAMP (buffer);
+  stop = start + GST_BUFFER_DURATION (buffer);
+
+  if (gst_segment_clip (faad->segment, GST_FORMAT_TIME,
+          start, stop, &cstart, &cstop)) {
+    diff = cstart - start;
+    if (diff > 0) {
+      GST_BUFFER_TIMESTAMP (buffer) = cstart;
+      GST_BUFFER_DURATION (buffer) -= diff;
+
+      /* time->frames->bytes */
+      diff =
+          faad->bps * faad->channels * GST_CLOCK_TIME_TO_FRAMES (diff,
+          faad->samplerate);
+      GST_BUFFER_DATA (buffer) += diff;
+      GST_BUFFER_SIZE (buffer) -= diff;
+    }
+    diff = cstop - stop;
+    if (diff > 0) {
+      GST_BUFFER_DURATION (buffer) -= diff;
+      /* time->frames->bytes */
+      diff =
+          faad->bps * faad->channels * GST_CLOCK_TIME_TO_FRAMES (diff,
+          faad->samplerate);
+      /* update size */
+      GST_BUFFER_SIZE (buffer) -= diff;
+    }
+  } else {
+    GST_DEBUG_OBJECT (faad, "buffer is outside configured segment");
+    res = FALSE;
+  }
+
+beach:
+  return res;
+}
 
 static GstFlowReturn
 gst_faad_chain (GstPad * pad, GstBuffer * buffer)
@@ -1273,12 +1346,16 @@ gst_faad_chain (GstPad * pad, GstBuffer * buffer)
         faad->sum_dur_out += GST_BUFFER_DURATION (outbuf);
         GST_OBJECT_UNLOCK (faad);
 
-        GST_LOG_OBJECT (faad, "pushing buffer, off=%" G_GUINT64_FORMAT ", ts=%"
-            GST_TIME_FORMAT, GST_BUFFER_OFFSET (outbuf),
-            GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (outbuf)));
-        if ((ret = gst_pad_push (faad->srcpad, outbuf)) != GST_FLOW_OK &&
-            ret != GST_FLOW_NOT_LINKED)
-          goto out;
+        if (clip_outgoing_buffer (faad, outbuf)) {
+          GST_LOG_OBJECT (faad,
+              "pushing buffer, off=%" G_GUINT64_FORMAT ", ts=%" GST_TIME_FORMAT,
+              GST_BUFFER_OFFSET (outbuf),
+              GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (outbuf)));
+          if ((ret = gst_pad_push (faad->srcpad, outbuf)) != GST_FLOW_OK
+              && ret != GST_FLOW_NOT_LINKED)
+            goto out;
+        } else
+          gst_buffer_unref (outbuf);
       }
     }
   }
@@ -1372,6 +1449,9 @@ gst_faad_change_state (GstElement * element, GstStateChange transition)
       if (!gst_faad_open_decoder (faad))
         return GST_STATE_CHANGE_FAILURE;
       break;
+    case GST_STATE_CHANGE_READY_TO_PAUSED:
+      gst_segment_init (faad->segment, GST_FORMAT_UNDEFINED);
+      break;
     default:
       break;
   }