mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 09:10:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

libs: window: x11/wayland: use new api for conversion

Browse source 
Since gst_vaapi_window_vpp_convert_internal is created,
GstVaapiWindowX11/Wayland can use it for conversion.

Note that once it chooses to use vpp, it's going to use vpp
until the session is finished.

https://bugzilla.gnome.org/show_bug.cgi?id=759533
This commit is contained in:
Hyunjun Ko 2017-04-10 17:23:26 +09:00 committed by Víctor Manuel Jáquez Leal
parent ccfbca733d
commit c5b3577e88
3 changed files with 77 additions and 101 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

105
gst-libs/gst/vaapi/gstvaapiwindow_wayland.c
View file

@ -107,16 +107,13 @@ struct _GstVaapiWindowWaylandPrivate
struct wl_region *opaque_region;
struct wl_event_queue *event_queue;
FrameState *last_frame;
GstVideoFormat surface_format;
GstVaapiVideoPool *surface_pool;
GstVaapiFilter *filter;
GstPoll *poll;
GstPollFD pollfd;
guint is_shown:1;
guint fullscreen_on_show:1;
guint use_vpp:1;
guint sync_failed:1;
volatile guint num_frames_pending;
gboolean need_vpp;
};
/**
@ -306,8 +303,6 @@ gst_vaapi_window_wayland_create (GstVaapiWindow * window,
if (priv->fullscreen_on_show)
gst_vaapi_window_wayland_set_fullscreen (window, TRUE);
priv->surface_format = GST_VIDEO_FORMAT_ENCODED;
priv->use_vpp = GST_VAAPI_DISPLAY_HAS_VPP (GST_VAAPI_OBJECT_DISPLAY (window));
priv->is_shown = TRUE;
return TRUE;
@ -342,9 +337,6 @@ gst_vaapi_window_wayland_destroy (GstVaapiWindow * window)
priv->event_queue = NULL;
}
gst_vaapi_filter_replace (&priv->filter, NULL);
gst_vaapi_video_pool_replace (&priv->surface_pool, NULL);
gst_poll_free (priv->poll);
GST_VAAPI_WINDOW_WAYLAND_GET_CLASS (window)->parent_finalize (GST_VAAPI_OBJECT
@ -362,7 +354,6 @@ gst_vaapi_window_wayland_resize (GstVaapiWindow * window,
GST_DEBUG ("resize window, new size %ux%u", width, height);
gst_vaapi_video_pool_replace (&priv->surface_pool, NULL);
if (priv->opaque_region)
wl_region_destroy (priv->opaque_region);
GST_VAAPI_OBJECT_LOCK_DISPLAY (window);
@ -399,74 +390,6 @@ static const struct wl_buffer_listener frame_buffer_listener = {
frame_release_callback
};
static GstVaapiSurface *
vpp_convert (GstVaapiWindow * window,
GstVaapiSurface * surface,
const GstVaapiRectangle * src_rect,
const GstVaapiRectangle * dst_rect, guint flags)
{
GstVaapiWindowWaylandPrivate *const priv =
GST_VAAPI_WINDOW_WAYLAND_GET_PRIVATE (window);
GstVaapiDisplay *const display = GST_VAAPI_OBJECT_DISPLAY (window);
GstVaapiSurface *vpp_surface = NULL;
GstVaapiFilterStatus status;
/* Ensure VA surface pool is created */
/* XXX: optimize the surface format to use. e.g. YUY2 */
if (!priv->surface_pool) {
priv->surface_pool = gst_vaapi_surface_pool_new (display,
priv->surface_format, window->width, window->height);
if (!priv->surface_pool)
return NULL;
gst_vaapi_filter_replace (&priv->filter, NULL);
}
/* Ensure VPP pipeline is built */
if (!priv->filter) {
priv->filter = gst_vaapi_filter_new (display);
if (!priv->filter)
goto error_create_filter;
if (!gst_vaapi_filter_set_format (priv->filter, priv->surface_format))
goto error_unsupported_format;
}
if (!gst_vaapi_filter_set_cropping_rectangle (priv->filter, src_rect))
return NULL;
if (!gst_vaapi_filter_set_target_rectangle (priv->filter, dst_rect))
return NULL;
/* Post-process the decoded source surface */
vpp_surface = gst_vaapi_video_pool_get_object (priv->surface_pool);
if (!vpp_surface)
return NULL;
status = gst_vaapi_filter_process (priv->filter, surface, vpp_surface, flags);
if (status != GST_VAAPI_FILTER_STATUS_SUCCESS)
goto error_process_filter;
return vpp_surface;
/* ERRORS */
error_create_filter:
{
GST_WARNING ("failed to create VPP filter. Disabling");
priv->use_vpp = FALSE;
return NULL;
}
error_unsupported_format:
{
GST_ERROR ("unsupported render target format %s",
gst_vaapi_video_format_to_string (priv->surface_format));
priv->use_vpp = FALSE;
return NULL;
}
error_process_filter:
{
GST_ERROR ("failed to process surface %" GST_VAAPI_ID_FORMAT " (error %d)",
GST_VAAPI_ID_ARGS (GST_VAAPI_OBJECT_ID (surface)), status);
gst_vaapi_video_pool_put_object (priv->surface_pool, vpp_surface);
return NULL;
}
}
static gboolean
gst_vaapi_window_wayland_render (GstVaapiWindow * window,
GstVaapiSurface * surface,
@ -482,23 +405,22 @@ gst_vaapi_window_wayland_render (GstVaapiWindow * window,
FrameState *frame;
guint width, height, va_flags;
VAStatus status;
gboolean need_vpp = FALSE;
/* Check that we don't need to crop source VA surface */
gst_vaapi_surface_get_size (surface, &width, &height);
if (src_rect->x != 0 || src_rect->y != 0)
need_vpp = TRUE;
priv->need_vpp = TRUE;
if (src_rect->width != width || src_rect->height != height)
need_vpp = TRUE;
priv->need_vpp = TRUE;
/* Check that we don't render to a subregion of this window */
if (dst_rect->x != 0 || dst_rect->y != 0)
need_vpp = TRUE;
priv->need_vpp = TRUE;
if (dst_rect->width != window->width || dst_rect->height != window->height)
need_vpp = TRUE;
priv->need_vpp = TRUE;
/* Try to construct a Wayland buffer from VA surface as is (without VPP) */
if (!need_vpp) {
if (!priv->need_vpp) {
GST_VAAPI_OBJECT_LOCK_DISPLAY (window);
va_flags = from_GstVaapiSurfaceRenderFlags (flags);
status = vaGetSurfaceBufferWl (GST_VAAPI_DISPLAY_VADISPLAY (display),
@ -508,18 +430,19 @@ gst_vaapi_window_wayland_render (GstVaapiWindow * window,
if (status == VA_STATUS_ERROR_FLAG_NOT_SUPPORTED ||
status == VA_STATUS_ERROR_UNIMPLEMENTED ||
status == VA_STATUS_ERROR_INVALID_IMAGE_FORMAT)
need_vpp = TRUE;
priv->need_vpp = TRUE;
else if (!vaapi_check_status (status, "vaGetSurfaceBufferWl()"))
return FALSE;
}
/* Try to construct a Wayland buffer with VPP */
if (need_vpp) {
if (priv->use_vpp) {
if (priv->need_vpp) {
if (window->has_vpp) {
GstVaapiSurface *const vpp_surface =
vpp_convert (window, surface, src_rect, dst_rect, flags);
gst_vaapi_window_vpp_convert_internal (window, surface, src_rect,
dst_rect, flags);
if (G_UNLIKELY (!vpp_surface))
need_vpp = FALSE;
priv->need_vpp = FALSE;
else {
surface = vpp_surface;
width = window->width;
@ -547,9 +470,9 @@ gst_vaapi_window_wayland_render (GstVaapiWindow * window,
g_atomic_pointer_set (&priv->last_frame, frame);
g_atomic_int_inc (&priv->num_frames_pending);
if (need_vpp && priv->use_vpp) {
if (priv->need_vpp && window->has_vpp) {
frame->surface = surface;
frame->surface_pool = gst_vaapi_video_pool_ref (priv->surface_pool);
frame->surface_pool = gst_vaapi_video_pool_ref (window->surface_pool);
}
/* XXX: attach to the specified target rectangle */

72
gst-libs/gst/vaapi/gstvaapiwindow_x11.c
View file

@ -399,19 +399,14 @@ gst_vaapi_window_x11_resize (GstVaapiWindow * window, guint width, guint height)
return !has_errors;
}
static gboolean
gst_vaapi_window_x11_render (GstVaapiWindow * window,
GstVaapiSurface * surface,
static VAStatus
gst_vaapi_window_x11_put_surface (GstVaapiWindow * window,
VASurfaceID surface_id,
const GstVaapiRectangle * src_rect,
const GstVaapiRectangle * dst_rect, guint flags)
{
VASurfaceID surface_id;
VAStatus status;
surface_id = GST_VAAPI_OBJECT_ID (surface);
if (surface_id == VA_INVALID_ID)
return FALSE;
GST_VAAPI_OBJECT_LOCK_DISPLAY (window);
status = vaPutSurface (GST_VAAPI_OBJECT_VADISPLAY (window),
surface_id,
@ -425,11 +420,68 @@ gst_vaapi_window_x11_render (GstVaapiWindow * window,
dst_rect->width,
dst_rect->height, NULL, 0, from_GstVaapiSurfaceRenderFlags (flags)
);
GST_VAAPI_OBJECT_UNLOCK_DISPLAY (window);
if (!vaapi_check_status (status, "vaPutSurface()"))
return status;
}
static gboolean
gst_vaapi_window_x11_render (GstVaapiWindow * window,
GstVaapiSurface * surface,
const GstVaapiRectangle * src_rect,
const GstVaapiRectangle * dst_rect, guint flags)
{
VASurfaceID surface_id;
VAStatus status;
GstVaapiWindowX11Private *const priv =
GST_VAAPI_WINDOW_X11_GET_PRIVATE (window);
gboolean ret = FALSE;
surface_id = GST_VAAPI_OBJECT_ID (surface);
if (surface_id == VA_INVALID_ID)
return FALSE;
return TRUE;
if (window->has_vpp && priv->need_vpp)
goto conversion;
status =
gst_vaapi_window_x11_put_surface (window, surface_id, src_rect, dst_rect,
flags);
if (status == VA_STATUS_ERROR_FLAG_NOT_SUPPORTED ||
status == VA_STATUS_ERROR_UNIMPLEMENTED ||
status == VA_STATUS_ERROR_INVALID_IMAGE_FORMAT) {
priv->need_vpp = TRUE;
} else {
ret = vaapi_check_status (status, "vaPutSurface()");
}
conversion:
if (priv->need_vpp && window->has_vpp) {
GstVaapiSurface *const vpp_surface =
gst_vaapi_window_vpp_convert_internal (window, surface, NULL, NULL,
flags);
if (G_LIKELY (vpp_surface)) {
surface_id = GST_VAAPI_OBJECT_ID (vpp_surface);
status =
gst_vaapi_window_x11_put_surface (window, surface_id, src_rect,
dst_rect, flags);
ret = vaapi_check_status (status, "vaPutSurface()");
if (!gst_vaapi_surface_sync (vpp_surface)) {
GST_WARNING ("failed to render surface");
ret = FALSE;
}
gst_vaapi_video_pool_put_object (window->surface_pool, vpp_surface);
} else {
priv->need_vpp = FALSE;
}
}
return ret;
}
static gboolean

1
gst-libs/gst/vaapi/gstvaapiwindow_x11_priv.h
View file

@ -55,6 +55,7 @@ struct _GstVaapiWindowX11Private
guint is_mapped:1;
guint fullscreen_on_map:1;
guint has_xrender:1;
gboolean need_vpp;
};
/**