summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGwenole Beauchesne <gwenole.beauchesne@intel.com>2012-07-23 17:49:08 +0200
committerGwenole Beauchesne <gwenole.beauchesne@intel.com>2012-09-07 15:00:43 +0200
commit71f1a5e0340bc5b8125688f99e5149835678ae25 (patch)
treee5708302d2ea4e9c1d599edb761f08ccb279d143
parent4a641e9d1332343bb5aa992f51a32c49853732fa (diff)
downloadgst-vaapi-71f1a5e0340bc5b8125688f99e5149835678ae25.tar.gz
vaapisink: ensure display from a single function.
-rw-r--r--gst/vaapi/gstvaapisink.c14
1 files changed, 11 insertions, 3 deletions
diff --git a/gst/vaapi/gstvaapisink.c b/gst/vaapi/gstvaapisink.c
index 5741588c..d1fb86ed 100644
--- a/gst/vaapi/gstvaapisink.c
+++ b/gst/vaapi/gstvaapisink.c
@@ -295,6 +295,14 @@ configure_notify_event_pending(
return args.match;
}
+static inline gboolean
+gst_vaapisink_ensure_display(GstVaapiSink *sink)
+{
+ if (!gst_vaapi_ensure_display(sink, &sink->display))
+ return FALSE;
+ return TRUE;
+}
+
static gboolean
gst_vaapisink_ensure_render_rect(GstVaapiSink *sink, guint width, guint height)
{
@@ -380,7 +388,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);
@@ -423,7 +431,7 @@ gst_vaapisink_start(GstBaseSink *base_sink)
{
GstVaapiSink * const sink = GST_VAAPISINK(base_sink);
- return gst_vaapi_ensure_display(sink, &sink->display);
+ return gst_vaapisink_ensure_display(sink);
}
static gboolean
@@ -469,7 +477,7 @@ gst_vaapisink_set_caps(GstBaseSink *base_sink, GstCaps *caps)
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);