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

help--- An Error about the critical section
by yuke 01 Nov '02

01 Nov '02

Hello, mplayer-cvslog, If i enable the cache,Then the mplayer run in 2 processes.But i found that this two processers share the cache.So the things in the cache_var_t struct are critical sections. They will make problems.And in actural,when i modified the config file with cache < 100,the problem is so severe that it can not decode audio or video right.But in the file of "cache.c",i find "Note it runs in 2 processes (using fork()), but doesn't requires locking!!" . why u think there is no need of locking?? // confusing!! Best regards. yuke guqinwei(a)magima.com.cn 2002-11-01

1 0

CVS: main/DOCS/tech libmpcodecs.txt,1.5,1.6
by Arpi of Ize 01 Nov '02

01 Nov '02

Update of /cvsroot/mplayer/main/DOCS/tech In directory mail:/var/tmp.root/cvs-serv12484 Modified Files: libmpcodecs.txt Log Message: - some explanations suggested by Michael & Rich - note about mpi-local dmpi storage for get_image() Index: libmpcodecs.txt =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/tech/libmpcodecs.txt,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- libmpcodecs.txt 31 Oct 2002 14:25:41 -0000 1.5 +++ libmpcodecs.txt 1 Nov 2002 01:32:30 -0000 1.6 @@ -126,6 +126,16 @@ int (*open)(struct vf_instance_s* vf,char* args); // pointer to the open() function: +Sample: + +vf_info_t vf_info_foobar = { + "Universal Foo and Bar filter", + "foobar", + "Ms. Foo Bar", + "based on algo described at http://www.foo-bar.org", + open +}; + The open() function: open() is called when the filter is appended/inserted to the filter chain. @@ -169,8 +179,10 @@ to find out the capabilities and/or support status of a given colorspace (fmt). For the return values, see vfcap.h! Normally, a filter should return at least VFCAP_CSP_SUPPORTED for all supported -colorspaces, and 0 for the unsupported ones. If your filter does linear -conversion, it should query the next filter, and pass its capability flags. +colorspaces it accepts as input, and 0 for the unsupported ones. +If your filter does linear conversion, it should query the next filter, +and merge in its capability flags. Note: you should always ensure that the +next filter will accept at least one of your possible output colorspaces! Sample: @@ -185,6 +197,9 @@ return 0; } +For the more complex case, when you have an N->M colorspace mapping matrix, +see vf_scale or vf_rgb2bgr for examples. + int (*config)(struct vf_instance_s* vf, int width, int height, int d_width, int d_height, @@ -194,6 +209,12 @@ Its parameters are already well-known from libvo: width, height: size of the coded image d_width, d_height: wanted display size (usually aspect corrected w/h) + Filters should use width,height as input image dimension, but the + resizing filters (crop, expand, scale, rotate, etc) should update + d_width/d_height (display size) to preserve the correct aspect ratio! + Filters should not rely on d_width, d_height as input parameters, + the only exception is when a filter replaces some libvo functionality + (like -vop scale with -zoom, or OSD rendering wiht -vop expand). flags: the "good" old flags set of libvo: 0x01 - force fullscreen (-fs) 0x02 - allow mode switching (-vm) @@ -267,7 +288,10 @@ 32bpp (actually 24bit color depth) mode! It's 1 for 1bpp, 9 for YVU9, and is 12 for YV12 mode. Get it? For planar formats, you also have chroma_width, chroma_height and - chroma_x_shift, chroma_y_shift too. + chroma_x_shift, chroma_y_shift too, they specify the chroma subsampling + for yuv formats: + chroma_width = luma_width >>chroma_x_shift; + chroma_height= luma_height>>chroma_y_shift; If you're done, call the rest of the filter chain to process your output image: @@ -287,6 +311,7 @@ #define VFCTRL_DRAW_OSD 7 #define VFCTRL_CHANGE_RECTANGLE 9 /* Change the rectangle boundaries */ + void (*get_image)(struct vf_instance_s* vf, mp_image_t *mpi); @@ -297,14 +322,21 @@ readability etc) and if all OK, then allocate the requested buffer using the vf_get_image() func and copying the buffer pointers. +NOTE: You HAVE TO save dmpi pointer, as you'll need it in put_image() later. +It is not guaranteed that you'll get the same mpi for put_image() as in +get_image() (think of out-of-order decoding, get_image is called in decoding +order, while put_image is called for display) so the only safe place to save +it is in the mpi struct itself: mpi->priv=(void*)dmpi; + + void (*draw_slice)(struct vf_instance_s* vf, unsigned char** src, int* stride, int w,int h, int x, int y); It's the good old draw_slice callback, already known from libvo. -If you filter can operate on partial images, you can implement this one +If your filter can operate on partial images, you can implement this one to improve performance (cache utilization). -Ah, and there is 2 set of capability/requirement flags (vfcap.h type) +Ah, and there is two set of capability/requirement flags (vfcap.h type) in vf_instance_t, used by default query_format() implementation, and by the automatic colorspace/stride matching code (vf_next_config()).

1 0

CVS: main/postproc postprocess.c,1.69,1.70 postprocess.h,1.29,1.30
by Michael Niedermayer 01 Nov '02

01 Nov '02

Update of /cvsroot/mplayer/main/postproc In directory mail:/var/tmp.root/cvs-serv8146 Modified Files: postprocess.c postprocess.h Log Message: cosmetics requested by kabi Index: postprocess.c =================================================================== RCS file: /cvsroot/mplayer/main/postproc/postprocess.c,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- postprocess.c 30 Oct 2002 21:13:07 -0000 1.69 +++ postprocess.c 1 Nov 2002 01:19:04 -0000 1.70 @@ -489,7 +489,7 @@ // minor note: the HAVE_xyz is messed up after that line so dont use it static inline void postProcess(uint8_t src[], int srcStride, uint8_t dst[], int dstStride, int width, int height, - QP_STORE_T QPs[], int QPStride, int isColor, PPMode *ppMode, pp_context *vc) + QP_STORE_T QPs[], int QPStride, int isColor, PPMode *ppMode, pp_context_t *vc) { PPContext *c= (PPContext *)vc; c->ppMode= *ppMode; //FIXME Index: postprocess.h =================================================================== RCS file: /cvsroot/mplayer/main/postproc/postprocess.h,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- postprocess.h 30 Oct 2002 21:02:03 -0000 1.29 +++ postprocess.h 1 Nov 2002 01:19:04 -0000 1.30 @@ -64,7 +64,7 @@ #define QP_STORE_T int8_t -typedef void pp_context; +typedef void pp_context_t; extern char *pp_help; @@ -90,13 +90,13 @@ uint8_t * dst[3], int dstStride[3], int horizontalSize, int verticalSize, QP_STORE_T *QP_store, int QP_stride, - PPMode *mode, pp_context *ppContext, int pict_type); + PPMode *mode, pp_context_t *ppContext, int pict_type); // name is the stuff after "-pp" on the command line PPMode pp_get_mode_by_name_and_quality(char *name, int quality); -pp_context *pp_get_context(int width, int height, int cpuCaps); -void pp_free_context(pp_context *ppContext); +pp_context_t *pp_get_context(int width, int height, int cpuCaps); +void pp_free_context(pp_context_t *ppContext); #define PP_CPU_CAPS_MMX 0x80000000 #define PP_CPU_CAPS_MMX2 0x20000000

1 0

CVS: main AUTHORS,1.11,1.12 ChangeLog,1.20,1.21
by Arpi of Ize 01 Nov '02

01 Nov '02

