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

CVS: main mplayer.c,1.485,1.486
by Zoltan Ponekker 29 Apr '02

29 Apr '02

Update of /cvsroot/mplayer/main In directory mail:/var/tmp.root/cvs-serv19770 Modified Files: mplayer.c Log Message: fix fullscreen bug es ilyen libvo not initialized bug with gui igy Index: mplayer.c =================================================================== RCS file: /cvsroot/mplayer/main/mplayer.c,v retrieving revision 1.485 retrieving revision 1.486 diff -u -r1.485 -r1.486 --- mplayer.c 29 Apr 2002 21:31:56 -0000 1.485 +++ mplayer.c 29 Apr 2002 22:00:47 -0000 1.486 @@ -2945,16 +2945,6 @@ eof = eof == PT_PREV_SRC ? -1 : 1; } -#ifdef HAVE_NEW_GUI - if( use_gui && !playtree_iter ) - { -#ifdef USE_DVDREAD - if ( !guiIntfStruct.DVDChanged ) -#endif - mplStop(); - } -#endif - if(eof == 0) eof = 1; while(playtree_iter != NULL) { @@ -2967,6 +2957,16 @@ } else break; } + +#ifdef HAVE_NEW_GUI + if( use_gui && !playtree_iter ) + { +#ifdef USE_DVDREAD + if ( !guiIntfStruct.DVDChanged ) +#endif + mplStop(); + } +#endif if(use_gui || playtree_iter != NULL #if defined( HAVE_NEW_GUI ) && defined( USE_DVDREAD )

1 0

CVS: main/libvo x11_common.c,1.67,1.68
by Zoltan Ponekker 29 Apr '02

29 Apr '02

Update of /cvsroot/mplayer/main/libvo In directory mail:/var/tmp.root/cvs-serv19770/libvo Modified Files: x11_common.c Log Message: fix fullscreen bug es ilyen libvo not initialized bug with gui igy Index: x11_common.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/x11_common.c,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- x11_common.c 25 Apr 2002 21:52:47 -0000 1.67 +++ x11_common.c 29 Apr 2002 22:00:50 -0000 1.68 @@ -542,13 +542,18 @@ break; #endif case PropertyNotify: - if ( !strcmp( XGetAtomName( mydisplay,Event.xproperty.atom ),"_ICEWM_TRAY" ) || - !strncmp( XGetAtomName( mydisplay,Event.xproperty.atom ),"_KDE_",5 ) || - !strcmp( XGetAtomName( mydisplay,Event.xproperty.atom ),"KWM_WIN_DESKTOP" ) ) vo_wm_type=0; + { + char * name = XGetAtomName( mydisplay,Event.xproperty.atom ); + if ( !name ) break; + if ( !strncmp( name,"_ICEWM_TRAY",11 ) || + !strncmp( name,"_KDE_",5 ) || + !strncmp( name,"KWM_WIN_DESKTOP",15 ) ) vo_wm_type=0; fprintf(stderr,"[ws] PropertyNotify ( 0x%x ) %s ( 0x%x )\n", - vo_window,XGetAtomName( mydisplay,Event.xproperty.atom ),Event.xproperty.atom ); - + vo_window,name,Event.xproperty.atom ); + + XFree( name ); + } break; } } @@ -589,7 +594,7 @@ vo_x11_sizehint( vo_dx,vo_dy,vo_dwidth,vo_dheight,0 ); XMoveResizeWindow( mDisplay,vo_window,vo_dx,vo_dy,vo_dwidth,vo_dheight ); XMapRaised( mDisplay,vo_window ); - + XRaiseWindow( mDisplay,vo_window ); XFlush( mDisplay ); }

1 0

CVS: main/Gui/wm ws.c,1.33,1.34
by Zoltan Ponekker 29 Apr '02

29 Apr '02

