Rename gst_vaapi_window_put_surface_full() to plain gst_vaapi_window_put_surface().

diff --git a/docs/reference/libs/libs-sections.txt b/docs/reference/libs/libs-sections.txt
index c919a70..ff1aef0 100644 (file)
--- a/docs/reference/libs/libs-sections.txt
+++ b/docs/reference/libs/libs-sections.txt
@@ -164,7 +164,6 @@ gst_vaapi_window_set_width
 gst_vaapi_window_set_height
 gst_vaapi_window_set_size
 gst_vaapi_window_put_surface
-gst_vaapi_window_put_surface_full
 <SUBSECTION Standard>
 GST_VAAPI_WINDOW
 GST_VAAPI_IS_WINDOW

diff --git a/gst-libs/gst/vaapi/gstvaapiwindow.c b/gst-libs/gst/vaapi/gstvaapiwindow.c
index 6eab910..0a1fa07 100644 (file)
--- a/gst-libs/gst/vaapi/gstvaapiwindow.c
+++ b/gst-libs/gst/vaapi/gstvaapiwindow.c
@@ -352,40 +352,6 @@ get_window_rect(GstVaapiWindow *window, GstVideoRectangle *rect)
  * gst_vaapi_window_put_surface:
  * @window: a #GstVaapiWindow
  * @surface: a #GstVaapiSurface
- * @flags: postprocessing flags
- *
- * Renders the whole @surface into the @window. The surface will be
- * scale to fit the window, while not preserving aspect ratio.
- *
- * Return value: %TRUE on success
- */
-gboolean
-gst_vaapi_window_put_surface(
-    GstVaapiWindow          *window,
-    GstVaapiSurface         *surface,
-    guint                    flags
-)
-{
-    GstVideoRectangle src_rect, dst_rect;
-
-    g_return_val_if_fail(GST_VAAPI_IS_WINDOW(window), FALSE);
-    g_return_val_if_fail(window->priv->is_constructed, FALSE);
-    g_return_val_if_fail(GST_VAAPI_IS_SURFACE(surface), FALSE);
-
-    get_surface_rect(surface, &src_rect);
-    get_window_rect(window, &dst_rect);
-
-    return GST_VAAPI_WINDOW_GET_CLASS(window)->render(window,
-                                                      surface,
-                                                      &src_rect,
-                                                      &dst_rect,
-                                                      flags);
-}
-
-/**
- * gst_vaapi_window_put_surface_full:
- * @window: a #GstVaapiWindow
- * @surface: a #GstVaapiSurface
  * @src_rect: (allow-none): the sub-rectangle of the source surface to
  *   extract and process. If %NULL, the entire surface will be used.
  * @dst_rect: (allow-none): the sub-rectangle of the destination
@@ -401,7 +367,7 @@ gst_vaapi_window_put_surface(
  * Return value: %TRUE on success
  */
 gboolean
-gst_vaapi_window_put_surface_full(
+gst_vaapi_window_put_surface(
     GstVaapiWindow          *window,
     GstVaapiSurface         *surface,
     const GstVideoRectangle *src_rect,

diff --git a/gst-libs/gst/vaapi/gstvaapiwindow.h b/gst-libs/gst/vaapi/gstvaapiwindow.h
index 8ad651b..6138170 100644 (file)
--- a/gst-libs/gst/vaapi/gstvaapiwindow.h
+++ b/gst-libs/gst/vaapi/gstvaapiwindow.h
@@ -138,13 +138,6 @@ gboolean
 gst_vaapi_window_put_surface(
     GstVaapiWindow          *window,
     GstVaapiSurface         *surface,
-    guint                    flags
-);
-
-gboolean
-gst_vaapi_window_put_surface_full(
-    GstVaapiWindow          *window,
-    GstVaapiSurface         *surface,
     const GstVideoRectangle *src_rect,
     const GstVideoRectangle *dst_rect,
     guint                    flags

diff --git a/sys/vaapisink/gstvaapisink.c b/sys/vaapisink/gstvaapisink.c
index 4c00ad4..7059612 100644 (file)
--- a/sys/vaapisink/gstvaapisink.c
+++ b/sys/vaapisink/gstvaapisink.c
@@ -176,7 +176,7 @@ gst_vaapisink_show_frame(GstBaseSink *base_sink, GstBuffer *buffer)
         return GST_FLOW_UNEXPECTED;
 
     flags = GST_VAAPI_PICTURE_STRUCTURE_FRAME;
-    if (!gst_vaapi_window_put_surface(sink->window, surface, flags))
+    if (!gst_vaapi_window_put_surface(sink->window, surface, NULL, NULL, flags))
         return GST_FLOW_UNEXPECTED;
 
     return GST_FLOW_OK;

diff --git a/tests/test-windows.c b/tests/test-windows.c
index 1e3ca49..6813c94 100644 (file)
--- a/tests/test-windows.c
+++ b/tests/test-windows.c
@@ -231,7 +231,7 @@ main(int argc, char *argv[])
 
         gst_vaapi_window_show(window);
 
-        if (!gst_vaapi_window_put_surface(window, surface, flags))
+        if (!gst_vaapi_window_put_surface(window, surface, NULL, NULL, flags))
             g_error("could not render surface");
 
         pause();
@@ -268,7 +268,7 @@ main(int argc, char *argv[])
 
         gst_vaapi_window_show(window);
 
-        if (!gst_vaapi_window_put_surface(window, surface, flags))
+        if (!gst_vaapi_window_put_surface(window, surface, NULL, NULL, flags))
             g_error("could not render surface");
 
         pause();