November 2005 - MPlayer-cvslog - lists.mplayerhq.hu

CVS: main configure,1.1089,1.1090
by syncmail＠mplayerhq.hu 03 Nov '05

03 Nov '05

CVS change done by Diego Biurrun CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv3293 Modified Files: configure Log Message: Simplification of the system_name check and the PPC CPU type check. Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.1089 retrieving revision 1.1090 diff -u -r1.1089 -r1.1090 --- configure 23 Oct 2005 11:26:36 -0000 1.1089 +++ configure 23 Oct 2005 12:39:47 -0000 1.1090 @@ -477,7 +477,7 @@ # OS name system_name=`uname -s 2>&1` case "$system_name" in - Linux|FreeBSD|NetBSD|BSD/OS|OpenBSD|SunOS|QNX|Darwin|GNU|BeOS) + Linux|FreeBSD|NetBSD|BSD/OS|OpenBSD|SunOS|QNX|Darwin|GNU|BeOS|MorphOS) ;; IRIX*) system_name=IRIX @@ -491,9 +491,6 @@ MINGW32*) system_name=MINGW32 ;; - MorphOS) - system_name=MorphOS - ;; *) system_name="$system_name-UNKNOWN" ;; @@ -1136,22 +1133,22 @@ _altivec=no echocheck "CPU type" - if linux && test -n "$_cpuinfo"; then + case $system_name in + Linux) proc=`$_cpuinfo | grep 'cpu' | cut -d ':' -f 2 | cut -d ',' -f 1 | cut -b 2- | _head 1` if test -n "`$_cpuinfo | grep altivec`"; then _altivec=yes fi - fi - if darwin ; then + ;; + Darwin) proc=`$_cpuinfo | grep "Processor type" | cut -f 3 -d ' ' | sed 's/ppc//'` - if [ `sysctl -n hw.vectorunit` -eq 1 ]; then - _altivec=yes - elif [ "`sysctl -n hw.optional.altivec 2>/dev/null`" = 1 ]; then + if [ `sysctl -n hw.vectorunit` -eq 1 -o + "`sysctl -n hw.optional.altivec 2>/dev/null`" -eq 1 ]; then _altivec=yes fi - fi - # only gcc 3.4 works reliably with altivec code under netbsd - if netbsd ; then + ;; + NetBSD) + # only gcc 3.4 works reliably with AltiVec code under NetBSD case $cc_version in 2*|3.0*|3.1*|3.2*|3.3*) ;; @@ -1161,7 +1158,8 @@ fi ;; esac - fi + ;; + esac if test "$_altivec" = yes; then echores "$proc altivec" else

3 2

CVS: main/libvo vo_dfbmga.c,1.30,1.31
by syncmail＠mplayerhq.hu 03 Nov '05

03 Nov '05

CVS change done by Paolo Tresoldi (PaulTT) Update of /cvsroot/mplayer/main/libvo In directory mail:/var2/tmp/cvs-serv8750/libvo Modified Files: vo_dfbmga.c Log Message: changed KEY_PREVIOUS to KEY_PREV, cause the first undefined Index: vo_dfbmga.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_dfbmga.c,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- vo_dfbmga.c 2 Nov 2005 21:50:55 -0000 1.30 +++ vo_dfbmga.c 3 Nov 2005 10:50:43 -0000 1.31 @@ -1500,7 +1500,7 @@ mplayer_put_key( KEY_REWIND ); break; case DIKS_PREVIOUS: - mplayer_put_key( KEY_PREVIOUS ); + mplayer_put_key( KEY_PREV ); break; case DIKS_VOLUME_UP: mplayer_put_key( KEY_VOLUME_UP );

1 0

CVS: main/DOCS/tech libao2.txt,1.2,1.3
by syncmail＠mplayerhq.hu 03 Nov '05

03 Nov '05

CVS change done by Reynaldo H. Verdejo CVS Update of /cvsroot/mplayer/main/DOCS/tech In directory mail:/var2/tmp/cvs-serv12029/DOCS/tech Modified Files: libao2.txt Log Message: typo fix bust/must Index: libao2.txt =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/tech/libao2.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libao2.txt 17 Apr 2004 23:19:21 -0000 1.2 +++ libao2.txt 3 Nov 2005 04:04:22 -0000 1.3 @@ -63,7 +63,7 @@ static int control(int cmd, int arg); This is for reading/setting plugin-specific and other special parameters and can be used for keyboard input for example. All - plugins bust respond to cmd=AOCONTROL_PLUGIN_SET_LEN which is part + plugins must respond to cmd=AOCONTROL_PLUGIN_SET_LEN which is part of the initialization of the plugin. When this command is received the parameter pl_delay.len will contain the maximum size of data the plugin can produce. This can be used for calculating and allocating

