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

CVS: main codec-cfg.h,1.65,1.66
by Arpi of Ize 16 Oct '02

16 Oct '02

Update of /cvsroot/mplayer/main In directory mail:/var/tmp.root/cvs-serv14367 Modified Files: codec-cfg.h Log Message: codecs.conf min. version bumped Index: codec-cfg.h =================================================================== RCS file: /cvsroot/mplayer/main/codec-cfg.h,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- codec-cfg.h 26 Sep 2002 01:28:32 -0000 1.65 +++ codec-cfg.h 17 Oct 2002 00:24:58 -0000 1.66 @@ -1,7 +1,7 @@ #ifndef __CODEC_CFG_H #define __CODEC_CFG_H -#define CODEC_CFG_MIN 20020910 +#define CODEC_CFG_MIN 20021016 #define CODECS_MAX_FOURCC 32 #define CODECS_MAX_OUTFMT 16

1 0

CVS: main/etc codecs.conf,1.235,1.236
by Arpi of Ize 16 Oct '02

16 Oct '02

Update of /cvsroot/mplayer/main/etc In directory mail:/var/tmp.root/cvs-serv14194 Modified Files: codecs.conf Log Message: - raw rgb1, rgb4 added - mapping raw yuv formats added - fourcc 'alaw' fo rmov files added - version bumped Index: codecs.conf =================================================================== RCS file: /cvsroot/mplayer/main/etc/codecs.conf,v retrieving revision 1.235 retrieving revision 1.236 diff -u -r1.235 -r1.236 --- codecs.conf 13 Oct 2002 21:40:08 -0000 1.235 +++ codecs.conf 17 Oct 2002 00:24:43 -0000 1.236 @@ -3,7 +3,7 @@ ; Before editing this file, please read DOCS/tech/codecs.conf.txt ! ;============================================================================= -release 20020910 +release 20021016 ;============================================================================= ; VIDEO CODECS @@ -1092,11 +1092,29 @@ format 0x4247520F out BGR15 flip +videocodec rawbgr8 + info "RAW BGR8" + status working + driver raw + format 0x0 + format 0x20776172 + format 0x4247520F + out BGR8 flip + +videocodec rawbgr1 + info "RAW BGR8" + status working + driver raw + format 0x0 + format 0x20776172 + format 0x4247520F + out BGR1 flip + videocodec rawyuy2 info "RAW YUY2" status working driver raw - format 0x0 + format 0x0 0x32595559 format 0x20776172 fourcc yuy2,YUY2 out YUY2 @@ -1105,7 +1123,7 @@ info "RAW UYVY" status working driver raw - format 0x0 + format 0x0 0x59565955 format 0x20776172 fourcc uyvy,UYVY out UYVY @@ -1114,7 +1132,7 @@ info "RAW YV12" status working driver raw - format 0x0 + format 0x0 0x32315659 format 0x20776172 fourcc yv12,YV12 out YV12 @@ -1123,7 +1141,7 @@ info "RAW I420" status working driver raw - format 0x0 + format 0x0 0x30323449 format 0x20776172 fourcc i420,I420 fourcc IYUV,iyuv @@ -1133,7 +1151,7 @@ info "RAW YVU9" status working driver raw - format 0x0 + format 0x0 0x39555659 format 0x20776172 fourcc yvu9,YVU9 out YVU9 @@ -1335,6 +1353,7 @@ info "aLaw" status working format 0x6 + format 0x77616C61 ; 'alaw', .mov files driver alaw audiocodec ulaw

1 0

CVS: main codec-cfg.c,1.95,1.96
by Arpi of Ize 16 Oct '02

16 Oct '02

