summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReynaldo H. Verdejo Pinochet <reynaldo@collabora.com>2012-10-18 01:45:51 -0300
committerSebastian Dröge <sebastian.droege@collabora.co.uk>2012-10-18 14:35:20 +0200
commitc3a12d737e698358a5e5c3fdb3749e67876dfa08 (patch)
tree01750a9a206a0266c5ae6e2fe63af690e276a537
parentac037ce319b90f5b6b7a2f0f73b95df8006ecb69 (diff)
downloadgstreamer-plugins-bad-c3a12d737e698358a5e5c3fdb3749e67876dfa08.tar.gz
eglglessink: Always Reset display_region.* at EGL/GLES ctx wipe
-rw-r--r--ext/eglgles/gsteglglessink.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/ext/eglgles/gsteglglessink.c b/ext/eglgles/gsteglglessink.c
index e268ff7b4..110c44852 100644
--- a/ext/eglgles/gsteglglessink.c
+++ b/ext/eglgles/gsteglglessink.c
@@ -687,6 +687,15 @@ gst_eglglessink_wipe_eglglesctx (GstEglGlesSink * eglglessink)
eglglessink->eglglesctx.eglcontext);
eglglessink->eglglesctx.eglcontext = NULL;
}
+
+ GST_OBJECT_LOCK (eglglessink);
+ /* Reset display region
+ * XXX: Should probably keep old ones if set_render_rect()
+ * has been called.
+ */
+ eglglessink->display_region.w = 0;
+ eglglessink->display_region.h = 0;
+ GST_OBJECT_UNLOCK (eglglessink);
}
static gboolean
@@ -2026,15 +2035,6 @@ gst_eglglessink_configure_caps (GstEglGlesSink * eglglessink, GstCaps * caps)
/* EGL/GLES cleanup */
gst_eglglessink_wipe_eglglesctx (eglglessink);
- GST_OBJECT_LOCK (eglglessink);
- /* Reset display region
- * XXX: Should probably keep old ones if set_render_rect()
- * has been called.
- */
- eglglessink->display_region.w = 0;
- eglglessink->display_region.h = 0;
- GST_OBJECT_UNLOCK (eglglessink);
-
gst_caps_unref (eglglessink->configured_caps);
eglglessink->configured_caps = NULL;
}