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

udpsrc: use negotiated allocator or pool

Browse source 
Use the base class to allocate a buffer for us because it knows how
to use the negotiated allocator or bufferpool.
This commit is contained in:
Wim Taymans 2012-10-10 10:10:26 +02:00
parent e8d951ed68
commit f4e1bb02b7
1 changed files with 32 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
gst/udp/gstudpsrc.c
View file

@ -362,14 +362,14 @@ gst_udpsrc_getcaps (GstBaseSrc * src, GstCaps * filter)
static GstFlowReturn static GstFlowReturn
gst_udpsrc_create (GstPushSrc * psrc, GstBuffer ** buf) gst_udpsrc_create (GstPushSrc * psrc, GstBuffer ** buf)
{ {
GstFlowReturn ret;
GstUDPSrc *udpsrc; GstUDPSrc *udpsrc;
GstBuffer *outbuf; GstBuffer *outbuf;
GstMapInfo info;
GSocketAddress *saddr = NULL; GSocketAddress *saddr = NULL;
guint8 *pktdata;
gint pktsize;
gsize offset; gsize offset;
gssize readsize; gssize readsize;
gssize ret; gssize res;
gboolean try_again; gboolean try_again;
GError *err = NULL; GError *err = NULL;
@ -422,13 +422,10 @@ retry:
if (G_UNLIKELY (!readsize)) { if (G_UNLIKELY (!readsize)) {
/* try to read a packet (and it will be ignored), /* try to read a packet (and it will be ignored),
* in case a packet with no data arrived */ * in case a packet with no data arrived */
res =
pktdata = NULL; g_socket_receive_from (udpsrc->used_socket, NULL, NULL,
pktsize = 0; 0, udpsrc->cancellable, &err);
ret = if (G_UNLIKELY (res < 0))
g_socket_receive_from (udpsrc->used_socket, NULL, (gchar *) pktdata,
pktsize, udpsrc->cancellable, &err);
if (G_UNLIKELY (ret < 0))
goto receive_error; goto receive_error;
/* poll again */ /* poll again */
@ -438,34 +435,36 @@ retry:
no_select: no_select:
GST_LOG_OBJECT (udpsrc, "ioctl says %d bytes available", (int) readsize); GST_LOG_OBJECT (udpsrc, "ioctl says %d bytes available", (int) readsize);
pktdata = g_malloc (readsize); ret = GST_BASE_SRC_CLASS (parent_class)->alloc (GST_BASE_SRC_CAST (udpsrc),
pktsize = readsize; -1, readsize, &outbuf);
if (ret != GST_FLOW_OK)
goto alloc_failed;
gst_buffer_map (outbuf, &info, GST_MAP_WRITE);
offset = 0; offset = 0;
if (saddr) if (saddr)
g_object_unref (saddr); g_object_unref (saddr);
saddr = NULL; saddr = NULL;
ret = res =
g_socket_receive_from (udpsrc->used_socket, &saddr, (gchar *) pktdata, g_socket_receive_from (udpsrc->used_socket, &saddr, (gchar *) info.data,
pktsize, udpsrc->cancellable, &err); info.size, udpsrc->cancellable, &err);
if (G_UNLIKELY (ret < 0)) if (G_UNLIKELY (res < 0))
goto receive_error; goto receive_error;
/* patch pktdata and len when stripping off the headers */ /* patch offset and size when stripping off the headers */
if (G_UNLIKELY (udpsrc->skip_first_bytes != 0)) { if (G_UNLIKELY (udpsrc->skip_first_bytes != 0)) {
if (G_UNLIKELY (readsize < udpsrc->skip_first_bytes)) if (G_UNLIKELY (readsize < udpsrc->skip_first_bytes))
goto skip_error; goto skip_error;
offset += udpsrc->skip_first_bytes; offset += udpsrc->skip_first_bytes;
ret -= udpsrc->skip_first_bytes; res -= udpsrc->skip_first_bytes;
} }
outbuf = gst_buffer_new (); gst_buffer_unmap (outbuf, &info);
gst_buffer_append_memory (outbuf, gst_buffer_resize (outbuf, offset, res);
gst_memory_new_wrapped (0, pktdata, pktsize, offset, ret, pktdata,
g_free));
/* use buffer metadata so receivers can also track the address */ /* use buffer metadata so receivers can also track the address */
if (saddr) { if (saddr) {
@ -478,7 +477,7 @@ no_select:
*buf = GST_BUFFER_CAST (outbuf); *buf = GST_BUFFER_CAST (outbuf);
return GST_FLOW_OK; return ret;
/* ERRORS */ /* ERRORS */
select_error: select_error:
@ -500,9 +499,15 @@ get_available_error:
("get available bytes failed")); ("get available bytes failed"));
return GST_FLOW_ERROR; return GST_FLOW_ERROR;
} }
alloc_failed:
{
GST_DEBUG ("Allocation failed");
return ret;
}
receive_error: receive_error:
{ {
g_free (pktdata); gst_buffer_unmap (outbuf, &info);
gst_buffer_unref (outbuf);
if (g_error_matches (err, G_IO_ERROR, G_IO_ERROR_BUSY) || if (g_error_matches (err, G_IO_ERROR, G_IO_ERROR_BUSY) ||
g_error_matches (err, G_IO_ERROR, G_IO_ERROR_CANCELLED)) { g_error_matches (err, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
@ -517,6 +522,9 @@ receive_error:
} }
skip_error: skip_error:
{ {
gst_buffer_unmap (outbuf, &info);
gst_buffer_unref (outbuf);
GST_ELEMENT_ERROR (udpsrc, STREAM, DECODE, (NULL), GST_ELEMENT_ERROR (udpsrc, STREAM, DECODE, (NULL),
("UDP buffer to small to skip header")); ("UDP buffer to small to skip header"));
return GST_FLOW_ERROR; return GST_FLOW_ERROR;