{
g_mutex_lock (display->lock);
- if (window != display->parent_window) {
- gst_gl_display_destroy_tmp_window (display);
-
+ if (display->display == NULL) {
display->parent_window = window;
+ } else {
+ if (window != display->parent_window) {
+ XSync (display->display, False);
+
+ gst_gl_display_destroy_tmp_window (display);
- gst_gl_display_init_tmp_window (display);
+ display->parent_window = window;
+
+ gst_gl_display_init_tmp_window (display);
+ }
}
g_mutex_unlock (display->lock);
}
void
+gst_gl_display_update_window (GstGLDisplay * display)
+{
+ XWindowAttributes attr;
+
+ g_return_if_fail (display != NULL);
+
+ g_mutex_lock (display->lock);
+ if (display->window != None && display->parent_window != None) {
+ XSync (display->display, False);
+ XGetWindowAttributes (display->display, display->parent_window, &attr);
+
+ GST_DEBUG ("new size %d %d", attr.width, attr.height);
+
+ if (display->win_width != attr.width || display->win_height != attr.height) {
+ XResizeWindow (display->display, display->window,
+ attr.width, attr.height);
+ //XSync (display->display, False);
+ }
+ display->win_width = attr.width;
+ display->win_height = attr.height;
+ }
+ g_mutex_unlock (display->lock);
+}
+
+void
gst_gl_display_update_attributes (GstGLDisplay * display)
{
XWindowAttributes attr;
}
void
+gst_gl_display_set_window_size (GstGLDisplay * display, int width, int height)
+{
+ if (display->win_width != width || display->win_height != height) {
+ display->win_width = width;
+ display->win_height = height;
+ XResizeWindow (display->display, display->window, width, height);
+ XSync (display->display, False);
+ }
+}
+
+void
gst_gl_display_clear (GstGLDisplay * display)
{
gst_gl_display_lock (display);
void
gst_gl_display_draw_texture (GstGLDisplay * display, GLuint texture,
- int width, int height)
+ int width, int height, gboolean sync)
{
g_return_if_fail (width > 0);
g_return_if_fail (height > 0);
g_assert (display->window != None);
g_assert (display->context != NULL);
- gst_gl_display_update_attributes (display);
+ //gst_gl_display_update_attributes (display);
#if 0
/* Doesn't work */
{
}
#endif
-#if 1
- /* Doesn't work */
- glXSwapIntervalSGI (1);
-#endif
+ if (sync) {
+ glXSwapIntervalSGI (1);
+ } else {
+ glXSwapIntervalSGI (0);
+ }
glViewport (0, 0, display->win_width, display->win_height);
void gst_gl_display_set_window (GstGLDisplay *display, Window window);
void gst_gl_display_update_attributes (GstGLDisplay *display);
void gst_gl_display_clear (GstGLDisplay *display);
-void gst_gl_display_draw_image (GstGLDisplay * display, GstVideoFormat type,
- void *data, int width, int height);
-void gst_gl_display_draw_rbo (GstGLDisplay * display, GLuint rbo,
- int width, int height);
void gst_gl_display_draw_texture (GstGLDisplay * display, GLuint texture,
- int width, int height);
+ int width, int height, gboolean sync);
void gst_gl_display_check_error (GstGLDisplay *display, int line);
GLuint gst_gl_display_upload_texture_rectangle (GstGLDisplay *display,
GstVideoFormat type, void *data, int width, int height);
void gst_gl_display_set_visible (GstGLDisplay *display, gboolean visible);
+void gst_gl_display_set_window_size (GstGLDisplay *display, int width,
+ int height);
+void gst_gl_display_update_window (GstGLDisplay * display);
#endif