mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-02 12:45:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

basesink: remove obsolete code

Browse source 
Remove some more code now that the render_object ethod is only
called with buffers or bufferlsts.
This commit is contained in:
Wim Taymans 2011-12-02 22:36:38 +01:00
parent 0e38f0dad0
commit cc8359259b
1 changed files with 39 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2775,6 +2775,7 @@ gst_base_sink_render_object (GstBaseSink * basesink,
{
GstFlowReturn ret;
GstBaseSinkClass *bclass;
gint do_qos;
gboolean late, step_end;
gpointer sync_obj;
GstBaseSinkPrivate *priv;
@ -2800,18 +2801,12 @@ again:
if (G_UNLIKELY (ret != GST_FLOW_OK))
goto sync_failed;
/* and now render, event or buffer/buffer list. */
if (G_LIKELY (OBJ_IS_BUFFERFULL (obj_type))) {
/* drop late buffers unconditionally, let's hope it's unlikely */
if (G_UNLIKELY (late))
goto dropped;
bclass = GST_BASE_SINK_GET_CLASS (basesink);
if (G_LIKELY ((OBJ_IS_BUFFERLIST (obj_type) && bclass->render_list) ||
(!OBJ_IS_BUFFERLIST (obj_type) && bclass->render))) {
gint do_qos;
/* read once, to get same value before and after */
do_qos = g_atomic_int_get (&priv->qos_enabled);
@ -2830,12 +2825,14 @@ again:
buf = GST_BUFFER_CAST (obj);
gst_base_sink_set_last_buffer (basesink, buf);
if (bclass->render)
ret = bclass->render (basesink, buf);
} else {
GstBufferList *buflist;
buflist = GST_BUFFER_LIST_CAST (obj);
if (bclass->render_list)
ret = bclass->render_list (basesink, buflist);
}
@ -2849,10 +2846,6 @@ again:
goto flushing;
priv->rendered++;
}
} else {
g_return_val_if_reached (GST_FLOW_ERROR);
}
done:
if (step_end) {
@ -2867,6 +2860,7 @@ done:
GST_DEBUG_OBJECT (basesink, "object unref after render %p", obj);
gst_mini_object_unref (GST_MINI_OBJECT_CAST (obj));
return ret;
/* ERRORS */
@ -3358,6 +3352,7 @@ gst_base_sink_chain_unlocked (GstBaseSink * basesink, GstPad * pad,
/* now we can process the buffer in the queue, this function takes ownership
* of the buffer */
result = gst_base_sink_render_object (basesink, obj_type, obj);
return result;
/* ERRORS */