Update of /cvsroot/mplayer/main In directory mail:/var/tmp.root/cvs-serv12930 Modified Files: codec-cfg.c Log Message: - rgb1, rgb4 support - format mapping support - memleak fix Index: codec-cfg.c =================================================================== RCS file: /cvsroot/mplayer/main/codec-cfg.c,v retrieving revision 1.95 retrieving revision 1.96 diff -u -r1.95 -r1.96 --- codec-cfg.c 26 Sep 2002 01:28:32 -0000 1.95 +++ codec-cfg.c 17 Oct 2002 00:20:44 -0000 1.96 @@ -74,7 +74,7 @@ goto err_out_parse_error; return 1; err_out_duplicated: - mp_msg(MSGT_CODECCFG,MSGL_ERR,"duplicated fourcc/format"); + mp_msg(MSGT_CODECCFG,MSGL_ERR,"duplicated fourcc"); return 0; err_out_too_many: mp_msg(MSGT_CODECCFG,MSGL_ERR,"too many fourcc/format..."); @@ -84,7 +84,7 @@ return 0; } -static int add_to_format(char *s, unsigned int *fourcc, unsigned int *fourccmap) +static int add_to_format(char *s, char *alias,unsigned int *fourcc, unsigned int *fourccmap) { int i, j; char *endptr; @@ -97,14 +97,24 @@ return 0; } - fourcc[i]=fourccmap[i]=strtoul(s,&endptr,0); + fourcc[i]=strtoul(s,&endptr,0); if (*endptr != '\0') { - mp_msg(MSGT_CODECCFG,MSGL_ERR,"parse error"); + mp_msg(MSGT_CODECCFG,MSGL_ERR,"parse error (format ID not number?)"); return 0; } + + if(alias){ + fourccmap[i]=strtoul(alias,&endptr,0); + if (*endptr != '\0') { + mp_msg(MSGT_CODECCFG,MSGL_ERR,"parse error (format ID alias not number?)"); + return 0; + } + } else + fourccmap[i]=fourcc[i]; + for (j = 0; j < i; j++) if (fourcc[j] == fourcc[i]) { - mp_msg(MSGT_CODECCFG,MSGL_ERR,"duplicated fourcc/format"); + mp_msg(MSGT_CODECCFG,MSGL_ERR,"duplicated format ID"); return 0; } @@ -128,16 +138,20 @@ {"UYVY", IMGFMT_UYVY}, {"YVYU", IMGFMT_YVYU}, + {"RGB4", IMGFMT_RGB|4}, {"RGB8", IMGFMT_RGB|8}, {"RGB15", IMGFMT_RGB|15}, {"RGB16", IMGFMT_RGB|16}, {"RGB24", IMGFMT_RGB|24}, {"RGB32", IMGFMT_RGB|32}, + {"BGR4", IMGFMT_BGR|4}, {"BGR8", IMGFMT_BGR|8}, {"BGR15", IMGFMT_BGR|15}, {"BGR16", IMGFMT_BGR|16}, {"BGR24", IMGFMT_BGR|24}, {"BGR32", IMGFMT_BGR|32}, + {"RGB1", IMGFMT_RGB|1}, + {"BGR1", IMGFMT_BGR|1}, {"MPES", IMGFMT_MPEGPES}, {NULL, 0} @@ -284,7 +298,7 @@ static int validate_codec(codecs_t *c, int type) { unsigned int i; - char *tmp_name = strdup(c->name); + char *tmp_name = c->name; for (i = 0; i < strlen(tmp_name) && isalnum(tmp_name[i]); i++) /* NOTHING */; @@ -576,9 +590,10 @@ codec->fourccmap)) goto err_out_print_linenum; } else if (!strcmp(token[0], "format")) { - if (get_token(1, 1) < 0) + if (get_token(1, 2) < 0) goto err_out_parse_error; - if (!add_to_format(token[0], codec->fourcc,codec->fourccmap)) + if (!add_to_format(token[0], token[1], + codec->fourcc,codec->fourccmap)) goto err_out_print_linenum; } else if (!strcmp(token[0], "driver")) { if (get_token(1, 1) < 0)

1 0

CVS: main/libmpdemux demux_ogg.c,1.15,1.16
by Arpi of Ize 16 Oct '02

16 Oct '02

Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var/tmp.root/cvs-serv11605 Modified Files: demux_ogg.c Log Message: more memleak fixes Index: demux_ogg.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_ogg.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- demux_ogg.c 16 Oct 2002 20:17:20 -0000 1.15 +++ demux_ogg.c 16 Oct 2002 20:34:40 -0000 1.16 @@ -416,6 +416,7 @@ /// Error if(np < 0) { mp_msg(MSGT_DEMUX,MSGL_DBG2,"OGG demuxer : Bad page sync\n"); + ogg_sync_destroy(sync); free(ogg_d); return 0; } @@ -425,6 +426,7 @@ buf = ogg_sync_buffer(sync,BLOCK_SIZE); len = stream_read(s,buf,BLOCK_SIZE); if(len == 0 && s->eof) { + ogg_sync_destroy(sync); free(ogg_d); return 0; }

2 1

CVS: main/postproc yuv2rgb.c,1.13,1.14
by Michael Niedermayer 16 Oct '02

16 Oct '02

Update of /cvsroot/mplayer/main/postproc In directory mail:/var/tmp.root/cvs-serv6181 Modified Files: yuv2rgb.c Log Message: avoid multiple init Index: yuv2rgb.c =================================================================== RCS file: /cvsroot/mplayer/main/postproc/yuv2rgb.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- yuv2rgb.c 13 Aug 2002 19:18:20 -0000 1.13 +++ yuv2rgb.c 17 Oct 2002 00:04:33 -0000 1.14 @@ -232,7 +232,7 @@ void *yuv2rgb_c_init (unsigned bpp, int mode, void *table_rV[256], void *table_gU[256], int table_gV[256], void *table_bU[256]); -yuv2rgb_fun yuv2rgb; +yuv2rgb_fun yuv2rgb= NULL; static void (* yuv2rgb_c_internal) (uint8_t *, uint8_t *, uint8_t *, uint8_t *, @@ -263,7 +263,7 @@ void yuv2rgb_init (unsigned bpp, int mode) { - yuv2rgb = NULL; + if(yuv2rgb) return; #ifdef CAN_COMPILE_X86_ASM if(gCpuCaps.hasMMX2) {

1 0

CVS: main/libmpcodecs vf_expand.c,1.16,1.17
by Arpi of Ize 16 Oct '02

16 Oct '02

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv20745 Modified Files: vf_expand.c Log Message: 10l bug, found by valgrind :) Index: vf_expand.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_expand.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- vf_expand.c 10 Sep 2002 22:18:32 -0000 1.16 +++ vf_expand.c 16 Oct 2002 23:12:00 -0000 1.17 @@ -280,11 +280,12 @@ vf->get_image=get_image; vf->put_image=put_image; vf->priv=malloc(sizeof(struct vf_priv_s)); - // TODO: parse args -> vf->priv->exp_x= vf->priv->exp_y= vf->priv->exp_w= vf->priv->exp_h=-1; + vf->priv->osd=0; + // parse args -> if(args) sscanf(args, "%d:%d:%d:%d:%d", &vf->priv->exp_w, &vf->priv->exp_h,

1 0

CVS: main/libvo vo_x11.c,1.121,1.122 vo_xv.c,1.122,1.123
by Zoltan Ponekker 16 Oct '02

16 Oct '02

Update of /cvsroot/mplayer/main/libvo In directory mail:/var/tmp.root/cvs-serv6767/libvo Modified Files: vo_x11.c vo_xv.c Log Message: fix memleak Index: vo_x11.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_x11.c,v retrieving revision 1.121 retrieving revision 1.122 diff -u -r1.121 -r1.122 --- vo_x11.c 16 Oct 2002 22:29:00 -0000 1.121 +++ vo_x11.c 16 Oct 2002 22:44:09 -0000 1.122 @@ -362,9 +362,14 @@ #endif } + if ( vo_gc != None ) XFreeGC( mDisplay,vo_gc ); vo_gc=XCreateGC( mDisplay,vo_window,0L,&xgcv ); - if ( myximage ) freeMyXImage(); + if ( myximage ) + { + freeMyXImage(); + freeSwsContext(swsContext); + } getMyXImage(); if ( !WinID ) Index: vo_xv.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_xv.c,v retrieving revision 1.122 retrieving revision 1.123 diff -u -r1.122 -r1.123 --- vo_xv.c 16 Oct 2002 19:45:35 -0000 1.122 +++ vo_xv.c 16 Oct 2002 22:44:09 -0000 1.123 @@ -290,7 +290,6 @@ num_buffers=vo_doublebuffering?(vo_directrendering?NUM_BUFFERS:2):1; /* check image formats */ - fo = XvListImageFormats(mDisplay, xv_port, (int*)&formats); xv_format=0; if(format==IMGFMT_BGR24) format=IMGFMT_YV12; for(i = 0; i < formats; i++){ @@ -387,7 +386,7 @@ } else if ( !(flags&1) ) XMoveResizeWindow( mDisplay,vo_window,hint.x,hint.y,hint.width,hint.height ); - + if ( vo_gc != None ) XFreeGC( mDisplay,vo_gc ); vo_gc = XCreateGC(mDisplay, vo_window, 0L, &xgcv); XFlush(mDisplay); XSync(mDisplay, False);

1 0

CVS: main/libvo vo_x11.c,1.120,1.121
by Zoltan Ponekker 16 Oct '02

16 Oct '02

Update of /cvsroot/mplayer/main/libvo In directory mail:/var/tmp.root/cvs-serv2338/libvo Modified Files: vo_x11.c Log Message: -fixed-vo support Index: vo_x11.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_x11.c,v retrieving revision 1.120 retrieving revision 1.121 diff -u -r1.120 -r1.121 --- vo_x11.c 9 Oct 2002 22:44:07 -0000 1.120 +++ vo_x11.c 16 Oct 2002 22:29:00 -0000 1.121 @@ -49,7 +49,7 @@ static unsigned char *ImageData; /* X11 related variables */ -static XImage *myximage; +static XImage *myximage = NULL; static int depth,bpp,mode; static XWindowAttributes attribs; @@ -275,12 +275,6 @@ else #endif { - if(vo_window != None) { - freeMyXImage(); - XUnmapWindow( mDisplay,vo_window ); - XDestroyWindow(mDisplay, vo_window); - } - #ifdef HAVE_XF86VM if ( vm ) { @@ -325,24 +319,27 @@ } else { - vo_window=XCreateWindow( mDisplay,mRootWin, + if ( vo_window == None ) + { + vo_window=XCreateWindow( mDisplay,mRootWin, vo_dx,vo_dy, vo_dwidth,vo_dheight, xswa.border_pixel,depth,CopyFromParent,vinfo.visual,xswamask,&xswa ); - vo_x11_classhint( mDisplay,vo_window,"x11" ); - vo_hidecursor(mDisplay,vo_window); - vo_x11_sizehint( vo_dx,vo_dy,vo_dwidth,vo_dheight,0 ); - XSelectInput( mDisplay,vo_window,StructureNotifyMask ); - XStoreName( mDisplay,vo_window,title ); - XMapWindow( mDisplay,vo_window ); - if(WinID!=0) - do { XNextEvent( mDisplay,&xev ); } while ( xev.type != MapNotify || xev.xmap.event != vo_window ); - - if ( fullscreen ) vo_x11_fullscreen(); + vo_x11_classhint( mDisplay,vo_window,"x11" ); + vo_hidecursor(mDisplay,vo_window); + vo_x11_sizehint( vo_dx,vo_dy,vo_dwidth,vo_dheight,0 ); + XSelectInput( mDisplay,vo_window,StructureNotifyMask ); + XStoreName( mDisplay,vo_window,title ); + XMapWindow( mDisplay,vo_window ); +// if(WinID!=0) + do { XNextEvent( mDisplay,&xev ); } while ( xev.type != MapNotify || xev.xmap.event != vo_window ); + + if ( fullscreen ) vo_x11_fullscreen(); #ifdef HAVE_XINERAMA - vo_x11_xinerama_move(mDisplay,vo_window); + vo_x11_xinerama_move(mDisplay,vo_window); #endif + } else if ( !fullscreen ) XMoveResizeWindow( mDisplay,vo_window,vo_dx,vo_dy,vo_dwidth,vo_dheight ); } XFlush( mDisplay ); @@ -366,6 +363,8 @@ } vo_gc=XCreateGC( mDisplay,vo_window,0L,&xgcv ); + + if ( myximage ) freeMyXImage(); getMyXImage(); if ( !WinID )

1 0

CVS: main/libvo x11_common.c,1.104,1.105
by Arpi of Ize 16 Oct '02

16 Oct '02

Update of /cvsroot/mplayer/main/libvo In directory mail:/var/tmp.root/cvs-serv31519 Modified Files: x11_common.c Log Message: 10l to Dominik - casting at wrong place Index: x11_common.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/x11_common.c,v retrieving revision 1.104 retrieving revision 1.105 diff -u -r1.104 -r1.105 --- x11_common.c 13 Oct 2002 21:58:55 -0000 1.104 +++ x11_common.c 16 Oct 2002 13:31:38 -0000 1.105 @@ -635,7 +635,7 @@ Atom type; int format; unsigned long nitems, bytesafter; - unsigned char * args = NULL; + Atom * args = NULL; if ( WinID >= 0 ) return; @@ -655,7 +655,7 @@ } type=XInternAtom( mDisplay,"_NET_SUPPORTED",False ); - if ( Success == XGetWindowProperty( mDisplay,mRootWin,type,0,16384,False,AnyPropertyType,&type,&format,&nitems,&bytesafter,&args ) && nitems > 0 ) + if ( Success == XGetWindowProperty( mDisplay,mRootWin,type,0,16384,False,AnyPropertyType,&type,&format,&nitems,&bytesafter,(unsigned char**)(&args) ) && nitems > 0 ) { XEvent e; int i; @@ -680,7 +680,7 @@ return; } type=XInternAtom( mDisplay,"_WIN_SUPPORTING_WM_CHECK",False ); - if ( Success == XGetWindowProperty( mDisplay,mRootWin,type,0,16384,False,AnyPropertyType,&type,&format,&nitems,&bytesafter,&args ) && nitems > 0 ) + if ( Success == XGetWindowProperty( mDisplay,mRootWin,type,0,16384,False,AnyPropertyType,&type,&format,&nitems,&bytesafter,(unsigned char**)(&args) ) && nitems > 0 ) { XClientMessageEvent xev;

3 2

CVS: main/libvo vo_gl2.c,1.23,1.24
by Zoltan Ponekker 16 Oct '02

16 Oct '02

Update of /cvsroot/mplayer/main/libvo In directory mail:/var/tmp.root/cvs-serv2667/libvo Modified Files: vo_gl2.c Log Message: -fixed-vo support Index: vo_gl2.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_gl2.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- vo_gl2.c 28 Aug 2002 21:32:32 -0000 1.23 +++ vo_gl2.c 16 Oct 2002 21:32:03 -0000 1.24 @@ -669,13 +669,9 @@ xswa.colormap = XCreateColormap(mDisplay, mRootWin, vinfo->visual, AllocNone); xswamask = CWBackPixel | CWBorderPixel | CWColormap; - vo_window = XCreateWindow(mDisplay, RootWindow(mDisplay,mScreen), - hint.x, hint.y, hint.width, hint.height, 4, vinfo->depth,CopyFromParent,vinfo->visual,xswamask,&xswa); - - vo_x11_classhint( mDisplay,vo_window,"gl2" ); - vo_hidecursor(mDisplay,vo_window); - - wsGLXContext=glXCreateContext( mDisplay,vinfo,NULL,True ); + if ( vo_window == None ) + { + vo_window = XCreateWindow(mDisplay, RootWindow(mDisplay,mScreen), hint.x, hint.y, hint.width, hint.height, 4, vinfo->depth,CopyFromParent,vinfo->visual,xswamask,&xswa); if ( flags&0x01 ) vo_x11_decoration( mDisplay,vo_window,0 ); @@ -686,7 +682,6 @@ XSetStandardProperties(mDisplay, vo_window, hello, hello, None, NULL, 0, &hint); /* Map window. */ - XMapWindow(mDisplay, vo_window); #ifdef HAVE_XINERAMA vo_x11_xinerama_move(mDisplay,vo_window); @@ -702,7 +697,17 @@ XSelectInput(mDisplay, vo_window, NoEventMask); - glXMakeCurrent( mDisplay,vo_window,wsGLXContext ); + } + else if ( !(flags&1) ) XMoveResizeWindow( mDisplay,vo_window,hint.x,hint.y,hint.width,hint.height ); + + vo_x11_classhint( mDisplay,vo_window,"gl2" ); + vo_hidecursor(mDisplay,vo_window); + + if ( vo_config_count ) glXDestroyContext( mDisplay,wsGLXContext ); + + wsGLXContext=glXCreateContext( mDisplay,vinfo,NULL,True ); + + glXMakeCurrent( mDisplay,vo_window,wsGLXContext ); XFlush(mDisplay); XSync(mDisplay, False);

1 0