Commit d9f4c59c authored by Andoni Morales Alastruey's avatar Andoni Morales Alastruey Committed by David Schleef

dv1394src: make the internal clock thread safe

Fixes: #653091.
parent 977a5eee
......@@ -113,6 +113,7 @@ gst_1394_clock_get_internal_time (GstClock * clock)
_1394clock = GST_1394_CLOCK_CAST (clock);
if (_1394clock->handle != NULL) {
GST_OBJECT_LOCK (clock);
raw1394_read_cycle_timer (_1394clock->handle, &cycle_timer, &local_time);
if (cycle_timer < _1394clock->cycle_timer_lo) {
......@@ -130,6 +131,7 @@ gst_1394_clock_get_internal_time (GstClock * clock)
result += (((cycle_timer >> 12) & 0x1fff) * 125) * GST_USECOND;
GST_LOG_OBJECT (clock, "result %" GST_TIME_FORMAT, GST_TIME_ARGS (result));
GST_OBJECT_UNLOCK (clock);
} else {
result = GST_CLOCK_TIME_NONE;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment