/*****************************************************************************
* Copyright © 2010-2011 Rémi Denis-Courmont
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1
- * of the License, or (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
*
- * This library is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- ****************************************************************************/
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
#ifdef HAVE_CONFIG_H
# include <config.h>
vlc_module_begin ()
#if USE_OPENGL_ES == 2
-# error The OpenGL ES2 plugin is incomplete and not functional. FIXME.
# define API VLC_OPENGL_ES2
# define MODULE_VARNAME "gles2"
set_shortname (N_("OpenGL ES2"))
# define API VLC_OPENGL
# define MODULE_VARNAME "gl"
set_shortname (N_("OpenGL"))
- set_description (N_("OpenGL video output"))
+ set_description (N_("OpenGL video output (experimental)"))
set_category (CAT_VIDEO)
set_subcategory (SUBCAT_VIDEO_VOUT)
set_capability ("vout display", /*170*/0)
static vout_window_t *MakeWindow (vout_display_t *vd)
{
- vout_window_cfg_t wnd_cfg;
-
- memset (&wnd_cfg, 0, sizeof (wnd_cfg));
- wnd_cfg.type = VOUT_WINDOW_TYPE_NATIVE;
- wnd_cfg.x = var_InheritInteger (vd, "video-x");
- wnd_cfg.y = var_InheritInteger (vd, "video-y");
- wnd_cfg.width = vd->cfg->display.width;
- wnd_cfg.height = vd->cfg->display.height;
-
- vout_window_t *wnd = vout_display_NewWindow (vd, &wnd_cfg);
- if (wnd == NULL)
- msg_Err (vd, "parent window not available");
- return wnd;
+ vout_window_cfg_t cfg = {
+ .x = var_InheritInteger (vd, "video-x"),
+ .y = var_InheritInteger (vd, "video-y"),
+ .width = vd->cfg->display.width,
+ .height = vd->cfg->display.height,
+ };
+ vout_window_t *wnd;
+
+#if defined(_WIN32)
+ cfg.type = VOUT_WINDOW_TYPE_HWND;
+#elif defined(__ANDROID__)
+ cfg.type = VOUT_WINDOW_TYPE_ANDROID_NATIVE;
+#else
+ cfg.type = VOUT_WINDOW_TYPE_XID;
+#endif
+
+ wnd = vout_display_NewWindow (vd, &cfg);
+ if (wnd != NULL)
+ return wnd;
+
+ msg_Err (vd, "parent window not available");
+ return NULL;
}
/**
if (sys->gl == NULL)
goto error;
+ /* Initialize video display */
+ const vlc_fourcc_t *spu_chromas;
+
if (vlc_gl_MakeCurrent (sys->gl))
goto error;
- /* Initialize video display */
- sys->vgl = vout_display_opengl_New (&vd->fmt, NULL, sys->gl);
- if (!sys->vgl)
+ sys->vgl = vout_display_opengl_New (&vd->fmt, &spu_chromas, sys->gl);
+ vlc_gl_ReleaseCurrent (sys->gl);
+
+ if (sys->vgl == NULL)
goto error;
vd->sys = sys;
vd->info.has_pictures_invalid = false;
vd->info.has_event_thread = false;
+ vd->info.subpicture_chromas = spu_chromas;
vd->pool = Pool;
vd->prepare = PictureRender;
vd->display = PictureDisplay;
vout_display_t *vd = (vout_display_t *)obj;
vout_display_sys_t *sys = vd->sys;
+ vlc_gl_MakeCurrent (sys->gl);
vout_display_opengl_Delete (sys->vgl);
+ vlc_gl_ReleaseCurrent (sys->gl);
+
vlc_gl_Destroy (sys->gl);
vout_display_DeleteWindow (vd, sys->window);
free (sys);
vout_display_sys_t *sys = vd->sys;
if (!sys->pool)
+ {
+ vlc_gl_MakeCurrent (sys->gl);
sys->pool = vout_display_opengl_GetPool (sys->vgl, count);
+ vlc_gl_ReleaseCurrent (sys->gl);
+ }
return sys->pool;
}
{
vout_display_sys_t *sys = vd->sys;
+ vlc_gl_MakeCurrent (sys->gl);
vout_display_opengl_Prepare (sys->vgl, pic, subpicture);
+ vlc_gl_ReleaseCurrent (sys->gl);
}
static void PictureDisplay (vout_display_t *vd, picture_t *pic, subpicture_t *subpicture)
{
vout_display_sys_t *sys = vd->sys;
+ vlc_gl_MakeCurrent (sys->gl);
vout_display_opengl_Display (sys->vgl, &vd->source);
+ vlc_gl_ReleaseCurrent (sys->gl);
+
picture_Release (pic);
- (void)subpicture;
+ (void) subpicture;
}
static int Control (vout_display_t *vd, int query, va_list ap)
vout_display_place_t place;
vout_display_PlacePicture (&place, src, cfg, false);
- glViewport (0, 0, place.width, place.height);
+ vlc_gl_MakeCurrent (sys->gl);
+ glViewport (place.x, place.y, place.width, place.height);
+ vlc_gl_ReleaseCurrent (sys->gl);
return VLC_SUCCESS;
}
vout_display_place_t place;
vout_display_PlacePicture (&place, src, cfg, false);
- glViewport (0, 0, place.width, place.height);
+ vlc_gl_MakeCurrent (sys->gl);
+ glViewport (place.x, place.y, place.width, place.height);
+ vlc_gl_ReleaseCurrent (sys->gl);
return VLC_SUCCESS;
}