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

CVS: main/libmpdemux aviheader.c,1.47,1.48
by Arpi of Ize 16 Oct '02

16 Oct '02

Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var/tmp.root/cvs-serv25409 Modified Files: aviheader.c Log Message: 10l - do not read INDEX twice!!! list index even if generated by mplayer (verbose>=2) Index: aviheader.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/aviheader.c,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- aviheader.c 2 Jun 2002 21:35:49 -0000 1.47 +++ aviheader.c 16 Oct 2002 21:04:19 -0000 1.48 @@ -65,8 +65,8 @@ if(demuxer->stream->end_pos>demuxer->movi_end) demuxer->movi_end=demuxer->stream->end_pos; if(index_mode==-2 || index_mode==2 || index_mode==0) break; // reading from non-seekable source (stdin) or forced index or no index forced - len=(len+1)&(~1); - stream_skip(demuxer->stream,len); + if(list_end>0) stream_seek(demuxer->stream,list_end); // skip movi + list_end=0; } continue; } @@ -248,9 +248,10 @@ if(index_mode){ int i; priv->idx_size=size2>>4; - mp_msg(MSGT_HEADER,MSGL_V,"Reading INDEX block, %d chunks for %ld frames\n", - priv->idx_size,avih.dwTotalFrames); + mp_msg(MSGT_HEADER,MSGL_V,"Reading INDEX block, %d chunks for %ld frames (fpos=%p)\n", + priv->idx_size,avih.dwTotalFrames, stream_tell(demuxer->stream)); priv->idx=malloc(priv->idx_size<<4); +// printf("\nindex to %p !!!!! (priv=%p)\n",priv->idx,priv); stream_read(demuxer->stream,(char*)priv->idx,priv->idx_size<<4); for (i = 0; i < priv->idx_size; i++) // swap index to machine endian le2me_AVIINDEXENTRY((AVIINDEXENTRY*)priv->idx + i); @@ -379,6 +380,7 @@ } priv->idx_size=priv->idx_pos; mp_msg(MSGT_HEADER,MSGL_INFO,"AVI: Generated index table for %d chunks!\n",priv->idx_size); + if(verbose>=2) print_index(priv->idx,priv->idx_size); } }

1 0

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

