vaapisink: allow scaling to ignore aspect ratio.
[platform/upstream/gstreamer-vaapi.git] / gst / vaapi / gstvaapisink.c
index b2477c3..092169a 100644 (file)
@@ -1,8 +1,8 @@
 /*
  *  gstvaapisink.c - VA-API video sink
  *
- *  gstreamer-vaapi (C) 2010-2011 Splitted-Desktop Systems
- *  Copyright (C) 2011 Intel Corporation
+ *  Copyright (C) 2010-2011 Splitted-Desktop Systems
+ *  Copyright (C) 2011-2013 Intel Corporation
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public License
  * create its own internal window and render into it.
  */
 
-#include "config.h"
+#include "gst/vaapi/sysdeps.h"
 #include <gst/gst.h>
-#include <gst/gstutils_version.h>
 #include <gst/video/video.h>
 #include <gst/video/videocontext.h>
-#include <gst/vaapi/gstvaapivideobuffer.h>
-#include <gst/vaapi/gstvaapivideosink.h>
-#include <gst/vaapi/gstvaapidisplay_x11.h>
-#include <gst/vaapi/gstvaapiwindow_x11.h>
-#if USE_VAAPISINK_GLX
-#include <gst/vaapi/gstvaapidisplay_glx.h>
-#include <gst/vaapi/gstvaapiwindow_glx.h>
+#include <gst/vaapi/gstvaapivalue.h>
+#if USE_DRM
+# include <gst/vaapi/gstvaapidisplay_drm.h>
+#endif
+#if USE_X11
+# include <gst/vaapi/gstvaapidisplay_x11.h>
+# include <gst/vaapi/gstvaapiwindow_x11.h>
+#endif
+#if USE_GLX
+# include <gst/vaapi/gstvaapidisplay_glx.h>
+# include <gst/vaapi/gstvaapiwindow_glx.h>
+#endif
+#if USE_WAYLAND
+# include <gst/vaapi/gstvaapidisplay_wayland.h>
+# include <gst/vaapi/gstvaapiwindow_wayland.h>
 #endif
 
 /* Supported interfaces */
-#include <gst/interfaces/xoverlay.h>
+#if GST_CHECK_VERSION(1,0,0)
+# include <gst/video/videooverlay.h>
+#else
+# include <gst/interfaces/xoverlay.h>
+
+# define GST_TYPE_VIDEO_OVERLAY         GST_TYPE_X_OVERLAY
+# define GST_VIDEO_OVERLAY              GST_X_OVERLAY
+# define GstVideoOverlay                GstXOverlay
+# define GstVideoOverlayInterface       GstXOverlayClass
+
+# define gst_video_overlay_prepare_window_handle(sink) \
+    gst_x_overlay_prepare_xwindow_id(sink)
+# define gst_video_overlay_got_window_handle(sink, window_handle) \
+    gst_x_overlay_got_window_handle(sink, window_handle)
+#endif
 
 #include "gstvaapisink.h"
 #include "gstvaapipluginutil.h"
-
-#define HAVE_GST_XOVERLAY_SET_WINDOW_HANDLE \
-    GST_PLUGINS_BASE_CHECK_VERSION(0,10,31)
+#include "gstvaapivideometa.h"
+#if GST_CHECK_VERSION(1,0,0)
+#include "gstvaapivideobufferpool.h"
+#include "gstvaapivideomemory.h"
+#endif
 
 #define GST_PLUGIN_NAME "vaapisink"
 #define GST_PLUGIN_DESC "A VA-API based videosink"
 GST_DEBUG_CATEGORY_STATIC(gst_debug_vaapisink);
 #define GST_CAT_DEFAULT gst_debug_vaapisink
 
-/* ElementFactory information */
-static const GstElementDetails gst_vaapisink_details =
-    GST_ELEMENT_DETAILS(
-        "VA-API sink",
-        "Sink/Video",
-        GST_PLUGIN_DESC,
-        "Gwenole Beauchesne <gwenole.beauchesne@intel.com>");
-
 /* Default template */
+static const char gst_vaapisink_sink_caps_str[] =
+#if GST_CHECK_VERSION(1,0,0)
+    GST_VIDEO_CAPS_MAKE(GST_VIDEO_FORMATS_ALL) "; "
+#else
+    "video/x-raw-yuv, "
+    "width  = (int) [ 1, MAX ], "
+    "height = (int) [ 1, MAX ]; "
+#endif
+    GST_VAAPI_SURFACE_CAPS;
+
 static GstStaticPadTemplate gst_vaapisink_sink_factory =
     GST_STATIC_PAD_TEMPLATE(
         "sink",
         GST_PAD_SINK,
         GST_PAD_ALWAYS,
-        GST_STATIC_CAPS(GST_VAAPI_SURFACE_CAPS));
-
-static void gst_vaapisink_iface_init(GType type);
-
-GST_BOILERPLATE_FULL(
-    GstVaapiSink,
-    gst_vaapisink,
-    GstVideoSink,
-    GST_TYPE_VIDEO_SINK,
-    gst_vaapisink_iface_init);
-
-enum {
-    PROP_0,
-
-    PROP_USE_GLX,
-    PROP_FULLSCREEN,
-    PROP_SYNCHRONOUS,
-    PROP_USE_REFLECTION
-};
+        GST_STATIC_CAPS(gst_vaapisink_sink_caps_str));
 
 /* GstImplementsInterface interface */
-
+#if !GST_CHECK_VERSION(1,0,0)
 static gboolean
 gst_vaapisink_implements_interface_supported(
     GstImplementsInterface *iface,
@@ -101,7 +108,7 @@ gst_vaapisink_implements_interface_supported(
 )
 {
     return (type == GST_TYPE_VIDEO_CONTEXT ||
-            type == GST_TYPE_X_OVERLAY);
+            type == GST_TYPE_VIDEO_OVERLAY);
 }
 
 static void
@@ -109,9 +116,9 @@ gst_vaapisink_implements_iface_init(GstImplementsInterfaceClass *iface)
 {
     iface->supported = gst_vaapisink_implements_interface_supported;
 }
+#endif
 
-/* GstVaapiVideoSink interface */
-
+/* GstVideoContext interface */
 static void
 gst_vaapisink_set_video_context(GstVideoContext *context, const gchar *type,
     const GValue *value)
@@ -126,48 +133,112 @@ gst_vaapisink_video_context_iface_init(GstVideoContextInterface *iface)
     iface->set_context = gst_vaapisink_set_video_context;
 }
 
-/* GstXOverlay interface */
+static void
+gst_vaapisink_video_overlay_iface_init(GstVideoOverlayInterface *iface);
+
+G_DEFINE_TYPE_WITH_CODE(
+    GstVaapiSink,
+    gst_vaapisink,
+    GST_TYPE_VIDEO_SINK,
+#if !GST_CHECK_VERSION(1,0,0)
+    G_IMPLEMENT_INTERFACE(GST_TYPE_IMPLEMENTS_INTERFACE,
+                          gst_vaapisink_implements_iface_init);
+#endif
+    G_IMPLEMENT_INTERFACE(GST_TYPE_VIDEO_CONTEXT,
+                          gst_vaapisink_video_context_iface_init);
+    G_IMPLEMENT_INTERFACE(GST_TYPE_VIDEO_OVERLAY,
+                          gst_vaapisink_video_overlay_iface_init))
+
+enum {
+    PROP_0,
+
+    PROP_DISPLAY_TYPE,
+    PROP_FULLSCREEN,
+    PROP_SYNCHRONOUS,
+    PROP_USE_GLX,
+    PROP_USE_REFLECTION,
+    PROP_ROTATION,
+    PROP_FORCE_ASPECT_RATIO,
+};
+
+#define DEFAULT_DISPLAY_TYPE            GST_VAAPI_DISPLAY_TYPE_ANY
+#define DEFAULT_ROTATION                GST_VAAPI_ROTATION_0
+
+/* GstVideoOverlay interface */
 
