mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-02 04:22:27 +00:00
Code Issues 1 Projects Releases Wiki Activity

basesink: more cleanups

Browse source 
Don't pass around the object type, we can find that very efficiently from the
object itself now.
This commit is contained in:
Wim Taymans 2011-12-03 06:29:42 +01:00
parent 64bd0b6416
commit ee15bd7287
1 changed files with 29 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -277,19 +277,6 @@ struct _GstBaseSinkPrivate
#define UPDATE_RUNNING_AVG_P(avg,val) DO_RUNNING_AVG(avg,val,16) #define UPDATE_RUNNING_AVG_P(avg,val) DO_RUNNING_AVG(avg,val,16)
#define UPDATE_RUNNING_AVG_N(avg,val) DO_RUNNING_AVG(avg,val,4) #define UPDATE_RUNNING_AVG_N(avg,val) DO_RUNNING_AVG(avg,val,4)
enum
{
_PR_IS_NOTHING = 1 << 0,
_PR_IS_BUFFER = 1 << 1,
_PR_IS_BUFFERLIST = 1 << 2,
_PR_IS_EVENT = 1 << 3
} PrivateObjectType;
#define OBJ_IS_BUFFER(a) ((a) & _PR_IS_BUFFER)
#define OBJ_IS_BUFFERLIST(a) ((a) & _PR_IS_BUFFERLIST)
#define OBJ_IS_EVENT(a) ((a) & _PR_IS_EVENT)
#define OBJ_IS_BUFFERFULL(a) ((a) & (_PR_IS_BUFFER | _PR_IS_BUFFERLIST))
/* BaseSink properties */ /* BaseSink properties */
#define DEFAULT_CAN_ACTIVATE_PULL FALSE /* fixme: enable me */ #define DEFAULT_CAN_ACTIVATE_PULL FALSE /* fixme: enable me */
@ -410,7 +397,7 @@ static gboolean gst_base_sink_is_too_late (GstBaseSink * basesink,
GstMiniObject * obj, GstClockTime rstart, GstClockTime rstop, GstMiniObject * obj, GstClockTime rstart, GstClockTime rstop,
GstClockReturn status, GstClockTimeDiff jitter); GstClockReturn status, GstClockTimeDiff jitter);
static GstFlowReturn gst_base_sink_preroll_object (GstBaseSink * basesink, static GstFlowReturn gst_base_sink_preroll_object (GstBaseSink * basesink,
guint8 obj_type, GstMiniObject * obj); GstMiniObject * obj);
static void static void
gst_base_sink_class_init (GstBaseSinkClass * klass) gst_base_sink_class_init (GstBaseSinkClass * klass)
@ -1759,8 +1746,7 @@ static gboolean
gst_base_sink_get_sync_times (GstBaseSink * basesink, GstMiniObject * obj, gst_base_sink_get_sync_times (GstBaseSink * basesink, GstMiniObject * obj,
GstClockTime * rsstart, GstClockTime * rsstop, GstClockTime * rsstart, GstClockTime * rsstop,
GstClockTime * rrstart, GstClockTime * rrstop, gboolean * do_sync, GstClockTime * rrstart, GstClockTime * rrstop, gboolean * do_sync,
gboolean * stepped, GstStepInfo * step, gboolean * stepped, GstStepInfo * step, gboolean * step_end)
gboolean * step_end, guint8 obj_type)
{ {
GstBaseSinkClass *bclass; GstBaseSinkClass *bclass;
GstBuffer *buffer; GstBuffer *buffer;
@ -1779,7 +1765,7 @@ gst_base_sink_get_sync_times (GstBaseSink * basesink, GstMiniObject * obj,
/* start with nothing */ /* start with nothing */
start = stop = GST_CLOCK_TIME_NONE; start = stop = GST_CLOCK_TIME_NONE;
if (G_UNLIKELY (OBJ_IS_EVENT (obj_type))) { if (G_UNLIKELY (GST_IS_EVENT (obj))) {
GstEvent *event = GST_EVENT_CAST (obj); GstEvent *event = GST_EVENT_CAST (obj);
switch (GST_EVENT_TYPE (event)) { switch (GST_EVENT_TYPE (event)) {
@ -2017,8 +2003,8 @@ gst_base_sink_wait_clock (GstBaseSink * sink, GstClockTime time,
/* FIXME: Casting to GstClockEntry only works because the types /* FIXME: Casting to GstClockEntry only works because the types
* are the same */ * are the same */
if (G_LIKELY (sink->priv->cached_clock_id != NULL if (G_LIKELY (sink->priv->cached_clock_id != NULL
&& GST_CLOCK_ENTRY_CLOCK ((GstClockEntry *) sink-> && GST_CLOCK_ENTRY_CLOCK ((GstClockEntry *) sink->priv->
priv->cached_clock_id) == clock)) { cached_clock_id) == clock)) {
if (!gst_clock_single_shot_id_reinit (clock, sink->priv->cached_clock_id, if (!gst_clock_single_shot_id_reinit (clock, sink->priv->cached_clock_id,
time)) { time)) {
gst_clock_id_unref (sink->priv->cached_clock_id); gst_clock_id_unref (sink->priv->cached_clock_id);
@ -2117,23 +2103,6 @@ step_unlocked:
} }
} }
static inline guint8
get_object_type (GstMiniObject * obj)
{
guint8 obj_type;
if (G_LIKELY (GST_IS_BUFFER (obj)))
obj_type = _PR_IS_BUFFER;
else if (GST_IS_EVENT (obj))
obj_type = _PR_IS_EVENT;
else if (GST_IS_BUFFER_LIST (obj))
obj_type = _PR_IS_BUFFERLIST;
else
obj_type = _PR_IS_NOTHING;
return obj_type;
}
/** /**
* gst_base_sink_do_preroll: * gst_base_sink_do_preroll:
* @sink: the sink * @sink: the sink
@ -2157,12 +2126,9 @@ gst_base_sink_do_preroll (GstBaseSink * sink, GstMiniObject * obj)
GstFlowReturn ret; GstFlowReturn ret;
while (G_UNLIKELY (sink->need_preroll)) { while (G_UNLIKELY (sink->need_preroll)) {
guint8 obj_type;
GST_DEBUG_OBJECT (sink, "prerolling object %p", obj); GST_DEBUG_OBJECT (sink, "prerolling object %p", obj);
obj_type = get_object_type (obj); ret = gst_base_sink_preroll_object (sink, obj);
ret = gst_base_sink_preroll_object (sink, obj_type, obj);
if (ret != GST_FLOW_OK) if (ret != GST_FLOW_OK)
goto preroll_failed; goto preroll_failed;
@ -2286,7 +2252,7 @@ flushing:
*/ */
static GstFlowReturn static GstFlowReturn
gst_base_sink_do_sync (GstBaseSink * basesink, gst_base_sink_do_sync (GstBaseSink * basesink,
GstMiniObject * obj, gboolean * late, gboolean * step_end, guint8 obj_type) GstMiniObject * obj, gboolean * late, gboolean * step_end)
{ {
GstClockTimeDiff jitter = 0; GstClockTimeDiff jitter = 0;
gboolean syncable; gboolean syncable;
@ -2313,8 +2279,7 @@ do_step:
/* get timing information for this object against the render segment */ /* get timing information for this object against the render segment */
syncable = gst_base_sink_get_sync_times (basesink, obj, syncable = gst_base_sink_get_sync_times (basesink, obj,
&sstart, &sstop, &rstart, &rstop, &do_sync, &stepped, &sstart, &sstop, &rstart, &rstop, &do_sync, &stepped, current, step_end);
current, step_end, obj_type);
if (G_UNLIKELY (stepped)) if (G_UNLIKELY (stepped))
goto step_skipped; goto step_skipped;
@ -2782,37 +2747,31 @@ gst_base_sink_do_render_stats (GstBaseSink * basesink, gboolean start)
* function does not take ownership of obj. * function does not take ownership of obj.
*/ */
static GstFlowReturn static GstFlowReturn
gst_base_sink_preroll_object (GstBaseSink * basesink, guint8 obj_type, gst_base_sink_preroll_object (GstBaseSink * basesink, GstMiniObject * obj)
GstMiniObject * obj)
{ {
GstFlowReturn ret; GstFlowReturn ret;
GST_DEBUG_OBJECT (basesink, "prerolling object %p", obj); GST_DEBUG_OBJECT (basesink, "prerolling object %p", obj);
/* if it's a buffer, we need to call the preroll method */ /* if it's a buffer, we need to call the preroll method */
if (G_LIKELY (OBJ_IS_BUFFERFULL (obj_type) && basesink->priv->call_preroll)) { if (basesink->priv->call_preroll) {
GstBaseSinkClass *bclass; GstBaseSinkClass *bclass;
GstBuffer *buf; GstBuffer *buf;
if (OBJ_IS_BUFFERLIST (obj_type)) { if (GST_IS_BUFFER_LIST (obj)) {
buf = gst_buffer_list_get (GST_BUFFER_LIST_CAST (obj), 0); buf = gst_buffer_list_get (GST_BUFFER_LIST_CAST (obj), 0);
g_assert (NULL != buf); g_assert (NULL != buf);
} else { } else if (GST_IS_BUFFER (obj)) {
buf = GST_BUFFER_CAST (obj); buf = GST_BUFFER_CAST (obj);
/* For buffer lists do not set last buffer for now */
gst_base_sink_set_last_buffer (basesink, buf);
} else {
goto no_call_preroll;
} }
GST_DEBUG_OBJECT (basesink, "preroll buffer %" GST_TIME_FORMAT, GST_DEBUG_OBJECT (basesink, "preroll buffer %" GST_TIME_FORMAT,
GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buf))); GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buf)));
/*
* For buffer lists do not set last buffer. Creating buffer
* with meaningful data can be done only with memcpy which will
* significantly affect performance
*/
if (!OBJ_IS_BUFFERLIST (obj_type)) {
gst_base_sink_set_last_buffer (basesink, buf);
}
bclass = GST_BASE_SINK_GET_CLASS (basesink); bclass = GST_BASE_SINK_GET_CLASS (basesink);
if (bclass->preroll) if (bclass->preroll)
if ((ret = bclass->preroll (basesink, buf)) != GST_FLOW_OK) if ((ret = bclass->preroll (basesink, buf)) != GST_FLOW_OK)
@ -2821,6 +2780,7 @@ gst_base_sink_preroll_object (GstBaseSink * basesink, guint8 obj_type,
basesink->priv->call_preroll = FALSE; basesink->priv->call_preroll = FALSE;
} }
no_call_preroll:
/* commit state */ /* commit state */
if (G_LIKELY (basesink->playing_async)) { if (G_LIKELY (basesink->playing_async)) {
if (G_UNLIKELY (!gst_base_sink_commit_state (basesink))) if (G_UNLIKELY (!gst_base_sink_commit_state (basesink)))
@ -2904,7 +2864,7 @@ gst_base_sink_default_wait_eos (GstBaseSink * basesink, GstEvent * event)
gboolean late, step_end; gboolean late, step_end;
ret = gst_base_sink_do_sync (basesink, GST_MINI_OBJECT_CAST (event), ret = gst_base_sink_do_sync (basesink, GST_MINI_OBJECT_CAST (event),
&late, &step_end, _PR_IS_EVENT); &late, &step_end);
return ret; return ret;
} }
@ -3145,7 +3105,7 @@ gst_base_sink_needs_preroll (GstBaseSink * basesink)
*/ */
static GstFlowReturn static GstFlowReturn
gst_base_sink_chain_unlocked (GstBaseSink * basesink, GstPad * pad, gst_base_sink_chain_unlocked (GstBaseSink * basesink, GstPad * pad,
guint8 obj_type, gpointer obj) gpointer obj)
{ {
GstBaseSinkClass *bclass; GstBaseSinkClass *bclass;
GstBaseSinkPrivate *priv = basesink->priv; GstBaseSinkPrivate *priv = basesink->priv;
@ -3162,7 +3122,7 @@ gst_base_sink_chain_unlocked (GstBaseSink * basesink, GstPad * pad,
if (G_UNLIKELY (priv->received_eos)) if (G_UNLIKELY (priv->received_eos))
goto was_eos; goto was_eos;
if (OBJ_IS_BUFFERLIST (obj_type)) { if (GST_IS_BUFFER_LIST (obj)) {
sync_buf = gst_buffer_list_get (GST_BUFFER_LIST_CAST (obj), 0); sync_buf = gst_buffer_list_get (GST_BUFFER_LIST_CAST (obj), 0);
g_assert (NULL != sync_buf); g_assert (NULL != sync_buf);
} else { } else {
@ -3222,7 +3182,7 @@ again:
/* synchronize this object, non syncable objects return OK /* synchronize this object, non syncable objects return OK
* immediately. */ * immediately. */
ret = gst_base_sink_do_sync (basesink, GST_MINI_OBJECT_CAST (sync_buf), ret = gst_base_sink_do_sync (basesink, GST_MINI_OBJECT_CAST (sync_buf),
&late, &step_end, obj_type); &late, &step_end);
if (G_UNLIKELY (ret != GST_FLOW_OK)) if (G_UNLIKELY (ret != GST_FLOW_OK))
goto sync_failed; goto sync_failed;
@ -3239,10 +3199,8 @@ again:
if (do_qos) if (do_qos)
gst_base_sink_do_render_stats (basesink, TRUE); gst_base_sink_do_render_stats (basesink, TRUE);
if (!OBJ_IS_BUFFERLIST (obj_type)) { if (!GST_IS_BUFFER_LIST (obj)) {
/* For buffer lists do not set last buffer. Creating buffer /* For buffer lists do not set last buffer for now. */
* with meaningful data can be done only with memcpy which will
* significantly affect performance */
gst_base_sink_set_last_buffer (basesink, GST_BUFFER_CAST (obj)); gst_base_sink_set_last_buffer (basesink, GST_BUFFER_CAST (obj));
if (bclass->render) if (bclass->render)
@ -3341,8 +3299,7 @@ dropped:
/* with STREAM_LOCK /* with STREAM_LOCK
*/ */
static GstFlowReturn static GstFlowReturn
gst_base_sink_chain_main (GstBaseSink * basesink, GstPad * pad, gst_base_sink_chain_main (GstBaseSink * basesink, GstPad * pad, gpointer obj)
guint8 obj_type, gpointer obj)
{ {
GstFlowReturn result; GstFlowReturn result;
@ -3350,7 +3307,7 @@ gst_base_sink_chain_main (GstBaseSink * basesink, GstPad * pad,
goto wrong_mode; goto wrong_mode;
GST_BASE_SINK_PREROLL_LOCK (basesink); GST_BASE_SINK_PREROLL_LOCK (basesink);
result = gst_base_sink_chain_unlocked (basesink, pad, obj_type, obj); result = gst_base_sink_chain_unlocked (basesink, pad, obj);
GST_BASE_SINK_PREROLL_UNLOCK (basesink); GST_BASE_SINK_PREROLL_UNLOCK (basesink);
done: done:
@ -3379,7 +3336,7 @@ gst_base_sink_chain (GstPad * pad, GstObject * parent, GstBuffer * buf)
basesink = GST_BASE_SINK (parent); basesink = GST_BASE_SINK (parent);
return gst_base_sink_chain_main (basesink, pad, _PR_IS_BUFFER, buf); return gst_base_sink_chain_main (basesink, pad, buf);
} }
static GstFlowReturn static GstFlowReturn
@ -3394,7 +3351,7 @@ gst_base_sink_chain_list (GstPad * pad, GstObject * parent,
bclass = GST_BASE_SINK_GET_CLASS (basesink); bclass = GST_BASE_SINK_GET_CLASS (basesink);
if (G_LIKELY (bclass->render_list)) { if (G_LIKELY (bclass->render_list)) {
result = gst_base_sink_chain_main (basesink, pad, _PR_IS_BUFFERLIST, list); result = gst_base_sink_chain_main (basesink, pad, list);
} else { } else {
guint i, len; guint i, len;
GstBuffer *buffer; GstBuffer *buffer;
@ -3406,7 +3363,7 @@ gst_base_sink_chain_list (GstPad * pad, GstObject * parent,
result = GST_FLOW_OK; result = GST_FLOW_OK;
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
buffer = gst_buffer_list_get (list, 0); buffer = gst_buffer_list_get (list, 0);
result = gst_base_sink_chain_main (basesink, pad, _PR_IS_BUFFER, result = gst_base_sink_chain_main (basesink, pad,
gst_buffer_ref (buffer)); gst_buffer_ref (buffer));
if (result != GST_FLOW_OK) if (result != GST_FLOW_OK)
break; break;
@ -3752,7 +3709,7 @@ gst_base_sink_loop (GstPad * pad)
basesink->segment.position = offset; basesink->segment.position = offset;
GST_BASE_SINK_PREROLL_LOCK (basesink); GST_BASE_SINK_PREROLL_LOCK (basesink);
result = gst_base_sink_chain_unlocked (basesink, pad, _PR_IS_BUFFER, buf); result = gst_base_sink_chain_unlocked (basesink, pad, buf);
GST_BASE_SINK_PREROLL_UNLOCK (basesink); GST_BASE_SINK_PREROLL_UNLOCK (basesink);
if (G_UNLIKELY (result != GST_FLOW_OK)) if (G_UNLIKELY (result != GST_FLOW_OK))
goto paused; goto paused;