basetextoverlay: Append our rectangle to the upstream composition, not the other way around

Upstream is supposed to be painted first, and only then our rectangle.

1 files changed, 8 insertions, 16 deletions

diff --git a/ext/pango/gstbasetextoverlay.c b/ext/pango/gstbasetextoverlay.c
index c37705fbf..ded822a33 100644
--- a/ext/pango/gstbasetextoverlay.c
+++ b/ext/pango/gstbasetextoverlay.c
@@ -1668,25 +1668,17 @@ gst_base_text_overlay_set_composition (GstBaseTextOverlay * overlay)
     if (overlay->composition)
       gst_video_overlay_composition_unref (overlay->composition);
 
-    overlay->composition = gst_video_overlay_composition_new (rectangle);
-    gst_video_overlay_rectangle_unref (rectangle);
-
     if (overlay->upstream_composition) {
-      guint num_overlays =
-          gst_video_overlay_composition_n_rectangles
-          (overlay->upstream_composition);
-      guint i;
-
-      for (i = 0; i < num_overlays; i++) {
-        GstVideoOverlayRectangle *rectangle;
-        rectangle =
-            gst_video_overlay_composition_get_rectangle
-            (overlay->upstream_composition, i);
-        gst_video_overlay_composition_add_rectangle (overlay->composition,
-            rectangle);
-      }
+      overlay->composition =
+          gst_video_overlay_composition_copy (overlay->upstream_composition);
+      gst_video_overlay_composition_add_rectangle (overlay->composition,
+          rectangle);
+    } else {
+      overlay->composition = gst_video_overlay_composition_new (rectangle);
     }
 
+    gst_video_overlay_rectangle_unref (rectangle);
+
   } else if (overlay->composition) {
     gst_video_overlay_composition_unref (overlay->composition);
     overlay->composition = NULL;