diff options
Diffstat (limited to 'libs/gst/base/gstbasesink.h')
| -rw-r--r-- | libs/gst/base/gstbasesink.h | 69 |
1 files changed, 32 insertions, 37 deletions
diff --git a/libs/gst/base/gstbasesink.h b/libs/gst/base/gstbasesink.h index a4215b8de4..c651a44bac 100644 --- a/libs/gst/base/gstbasesink.h +++ b/libs/gst/base/gstbasesink.h @@ -44,6 +44,19 @@ G_BEGIN_DECLS */ #define GST_BASE_SINK_PAD(obj) (GST_BASE_SINK_CAST (obj)->sinkpad) +#define GST_BASE_SINK_GET_PREROLL_LOCK(pad) (GST_BASE_SINK_CAST(pad)->preroll_lock) +#define GST_BASE_SINK_PREROLL_LOCK(pad) (g_mutex_lock(GST_BASE_SINK_GET_PREROLL_LOCK(pad))) +#define GST_BASE_SINK_PREROLL_TRYLOCK(pad) (g_mutex_trylock(GST_BASE_SINK_GET_PREROLL_LOCK(pad))) +#define GST_BASE_SINK_PREROLL_UNLOCK(pad) (g_mutex_unlock(GST_BASE_SINK_GET_PREROLL_LOCK(pad))) + +#define GST_BASE_SINK_GET_PREROLL_COND(pad) (GST_BASE_SINK_CAST(pad)->preroll_cond) +#define GST_BASE_SINK_PREROLL_WAIT(pad) \ + g_cond_wait (GST_BASE_SINK_GET_PREROLL_COND (pad), GST_BASE_SINK_GET_PREROLL_LOCK (pad)) +#define GST_BASE_SINK_PREROLL_TIMED_WAIT(pad, timeval) \ + g_cond_timed_wait (GST_BASE_SINK_GET_PREROLL_COND (pad), GST_BASE_SINK_GET_PREROLL_LOCK (pad), timeval) +#define GST_BASE_SINK_PREROLL_SIGNAL(pad) g_cond_signal (GST_BASE_SINK_GET_PREROLL_COND (pad)); +#define GST_BASE_SINK_PREROLL_BROADCAST(pad) g_cond_broadcast (GST_BASE_SINK_GET_PREROLL_COND (pad)); + typedef struct _GstBaseSink GstBaseSink; typedef struct _GstBaseSinkClass GstBaseSinkClass; typedef struct _GstBaseSinkPrivate GstBaseSinkPrivate; @@ -66,6 +79,8 @@ struct _GstBaseSink { gboolean can_activate_push; /*< protected >*/ /* with PREROLL_LOCK */ + GMutex *preroll_lock; + GCond *preroll_cond; GQueue *preroll_queue; gint preroll_queue_max_len; /* FIXME-0.11: the property is guint */ gint preroll_queued; @@ -80,26 +95,21 @@ struct _GstBaseSink { /*< protected >*/ /* with STREAM_LOCK */ gboolean have_newsegment; GstSegment segment; + GstSegment clip_segment; /*< private >*/ /* with LOCK */ GstClockID clock_id; GstClockTime end_time; gboolean sync; gboolean flushing; + gboolean running; - /*< private >*/ - union { - struct { - /* segment used for clipping incoming buffers */ - GstSegment *clip_segment; - /* max amount of time a buffer can be late, -1 no limit. */ - gint64 max_lateness; - gboolean running; - } ABI; - gpointer _gst_reserved[GST_PADDING_LARGE - 1]; - } abidata; + gint64 max_lateness; + /*< private >*/ GstBaseSinkPrivate *priv; + + gpointer _gst_reserved[GST_PADDING_LARGE]; }; /** @@ -107,7 +117,6 @@ struct _GstBaseSink { * @parent_class: Element parent class * @get_caps: Called to get sink pad caps from the subclass * @set_caps: Notify subclass of changed caps - * @buffer_alloc: Subclasses can override to perform custom buffer allocations * @get_times: Called to get the start and end times for synchronising * the passed buffer to the clock * @start: Start processing. Ideal for opening resources in the subclass @@ -122,9 +131,6 @@ struct _GstBaseSink { * correct moment if the #GstBaseSink has been set to sync to the clock. * @render_list: Same as @render but used whith buffer lists instead of * buffers. Since: 0.10.24 - * @async_play: Subclasses should override this when they need to perform - * special processing when changing to the PLAYING state asynchronously. - * Called with the OBJECT_LOCK held. * @activate_pull: Subclasses should override this when they can provide an * alternate method of spawning a thread to drive the pipeline in pull mode. * Should start or stop the pulling thread, depending on the value of the @@ -142,13 +148,14 @@ struct _GstBaseSinkClass { GstElementClass parent_class; /* get caps from subclass */ - GstCaps* (*get_caps) (GstBaseSink *sink); + GstCaps* (*get_caps) (GstBaseSink *sink, GstCaps *filter); /* notify subclass of new caps */ gboolean (*set_caps) (GstBaseSink *sink, GstCaps *caps); - /* allocate a new buffer with given caps */ - GstFlowReturn (*buffer_alloc) (GstBaseSink *sink, guint64 offset, guint size, - GstCaps *caps, GstBuffer **buf); + /* fixate sink caps during pull-mode negotiation */ + void (*fixate) (GstBaseSink *sink, GstCaps *caps); + /* start or stop a pulling thread */ + gboolean (*activate_pull)(GstBaseSink *sink, gboolean active); /* get the start and end times for syncing on this buffer */ void (*get_times) (GstBaseSink *sink, GstBuffer *buffer, @@ -161,33 +168,21 @@ struct _GstBaseSinkClass { /* unlock any pending access to the resource. subclasses should unlock * any function ASAP. */ gboolean (*unlock) (GstBaseSink *sink); - - /* notify subclass of event, preroll buffer or real buffer */ - gboolean (*event) (GstBaseSink *sink, GstEvent *event); - GstFlowReturn (*preroll) (GstBaseSink *sink, GstBuffer *buffer); - GstFlowReturn (*render) (GstBaseSink *sink, GstBuffer *buffer); - - /* ABI additions */ - - /* when an ASYNC state change to PLAYING happens */ /* with LOCK */ - GstStateChangeReturn (*async_play) (GstBaseSink *sink); - - /* start or stop a pulling thread */ - gboolean (*activate_pull)(GstBaseSink *sink, gboolean active); - - /* fixate sink caps during pull-mode negotiation */ - void (*fixate) (GstBaseSink *sink, GstCaps *caps); - /* Clear a previously indicated unlock request not that unlocking is * complete. Sub-classes should clear any command queue or indicator they * set during unlock */ gboolean (*unlock_stop) (GstBaseSink *sink); + /* notify subclass of event, preroll buffer or real buffer */ + gboolean (*event) (GstBaseSink *sink, GstEvent *event); + + GstFlowReturn (*preroll) (GstBaseSink *sink, GstBuffer *buffer); + GstFlowReturn (*render) (GstBaseSink *sink, GstBuffer *buffer); /* Render a BufferList */ GstFlowReturn (*render_list) (GstBaseSink *sink, GstBufferList *buffer_list); /*< private >*/ - gpointer _gst_reserved[GST_PADDING_LARGE-5]; + gpointer _gst_reserved[GST_PADDING_LARGE]; }; GType gst_base_sink_get_type(void); |