GST_PAD_ALWAYS,
GST_STATIC_CAPS_ANY);
-GST_BOILERPLATE (GstShmSink, gst_shm_sink, GstBaseSink, GST_TYPE_BASE_SINK);
+#define gst_shm_sink_parent_class parent_class
+G_DEFINE_TYPE (GstShmSink, gst_shm_sink, GST_TYPE_BASE_SINK);
static void gst_shm_sink_finalize (GObject * object);
static void gst_shm_sink_set_property (GObject * object, guint prop_id,
static gboolean gst_shm_sink_start (GstBaseSink * bsink);
static gboolean gst_shm_sink_stop (GstBaseSink * bsink);
static GstFlowReturn gst_shm_sink_render (GstBaseSink * bsink, GstBuffer * buf);
-static GstFlowReturn gst_shm_sink_buffer_alloc (GstBaseSink * sink,
- guint64 offset, guint size, GstCaps * caps, GstBuffer ** out_buf);
static gboolean gst_shm_sink_event (GstBaseSink * bsink, GstEvent * event);
static gboolean gst_shm_sink_unlock (GstBaseSink * bsink);
static guint signals[LAST_SIGNAL] = { 0 };
static void
-gst_shm_sink_base_init (gpointer g_class)
-{
- GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
-
- gst_element_class_add_pad_template (element_class,
- gst_static_pad_template_get (&sinktemplate));
-
- gst_element_class_set_details_simple (element_class,
- "Shared Memory Sink",
- "Sink",
- "Send data over shared memory to the matching source",
- "Olivier Crete <olivier.crete@collabora.co.uk>");
-}
-
-static void
-gst_shm_sink_init (GstShmSink * self, GstShmSinkClass * g_class)
+gst_shm_sink_init (GstShmSink * self)
{
self->cond = g_cond_new ();
self->size = DEFAULT_SIZE;
gst_shm_sink_class_init (GstShmSinkClass * klass)
{
GObjectClass *gobject_class;
+ GstElementClass *gstelement_class;
GstBaseSinkClass *gstbasesink_class;
gobject_class = (GObjectClass *) klass;
+ gstelement_class = (GstElementClass *) klass;
gstbasesink_class = (GstBaseSinkClass *) klass;
gobject_class->finalize = gst_shm_sink_finalize;
gstbasesink_class->event = GST_DEBUG_FUNCPTR (gst_shm_sink_event);
gstbasesink_class->unlock = GST_DEBUG_FUNCPTR (gst_shm_sink_unlock);
gstbasesink_class->unlock_stop = GST_DEBUG_FUNCPTR (gst_shm_sink_unlock_stop);
- gstbasesink_class->buffer_alloc =
- GST_DEBUG_FUNCPTR (gst_shm_sink_buffer_alloc);
g_object_class_install_property (gobject_class, PROP_SOCKET_PATH,
g_param_spec_string ("socket-path",
GST_TYPE_SHM_SINK, G_SIGNAL_RUN_LAST, 0, NULL, NULL,
g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT);
+ gst_element_class_add_pad_template (gstelement_class,
+ gst_static_pad_template_get (&sinktemplate));
+
+ gst_element_class_set_details_simple (gstelement_class,
+ "Shared Memory Sink",
+ "Sink",
+ "Send data over shared memory to the matching source",
+ "Olivier Crete <olivier.crete@collabora.co.uk>");
+
GST_DEBUG_CATEGORY_INIT (shmsink_debug, "shmsink", 0, "Shared Memory Sink");
}
{
GstShmSink *self = GST_SHM_SINK (bsink);
int rv;
+ GstMapInfo map;
GST_OBJECT_LOCK (self);
while (self->wait_for_connection && !self->clients) {
}
}
- rv = sp_writer_send_buf (self->pipe, (char *) GST_BUFFER_DATA (buf),
- GST_BUFFER_SIZE (buf), GST_BUFFER_TIMESTAMP (buf));
+ gst_buffer_map (buf, &map, GST_MAP_READ);
+ rv = sp_writer_send_buf (self->pipe, (char *) map.data, map.size,
+ GST_BUFFER_TIMESTAMP (buf));
+ gst_buffer_unmap (buf, &map);
if (rv == -1) {
ShmBlock *block = NULL;
gchar *shmbuf = NULL;
while ((block = sp_writer_alloc_block (self->pipe,
- GST_BUFFER_SIZE (buf))) == NULL) {
+ gst_buffer_get_size (buf))) == NULL) {
g_cond_wait (self->cond, GST_OBJECT_GET_LOCK (self));
if (self->unlock) {
GST_OBJECT_UNLOCK (self);
}
shmbuf = sp_writer_block_get_buf (block);
- memcpy (shmbuf, GST_BUFFER_DATA (buf), GST_BUFFER_SIZE (buf));
- sp_writer_send_buf (self->pipe, shmbuf, GST_BUFFER_SIZE (buf),
+ gst_buffer_extract (buf, 0, shmbuf, gst_buffer_get_size (buf));
+ sp_writer_send_buf (self->pipe, shmbuf, gst_buffer_get_size (buf),
GST_BUFFER_TIMESTAMP (buf));
sp_writer_free_block (block);
}
return GST_FLOW_OK;
}
+#if 0
+
+/* FIXME 0.11 implement some bufferpool support */
+
static void
gst_shm_sink_free_buffer (gpointer data)
{
return GST_FLOW_OK;
}
+#endif
static gpointer
pollthread_func (gpointer data)
GST_PAD_ALWAYS,
GST_STATIC_CAPS_ANY);
-GST_BOILERPLATE (GstShmSrc, gst_shm_src, GstPushSrc, GST_TYPE_PUSH_SRC);
+#define gst_shm_src_parent_class parent_class
+G_DEFINE_TYPE (GstShmSrc, gst_shm_src, GST_TYPE_PUSH_SRC);
static void gst_shm_src_set_property (GObject * object, guint prop_id,
const GValue * value, GParamSpec * pspec);
// static guint gst_shm_src_signals[LAST_SIGNAL] = { 0 };
-
-static void
-gst_shm_src_base_init (gpointer g_class)
-{
- GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
-
- gst_element_class_add_pad_template (element_class,
- gst_static_pad_template_get (&srctemplate));
-
- gst_element_class_set_details_simple (element_class,
- "Shared Memory Source",
- "Source",
- "Receive data from the sharem memory sink",
- "Olivier Crete <olivier.crete@collabora.co.uk>");
-}
-
static void
gst_shm_src_class_init (GstShmSrcClass * klass)
{
"True if the element cannot produce data in PAUSED", FALSE,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+ gst_element_class_add_pad_template (gstelement_class,
+ gst_static_pad_template_get (&srctemplate));
+
+ gst_element_class_set_details_simple (gstelement_class,
+ "Shared Memory Source",
+ "Source",
+ "Receive data from the sharem memory sink",
+ "Olivier Crete <olivier.crete@collabora.co.uk>");
+
GST_DEBUG_CATEGORY_INIT (shmsrc_debug, "shmsrc", 0, "Shared Memory Source");
}
static void
-gst_shm_src_init (GstShmSrc * self, GstShmSrcClass * g_class)
+gst_shm_src_init (GstShmSrc * self)
{
self->poll = gst_poll_new (TRUE);
gst_poll_fd_init (&self->pollfd);
gst_shm_pipe_inc (self->pipe);
*outbuf = gst_buffer_new ();
- GST_BUFFER_FLAG_SET (*outbuf, GST_BUFFER_FLAG_READONLY);
- GST_BUFFER_DATA (*outbuf) = (guint8 *) buf;
- GST_BUFFER_SIZE (*outbuf) = rv;
- GST_BUFFER_MALLOCDATA (*outbuf) = (guint8 *) gsb;
- GST_BUFFER_FREE_FUNC (*outbuf) = free_buffer;
+ gst_buffer_append_memory (*outbuf,
+ gst_memory_new_wrapped (GST_MEMORY_FLAG_READONLY,
+ buf, rv, 0, rv, gsb, free_buffer));
return GST_FLOW_OK;
}