mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-21 05:26:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

Fixed the clock

Browse source 
Original commit message from CVS:
Fixed the clock
This commit is contained in:
Zeeshan Ali 2004-11-08 19:10:48 +00:00
parent b312957308
commit d712d24254
2 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
ext/libcaca/gstcacasink.c
View file

@ -62,6 +62,7 @@ static void gst_cacasink_base_init (gpointer g_class);
static void gst_cacasink_class_init (GstCACASinkClass * klass); static void gst_cacasink_class_init (GstCACASinkClass * klass);
static void gst_cacasink_init (GstCACASink * cacasink); static void gst_cacasink_init (GstCACASink * cacasink);
static void gst_cacasink_interface_init (GstImplementsInterfaceClass * klass); static void gst_cacasink_interface_init (GstImplementsInterfaceClass * klass);
static void gst_cacasink_set_clock (GstElement * element, GstClock * clock);
static gboolean gst_cacasink_interface_supported (GstImplementsInterface * static gboolean gst_cacasink_interface_supported (GstImplementsInterface *
iface, GType type); iface, GType type);
static void gst_cacasink_navigation_init (GstNavigationInterface * iface); static void gst_cacasink_navigation_init (GstNavigationInterface * iface);
@ -189,6 +190,8 @@ gst_cacasink_class_init (GstCACASinkClass * klass)
gobject_class->get_property = gst_cacasink_get_property; gobject_class->get_property = gst_cacasink_get_property;
gstelement_class->change_state = gst_cacasink_change_state; gstelement_class->change_state = gst_cacasink_change_state;
gstelement_class->set_clock = gst_cacasink_set_clock;
} }
static void static void
@ -287,6 +290,14 @@ gst_cacasink_sinkconnect (GstPad * pad, const GstCaps * caps)
return GST_PAD_LINK_OK; return GST_PAD_LINK_OK;
} }
static void
gst_cacasink_set_clock (GstElement * element, GstClock * clock)
{
GstCACASink *cacasink = GST_CACASINK (element);
cacasink->clock = clock;
}
static void static void
gst_cacasink_init (GstCACASink * cacasink) gst_cacasink_init (GstCACASink * cacasink)
{ {
@ -305,6 +316,8 @@ gst_cacasink_init (GstCACASink * cacasink)
cacasink->green_mask = GST_CACA_DEFAULT_GREEN_MASK; cacasink->green_mask = GST_CACA_DEFAULT_GREEN_MASK;
cacasink->blue_mask = GST_CACA_DEFAULT_BLUE_MASK; cacasink->blue_mask = GST_CACA_DEFAULT_BLUE_MASK;
cacasink->clock = NULL;
GST_FLAG_SET (cacasink, GST_ELEMENT_THREAD_SUGGESTED); GST_FLAG_SET (cacasink, GST_ELEMENT_THREAD_SUGGESTED);
} }
@ -313,8 +326,6 @@ gst_cacasink_chain (GstPad * pad, GstData * _data)
{ {
GstBuffer *buf = GST_BUFFER (_data); GstBuffer *buf = GST_BUFFER (_data);
GstCACASink *cacasink; GstCACASink *cacasink;
GstClockTime time = GST_BUFFER_TIMESTAMP (buf);
gint64 jitter;
g_return_if_fail (pad != NULL); g_return_if_fail (pad != NULL);
g_return_if_fail (GST_IS_PAD (pad)); g_return_if_fail (GST_IS_PAD (pad));
@ -325,10 +336,10 @@ gst_cacasink_chain (GstPad * pad, GstData * _data)
if (!GST_FLAG_IS_SET (GST_ELEMENT (cacasink), GST_CACASINK_OPEN)) if (!GST_FLAG_IS_SET (GST_ELEMENT (cacasink), GST_CACASINK_OPEN))
return; return;
if (cacasink->id && GST_CLOCK_TIME_IS_VALID (time)) { GST_DEBUG ("videosink: clock wait: %" G_GUINT64_FORMAT,
GST_DEBUG ("videosink: clock %s wait: %" G_GUINT64_FORMAT " %u", GST_BUFFER_TIMESTAMP (buf));
GST_OBJECT_NAME (GST_VIDEOSINK_CLOCK (cacasink)),
time, GST_BUFFER_SIZE (buf)); if (cacasink->clock && GST_BUFFER_TIMESTAMP_IS_VALID (buf)) {
gst_element_wait (GST_ELEMENT (cacasink), GST_BUFFER_TIMESTAMP (buf)); gst_element_wait (GST_ELEMENT (cacasink), GST_BUFFER_TIMESTAMP (buf));
} }
@ -337,13 +348,6 @@ gst_cacasink_chain (GstPad * pad, GstData * _data)
cacasink->screen_height - 1, cacasink->bitmap, GST_BUFFER_DATA (buf)); cacasink->screen_height - 1, cacasink->bitmap, GST_BUFFER_DATA (buf));
caca_refresh (); caca_refresh ();
if (GST_VIDEOSINK_CLOCK (cacasink)) {
jitter = gst_clock_get_time (GST_VIDEOSINK_CLOCK (cacasink)) - time;
cacasink->correction = (cacasink->correction + jitter) >> 1;
cacasink->correction = 0;
}
gst_buffer_unref (buf); gst_buffer_unref (buf);
} }

3
ext/libcaca/gstcacasink.h
View file

@ -75,7 +75,8 @@ struct _GstCACASink {
guint red_mask, green_mask, blue_mask; guint red_mask, green_mask, blue_mask;
gint64 correction; gint64 correction;
GstClockID id; //GstClockID id;
GstClock *clock;
struct caca_bitmap *bitmap; struct caca_bitmap *bitmap;
}; };