Small docs updates.

Original commit message from CVS:
* docs/design/part-clocks.txt:
* docs/design/part-events.txt:
* gst/base/gstbasesrc.c: (gst_base_src_do_seek):
Small docs updates.
Only update the seeking values when we are not
busy streaming.

diff --git a/ChangeLog b/ChangeLog
index 09fd40b458f88c6b9e85dfa15b6b7cfb24d01399..17275655138705d92b42a7deeb6d02117277841e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-07-19  Wim Taymans  <wim@fluendo.com>
+
+       * docs/design/part-clocks.txt:
+       * docs/design/part-events.txt:
+       * gst/base/gstbasesrc.c: (gst_base_src_do_seek):
+       Small docs updates.
+       Only update the seeking values when we are not
+       busy streaming.
+
 2005-07-19  Jan Schmidt  <thaytan@mad.scientist.com>
 
        * gst/base/gstbasesrc.c: (gst_base_src_loop):

diff --git a/docs/design/part-clocks.txt b/docs/design/part-clocks.txt
index ddafa76613957880df5f8f2add0751dd3e1b4a3e..f8cfc94a32e9372494c08b29f8d01acf6dc279bd 100644 (file)
--- a/docs/design/part-clocks.txt
+++ b/docs/design/part-clocks.txt
@@ -73,7 +73,7 @@ The pipeline base time is propagated to all the element during the PAUSED
 to PLAYING state change. All elements are therefore able to convert the 
 stream time to the absolute time. It is possible to specify an aditional
 delay to the base time to compensate for the delay it takes to perform
-the state change.
+the state change using the GstPipeline "delay" property.
 
 
 Clock features

diff --git a/docs/design/part-events.txt b/docs/design/part-events.txt
index 03f83b3f952e40e29aa0c6714686863bc463d086..e471ede85498d6facc0360c467963776b9d6e917 100644 (file)
--- a/docs/design/part-events.txt
+++ b/docs/design/part-events.txt
@@ -98,6 +98,9 @@ Since the stream time is always set to 0 at start and after a seek, a 0
 point for all next buffer's timestamps has to be propagated through the
 pipeline using the DISCONT event.
 
+Before sending buffers, an element must send a DISCONT event. An element is
+free to refuse buffers if they were not preceeded by a DISCONT event.
+
 Elements that sync to the clock should store the DISCONT start and end values
 and substract the start value from the buffer timestamp before comparing
 it against the stream time (see part-clocks.txt).
@@ -107,14 +110,13 @@ substracted from the timestamp. If it does so, it needs to send a corrected
 DISCONT downstream, ie, one with start time 0.
 
 A DISCONT event should be generated as soon as possible in the pipeline and
-is usually generated by a demuxer. The event is generated before pushing the
-first buffer and after a seek, right before pushing the new buffer.
+is usually generated by a demuxer or source. The event is generated before 
+pushing the first buffer and after a seek, right before pushing the new buffer.
 
 The DISCONT event can be send from both the application and the streaming
 thread and should be serialized with the buffers.
 
 
-
 SEEK
 ----
 

diff --git a/gst/base/gstbasesrc.c b/gst/base/gstbasesrc.c
index d7b2b2ffd38456ef1aff652fe3c00efd12fe772c..4bc70daefd64b031cbeb5ba04478ca743093effb 100644 (file)
--- a/gst/base/gstbasesrc.c
+++ b/gst/base/gstbasesrc.c
@@ -387,6 +387,19 @@ gst_base_src_do_seek (GstBaseSrc * src, GstEvent * event)
   offset = GST_EVENT_SEEK_OFFSET (event);
   src->segment_loop = GST_EVENT_SEEK_FLAGS (event) & GST_SEEK_FLAG_SEGMENT_LOOP;
 
+  /* send flush start */
+  gst_pad_push_event (src->srcpad, gst_event_new_flush (FALSE));
+
+  /* unblock streaming thread */
+  gst_base_src_unlock (src);
+
+  /* grab streaming lock */
+  GST_STREAM_LOCK (src->srcpad);
+
+  /* send flush end */
+  gst_pad_push_event (src->srcpad, gst_event_new_flush (TRUE));
+
+  /* perform the seek */
   switch (GST_EVENT_SEEK_METHOD (event)) {
     case GST_SEEK_METHOD_SET:
       if (offset < 0)
@@ -419,18 +432,6 @@ gst_base_src_do_seek (GstBaseSrc * src, GstEvent * event)
       goto error;
   }
 
-  /* send flush start */
-  gst_pad_push_event (src->srcpad, gst_event_new_flush (FALSE));
-
-  /* unblock streaming thread */
-  gst_base_src_unlock (src);
-
-  /* grab streaming lock */
-  GST_STREAM_LOCK (src->srcpad);
-
-  /* send flush end */
-  gst_pad_push_event (src->srcpad, gst_event_new_flush (TRUE));
-
   /* now send discont */
   gst_base_src_send_discont (src);
 
@@ -447,6 +448,7 @@ gst_base_src_do_seek (GstBaseSrc * src, GstEvent * event)
 error:
   {
     GST_DEBUG_OBJECT (src, "seek error");
+    GST_STREAM_UNLOCK (src->srcpad);
     gst_event_unref (event);
     return FALSE;
   }

diff --git a/libs/gst/base/gstbasesrc.c b/libs/gst/base/gstbasesrc.c
index d7b2b2ffd38456ef1aff652fe3c00efd12fe772c..4bc70daefd64b031cbeb5ba04478ca743093effb 100644 (file)
--- a/libs/gst/base/gstbasesrc.c
+++ b/libs/gst/base/gstbasesrc.c
@@ -387,6 +387,19 @@ gst_base_src_do_seek (GstBaseSrc * src, GstEvent * event)
   offset = GST_EVENT_SEEK_OFFSET (event);
   src->segment_loop = GST_EVENT_SEEK_FLAGS (event) & GST_SEEK_FLAG_SEGMENT_LOOP;
 
+  /* send flush start */
+  gst_pad_push_event (src->srcpad, gst_event_new_flush (FALSE));
+
+  /* unblock streaming thread */
+  gst_base_src_unlock (src);
+
+  /* grab streaming lock */
+  GST_STREAM_LOCK (src->srcpad);
+
+  /* send flush end */
+  gst_pad_push_event (src->srcpad, gst_event_new_flush (TRUE));
+
+  /* perform the seek */
   switch (GST_EVENT_SEEK_METHOD (event)) {
     case GST_SEEK_METHOD_SET:
       if (offset < 0)
@@ -419,18 +432,6 @@ gst_base_src_do_seek (GstBaseSrc * src, GstEvent * event)
       goto error;
   }
 
-  /* send flush start */
-  gst_pad_push_event (src->srcpad, gst_event_new_flush (FALSE));
-
-  /* unblock streaming thread */
-  gst_base_src_unlock (src);
-
-  /* grab streaming lock */
-  GST_STREAM_LOCK (src->srcpad);
-
-  /* send flush end */
-  gst_pad_push_event (src->srcpad, gst_event_new_flush (TRUE));
-
   /* now send discont */
   gst_base_src_send_discont (src);
 
@@ -447,6 +448,7 @@ gst_base_src_do_seek (GstBaseSrc * src, GstEvent * event)
 error:
   {
     GST_DEBUG_OBJECT (src, "seek error");
+    GST_STREAM_UNLOCK (src->srcpad);
     gst_event_unref (event);
     return FALSE;
   }