mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-11 18:05:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

Let VideoSink store the clock, since Cacasink inherits from there

Browse source 
Original commit message from CVS:
Let VideoSink store the clock, since Cacasink inherits from there
This commit is contained in:
Jan Schmidt 2004-11-09 13:03:33 +00:00
parent cddd9ddf05
commit 5e5f93ce4a
3 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2004-11-09 Jan Schmidt <thaytan@mad.scientist.com>
* ext/libcaca/gstcacasink.c: (gst_cacasink_class_init),
(gst_cacasink_init), (gst_cacasink_chain):
* ext/libcaca/gstcacasink.h:
Cacasink inherits from VideoSink, so let that store the clock.
2004-11-09 Wim Taymans <wim@fluendo.com> 2004-11-09 Wim Taymans <wim@fluendo.com>
* gst/playback/README: * gst/playback/README:

15
ext/libcaca/gstcacasink.c
View file

@ -62,7 +62,6 @@ 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);
@ -190,8 +189,6 @@ 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
@ -290,14 +287,6 @@ 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)
{ {
@ -316,8 +305,6 @@ 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);
} }
@ -339,7 +326,7 @@ gst_cacasink_chain (GstPad * pad, GstData * _data)
GST_DEBUG ("videosink: clock wait: %" G_GUINT64_FORMAT, GST_DEBUG ("videosink: clock wait: %" G_GUINT64_FORMAT,
GST_BUFFER_TIMESTAMP (buf)); GST_BUFFER_TIMESTAMP (buf));
if (cacasink->clock && GST_BUFFER_TIMESTAMP_IS_VALID (buf)) { if (GST_VIDEOSINK_CLOCK (cacasink) && 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));
} }

2
ext/libcaca/gstcacasink.h
View file

@ -74,8 +74,6 @@ struct _GstCACASink {
gboolean antialiasing; gboolean antialiasing;
guint red_mask, green_mask, blue_mask; guint red_mask, green_mask, blue_mask;
GstClock *clock;
struct caca_bitmap *bitmap; struct caca_bitmap *bitmap;
}; };