From ca9532ccc58e69ccfc15226f093506ea868287a0 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Wed, 22 Feb 2012 02:06:17 +0100 Subject: [PATCH] update for new memory api --- gst/avi/gstavimux.c | 2 +- gst/avi/gstavisubtitle.c | 2 +- gst/flv/gstflvmux.c | 2 +- gst/isomp4/atoms.c | 2 +- gst/isomp4/gstqtmux.c | 2 +- gst/isomp4/qtdemux.c | 2 +- gst/multifile/gstmultifilesrc.c | 2 +- gst/rtp/gstrtpqdmdepay.c | 4 ++-- gst/rtp/gstrtptheoradepay.c | 7 ++++--- gst/rtp/gstrtpvorbisdepay.c | 7 ++++--- gst/rtsp/gstrtspsrc.c | 2 +- gst/udp/gstudpsrc.c | 5 +++-- gst/y4m/gsty4mencode.c | 4 ++-- sys/v4l2/gstv4l2bufferpool.c | 3 ++- sys/ximage/ximageutil.c | 2 +- tests/check/elements/deinterleave.c | 4 ++-- tests/check/elements/interleave.c | 4 ++-- 17 files changed, 30 insertions(+), 26 deletions(-) diff --git a/gst/avi/gstavimux.c b/gst/avi/gstavimux.c index 181f14fc77..dfa6044425 100644 --- a/gst/avi/gstavimux.c +++ b/gst/avi/gstavimux.c @@ -1558,7 +1558,7 @@ gst_avi_mux_write_index (GstAviMux * avimux) avimux->idx = NULL; /* will be free()'ed by gst_buffer_unref() */ gst_buffer_take_memory (buffer, -1, - gst_memory_new_wrapped (0, data, g_free, size, 0, size)); + gst_memory_new_wrapped (0, data, size, 0, size, data, g_free)); avimux->total_data += size + 8; diff --git a/gst/avi/gstavisubtitle.c b/gst/avi/gstavisubtitle.c index 3060c24bfe..5f5e1394c4 100644 --- a/gst/avi/gstavisubtitle.c +++ b/gst/avi/gstavisubtitle.c @@ -154,7 +154,7 @@ gst_avi_subtitle_extract_file (GstAviSubtitle * sub, GstBuffer * buffer, ret = gst_buffer_new (); slen = strlen (utf8); gst_buffer_take_memory (ret, -1, - gst_memory_new_wrapped (0, utf8, g_free, slen, 0, slen)); + gst_memory_new_wrapped (0, utf8, slen, 0, slen, utf8, g_free)); GST_BUFFER_OFFSET (ret) = 0; } diff --git a/gst/flv/gstflvmux.c b/gst/flv/gstflvmux.c index 6f47c9b332..1fa60afd72 100644 --- a/gst/flv/gstflvmux.c +++ b/gst/flv/gstflvmux.c @@ -138,7 +138,7 @@ _gst_buffer_new_wrapped (gpointer mem, gsize size, GFreeFunc free_func) buf = gst_buffer_new (); gst_buffer_take_memory (buf, -1, gst_memory_new_wrapped (free_func ? 0 : GST_MEMORY_FLAG_READONLY, - mem, free_func, size, 0, size)); + mem, size, 0, size, mem, free_func)); return buf; } diff --git a/gst/isomp4/atoms.c b/gst/isomp4/atoms.c index dc4eea0d7e..bffc17c966 100644 --- a/gst/isomp4/atoms.c +++ b/gst/isomp4/atoms.c @@ -2909,7 +2909,7 @@ _gst_buffer_new_wrapped (gpointer mem, gsize size, GFreeFunc free_func) buf = gst_buffer_new (); gst_buffer_take_memory (buf, -1, gst_memory_new_wrapped (free_func ? 0 : GST_MEMORY_FLAG_READONLY, - mem, free_func, size, 0, size)); + mem, size, 0, size, mem, free_func)); return buf; } diff --git a/gst/isomp4/gstqtmux.c b/gst/isomp4/gstqtmux.c index 4e22d7056f..d06cbc8f07 100644 --- a/gst/isomp4/gstqtmux.c +++ b/gst/isomp4/gstqtmux.c @@ -1187,7 +1187,7 @@ _gst_buffer_new_take_data (guint8 * data, guint size) buf = gst_buffer_new (); gst_buffer_take_memory (buf, -1, - gst_memory_new_wrapped (0, data, g_free, size, 0, size)); + gst_memory_new_wrapped (0, data, size, 0, size, data, g_free)); return buf; } diff --git a/gst/isomp4/qtdemux.c b/gst/isomp4/qtdemux.c index 6eaff11d47..c19e519d6b 100644 --- a/gst/isomp4/qtdemux.c +++ b/gst/isomp4/qtdemux.c @@ -548,7 +548,7 @@ _gst_buffer_new_wrapped (gpointer mem, gsize size, GFreeFunc free_func) buf = gst_buffer_new (); gst_buffer_take_memory (buf, -1, gst_memory_new_wrapped (free_func ? 0 : GST_MEMORY_FLAG_READONLY, - mem, free_func, size, 0, size)); + mem, size, 0, size, mem, free_func)); return buf; } diff --git a/gst/multifile/gstmultifilesrc.c b/gst/multifile/gstmultifilesrc.c index 7ef347de93..9e9c3377d8 100644 --- a/gst/multifile/gstmultifilesrc.c +++ b/gst/multifile/gstmultifilesrc.c @@ -387,7 +387,7 @@ gst_multi_file_src_create (GstPushSrc * src, GstBuffer ** buffer) buf = gst_buffer_new (); gst_buffer_take_memory (buf, -1, - gst_memory_new_wrapped (0, data, g_free, size, 0, size)); + gst_memory_new_wrapped (0, data, size, 0, size, data, g_free)); GST_BUFFER_OFFSET (buf) = multifilesrc->offset; GST_BUFFER_OFFSET_END (buf) = multifilesrc->offset + size; multifilesrc->offset += size; diff --git a/gst/rtp/gstrtpqdmdepay.c b/gst/rtp/gstrtpqdmdepay.c index 64cc9fb321..bad239c587 100644 --- a/gst/rtp/gstrtpqdmdepay.c +++ b/gst/rtp/gstrtpqdmdepay.c @@ -182,8 +182,8 @@ flush_data (GstRtpQDM2Depay * depay) buf = gst_buffer_new (); gst_buffer_take_memory (buf, -1, - gst_memory_new_wrapped (0, data, g_free, depay->packetsize, 0, - depay->packetsize)); + gst_memory_new_wrapped (0, data, depay->packetsize, 0, + depay->packetsize, data, g_free)); gst_adapter_push (depay->adapter, buf); diff --git a/gst/rtp/gstrtptheoradepay.c b/gst/rtp/gstrtptheoradepay.c index e41dad7db5..e86c5433ed 100644 --- a/gst/rtp/gstrtptheoradepay.c +++ b/gst/rtp/gstrtptheoradepay.c @@ -329,7 +329,7 @@ gst_rtp_theora_depay_setcaps (GstRTPBaseDepayload * depayload, GstCaps * caps) confbuf = gst_buffer_new (); gst_buffer_take_memory (confbuf, -1, - gst_memory_new_wrapped (0, data, g_free, size, 0, size)); + gst_memory_new_wrapped (0, data, size, 0, size, data, g_free)); if (!gst_rtp_theora_depay_parse_configuration (rtptheoradepay, confbuf)) goto invalid_configuration; @@ -543,8 +543,9 @@ gst_rtp_theora_depay_process (GstRTPBaseDepayload * depayload, GstBuffer * buf) if (G_UNLIKELY (to_free)) { outbuf = gst_buffer_new (); gst_buffer_take_memory (buf, -1, - gst_memory_new_wrapped (0, to_free, g_free, - (payload - to_free) + length, payload - to_free, length)); + gst_memory_new_wrapped (0, to_free, + (payload - to_free) + length, payload - to_free, length, to_free, + g_free)); to_free = NULL; } else { outbuf = gst_buffer_new_and_alloc (length); diff --git a/gst/rtp/gstrtpvorbisdepay.c b/gst/rtp/gstrtpvorbisdepay.c index d2017acb15..69064105b2 100644 --- a/gst/rtp/gstrtpvorbisdepay.c +++ b/gst/rtp/gstrtpvorbisdepay.c @@ -370,7 +370,7 @@ gst_rtp_vorbis_depay_setcaps (GstRTPBaseDepayload * depayload, GstCaps * caps) confbuf = gst_buffer_new (); gst_buffer_take_memory (confbuf, -1, - gst_memory_new_wrapped (0, data, g_free, size, 0, size)); + gst_memory_new_wrapped (0, data, size, 0, size, data, g_free)); if (!gst_rtp_vorbis_depay_parse_configuration (rtpvorbisdepay, confbuf)) goto invalid_configuration; } else { @@ -594,8 +594,9 @@ gst_rtp_vorbis_depay_process (GstRTPBaseDepayload * depayload, GstBuffer * buf) if (G_UNLIKELY (to_free)) { outbuf = gst_buffer_new (); gst_buffer_take_memory (outbuf, -1, - gst_memory_new_wrapped (0, to_free, g_free, - (payload - to_free) + length, payload - to_free, length)); + gst_memory_new_wrapped (0, to_free, + (payload - to_free) + length, payload - to_free, length, to_free, + g_free)); to_free = NULL; } else { outbuf = gst_buffer_new_and_alloc (length); diff --git a/gst/rtsp/gstrtspsrc.c b/gst/rtsp/gstrtspsrc.c index 1b44a68d33..448af25198 100644 --- a/gst/rtsp/gstrtspsrc.c +++ b/gst/rtsp/gstrtspsrc.c @@ -3603,7 +3603,7 @@ gst_rtspsrc_loop_interleaved (GstRTSPSrc * src) buf = gst_buffer_new (); gst_buffer_take_memory (buf, -1, - gst_memory_new_wrapped (0, data, g_free, size, 0, size)); + gst_memory_new_wrapped (0, data, size, 0, size, data, g_free)); /* don't need message anymore */ gst_rtsp_message_unset (&message); diff --git a/gst/udp/gstudpsrc.c b/gst/udp/gstudpsrc.c index f2bd5ea2a5..81a96e87ae 100644 --- a/gst/udp/gstudpsrc.c +++ b/gst/udp/gstudpsrc.c @@ -459,7 +459,8 @@ no_select: outbuf = gst_buffer_new (); gst_buffer_take_memory (outbuf, -1, - gst_memory_new_wrapped (0, pktdata, g_free, pktsize, offset, ret)); + gst_memory_new_wrapped (0, pktdata, pktsize, offset, ret, pktdata, + g_free)); /* use buffer metadata so receivers can also track the address */ if (saddr) { @@ -525,7 +526,7 @@ gst_udpsrc_set_uri (GstUDPSrc * src, const gchar * uri, GError ** error) if (!gst_udp_parse_uri (uri, &host, &port)) goto wrong_uri; - if (port == (guint16) -1) + if (port == (guint16) - 1) port = UDP_DEFAULT_PORT; g_free (src->host); diff --git a/gst/y4m/gsty4mencode.c b/gst/y4m/gsty4mencode.c index 1107144657..0987dc3ed9 100644 --- a/gst/y4m/gsty4mencode.c +++ b/gst/y4m/gsty4mencode.c @@ -240,7 +240,7 @@ gst_y4m_encode_get_stream_header (GstY4mEncode * filter, gboolean tff) buf = gst_buffer_new (); gst_buffer_take_memory (buf, -1, - gst_memory_new_wrapped (0, header, g_free, len, 0, len)); + gst_memory_new_wrapped (0, header, len, 0, len, header, g_free)); return buf; } @@ -257,7 +257,7 @@ gst_y4m_encode_get_frame_header (GstY4mEncode * filter) buf = gst_buffer_new (); gst_buffer_take_memory (buf, -1, - gst_memory_new_wrapped (0, header, g_free, len, 0, len)); + gst_memory_new_wrapped (0, header, len, 0, len, header, g_free)); return buf; } diff --git a/sys/v4l2/gstv4l2bufferpool.c b/sys/v4l2/gstv4l2bufferpool.c index bc0838decd..4e149dd764 100644 --- a/sys/v4l2/gstv4l2bufferpool.c +++ b/sys/v4l2/gstv4l2bufferpool.c @@ -173,7 +173,8 @@ gst_v4l2_buffer_pool_alloc_buffer (GstBufferPool * bpool, GstBuffer ** buffer, gst_buffer_take_memory (newbuf, -1, gst_memory_new_wrapped (0, - meta->mem, NULL, meta->vbuffer.length, 0, meta->vbuffer.length)); + meta->mem, meta->vbuffer.length, 0, meta->vbuffer.length, NULL, + NULL)); /* add metadata to raw video buffers */ if (pool->add_videometa && info->finfo) { diff --git a/sys/ximage/ximageutil.c b/sys/ximage/ximageutil.c index d3dee2bc02..c221a58dc4 100644 --- a/sys/ximage/ximageutil.c +++ b/sys/ximage/ximageutil.c @@ -423,7 +423,7 @@ gst_ximageutil_ximage_new (GstXContext * xcontext, gst_buffer_take_memory (ximage, -1, gst_memory_new_wrapped (GST_MEMORY_FLAG_NO_SHARE, meta->ximage->data, - NULL, meta->size, 0, meta->size)); + meta->size, 0, meta->size, NULL, NULL)); /* Keep a ref to our src */ meta->parent = gst_object_ref (parent); diff --git a/tests/check/elements/deinterleave.c b/tests/check/elements/deinterleave.c index 77bca77096..a2c802d784 100644 --- a/tests/check/elements/deinterleave.c +++ b/tests/check/elements/deinterleave.c @@ -454,8 +454,8 @@ src_handoff_float32_8ch (GstElement * src, GstBuffer * buf, GstPad * pad, } buf = gst_buffer_new (); - gst_buffer_take_memory (buf, -1, gst_memory_new_wrapped (0, data, g_free, - size, 0, size)); + gst_buffer_take_memory (buf, -1, gst_memory_new_wrapped (0, data, + size, 0, size, data, g_free)); GST_BUFFER_OFFSET (buf) = 0; GST_BUFFER_TIMESTAMP (buf) = 0; } diff --git a/tests/check/elements/interleave.c b/tests/check/elements/interleave.c index ed83db93b4..e456a3e25e 100644 --- a/tests/check/elements/interleave.c +++ b/tests/check/elements/interleave.c @@ -415,8 +415,8 @@ src_handoff_float32 (GstElement * element, GstBuffer * buffer, GstPad * pad, for (i = 0; i < 48000; i++) data[i] = (n % 2 == 0) ? -1.0 : 1.0; - gst_buffer_take_memory (buffer, -1, gst_memory_new_wrapped (0, data, g_free, - size, 0, size)); + gst_buffer_take_memory (buffer, -1, gst_memory_new_wrapped (0, data, + size, 0, size, data, g_free)); GST_BUFFER_OFFSET (buffer) = GST_BUFFER_OFFSET_NONE; GST_BUFFER_TIMESTAMP (buffer) = GST_CLOCK_TIME_NONE;