mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-03 01:02:19 +00:00
Code Issues 1 Projects Releases Wiki Activity

update for memory api changes

Browse source
This commit is contained in:
Wim Taymans 2012-03-15 13:32:08 +01:00
parent 28034226c6
commit df5253b22c
4 changed files with 11 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ext/vorbis/gstvorbisdec.c
View file

@ -478,7 +478,7 @@ vorbis_handle_data_packet (GstVorbisDec * vd, ogg_packet * packet,
sample_count, size); sample_count, size);
/* alloc buffer for it */ /* alloc buffer for it */
out = gst_buffer_new_allocate (NULL, size, 0); out = gst_buffer_new_allocate (NULL, size, NULL);
gst_buffer_map (out, &map, GST_MAP_WRITE); gst_buffer_map (out, &map, GST_MAP_WRITE);
/* get samples ready for reading now, should be sample_count */ /* get samples ready for reading now, should be sample_count */

2
gst-libs/gst/rtp/gstrtpbuffer.c
View file

@ -109,7 +109,7 @@ gst_rtp_buffer_allocate_data (GstBuffer * buffer, guint payload_len,
len = GST_RTP_HEADER_LEN + csrc_count * sizeof (guint32) len = GST_RTP_HEADER_LEN + csrc_count * sizeof (guint32)
+ payload_len + pad_len; + payload_len + pad_len;
mem = gst_allocator_alloc (NULL, 0, len, 0, len, 0); mem = gst_allocator_alloc (NULL, len, NULL);
gst_memory_map (mem, &map, GST_MAP_WRITE); gst_memory_map (mem, &map, GST_MAP_WRITE);
/* fill in defaults */ /* fill in defaults */

23
gst-libs/gst/video/gstvideopool.c
View file

@ -144,9 +144,7 @@ struct _GstVideoBufferPoolPrivate
GstVideoAlignment video_align; GstVideoAlignment video_align;
gboolean add_videometa; gboolean add_videometa;
gboolean need_alignment; gboolean need_alignment;
guint prefix; GstAllocationParams params;
guint padding;
guint align;
}; };
static void gst_video_buffer_pool_finalize (GObject * object); static void gst_video_buffer_pool_finalize (GObject * object);
@ -195,9 +193,10 @@ video_buffer_pool_set_config (GstBufferPool * pool, GstStructure * config)
if (priv->caps) if (priv->caps)
gst_caps_unref (priv->caps); gst_caps_unref (priv->caps);
priv->caps = gst_caps_copy (caps); priv->caps = gst_caps_copy (caps);
priv->prefix = prefix; gst_allocation_params_init (&priv->params);
priv->padding = padding; priv->params.prefix = prefix;
priv->align = align; priv->params.padding = padding;
priv->params.align = align;
/* enable metadata based on config of the pool */ /* enable metadata based on config of the pool */
priv->add_videometa = priv->add_videometa =
@ -243,22 +242,16 @@ video_buffer_pool_alloc (GstBufferPool * pool, GstBuffer ** buffer,
GstVideoBufferPool *vpool = GST_VIDEO_BUFFER_POOL_CAST (pool); GstVideoBufferPool *vpool = GST_VIDEO_BUFFER_POOL_CAST (pool);
GstVideoBufferPoolPrivate *priv = vpool->priv; GstVideoBufferPoolPrivate *priv = vpool->priv;
GstVideoInfo *info; GstVideoInfo *info;
GstMemory *mem;
gint maxsize;
info = &priv->info; info = &priv->info;
GST_DEBUG_OBJECT (pool, "alloc %" G_GSIZE_FORMAT, info->size); GST_DEBUG_OBJECT (pool, "alloc %" G_GSIZE_FORMAT, info->size);
maxsize = info->size + priv->prefix + priv->padding; *buffer =
mem = gst_allocator_alloc (priv->allocator, 0, maxsize, priv->prefix, gst_buffer_new_allocate (priv->allocator, info->size, &priv->params);
info->size, priv->align); if (*buffer == NULL)
if (mem == NULL)
goto no_memory; goto no_memory;
*buffer = gst_buffer_new ();
gst_buffer_take_memory (*buffer, -1, mem);
if (priv->add_videometa) { if (priv->add_videometa) {
GST_DEBUG_OBJECT (pool, "adding GstVideoMeta"); GST_DEBUG_OBJECT (pool, "adding GstVideoMeta");

2
gst/gdp/dataprotocol.c
View file

@ -459,7 +459,7 @@ gst_dp_buffer_from_header (guint header_length, const guint8 * header)
buffer = buffer =
gst_buffer_new_allocate (NULL, gst_buffer_new_allocate (NULL,
(guint) GST_DP_HEADER_PAYLOAD_LENGTH (header), 0); (guint) GST_DP_HEADER_PAYLOAD_LENGTH (header), NULL);
GST_BUFFER_TIMESTAMP (buffer) = GST_DP_HEADER_TIMESTAMP (header); GST_BUFFER_TIMESTAMP (buffer) = GST_DP_HEADER_TIMESTAMP (header);
GST_BUFFER_DURATION (buffer) = GST_DP_HEADER_DURATION (header); GST_BUFFER_DURATION (buffer) = GST_DP_HEADER_DURATION (header);