January 2013 - MPlayer-cvslog - lists.mplayerhq.hu

r35906 - trunk/libmpcodecs/vf_stereo3d.c
by cehoyos 31 Jan '13

31 Jan '13

Author: cehoyos Date: Thu Jan 31 13:12:36 2013 New Revision: 35906 Log: Add more vf_stereo3d output formats. Adds high quality green-magenta and yellow-blue dubois anaglyph 3D output support. Patch by thomas schorpp, thomas.schorpp gmail Modified: trunk/libmpcodecs/vf_stereo3d.c Modified: trunk/libmpcodecs/vf_stereo3d.c ============================================================================== --- trunk/libmpcodecs/vf_stereo3d.c Sun Jan 27 16:33:31 2013 (r35905) +++ trunk/libmpcodecs/vf_stereo3d.c Thu Jan 31 13:12:36 2013 (r35906) @@ -45,6 +45,7 @@ typedef enum stereo_code { ANAGLYPH_GM_GRAY, //anaglyph green/magenta gray ANAGLYPH_GM_HALF, //anaglyph green/magenta half colored ANAGLYPH_GM_COLOR, //anaglyph green/magenta colored + ANAGLYPH_GM_DUBOIS, //anaglyph green/magenta dubois ANAGLYPH_YB_GRAY, //anaglyph yellow/blue gray ANAGLYPH_YB_HALF, //anaglyph yellow/blue half colored ANAGLYPH_YB_COLOR, //anaglyph yellow/blue colored @@ -104,6 +105,10 @@ static const int ana_coeff[][3][6] = { {{ 0, 0, 0, 65536, 0, 0}, { 0, 65536, 0, 0, 0, 0}, { 0, 0, 0, 0, 0, 65536}}, + [ANAGLYPH_GM_DUBOIS] = + {{-4063,-10354, -2556, 34669, 46203, 1573}, + {18612, 43778, 9372, -1049, -983, -4260}, + { -983, -1769, 1376, 590, 4915, 61407}}, [ANAGLYPH_YB_GRAY] = {{ 0, 0, 0, 19595, 38470, 7471}, { 0, 0, 0, 19595, 38470, 7471}, @@ -212,6 +217,7 @@ static int config(struct vf_instance *vf case ANAGLYPH_GM_GRAY: case ANAGLYPH_GM_HALF: case ANAGLYPH_GM_COLOR: + case ANAGLYPH_GM_DUBOIS: case ANAGLYPH_YB_GRAY: case ANAGLYPH_YB_HALF: case ANAGLYPH_YB_COLOR: @@ -339,9 +345,11 @@ static int put_image(struct vf_instance case ANAGLYPH_GM_GRAY: case ANAGLYPH_GM_HALF: case ANAGLYPH_GM_COLOR: + case ANAGLYPH_GM_DUBOIS: case ANAGLYPH_YB_GRAY: case ANAGLYPH_YB_HALF: - case ANAGLYPH_YB_COLOR: { + case ANAGLYPH_YB_COLOR: + case ANAGLYPH_YB_DUBOIS: { int i,x,y,il,ir,o; unsigned char *source = mpi->planes[0]; unsigned char *dest = dmpi->planes[0]; @@ -421,6 +429,8 @@ static const struct format_preset { {"anaglyph_green_magenta_half_color",ANAGLYPH_GM_HALF}, {"agmc", ANAGLYPH_GM_COLOR}, {"anaglyph_green_magenta_color", ANAGLYPH_GM_COLOR}, + {"agmd", ANAGLYPH_GM_DUBOIS}, + {"anaglyph_green_magenta_dubois", ANAGLYPH_GM_DUBOIS}, {"aybg", ANAGLYPH_YB_GRAY}, {"anaglyph_yellow_blue_gray", ANAGLYPH_YB_GRAY}, {"aybh", ANAGLYPH_YB_HALF},

1 0

r35834 - trunk/configure
by diego 28 Jan '13

28 Jan '13

Author: diego Date: Wed Jan 23 17:04:28 2013 New Revision: 35834 Log: configure: Unset HAVE_DIRECT_H if direct.h is not available. libdvdcss checks the value of that preprocessor symbol via #ifdef, so it needs to be explicitly undefined, not set to zero. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Wed Jan 23 15:36:36 2013 (r35833) +++ trunk/configure Wed Jan 23 17:04:28 2013 (r35834) @@ -3785,7 +3785,8 @@ header_check direct.h && _direct_h=yes if [ $_direct_h = yes ]; then def_direct_h='#define HAVE_DIRECT_H 1' else - def_direct_h='#define HAVE_DIRECT_H 0' + # libdvdcss checks this via #ifdef, so we need #undef here. + def_direct_h='#undef HAVE_DIRECT_H' fi echores "$_direct_h"

6 18

r35905 - trunk/libvo/gl_common.h
by reimar 27 Jan '13

27 Jan '13

Author: reimar Date: Sun Jan 27 16:33:31 2013 New Revision: 35905 Log: Switch from OpenGL.h to gl.h The former seems to miss some needed defines from OSX 10.8 on, and gl.h seems to work without issues at the very least down to 10.5 Modified: trunk/libvo/gl_common.h Modified: trunk/libvo/gl_common.h ============================================================================== --- trunk/libvo/gl_common.h Sun Jan 27 16:24:56 2013 (r35904) +++ trunk/libvo/gl_common.h Sun Jan 27 16:33:31 2013 (r35905) @@ -46,7 +46,7 @@ #endif #ifdef CONFIG_GL_OSX #include "osx_common.h" -#include <OpenGL/OpenGL.h> +#include <OpenGL/gl.h> #else #include <GL/gl.h> #endif

1 0

r35904 - trunk/libvo/x11_common.c
by ib 27 Jan '13

27 Jan '13

Author: ib Date: Sun Jan 27 16:24:56 2013 New Revision: 35904 Log: Cosmetic: Adjust indent. Modified: trunk/libvo/x11_common.c Modified: trunk/libvo/x11_common.c ============================================================================== --- trunk/libvo/x11_common.c Sun Jan 27 16:23:39 2013 (r35903) +++ trunk/libvo/x11_common.c Sun Jan 27 16:24:56 2013 (r35904) @@ -941,9 +941,9 @@ int vo_x11_check_events(Display * mydisp break; case MapNotify: if (WinID < 0) { - vo_hint.win_gravity = old_gravity; - XSetWMNormalHints(mDisplay, vo_window, &vo_hint); - vo_fs_flip = 0; + vo_hint.win_gravity = old_gravity; + XSetWMNormalHints(mDisplay, vo_window, &vo_hint); + vo_fs_flip = 0; } break; case DestroyNotify:

1 0

r35903 - trunk/libvo/x11_common.c
by ib 27 Jan '13

27 Jan '13

Author: ib Date: Sun Jan 27 16:23:39 2013 New Revision: 35903 Log: Don't destroy a -wid window's WM_NORMAL_HINTS property information. MPlayer doesn't handle vo_hint when attached to an existing window and vo_hint has even never been set in that case. The MapNotify event adjusts win_gravity and vo_fs_flip which previously have only been changed in vo_x11_fullscreen(), but in case MPlayer is attached to an existing window, vo_x11_fullscreen() immediately returns and doesn't change these variables so there is no reason for adjustment anyway. Modified: trunk/libvo/x11_common.c Modified: trunk/libvo/x11_common.c ============================================================================== --- trunk/libvo/x11_common.c Sun Jan 27 13:15:19 2013 (r35902) +++ trunk/libvo/x11_common.c Sun Jan 27 16:23:39 2013 (r35903) @@ -940,9 +940,11 @@ int vo_x11_check_events(Display * mydisp } break; case MapNotify: + if (WinID < 0) { vo_hint.win_gravity = old_gravity; XSetWMNormalHints(mDisplay, vo_window, &vo_hint); vo_fs_flip = 0; + } break; case DestroyNotify: mp_msg(MSGT_VO, MSGL_WARN, "Our window was destroyed, exiting\n");

1 0

r35902 - trunk/configure
by al 27 Jan '13

27 Jan '13

Author: al Date: Sun Jan 27 13:15:19 2013 New Revision: 35902 Log: build: configure: Simplify check for alloca Just test the _alloca variable instead of re-running the compiler. The oversight was introduced in r32246 Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sat Jan 26 17:44:34 2013 (r35901) +++ trunk/configure Sun Jan 27 13:15:19 2013 (r35902) @@ -3633,7 +3633,7 @@ echores "$posix_memalign" echocheck "alloca.h" _alloca=no statement_check alloca.h 'alloca(0)' && _alloca=yes -if cc_check ; then +if test "$_alloca" = yes ; then def_alloca_h='#define HAVE_ALLOCA_H 1' else def_alloca_h='#undef HAVE_ALLOCA_H'

1 0

r35901 - trunk/gui/ui/main.c
by ib 26 Jan '13

26 Jan '13

Author: ib Date: Sat Jan 26 17:44:34 2013 New Revision: 35901 Log: Comment code with no effect. The expression can never be true and its intention is unclear. Reported by Hans-Dieter Kosch, hdkosch kabelbw de. Modified: trunk/gui/ui/main.c Modified: trunk/gui/ui/main.c ============================================================================== --- trunk/gui/ui/main.c Sat Jan 26 16:35:10 2013 (r35900) +++ trunk/gui/ui/main.c Sat Jan 26 17:44:34 2013 (r35901) @@ -123,7 +123,8 @@ static void uiMainMouse( int Button,int item=&guiApp.mainItems[SelectedItem]; itemtype=item->type; item->pressed=btnPressed; - switch( item->type ) + // NOTE TO MYSELF: commented, because the expression can never be true + /*switch( item->type ) { case itButton: if ( ( SelectedItem > -1 ) && @@ -131,7 +132,7 @@ static void uiMainMouse( int Button,int ( ( item->message == evPauseSwitchToPlay && item->message == evPlaySwitchToPause ) ) ) ) { item->pressed=btnDisabled; } break; - } + }*/ break; case wsRLMouseButton: boxMoved=False;

1 0

r35900 - trunk/gui/ui/actions.c
by ib 26 Jan '13

26 Jan '13

Author: ib Date: Sat Jan 26 16:35:10 2013 New Revision: 35900 Log: Cosmetic: Adjust indent. Modified: trunk/gui/ui/actions.c Modified: trunk/gui/ui/actions.c ============================================================================== --- trunk/gui/ui/actions.c Sat Jan 26 16:32:37 2013 (r35899) +++ trunk/gui/ui/actions.c Sat Jan 26 16:35:10 2013 (r35900) @@ -619,9 +619,9 @@ void uiChangeSkin(char *name) if (!guiInfo.Playing) { if (!guiApp.videoWindow.isFullScreen) { - wsWindowResize(&guiApp.videoWindow, guiApp.video.width, guiApp.video.height); - wsWindowMove(&guiApp.videoWindow, False, guiApp.video.x, guiApp.video.y); - } + wsWindowResize(&guiApp.videoWindow, guiApp.video.width, guiApp.video.height); + wsWindowMove(&guiApp.videoWindow, False, guiApp.video.x, guiApp.video.y); + } wsWindowRedraw(&guiApp.videoWindow); }

1 0

r35899 - trunk/gui/ui/actions.c
by ib 26 Jan '13

26 Jan '13

Author: ib Date: Sat Jan 26 16:32:37 2013 New Revision: 35899 Log: Restructure code for video window in uiChangeSkin(). Compact the conditions. It's much clearer now what's happening. Additionally, change comment to indicate that the video window will not be reloaded (like all other windows). Modified: trunk/gui/ui/actions.c Modified: trunk/gui/ui/actions.c ============================================================================== --- trunk/gui/ui/actions.c Sat Jan 26 02:07:36 2013 (r35898) +++ trunk/gui/ui/actions.c Sat Jan 26 16:32:37 2013 (r35899) @@ -610,21 +610,21 @@ void uiChangeSkin(char *name) wsWindowVisibility(&guiApp.mainWindow, wsShowWindow); mainVisible = True; - /* reload video window (must be second!) */ + /* adjust video window */ - if (guiApp.video.Bitmap.Image) + if (guiApp.video.Bitmap.Image) { wsImageResize(&guiApp.videoWindow, guiApp.video.Bitmap.Width, guiApp.video.Bitmap.Height); + wsImageRender(&guiApp.videoWindow, guiApp.video.Bitmap.Image); + } - if (!guiApp.videoWindow.isFullScreen && !guiInfo.Playing) { + if (!guiInfo.Playing) { + if (!guiApp.videoWindow.isFullScreen) { wsWindowResize(&guiApp.videoWindow, guiApp.video.width, guiApp.video.height); wsWindowMove(&guiApp.videoWindow, False, guiApp.video.x, guiApp.video.y); } - if (guiApp.video.Bitmap.Image) - wsImageRender(&guiApp.videoWindow, guiApp.video.Bitmap.Image); - - if (!guiInfo.Playing) wsWindowRedraw(&guiApp.videoWindow); + } /* reload playbar */

1 0

r35898 - trunk/gui/ui/actions.c
by ib 26 Jan '13

26 Jan '13

Author: ib Date: Sat Jan 26 02:07:36 2013 New Revision: 35898 Log: Remove code almost identical to uiMenuDone() plus uiMenuInit(). Nothing but uiMenuDone() destroys the menu and nothing but uiMenuInit() builds it. This is analogous to rebuilding the playbar now. Modified: trunk/gui/ui/actions.c Modified: trunk/gui/ui/actions.c ============================================================================== --- trunk/gui/ui/actions.c Sat Jan 26 01:53:25 2013 (r35897) +++ trunk/gui/ui/actions.c Sat Jan 26 02:07:36 2013 (r35898) @@ -635,21 +635,10 @@ void uiChangeSkin(char *name) /* reload menu window */ - if (was_menu && guiApp.menuIsPresent) { - free(menuDrawBuffer); - menuDrawBuffer = calloc(1, guiApp.menu.Bitmap.ImageSize); - - if (!menuDrawBuffer) { - gmp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_NEMDB); - mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0); - } + if (was_menu) + uiMenuDone(); - wsWindowResize(&guiApp.menuWindow, guiApp.menu.width, guiApp.menu.height); - wsImageResize(&guiApp.menuWindow, guiApp.menu.width, guiApp.menu.height); - wsWindowShape(&guiApp.menuWindow, guiApp.menu.Mask.Image); - wsWindowVisibility(&guiApp.menuWindow, wsHideWindow); - } else - uiMenuInit(); + uiMenuInit(); /* */

1 0