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

waylansink: Implement _show_frame()

Browse source 
This fixes the property show-preroll-frame expose by the VideoSink base
class and removes redundant code.
This commit is contained in:
Nicolas Dufresne 2016-09-16 15:41:11 -04:00
parent 25cb3afb58
commit 1c81b0bb6e
1 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
ext/wayland/gstwaylandsink.c
View file

@ -89,11 +89,9 @@ static void gst_wayland_sink_set_context (GstElement * element,
static GstCaps *gst_wayland_sink_get_caps (GstBaseSink * bsink, static GstCaps *gst_wayland_sink_get_caps (GstBaseSink * bsink,
GstCaps * filter); GstCaps * filter);
static gboolean gst_wayland_sink_set_caps (GstBaseSink * bsink, GstCaps * caps); static gboolean gst_wayland_sink_set_caps (GstBaseSink * bsink, GstCaps * caps);
static gboolean gst_wayland_sink_preroll (GstBaseSink * bsink,
GstBuffer * buffer);
static gboolean static gboolean
gst_wayland_sink_propose_allocation (GstBaseSink * bsink, GstQuery * query); gst_wayland_sink_propose_allocation (GstBaseSink * bsink, GstQuery * query);
static gboolean gst_wayland_sink_render (GstBaseSink * bsink, static gboolean gst_wayland_sink_show_frame (GstVideoSink * bsink,
GstBuffer * buffer); GstBuffer * buffer);
/* VideoOverlay interface */ /* VideoOverlay interface */
@ -124,10 +122,12 @@ gst_wayland_sink_class_init (GstWaylandSinkClass * klass)
GObjectClass *gobject_class; GObjectClass *gobject_class;
GstElementClass *gstelement_class; GstElementClass *gstelement_class;
GstBaseSinkClass *gstbasesink_class; GstBaseSinkClass *gstbasesink_class;
GstVideoSinkClass *gstvideosink_class;
gobject_class = (GObjectClass *) klass; gobject_class = (GObjectClass *) klass;
gstelement_class = (GstElementClass *) klass; gstelement_class = (GstElementClass *) klass;
gstbasesink_class = (GstBaseSinkClass *) klass; gstbasesink_class = (GstBaseSinkClass *) klass;
gstvideosink_class = (GstVideoSinkClass *) klass;
gobject_class->set_property = gst_wayland_sink_set_property; gobject_class->set_property = gst_wayland_sink_set_property;
gobject_class->get_property = gst_wayland_sink_get_property; gobject_class->get_property = gst_wayland_sink_get_property;
@ -148,10 +148,11 @@ gst_wayland_sink_class_init (GstWaylandSinkClass * klass)
gstbasesink_class->get_caps = GST_DEBUG_FUNCPTR (gst_wayland_sink_get_caps); gstbasesink_class->get_caps = GST_DEBUG_FUNCPTR (gst_wayland_sink_get_caps);
gstbasesink_class->set_caps = GST_DEBUG_FUNCPTR (gst_wayland_sink_set_caps); gstbasesink_class->set_caps = GST_DEBUG_FUNCPTR (gst_wayland_sink_set_caps);
gstbasesink_class->preroll = GST_DEBUG_FUNCPTR (gst_wayland_sink_preroll);
gstbasesink_class->propose_allocation = gstbasesink_class->propose_allocation =
GST_DEBUG_FUNCPTR (gst_wayland_sink_propose_allocation); GST_DEBUG_FUNCPTR (gst_wayland_sink_propose_allocation);
gstbasesink_class->render = GST_DEBUG_FUNCPTR (gst_wayland_sink_render);
gstvideosink_class->show_frame =
GST_DEBUG_FUNCPTR (gst_wayland_sink_show_frame);
g_object_class_install_property (gobject_class, PROP_DISPLAY, g_object_class_install_property (gobject_class, PROP_DISPLAY,
g_param_spec_string ("display", "Wayland Display name", "Wayland " g_param_spec_string ("display", "Wayland Display name", "Wayland "
@ -524,13 +525,6 @@ gst_wayland_sink_propose_allocation (GstBaseSink * bsink, GstQuery * query)
return TRUE; return TRUE;
} }
static GstFlowReturn
gst_wayland_sink_preroll (GstBaseSink * bsink, GstBuffer * buffer)
{
GST_DEBUG_OBJECT (bsink, "preroll buffer %p", buffer);
return gst_wayland_sink_render (bsink, buffer);
}
static void static void
frame_redraw_callback (void *data, struct wl_callback *callback, uint32_t time) frame_redraw_callback (void *data, struct wl_callback *callback, uint32_t time)
{ {
@ -570,9 +564,9 @@ render_last_buffer (GstWaylandSink * sink)
} }
static GstFlowReturn static GstFlowReturn
gst_wayland_sink_render (GstBaseSink * bsink, GstBuffer * buffer) gst_wayland_sink_show_frame (GstVideoSink * vsink, GstBuffer * buffer)
{ {
GstWaylandSink *sink = GST_WAYLAND_SINK (bsink); GstWaylandSink *sink = GST_WAYLAND_SINK (vsink);
GstBuffer *to_render; GstBuffer *to_render;
GstWlBuffer *wlbuffer; GstWlBuffer *wlbuffer;
GstFlowReturn ret = GST_FLOW_OK; GstFlowReturn ret = GST_FLOW_OK;