Update of /cvsroot/mplayer/main/Gui/wm In directory mail:/var/tmp.root/cvs-serv19770/Gui/wm Modified Files: ws.c Log Message: fix fullscreen bug es ilyen libvo not initialized bug with gui igy Index: ws.c =================================================================== RCS file: /cvsroot/mplayer/main/Gui/wm/ws.c,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- ws.c 10 Mar 2002 23:05:44 -0000 1.33 +++ ws.c 29 Apr 2002 22:00:49 -0000 1.34 @@ -50,6 +50,7 @@ Window wsRootWin; XEvent wsEvent; int wsWindowDepth; +int wsWMType = 1; GC wsHGC; MotifWmHints wsMotifWmHints; Atom wsTextProperlyAtom = None; @@ -337,6 +338,7 @@ win->AtomWMSizeHint=XInternAtom( wsDisplay,"WM_SIZE_HINT",False ); win->AtomWMNormalHint=XInternAtom( wsDisplay,"WM_NORMAL_HINT",False ); win->AtomProtocols=XInternAtom( wsDisplay,"WM_PROTOCOLS",False ); +#if 0 { char buf[32]; int i; sprintf( buf,"_%s_REMOTE",label ); @@ -347,6 +349,7 @@ fprintf( stderr,"[ws] atomname: %s\n",buf ); win->AtomRemote=XInternAtom( wsDisplay,buf,False ); } +#endif win->AtomsProtocols[0]=win->AtomDeleteWindow; win->AtomsProtocols[1]=win->AtomTakeFocus; win->AtomsProtocols[2]=win->AtomRolle; @@ -442,10 +445,12 @@ wsTextProperty.nitems=strlen( label ); XSetWMIconName( wsDisplay,win->WindowID,&wsTextProperty ); +#if 0 XChangeProperty( wsDisplay,win->WindowID, win->AtomRemote,XA_STRING, 8,PropModeReplace, "REALIZED",8 ); +#endif // win->Font=XLoadQueryFont( wsDisplay,"-adobe-helvetica-bold-r-normal--14-140-75-75-p-77-iso8859-1" ); // -adobe-times-medium-r-normal--14-140-75-75-p-77-iso8859-1" ); @@ -647,10 +652,20 @@ // break; case PropertyNotify: -// break; -// #ifdef DEBUG -// fprintf(stderr,"[ws] PropertyNotify ( 0x%x ) %s ( 0x%x )\n",wsWindowList[l]->WindowID,XGetAtomName( wsDisplay,Event->xproperty.atom ),Event->xproperty.atom ); -// #endif + { + char * name = XGetAtomName( wsDisplay,Event->xproperty.atom ); + + if ( !name ) break; + if ( !strncmp( name,"_ICEWM_TRAY",11 ) || + !strncmp( name,"_KDE_",5 ) || + !strncmp( name,"KWM_WIN_DESKTOP",15 ) ) wsWMType=0; + +// fprintf(stderr,"[ws] PropertyNotify %s ( 0x%x )\n",name,Event->xproperty.atom ); + + XFree( name ); + break; + } +#if 0 if ( Event->xproperty.atom == wsWindowList[l]->AtomRemote ) { Atom type; @@ -677,6 +692,7 @@ XFree( args ); } } +#endif break; } @@ -741,8 +757,7 @@ void wsFullScreen( wsTWindow * win ) { int decoration = 0; - XUnmapWindow( wsDisplay,win->WindowID ); - win->SizeHint.flags=0; + if ( wsWMType ) XUnmapWindow( wsDisplay,win->WindowID ); if ( win->isFullScreen ) { win->X=win->OldX; @@ -763,11 +778,11 @@ wsScreenSaverOff( wsDisplay ); } - win->SizeHint.flags|=PPosition | PSize; - win->SizeHint.x=win->X; - win->SizeHint.y=win->Y; - win->SizeHint.width=win->Width; - win->SizeHint.height=win->Height; + win->SizeHint.flags=PPosition | PSize | PWinGravity | PBaseSize; + win->SizeHint.x=win->X; win->SizeHint.y=win->Y; + win->SizeHint.width=win->Width; win->SizeHint.height=win->Height; + win->SizeHint.base_width=win->Width; win->SizeHint.base_height=win->Height; + win->SizeHint.win_gravity=StaticGravity; if ( win->Property & wsMaxSize ) { win->SizeHint.flags|=PMaxSize; @@ -784,8 +799,8 @@ XMoveResizeWindow( wsDisplay,win->WindowID,win->X,win->Y,win->Width,win->Height ); wsWindowDecoration( win,decoration ); + XMapRaised( wsDisplay,win->WindowID ); XRaiseWindow( wsDisplay,win->WindowID ); - XMapWindow( wsDisplay,win->WindowID ); } // ----------------------------------------------------------------------------------------------

