summaryrefslogtreecommitdiff
authorMark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>2010-07-29 15:27:06 (GMT)
committer Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>2010-07-29 15:29:00 (GMT)
commit2057cf6d79451e81a25babd9a8965bdc56c427b3 (patch) (side-by-side diff)
tree1c2eb974ac6420b7465f0692a68d1b715b2f9258
parent29289ee79e1b49b6dcbb314bee8c760395e5c8e9 (diff)
downloadgstreamer-2057cf6d79451e81a25babd9a8965bdc56c427b3.zip
gstreamer-2057cf6d79451e81a25babd9a8965bdc56c427b3.tar.gz
queue2: download mode; prevent range corruption due to race
Current range was being updated in the thread performing seek, but as no locks were kept for a short section, data flow could resume before current range updated, so data for the new range would be accepted as from the previous range. Rather, range should be updated in serialized manner based on newsegment event.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--plugins/elements/gstqueue2.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/plugins/elements/gstqueue2.c b/plugins/elements/gstqueue2.c
index 83af4b9..8f595a2 100644
--- a/plugins/elements/gstqueue2.c
+++ b/plugins/elements/gstqueue2.c
@@ -244,6 +244,9 @@ static GstStateChangeReturn gst_queue2_change_state (GstElement * element,
static gboolean gst_queue2_is_empty (GstQueue2 * queue);
static gboolean gst_queue2_is_filled (GstQueue2 * queue);
+static void update_cur_level (GstQueue2 * queue, GstQueue2Range * range);
+
+
/* static guint gst_queue2_signals[LAST_SIGNAL] = { 0 }; */
static void
@@ -648,6 +651,12 @@ apply_segment (GstQueue2 * queue, GstEvent * event, GstSegment * segment)
G_GINT64_FORMAT, update, rate, arate, format, start, stop, time);
if (format == GST_FORMAT_BYTES) {
+ if (QUEUE_IS_USING_TEMP_FILE (queue)) {
+ /* start is where we'll be getting from and as such writing next */
+ queue->current = add_range (queue, start);
+ /* update the stats for this range */
+ update_cur_level (queue, queue->current);
+ }
}
/* now configure the values, we use these to track timestamps on the
@@ -1012,11 +1021,6 @@ perform_seek_to_offset (GstQueue2 * queue, guint64 offset)
res = gst_pad_push_event (queue->sinkpad, event);
GST_QUEUE2_MUTEX_LOCK (queue);
- if (res) {
- queue->current = add_range (queue, offset);
- /* update the stats for this range */
- update_cur_level (queue, queue->current);
- }
return res;
}