diff options
author | Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk> | 2012-07-05 16:29:42 +0200 |
---|---|---|
committer | Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk> | 2012-07-05 16:39:17 +0200 |
commit | db3ce93c51f9e87159589678f6d396b44a201d33 (patch) | |
tree | c38265599cdf15b1fca6875608000df87120ea6e /gst-libs/gst/video/video-overlay-composition.c | |
parent | 2f3637ca07bc119bc3088a187ef86dc35fa1f5d0 (diff) |
Revert "videooverlaycomposition: ensure proper buffer copy"
This reverts commit 1d413ace640c679ba7fbecec07f2bea3d98360b2.
Plain gst_buffer_copy() is now doing the expected ...
See https://bugzilla.gnome.org/show_bug.cgi?id=678384.
Diffstat (limited to 'gst-libs/gst/video/video-overlay-composition.c')
-rw-r--r-- | gst-libs/gst/video/video-overlay-composition.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/gst-libs/gst/video/video-overlay-composition.c b/gst-libs/gst/video/video-overlay-composition.c index f3ca94620..c4858a2a5 100644 --- a/gst-libs/gst/video/video-overlay-composition.c +++ b/gst-libs/gst/video/video-overlay-composition.c @@ -939,22 +939,6 @@ gst_video_overlay_rectangle_apply_global_alpha (GstVideoOverlayRectangle * rect, rect->applied_global_alpha = global_alpha; } -/* need real independent buffer copy; - * see also https://bugzilla.gnome.org/show_bug.cgi?id=679145 */ -static GstBuffer * -__gst_buffer_copy (GstBuffer * buf) -{ - GstBuffer *newb; - GstMapInfo map; - - newb = gst_buffer_new_and_alloc (gst_buffer_get_size (buf)); - gst_buffer_map (buf, &map, GST_MAP_READ); - gst_buffer_fill (newb, 0, map.data, map.size); - gst_buffer_unmap (buf, &map); - - return newb; -} - static GstBuffer * gst_video_overlay_rectangle_get_pixels_argb_internal (GstVideoOverlayRectangle * rectangle, guint * stride, GstVideoOverlayFormatFlags flags, @@ -1036,7 +1020,7 @@ gst_video_overlay_rectangle_get_pixels_argb_internal (GstVideoOverlayRectangle * } else { /* if we don't have to scale, we have to modify the alpha values, so we * need to make a copy of the pixel memory (and we take ownership below) */ - buf = __gst_buffer_copy (rectangle->pixels); + buf = gst_buffer_copy (rectangle->pixels); } new_flags = rectangle->flags; |