mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-05 06:05:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

shm: port to 0.11

Browse source
This commit is contained in:
Mark Nauwelaerts 2012-03-20 20:21:42 +01:00
parent cc7918de19
commit 995bad93a8
3 changed files with 43 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -309,7 +309,7 @@ GST_PLUGINS_NONPORTED=" aiff asfmux \
patchdetect pnm real \
sdi siren speed subenc stereo tta videofilters \
videomeasure videosignal vmnc \
decklink fbdev linsys shm vcd \
decklink fbdev linsys vcd \
apexsink cdaudio cog curl dc1394 dirac directfb resindvd \
gsettings jp2k ladspa mimic \
musepack musicbrainz nas neon ofa openal opencv rsvg sdl sndfile soundtouch spandsp spc timidity \

53
sys/shm/gstshmsink.c
View file

@ -70,7 +70,8 @@ static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",
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,
@ -81,8 +82,6 @@ static void gst_shm_sink_get_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);
@ -93,22 +92,7 @@ static gpointer pollthread_func (gpointer data);
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;
@ -120,9 +104,11 @@ static void
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;
@ -135,8 +121,6 @@ gst_shm_sink_class_init (GstShmSinkClass * klass)
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",
@ -179,6 +163,15 @@ gst_shm_sink_class_init (GstShmSinkClass * klass)
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");
}
@ -399,6 +392,7 @@ gst_shm_sink_render (GstBaseSink * bsink, GstBuffer * buf)
{
GstShmSink *self = GST_SHM_SINK (bsink);
int rv;
GstMapInfo map;
GST_OBJECT_LOCK (self);
while (self->wait_for_connection && !self->clients) {
@ -417,14 +411,16 @@ gst_shm_sink_render (GstBaseSink * bsink, GstBuffer * buf)
}
}
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);
@ -441,8 +437,8 @@ gst_shm_sink_render (GstBaseSink * bsink, GstBuffer * buf)
}
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);
}
@ -452,6 +448,10 @@ gst_shm_sink_render (GstBaseSink * bsink, GstBuffer * buf)
return GST_FLOW_OK;
}
#if 0
/* FIXME 0.11 implement some bufferpool support */
static void
gst_shm_sink_free_buffer (gpointer data)
{
@ -507,6 +507,7 @@ gst_shm_sink_buffer_alloc (GstBaseSink * sink, guint64 offset, guint size,
return GST_FLOW_OK;
}
#endif
static gpointer
pollthread_func (gpointer data)

38
sys/shm/gstshmsrc.c
View file

@ -58,7 +58,8 @@ static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src",
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);
@ -79,22 +80,6 @@ static void gst_shm_pipe_dec (GstShmPipe * pipe);
// 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)
{
@ -132,11 +117,20 @@ 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);
@ -349,11 +343,9 @@ gst_shm_src_create (GstPushSrc * psrc, GstBuffer ** outbuf)
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;
}