mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-09-29 15:22:17 +00:00
Code Issues 1 Projects Releases Wiki Activity

basesink: wait_eos -> wait_event

Browse source 
Fix a FIXME. Now we can also pass the GAP event to the subclass.
This commit is contained in:
Wim Taymans 2012-09-04 12:13:11 +02:00
parent 38e3d6c7fd
commit 42e85953c8
2 changed files with 31 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -523,7 +523,7 @@ gst_base_sink_class_init (GstBaseSinkClass * klass)
klass->get_times = GST_DEBUG_FUNCPTR (gst_base_sink_default_get_times);
klass->query = GST_DEBUG_FUNCPTR (gst_base_sink_default_query);
klass->event = GST_DEBUG_FUNCPTR (gst_base_sink_default_event);
klass->wait_eos = GST_DEBUG_FUNCPTR (gst_base_sink_default_wait_event);
klass->wait_event = GST_DEBUG_FUNCPTR (gst_base_sink_default_wait_event);
/* Registering debug symbols for function pointers */
GST_DEBUG_REGISTER_FUNCPTR (gst_base_sink_fixate);
@ -1969,8 +1969,8 @@ gst_base_sink_wait_clock (GstBaseSink * sink, GstClockTime time,
/* FIXME: Casting to GstClockEntry only works because the types
* are the same */
if (G_LIKELY (sink->priv->cached_clock_id != NULL
&& GST_CLOCK_ENTRY_CLOCK ((GstClockEntry *) sink->
priv->cached_clock_id) == clock)) {
&& GST_CLOCK_ENTRY_CLOCK ((GstClockEntry *) sink->priv->
cached_clock_id) == clock)) {
if (!gst_clock_single_shot_id_reinit (clock, sink->priv->cached_clock_id,
time)) {
gst_clock_id_unref (sink->priv->cached_clock_id);
@ -2807,6 +2807,22 @@ gst_base_sink_default_wait_event (GstBaseSink * basesink, GstEvent * event)
return ret;
}
static GstFlowReturn
gst_base_sink_wait_event (GstBaseSink * basesink, GstEvent * event)
{
GstFlowReturn ret;
GstBaseSinkClass *bclass;
bclass = GST_BASE_SINK_GET_CLASS (basesink);
if (G_LIKELY (bclass->wait_event))
ret = bclass->wait_event (basesink, event);
else
ret = GST_FLOW_NOT_SUPPORTED;
return ret;
}
static gboolean
gst_base_sink_default_event (GstBaseSink * basesink, GstEvent * event)
{
@ -2842,15 +2858,11 @@ gst_base_sink_default_event (GstBaseSink * basesink, GstEvent * event)
basesink->priv->received_eos = TRUE;
/* wait for EOS */
if (G_LIKELY (bclass->wait_eos)) {
GstFlowReturn ret;
ret = bclass->wait_eos (basesink, event);
if (G_UNLIKELY (ret != GST_FLOW_OK)) {
if (G_UNLIKELY (gst_base_sink_wait_event (basesink,
event) != GST_FLOW_OK)) {
result = FALSE;
goto done;
}
}
/* the EOS event is completely handled so we mark
* ourselves as being in the EOS state. eos is also
@ -2917,19 +2929,9 @@ gst_base_sink_default_event (GstBaseSink * basesink, GstEvent * event)
break;
case GST_EVENT_GAP:
{
/* FIXME: Rename ->wait_eos to wait_event() and pass GAP to subclass? */
gst_base_sink_default_wait_event (basesink, event);
#if 0
if (G_LIKELY (bclass->wait_eos)) {
GstFlowReturn ret;
ret = bclass->wait_eos (basesink, event);
if (G_UNLIKELY (ret != GST_FLOW_OK)) {
if (G_UNLIKELY (gst_base_sink_wait_event (basesink,
event) != GST_FLOW_OK))
result = FALSE;
goto done;
}
}
#endif
break;
}
case GST_EVENT_TAG:

9
libs/gst/base/gstbasesink.h
View file

@ -127,8 +127,9 @@ struct _GstBaseSink {
* any state they set during unlock(), such as clearing command queues.
* @query: perform a #GstQuery on the element.
* @event: Override this to handle events arriving on the sink pad
* @wait_eos: Override this to implement custom logic to wait for the EOS time.
* subclasses should always first chain up to the default implementation.
* @wait_event: Override this to implement custom logic to wait for the event
* time (for events like EOS and GAP). Subclasses should always first
* chain up to the default implementation.
* @prepare: Called to prepare the buffer for @render and @preroll. This
* function is called before synchronisation is performed.
* @prepare_list: Called to prepare the buffer list for @render_list. This
@ -180,8 +181,8 @@ struct _GstBaseSinkClass {
/* notify subclass of event */
gboolean (*event) (GstBaseSink *sink, GstEvent *event);
/* wait for eos, subclasses should chain up to parent first */
GstFlowReturn (*wait_eos) (GstBaseSink *sink, GstEvent *event);
/* wait for eos or gap, subclasses should chain up to parent first */
GstFlowReturn (*wait_event) (GstBaseSink *sink, GstEvent *event);
/* notify subclass of buffer or list before doing sync */
GstFlowReturn (*prepare) (GstBaseSink *sink, GstBuffer *buffer);