Rename to GST_VAAPI_OBJECT_DISPLAY().

diff --git a/gst-libs/gst/vaapi/gstvaapiimage.c b/gst-libs/gst/vaapi/gstvaapiimage.c
index c4f2b72..b637484 100644 (file)
--- a/gst-libs/gst/vaapi/gstvaapiimage.c
+++ b/gst-libs/gst/vaapi/gstvaapiimage.c
@@ -147,7 +147,7 @@ vaapi_image_is_linear(const VAImage *va_image)
 static void
 gst_vaapi_image_destroy(GstVaapiImage *image)
 {
-    GstVaapiDisplay * const display = GST_VAAPI_OBJECT_GET_DISPLAY(image);
+    GstVaapiDisplay * const display = GST_VAAPI_OBJECT_DISPLAY(image);
     VAImageID image_id;
     VAStatus status;
 
@@ -170,7 +170,7 @@ gst_vaapi_image_destroy(GstVaapiImage *image)
 static gboolean
 _gst_vaapi_image_create(GstVaapiImage *image, GstVaapiImageFormat format)
 {
-    GstVaapiDisplay * const display = GST_VAAPI_OBJECT_GET_DISPLAY(image);
+    GstVaapiDisplay * const display = GST_VAAPI_OBJECT_DISPLAY(image);
     GstVaapiImagePrivate * const priv = image->priv;
     const VAImageFormat *va_format;
     VAStatus status;
@@ -736,7 +736,7 @@ _gst_vaapi_image_map(GstVaapiImage *image)
     if (_gst_vaapi_image_is_mapped(image))
         return TRUE;
 
-    display = GST_VAAPI_OBJECT_GET_DISPLAY(image);
+    display = GST_VAAPI_OBJECT_DISPLAY(image);
     if (!display)
         return FALSE;
 
@@ -781,7 +781,7 @@ _gst_vaapi_image_unmap(GstVaapiImage *image)
     if (!_gst_vaapi_image_is_mapped(image))
         return FALSE;
 
-    display = GST_VAAPI_OBJECT_GET_DISPLAY(image);
+    display = GST_VAAPI_OBJECT_DISPLAY(image);
     if (!display)
         return FALSE;
 

diff --git a/gst-libs/gst/vaapi/gstvaapiobject_priv.h b/gst-libs/gst/vaapi/gstvaapiobject_priv.h
index aeea393..7bd87b1 100644 (file)
--- a/gst-libs/gst/vaapi/gstvaapiobject_priv.h
+++ b/gst-libs/gst/vaapi/gstvaapiobject_priv.h
@@ -33,13 +33,13 @@ G_BEGIN_DECLS
 #define GST_VAAPI_OBJECT_CAST(object) ((GstVaapiObject *)(object))
 
 /**
- * GST_VAAPI_OBJECT_GET_DISPLAY:
+ * GST_VAAPI_OBJECT_DISPLAY:
  * @object: a #GstVaapiObject
  *
  * Macro that evaluates to the #GstVaapiDisplay the @object is bound to.
  * This is an internal macro that does not do any run-time type check.
  */
-#define GST_VAAPI_OBJECT_GET_DISPLAY(object) \
+#define GST_VAAPI_OBJECT_DISPLAY(object) \
     GST_VAAPI_OBJECT_CAST(object)->priv->display
 
 /**

diff --git a/gst-libs/gst/vaapi/gstvaapisubpicture.c b/gst-libs/gst/vaapi/gstvaapisubpicture.c
index eb44ced..d3047c4 100644 (file)
--- a/gst-libs/gst/vaapi/gstvaapisubpicture.c
+++ b/gst-libs/gst/vaapi/gstvaapisubpicture.c
@@ -53,7 +53,7 @@ enum {
 static void
 gst_vaapi_subpicture_destroy(GstVaapiSubpicture *subpicture)
 {
-    GstVaapiDisplay * const display = GST_VAAPI_OBJECT_GET_DISPLAY(subpicture);
+    GstVaapiDisplay * const display = GST_VAAPI_OBJECT_DISPLAY(subpicture);
     GstVaapiSubpicturePrivate * const priv = subpicture->priv;
     VASubpictureID subpicture_id;
     VAStatus status;
@@ -86,7 +86,7 @@ gst_vaapi_subpicture_destroy(GstVaapiSubpicture *subpicture)
 static gboolean
 gst_vaapi_subpicture_create(GstVaapiSubpicture *subpicture)
 {
-    GstVaapiDisplay * const display = GST_VAAPI_OBJECT_GET_DISPLAY(subpicture);
+    GstVaapiDisplay * const display = GST_VAAPI_OBJECT_DISPLAY(subpicture);
     GstVaapiSubpicturePrivate * const priv = subpicture->priv;
     VASubpictureID subpicture_id;
     VAStatus status;
@@ -211,7 +211,7 @@ gst_vaapi_subpicture_new(GstVaapiImage *image)
               GST_VAAPI_ID_ARGS(GST_VAAPI_OBJECT_ID(image)));
 
     return g_object_new(GST_VAAPI_TYPE_SUBPICTURE,
-                        "display", GST_VAAPI_OBJECT_GET_DISPLAY(image),
+                        "display", GST_VAAPI_OBJECT_DISPLAY(image),
                         "id",      GST_VAAPI_ID(VA_INVALID_ID),
                         "image",   image,
                         NULL);

diff --git a/gst-libs/gst/vaapi/gstvaapisurface.c b/gst-libs/gst/vaapi/gstvaapisurface.c
index 03ded41..58026d3 100644 (file)
--- a/gst-libs/gst/vaapi/gstvaapisurface.c
+++ b/gst-libs/gst/vaapi/gstvaapisurface.c
@@ -79,7 +79,7 @@ destroy_subpicture_cb(gpointer subpicture, gpointer surface)
 static void
 gst_vaapi_surface_destroy(GstVaapiSurface *surface)
 {
-    GstVaapiDisplay * const display = GST_VAAPI_OBJECT_GET_DISPLAY(surface);
+    GstVaapiDisplay * const display = GST_VAAPI_OBJECT_DISPLAY(surface);
     GstVaapiSurfacePrivate * const priv = surface->priv;
     VASurfaceID surface_id;
     VAStatus status;
@@ -110,7 +110,7 @@ gst_vaapi_surface_destroy(GstVaapiSurface *surface)
 static gboolean
 gst_vaapi_surface_create(GstVaapiSurface *surface)
 {
-    GstVaapiDisplay * const display = GST_VAAPI_OBJECT_GET_DISPLAY(surface);
+    GstVaapiDisplay * const display = GST_VAAPI_OBJECT_DISPLAY(surface);
     GstVaapiSurfacePrivate * const priv = surface->priv;
     VASurfaceID surface_id;
     VAStatus status;
@@ -410,7 +410,7 @@ gst_vaapi_surface_derive_image(GstVaapiSurface *surface)
 
     g_return_val_if_fail(GST_VAAPI_IS_SURFACE(surface), NULL);
 
-    display           = GST_VAAPI_OBJECT_GET_DISPLAY(surface);
+    display           = GST_VAAPI_OBJECT_DISPLAY(surface);
     va_image.image_id = VA_INVALID_ID;
     va_image.buf      = VA_INVALID_ID;
 
@@ -450,7 +450,7 @@ gst_vaapi_surface_get_image(GstVaapiSurface *surface, GstVaapiImage *image)
     g_return_val_if_fail(GST_VAAPI_IS_SURFACE(surface), FALSE);
     g_return_val_if_fail(GST_VAAPI_IS_IMAGE(image), FALSE);
 
-    display = GST_VAAPI_OBJECT_GET_DISPLAY(surface);
+    display = GST_VAAPI_OBJECT_DISPLAY(surface);
     if (!display)
         return FALSE;
 
@@ -497,7 +497,7 @@ gst_vaapi_surface_put_image(GstVaapiSurface *surface, GstVaapiImage *image)
     g_return_val_if_fail(GST_VAAPI_IS_SURFACE(surface), FALSE);
     g_return_val_if_fail(GST_VAAPI_IS_IMAGE(image), FALSE);
 
-    display = GST_VAAPI_OBJECT_GET_DISPLAY(surface);
+    display = GST_VAAPI_OBJECT_DISPLAY(surface);
     if (!display)
         return FALSE;
 
@@ -591,7 +591,7 @@ _gst_vaapi_surface_associate_subpicture(
     VASurfaceID surface_id;
     VAStatus status;
 
-    display = GST_VAAPI_OBJECT_GET_DISPLAY(surface);
+    display = GST_VAAPI_OBJECT_DISPLAY(surface);
     if (!display)
         return FALSE;
 
@@ -684,7 +684,7 @@ _gst_vaapi_surface_deassociate_subpicture(
     VASurfaceID surface_id;
     VAStatus status;
 
-    display = GST_VAAPI_OBJECT_GET_DISPLAY(surface);
+    display = GST_VAAPI_OBJECT_DISPLAY(surface);
     if (!display)
         return FALSE;
 
@@ -722,7 +722,7 @@ gst_vaapi_surface_sync(GstVaapiSurface *surface)
 
     g_return_val_if_fail(GST_VAAPI_IS_SURFACE(surface), FALSE);
 
-    display = GST_VAAPI_OBJECT_GET_DISPLAY(surface);
+    display = GST_VAAPI_OBJECT_DISPLAY(surface);
     if (!display)
         return FALSE;
 

diff --git a/gst-libs/gst/vaapi/gstvaapiwindow.c b/gst-libs/gst/vaapi/gstvaapiwindow.c
index 101a7e0..495d86f 100644 (file)
--- a/gst-libs/gst/vaapi/gstvaapiwindow.c
+++ b/gst-libs/gst/vaapi/gstvaapiwindow.c
@@ -67,7 +67,7 @@ gst_vaapi_window_ensure_size(GstVaapiWindow *window)
         klass->get_geometry(window, NULL, NULL, &priv->width, &priv->height);
 
     gst_vaapi_display_get_size(
-        GST_VAAPI_OBJECT_GET_DISPLAY(window),
+        GST_VAAPI_OBJECT_DISPLAY(window),
         &display_width,
         &display_height
     );
@@ -241,7 +241,7 @@ gst_vaapi_window_get_display(GstVaapiWindow *window)
 {
     g_return_val_if_fail(GST_VAAPI_IS_WINDOW(window), NULL);
 
-    return GST_VAAPI_OBJECT_GET_DISPLAY(window);
+    return GST_VAAPI_OBJECT_DISPLAY(window);
 }
 
 /**

diff --git a/gst-libs/gst/vaapi/gstvaapiwindow_x11.c b/gst-libs/gst/vaapi/gstvaapiwindow_x11.c
index 2d3ac8a..4b8ea27 100644 (file)
--- a/gst-libs/gst/vaapi/gstvaapiwindow_x11.c
+++ b/gst-libs/gst/vaapi/gstvaapiwindow_x11.c
@@ -405,7 +405,7 @@ gst_vaapi_window_x11_render(
     VASurfaceID surface_id;
     VAStatus status;
 
-    display = GST_VAAPI_OBJECT_GET_DISPLAY(surface);
+    display = GST_VAAPI_OBJECT_DISPLAY(surface);
     if (!display)
         return FALSE;