+#if USE_X11
 static gboolean
 gst_vaapisink_ensure_window_xid(GstVaapiSink *sink, guintptr window_id);
+#endif
 
 static GstFlowReturn
 gst_vaapisink_show_frame(GstBaseSink *base_sink, GstBuffer *buffer);
 
-static inline void
-_gst_vaapisink_xoverlay_set_xid(GstXOverlay *overlay, guintptr window_id)
+static void
+gst_vaapisink_video_overlay_set_window_handle(GstVideoOverlay *overlay, guintptr window)
 {
     GstVaapiSink * const sink = GST_VAAPISINK(overlay);
 
     /* Disable GLX rendering when vaapisink is using a foreign X
        window. It's pretty much useless */
-    sink->use_glx = FALSE;
+    if (sink->display_type == GST_VAAPI_DISPLAY_TYPE_GLX)
+        sink->display_type = GST_VAAPI_DISPLAY_TYPE_X11;
 
     sink->foreign_window = TRUE;
-    gst_vaapisink_ensure_window_xid(sink, window_id);
-}
 
-#if HAVE_GST_XOVERLAY_SET_WINDOW_HANDLE
-static void
-gst_vaapisink_xoverlay_set_window_handle(GstXOverlay *overlay, guintptr window_id)
-{
-    _gst_vaapisink_xoverlay_set_xid(overlay, window_id);
+    switch (sink->display_type) {
+#if USE_X11
+    case GST_VAAPI_DISPLAY_TYPE_X11:
+        gst_vaapisink_ensure_window_xid(sink, window);
+        break;
+#endif
+    default:
+        break;
+    }
 }
-#else
+
 static void
-gst_vaapisink_xoverlay_set_xid(GstXOverlay *overlay, XID xid)
+gst_vaapisink_video_overlay_set_render_rectangle(
+    GstVideoOverlay *overlay,
+    gint         x,
+    gint         y,
+    gint         width,
+    gint         height
+)
 {
-    _gst_vaapisink_xoverlay_set_xid(overlay, xid);
+    GstVaapiSink * const sink = GST_VAAPISINK(overlay);
+    GstVaapiRectangle * const display_rect = &sink->display_rect;
+
+    display_rect->x      = x;
+    display_rect->y      = y;
+    display_rect->width  = width;
+    display_rect->height = height;
+    
+    GST_DEBUG("render rect (%d,%d):%ux%u",
+              display_rect->x, display_rect->y,
+              display_rect->width, display_rect->height);
 }
-#endif
 
 static void
