Ticket #2649: opengl.diff

mythtv-vid/configure

@@ -128 +128 @@
   echo "  --disable-xvmc-opengl    disable nVidia XvMC OpenGL texture method"
   echo "  --xvmc-lib=LIB           XvMC library override (for crosscompiling)"
   #echo "  --disable-xvmc-vld       disable XvMC-VLD (VIA Epia MPEG accel.)"
+  echo "  --enable-opengl-video    enable opengl based video display "
   echo "  --enable-mac-accel       enable Mac OS X MPEG acceleration"
   echo "  --enable-opengl-vsync    enable OpenGL vsync method"
   echo "  --enable-directfb        enable DirectFB  (Linux non-X11 video)"
@@ -419 +420 @@
 xvmc_pro="no"
 xvmc_opengl="no"
 xvmc_lib=""
+opengl_video="no"
 dvdv="no"
 mac_corevideo="no"
 opengl_vsync="no"
@@ -1171 +1173 @@
   ;;
   --xvmc-lib=*) xvmc_lib="$optval"
   ;;
+  --enable-opengl-video) opengl_video="yes"
+  ;;
+  --disable-opengl-video) opengl_video="no"
+  ;;
   --enable-mac-accel) dvdv="yes"
   ;;
   --disable-mac-accel) dvdv="no"
@@ -2540 +2546 @@
 fi
 
 if ! has_library libGL ; then
+    opengl_video="no"
     xvmc_opengl="no"
     opengl_vsync="no"
 fi
@@ -2552 +2559 @@
     opengl="yes"
 fi
 
+if test x"$opengl_video" = x"yes" ; then
+    opengl="yes"
+fi
+
 if test x"$dvdv" = x"yes" ; then
     # Can only do Mac accel on Mac platform
     if test $targetos != Darwin; then
@@ -2729 +2740 @@
 if test "$VENDOR_XVMC_LIBS" != "" ; then
   echo "XvMC libs        $VENDOR_XVMC_LIBS"
 fi
+  echo "OpenGL video     $opengl_video"
   echo "Mac acceleration $dvdv"
   echo "OpenGL vsync     $opengl_vsync"
   echo "DirectFB         $direct_fb"
@@ -3477 +3489 @@
   fi
 fi
 
+if test x"$opengl_video" = x"yes"; then
+  CCONFIG="$CCONFIG using_opengl_video"
+fi
+
 if test x"$direct_fb" = x"yes" ; then
   CCONFIG="$CCONFIG using_directfb"
   echo "CONFIG_DIRECTFB_LIBS=$CONFIG_DIRECTFB_LIBS" >> $MYTH_CONFIG_MAK

mythtv-vid/libs/libmythtv/libmythtv.pro

@@ -290 +290 @@
     using_xvmc_opengl:DEFINES += USING_XVMC_OPENGL
     using_opengl_vsync:DEFINES += USING_OPENGL_VSYNC
 
+    using_opengl_video:DEFINES += USING_OPENGL_VIDEO
+    using_opengl_video:HEADERS += videoout_opengl.h
+    using_opengl_video:SOURCES += videoout_opengl.cpp
+
     # Misc. frontend
     HEADERS += guidegrid.h              infostructs.h
     HEADERS += progfind.h               ttfont.h

mythtv-vid/libs/libmythtv/videooutbase.cpp

@@ -28 +28 @@
 #include "videoout_quartz.h"
 #endif
 
+#ifdef USING_OPENGL_VIDEO
+#include "videoout_opengl.h"
+#endif
+
 #include "videoout_null.h"
 
 #include "dithertable.h"
@@ -49 +53 @@
 {
     (void)type;
 
+#ifdef USING_OPENGL_VIDEO
+    if (gContext->GetNumSetting("UseOpenglVideo", false))
+        return new VideoOutputOpengl();
+#endif
+
 #ifdef USING_IVTV
     if (type == kVideoOutput_IVTV)
         return new VideoOutputIvtv();

mythtv-vid/libs/libmythtv/videodisplayprofile.cpp

@@ -923 +923 @@
 "xv-blit"
 "xvmc-blit"
 "xvmc-opengl"
+"opengl"
 "directfb"
 "directx"
 "quartz-blit"
@@ -958 +959 @@
     safe_custom += "directx";
     safe_custom += "quartz-blit";
     safe_custom += "xv-blit";
+#ifdef USING_OPENGL_VIDEO
+    safe_custom += "opengl";
+#endif
 
     safe_list_t::const_iterator it;
     for (it = safe_custom.begin(); it != safe_custom.end(); ++it)
@@ -1004 +1008 @@
         safe_renderer[*it2] += "directx";
         safe_renderer[*it2] += "quartz-blit";
         safe_renderer[*it2] += "xv-blit";
+#ifdef USING_OPENGL_VIDEO
+        safe_renderer[*it2] += "opengl";
+#endif
     }
 
     safe_renderer["xvmc"]     += "xvmc-blit";