1 0

CVS: main/Gui/mplayer play.c,1.56,1.57
by Zoltan Ponekker 29 Apr '02

29 Apr '02

Update of /cvsroot/mplayer/main/Gui/mplayer In directory mail:/var/tmp.root/cvs-serv19770/Gui/mplayer Modified Files: play.c Log Message: fix fullscreen bug es ilyen libvo not initialized bug with gui igy Index: play.c =================================================================== RCS file: /cvsroot/mplayer/main/Gui/mplayer/play.c,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- play.c 19 Apr 2002 10:56:26 -0000 1.56 +++ play.c 29 Apr 2002 22:00:48 -0000 1.57 @@ -31,6 +31,7 @@ { static int sx,sy; +#if 0 // if ( !guiIntfStruct.Playing ) { wsVisibleWindow( &appMPlayer.subWindow,wsHideWindow ); @@ -52,7 +53,10 @@ vo_fs=appMPlayer.subWindow.isFullScreen; wsVisibleWindow( &appMPlayer.subWindow,wsShowWindow ); }// else { vo_x11_fullscreen(); appMPlayer.subWindow.isFullScreen=vo_fs; } - +#else + wsFullScreen( &appMPlayer.subWindow ); +#endif + fullscreen=appMPlayer.subWindow.isFullScreen; if ( guiIntfStruct.Playing ) wsSetBackgroundRGB( &appMPlayer.subWindow,0,0,0 ); else wsSetBackgroundRGB( &appMPlayer.subWindow,appMPlayer.subR,appMPlayer.subG,appMPlayer.subB );

1 0

CVS: main/mp3lib Makefile,1.27,1.28
by Arpi of Ize 29 Apr '02

29 Apr '02

Update of /cvsroot/mplayer/main/mp3lib In directory mail:/var/tmp.root/cvs-serv9499/mp3lib Modified Files: Makefile Log Message: OpenBSD patch - by Björn Sandell <biorn(a)dce.chalmers.se> Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/mp3lib/Makefile,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- Makefile 13 Apr 2002 19:14:34 -0000 1.27 +++ Makefile 29 Apr 2002 21:42:36 -0000 1.28 @@ -38,7 +38,9 @@ ifeq ($(TARGET_OS),CYGWIN) ./mp3lib_objfix.sh endif - +ifeq ($(TARGET_OS),OpenBSD) + ./mp3lib_objfix.sh +endif test1: libMP3.a test.c $(CC) $(CFLAGS) test.c ../libvo/aclib.c -o test1 -I.. -L. -lMP3 -lm

1 0

CVS: main/libmpdvdkit ioctl.h,1.1,1.2
by Arpi of Ize 29 Apr '02

29 Apr '02

Update of /cvsroot/mplayer/main/libmpdvdkit In directory mail:/var/tmp.root/cvs-serv9499/libmpdvdkit Modified Files: ioctl.h Log Message: OpenBSD patch - by Björn Sandell <biorn(a)dce.chalmers.se> Index: ioctl.h =================================================================== RCS file: /cvsroot/mplayer/main/libmpdvdkit/ioctl.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ioctl.h 24 Apr 2002 19:28:03 -0000 1.1 +++ ioctl.h 29 Apr 2002 21:42:36 -0000 1.2 @@ -262,3 +262,9 @@ #endif +#ifdef __OpenBSD__ +typedef union dvd_struct dvd_struct; +typedef union dvd_authinfo dvd_authinfo; +typedef u_int8_t dvd_key[5]; /* 40-bit value, MSB is first elem. */ +typedef u_int8_t dvd_challenge[10]; /* 80-bit value, MSB is first elem. */ +#endif

1 0

CVS: main/DOCS documentation.html,1.236,1.237
by Arpi of Ize 29 Apr '02

29 Apr '02

Update of /cvsroot/mplayer/main/DOCS In directory mail:/var/tmp.root/cvs-serv9499/DOCS Modified Files: documentation.html Log Message: OpenBSD patch - by Björn Sandell <biorn(a)dce.chalmers.se> Index: documentation.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/documentation.html,v retrieving revision 1.236 retrieving revision 1.237 diff -u -r1.236 -r1.237 --- documentation.html 28 Apr 2002 05:20:52 -0000 1.236 +++ documentation.html 29 Apr 2002 21:42:35 -0000 1.237 @@ -1614,20 +1614,17 @@ /usr/ports/devel/gmake), native BSD make will not work, and a recent binutils (including objcopy). -Presently you must give the option '<CODE>--disable-mpdvdkit</CODE>' to -configure, else it won't compile. - Due to limitations in different versions of gas (relocation vs mmx), you'll need to compile in two steps: First make sure that the non-native as is first in PATH and do a '<CODE>gmake -k</CODE>', then make sure -that the native version i used an do '<CODE>gmake</CODE>'. +that the native version is used and do '<CODE>gmake</CODE>'. To use Win32 DLLs with MPlayer you will need to re-compile the kernel with "<CODE>option USER_LDT</CODE>". If MPlayer complains about not finding '/dev/cdrom' or '/dev/dvd' make a symbolic link, eg <CODE>ln -s -/dev/(your_cdrom_device) /dev/cdrom</CODE> +/dev/rcd0c /dev/dvd</CODE> <A NAME=A>Appendix A - Authors</A>