16 Oct '02

Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var/tmp.root/cvs-serv6455 Modified Files: url.c Log Message: memleaks Index: url.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/url.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- url.c 9 Sep 2002 04:16:16 -0000 1.16 +++ url.c 16 Oct 2002 20:25:23 -0000 1.17 @@ -33,6 +33,7 @@ Curl->url = strdup(url); if( Curl->url==NULL ) { mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed!\n"); + free(Curl); return NULL; } @@ -40,6 +41,7 @@ ptr1 = strstr(url, "://"); if( ptr1==NULL ) { mp_msg(MSGT_NETWORK,MSGL_V,"Not an URL!\n"); + free(Curl->url);free(Curl); return NULL; } pos1 = ptr1-url; @@ -47,6 +49,7 @@ strncpy(Curl->protocol, url, pos1); if( Curl->protocol==NULL ) { mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed!\n"); + free(Curl->protocol);free(Curl->url);free(Curl); return NULL; } Curl->protocol[pos1] = '\0';

1 0

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

16 Oct '02

Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var/tmp.root/cvs-serv32282 Modified Files: demux_ogg.c Log Message: memleak fix Index: demux_ogg.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_ogg.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- demux_ogg.c 15 Sep 2002 22:38:30 -0000 1.14 +++ demux_ogg.c 16 Oct 2002 20:17:20 -0000 1.15 @@ -416,6 +416,7 @@ /// Error if(np < 0) { mp_msg(MSGT_DEMUX,MSGL_DBG2,"OGG demuxer : Bad page sync\n"); + free(ogg_d); return 0; } /// Need some more data

1 0

CVS: main/libmpdemux demux_mov.c,1.76,1.77
by Arpi of Ize 16 Oct '02

16 Oct '02

Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var/tmp.root/cvs-serv31297 Modified Files: demux_mov.c Log Message: memleak fix (found by valgrind) Index: demux_mov.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mov.c,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- demux_mov.c 16 Oct 2002 16:51:02 -0000 1.76 +++ demux_mov.c 16 Oct 2002 20:14:29 -0000 1.77 @@ -286,7 +286,6 @@ mp_msg(MSGT_DEMUX,MSGL_V,"Checking for MOV\n"); memset(priv,0,sizeof(mov_priv_t)); - demuxer->priv=priv; while(1){ int skipped=8; @@ -374,7 +373,7 @@ /* dunno what, but we shoudl ignore it */ break; default: - if(no==0) return 0; // first chunk is bad! + if(no==0){ free(priv); return 0;} // first chunk is bad! id = be2me_32(id); mp_msg(MSGT_DEMUX,MSGL_V,"MOV: unknown chunk: %.4s %d\n",&id,(int)len); } @@ -382,13 +381,19 @@ if(!stream_skip(demuxer->stream,len-skipped)) break; ++no; } - + + if(flags==3){ + demuxer->priv=priv; + return 1; + } + free(priv); + if(flags==1) mp_msg(MSGT_DEMUX,MSGL_WARN,"MOV: missing data (mdat) chunk! Maybe broken file...\n"); else if(flags==2) mp_msg(MSGT_DEMUX,MSGL_WARN,"MOV: missing header (moov/cmov) chunk! Maybe broken file...\n"); -return (flags==3); + return 0; } static void lschunks(demuxer_t* demuxer,int level,off_t endpos,mov_track_t* trak){

1 0

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

16 Oct '02

Update of /cvsroot/mplayer/main/libvo In directory mail:/var/tmp.root/cvs-serv13508/libvo Modified Files: vo_xv.c Log Message: fix fullscreen Index: vo_xv.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_xv.c,v retrieving revision 1.121 retrieving revision 1.122 diff -u -r1.121 -r1.122 --- vo_xv.c 16 Oct 2002 19:31:07 -0000 1.121 +++ vo_xv.c 16 Oct 2002 19:45:35 -0000 1.122 @@ -385,7 +385,8 @@ vo_x11_xinerama_move(mDisplay,vo_window); #endif } else - XMoveResizeWindow( mDisplay,vo_window,hint.x,hint.y,hint.width,hint.height ); + if ( !(flags&1) ) XMoveResizeWindow( mDisplay,vo_window,hint.x,hint.y,hint.width,hint.height ); + vo_gc = XCreateGC(mDisplay, vo_window, 0L, &xgcv); XFlush(mDisplay);

1 0

CVS: main/libvo vo_xv.c,1.120,1.121
by Arpi of Ize 16 Oct '02

16 Oct '02

Update of /cvsroot/mplayer/main/libvo In directory mail:/var/tmp.root/cvs-serv5211 Modified Files: vo_xv.c Log Message: -fixed-vo support, based on patch by .so :) Index: vo_xv.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_xv.c,v retrieving revision 1.120 retrieving revision 1.121 diff -u -r1.120 -r1.121 --- vo_xv.c 10 Oct 2002 00:09:34 -0000 1.120 +++ vo_xv.c 16 Oct 2002 19:31:07 -0000 1.121 @@ -1,3 +1,4 @@ +/* vo_xv.c, X11 Xv interface */ // Number of buffers _FOR_DOUBLEBUFFERING_MODE_ // Use option -double to enable double buffering! (default: single buffer) @@ -15,21 +16,6 @@ 3: 2*STATIC+TEMP */ - -/* - * vo_xv.c, X11 Xv interface - * - * Copyright (C) 1996, MPEG Software Simulation Group. All Rights Reserved. - * - * Hacked into mpeg2dec by - * - * Aaron Holtzman <aholtzma(a)ess.engr.uvic.ca> - * - * Xv image suuport by Gerd Knorr <kraxel(a)goldbach.in-berlin.de> - * fullscreen support by Pontscho - * double buffering support by A'rpi - */ - #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -258,6 +244,8 @@ return(VO_FALSE); } +static void deallocate_xvimage(int foo); + /* * connect to server, create and map window, * allocate colors and (shared) memory @@ -377,7 +365,7 @@ XMapWindow( mDisplay,vo_window ); } else { drwX=vo_dx; drwY=vo_dy; } } else - { + if ( vo_window == None ){ vo_window = XCreateWindow(mDisplay, mRootWin, hint.x, hint.y, hint.width, hint.height, 0, depth,CopyFromParent,vinfo.visual,xswamask,&xswa); @@ -396,7 +384,9 @@ #ifdef HAVE_XINERAMA vo_x11_xinerama_move(mDisplay,vo_window); #endif - } + } else + XMoveResizeWindow( mDisplay,vo_window,hint.x,hint.y,hint.width,hint.height ); + vo_gc = XCreateGC(mDisplay, vo_window, 0L, &xgcv); XFlush(mDisplay); XSync(mDisplay, False); @@ -424,6 +414,10 @@ case IMGFMT_UYVY: draw_alpha_fnc=draw_alpha_uyvy; break; default: draw_alpha_fnc=draw_alpha_null; } + + if ( vo_config_count ) + for(current_buf=0;current_buf<num_buffers;++current_buf) + deallocate_xvimage(current_buf); for(current_buf=0;current_buf<num_buffers;++current_buf) allocate_xvimage(current_buf);

1 0

CVS: main/libmpcodecs vd_libmpeg2.c,1.14,1.15
by Arpi of Ize 16 Oct '02

16 Oct '02

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv3449 Modified Files: vd_libmpeg2.c Log Message: 10l. use mpcodecs_draw_slice, instead of libvo directly Index: vd_libmpeg2.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_libmpeg2.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- vd_libmpeg2.c 21 Sep 2002 22:38:41 -0000 1.14 +++ vd_libmpeg2.c 16 Oct 2002 19:26:30 -0000 1.15 @@ -91,14 +91,13 @@ } static void draw_slice (vo_frame_t * frame, uint8_t ** src){ - vo_functions_t * output = frame->vo; int stride[3]; int y=picture->slice<<4; stride[0]=picture->coded_picture_width; stride[1]=stride[2]=stride[0]/2; - output->draw_slice (src, + mpcodecs_draw_slice(frame->vo, src, stride, picture->display_picture_width, (y+16<=picture->display_picture_height) ? 16 : picture->display_picture_height-y, @@ -205,7 +204,7 @@ mpi, (mpi->flags&MP_IMGFLAG_DIRECT)?"DR!":""); } - picture->current_frame->vo=sh->video_out; + picture->current_frame->vo=sh; picture->slice=0; }