Update of /cvsroot/mplayer/main In directory mail:/var/tmp.root/cvs-serv3892 Modified Files: AUTHORS ChangeLog Log Message: updated Index: AUTHORS =================================================================== RCS file: /cvsroot/mplayer/main/AUTHORS,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- AUTHORS 28 Oct 2002 00:36:27 -0000 1.11 +++ AUTHORS 1 Nov 2002 01:09:06 -0000 1.12 @@ -199,6 +199,7 @@ * runtime CPU detection * SSE optimization of liba52 * various encoder/decoder fixes, improvements in libavcodec, DR support + * various video filters, like il, swapuv, boxblur Sven Goethel <sgoethel(a)jausoft.com> * libvo driver: vo_gl2 @@ -313,7 +314,8 @@ Sascha Sommer <saschasommer(a)freenet.de> * directx VO driver - * windows waveout AO driver + * windows waveout AO driver + * quicktime audio decoding (using win32 DLLs) support Sidik Isani <lksi(a)cfht.hawaii.edu> * get_delay() smoothing code (-autosync) @@ -329,6 +331,7 @@ Hampa Hug <hhug(a)student.ethz.ch> * LUT-based soft eq video filter (-vop eq2) + * .ogm demuxer endianess fixes Uwe Reder <Uwe.Reder(a)3SOFT.de> * various x11/vm/fs fixes @@ -372,6 +375,26 @@ * GUI drag&drop support * GUI DVD fixes * various small bugfixes in ASX/URL parser + +Rémi Guyomarch <rguyom(a)pobox.com> + * various fixes + * 'unsharp' video filter + +Salvatore Falco <sfalco(a)studenti.ing.uniroma1.it> + * jacosub support + * overlapping subtitles supoprt + +Ville Syrjälä <syrjala(a)sci.fi> + * -vo dfbmga driver (G400 DVDMax-like feature using dfb 0.9.14) + +Björn Sandell <biorn(a)dce.chalmers.se> + * various *BSD fixes + +lucho <lucho(a)haemimont.bg> + * hw-accelerated video eq support into x11, gl2 (using DirectColor cmap) + +Per Wigren <wigren(a)home.se> + * bmovl - Bitmap Overlay video filter NOTE: If you feel you were missed here, feel free to send a patch. Index: ChangeLog =================================================================== RCS file: /cvsroot/mplayer/main/ChangeLog,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- ChangeLog 30 Oct 2002 22:49:39 -0000 1.20 +++ ChangeLog 1 Nov 2002 01:09:06 -0000 1.21 @@ -16,19 +16,29 @@ * -vo zr fixes * fixed sig11 if vo init failed * various dxr2 and dxr3 fixes - * cleanup of postprocessing code - now it's threadsafe and can be shared * v4l buffering fixed - * now auto-inserting -vop lavc for mpeg-only vo's + * fixed multiple reads caused by byteswapping macro (mjpeg.c, mach64_vid.c) + * cleanup of postprocessing code - now it's threadsafe and can be shared + * ported to GNU/Hurd Features: * -ao win32 (for windows port) - * -vop 2xsai - 2x scaler for drawn images (low color cartoon anims) * libavcodec: native WMA v1/v2 (aka. DivX audio) decoder - * better deblocking filter (-vop pp), pp/npp syntax changed! * hw-accelerated video eq for -vo x11 and gl2, using DirectColor colormap - * -vop unsharp - an sharp/blur filter, nice, but very slow * overlapping subtitles support, jacosub (*.js) format support * dxr3 got a new syncengine, ':sync', read the manual for more info + * QDMC/QDM2 audio codec support, using quicktime 5 win32 DLLs (libwine!) + + Filters: + * -af/-af-adv options cleanup + * now auto-inserting -vop lavc for mpeg-only vo's + * video filter API documented :) + * better deblocking filter (-vop pp), pp/npp syntax changed! + * -vop 2xsai - 2x scaler for drawn images (low color cartoon anims) + * -vop unsharp - an sharp/blur filter, nice, but very slow + * -vop il - (de)interleave fields + * -vop swapuv - guess what :) + * -vop boxblur - box blur... pre9: Docs:

1 0

CVS: main/libvo mga_common.c,1.47,1.48 vo_xmga.c,1.80,1.81
by Arpi of Ize 01 Nov '02

01 Nov '02