-gst_vaapisink_xoverlay_expose(GstXOverlay *overlay)
+gst_vaapisink_video_overlay_expose(GstVideoOverlay *overlay)
 {
+    GstVaapiSink * const sink = GST_VAAPISINK(overlay);
     GstBaseSink * const base_sink = GST_BASE_SINK(overlay);
     GstBuffer *buffer;
 
-    buffer = gst_base_sink_get_last_buffer(base_sink);
+    if (sink->use_overlay)
+        buffer = sink->video_buffer ? gst_buffer_ref(sink->video_buffer) : NULL;
+    else {
+#if GST_CHECK_VERSION(1,0,0)
+        GstSample * const sample = gst_base_sink_get_last_sample(base_sink);
+        if (!sample)
+            return;
+        buffer = gst_buffer_ref(gst_sample_get_buffer(sample));
+        gst_sample_unref(sample);
+#else
+        buffer = gst_base_sink_get_last_buffer(base_sink);
+#endif
+    }
     if (buffer) {
         gst_vaapisink_show_frame(base_sink, buffer);
         gst_buffer_unref(buffer);
@@ -175,38 +246,27 @@ gst_vaapisink_xoverlay_expose(GstXOverlay *overlay)
 }
 
 static void
-gst_vaapisink_xoverlay_iface_init(GstXOverlayClass *iface)
-{
-#if HAVE_GST_XOVERLAY_SET_WINDOW_HANDLE
-    iface->set_window_handle = gst_vaapisink_xoverlay_set_window_handle;
-#else
-    iface->set_xwindow_id    = gst_vaapisink_xoverlay_set_xid;
-#endif
-    iface->expose            = gst_vaapisink_xoverlay_expose;
-}
-
-static void
-gst_vaapisink_iface_init(GType type)
+gst_vaapisink_video_overlay_iface_init(GstVideoOverlayInterface *iface)
 {
-    const GType g_define_type_id = type;
-
-    G_IMPLEMENT_INTERFACE(GST_TYPE_IMPLEMENTS_INTERFACE,
-                          gst_vaapisink_implements_iface_init);
-    G_IMPLEMENT_INTERFACE(GST_TYPE_VIDEO_CONTEXT,
-                          gst_vaapisink_video_context_iface_init);
-    G_IMPLEMENT_INTERFACE(GST_TYPE_X_OVERLAY,
-                          gst_vaapisink_xoverlay_iface_init);
+    iface->set_window_handle    = gst_vaapisink_video_overlay_set_window_handle;
+    iface->set_render_rectangle = gst_vaapisink_video_overlay_set_render_rectangle;
+    iface->expose               = gst_vaapisink_video_overlay_expose;
 }
 
 static void
 gst_vaapisink_destroy(GstVaapiSink *sink)
 {
-    if (sink->display) {
-        g_object_unref(sink->display);
-        sink->display = NULL;
-    }
+    gst_buffer_replace(&sink->video_buffer, NULL);
+#if USE_GLX
+    gst_vaapi_texture_replace(&sink->texture, NULL);
+#endif
+    gst_vaapi_display_replace(&sink->display, NULL);
+    g_clear_object(&sink->uploader);
+
+    gst_caps_replace(&sink->caps, NULL);
 }
 
+#if USE_X11
 /* Checks whether a ConfigureNotify event is in the queue */
 typedef struct _ConfigureNotifyEventPendingArgs ConfigureNotifyEventPendingArgs;
 struct _ConfigureNotifyEventPendingArgs {
@@ -257,15 +317,84 @@ configure_notify_event_pending(
     );
     return args.match;
 }
+#endif
+
+static const gchar *
+get_display_type_name(GstVaapiDisplayType display_type)
+{
+    gpointer const klass = g_type_class_peek(GST_VAAPI_TYPE_DISPLAY_TYPE);
+    GEnumValue * const e = g_enum_get_value(klass, display_type);
+
+    if (e)
+        return e->value_name;
+    return "<unknown-type>";
+}
+
+static inline gboolean
+gst_vaapisink_ensure_display(GstVaapiSink *sink)
+{
+    GstVaapiDisplayType display_type;
+    GstVaapiRenderMode render_mode;
+    const gboolean had_display = sink->display != NULL;
+
+    if (!gst_vaapi_ensure_display(sink, sink->display_type, &sink->display))
+        return FALSE;
+
+    display_type = gst_vaapi_display_get_display_type(sink->display);
+    if (display_type != sink->display_type || (!had_display && sink->display)) {
+        GST_INFO("created %s %p", get_display_type_name(display_type),
+            sink->display);
+        sink->display_type = display_type;
+
+        sink->use_overlay =
+            gst_vaapi_display_get_render_mode(sink->display, &render_mode) &&
+            render_mode == GST_VAAPI_RENDER_MODE_OVERLAY;
+        GST_DEBUG("use %s rendering mode", sink->use_overlay ? "overlay" : "texture");
+
+        sink->use_rotation = gst_vaapi_display_has_property(
+            sink->display, GST_VAAPI_DISPLAY_PROP_ROTATION);
+    }
+    return TRUE;
+}
+
+static gboolean
+gst_vaapisink_ensure_uploader(GstVaapiSink *sink)
+{
+    if (!gst_vaapisink_ensure_display(sink))
+        return FALSE;
+
+    if (!sink->uploader) {
+        sink->uploader = gst_vaapi_uploader_new(sink->display);
+        if (!sink->uploader)
+            return FALSE;
+    }
+    return TRUE;
+}
 
 static gboolean
 gst_vaapisink_ensure_render_rect(GstVaapiSink *sink, guint width, guint height)
 {
     GstVaapiRectangle * const display_rect = &sink->display_rect;
     guint num, den, display_par_n, display_par_d;
-    double display_ratio;
     gboolean success;
 
+    /* Return success if caps are not set yet */
+    if (!sink->caps)
+        return TRUE;
+
+    if (!sink->keep_aspect) {
+        display_rect->width = width;
+        display_rect->height = height;
+        display_rect->x = 0;
+        display_rect->y = 0;
+
+        GST_DEBUG("force-aspect-ratio is false; distorting while scaling video");
+        GST_DEBUG("render rect (%d,%d):%ux%u",
+                  display_rect->x, display_rect->y,
+                  display_rect->width, display_rect->height);
+        return TRUE;
+    }
+
     GST_DEBUG("ensure render rect within %ux%u bounds", width, height);
 
     gst_vaapi_display_get_pixel_aspect_ratio(
@@ -286,47 +415,24 @@ gst_vaapisink_ensure_render_rect(GstVaapiSink *sink, guint width, guint height)
     GST_DEBUG("video size %dx%d, calculated ratio %d/%d",
               sink->video_width, sink->video_height, num, den);
 
-    if ((sink->video_height % den) == 0) {
-        GST_DEBUG("keeping video height");
-        display_rect->width  =
-            gst_util_uint64_scale_int(sink->video_height, num, den);
-        display_rect->height = sink->video_height;
-    }
-    else if ((sink->video_width % num) == 0) {
-        GST_DEBUG("keeping video width");
-        display_rect->width  = sink->video_width;
-        display_rect->height =
-            gst_util_uint64_scale_int(sink->video_width, den, num);
+    display_rect->width = gst_util_uint64_scale_int(height, num, den);
+    if (display_rect->width <= width) {
+        GST_DEBUG("keeping window height");
+        display_rect->height = height;
     }
     else {
-        GST_DEBUG("approximating while keeping video height");
-        display_rect->width  =
-            gst_util_uint64_scale_int(sink->video_height, num, den);
-        display_rect->height = sink->video_height;
-    }
-    display_ratio = (gdouble)display_rect->width / display_rect->height;
-    GST_DEBUG("scaling to %ux%u", display_rect->width, display_rect->height);
-
-    if (sink->fullscreen || sink->foreign_window ||
-        display_rect->width > width || display_rect->height > height) {
-        if (sink->video_width > sink->video_height) {
-            display_rect->width  = width;
-            display_rect->height = width / display_ratio;
-        }
-        else {
-            display_rect->width  = height * display_ratio;
-            display_rect->height = height;
-        }
+        GST_DEBUG("keeping window width");
+        display_rect->width  = width;
+        display_rect->height =
+            gst_util_uint64_scale_int(width, den, num);
     }
+    GST_DEBUG("scaling video to %ux%u", display_rect->width, display_rect->height);
 
-    if (sink->fullscreen) {
-        display_rect->x  = (width  - display_rect->width)  / 2;
-        display_rect->y  = (height - display_rect->height) / 2;
-    }
-    else {
-        display_rect->x  = 0;
-        display_rect->y  = 0;
-    }
+    g_assert(display_rect->width  <= width);
+    g_assert(display_rect->height <= height);
+
+    display_rect->x = (width  - display_rect->width)  / 2;
+    display_rect->y = (height - display_rect->height) / 2;
 
     GST_DEBUG("render rect (%d,%d):%ux%u",
               display_rect->x, display_rect->y,
@@ -334,27 +440,94 @@ gst_vaapisink_ensure_render_rect(GstVaapiSink *sink, guint width, guint height)
     return TRUE;
 }
 
+static void
+gst_vaapisink_ensure_window_size(GstVaapiSink *sink, guint *pwidth, guint *pheight)
+{
+    GstVideoRectangle src_rect, dst_rect, out_rect;
+    guint num, den, display_width, display_height, display_par_n, display_par_d;
+    gboolean success, scale;
+
+    if (sink->foreign_window) {
+        *pwidth  = sink->window_width;
+        *pheight = sink->window_height;
+        return;
+    }
+
+    gst_vaapi_display_get_size(sink->display, &display_width, &display_height);
+    if (sink->fullscreen) {
+        *pwidth  = display_width;
+        *pheight = display_height;
+        return;
+    }
+
+    gst_vaapi_display_get_pixel_aspect_ratio(
+        sink->display,
+        &display_par_n, &display_par_d
+    );
+
+    success = gst_video_calculate_display_ratio(
+        &num, &den,
+        sink->video_width, sink->video_height,
+        sink->video_par_n, sink->video_par_d,
+        display_par_n, display_par_d
+    );
+    if (!success) {
+        num = sink->video_par_n;
+        den = sink->video_par_d;
+    }
+
+    src_rect.x = 0;
+    src_rect.y = 0;
+    src_rect.w = gst_util_uint64_scale_int(sink->video_height, num, den);
+    src_rect.h = sink->video_height;
+    dst_rect.x = 0;
+    dst_rect.y = 0;
+    dst_rect.w = display_width;
+    dst_rect.h = display_height;
+    scale      = (src_rect.w > dst_rect.w || src_rect.h > dst_rect.h);
+    gst_video_sink_center_rect(src_rect, dst_rect, &out_rect, scale);
+    *pwidth    = out_rect.w;
+    *pheight   = out_rect.h;
+}
+
 static inline gboolean
 gst_vaapisink_ensure_window(GstVaapiSink *sink, guint width, guint height)
 {
     GstVaapiDisplay * const display = sink->display;
 
     if (!sink->window) {
-#if USE_VAAPISINK_GLX
-        if (sink->use_glx)
+        switch (sink->display_type) {
+#if USE_GLX
+        case GST_VAAPI_DISPLAY_TYPE_GLX:
             sink->window = gst_vaapi_window_glx_new(display, width, height);
-        else
+            goto notify_video_overlay_interface;
 #endif
+#if USE_X11
+        case GST_VAAPI_DISPLAY_TYPE_X11:
             sink->window = gst_vaapi_window_x11_new(display, width, height);
-        if (sink->window)
-            gst_x_overlay_got_xwindow_id(
-                GST_X_OVERLAY(sink),
+        notify_video_overlay_interface:
+            if (!sink->window)
+                break;
+            gst_video_overlay_got_window_handle(
+                GST_VIDEO_OVERLAY(sink),
                 gst_vaapi_window_x11_get_xid(GST_VAAPI_WINDOW_X11(sink->window))
             );
+            break;
+#endif
+#if USE_WAYLAND
+        case GST_VAAPI_DISPLAY_TYPE_WAYLAND:
+            sink->window = gst_vaapi_window_wayland_new(display, width, height);
+            break;
+#endif
+        default:
+            GST_ERROR("unsupported display type %d", sink->display_type);
+            return FALSE;
+        }
     }
     return sink->window != NULL;
 }
 
+#if USE_X11
 static gboolean
 gst_vaapisink_ensure_window_xid(GstVaapiSink *sink, guintptr window_id)
 {
@@ -363,7 +536,7 @@ gst_vaapisink_ensure_window_xid(GstVaapiSink *sink, guintptr window_id)
     int x, y;
     XID xid = window_id;
 
-    if (!gst_vaapi_ensure_display(sink, &sink->display))
+    if (!gst_vaapisink_ensure_display(sink))
         return FALSE;
 
     gst_vaapi_display_lock(sink->display);
@@ -387,26 +560,134 @@ gst_vaapisink_ensure_window_xid(GstVaapiSink *sink, guintptr window_id)
         gst_vaapi_window_x11_get_xid(GST_VAAPI_WINDOW_X11(sink->window)) == xid)
         return TRUE;
 
-    if (sink->window) {
-        g_object_unref(sink->window);
-        sink->window = NULL;
-    }
+    gst_vaapi_window_replace(&sink->window, NULL);
 
-#if USE_VAAPISINK_GLX
-    if (sink->use_glx)
+    switch (sink->display_type) {
+#if USE_GLX
+    case GST_VAAPI_DISPLAY_TYPE_GLX:
         sink->window = gst_vaapi_window_glx_new_with_xid(sink->display, xid);
-    else
+        break;
 #endif
+    case GST_VAAPI_DISPLAY_TYPE_X11:
         sink->window = gst_vaapi_window_x11_new_with_xid(sink->display, xid);
+        break;
+    default:
+        GST_ERROR("unsupported display type %d", sink->display_type);
+        return FALSE;
+    }
     return sink->window != NULL;
 }
+#endif
+
+static gboolean
+gst_vaapisink_ensure_rotation(GstVaapiSink *sink, gboolean recalc_display_rect)
+{
+    gboolean success = FALSE;
+
+    g_return_val_if_fail(sink->display, FALSE);
+
+    if (sink->rotation == sink->rotation_req)
+        return TRUE;
+
+    if (!sink->use_rotation) {
+        GST_WARNING("VA display does not support rotation");
+        goto end;
+    }
+
+    gst_vaapi_display_lock(sink->display);
+    success = gst_vaapi_display_set_rotation(sink->display, sink->rotation_req);
+    gst_vaapi_display_unlock(sink->display);
+    if (!success) {
+        GST_ERROR("failed to change VA display rotation mode");
+        goto end;
+    }
+
+    if (((sink->rotation + sink->rotation_req) % 180) == 90) {
+        /* Orientation changed */
+        G_PRIMITIVE_SWAP(guint, sink->video_width, sink->video_height);
+        G_PRIMITIVE_SWAP(gint, sink->video_par_n, sink->video_par_d);
+    }
+
+    if (recalc_display_rect && !sink->foreign_window)
+        gst_vaapisink_ensure_render_rect(sink, sink->window_width,
+            sink->window_height);
+    success = TRUE;
+
+end:
+    sink->rotation = sink->rotation_req;
+    return success;
+}
+
+static gboolean
+gst_vaapisink_ensure_video_buffer_pool(GstVaapiSink *sink, GstCaps *caps)
+{
+#if GST_CHECK_VERSION(1,0,0)
+    GstBufferPool *pool;
+    GstCaps *pool_caps;
+    GstStructure *config;
+    GstVideoInfo vi;
+    gboolean need_pool;
+
+    if (!gst_vaapisink_ensure_display(sink))
+        return FALSE;
+
+    if (sink->video_buffer_pool) {
+        config = gst_buffer_pool_get_config(sink->video_buffer_pool);
+        gst_buffer_pool_config_get_params(config, &pool_caps, NULL, NULL, NULL);
+        need_pool = !gst_caps_is_equal(caps, pool_caps);
+        gst_structure_free(config);
+        if (!need_pool)
+            return TRUE;
+        g_clear_object(&sink->video_buffer_pool);
+        sink->video_buffer_size = 0;
+    }
+
+    pool = gst_vaapi_video_buffer_pool_new(sink->display);
+    if (!pool)
+        goto error_create_pool;
+
+    gst_video_info_init(&vi);
+    gst_video_info_from_caps(&vi, caps);
+    if (GST_VIDEO_INFO_FORMAT(&vi) == GST_VIDEO_FORMAT_ENCODED) {
+        GST_DEBUG("assume video buffer pool format is NV12");
+        gst_video_info_set_format(&vi, GST_VIDEO_FORMAT_NV12,
+            GST_VIDEO_INFO_WIDTH(&vi), GST_VIDEO_INFO_HEIGHT(&vi));
+    }
+    sink->video_buffer_size = vi.size;
+
+    config = gst_buffer_pool_get_config(pool);
+    gst_buffer_pool_config_set_params(config, caps, sink->video_buffer_size,
+        0, 0);
+    gst_buffer_pool_config_add_option(config,
+        GST_BUFFER_POOL_OPTION_VAAPI_VIDEO_META);
+    if (!gst_buffer_pool_set_config(pool, config))
+        goto error_pool_config;
+    sink->video_buffer_pool = pool;
+    return TRUE;
+
+    /* ERRORS */
+error_create_pool:
+    {
+        GST_ERROR("failed to create buffer pool");
+        return FALSE;
+    }
+error_pool_config:
+    {
+        GST_ERROR("failed to reset buffer pool config");
+        gst_object_unref(pool);
+        return FALSE;
+    }
+#else
+    return TRUE;
+#endif
+}
 
 static gboolean
 gst_vaapisink_start(GstBaseSink *base_sink)
 {
     GstVaapiSink * const sink = GST_VAAPISINK(base_sink);
 
-    return TRUE;
+    return gst_vaapisink_ensure_uploader(sink);
 }
 
 static gboolean
@@ -414,61 +695,95 @@ gst_vaapisink_stop(GstBaseSink *base_sink)
 {
     GstVaapiSink * const sink = GST_VAAPISINK(base_sink);
 
-    if (sink->window) {
-        g_object_unref(sink->window);
-        sink->window = NULL;
+    gst_buffer_replace(&sink->video_buffer, NULL);
+#if GST_CHECK_VERSION(1,0,0)
+    g_clear_object(&sink->video_buffer_pool);
+#endif
+    gst_vaapi_window_replace(&sink->window, NULL);
+    gst_vaapi_display_replace(&sink->display, NULL);
+    g_clear_object(&sink->uploader);
+
+    return TRUE;
+}
+
+static GstCaps *
+gst_vaapisink_get_caps_impl(GstBaseSink *base_sink)
+{
+    GstVaapiSink * const sink = GST_VAAPISINK(base_sink);
+    GstCaps *out_caps, *yuv_caps;
+
+    out_caps = gst_caps_from_string(GST_VAAPI_SURFACE_CAPS);
+    if (!out_caps)
+        return NULL;
+
+    if (gst_vaapisink_ensure_uploader(sink)) {
+        yuv_caps = gst_vaapi_uploader_get_caps(sink->uploader);
+        if (yuv_caps)
+            gst_caps_append(out_caps, gst_caps_copy(yuv_caps));
     }
+    return out_caps;
+}
 
-    if (sink->display) {
-        g_object_unref(sink->display);
-        sink->display = NULL;
+#if GST_CHECK_VERSION(1,0,0)
+static inline GstCaps *
+gst_vaapisink_get_caps(GstBaseSink *base_sink, GstCaps *filter)
+{
+    GstCaps *caps, *out_caps;
+
+    caps = gst_vaapisink_get_caps_impl(base_sink);
+    if (caps && filter) {
+        out_caps = gst_caps_intersect_full(caps, filter,
+            GST_CAPS_INTERSECT_FIRST);
+        gst_caps_unref(caps);
     }
-    return TRUE;
+    else
+        out_caps = caps;
+    return out_caps;
 }
+#else
+#define gst_vaapisink_get_caps gst_vaapisink_get_caps_impl
+#endif
 
 static gboolean
 gst_vaapisink_set_caps(GstBaseSink *base_sink, GstCaps *caps)
 {
     GstVaapiSink * const sink = GST_VAAPISINK(base_sink);
-    GstStructure * const structure = gst_caps_get_structure(caps, 0);
-    guint display_width, display_height, win_width, win_height;
-    gint video_width, video_height, video_par_n = 1, video_par_d = 1;
+    GstVideoInfo vi;
+    guint win_width, win_height;
 
-    if (!structure)
-        return FALSE;
-    if (!gst_structure_get_int(structure, "width",  &video_width))
+#if USE_DRM
+    if (sink->display_type == GST_VAAPI_DISPLAY_TYPE_DRM)
+        return TRUE;
+#endif
+
+    if (!gst_vaapisink_ensure_video_buffer_pool(sink, caps))
         return FALSE;
-    if (!gst_structure_get_int(structure, "height", &video_height))
+
+    if (!gst_video_info_from_caps(&vi, caps))
         return FALSE;
-    sink->video_width  = video_width;
-    sink->video_height = video_height;
+    sink->use_video_raw = GST_VIDEO_INFO_IS_YUV(&vi);
+    sink->video_width   = GST_VIDEO_INFO_WIDTH(&vi);
+    sink->video_height  = GST_VIDEO_INFO_HEIGHT(&vi);
+    sink->video_par_n   = GST_VIDEO_INFO_PAR_N(&vi);
+    sink->video_par_d   = GST_VIDEO_INFO_PAR_D(&vi);
+    GST_DEBUG("video pixel-aspect-ratio %d/%d",
+              sink->video_par_n, sink->video_par_d);
 
-    gst_video_parse_caps_pixel_aspect_ratio(caps, &video_par_n, &video_par_d);
-    sink->video_par_n  = video_par_n;
-    sink->video_par_d  = video_par_d;
-    GST_DEBUG("video pixel-aspect-ratio %d/%d", video_par_n, video_par_d);
+    gst_caps_replace(&sink->caps, caps);
 
-    if (!gst_vaapi_ensure_display(sink, &sink->display))
+    if (!gst_vaapisink_ensure_display(sink))
         return FALSE;
 
-    gst_vaapi_display_get_size(sink->display, &display_width, &display_height);
-    if (!gst_vaapisink_ensure_render_rect(sink, display_width, display_height))
-        return FALSE;
+    gst_vaapisink_ensure_rotation(sink, FALSE);
 
-    if (sink->fullscreen) {
-        win_width  = display_width;
-        win_height = display_height;
-    }
-    else {
-        win_width  = sink->display_rect.width;
-        win_height = sink->display_rect.height;
+    gst_vaapisink_ensure_window_size(sink, &win_width, &win_height);
+    if (sink->window) {
+        if (!sink->foreign_window || sink->fullscreen)
+            gst_vaapi_window_set_size(sink->window, win_width, win_height);
     }
-
-    if (sink->window)
-        gst_vaapi_window_set_size(sink->window, win_width, win_height);
     else {
         gst_vaapi_display_lock(sink->display);
-        gst_x_overlay_prepare_xwindow_id(GST_X_OVERLAY(sink));
+        gst_video_overlay_prepare_window_handle(GST_VIDEO_OVERLAY(sink));
         gst_vaapi_display_unlock(sink->display);
         if (sink->window)
             return TRUE;
@@ -476,59 +791,16 @@ gst_vaapisink_set_caps(GstBaseSink *base_sink, GstCaps *caps)
             return FALSE;
         gst_vaapi_window_set_fullscreen(sink->window, sink->fullscreen);
         gst_vaapi_window_show(sink->window);
+        gst_vaapi_window_get_size(sink->window, &win_width, &win_height);
     }
     sink->window_width  = win_width;
     sink->window_height = win_height;
-    return TRUE;
-}
-
-static GstFlowReturn
-gst_vaapisink_buffer_alloc(
-    GstBaseSink *base_sink,
-    guint64      offset,
-    guint        size,
-    GstCaps     *caps,
-    GstBuffer  **pout_buffer
-)
-{
-    GstVaapiSink * const sink = GST_VAAPISINK(base_sink);
-    GstStructure *structure;
-    GstBuffer *buffer;
-
-    if (!gst_vaapi_ensure_display(sink, &sink->display))
-        goto error_ensure_display;
-
-    structure = gst_caps_get_structure(caps, 0);
-    if (!gst_structure_has_name(structure, "video/x-vaapi-surface"))
-        goto error_invalid_caps;
-
-    buffer = gst_vaapi_video_buffer_new(sink->display);
-    if (!buffer)
-        goto error_create_buffer;
+    GST_DEBUG("window size %ux%u", win_width, win_height);
 
-    gst_buffer_set_caps(buffer, caps);
-    *pout_buffer = buffer;
-    return GST_FLOW_OK;
-
-    /* ERRORS */
-error_ensure_display:
-    {
-        GST_ERROR("failed to ensure display");
-        return GST_FLOW_UNEXPECTED;
-    }
-error_invalid_caps:
-    {
-        GST_ERROR("failed to validate input caps");
-        return GST_FLOW_UNEXPECTED;
-    }
-error_create_buffer:
-    {
-        GST_ERROR("failed to create video buffer");
-        return GST_FLOW_UNEXPECTED;
-    }
+    return gst_vaapisink_ensure_render_rect(sink, win_width, win_height);
 }
 
-#if USE_VAAPISINK_GLX
+#if USE_GLX
 static void
 render_background(GstVaapiSink *sink)
 {
@@ -573,20 +845,37 @@ render_background(GstVaapiSink *sink)
 }
 
 static void
-render_frame(GstVaapiSink *sink)
+render_frame(GstVaapiSink *sink, GstVaapiSurface *surface,
+    const GstVaapiRectangle *surface_rect)
 {
     const guint x1 = sink->display_rect.x;
     const guint x2 = sink->display_rect.x + sink->display_rect.width;
     const guint y1 = sink->display_rect.y;
     const guint y2 = sink->display_rect.y + sink->display_rect.height;
+    gfloat tx1, tx2, ty1, ty2;
+    guint width, height;
+
+    if (surface_rect) {
+        gst_vaapi_surface_get_size(surface, &width, &height);
+        tx1 = (gfloat)surface_rect->x / width;
+        ty1 = (gfloat)surface_rect->y / height;
+        tx2 = (gfloat)(surface_rect->x + surface_rect->width) / width;
+        ty2 = (gfloat)(surface_rect->y + surface_rect->height) / height;
+    }
+    else {
+        tx1 = 0.0f;
+        ty1 = 0.0f;
+        tx2 = 1.0f;
+        ty2 = 1.0f;
+    }
 
     glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
     glBegin(GL_QUADS);
     {
-        glTexCoord2f(0.0f, 0.0f); glVertex2i(x1, y1);
-        glTexCoord2f(0.0f, 1.0f); glVertex2i(x1, y2);
-        glTexCoord2f(1.0f, 1.0f); glVertex2i(x2, y2);
-        glTexCoord2f(1.0f, 0.0f); glVertex2i(x2, y1);
+        glTexCoord2f(tx1, ty1); glVertex2i(x1, y1);
+        glTexCoord2f(tx1, ty2); glVertex2i(x1, y2);
+        glTexCoord2f(tx2, ty2); glVertex2i(x2, y2);
+        glTexCoord2f(tx2, ty1); glVertex2i(x2, y1);
     }
     glEnd();
 }
@@ -614,10 +903,47 @@ render_reflection(GstVaapiSink *sink)
 }
 
 static gboolean
+gst_vaapisink_ensure_texture(GstVaapiSink *sink, GstVaapiSurface *surface)
+{
+    GstVideoRectangle tex_rect, dis_rect, out_rect;
+    guint width, height;
+
+    if (sink->texture)
+        return TRUE;
+
+    gst_vaapi_surface_get_size(surface, &width, &height);
+    tex_rect.x = 0;
+    tex_rect.y = 0;
+    tex_rect.w = width;
+    tex_rect.h = height;
+
+    gst_vaapi_display_get_size(sink->display, &width, &height);
+    dis_rect.x = 0;
+    dis_rect.y = 0;
+    dis_rect.w = width;
+    dis_rect.h = height;
+
+    gst_video_sink_center_rect(tex_rect, dis_rect, &out_rect, TRUE);
+
+    /* XXX: use surface size for now since some VA drivers have issues
+       with downscaling to the provided texture size. i.e. we should be
+       using the resulting out_rect size, which preserves the aspect
+       ratio of the surface */
+    width = tex_rect.w;
+    height = tex_rect.h;
+    GST_INFO("texture size %ux%u", width, height);
+
+    sink->texture = gst_vaapi_texture_new(sink->display,
+        GL_TEXTURE_2D, GL_BGRA, width, height);
+    return sink->texture != NULL;
+}
+
+static gboolean
 gst_vaapisink_show_frame_glx(
-    GstVaapiSink    *sink,
-    GstVaapiSurface *surface,
-    guint            flags
+    GstVaapiSink               *sink,
+    GstVaapiSurface            *surface,
+    const GstVaapiRectangle    *surface_rect,
+    guint                       flags
 )
 {
     GstVaapiWindowGLX * const window = GST_VAAPI_WINDOW_GLX(sink->window);
@@ -625,17 +951,8 @@ gst_vaapisink_show_frame_glx(
     GLuint texture;
 
     gst_vaapi_window_glx_make_current(window);
-    if (!sink->texture) {
-        sink->texture = gst_vaapi_texture_new(
-            sink->display,
-            GL_TEXTURE_2D,
-            GL_BGRA,
-            sink->video_width,
-            sink->video_height
-        );
-        if (!sink->texture)
-            goto error_create_texture;
-    }
+    if (!gst_vaapisink_ensure_texture(sink, surface))
+        goto error_create_texture;
     if (!gst_vaapi_texture_put_surface(sink->texture, surface, flags))
         goto error_transfer_surface;
 
@@ -655,7 +972,7 @@ gst_vaapisink_show_frame_glx(
             glRotatef(20.0f, 0.0f, 1.0f, 0.0f);
             glTranslatef(50.0f, 0.0f, 0.0f);
         }
-        render_frame(sink);
+        render_frame(sink, surface, surface_rect);
         if (sink->use_reflection) {
             glPushMatrix();
             glTranslatef(0.0, (GLfloat)sink->display_rect.height + 5.0f, 0.0f);
@@ -684,14 +1001,15 @@ error_transfer_surface:
 #endif
 
 static inline gboolean
-gst_vaapisink_show_frame_x11(
-    GstVaapiSink    *sink,
-    GstVaapiSurface *surface,
-    guint            flags
+gst_vaapisink_put_surface(
+    GstVaapiSink               *sink,
+    GstVaapiSurface            *surface,
+    const GstVaapiRectangle    *surface_rect,
+    guint                       flags
 )
 {
     if (!gst_vaapi_window_put_surface(sink->window, surface,
-                                      NULL, &sink->display_rect, flags)) {
+                surface_rect, &sink->display_rect, flags)) {
         GST_DEBUG("could not render VA surface");
         return FALSE;
     }
@@ -699,47 +1017,219 @@ gst_vaapisink_show_frame_x11(
 }
 
 static GstFlowReturn
-gst_vaapisink_show_frame(GstBaseSink *base_sink, GstBuffer *buffer)
+gst_vaapisink_show_frame(GstBaseSink *base_sink, GstBuffer *src_buffer)
 {
     GstVaapiSink * const sink = GST_VAAPISINK(base_sink);
-    GstVaapiVideoBuffer * const vbuffer = GST_VAAPI_VIDEO_BUFFER(buffer);
+    GstVaapiVideoMeta *meta;
     GstVaapiSurface *surface;
+    GstBuffer *buffer;
     guint flags;
     gboolean success;
+    GstVaapiRectangle *surface_rect = NULL;
+#if GST_CHECK_VERSION(1,0,0)
+    GstVaapiRectangle tmp_rect;
+#endif
+
+    meta = gst_buffer_get_vaapi_video_meta(src_buffer);
+#if GST_CHECK_VERSION(1,0,0)
+    if (!meta)
+        return GST_FLOW_EOS;
+    buffer = gst_buffer_ref(src_buffer);
+
+    GstVideoCropMeta * const crop_meta =
+        gst_buffer_get_video_crop_meta(buffer);
+    if (crop_meta) {
+        surface_rect = &tmp_rect;
+        surface_rect->x = crop_meta->x;
+        surface_rect->y = crop_meta->y;
+        surface_rect->width = crop_meta->width;
+        surface_rect->height = crop_meta->height;
+    }
+#else
+    if (meta)
+        buffer = gst_buffer_ref(src_buffer);
+    else if (sink->use_video_raw) {
+        buffer = gst_vaapi_uploader_get_buffer(sink->uploader);
+        if (!buffer)
+            return GST_FLOW_EOS;
+        meta = gst_buffer_get_vaapi_video_meta(buffer);
+        if (!meta)
+            goto error;
+    }
+    else
+        return GST_FLOW_EOS;
 
-    if (sink->display != gst_vaapi_video_buffer_get_display (vbuffer)) {
-      if (sink->display)
-        g_object_unref (sink->display);
-      sink->display = g_object_ref (gst_vaapi_video_buffer_get_display (vbuffer));
+    if (sink->use_video_raw &&
+        !gst_vaapi_uploader_process(sink->uploader, src_buffer, buffer)) {
+        GST_WARNING("failed to process raw YUV buffer");
+        goto error;
     }
+#endif
+
+    if (sink->display != gst_vaapi_video_meta_get_display(meta))
+        gst_vaapi_display_replace(&sink->display,
+            gst_vaapi_video_meta_get_display(meta));
 
     if (!sink->window)
-        return GST_FLOW_UNEXPECTED;
+        goto error;
+
+    gst_vaapisink_ensure_rotation(sink, TRUE);
 
-    surface = gst_vaapi_video_buffer_get_surface(vbuffer);
+    surface = gst_vaapi_video_meta_get_surface(meta);
     if (!surface)
-        return GST_FLOW_UNEXPECTED;
+        goto error;
 
     GST_DEBUG("render surface %" GST_VAAPI_ID_FORMAT,
               GST_VAAPI_ID_ARGS(gst_vaapi_surface_get_id(surface)));
 
-    flags = GST_VAAPI_PICTURE_STRUCTURE_FRAME;
+    if (!surface_rect)
+        surface_rect = (GstVaapiRectangle *)
+            gst_vaapi_video_meta_get_render_rect(meta);
 
-#if USE_VAAPISINK_GLX
-    if (sink->use_glx)
-        success = gst_vaapisink_show_frame_glx(sink, surface, flags);
-    else
+    if (surface_rect)
+        GST_DEBUG("render rect (%d,%d), size %ux%u",
+                  surface_rect->x, surface_rect->y,
+                  surface_rect->width, surface_rect->height);
+
+    flags = gst_vaapi_video_meta_get_render_flags(meta);
+
+    if (!gst_vaapi_apply_composition(surface, src_buffer))
+        GST_WARNING("could not update subtitles");
+
+    switch (sink->display_type) {
+#if USE_DRM
+    case GST_VAAPI_DISPLAY_TYPE_DRM:
+        success = TRUE;
+        break;
 #endif
-        success = gst_vaapisink_show_frame_x11(sink, surface, flags);
-    return success ? GST_FLOW_OK : GST_FLOW_UNEXPECTED;
+#if USE_GLX
+    case GST_VAAPI_DISPLAY_TYPE_GLX:
+        if (!sink->use_glx)
+            goto put_surface_x11;
+        success = gst_vaapisink_show_frame_glx(sink, surface, surface_rect,
+            flags);
+        break;
+#endif
+#if USE_X11
+    case GST_VAAPI_DISPLAY_TYPE_X11:
+    put_surface_x11:
+        success = gst_vaapisink_put_surface(sink, surface, surface_rect, flags);
+        break;
+#endif
+#if USE_WAYLAND
+    case GST_VAAPI_DISPLAY_TYPE_WAYLAND:
+        success = gst_vaapisink_put_surface(sink, surface, surface_rect, flags);
+        break;
+#endif
+    default:
+        GST_ERROR("unsupported display type %d", sink->display_type);
+        success = FALSE;
+        break;
+    }
+    if (!success)
+        goto error;
+
+    /* Retain VA surface until the next one is displayed */
+    if (sink->use_overlay)
+        gst_buffer_replace(&sink->video_buffer, buffer);
+    gst_buffer_unref(buffer);
+    return GST_FLOW_OK;
+
+error:
+    gst_buffer_unref(buffer);
+    return GST_FLOW_EOS;
+}
+
+#if GST_CHECK_VERSION(1,0,0)
+static gboolean
+gst_vaapisink_propose_allocation(GstBaseSink *base_sink, GstQuery *query)
+{
+    GstVaapiSink * const sink = GST_VAAPISINK(base_sink);
+    GstCaps *caps = NULL;
+    gboolean need_pool;
+
+    gst_query_parse_allocation(query, &caps, &need_pool);
+
+    if (need_pool) {
+        if (!caps)
+            goto error_no_caps;
+        if (!gst_vaapisink_ensure_video_buffer_pool(sink, caps))
+            return FALSE;
+        gst_query_add_allocation_pool(query, sink->video_buffer_pool,
+            sink->video_buffer_size, 0, 0);
+    }
+
+    gst_query_add_allocation_meta(query,
+        GST_VAAPI_VIDEO_META_API_TYPE, NULL);
+    gst_query_add_allocation_meta(query,
+        GST_VIDEO_META_API_TYPE, NULL);
+    gst_query_add_allocation_meta(query,
+        GST_VIDEO_CROP_META_API_TYPE, NULL);
+    gst_query_add_allocation_meta(query,
+        GST_VIDEO_OVERLAY_COMPOSITION_META_API_TYPE, NULL);
+    return TRUE;
+
+    /* ERRORS */
+error_no_caps:
+    {
+        GST_ERROR("no caps specified");
+        return FALSE;
+    }
+}
+#else
+static GstFlowReturn
+gst_vaapisink_buffer_alloc(
+    GstBaseSink        *base_sink,
+    guint64             offset,
+    guint               size,
+    GstCaps            *caps,
+    GstBuffer         **pbuf
+)
+{
+    GstVaapiSink * const sink = GST_VAAPISINK(base_sink);
+    GstVideoInfo vi;
+    GstBuffer *buf;
+
+    *pbuf = NULL;
+
+    if (!sink->use_video_raw) {
+        /* Note: this code path is rarely used but for raw YUV formats
+           from custom pipeline. Otherwise, GstBaseSink::set_caps() is
+           called first, and GstBaseSink::buffer_alloc() is not called
+           in VA surface format mode */
+        if (!gst_video_info_from_caps(&vi, caps))
+            return GST_FLOW_NOT_SUPPORTED;
+        if (!GST_VIDEO_INFO_IS_YUV(&vi))
+            return GST_FLOW_OK;
+    }
+
+    if (!gst_vaapi_uploader_ensure_display(sink->uploader, sink->display))
+        return GST_FLOW_NOT_SUPPORTED;
+    if (!gst_vaapi_uploader_ensure_caps(sink->uploader, caps, NULL))
+        return GST_FLOW_NOT_SUPPORTED;
+
+    buf = gst_vaapi_uploader_get_buffer(sink->uploader);
+    if (!buf) {
+        GST_WARNING("failed to allocate resources for raw YUV buffer");
+        return GST_FLOW_NOT_SUPPORTED;
+    }
+
+    *pbuf = buf;
+    return GST_FLOW_OK;
 }
+#endif
 
 static gboolean
 gst_vaapisink_query(GstBaseSink *base_sink, GstQuery *query)
 {
-    GstVaapiSink *sink = GST_VAAPISINK(base_sink);
-    GST_DEBUG ("sharing display %p", sink->display);
-    return gst_vaapi_reply_to_query (query, sink->display);
+    GstVaapiSink * const sink = GST_VAAPISINK(base_sink);
+
+    if (gst_vaapi_reply_to_query(query, sink->display)) {
+        GST_DEBUG("sharing display %p", sink->display);
+        return TRUE;
+    }
+    return GST_BASE_SINK_CLASS(gst_vaapisink_parent_class)->query(base_sink,
+        query);
 }
 
 static void
@@ -747,7 +1237,7 @@ gst_vaapisink_finalize(GObject *object)
 {
     gst_vaapisink_destroy(GST_VAAPISINK(object));
 
-    G_OBJECT_CLASS(parent_class)->finalize(object);
+    G_OBJECT_CLASS(gst_vaapisink_parent_class)->finalize(object);
 }
 
 static void
@@ -761,8 +1251,8 @@ gst_vaapisink_set_property(
     GstVaapiSink * const sink = GST_VAAPISINK(object);
 
     switch (prop_id) {
-    case PROP_USE_GLX:
-        sink->use_glx = g_value_get_boolean(value);
+    case PROP_DISPLAY_TYPE:
+        sink->display_type = g_value_get_enum(value);
         break;
     case PROP_FULLSCREEN:
         sink->fullscreen = g_value_get_boolean(value);
@@ -770,9 +1260,18 @@ gst_vaapisink_set_property(
     case PROP_SYNCHRONOUS:
         sink->synchronous = g_value_get_boolean(value);
         break;
+    case PROP_USE_GLX:
+        sink->use_glx = g_value_get_boolean(value);
+        break;
     case PROP_USE_REFLECTION:
         sink->use_reflection = g_value_get_boolean(value);
         break;
+    case PROP_ROTATION:
+        sink->rotation_req = g_value_get_enum(value);
+        break;
+    case PROP_FORCE_ASPECT_RATIO:
+        sink->keep_aspect = g_value_get_boolean(value);
+        break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
         break;
@@ -790,8 +1289,8 @@ gst_vaapisink_get_property(
     GstVaapiSink * const sink = GST_VAAPISINK(object);
 
     switch (prop_id) {
-    case PROP_USE_GLX:
-        g_value_set_boolean(value, sink->use_glx);
+    case PROP_DISPLAY_TYPE:
+        g_value_set_enum(value, sink->display_type);
         break;
     case PROP_FULLSCREEN:
         g_value_set_boolean(value, sink->fullscreen);
@@ -799,9 +1298,18 @@ gst_vaapisink_get_property(
     case PROP_SYNCHRONOUS:
         g_value_set_boolean(value, sink->synchronous);
         break;
+    case PROP_USE_GLX:
+        g_value_set_boolean(value, sink->use_glx);
+        break;
     case PROP_USE_REFLECTION:
         g_value_set_boolean(value, sink->use_reflection);
         break;
+    case PROP_ROTATION:
+        g_value_set_enum(value, sink->rotation);
+        break;
+    case PROP_FORCE_ASPECT_RATIO:
+        g_value_set_boolean(value, sink->keep_aspect);
+        break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
         break;
@@ -809,23 +1317,12 @@ gst_vaapisink_get_property(
 }
 
 static void
-gst_vaapisink_base_init(gpointer klass)
-{
-    GstElementClass * const element_class = GST_ELEMENT_CLASS(klass);
-
-    gst_element_class_set_details(element_class, &gst_vaapisink_details);
-
-    gst_element_class_add_pad_template(
-        element_class,
-        gst_static_pad_template_get(&gst_vaapisink_sink_factory)
-    );
-}
-
-static void
 gst_vaapisink_class_init(GstVaapiSinkClass *klass)
 {
     GObjectClass * const     object_class   = G_OBJECT_CLASS(klass);
+    GstElementClass * const  element_class  = GST_ELEMENT_CLASS(klass);
     GstBaseSinkClass * const basesink_class = GST_BASE_SINK_CLASS(klass);
+    GstPadTemplate *pad_template;
 
     GST_DEBUG_CATEGORY_INIT(gst_debug_vaapisink,
                             GST_PLUGIN_NAME, 0, GST_PLUGIN_DESC);
@@ -836,20 +1333,44 @@ gst_vaapisink_class_init(GstVaapiSinkClass *klass)
 
     basesink_class->start        = gst_vaapisink_start;
     basesink_class->stop         = gst_vaapisink_stop;
+    basesink_class->get_caps     = gst_vaapisink_get_caps;
     basesink_class->set_caps     = gst_vaapisink_set_caps;
-    basesink_class->buffer_alloc = gst_vaapisink_buffer_alloc;
     basesink_class->preroll      = gst_vaapisink_show_frame;
     basesink_class->render       = gst_vaapisink_show_frame;
     basesink_class->query        = gst_vaapisink_query;
+#if GST_CHECK_VERSION(1,0,0)
+    basesink_class->propose_allocation = gst_vaapisink_propose_allocation;
+#else
+    basesink_class->buffer_alloc = gst_vaapisink_buffer_alloc;
+#endif
 
-#if USE_VAAPISINK_GLX
+    gst_element_class_set_static_metadata(element_class,
+        "VA-API sink",
+        "Sink/Video",
+        GST_PLUGIN_DESC,
+        "Gwenole Beauchesne <gwenole.beauchesne@intel.com>");
+
+    pad_template = gst_static_pad_template_get(&gst_vaapisink_sink_factory);
+    gst_element_class_add_pad_template(element_class, pad_template);
+
+    g_object_class_install_property
+        (object_class,
+         PROP_DISPLAY_TYPE,
+         g_param_spec_enum("display",
+                           "display type",
+                           "display type to use",
+                           GST_VAAPI_TYPE_DISPLAY_TYPE,
+                           GST_VAAPI_DISPLAY_TYPE_ANY,
+                           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+#if USE_GLX
     g_object_class_install_property
         (object_class,
          PROP_USE_GLX,
          g_param_spec_boolean("use-glx",
-                              "GLX rendering",
-                              "Enables GLX rendering",
-                              TRUE,
+                              "OpenGL rendering",
+                              "Enables OpenGL rendering",
+                              FALSE,
                               G_PARAM_READWRITE));
 
     g_object_class_install_property
@@ -885,16 +1406,48 @@ gst_vaapisink_class_init(GstVaapiSinkClass *klass)
                               "Toggles X display synchronous mode",
                               FALSE,
                               G_PARAM_READWRITE));
+
+    /**
+     * GstVaapiSink:rotation:
+     *
+     * The VA display rotation mode, expressed as a #GstVaapiRotation.
+     */
+    g_object_class_install_property
+        (object_class,
+         PROP_ROTATION,
+         g_param_spec_enum(GST_VAAPI_DISPLAY_PROP_ROTATION,
+                           "rotation",
+                           "The display rotation mode",
+                           GST_VAAPI_TYPE_ROTATION,
+                           DEFAULT_ROTATION,
+                           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+    /**
+     * GstVaapiSink:force-aspect-ratio:
+     *
+     * When enabled, scaling respects video aspect ratio; when disabled, the
+     * video is distorted to fit the window.
+     */
+    g_object_class_install_property
+        (object_class,
+         PROP_FORCE_ASPECT_RATIO,
+         g_param_spec_boolean("force-aspect-ratio",
+                              "Force aspect ratio",
+                              "When enabled, scaling will respect original aspect ratio",
+                              TRUE,
+                              G_PARAM_READWRITE));
 }
 
 static void
-gst_vaapisink_init(GstVaapiSink *sink, GstVaapiSinkClass *klass)
+gst_vaapisink_init(GstVaapiSink *sink)
 {
+    sink->caps           = NULL;
     sink->display        = NULL;
     sink->window         = NULL;
     sink->window_width   = 0;
     sink->window_height  = 0;
     sink->texture        = NULL;
+    sink->video_buffer   = NULL;
     sink->video_width    = 0;
     sink->video_height   = 0;
     sink->video_par_n    = 1;
@@ -902,6 +1455,11 @@ gst_vaapisink_init(GstVaapiSink *sink, GstVaapiSinkClass *klass)
     sink->foreign_window = FALSE;
     sink->fullscreen     = FALSE;
     sink->synchronous    = FALSE;
-    sink->use_glx        = USE_VAAPISINK_GLX;
+    sink->display_type   = DEFAULT_DISPLAY_TYPE;
+    sink->rotation       = DEFAULT_ROTATION;
+    sink->rotation_req   = DEFAULT_ROTATION;
     sink->use_reflection = FALSE;
+    sink->use_overlay    = FALSE;
+    sink->use_rotation   = FALSE;
+    sink->keep_aspect    = TRUE;
 }