video: make composition_blend() return a boolean

Not that anyone will ever check that, and it's not clear what
they're supposed to do if it fails, but at least it's there.

diff --git a/gst-libs/gst/video/video-overlay-composition.c b/gst-libs/gst/video/video-overlay-composition.c
index a3e360c0ceca29474179e940c789fcb6db550caa..3bfbad1bbe23700f82bddcaa300803f4cd57d08d 100644 (file)
--- a/gst-libs/gst/video/video-overlay-composition.c
+++ b/gst-libs/gst/video/video-overlay-composition.c
@@ -478,25 +478,26 @@ gst_video_overlay_rectangle_needs_scaling (GstVideoOverlayRectangle * r)
  *
  * Since: 0.10.36
  */
-void
+gboolean
 gst_video_overlay_composition_blend (GstVideoOverlayComposition * comp,
     GstBuffer * video_buf)
 {
   GstBlendVideoFormatInfo video_info, rectangle_info;
   GstVideoFormat fmt;
+  gboolean ret = TRUE;
   guint n, num;
   int w, h;
 
-  g_return_if_fail (GST_IS_VIDEO_OVERLAY_COMPOSITION (comp));
-  g_return_if_fail (GST_IS_BUFFER (video_buf));
-  g_return_if_fail (gst_buffer_is_writable (video_buf));
-  g_return_if_fail (GST_BUFFER_CAPS (video_buf) != NULL);
+  g_return_val_if_fail (GST_IS_VIDEO_OVERLAY_COMPOSITION (comp), FALSE);
+  g_return_val_if_fail (GST_IS_BUFFER (video_buf), FALSE);
+  g_return_val_if_fail (gst_buffer_is_writable (video_buf), FALSE);
+  g_return_val_if_fail (GST_BUFFER_CAPS (video_buf) != NULL, FALSE);
 
   if (!gst_video_format_parse_caps (GST_BUFFER_CAPS (video_buf), &fmt, &w, &h)) {
     gchar *str = gst_caps_to_string (GST_BUFFER_CAPS (video_buf));
     g_warning ("%s: could not parse video buffer caps '%s'", GST_FUNCTION, str);
     g_free (str);
-    return;
+    return FALSE;
   }
 
   video_blend_format_info_init (&video_info, GST_BUFFER_DATA (video_buf),
@@ -525,7 +526,8 @@ gst_video_overlay_composition_blend (GstVideoOverlayComposition * comp,
           rect->render_width);
     }
 
-    if (!video_blend (&video_info, &rectangle_info, rect->x, rect->y)) {
+    ret = video_blend (&video_info, &rectangle_info, rect->x, rect->y);
+    if (!ret) {
       GST_WARNING ("Could not blend overlay rectangle onto video buffer");
     }
 
@@ -533,6 +535,8 @@ gst_video_overlay_composition_blend (GstVideoOverlayComposition * comp,
     if (needs_scaling)
       g_free (rectangle_info.pixels);
   }
+
+  return ret;
 }
 
 /**

diff --git a/gst-libs/gst/video/video-overlay-composition.h b/gst-libs/gst/video/video-overlay-composition.h
index 1a1a2343419871e8917e08ea7c8b6b31f850cf4f..5ff7ce36c6c87a520a38dd2a567444fc2670ce8c 100644 (file)
--- a/gst-libs/gst/video/video-overlay-composition.h
+++ b/gst-libs/gst/video/video-overlay-composition.h
@@ -220,7 +220,7 @@ guint                        gst_video_overlay_composition_get_seqnum    (GstVid
 
 /* blend composition onto raw video buffer */
 
-void                         gst_video_overlay_composition_blend         (GstVideoOverlayComposition * comp,
+gboolean                     gst_video_overlay_composition_blend         (GstVideoOverlayComposition * comp,
                                                                           GstBuffer                  * video_buf);
 
 /* attach/retrieve composition from buffers */