mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 15:08:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/base/gstbasesink.c: For the current position in stream time, we need to subtract accumulated time.

Browse source 
Original commit message from CVS:
* gst/base/gstbasesink.c: (gst_base_sink_get_position):
For the current position in stream time, we need to subtract
accumulated time.

* gst/gstsystemclock.c: (gst_system_clock_async_thread):
Release lock before calling the callback function of async
entries.
This commit is contained in:
Wim Taymans 2005-11-18 13:18:44 +00:00
parent d8b2273583
commit d72c6e95ed
4 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
2005-11-18 Wim Taymans <wim@fluendo.com>
* gst/base/gstbasesink.c: (gst_base_sink_get_position):
For the current position in stream time, we need to subtract
accumulated time.
* gst/gstsystemclock.c: (gst_system_clock_async_thread):
Release lock before calling the callback function of async
entries.
2005-11-18 Andy Wingo <wingo@pobox.com> 2005-11-18 Andy Wingo <wingo@pobox.com>
* gst/net/gstnetclientclock.c (gst_net_client_clock_class_init): * gst/net/gstnetclientclock.c (gst_net_client_clock_class_init):

3
gst/base/gstbasesink.c
View file

@ -1480,7 +1480,8 @@ gst_base_sink_get_position (GstBaseSink * basesink, GstFormat format,
else else
segment_time = 0; segment_time = 0;
*cur = now - GST_ELEMENT_CAST (basesink)->base_time + segment_time; *cur = now - GST_ELEMENT_CAST (basesink)->base_time -
basesink->segment_accum + segment_time;
GST_DEBUG_OBJECT (basesink, GST_DEBUG_OBJECT (basesink,
"now %" GST_TIME_FORMAT " + segment_time %" GST_TIME_FORMAT " = %" "now %" GST_TIME_FORMAT " + segment_time %" GST_TIME_FORMAT " = %"

3
gst/gstsystemclock.c
View file

@ -280,8 +280,11 @@ gst_system_clock_async_thread (GstClock * clock)
* entry */ * entry */
GST_CAT_DEBUG (GST_CAT_CLOCK, "async entry %p unlocked", entry); GST_CAT_DEBUG (GST_CAT_CLOCK, "async entry %p unlocked", entry);
if (entry->func) { if (entry->func) {
/* unlock before firing the callback */
GST_UNLOCK (clock);
entry->func (clock, entry->time, (GstClockID) entry, entry->func (clock, entry->time, (GstClockID) entry,
entry->user_data); entry->user_data);
GST_LOCK (clock);
} }
if (entry->type == GST_CLOCK_ENTRY_PERIODIC) { if (entry->type == GST_CLOCK_ENTRY_PERIODIC) {
/* adjust time now */ /* adjust time now */

3
libs/gst/base/gstbasesink.c
View file

@ -1480,7 +1480,8 @@ gst_base_sink_get_position (GstBaseSink * basesink, GstFormat format,
else else
segment_time = 0; segment_time = 0;
*cur = now - GST_ELEMENT_CAST (basesink)->base_time + segment_time; *cur = now - GST_ELEMENT_CAST (basesink)->base_time -
basesink->segment_accum + segment_time;
GST_DEBUG_OBJECT (basesink, GST_DEBUG_OBJECT (basesink,
"now %" GST_TIME_FORMAT " + segment_time %" GST_TIME_FORMAT " = %" "now %" GST_TIME_FORMAT " + segment_time %" GST_TIME_FORMAT " = %"