Update of /cvsroot/mplayer/main/libvo In directory mail:/var/tmp.root/cvs-serv15149 Modified Files: mga_common.c vo_xmga.c Log Message: panscan support in -vo mga (actually moved common code to mga_common.c) Ivan Szanto <szivan(a)duticai.TWI.TUDelft.NL> Index: mga_common.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/mga_common.c,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- mga_common.c 17 Oct 2002 09:49:25 -0000 1.47 +++ mga_common.c 1 Nov 2002 00:21:45 -0000 1.48 @@ -2,10 +2,12 @@ #include "fastmemcpy.h" #include "../mmx_defs.h" #include "../postproc/rgb2rgb.h" +#include "mp_msg.h" // mga_vid drawing functions +static void set_window( void ); /* forward declaration to kill warnings */ #ifdef VO_XMGA -static void set_window( void ); /* forward declaration to kill warnings */ +static void mDrawColorKey( void ); /* forward declaration to kill warnings */ #endif static int mga_next_frame=0; @@ -14,6 +16,9 @@ static uint8_t *vid_data, *frames[4]; static int f = -1; +static uint32_t drwX,drwY,drwWidth,drwHeight,drwBorderWidth,drwDepth; +static uint32_t drwcX,drwcY,dwidth,dheight; + static void draw_alpha(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){ uint32_t bespitch = (mga_vid_config.src_width + 31) & ~31; switch(mga_vid_config.format){ @@ -297,6 +302,9 @@ else printf("Screen width/height unknown!\n"); return VO_TRUE; + case VOCTRL_GET_PANSCAN: + if ( !vo_fs ) return VO_FALSE; + return VO_TRUE; #endif #if defined( VO_XMGA ) && defined( HAVE_NEW_GUI ) @@ -312,6 +320,7 @@ vo_x11_fullscreen(); vo_panscan_amount=0; /* indended, fallthrough to update panscan on fullscreen/windowed switch */ +#endif case VOCTRL_SET_PANSCAN: if ( vo_fs && ( vo_panscan != vo_panscan_amount ) ) // || ( !vo_fs && vo_panscan_amount ) ) { @@ -321,7 +330,6 @@ set_window(); } return VO_TRUE; -#endif } return VO_NOTIMPL; } @@ -416,3 +424,84 @@ return 0; } +static void set_window( void ){ + +#ifdef VO_XMGA + if ( WinID ) + { + XGetGeometry( mDisplay,vo_window,&mRoot,&drwX,&drwY,&drwWidth,&drwHeight,&drwBorderWidth,&drwDepth ); + mp_msg(MSGT_VO,MSGL_V,"[xmga] x: %d y: %d w: %d h: %d\n",drwX,drwY,drwWidth,drwHeight ); + drwX=0; drwY=0; + XTranslateCoordinates( mDisplay,vo_window,mRoot,0,0,&drwcX,&drwcY,&mRoot ); + mp_msg(MSGT_VO,MSGL_V,"[xmga] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",drwcX,drwcY,drwX,drwY,drwWidth,drwHeight ); + + } + else +#endif + { drwX=drwcX=vo_dx; drwY=drwcY=vo_dy; drwWidth=vo_dwidth; drwHeight=vo_dheight; } + + aspect(&dwidth,&dheight,A_NOZOOM); + if ( vo_fs ) + { + aspect(&dwidth,&dheight,A_ZOOM); + drwX=( vo_screenwidth - (dwidth > vo_screenwidth?vo_screenwidth:dwidth) ) / 2; + drwcX+=drwX; + drwY=( vo_screenheight - (dheight > vo_screenheight?vo_screenheight:dheight) ) / 2; + drwcY+=drwY; + drwWidth=(dwidth > vo_screenwidth?vo_screenwidth:dwidth); + drwHeight=(dheight > vo_screenheight?vo_screenheight:dheight); + mp_msg(MSGT_VO,MSGL_V,"[xmga-fs] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",drwcX,drwcY,drwX,drwY,drwWidth,drwHeight ); + } + vo_dwidth=drwWidth; vo_dheight=drwHeight; + +#ifdef VO_XMGA +#ifdef HAVE_XINERAMA + if(XineramaIsActive(mDisplay)) + { + XineramaScreenInfo *screens; + int num_screens; + int i; + + screens = XineramaQueryScreens(mDisplay,&num_screens); + + /* find the screen we are on */ + i = 0; + while(!(screens[i].x_org <= drwcX && screens[i].y_org <= drwcY && + screens[i].x_org + screens[i].width >= drwcX && + screens[i].y_org + screens[i].height >= drwcY )) + { + i++; + } + + /* set drwcX and drwcY to the right values */ + drwcX = drwcX - screens[i].x_org; + drwcY = drwcY - screens[i].y_org; + XFree(screens); + } + +#endif + + mDrawColorKey(); +#endif + + mga_vid_config.x_org=drwcX; + mga_vid_config.y_org=drwcY; + mga_vid_config.dest_width=drwWidth; + mga_vid_config.dest_height=drwHeight; + if ( vo_panscan > 0.0f && vo_fs ) + { + drwX-=vo_panscan_x>>1; + drwY-=vo_panscan_y>>1; + drwWidth+=vo_panscan_x; + drwHeight+=vo_panscan_y; + + mga_vid_config.x_org-=vo_panscan_x>>1; + mga_vid_config.y_org-=vo_panscan_y>>1; + mga_vid_config.dest_width=drwWidth; + mga_vid_config.dest_height=drwHeight; +#ifdef VO_XMGA + mDrawColorKey(); +#endif + if ( ioctl( f,MGA_VID_CONFIG,&mga_vid_config ) ) mp_msg(MSGT_VO,MSGL_WARN,"Error in mga_vid_config ioctl (wrong mga_vid.o version?)" ); + } +} Index: vo_xmga.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_xmga.c,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- vo_xmga.c 17 Oct 2002 09:49:25 -0000 1.80 +++ vo_xmga.c 1 Nov 2002 00:21:45 -0000 1.81 @@ -13,7 +13,6 @@ #include <string.h> #include "config.h" -#include "mp_msg.h" #include "video_out.h" #include "video_out_internal.h" @@ -67,8 +66,6 @@ static uint32_t mvWidth; static Window mRoot; -static uint32_t drwX,drwY,drwWidth,drwHeight,drwBorderWidth,drwDepth; -static uint32_t drwcX,drwcY,dwidth,dheight; static XSetWindowAttributes xWAttribs; @@ -85,80 +82,6 @@ XSetForeground( mDisplay,vo_gc,fgColor ); XFillRectangle( mDisplay,vo_window,vo_gc,drwX,drwY,drwWidth,(vo_fs?drwHeight - 1:drwHeight) ); XFlush( mDisplay ); -} - -static void set_window( void ){ - - if ( WinID ) - { - XGetGeometry( mDisplay,vo_window,&mRoot,&drwX,&drwY,&drwWidth,&drwHeight,&drwBorderWidth,&drwDepth ); - mp_msg(MSGT_VO,MSGL_V,"[xmga] x: %d y: %d w: %d h: %d\n",drwX,drwY,drwWidth,drwHeight ); - drwX=0; drwY=0; - XTranslateCoordinates( mDisplay,vo_window,mRoot,0,0,&drwcX,&drwcY,&mRoot ); - mp_msg(MSGT_VO,MSGL_V,"[xmga] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",drwcX,drwcY,drwX,drwY,drwWidth,drwHeight ); - } - else { drwX=drwcX=vo_dx; drwY=drwcY=vo_dy; drwWidth=vo_dwidth; drwHeight=vo_dheight; } - - aspect(&dwidth,&dheight,A_NOZOOM); - if ( vo_fs ) - { - aspect(&dwidth,&dheight,A_ZOOM); - drwX=( vo_screenwidth - (dwidth > vo_screenwidth?vo_screenwidth:dwidth) ) / 2; - drwcX+=drwX; - drwY=( vo_screenheight - (dheight > vo_screenheight?vo_screenheight:dheight) ) / 2; - drwcY+=drwY; - drwWidth=(dwidth > vo_screenwidth?vo_screenwidth:dwidth); - drwHeight=(dheight > vo_screenheight?vo_screenheight:dheight); - mp_msg(MSGT_VO,MSGL_V,"[xmga-fs] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",drwcX,drwcY,drwX,drwY,drwWidth,drwHeight ); - } - vo_dwidth=drwWidth; vo_dheight=drwHeight; - -#ifdef HAVE_XINERAMA - if(XineramaIsActive(mDisplay)) - { - XineramaScreenInfo *screens; - int num_screens; - int i; - - screens = XineramaQueryScreens(mDisplay,&num_screens); - - /* find the screen we are on */ - i = 0; - while(!(screens[i].x_org <= drwcX && screens[i].y_org <= drwcY && - screens[i].x_org + screens[i].width >= drwcX && - screens[i].y_org + screens[i].height >= drwcY )) - { - i++; - } - - /* set drwcX and drwcY to the right values */ - drwcX = drwcX - screens[i].x_org; - drwcY = drwcY - screens[i].y_org; - XFree(screens); - } - -#endif - - mDrawColorKey(); - - mga_vid_config.x_org=drwcX; - mga_vid_config.y_org=drwcY; - mga_vid_config.dest_width=drwWidth; - mga_vid_config.dest_height=drwHeight; - if ( vo_panscan > 0.0f && vo_fs ) - { - drwX-=vo_panscan_x>>1; - drwY-=vo_panscan_y>>1; - drwWidth+=vo_panscan_x; - drwHeight+=vo_panscan_y; - - mga_vid_config.x_org-=vo_panscan_x>>1; - mga_vid_config.y_org-=vo_panscan_y>>1; - mga_vid_config.dest_width=drwWidth; - mga_vid_config.dest_height=drwHeight; - mDrawColorKey(); - if ( ioctl( f,MGA_VID_CONFIG,&mga_vid_config ) ) mp_msg(MSGT_VO,MSGL_WARN,"Error in mga_vid_config ioctl (wrong mga_vid.o version?)" ); - } } static void check_events(void)

