diff options
author | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-01-19 09:17:07 +0100 |
---|---|---|
committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-01-19 12:15:18 +0100 |
commit | 5872bcc33a939ef947c9f469b49b7a5443714011 (patch) | |
tree | de4217ebd79042adcb4e381d8878c618af562771 | |
parent | 3d42f0f6ed9b3f9316c3a1614cbcbbcaf8b8408d (diff) |
Update for memory API changes
-rw-r--r-- | gst-libs/gst/rtp/gstrtpbuffer.c | 2 | ||||
-rw-r--r-- | gst-libs/gst/video/gstvideometa.c | 9 | ||||
-rw-r--r-- | gst-libs/gst/video/gstvideometa.h | 4 | ||||
-rw-r--r-- | gst-libs/gst/video/video.c | 2 |
4 files changed, 7 insertions, 10 deletions
diff --git a/gst-libs/gst/rtp/gstrtpbuffer.c b/gst-libs/gst/rtp/gstrtpbuffer.c index 66049005b..724c2d331 100644 --- a/gst-libs/gst/rtp/gstrtpbuffer.c +++ b/gst-libs/gst/rtp/gstrtpbuffer.c @@ -124,7 +124,7 @@ gst_rtp_buffer_allocate_data (GstBuffer * buffer, guint payload_len, GST_RTP_HEADER_SEQ (data) = 0; GST_RTP_HEADER_TIMESTAMP (data) = 0; GST_RTP_HEADER_SSRC (data) = 0; - gst_memory_unmap (mem, data, len); + gst_memory_unmap (mem); gst_buffer_take_memory (buffer, -1, mem); } diff --git a/gst-libs/gst/video/gstvideometa.c b/gst-libs/gst/video/gstvideometa.c index 6ce4d0d1e..5e90c5efc 100644 --- a/gst-libs/gst/video/gstvideometa.c +++ b/gst-libs/gst/video/gstvideometa.c @@ -235,19 +235,17 @@ gst_video_meta_map (GstVideoMeta * meta, guint plane, gint * stride, * gst_video_meta_unmap: * @meta: a #GstVideoMeta * @plane: a plane - * @data: the data to unmap * - * Unmap previously mapped data with gst_video_meta_map(). + * Unmap a previously mapped plane with gst_video_meta_map(). * * Returns: TRUE if the memory was successfully unmapped. */ gboolean -gst_video_meta_unmap (GstVideoMeta * meta, guint plane, gpointer data) +gst_video_meta_unmap (GstVideoMeta * meta, guint plane) { guint offset; GstBuffer *buffer; GstMemory *mem; - guint8 *base; g_return_val_if_fail (meta != NULL, FALSE); g_return_val_if_fail (plane < meta->n_planes, FALSE); @@ -257,9 +255,8 @@ gst_video_meta_unmap (GstVideoMeta * meta, guint plane, gpointer data) offset = meta->offset[plane]; mem = find_mem_for_offset (buffer, &offset, GST_MAP_READ); - base = data; - gst_memory_unmap (mem, base - offset, -1); + gst_memory_unmap (mem); return TRUE; } diff --git a/gst-libs/gst/video/gstvideometa.h b/gst-libs/gst/video/gstvideometa.h index b68b9790a..d9b9a0faa 100644 --- a/gst-libs/gst/video/gstvideometa.h +++ b/gst-libs/gst/video/gstvideometa.h @@ -68,7 +68,7 @@ struct _GstVideoMeta { gpointer (*map) (GstVideoMeta *meta, guint plane, gint *stride, GstMapFlags flags); - gboolean (*unmap) (GstVideoMeta *meta, guint plane, gpointer data); + gboolean (*unmap) (GstVideoMeta *meta, guint plane); }; const GstMetaInfo * gst_video_meta_get_info (void); @@ -85,7 +85,7 @@ GstVideoMeta * gst_buffer_add_video_meta_full (GstBuffer *buffer, GstVideoFlags gpointer gst_video_meta_map (GstVideoMeta *meta, guint plane, gint *stride, GstMapFlags flags); -gboolean gst_video_meta_unmap (GstVideoMeta *meta, guint plane, gpointer data); +gboolean gst_video_meta_unmap (GstVideoMeta *meta, guint plane); /** * GstVideoCropMeta: diff --git a/gst-libs/gst/video/video.c b/gst-libs/gst/video/video.c index 94bd87b28..cda2e5627 100644 --- a/gst-libs/gst/video/video.c +++ b/gst-libs/gst/video/video.c @@ -1107,7 +1107,7 @@ gst_video_frame_unmap (GstVideoFrame * frame) if (meta) { for (i = 0; i < frame->info.finfo->n_planes; i++) { - gst_video_meta_unmap (meta, i, frame->data[i]); + gst_video_meta_unmap (meta, i); } } else { guint8 *data; |