[gst-cvs] gstreamer: queue2: reading_pos is updated in create_read only

Wim Taymans wtay at kemper.freedesktop.org
Fri Aug 13 07:41:04 PDT 2010


Module: gstreamer
Branch: master
Commit: 8de7cc22223e80b3b8297095713d2eb5a412ee02
URL:    http://cgit.freedesktop.org/gstreamer/gstreamer/commit/?id=8de7cc22223e80b3b8297095713d2eb5a412ee02

Author: Wim Taymans <wim.taymans at collabora.co.uk>
Date:   Wed Jun 16 11:11:32 2010 +0200

queue2: reading_pos is updated in create_read only

---

 plugins/elements/gstqueue2.c |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/plugins/elements/gstqueue2.c b/plugins/elements/gstqueue2.c
index 1d005dc..a9bfbff 100644
--- a/plugins/elements/gstqueue2.c
+++ b/plugins/elements/gstqueue2.c
@@ -1297,11 +1297,6 @@ gst_queue2_read_item_from_file (GstQueue2 * queue)
     switch (ret) {
       case GST_FLOW_OK:
         item = GST_MINI_OBJECT_CAST (buffer);
-        queue->current->reading_pos += DEFAULT_BUFFER_SIZE;
-        if (QUEUE_IS_USING_RING_BUFFER (queue))
-          queue->current->rb_reading_pos =
-              (queue->current->rb_reading_pos +
-              DEFAULT_BUFFER_SIZE) % queue->ring_buffer_max_size;
         break;
       case GST_FLOW_UNEXPECTED:
         item = GST_MINI_OBJECT_CAST (gst_event_new_eos ());
@@ -2530,8 +2525,7 @@ gst_queue2_get_range (GstPad * pad, guint64 offset, guint length,
 
   GST_QUEUE2_MUTEX_LOCK_CHECK (queue, queue->srcresult, out_flushing);
   length = (length == -1) ? DEFAULT_BUFFER_SIZE : length;
-  queue->current->reading_pos = offset =
-      (offset == -1) ? queue->current->reading_pos : offset;
+  offset = (offset == -1) ? queue->current->reading_pos : offset;
 
   GST_DEBUG_OBJECT (queue,
       "Getting range: offset %" G_GUINT64_FORMAT ", length %u", offset, length);





More information about the Gstreamer-commits mailing list