April 2010 - MPlayer-cvslog - lists.mplayerhq.hu

r23524 - trunk/etc/codecs.conf
by compn 10 Jun '10

10 Jun '10

Author: compn Date: Sat Jun 9 00:59:04 2007 New Revision: 23524 Log: add mmes fourcc for mpeg2 in avi files Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf (original) +++ trunk/etc/codecs.conf Sat Jun 9 00:59:04 2007 @@ -58,6 +58,7 @@ videocodec mpeg12 fourcc MPEG fourcc hdv3 ; HDV 1080i50 fourcc mx5p ; MPEG IMX 625/50 (50 Mb/s) + fourcc MMES,mmes ; matrox mpeg2 in avi driver libmpeg2 ; dll "libmpeg2" out YV12,I420,IYUV @@ -85,6 +86,7 @@ videocodec ffmpeg2 fourcc MPEG fourcc hdv3 ; HDV 1080i50 fourcc mx5p ; MPEG IMX 625/50 (50 Mb/s) + fourcc MMES,mmes ; matrox mpeg2 in avi driver ffmpeg dll "mpeg2video" out YV12,I420,IYUV @@ -104,6 +106,7 @@ videocodec ffmpeg12 fourcc MPEG fourcc hdv3 ; HDV 1080i50 fourcc mx5p ; MPEG IMX 625/50 (50 Mb/s) + fourcc MMES,mmes ; matrox mpeg2 in avi driver ffmpeg dll "mpegvideo" out YV12,I420,IYUV @@ -122,6 +125,7 @@ videocodec ffmpeg12mc fourcc MPEG fourcc hdv3 ; HDV 1080i50 fourcc mx5p ; MPEG IMX 625/50 (50 Mb/s) + fourcc MMES,mmes ; matrox mpeg2 in avi driver ffmpeg dll "mpegvideo_xvmc" out IDCT_MPEG2

4 5

r31057 - trunk/configure
by diego 28 May '10

28 May '10

Author: diego Date: Thu Apr 22 16:02:20 2010 New Revision: 31057 Log: VIDIX only works for Linux on the x86_64 architecture, not on other OSes. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Thu Apr 22 15:53:13 2010 (r31056) +++ trunk/configure Thu Apr 22 16:02:20 2010 (r31057) @@ -4716,7 +4716,7 @@ if test "$_vidix" = auto ; then _vidix=no x86 && (linux || freebsd || netbsd || openbsd || dragonfly || sunos || win32) \ && _vidix=yes - x86_64 && win32 && _vidix=no + x86_64 && ! linux && _vidix=no (ppc || alpha) && linux && _vidix=yes fi echores "$_vidix"

3 2

r29721 - trunk/libvo/gl_common.c
by reimar 24 May '10

24 May '10

