mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 20:21:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

textoverlay: Make the text_image data a buffer

Browse source 
This way we won't free data that would be attached to some buffer.
This commit is contained in:
Thibault Saunier 2011-11-18 13:22:52 -03:00 committed by Tim-Philipp Müller
parent a741c0cf11
commit 2a687b6dfb
2 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
ext/pango/gsttextoverlay.c
View file

@ -580,7 +580,7 @@ gst_text_overlay_finalize (GObject * object)
}
if (overlay->text_image) {
g_free (overlay->text_image);
gst_buffer_unref (overlay->text_image);
overlay->text_image = NULL;
}
@ -1235,15 +1235,10 @@ gst_text_overlay_set_composition (GstTextOverlay * overlay)
gst_text_overlay_get_pos (overlay, &xpos, &ypos);
if (overlay->text_image) {
GstBuffer *buffer = gst_buffer_new ();
GST_BUFFER_DATA (buffer) = overlay->text_image;
GST_BUFFER_SIZE (buffer) = gst_video_format_get_size (GST_VIDEO_FORMAT_ARGB,
overlay->image_width, overlay->image_height);
rectangle = gst_video_overlay_rectangle_new_argb (buffer,
rectangle = gst_video_overlay_rectangle_new_argb (overlay->text_image,
overlay->image_width, overlay->image_height, 4 * overlay->image_width,
1, 1, xpos, ypos, overlay->image_width, overlay->image_height);
xpos, ypos, overlay->image_width, overlay->image_height,
GST_VIDEO_OVERLAY_FORMAT_FLAG_NONE);
if (overlay->composition)
gst_video_overlay_composition_unref (overlay->composition);
@ -1267,7 +1262,8 @@ gst_text_overlay_render_pangocairo (GstTextOverlay * overlay,
int width, height;
double scalef = 1.0;
double a, r, g, b;
GstBuffer *buffer;
guint8 *text_image;
g_mutex_lock (GST_TEXT_OVERLAY_GET_CLASS (overlay)->pango_lock);
if (overlay->auto_adjust_size) {
@ -1333,10 +1329,13 @@ gst_text_overlay_render_pangocairo (GstTextOverlay * overlay,
cairo_matrix_init_scale (&cairo_matrix, scalef, scalef);
}
/* reallocate surface */
overlay->text_image = g_realloc (overlay->text_image, 4 * width * height);
/* reallocate overlay buffer */
buffer = gst_buffer_new_and_alloc (4 * width * height);
gst_buffer_replace (&overlay->text_image, buffer);
text_image = GST_BUFFER_DATA (buffer);
gst_buffer_unref (buffer);
surface = cairo_image_surface_create_for_data (overlay->text_image,
surface = cairo_image_surface_create_for_data (text_image,
CAIRO_FORMAT_ARGB32, width, height, width * 4);
cr = cairo_create (surface);

2
ext/pango/gsttextoverlay.h
View file

@ -143,7 +143,7 @@ struct _GstTextOverlay {
gdouble shadow_offset;
gboolean want_shadow;
gdouble outline_offset;
guchar *text_image;
GstBuffer *text_image;
gint image_width;
gint image_height;
gint baseline_y;