1 0

CVS: main configure,1.592,1.593
by Arpi of Ize 01 Nov '02

01 Nov '02

Update of /cvsroot/mplayer/main In directory mail:/var/tmp.root/cvs-serv6824 Modified Files: configure Log Message: I ported mplayer to the GNU system (also known as GNU/Hurd), it was just a matter of adding it to the makefiles and other misc fix. Patch by Robert Millan <zeratul2(a)wanadoo.es> Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.592 retrieving revision 1.593 diff -u -r1.592 -r1.593 --- configure 31 Oct 2002 23:54:25 -0000 1.592 +++ configure 1 Nov 2002 00:05:55 -0000 1.593 @@ -66,6 +66,7 @@ bsd() { freebsd || netbsd || bsdos || openbsd ; return "$?" ; } qnx() { issystem "QNX" ; return "$?" ; } darwin() { issystem "Darwin" ; return "$?" ; } +gnu() { issystem "GNU" ; return "$?" ; } # arch test boolean functions # x86/x86pc is used by QNX @@ -317,7 +318,7 @@ # OS name system_name=`( uname -s ) 2>&1` case "$system_name" in - Linux|FreeBSD|NetBSD|BSD/OS|OpenBSD|SunOS|QNX|Darwin) + Linux|FreeBSD|NetBSD|BSD/OS|OpenBSD|SunOS|QNX|Darwin|GNU) ;; IRIX*) system_name=IRIX @@ -350,7 +351,7 @@ # x86/x86pc is used by QNX case "`( uname -m ) 2>&1`" in - i[3-9]86|x86|x86pc|k5|k6|k6_2|k6_3|k6-2|k6-3|pentium*|athlon*|i586_i686|i586-i686) host_arch=i386 ;; + i[3-9]86*|x86|x86pc|k5|k6|k6_2|k6_3|k6-2|k6-3|pentium*|athlon*|i586_i686|i586-i686) host_arch=i386 ;; ia64) host_arch=ia64 ;; x86_64) host_arch=x86_64 ;; ppc) host_arch=ppc ;;