1 0

CVS: main/libmpdemux demux_mov.c,1.75,1.76 demuxer.c,1.117,1.118
by Arpi of Ize 16 Oct '02

16 Oct '02

Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var/tmp.root/cvs-serv31609 Modified Files: demux_mov.c demuxer.c Log Message: ss_div/ss_mul defaults to 0 Index: demux_mov.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mov.c,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- demux_mov.c 7 Oct 2002 16:43:04 -0000 1.75 +++ demux_mov.c 16 Oct 2002 16:51:02 -0000 1.76 @@ -1399,7 +1399,7 @@ // x*=char2int(trak->stdata,32); // bytes/packet x*=char2int(trak->stdata,36); // bytes/frame } else { - if(ds->ss_div!=1 || ds->ss_mul!=1){ + if(ds->ss_div && ds->ss_mul){ // workaround for buggy files like 7up-high-traffic-areas.mov, // with missing stsd v1 header containing compression rate x/=ds->ss_div; x*=ds->ss_mul; // compression ratio fix ! HACK ! Index: demuxer.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demuxer.c,v retrieving revision 1.117 retrieving revision 1.118 diff -u -r1.117 -r1.118 --- demuxer.c 4 Oct 2002 19:23:36 -0000 1.117 +++ demuxer.c 16 Oct 2002 16:51:03 -0000 1.118 @@ -46,7 +46,7 @@ ds->asf_seq=-1; ds->asf_packet=NULL; //---------------- - ds->ss_mul=ds->ss_div=1; + ds->ss_mul=ds->ss_div=0; ds->block_size=1; //---------------- ds->sh=NULL;