Author: reimar Date: Sun Sep 27 16:24:15 2009 New Revision: 29721 Log: Also check GLX client and server strings for extensions Modified: trunk/libvo/gl_common.c Modified: trunk/libvo/gl_common.c ============================================================================== --- trunk/libvo/gl_common.c Sat Sep 26 23:22:01 2009 (r29720) +++ trunk/libvo/gl_common.c Sun Sep 27 16:24:15 2009 (r29721) @@ -1563,6 +1563,21 @@ static XVisualInfo *getWindowVisualInfo( return XGetVisualInfo(mDisplay, VisualIDMask, &vinfo_template, &tmp); } +static void appendstr(char **dst, const char *str) +{ + int newsize; + char *newstr; + if (!str) + return; + newsize = strlen(*dst) + 1 + strlen(str) + 1; + newstr = realloc(*dst, newsize); + if (!newstr) + return; + *dst = newstr; + strcat(*dst, " "); + strcat(*dst, str); +} + /** * \brief Changes the window in which video is displayed. * If possible only transfers the context to the new window, otherwise @@ -1619,6 +1634,7 @@ int setGlWindow(XVisualInfo **vinfo, GLX if (!keep_context) { void *(*getProcAddress)(const GLubyte *); const char *(*glXExtStr)(Display *, int); + char *glxstr = strdup(""); if (*context) glXDestroyContext(mDisplay, *context); *context = new_context; @@ -1631,8 +1647,17 @@ int setGlWindow(XVisualInfo **vinfo, GLX if (!getProcAddress) getProcAddress = (void *)getdladdr; glXExtStr = getdladdr("glXQueryExtensionsString"); - getFunctions(getProcAddress, !glXExtStr ? NULL : - glXExtStr(mDisplay, DefaultScreen(mDisplay))); + if (glXExtStr) + appendstr(&glxstr, glXExtStr(mDisplay, DefaultScreen(mDisplay))); + glXExtStr = getdladdr("glXGetClientString"); + if (glXExtStr) + appendstr(&glxstr, glXExtStr(mDisplay, GLX_EXTENSIONS)); + glXExtStr = getdladdr("glXGetServerString"); + if (glXExtStr) + appendstr(&glxstr, glXExtStr(mDisplay, GLX_EXTENSIONS)); + + getFunctions(getProcAddress, glxstr); + free(glxstr); // and inform that reinit is neccessary return SET_WINDOW_REINIT;

4 6

r30728 - trunk/libvo/fastmemcpy.h
by diego 11 May '10

11 May '10

Author: diego Date: Thu Feb 25 14:20:56 2010 New Revision: 30728 Log: Unconditionally declare fast_memcpy() and mem2agpcpy(). This fixes the following warnings on non-x86 systems: libvo/aclib.c:162: warning: no previous prototype for 'fast_memcpy' libvo/aclib.c:196: warning: no previous prototype for 'mem2agpcpy' Modified: trunk/libvo/fastmemcpy.h Modified: trunk/libvo/fastmemcpy.h ============================================================================== --- trunk/libvo/fastmemcpy.h Thu Feb 25 10:09:57 2010 (r30727) +++ trunk/libvo/fastmemcpy.h Thu Feb 25 14:20:56 2010 (r30728) @@ -22,14 +22,12 @@ #include "config.h" #include <inttypes.h> #include <string.h> - -#if defined(CONFIG_FASTMEMCPY) && (HAVE_MMX || HAVE_MMX2 || HAVE_AMD3DNOW /* || HAVE_SSE || HAVE_SSE2 */) #include <stddef.h> void * fast_memcpy(void * to, const void * from, size_t len); void * mem2agpcpy(void * to, const void * from, size_t len); -#else +#if ! defined(CONFIG_FASTMEMCPY) && ! (HAVE_MMX || HAVE_MMX2 || HAVE_AMD3DNOW /* || HAVE_SSE || HAVE_SSE2 */) #define mem2agpcpy(a,b,c) memcpy(a,b,c) #define fast_memcpy(a,b,c) memcpy(a,b,c) #endif

3 2

r31109 - trunk/configure
by reimar 30 Apr '10

30 Apr '10

Author: reimar Date: Fri Apr 30 23:18:17 2010 New Revision: 31109 Log: Revert accidental change to default CFLAGS. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Fri Apr 30 21:04:13 2010 (r31108) +++ trunk/configure Fri Apr 30 23:18:17 2010 (r31109) @@ -2496,7 +2496,7 @@ elif test -z "$CFLAGS" ; then elif test "$cc_vendor" != "gnu" ; then CFLAGS="-O2 $_march $_mcpu $_pipe" else - CFLAGS="-g3 -Wall -Wno-switch -Wpointer-arith -Wredundant-decls -O4 $_march $_mcpu $_pipe -ffast-math -fomit-frame-pointer" + CFLAGS="-Wall -Wno-switch -Wpointer-arith -Wredundant-decls -O4 $_march $_mcpu $_pipe -ffast-math -fomit-frame-pointer" extra_ldflags="$extra_ldflags -ffast-math" fi else

1 0