1 0

CVS: main/linux getch2.c,1.14,1.15
by Arpi of Ize 01 Nov '02

01 Nov '02

Update of /cvsroot/mplayer/main/linux In directory mail:/var/tmp.root/cvs-serv6824/linux Modified Files: getch2.c Log Message: I ported mplayer to the GNU system (also known as GNU/Hurd), it was just a matter of adding it to the makefiles and other misc fix. Patch by Robert Millan <zeratul2(a)wanadoo.es> Index: getch2.c =================================================================== RCS file: /cvsroot/mplayer/main/linux/getch2.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- getch2.c 3 May 2002 19:01:46 -0000 1.14 +++ getch2.c 1 Nov 2002 00:05:56 -0000 1.15 @@ -217,7 +217,7 @@ void getch2_enable(){ #ifdef HAVE_TERMIOS struct termios tio_new; -#if defined(__NetBSD__) || defined(__svr4__) || defined(__CYGWIN__) || defined(__OS2__) +#if defined(__NetBSD__) || defined(__svr4__) || defined(__CYGWIN__) || defined(__OS2__) || defined(__GNU__) tcgetattr(0,&tio_orig); #elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__) ioctl(0,TIOCGETA,&tio_orig); @@ -228,7 +228,7 @@ tio_new.c_lflag &= ~(ICANON|ECHO); /* Clear ICANON and ECHO. */ tio_new.c_cc[VMIN] = 1; tio_new.c_cc[VTIME] = 0; -#if defined(__NetBSD__) || defined(__svr4__) || defined(__CYGWIN__) || defined(__OS2__) +#if defined(__NetBSD__) || defined(__svr4__) || defined(__CYGWIN__) || defined(__OS2__) || defined(__GNU__) tcsetattr(0,TCSANOW,&tio_new); #elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__) ioctl(0,TIOCSETA,&tio_new); @@ -242,7 +242,7 @@ void getch2_disable(){ if(!getch2_status) return; // already disabled / never enabled #ifdef HAVE_TERMIOS -#if defined(__NetBSD__) || defined(__svr4__) || defined(__CYGWIN__) || defined(__OS2__) +#if defined(__NetBSD__) || defined(__svr4__) || defined(__CYGWIN__) || defined(__OS2__) || defined(__GNU__) tcsetattr(0,TCSANOW,&tio_orig); #elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__) ioctl(0,TIOCSETA,&tio_orig);

1 0

CVS: main/libmpcodecs vf_unsharp.c,1.1,1.2
by Arpi of Ize 01 Nov '02

01 Nov '02

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv4951 Modified Files: vf_unsharp.c Log Message: vf_unsharp: proper rounding & print if sharpening or bluring patch by Rémi Guyomarch <rguyom(a)pobox.com> Index: vf_unsharp.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_unsharp.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- vf_unsharp.c 29 Oct 2002 22:37:11 -0000 1.1 +++ vf_unsharp.c 1 Nov 2002 00:02:52 -0000 1.2 @@ -86,7 +86,7 @@ int stepsX = fp->msizeX/2; int stepsY = fp->msizeY/2; int scalebits = (stepsX+stepsY)*2; - int32_t halfscale = 1 << (stepsX+stepsY); + int32_t halfscale = 1 << ((stepsX+stepsY)*2-1); if( !fp->amount ) { if( src == dst ) @@ -138,11 +138,13 @@ int z, stepsX, stepsY; FilterParam *fp; + char *effect; // allocate buffers fp = &vf->priv->lumaParam; - mp_msg( MSGT_VFILTER, MSGL_INFO, "unsharp: %dx%d:%0.2f (luma) \n", fp->msizeX, fp->msizeY, fp->amount ); + effect = fp->amount == 0 ? "don't touch" : fp->amount < 0 ? "blur" : "sharpen"; + mp_msg( MSGT_VFILTER, MSGL_INFO, "unsharp: %dx%d:%0.2f (%s luma) \n", fp->msizeX, fp->msizeY, fp->amount, effect ); memset( fp->SC, 0, sizeof( fp->SC ) ); stepsX = fp->msizeX/2; stepsY = fp->msizeY/2; @@ -150,7 +152,8 @@ fp->SC[z] = memalign( 16, sizeof(*(fp->SC[z])) * (width+2*stepsX) ); fp = &vf->priv->chromaParam; - mp_msg( MSGT_VFILTER, MSGL_INFO, "unsharp: %dx%d:%0.2f (chroma)\n", fp->msizeX, fp->msizeY, fp->amount ); + effect = fp->amount == 0 ? "don't touch" : fp->amount < 0 ? "blur" : "sharpen"; + mp_msg( MSGT_VFILTER, MSGL_INFO, "unsharp: %dx%d:%0.2f (%s chroma)\n", fp->msizeX, fp->msizeY, fp->amount, effect ); memset( fp->SC, 0, sizeof( fp->SC ) ); stepsX = fp->msizeX/2; stepsY = fp->msizeY/2; @@ -317,7 +320,7 @@ } vf_info_t vf_info_unsharp = { - "unsharp mask", + "unsharp mask & gaussian blur", "unsharp", "Rémi Guyomarch", "",

1 0

CVS: main vobsub.c,1.21,1.22
by Arpi of Ize 01 Nov '02

01 Nov '02

Update of /cvsroot/mplayer/main In directory mail:/var/tmp.root/cvs-serv4329 Modified Files: vobsub.c Log Message: The first language ripped is set as the default language by writing the langidx tag with the index of this language. patch by Arne Driescher <driescher(a)mpi-magdeburg.mpg.de> (accepted by Kim Minh Kaplan) Index: vobsub.c =================================================================== RCS file: /cvsroot/mplayer/main/vobsub.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- vobsub.c 17 Oct 2002 15:44:41 -0000 1.21 +++ vobsub.c 1 Nov 2002 00:01:53 -0000 1.22 @@ -1262,8 +1262,11 @@ strcat(filename, ".idx"); result->fidx = fopen(filename, "a"); if (result->fidx) { - if (ftell(result->fidx) == 0) + if (ftell(result->fidx) == 0){ create_idx(result, palette, orig_width, orig_height); + /* Make the selected language the default language */ + fprintf(result->fidx, "\n# Language index in use\nlangidx: %u\n", index); + } fprintf(result->fidx, "\nid: %s, index: %u\n", id ? id : "xx", index); /* So that we can check the file now */ fflush(result->fidx);

1 0