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

video-overlay-composition: Handle miniobject writability correctly

Browse source 
By tracking parents and using the proper GstMiniObject API for detecting
writability instead of just the reference count.

https://bugzilla.gnome.org/show_bug.cgi?id=797230
This commit is contained in:
Sebastian Dröge 2018-10-01 12:17:42 +03:00
parent 4e125c20ac
commit bb0d58a905
1 changed files with 25 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
gst-libs/gst/video/video-overlay-composition.c
View file

@ -312,6 +312,8 @@ gst_video_overlay_composition_free (GstMiniObject * mini_obj)
num = comp->num_rectangles; num = comp->num_rectangles;
while (num > 0) { while (num > 0) {
gst_mini_object_remove_parent (GST_MINI_OBJECT_CAST (comp->rectangles[num -
1]), GST_MINI_OBJECT_CAST (comp));
gst_video_overlay_rectangle_unref (comp->rectangles[num - 1]); gst_video_overlay_rectangle_unref (comp->rectangles[num - 1]);
--num; --num;
} }
@ -354,6 +356,8 @@ gst_video_overlay_composition_new (GstVideoOverlayRectangle * rectangle)
comp->rectangles = g_new0 (GstVideoOverlayRectangle *, RECTANGLE_ARRAY_STEP); comp->rectangles = g_new0 (GstVideoOverlayRectangle *, RECTANGLE_ARRAY_STEP);
comp->rectangles[0] = gst_video_overlay_rectangle_ref (rectangle); comp->rectangles[0] = gst_video_overlay_rectangle_ref (rectangle);
gst_mini_object_add_parent (GST_MINI_OBJECT_CAST (rectangle),
GST_MINI_OBJECT_CAST (comp));
comp->num_rectangles = 1; comp->num_rectangles = 1;
comp->seq_num = gst_video_overlay_get_seqnum (); comp->seq_num = gst_video_overlay_get_seqnum ();
@ -382,7 +386,7 @@ gst_video_overlay_composition_add_rectangle (GstVideoOverlayComposition * comp,
{ {
g_return_if_fail (GST_IS_VIDEO_OVERLAY_COMPOSITION (comp)); g_return_if_fail (GST_IS_VIDEO_OVERLAY_COMPOSITION (comp));
g_return_if_fail (GST_IS_VIDEO_OVERLAY_RECTANGLE (rectangle)); g_return_if_fail (GST_IS_VIDEO_OVERLAY_RECTANGLE (rectangle));
g_return_if_fail (GST_MINI_OBJECT_REFCOUNT_VALUE (comp) == 1); g_return_if_fail (gst_mini_object_is_writable (GST_MINI_OBJECT_CAST (comp)));
if (comp->num_rectangles % RECTANGLE_ARRAY_STEP == 0) { if (comp->num_rectangles % RECTANGLE_ARRAY_STEP == 0) {
comp->rectangles = comp->rectangles =
@ -392,6 +396,8 @@ gst_video_overlay_composition_add_rectangle (GstVideoOverlayComposition * comp,
comp->rectangles[comp->num_rectangles] = comp->rectangles[comp->num_rectangles] =
gst_video_overlay_rectangle_ref (rectangle); gst_video_overlay_rectangle_ref (rectangle);
gst_mini_object_add_parent (GST_MINI_OBJECT_CAST (rectangle),
GST_MINI_OBJECT_CAST (comp));
comp->num_rectangles += 1; comp->num_rectangles += 1;
comp->min_seq_num_used = MIN (comp->min_seq_num_used, rectangle->seq_num); comp->min_seq_num_used = MIN (comp->min_seq_num_used, rectangle->seq_num);
@ -581,11 +587,12 @@ gst_video_overlay_composition_make_writable (GstVideoOverlayComposition * comp)
g_return_val_if_fail (GST_IS_VIDEO_OVERLAY_COMPOSITION (comp), NULL); g_return_val_if_fail (GST_IS_VIDEO_OVERLAY_COMPOSITION (comp), NULL);
if (GST_MINI_OBJECT_REFCOUNT_VALUE (comp) == 1) { if (gst_mini_object_is_writable (GST_MINI_OBJECT_CAST (comp))) {
guint n; guint n;
for (n = 0; n < comp->num_rectangles; ++n) { for (n = 0; n < comp->num_rectangles; ++n) {
if (GST_MINI_OBJECT_REFCOUNT_VALUE (comp->rectangles[n]) != 1) if (!gst_mini_object_is_writable (GST_MINI_OBJECT_CAST (comp->rectangles
[n])))
goto copy; goto copy;
} }
return comp; return comp;
@ -628,6 +635,8 @@ gst_video_overlay_rectangle_free (GstMiniObject * mini_obj)
{ {
GstVideoOverlayRectangle *rect = (GstVideoOverlayRectangle *) mini_obj; GstVideoOverlayRectangle *rect = (GstVideoOverlayRectangle *) mini_obj;
gst_mini_object_remove_parent (GST_MINI_OBJECT_CAST (rect->pixels),
GST_MINI_OBJECT_CAST (rect));
gst_buffer_replace (&rect->pixels, NULL); gst_buffer_replace (&rect->pixels, NULL);
while (rect->scaled_rectangles != NULL) { while (rect->scaled_rectangles != NULL) {
@ -729,6 +738,8 @@ gst_video_overlay_rectangle_new_raw (GstBuffer * pixels,
g_mutex_init (&rect->lock); g_mutex_init (&rect->lock);
rect->pixels = gst_buffer_ref (pixels); rect->pixels = gst_buffer_ref (pixels);
gst_mini_object_add_parent (GST_MINI_OBJECT_CAST (pixels),
GST_MINI_OBJECT_CAST (rect));
rect->scaled_rectangles = NULL; rect->scaled_rectangles = NULL;
gst_video_info_init (&rect->info); gst_video_info_init (&rect->info);
@ -816,7 +827,8 @@ gst_video_overlay_rectangle_set_render_rectangle (GstVideoOverlayRectangle *
guint render_height) guint render_height)
{ {
g_return_if_fail (GST_IS_VIDEO_OVERLAY_RECTANGLE (rectangle)); g_return_if_fail (GST_IS_VIDEO_OVERLAY_RECTANGLE (rectangle));
g_return_if_fail (GST_MINI_OBJECT_REFCOUNT_VALUE (rectangle) == 1); g_return_if_fail (gst_mini_object_is_writable (GST_MINI_OBJECT_CAST
(rectangle)));
rectangle->x = render_x; rectangle->x = render_x;
rectangle->y = render_y; rectangle->y = render_y;
@ -1000,7 +1012,13 @@ gst_video_overlay_rectangle_apply_global_alpha (GstVideoOverlayRectangle * rect,
gst_video_overlay_rectangle_extract_alpha (rect); gst_video_overlay_rectangle_extract_alpha (rect);
src = rect->initial_alpha; src = rect->initial_alpha;
rect->pixels = gst_buffer_make_writable (rect->pixels); if (!gst_buffer_is_writable (rect->pixels)) {
gst_mini_object_remove_parent (GST_MINI_OBJECT_CAST (rect->pixels),
GST_MINI_OBJECT_CAST (rect));
rect->pixels = gst_buffer_copy (rect->pixels);
gst_mini_object_add_parent (GST_MINI_OBJECT_CAST (rect->pixels),
GST_MINI_OBJECT_CAST (rect));
}
gst_video_frame_map (&frame, &rect->info, rect->pixels, GST_MAP_READ); gst_video_frame_map (&frame, &rect->info, rect->pixels, GST_MAP_READ);
dst = GST_VIDEO_FRAME_PLANE_DATA (&frame, 0); dst = GST_VIDEO_FRAME_PLANE_DATA (&frame, 0);
@ -1528,6 +1546,8 @@ gst_video_overlay_rectangle_set_global_alpha (GstVideoOverlayRectangle *
rectangle, gfloat global_alpha) rectangle, gfloat global_alpha)
{ {
g_return_if_fail (GST_IS_VIDEO_OVERLAY_RECTANGLE (rectangle)); g_return_if_fail (GST_IS_VIDEO_OVERLAY_RECTANGLE (rectangle));
g_return_if_fail (gst_mini_object_is_writable (GST_MINI_OBJECT_CAST
(rectangle)));
g_return_if_fail (global_alpha >= 0 && global_alpha <= 1); g_return_if_fail (global_alpha >= 0 && global_alpha <= 1);
if (rectangle->global_alpha != global_alpha) { if (rectangle->global_alpha != global_alpha) {