1 0

CVS: main/libmpcodecs ad_alaw.c,1.2,1.3
by Arpi of Ize 16 Oct '02

16 Oct '02

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv31030 Modified Files: ad_alaw.c Log Message: set up ss_div/ss_mul properly, accept 'alaw' fourcc too Index: ad_alaw.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_alaw.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ad_alaw.c 30 Aug 2002 21:44:20 -0000 1.2 +++ ad_alaw.c 16 Oct 2002 16:49:58 -0000 1.3 @@ -31,6 +31,8 @@ static int preinit(sh_audio_t *sh) { sh->audio_out_minsize=2048; + sh->ds->ss_div = 1; // 1 samples/packet + sh->ds->ss_mul = 1; // 1 bytes/packet return 1; } @@ -61,7 +63,7 @@ unsigned short *d=(unsigned short *) buf; unsigned char *s=buf; len=2*l; - if(sh_audio->format==6){ + if(sh_audio->format==6 || sh_audio->format==0x77616C61){ /* aLaw */ while(l>0){ --l; d[l]=alaw2short[s[l]]; } } else {

1 0

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

16 Oct '02

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv1691 Modified Files: ad_realaud.c Log Message: tell the codec wrapper the codec path (fixes realaudio Sipr) Index: ad_realaud.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_realaud.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- ad_realaud.c 29 Sep 2002 19:19:31 -0000 1.17 +++ ad_realaud.c 16 Oct 2002 15:59:04 -0000 1.18 @@ -41,7 +41,7 @@ static unsigned long (*raInitDecoder)(void*, void*); static unsigned long (*raOpenCodec2)(void*); static unsigned long (*raSetFlavor)(void*,unsigned long); -//static void (*raSetDLLAccessPath)(unsigned long); +static void (*raSetDLLAccessPath)(char*); static void (*raSetPwd)(char*,char*); typedef struct { @@ -77,14 +77,24 @@ raOpenCodec2 = dlsym(handle, "RAOpenCodec2"); raInitDecoder = dlsym(handle, "RAInitDecoder"); raSetFlavor = dlsym(handle, "RASetFlavor"); -// raSetDLLAccessPath = dlsym(handle, "SetDLLAccessPath"); + raSetDLLAccessPath = dlsym(handle, "SetDLLAccessPath"); raSetPwd = dlsym(handle, "RASetPwd"); // optional, used by SIPR if(!raCloseCodec || !raDecode || !raFlush || !raFreeDecoder || !raGetFlavorProperty || !raOpenCodec2 || !raSetFlavor || /*!raSetDLLAccessPath ||*/ !raInitDecoder){ - mp_msg(MSGT_DECAUDIO,MSGL_WARN,"Cannot resolve symbols - incompatible dll\n"); + mp_msg(MSGT_DECAUDIO,MSGL_WARN,"Cannot resolve symbols - incompatible dll: %s\n",path); return 0; + } + + if(raSetDLLAccessPath){ + sprintf(path, "DT_Codecs=" REALCODEC_PATH); + if(path[strlen(path)-1]!='/'){ + path[strlen(path)+1]=0; + path[strlen(path)]='/'; + } + path[strlen(path)+1]=0; + raSetDLLAccessPath(path); } result=raOpenCodec2(&sh->context);

1 0