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

gdkpixbufoverlay: crashes if any property changes during playback when location property is not set

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=702988
This commit is contained in:
Kishore Arepalli 2013-06-24 17:29:37 +02:00 committed by Sebastian Dröge
parent db84b928a3
commit 1e917822a9
1 changed files with 26 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
ext/gdk_pixbuf/gstgdkpixbufoverlay.c
View file

@ -73,6 +73,9 @@ static void gst_gdk_pixbuf_overlay_before_transform (GstBaseTransform * trans,
static gboolean gst_gdk_pixbuf_overlay_set_info (GstVideoFilter * filter, static gboolean gst_gdk_pixbuf_overlay_set_info (GstVideoFilter * filter,
GstCaps * incaps, GstVideoInfo * in_info, GstCaps * outcaps, GstCaps * incaps, GstVideoInfo * in_info, GstCaps * outcaps,
GstVideoInfo * out_info); GstVideoInfo * out_info);
static gboolean
gst_gdk_pixbuf_overlay_load_image (GstGdkPixbufOverlay * overlay,
GError ** err);
enum enum
{ {
@ -134,8 +137,9 @@ gst_gdk_pixbuf_overlay_class_init (GstGdkPixbufOverlayClass * klass)
g_object_class_install_property (gobject_class, PROP_LOCATION, g_object_class_install_property (gobject_class, PROP_LOCATION,
g_param_spec_string ("location", "location", g_param_spec_string ("location", "location",
"Location of image file to overlay", NULL, "Location of image file to overlay", NULL, GST_PARAM_CONTROLLABLE
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); | GST_PARAM_MUTABLE_PLAYING | G_PARAM_READWRITE
| G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, PROP_OFFSET_X, g_object_class_install_property (gobject_class, PROP_OFFSET_X,
g_param_spec_int ("offset-x", "X Offset", g_param_spec_int ("offset-x", "X Offset",
"For positive value, horizontal offset of overlay image in pixels from" "For positive value, horizontal offset of overlay image in pixels from"
@ -216,9 +220,16 @@ gst_gdk_pixbuf_overlay_set_property (GObject * object, guint property_id,
GST_OBJECT_LOCK (overlay); GST_OBJECT_LOCK (overlay);
switch (property_id) { switch (property_id) {
case PROP_LOCATION: case PROP_LOCATION:{
GError *err = NULL;
g_free (overlay->location); g_free (overlay->location);
overlay->location = g_value_dup_string (value); overlay->location = g_value_dup_string (value);
if (!gst_gdk_pixbuf_overlay_load_image (overlay, &err)) {
GST_ERROR_OBJECT (overlay, "Could not load overlay image: %s",
err->message);
g_error_free (err);
}
}
break; break;
case PROP_OFFSET_X: case PROP_OFFSET_X:
overlay->offset_x = g_value_get_int (value); overlay->offset_x = g_value_get_int (value);
@ -438,27 +449,29 @@ gst_gdk_pixbuf_overlay_update_composition (GstGdkPixbufOverlay * overlay)
GstVideoOverlayRectangle *rect; GstVideoOverlayRectangle *rect;
GstVideoMeta *overlay_meta; GstVideoMeta *overlay_meta;
gint x, y, width, height; gint x, y, width, height;
gint video_width = GST_VIDEO_INFO_WIDTH (&GST_VIDEO_FILTER (overlay)->in_info); gint video_width =
gint video_height = GST_VIDEO_INFO_HEIGHT (&GST_VIDEO_FILTER (overlay)->in_info); GST_VIDEO_INFO_WIDTH (&GST_VIDEO_FILTER (overlay)->in_info);
gint video_height =
GST_VIDEO_INFO_HEIGHT (&GST_VIDEO_FILTER (overlay)->in_info);
if (overlay->comp) { if (overlay->comp) {
gst_video_overlay_composition_unref (overlay->comp); gst_video_overlay_composition_unref (overlay->comp);
overlay->comp = NULL; overlay->comp = NULL;
} }
if (overlay->alpha == 0.0) if (overlay->alpha == 0.0 || overlay->pixels == NULL)
return; return;
overlay_meta = gst_buffer_get_video_meta (overlay->pixels); overlay_meta = gst_buffer_get_video_meta (overlay->pixels);
x = overlay->offset_x < 0 ? x = overlay->offset_x < 0 ?
video_width + overlay->offset_x - overlay_meta->width + video_width + overlay->offset_x - overlay_meta->width +
(overlay->relative_x * overlay_meta->width) : (overlay->relative_x * overlay_meta->width) :
overlay->offset_x + (overlay->relative_x * overlay_meta->width); overlay->offset_x + (overlay->relative_x * overlay_meta->width);
y = overlay->offset_y < 0 ? y = overlay->offset_y < 0 ?
video_height + overlay->offset_y - overlay_meta->height + video_height + overlay->offset_y - overlay_meta->height +
(overlay->relative_y * overlay_meta->height) : (overlay->relative_y * overlay_meta->height) :
overlay->offset_y + (overlay->relative_y * overlay_meta->height); overlay->offset_y + (overlay->relative_y * overlay_meta->height);
width = overlay->overlay_width; width = overlay->overlay_width;
if (width == 0) if (width == 0)
@ -475,8 +488,7 @@ gst_gdk_pixbuf_overlay_update_composition (GstGdkPixbufOverlay * overlay)
overlay->relative_x * 100.0, overlay->relative_y * 100.0, overlay->relative_x * 100.0, overlay->relative_y * 100.0,
overlay->overlay_height, overlay->overlay_width); overlay->overlay_height, overlay->overlay_width);
GST_DEBUG_OBJECT (overlay, "overlay rendered: %d x %d @ %d,%d (onto %d x %d)", GST_DEBUG_OBJECT (overlay, "overlay rendered: %d x %d @ %d,%d (onto %d x %d)",
width, height, x, y, width, height, x, y, video_width, video_height);
video_width, video_height);
rect = gst_video_overlay_rectangle_new_raw (overlay->pixels, rect = gst_video_overlay_rectangle_new_raw (overlay->pixels,
x, y, width, height, GST_VIDEO_OVERLAY_FORMAT_FLAG_NONE); x, y, width, height, GST_VIDEO_OVERLAY_FORMAT_FLAG_NONE);