r31108 - trunk/configure
by reimar 30 Apr '10

30 Apr '10

Author: reimar Date: Fri Apr 30 21:04:13 2010 New Revision: 31108 Log: Add configure detection for SDL backend for -vo gl. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Fri Apr 30 21:03:13 2010 (r31107) +++ trunk/configure Fri Apr 30 21:04:13 2010 (r31108) @@ -2496,7 +2496,7 @@ elif test -z "$CFLAGS" ; then elif test "$cc_vendor" != "gnu" ; then CFLAGS="-O2 $_march $_mcpu $_pipe" else - CFLAGS="-Wall -Wno-switch -Wpointer-arith -Wredundant-decls -O4 $_march $_mcpu $_pipe -ffast-math -fomit-frame-pointer" + CFLAGS="-g3 -Wall -Wno-switch -Wpointer-arith -Wredundant-decls -O4 $_march $_mcpu $_pipe -ffast-math -fomit-frame-pointer" extra_ldflags="$extra_ldflags -ffast-math" fi else @@ -5053,83 +5053,6 @@ echores "$_corevideo" fi #if darwin -# make sure this stays below CoreVideo to avoid issues due to namespace -# conflicts between -lGL and -framework OpenGL -echocheck "OpenGL" -#Note: this test is run even with --enable-gl since we autodetect linker flags -if (test "$_x11" = yes || win32) && test "$_gl" != no ; then - cat > $TMPC << EOF -#ifdef GL_WIN32 -#include <windows.h> -#include <GL/gl.h> -#else -#include <GL/gl.h> -#include <X11/Xlib.h> -#include <GL/glx.h> -#endif -int main(void) { -#ifdef GL_WIN32 - HDC dc; - wglCreateContext(dc); -#else - glXCreateContext(NULL, NULL, NULL, True); -#endif - glFinish(); - return 0; -} -EOF - _gl=no - for _ld_tmp in -lGL "-lGL -lXdamage" "-lGL $_ld_pthread" ; do - if cc_check $_ld_tmp $_ld_lm ; then - _gl=yes - _gl_x11=yes - libs_mplayer="$libs_mplayer $_ld_tmp $_ld_dl" - break - fi - done - if cc_check -DGL_WIN32 -lopengl32 ; then - _gl=yes - _gl_win32=yes - libs_mplayer="$libs_mplayer -lopengl32 -lgdi32" - fi -else - _gl=no -fi -if test "$_gl" = yes ; then - def_gl='#define CONFIG_GL 1' - _res_comment="backends:" - if test "$_gl_win32" = yes ; then - def_gl_win32='#define CONFIG_GL_WIN32 1' - _res_comment="$_res_comment win32" - fi - if test "$_gl_x11" = yes ; then - def_gl_x11='#define CONFIG_GL_X11 1' - _res_comment="$_res_comment x11" - fi - _vomodules="opengl $_vomodules" -else - def_gl='#undef CONFIG_GL' - def_gl_win32='#undef CONFIG_GL_WIN32' - def_gl_x11='#undef CONFIG_GL_X11' - _novomodules="opengl $_novomodules" -fi -echores "$_gl" - - -echocheck "MatrixView" -if test "$_gl" = no ; then - matrixview=no -fi -if test "$matrixview" = yes ; then - _vomodules="matrixview $_vomodules" - def_matrixview='#define CONFIG_MATRIXVIEW 1' -else - _novomodules="matrixview $_novomodules" - def_matrixview='#undef CONFIG_MATRIXVIEW' -fi -echores "$matrixview" - - echocheck "PNG support" if test "$_png" = auto ; then _png=no @@ -5420,6 +5343,114 @@ fi echores "$_sdl" +# make sure this stays below CoreVideo to avoid issues due to namespace +# conflicts between -lGL and -framework OpenGL +echocheck "OpenGL" +#Note: this test is run even with --enable-gl since we autodetect linker flags +if (test "$_x11" = yes || test "$_sdl" = yes || win32) && test "$_gl" != no ; then + cat > $TMPC << EOF +#ifdef GL_WIN32 +#include <windows.h> +#include <GL/gl.h> +#elif defined(GL_SDL) +#include <GL/gl.h> +#ifdef CONFIG_SDL_SDL_H +#include <SDL/SDL.h> +#else +#include <SDL.h> +#endif +#ifndef __APPLE__ +// we allow SDL hacking our main() only on OSX +#undef main +#endif +#else +#include <GL/gl.h> +#include <X11/Xlib.h> +#include <GL/glx.h> +#endif +int main(void) { +#ifdef GL_WIN32 + HDC dc; + wglCreateContext(dc); +#elif defined(GL_SDL) + SDL_GL_SwapBuffers(); +#else + glXCreateContext(NULL, NULL, NULL, True); +#endif + glFinish(); + return 0; +} +EOF + _gl=no + for _ld_tmp in "" -lGL "-lGL -lXdamage" "-lGL $_ld_pthread" ; do + if cc_check $_ld_tmp $_ld_lm ; then + _gl=yes + _gl_x11=yes + libs_mplayer="$libs_mplayer $_ld_tmp $_ld_dl" + break + fi + done + if cc_check -DGL_WIN32 -lopengl32 ; then + _gl=yes + _gl_win32=yes + libs_mplayer="$libs_mplayer -lopengl32 -lgdi32" + fi + # last so it can reuse any linker etc. flags detected before + if test "$_sdl" = yes ; then + if cc_check -DGL_SDL || + cc_check -DCONFIG_SDL_SDL_H -DGL_SDL ; then + _gl=yes + _gl_sdl=yes + elif cc_check -DGL_SDL -lGL || + cc_check -DCONFIG_SDL_SDL_H -DGL_SDL -lGL ; then + _gl=yes + _gl_sdl=yes + libs_mplayer="$libs_mplayer -lGL" + fi + fi +else + _gl=no +fi +if test "$_gl" = yes ; then + def_gl='#define CONFIG_GL 1' + _res_comment="backends:" + if test "$_gl_win32" = yes ; then + def_gl_win32='#define CONFIG_GL_WIN32 1' + _res_comment="$_res_comment win32" + fi + if test "$_gl_x11" = yes ; then + def_gl_x11='#define CONFIG_GL_X11 1' + _res_comment="$_res_comment x11" + fi + if test "$_gl_sdl" = yes ; then + def_gl_sdl='#define CONFIG_GL_SDL 1' + _res_comment="$_res_comment sdl" + fi + _vomodules="opengl $_vomodules" +else + def_gl='#undef CONFIG_GL' + def_gl_win32='#undef CONFIG_GL_WIN32' + def_gl_x11='#undef CONFIG_GL_X11' + def_gl_sdl='#undef CONFIG_GL_SDL' + _novomodules="opengl $_novomodules" +fi +echores "$_gl" + + +echocheck "MatrixView" +if test "$_gl" = no ; then + matrixview=no +fi +if test "$matrixview" = yes ; then + _vomodules="matrixview $_vomodules" + def_matrixview='#define CONFIG_MATRIXVIEW 1' +else + _novomodules="matrixview $_novomodules" + def_matrixview='#undef CONFIG_MATRIXVIEW' +fi +echores "$matrixview" + + if os2 ; then echocheck "KVA (SNAP/WarpOverlay!/DIVE)" if test "$_kva" = auto; then @@ -8536,6 +8567,7 @@ GGI = $_ggi GL = $_gl GL_WIN32 = $_gl_win32 GL_X11 = $_gl_x11 +GL_SDL = $_gl_sdl MATRIXVIEW = $matrixview GUI = $_gui GUI_GTK = $_gui_gtk @@ -9081,6 +9113,7 @@ $def_gif_tvt_hack $def_gl $def_gl_win32 $def_gl_x11 +$def_gl_sdl $def_matrixview $def_ivtv $def_jpeg

