mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 06:58:56 +00:00
Code Issues 1 Projects Releases Wiki Activity

quarktv: Fix setting the planes property of quarktv

Browse source 
Setting it to a value<16 would cause crashes before because
current_plane was set to the old number of planes-1. Also
fix calculations for non-2^n planes values.
This commit is contained in:
Sebastian Dröge 2009-06-15 20:00:43 +02:00
parent c116c301af
commit 426ff3bd93
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gst/effectv/gstquark.c
View file

@ -171,7 +171,7 @@ gst_quarktv_transform (GstBaseTransform * trans, GstBuffer * in,
/* pick a random buffer */ /* pick a random buffer */
rand = rand =
filter->planetable[(filter->current_plane + filter->planetable[(filter->current_plane +
(fastrand () >> 24)) & (filter->planes - 1)]; (fastrand () >> 24)) % filter->planes];
/* Copy the pixel from the random buffer to dest */ /* Copy the pixel from the random buffer to dest */
dest[area] = (rand ? ((guint32 *) GST_BUFFER_DATA (rand))[area] : 0); dest[area] = (rand ? ((guint32 *) GST_BUFFER_DATA (rand))[area] : 0);
@ -250,6 +250,7 @@ gst_quarktv_set_property (GObject * object, guint prop_id, const GValue * value,
new_planetable = new_planetable =
(GstBuffer **) g_malloc0 (new_n_planes * sizeof (GstBuffer *)); (GstBuffer **) g_malloc0 (new_n_planes * sizeof (GstBuffer *));
if (filter->planetable) {
for (i = 0; (i < new_n_planes) && (i < filter->planes); i++) { for (i = 0; (i < new_n_planes) && (i < filter->planes); i++) {
new_planetable[i] = filter->planetable[i]; new_planetable[i] = filter->planetable[i];
} }
@ -258,9 +259,11 @@ gst_quarktv_set_property (GObject * object, guint prop_id, const GValue * value,
gst_buffer_unref (filter->planetable[i]); gst_buffer_unref (filter->planetable[i]);
} }
g_free (filter->planetable); g_free (filter->planetable);
}
filter->planetable = new_planetable; filter->planetable = new_planetable;
filter->current_plane = filter->planes - 1;
filter->planes = new_n_planes; filter->planes = new_n_planes;
filter->current_plane = filter->planes - 1;
} }
break; break;
} }