mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-03-30 20:59:44 +00:00
Code Issues 1 Projects Releases Wiki Activity

dv1394src: make the internal clock thread safe

Browse source 
Fixes: #653091.
This commit is contained in:
Andoni Morales Alastruey 2011-06-20 18:49:57 +02:00 committed by David Schleef
parent 977a5eee7a
commit d9f4c59c49
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ext/raw1394/gst1394clock.c
View file

@ -113,6 +113,7 @@ gst_1394_clock_get_internal_time (GstClock * clock)
_1394clock = GST_1394_CLOCK_CAST (clock); _1394clock = GST_1394_CLOCK_CAST (clock);
if (_1394clock->handle != NULL) { if (_1394clock->handle != NULL) {
GST_OBJECT_LOCK (clock);
raw1394_read_cycle_timer (_1394clock->handle, &cycle_timer, &local_time); raw1394_read_cycle_timer (_1394clock->handle, &cycle_timer, &local_time);
if (cycle_timer < _1394clock->cycle_timer_lo) { 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; result += (((cycle_timer >> 12) & 0x1fff) * 125) * GST_USECOND;
GST_LOG_OBJECT (clock, "result %" GST_TIME_FORMAT, GST_TIME_ARGS (result)); GST_LOG_OBJECT (clock, "result %" GST_TIME_FORMAT, GST_TIME_ARGS (result));
GST_OBJECT_UNLOCK (clock);
} else { } else {
result = GST_CLOCK_TIME_NONE; result = GST_CLOCK_TIME_NONE;
} }