2 1

r31107 - trunk/libvo/gl_common.h
by reimar 30 Apr '10

30 Apr '10

Author: reimar Date: Fri Apr 30 21:03:13 2010 New Revision: 31107 Log: Avoid duplicating the GL/gl.h include. Modified: trunk/libvo/gl_common.h Modified: trunk/libvo/gl_common.h ============================================================================== --- trunk/libvo/gl_common.h Fri Apr 30 19:12:52 2010 (r31106) +++ trunk/libvo/gl_common.h Fri Apr 30 21:03:13 2010 (r31107) @@ -30,18 +30,14 @@ #ifdef CONFIG_GL_WIN32 #include <windows.h> -#include <GL/gl.h> #include "w32_common.h" #endif #ifdef CONFIG_GL_X11 -#include <GL/gl.h> #include <X11/Xlib.h> #include <GL/glx.h> #include "x11_common.h" #endif -#ifdef CONFIG_GL_SDL #include <GL/gl.h> -#endif // workaround for some gl.h headers #ifndef GLAPIENTRY

1 0

r31106 - trunk/libvo/vo_gl.c
by reimar 30 Apr '10

30 Apr '10

Author: reimar Date: Fri Apr 30 19:12:52 2010 New Revision: 31106 Log: 100l, open the customtex also in binary mode, not just the program. Modified: trunk/libvo/vo_gl.c Modified: trunk/libvo/vo_gl.c ============================================================================== --- trunk/libvo/vo_gl.c Wed Apr 28 13:57:09 2010 (r31105) +++ trunk/libvo/vo_gl.c Fri Apr 30 19:12:52 2010 (r31106) @@ -264,7 +264,7 @@ static void update_yuvconv(void) { texture_width, texture_height); } if (custom_tex) { - FILE *f = fopen(custom_tex, "r"); + FILE *f = fopen(custom_tex, "rb"); if (!f) mp_msg(MSGT_VO, MSGL_WARN, "[gl] Could not read customtex %s\n", custom_tex);

1 0

r31100 - trunk/libvo/x11_common.c
by diego 29 Apr '10

29 Apr '10

Author: diego Date: Tue Apr 27 17:16:42 2010 New Revision: 31100 Log: Move "screen" variable declaration below the relevant #ifdef, fixes the warning: libvo/x11_common.c:369: warning: unused variable 'screen' Modified: trunk/libvo/x11_common.c Modified: trunk/libvo/x11_common.c ============================================================================== --- trunk/libvo/x11_common.c Tue Apr 27 15:33:29 2010 (r31099) +++ trunk/libvo/x11_common.c Tue Apr 27 17:16:42 2010 (r31100) @@ -366,9 +366,9 @@ static void init_atoms(void) } void update_xinerama_info(void) { - int screen = xinerama_screen; xinerama_x = xinerama_y = 0; #ifdef CONFIG_XINERAMA + int screen = xinerama_screen; if (screen >= -1 && XineramaIsActive(mDisplay)) { XineramaScreenInfo *screens;

5 13

r31094 - trunk/libdvdcss/css.c
by reimar 29 Apr '10

29 Apr '10

Author: reimar Date: Sun Apr 25 18:39:39 2010 New Revision: 31094 Log: Try other methods also if GetBusKey fails instead of failing completely. Modified: trunk/libdvdcss/css.c Modified: trunk/libdvdcss/css.c ============================================================================== --- trunk/libdvdcss/css.c Sun Apr 25 18:20:54 2010 (r31093) +++ trunk/libdvdcss/css.c Sun Apr 25 18:39:39 2010 (r31094) @@ -379,7 +379,7 @@ int _dvdcss_titlekey( dvdcss_t dvdcss, i /* We need to authenticate again every time to get a new session key */ if( GetBusKey( dvdcss ) < 0 ) { - return -1; + i_ret = -1; } /* Get encrypted title key */

3 3