From d9f4c59c494cce8bb732089b8a4e6448c9abb60f Mon Sep 17 00:00:00 2001 From: Andoni Morales Alastruey Date: Mon, 20 Jun 2011 18:49:57 +0200 Subject: [PATCH] dv1394src: make the internal clock thread safe Fixes: #653091. --- ext/raw1394/gst1394clock.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ext/raw1394/gst1394clock.c b/ext/raw1394/gst1394clock.c index b7d4a8f177..0505c8cb1c 100644 --- a/ext/raw1394/gst1394clock.c +++ b/ext/raw1394/gst1394clock.c @@ -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; }