1 0

CVS: main/libvo vo_dfbmga.c, 1.29, 1.30 vo_directfb2.c, 1.20, 1.21 vo_directx.c, 1.56, 1.57 vo_quartz.c, 1.56, 1.57 vo_sdl.c, 1.122, 1.123 vo_winvidix.c, 1.10, 1.11 w32_common.c, 1.15, 1.16 x11_common.c, 1.197, 1.198
by syncmail＠mplayerhq.hu 02 Nov '05

02 Nov '05

CVS change done by Alban Bedel CVS Update of /cvsroot/mplayer/main/libvo In directory mail:/var2/tmp/cvs-serv3818/libvo Modified Files: vo_dfbmga.c vo_directfb2.c vo_directx.c vo_quartz.c vo_sdl.c vo_winvidix.c w32_common.c x11_common.c Log Message: libvo input cleanup: remove the dependency on libinput, remove most of the crappy mappings (like O->o or ESC->q). Index: vo_dfbmga.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_dfbmga.c,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- vo_dfbmga.c 26 Oct 2005 07:41:41 -0000 1.29 +++ vo_dfbmga.c 2 Nov 2005 21:50:55 -0000 1.30 @@ -1439,7 +1439,7 @@ if (event.type == DIET_KEYPRESS) { switch (event.key_symbol) { case DIKS_ESCAPE: - mplayer_put_key( 'q' ); + mplayer_put_key( KEY_ESC ); break; case DIKS_PAGE_UP: mplayer_put_key( KEY_PAGE_UP ); @@ -1473,33 +1473,43 @@ break; case DIKS_POWER: - mplayer_put_key( 'q' ); + mplayer_put_key( KEY_POWER ); break; case DIKS_MENU: - mplayer_put_key( 'o' ); + mplayer_put_key( KEY_MENU ); break; case DIKS_PLAY: + mplayer_put_key( KEY_PLAY ); + break; case DIKS_STOP: + mplayer_put_key( KEY_STOP ); + break; case DIKS_PAUSE: + mplayer_put_key( KEY_PAUSE ); + break; case DIKS_PLAYPAUSE: - mplayer_put_key( ' ' ); + mplayer_put_key( KEY_PLAYPAUSE ); break; case DIKS_FORWARD: + mplayer_put_key( KEY_FORWARD ); + break; case DIKS_NEXT: - mplayer_put_key( KEY_PAGE_UP ); + mplayer_put_key( KEY_NEXT ); break; case DIKS_REWIND: + mplayer_put_key( KEY_REWIND ); + break; case DIKS_PREVIOUS: - mplayer_put_key( KEY_PAGE_DOWN ); + mplayer_put_key( KEY_PREVIOUS ); break; case DIKS_VOLUME_UP: - mplayer_put_key( '0' ); + mplayer_put_key( KEY_VOLUME_UP ); break; case DIKS_VOLUME_DOWN: - mplayer_put_key( '9' ); + mplayer_put_key( KEY_VOLUME_DOWN ); break; case DIKS_MUTE: - mplayer_put_key( 'm' ); + mplayer_put_key( KEY_MUTE ); break; default: Index: vo_directfb2.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_directfb2.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- vo_directfb2.c 5 Aug 2005 01:24:36 -0000 1.20 +++ vo_directfb2.c 2 Nov 2005 21:50:55 -0000 1.21 @@ -909,7 +909,7 @@ if (event.type == DIET_KEYPRESS) { switch (event.key_symbol) { case DIKS_ESCAPE: - mplayer_put_key('q'); + mplayer_put_key(KEY_ESC); break; case DIKS_PAGE_UP: mplayer_put_key(KEY_PAGE_UP);break; case DIKS_PAGE_DOWN: mplayer_put_key(KEY_PAGE_DOWN);break; Index: vo_directx.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_directx.c,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- vo_directx.c 16 Sep 2005 12:09:24 -0000 1.56 +++ vo_directx.c 2 Nov 2005 21:50:55 -0000 1.57 @@ -889,7 +889,7 @@ } case WM_CLOSE: { - mp_input_queue_cmd(mp_input_parse_cmd("quit")); + mplayer_put_key(KEY_CLOSE_WIN); return 0; } case WM_WINDOWPOSCHANGED: Index: vo_quartz.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_quartz.c,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- vo_quartz.c 21 Aug 2005 01:20:31 -0000 1.56 +++ vo_quartz.c 2 Nov 2005 21:50:55 -0000 1.57 @@ -378,7 +378,7 @@ switch ( theHICommand.commandID ) { case kHICommandQuit: - mplayer_put_key(KEY_ESC); + mplayer_put_key(KEY_CLOSE_WIN); break; case kHalfScreenCmd: @@ -476,7 +476,7 @@ { case kEventWindowClosed: theWindow = NULL; - mplayer_put_key(KEY_ESC); + mplayer_put_key(KEY_CLOSE_WIN); break; //resize window Index: vo_sdl.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_sdl.c,v retrieving revision 1.122 retrieving revision 1.123 diff -u -r1.122 -r1.123 --- vo_sdl.c 5 Aug 2005 01:24:36 -0000 1.122 +++ vo_sdl.c 2 Nov 2005 21:50:55 -0000 1.123 @@ -1320,7 +1320,7 @@ } break; - case SDL_QUIT: mplayer_put_key('q');break; + case SDL_QUIT: mplayer_put_key(KEY_CLOSE_WIN);break; } } } Index: vo_winvidix.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_winvidix.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- vo_winvidix.c 21 Aug 2005 01:20:31 -0000 1.10 +++ vo_winvidix.c 2 Nov 2005 21:50:55 -0000 1.11 @@ -65,7 +65,7 @@ PostQuitMessage(0); return 0; case WM_CLOSE: - mp_input_queue_cmd(mp_input_parse_cmd("quit")); + mplayer_put_key(KEY_CLOSE_WIN); break; case WM_WINDOWPOSCHANGED: { Index: w32_common.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/w32_common.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- w32_common.c 22 Aug 2005 09:05:18 -0000 1.15 +++ w32_common.c 2 Nov 2005 21:50:55 -0000 1.16 @@ -25,7 +25,7 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { switch (message) { case WM_CLOSE: - mp_input_queue_cmd(mp_input_parse_cmd("quit")); + mplayer_put_key(KEY_CLOSE_WIN); break; case WM_SYSCOMMAND: switch (wParam) { Index: x11_common.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/x11_common.c,v retrieving revision 1.197 retrieving revision 1.198 diff -u -r1.197 -r1.198 --- x11_common.c 18 Oct 2005 11:11:25 -0000 1.197 +++ x11_common.c 2 Nov 2005 21:50:55 -0000 1.198 @@ -548,16 +548,16 @@ switch (keysym) { case XF86XK_AudioPause: - mplayer_put_key(KEY_XF86_PAUSE); + mplayer_put_key(KEY_PAUSE); break; case XF86XK_AudioStop: - mplayer_put_key(KEY_XF86_STOP); + mplayer_put_key(KEY_STOP); break; case XF86XK_AudioPrev: - mplayer_put_key(KEY_XF86_PREV); + mplayer_put_key(KEY_PREV); break; case XF86XK_AudioNext: - mplayer_put_key(KEY_XF86_NEXT); + mplayer_put_key(KEY_NEXT); break; default: break; @@ -587,6 +587,9 @@ case wsEscape: mplayer_put_key(KEY_ESC); break; + case wsTab: + mplayer_put_key(KEY_TAB); + break; case wsEnter: mplayer_put_key(KEY_ENTER); break; @@ -647,14 +650,6 @@ case wsF12: mplayer_put_key(KEY_F + 12); break; - case wsq: - case wsQ: - mplayer_put_key('q'); - break; - case wsp: - case wsP: - mplayer_put_key('p'); - break; case wsMinus: case wsGrayMinus: mplayer_put_key('-'); @@ -728,15 +723,6 @@ case wsGrayEnter: mplayer_put_key(KEY_KPENTER); break; - case wsm: - case wsM: - mplayer_put_key('m'); - break; - case wso: - case wsO: - mplayer_put_key('o'); - break; - case wsGrave: mplayer_put_key('`'); break;

1 0

CVS: main/osdep keycodes.h,1.3,1.4
by syncmail＠mplayerhq.hu 02 Nov '05

02 Nov '05

CVS change done by Alban Bedel CVS Update of /cvsroot/mplayer/main/osdep In directory mail:/var2/tmp/cvs-serv3818/osdep Modified Files: keycodes.h Log Message: libvo input cleanup: remove the dependency on libinput, remove most of the crappy mappings (like O->o or ESC->q). Index: keycodes.h =================================================================== RCS file: /cvsroot/mplayer/main/osdep/keycodes.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- keycodes.h 9 Apr 2003 17:05:39 -0000 1.3 +++ keycodes.h 2 Nov 2005 21:50:55 -0000 1.4 @@ -34,12 +34,21 @@ #define KEY_DOWN (KEY_CRSR+2) #define KEY_UP (KEY_CRSR+3) -/* XF86 Multimedia keyboard keys */ -#define KEY_XF86_BASE (0x100+384) -#define KEY_XF86_PAUSE (KEY_XF86_BASE+1) -#define KEY_XF86_STOP (KEY_XF86_BASE+2) -#define KEY_XF86_PREV (KEY_XF86_BASE+3) -#define KEY_XF86_NEXT (KEY_XF86_BASE+4) +/* Multimedia keyboard/remote keys */ +#define KEY_MM_BASE (0x100+384) +#define KEY_POWER (KEY_MM_BASE+0) +#define KEY_MENU (KEY_MM_BASE+1) +#define KEY_PLAY (KEY_MM_BASE+2) +#define KEY_PAUSE (KEY_MM_BASE+3) +#define KEY_PLAYPAUSE (KEY_MM_BASE+4) +#define KEY_STOP (KEY_MM_BASE+5) +#define KEY_FORWARD (KEY_MM_BASE+6) +#define KEY_REWIND (KEY_MM_BASE+7) +#define KEY_NEXT (KEY_MM_BASE+8) +#define KEY_PREV (KEY_MM_BASE+9) +#define KEY_VOLUME_UP (KEY_MM_BASE+10) +#define KEY_VOLUME_DOWN (KEY_MM_BASE+11) +#define KEY_MUTE (KEY_MM_BASE+12) /* Keypad keys */ #define KEY_KEYPAD (KEY_BASE+32) @@ -57,3 +66,7 @@ #define KEY_KPINS (KEY_KEYPAD+11) #define KEY_KPDEL (KEY_KEYPAD+12) #define KEY_KPENTER (KEY_KEYPAD+13) + +/* Special keys */ +#define KEY_INTERN (0x1000) +#define KEY_CLOSE_WIN (KEY_INTERN+0)

1 0

CVS: main/libmpdemux demux_ogg.c,1.81,1.82
by syncmail＠mplayerhq.hu 01 Nov '05

01 Nov '05

CVS change done by Reimar Döffinger CVS Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var2/tmp/cvs-serv22550/libmpdemux Modified Files: demux_ogg.c Log Message: Fix two (loosely) related bugs: massive A-V desync with -audiofile (bugzilla bug #375, sh_audio->delay must only be set when seeking, not at every packet) and not switching to the next file when seeking hits eof. Index: demux_ogg.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_ogg.c,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- demux_ogg.c 30 Oct 2005 09:19:05 -0000 1.81 +++ demux_ogg.c 1 Nov 2005 16:12:53 -0000 1.82 @@ -554,8 +554,6 @@ if (ds == d->video && ((sh_audio_t*)ds->sh)->format == FOURCC_THEORA) context = ((sh_video_t *)ds->sh)->context; data = demux_ogg_read_packet(os,pack,context,&pts,&flags,samplesize); - if(d->video->id < 0) - ((sh_audio_t*)ds->sh)->delay = pts; /// Clear subtitles if necessary (for broken files) if ((clear_sub > 0) && (pts >= clear_sub)) { @@ -1471,7 +1469,8 @@ } } if (pos < 0) pos = 0; - if (pos > (demuxer->movi_end - demuxer->movi_start)) return; + if (pos > (demuxer->movi_end - demuxer->movi_start)) + pos = demuxer->movi_end - demuxer->movi_start; } // if(ogg_d->syncpoints) while(1) { @@ -1500,8 +1499,8 @@ char* buf = ogg_sync_buffer(sync,BLOCK_SIZE); int len = stream_read(demuxer->stream,buf,BLOCK_SIZE); if(len == 0 && demuxer->stream->eof) { - mp_msg(MSGT_DEMUX,MSGL_ERR,"EOF while trying to seek !!!!\n"); - break; + mp_msg(MSGT_DEMUX,MSGL_V,"EOF while trying to seek !!!!\n"); + return; } ogg_sync_wrote(sync,len); continue; @@ -1556,6 +1555,8 @@ vo_osd_changed(OSDTYPE_SUBTITLE); clear_sub = -1; demux_ogg_add_packet(ds,os,ds->id,&op); + if (demuxer->video->id < 0) + sh_audio->delay = pts; return; } }

2 1

CVS: main/libmpcodecs vf_bmovl.c,1.11,1.12
by syncmail＠mplayerhq.hu 01 Nov '05

01 Nov '05

CVS change done by Reimar Döffinger CVS Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var2/tmp/cvs-serv32374 Modified Files: vf_bmovl.c Log Message: close stream_fd on uninit. Fixes bugzilla bug #400. Modified patch from T. Dekker {t dekker [at] student utwente nl}. Index: vf_bmovl.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_bmovl.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- vf_bmovl.c 10 Dec 2003 12:28:20 -0000 1.11 +++ vf_bmovl.c 1 Nov 2005 18:22:18 -0000 1.12 @@ -155,6 +155,8 @@ free(vf->priv->bitmap.v); free(vf->priv->bitmap.a); free(vf->priv->bitmap.oa); + if (vf->priv->stream_fd >= 0) + close(vf->priv->stream_fd); free(vf->priv); } }

1 0