gl: check gl1 support

QtAV.pro

@@ -64,7 +64,7 @@ cache(SOURCE_ROOT, set, SOURCE_ROOT)
 cache(mkspecs_cached, set, mkspecs_build)
 
 EssentialDepends = avutil avcodec avformat swscale
-OptionalDepends = portaudio direct2d gdiplus xv #openal
+OptionalDepends = portaudio direct2d gdiplus xv gl #openal
 for(d, EssentialDepends) {
    !config_$$d {
         CONFIG *= recheck

config.tests/gl/gl.pro

@@ -0,0 +1,13 @@
+CONFIG += qt
+QT += core gui opengl
+CONFIG += console
+
+SOURCES += main.cpp
+
+win32 {
+	LIBS += -lopengl32
+} else:macx {
+	LIBS += -framework OpenGL -framework AGL
+} else {
+	LIBS += -lGL
+}

config.tests/gl/main.cpp

@@ -0,0 +1,43 @@
+/******************************************************************************
+    QtAV:  Media play library based on Qt and FFmpeg
+    Copyright (C) 2013 Wang Bin <[email protected]>
+
+*   This file is part of QtAV
+
+    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 library 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
+    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 Street, Fifth Floor, Boston, MA  02110-1301  USA
+******************************************************************************/
+#include <qgl.h> //check type conflicting for gl.h and GLES2/gl2.h
+//gl.h is auto included by qt build with gl(not gles)
+#ifdef __APPLE__
+#include <OpenGL/gl.h>
+#else
+#include <GL/gl.h>
+#endif //__APPLE__
+
+int main()
+{
+    glShadeModel(GL_SMOOTH);
+    glClearDepth(1.0f);
+    glPushMatrix();
+    glLoadIdentity();
+    glBegin(GL_QUADS);
+    glTexCoord2d(0.0, 0.0); glVertex2d(-1.0, +1.0);
+    glEnd();
+    glPopMatrix();
+    glMatrixMode(GL_PROJECTION);
+    glMatrixMode(GL_MODELVIEW);
+
+	return 0;
+}

examples/examples.pro

@@ -1,7 +1,6 @@
 TEMPLATE = subdirs
 
 SUBDIRS += \
-    player-gl \
     simpleplayer \
     videographicsitem \
     videowall
@@ -13,3 +12,6 @@ config_gdiplus {
 config_direct2d {
     SUBDIRS += player-d2d
 }
+config_gl {
+    SUBDIRS += player-gl
+}

src/GLWidgetRenderer.cpp

@@ -22,13 +22,17 @@
 #include "QtAV/GLWidgetRenderer.h"
 #include "private/VideoRenderer_p.h"
 #include <QResizeEvent>
-
+#ifdef Q_OS_MAC
+#include <OpenGL/gl.h>
+#else
+#include <GL/gl.h>
+#endif //Q_OS_MAC
 //TODO: vsync http://stackoverflow.com/questions/589064/how-to-enable-vertical-sync-in-opengl
 //TODO: check gl errors
 //GL_BGRA is available in OpenGL >= 1.2
 #ifndef GL_BGRA
 #ifndef GL_BGRA_EXT
-#include <GL/glext.h> //GL_BGRA_EXT for OpenGL<=1.1
+#include <GL/glext.h> //GL_BGRA_EXT for OpenGL<=1.1 //TODO Apple include <OpenGL/xxx>
 #endif //GL_BGRA_EXT
 #ifndef GL_BGRA //it may be defined in glext.h
 #define GL_BGRA GL_BGRA_EXT

src/VideoRendererTypes.cpp

@@ -48,14 +48,14 @@ void RegisterVideoRendererWidget_Man()
 {
     FACTORY_REGISTER_ID_MAN(VideoRenderer, Widget, "QWidegt")
 }
-
+#if HAVE_GL
 FACTORY_REGISTER_ID_AUTO(VideoRenderer, GLWidget, "QGLWidegt")
 
 void RegisterVideoRendererGLWidget_Man()
 {
     FACTORY_REGISTER_ID_MAN(VideoRenderer, GLWidget, "QGLWidegt")
 }
-
+#endif //HAVE_GL
 #if HAVE_GDIPLUS
 FACTORY_REGISTER_ID_AUTO(VideoRenderer, GDI, "GDI")
 
@@ -84,7 +84,9 @@ void RegisterVideoRendererXV_Man()
 void VideoRenderer_RegisterAll()
 {
     RegisterVideoRendererWidget_Man();
+#if HAVE_GL
     RegisterVideoRendererGLWidget_Man();
+#endif //HAVE_GL
 #if HAVE_GDIPLUS
     RegisterVideoRendererGDI_Man();
 #endif //HAVE_GDIPLUS

src/libQtAV.pro

@@ -88,12 +88,18 @@ config_direct2d {
     #LIBS += -lD2d1
 }
 config_xv {
-	DEFINES *= HAVE_XV=1
-	SOURCES += XVRenderer.cpp
-	HEADERS += QtAV/XVRenderer.h
-	LIBS += -lXv
+    DEFINES *= HAVE_XV=1
+    SOURCES += XVRenderer.cpp
+    HEADERS += QtAV/XVRenderer.h
+    SDK_HEADERS += QtAV/XVRenderer.h
+    LIBS += -lXv
+}
+config_gl {
+    DEFINES *= HAVE_GL=1
+    SOURCES += GLWidgetRenderer.cpp
+    HEADERS += QtAV/GLWidgetRenderer.h
+    SDK_HEADERS += QtAV/GLWidgetRenderer.h
 }
-
 SOURCES += \
     QtAV_Compat.cpp \
     QtAV_Global.cpp \
@@ -106,7 +112,6 @@ SOURCES += \
     AVDemuxThread.cpp \
     EventFilter.cpp \
     Filter.cpp \
-    GLWidgetRenderer.cpp \
     GraphicsItemRenderer.cpp \
     ImageConverter.cpp \
     ImageConverterFF.cpp \
@@ -138,7 +143,6 @@ SDK_HEADERS *= \
     QtAV/AVDemuxThread.h \
     QtAV/BlockingQueue.h \
     QtAV/Filter.h \
-    QtAV/GLWidgetRenderer.h \
     QtAV/GraphicsItemRenderer.h \
     QtAV/ImageConverter.h \
     QtAV/QPainterRenderer.h \