1 0

CVS: main spudec.c,1.25,1.26 spudec.h,1.10,1.11 mplayer.c,1.484,1.485
by Arpi of Ize 29 Apr '02

29 Apr '02

Update of /cvsroot/mplayer/main In directory mail:/var/tmp.root/cvs-serv5540 Modified Files: spudec.c spudec.h mplayer.c Log Message: guessing palette - patch by salvador <salvador(a)inti.gov.ar> Index: spudec.c =================================================================== RCS file: /cvsroot/mplayer/main/spudec.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- spudec.c 25 Apr 2002 18:46:44 -0000 1.25 +++ spudec.c 29 Apr 2002 21:31:56 -0000 1.26 @@ -65,6 +65,11 @@ unsigned char *scaled_aimage; } spudec_handle_t; +/* 1 if we lack a palette and must use an heuristic. */ +static int auto_palette = 0; +/* Darkest value used for the computed font */ +static int font_start_level = 0; + static inline unsigned int get_be16(const unsigned char *p) { return (p[0] << 8) + p[1]; @@ -191,6 +196,43 @@ } } + +/* + This function tries to create a usable palette. + Is searchs how many non-transparent colors are used and assigns different +gray scale values to each color. + I tested it with four streams and even got something readable. Half of the +times I got black characters with white around and half the reverse. +*/ +static void compute_palette(spudec_handle_t *this) +{ + int used[16],i,cused,start,step,color; + + memset(used, 0, sizeof(used)); + for (i=0; i<4; i++) + if (this->alpha[i]) /* !Transparent? */ + used[this->palette[i]] = 1; + for (cused=0, i=0; i<16; i++) + if (used[i]) cused++; + if (!cused) return; + if (cused == 1) { + start = 0x80; + step = 0; + } else { + start = font_start_level; + step = (0xF0-font_start_level)/(cused-1); + } + memset(used, 0, sizeof(used)); + for (i=0; i<4; i++) { + color = this->palette[i]; + if (this->alpha[i] && !used[color]) { /* not assigned? */ + used[color] = 1; + this->global_palette[color] = start<<16; + start += step; + } + } +} + static void spudec_process_control(spudec_handle_t *this, unsigned int pts100) { int a,b; /* Temporary vars */ @@ -244,6 +286,7 @@ this->alpha[1] = this->packet[off] & 0xf; this->alpha[2] = this->packet[off + 1] >> 4; this->alpha[3] = this->packet[off + 1] & 0xf; + if (auto_palette) compute_palette(this); mp_msg(MSGT_SPUDEC,MSGL_DBG2,"Alpha %d, %d, %d, %d\n", this->alpha[0], this->alpha[1], this->alpha[2], this->alpha[3]); off+=2; @@ -682,12 +725,23 @@ memcpy(spu->global_palette, palette, sizeof(spu->global_palette)); } +void spudec_set_font_factor(double factor) +{ + font_start_level = (int)(0xF0-(0xE0*factor)); +} + void *spudec_new_scaled(unsigned int *palette, unsigned int frame_width, unsigned int frame_height) { spudec_handle_t *this = calloc(1, sizeof(spudec_handle_t)); if (this) { - if (palette) + if (palette) { memcpy(this->global_palette, palette, sizeof(this->global_palette)); + auto_palette = 0; + } + else { + /* No palette, compute one */ + auto_palette = 1; + } this->packet = NULL; this->image = NULL; this->scaled_image = NULL; @@ -704,10 +758,6 @@ { spudec_handle_t *this = calloc(1, sizeof(spudec_handle_t)); if (this){ - if (palette){ - memcpy(this->global_palette, palette, sizeof(this->global_palette)); - memcpy(this->cuspal, cuspal, sizeof(this->cuspal)); - } //(fprintf(stderr,"VobSub Custom Palette: %d,%d,%d,%d", this->cuspal[0], this->cuspal[1], this->cuspal[2],this->cuspal[3]); this->packet = NULL; this->image = NULL; @@ -715,11 +765,23 @@ this->orig_frame_width = frame_width; this->orig_frame_height = frame_height; this->custom = custom; + // set up palette: + auto_palette = 1; + if (palette){ + memcpy(this->global_palette, palette, sizeof(this->global_palette)); + auto_palette = 0; + } + this->custom = custom; + if (custom && cuspal) { + memcpy(this->cuspal, cuspal, sizeof(this->cuspal)); + auto_palette = 0; + } } else perror("FATAL: spudec_init: calloc"); return this; } + void *spudec_new(unsigned int *palette) { return spudec_new_scaled(palette, 0, 0); Index: spudec.h =================================================================== RCS file: /cvsroot/mplayer/main/spudec.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- spudec.h 15 Apr 2002 19:17:12 -0000 1.10 +++ spudec.h 29 Apr 2002 21:31:56 -0000 1.11 @@ -11,6 +11,7 @@ void spudec_free(void *this); void spudec_reset(void *this); // called after seek int spudec_visible(void *this); // check if spu is visible +void spudec_set_font_factor(double factor); // sets the equivalent to ffactor #endif Index: mplayer.c =================================================================== RCS file: /cvsroot/mplayer/main/mplayer.c,v retrieving revision 1.484 retrieving revision 1.485 diff -u -r1.484 -r1.485 --- mplayer.c 27 Apr 2002 21:03:59 -0000 1.484 +++ mplayer.c 29 Apr 2002 21:31:56 -0000 1.485 @@ -1152,6 +1152,7 @@ if (vo_spudec==NULL) { current_module="spudec_init_normal"; vo_spudec=spudec_new_scaled(NULL, sh_video->disp_w, sh_video->disp_h); + spudec_set_font_factor(font_factor); } if (vo_spudec!=NULL)

1 0

CVS: main/libao2 ao_oss.c,1.22,1.23
by Arpi of Ize 29 Apr '02

29 Apr '02

Update of /cvsroot/mplayer/main/libao2 In directory mail:/var/tmp.root/cvs-serv19800 Modified Files: ao_oss.c Log Message: nonblock open is not legal for OSS (see OSS api docs), and causes problems on freebsd (and maybe other OSs) Index: ao_oss.c =================================================================== RCS file: /cvsroot/mplayer/main/libao2/ao_oss.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- ao_oss.c 27 Apr 2002 22:42:24 -0000 1.22 +++ ao_oss.c 29 Apr 2002 20:42:15 -0000 1.23 @@ -103,17 +103,23 @@ if (verbose) printf("audio_setup: using '%s' dsp device\n", dsp); +#ifdef __linux__ audio_fd=open(dsp, O_WRONLY | O_NONBLOCK); +#else + audio_fd=open(dsp, O_WRONLY); +#endif if(audio_fd<0){ printf("Can't open audio device %s: %s -> no sound\n", dsp, strerror(errno)); return 0; } +#ifdef __linux__ /* Remove the non-blocking flag */ if(fcntl(audio_fd, F_SETFL, 0) < 0) { printf("Can't make filedescriptor non-blocking: %s -> no sound\n", strerror(errno)); return 0; } +#endif ao_data.bps=channels*rate; if(format != AFMT_U8 && format != AFMT_S8) @@ -217,8 +223,13 @@ // stop playing and empty buffers (for seeking/pause) static void reset(){ uninit(); +#ifdef __linux__ audio_fd=open(dsp, O_WRONLY | O_NONBLOCK); if(audio_fd < 0 || fcntl(audio_fd, F_SETFL, 0) < 0){ +#else + audio_fd=open(dsp, O_WRONLY); + if(audio_fd < 0){ +#endif printf("\nFatal error: *** CANNOT RE-OPEN / RESET AUDIO DEVICE *** %s\n", strerror(errno)); return; }

1 0

CVS: main/DOCS mplayer.1,1.161,1.162
by Arpi of Ize 29 Apr '02

29 Apr '02

Update of /cvsroot/mplayer/main/DOCS In directory mail:/var/tmp.root/cvs-serv18257 Modified Files: mplayer.1 Log Message: -xy/-zoom updated Index: mplayer.1 =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/mplayer.1,v retrieving revision 1.161 retrieving revision 1.162 diff -u -r1.161 -r1.162 --- mplayer.1 20 Apr 2002 12:05:50 -0000 1.161 +++ mplayer.1 29 Apr 2002 20:36:53 -0000 1.162 @@ -646,16 +646,18 @@ displays) this option tells MPlayer which screen to display movie on. Range 0 \- ... .TP .B \-x\ <x> -Scale image to x width (if sw/hw scaling available) +Scale image to x width (if sw/hw scaling available). Disables aspect calcs. .TP -.B \-xy\ <factor> -Scale image by <factor> +.B \-xy\ <x> +x<=8: Scale image by factor <x> +x>8: Set width to <x> and calculate height to keep correct aspect ratio .TP .B \-y\ <y> -Scale image to y height (if sw/hw scaling available) +Scale image to y height (if sw/hw scaling available). Disables aspect calcs. .TP .B \-zoom Allow software scaling, where available. Could be used to force scaling with -vop scale +(-vop scale will IGNORE options -x/-y/-xy/-fs/-aspect without -zoom) .TP .B \-z\ <0\-9> Specifies compression level for PNG output (-vo png)

1 0