[MPlayer-cvslog] r34463 - in trunk: DOCS/man/en/mplayer.1 libvo/gl_common.c libvo/gl_common.h libvo/vo_gl.c

[reimar]

Author: reimar
Date: Fri Dec 23 23:34:42 2011
New Revision: 34463

Log:
vo_gl stereo: allow swapping left and right view.

Modified:
   trunk/libvo/gl_common.c
   trunk/libvo/gl_common.h
   trunk/libvo/vo_gl.c

Changes in other areas also in this revision:
Modified:
   trunk/DOCS/man/en/mplayer.1

Modified: trunk/libvo/gl_common.c
==============================================================================
--- trunk/libvo/gl_common.c	Fri Dec 23 22:52:04 2011	(r34462)
+++ trunk/libvo/gl_common.c	Fri Dec 23 23:34:42 2011	(r34463)
@@ -1590,6 +1590,8 @@ void glDisableYUVConversion(GLenum targe
 
 void glEnable3DLeft(int type) {
   GLint buffer;
+  if (type & GL_3D_SWAP)
+    return glEnable3DRight(type & ~GL_3D_SWAP);
   switch (type) {
     case GL_3D_RED_CYAN:
       mpglColorMask(GL_TRUE,  GL_FALSE, GL_FALSE, GL_FALSE);
@@ -1618,6 +1620,8 @@ void glEnable3DLeft(int type) {
 
 void glEnable3DRight(int type) {
   GLint buffer;
+  if (type & GL_3D_SWAP)
+    return glEnable3DLeft(type & ~GL_3D_SWAP);
   switch (type) {
     case GL_3D_RED_CYAN:
       mpglColorMask(GL_FALSE, GL_TRUE,  GL_TRUE,  GL_FALSE);

Modified: trunk/libvo/gl_common.h
==============================================================================
--- trunk/libvo/gl_common.h	Fri Dec 23 22:52:04 2011	(r34462)
+++ trunk/libvo/gl_common.h	Fri Dec 23 23:34:42 2011	(r34463)
@@ -386,6 +386,7 @@ void glSetupYUVConversion(gl_conversion_
 void glEnableYUVConversion(GLenum target, int type);
 void glDisableYUVConversion(GLenum target, int type);
 
+#define GL_3D_SWAP           32
 #define GL_3D_RED_CYAN        1
 #define GL_3D_GREEN_MAGENTA   2
 #define GL_3D_QUADBUFFER      3

Modified: trunk/libvo/vo_gl.c
==============================================================================
--- trunk/libvo/vo_gl.c	Fri Dec 23 22:52:04 2011	(r34462)
+++ trunk/libvo/vo_gl.c	Fri Dec 23 23:34:42 2011	(r34463)
@@ -1292,7 +1292,7 @@ static int preinit_internal(const char *
               "    generate mipmaps for the video image (use with TXB in customprog)\n"
               "  osdcolor=<0xAARRGGBB>\n"
               "    use the given color for the OSD\n"
-              "  stereo=<n>\n"
+              "  stereo=<n> (add 32 to swap left and right)\n"
               "    0: normal display\n"
               "    1: side-by-side to red-cyan stereo\n"
               "    2: side-by-side to green-magenta stereo\n"