July 2001 - MPlayer-cvslog - lists.mplayerhq.hu

CVS: main configure,1.124,1.125
by Arpi of Ize 01 Aug '01

01 Aug '01

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv14452 Modified Files: configure Log Message: divx4linux autodetection Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.124 retrieving revision 1.125 diff -u -r1.124 -r1.125 --- configure 30 Jul 2001 14:53:07 -0000 1.124 +++ configure 31 Jul 2001 22:20:43 -0000 1.125 @@ -755,15 +755,18 @@ fi fi fi - + +_divx4linux=no +$_cc $_extraincdir $_extralibdir $TMPC -o $TMPO -ldivxdecore > /dev/null 2>&1 && _divx4linux=yes + _termcap=no -$_cc $TMPC -o $TMPO -ltermcap > /dev/null 2>&1 && _termcap=yes +$_cc $_extraincdir $_extralibdir $TMPC -o $TMPO -ltermcap > /dev/null 2>&1 && _termcap=yes _png=no -$_cc $_extraincdir $_extralibdir $TMPC -o $TMPO -lpng -lz -lm > /dev/null 2>&1 && _png=yes +$_cc $_extraincdir $_extralibdir $_extraincdir $_extralibdir $TMPC -o $TMPO -lpng -lz -lm > /dev/null 2>&1 && _png=yes _ggi=no -$_cc $TMPC -o $TMPO -lggi > /dev/null 2>&1 && _ggi=yes +$_cc $_extraincdir $_extralibdir $TMPC -o $TMPO -lggi > /dev/null 2>&1 && _ggi=yes _kstat=no $_cc $TMPC -o $TMPO -lkstat >/dev/null 2>&1 && _kstat=yes _archlibs="-lkstat $_archlibs" @@ -1360,6 +1363,7 @@ echo "Checking for PNG support ... $_png" echo "Checking for DirectShow ... $_dshow" echo "Checking for libavcodec ... $_libavcodec" +echo "Checking for divx4linux ... $_divx4linux" echo "Checking for fastmemcpy ... $_fastmemcpy" echo "Extra libs : $_extralibdir" echo "Extra headers : $_extraincdir" @@ -1745,6 +1749,16 @@ _gui='#undef HAVE_GUI' fi +if [ $_divx4linux = yes ]; then + _divx4def='#define NEW_DECORE' + _decorelibs='-ldivxdecore opendivx/postprocess.o' +else + _divx4def='#undef NEW_DECORE' + _decorelibs='-Lopendivx -ldecore' +# _postproc='#undef MPEG12_POSTPROC' +fi + + _postproc='#define MPEG12_POSTPROC' echo echo "Creating $MCONF" @@ -1778,8 +1792,8 @@ ESD_LIB = $_esdlib ARCH_LIBS = $_archlibs STREAM_SRCS = $_streamingsrcs -DECORE_LIBS = -Lopendivx -ldecore -# DECORE_LIBS=-L/usr/local/lib -ldivxdecore +DECORE_LIBS = $_decorelibs +DIVX4LINUX=$_divx4linux # --- Some stuff for autoconfigure ---- $_target_arch @@ -1805,7 +1819,7 @@ /* Define for using new DivX4Linux library, instead of open-source OpenDivX */ /* You have to change DECORE_LIBS in config.mak too! */ -#undef NEW_DECORE +$_divx4def /* Define this to enable avg. byte/sec-based AVI sync method by default: (use -bps or -nobps commandline option for run-time method selection) */ @@ -1872,7 +1886,7 @@ $_css /* Define this to enable MPEG 1/2 image postprocessing (requires FAST cpu!) */ -#define MPEG12_POSTPROC +$_postproc /* DirectShow support */ $_dshow

3 2

CVS: main configure,1.125,1.126 demuxer.c,1.14,1.15 demuxer.h,1.9,1.10 mplayer.c,1.197,1.198 seek.c,1.4,1.5 stream.c,1.11,1.12 stream.h,1.5,1.6
by Arpi of Ize 31 Jul '01

31 Jul '01

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv17594 Modified Files: configure demuxer.c demuxer.h mplayer.c seek.c stream.c stream.h Log Message: largefile patch by Stephen Davies <steve(a)daviesfam.org> Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.125 retrieving revision 1.126 diff -u -r1.125 -r1.126 --- configure 31 Jul 2001 22:20:43 -0000 1.125 +++ configure 31 Jul 2001 23:18:16 -0000 1.126 @@ -6,6 +6,9 @@ # # Changes in reversed order: # +# 2001/07/31 by Steve Davies +# - added --enable-largefiles +# # 2001/07/12 by Juergen Keil # - add support for non-x86 targets # - add autoconf checks for loader/wine @@ -122,6 +125,7 @@ data [/usr/local/share/mplayer] --enable-debug[=1-3] compile debugging information into mplayer [disable] --enable-profile compile profiling information into mplayer [disable] + --enable-largefiles build with support for files >2^32 bytes long [disable] --enable-mmx build with mmx support [autodetect] --enable-mmx2 build with mmx2 support (PIII, Athlon) [autodetect] --enable-3dnow build with 3dnow! support [autodetect] @@ -962,6 +966,9 @@ --enable-debug) _debug='-g' ;; + --enable-largefiles) + _largefiles=yes + ;; --enable-debug=*) _debug=`echo $_echo_n '-g'$_echo_c; echo $ac_option | cut -d '=' -f 2` ;; @@ -1573,6 +1580,11 @@ # for MT applications: if [ "$system_name" = "FreeBSD" ]; then CFLAGS="$CFLAGS -D_THREAD_SAFE" +fi + +# 64 bit file offsets? +if [ "$_largefiles" = "yes" ]; then +CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" fi # echo 'CFLAGS=$(OPTFLAGS) -Wall -DMPG12PLAY' >> config.mak Index: demuxer.c =================================================================== RCS file: /cvsroot/mplayer/main/demuxer.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- demuxer.c 29 Jul 2001 21:07:34 -0000 1.14 +++ demuxer.c 31 Jul 2001 23:18:16 -0000 1.15 @@ -1,5 +1,8 @@ //=================== DEMUXER v2.5 ========================= +#include <sys/types.h> +#include <sys/stat.h> + #include <stdio.h> #include <stdlib.h> @@ -96,12 +99,12 @@ ds->first=ds->last=dp; } if(verbose>=2) - printf("DEMUX: Append packet to %s, len=%d pts=%5.3f pos=%d [packs: A=%d V=%d]\n", + printf("DEMUX: Append packet to %s, len=%d pts=%5.3f pos=%u [packs: A=%d V=%d]\n", (ds==ds->demuxer->audio)?"d_audio":"d_video", - dp->len,dp->pts,dp->pos,ds->demuxer->audio->packs,ds->demuxer->video->packs); + dp->len,dp->pts,(unsigned int)dp->pos,ds->demuxer->audio->packs,ds->demuxer->video->packs); } -void ds_read_packet(demux_stream_t *ds,stream_t *stream,int len,float pts,int pos,int flags){ +void ds_read_packet(demux_stream_t *ds,stream_t *stream,int len,float pts,off_t pos,int flags){ demux_packet_t* dp=new_demux_packet(len); stream_read(stream,dp->buffer,len); dp->pts=pts; //(float)pts/90000.0f; @@ -574,4 +577,3 @@ demuxer->file_format=file_format; return demuxer; } - Index: demuxer.h =================================================================== RCS file: /cvsroot/mplayer/main/demuxer.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- demuxer.h 21 Jul 2001 22:36:39 -0000 1.9 +++ demuxer.h 31 Jul 2001 23:18:16 -0000 1.10 @@ -18,10 +18,11 @@ #define DEMUXER_TIME_BPS 3 +// Holds one packet/frame/whatever typedef struct demux_packet_st { int len; float pts; - int pos; // pozicio indexben (AVI) ill. fileban (MPG) + off_t pos; // pozicio indexben (AVI) ill. fileban (MPG) unsigned char* buffer; int flags; // keyframe, etc struct demux_packet_st* next; @@ -34,8 +35,8 @@ float pts; // current buffer's pts int pts_bytes; // number of bytes read after last pts stamp int eof; // end of demuxed stream? (true if all buffer empty) - int pos; // position in the input stream (file) - int dpos; // position in the demuxed stream + off_t pos; // position in the input stream (file) + off_t dpos; // position in the demuxed stream int pack_no; // serial number of packet int flags; // flags of current packet (keyframe etc) //--------------- @@ -55,12 +56,12 @@ typedef struct demuxer_st { stream_t *stream; int synced; // stream synced (used by mpeg) - int filepos; // input stream current pos. + off_t filepos; // input stream current pos. int type; // demuxer type: mpeg PS, mpeg ES, avi, avi-ni, avi-nini, asf int file_format; // file format: mpeg/avi/asf // int time_src;// time source (pts/file/bps) - unsigned int movi_start; - unsigned int movi_end; + off_t movi_start; + off_t movi_end; // demux_stream_t *audio; demux_stream_t *video; @@ -68,6 +69,7 @@ // index: // AVIINDEXENTRY* idx; +// FIXME: off_t??? void* idx; int idx_size; int idx_pos; @@ -103,12 +105,12 @@ demuxer_t* new_demuxer(stream_t *stream,int type,int a_id,int v_id,int s_id); void ds_add_packet(demux_stream_t *ds,demux_packet_t* dp); -void ds_read_packet(demux_stream_t *ds,stream_t *stream,int len,float pts,int pos,int flags); +void ds_read_packet(demux_stream_t *ds,stream_t *stream,int len,float pts,off_t pos,int flags); int demux_fill_buffer(demuxer_t *demux,demux_stream_t *ds); int ds_fill_buffer(demux_stream_t *ds); -inline static int ds_tell(demux_stream_t *ds){ +inline static off_t ds_tell(demux_stream_t *ds){ return (ds->dpos-ds->buffer_size)+ds->buffer_pos; } Index: mplayer.c =================================================================== RCS file: /cvsroot/mplayer/main/mplayer.c,v retrieving revision 1.197 retrieving revision 1.198 diff -u -r1.197 -r1.198 --- mplayer.c 30 Jul 2001 02:00:54 -0000 1.197 +++ mplayer.c 31 Jul 2001 23:18:16 -0000 1.198 @@ -1,24 +1,25 @@ // AVI & MPEG Player v0.18 (C) 2000-2001. by A'rpi/ESP-team -#include <stdio.h> -#include <stdlib.h> -#include <string.h> - -#include <signal.h> +#include "version.h" +#include "config.h" #include <sys/ioctl.h> -#include <unistd.h> -#include <time.h> #include <sys/mman.h> - #include <sys/types.h> #include <sys/wait.h> #include <sys/time.h> #include <sys/stat.h> + +#include <signal.h> + +#include <time.h> + #include <fcntl.h> +#include <unistd.h> -#include "version.h" -#include "config.h" +#include <stdio.h> +#include <stdlib.h> +#include <string.h> #ifdef __FreeBSD__ #include <sys/cdrio.h> @@ -227,7 +228,7 @@ int osd_level=2; int divx_quality=0; char *seek_to_sec=NULL; -int seek_to_byte=0; +off_t seek_to_byte=0; int has_audio=1; char *audio_codec=NULL; // override audio codec char *video_codec=NULL; // override video codec @@ -641,7 +642,7 @@ stream->end_pos=ret2; } else { //============ Open plain FILE ============ - int len; + off_t len; if(!strcmp(filename,"-")){ // read from stdin printf("Reading from stdin...\n"); @@ -656,6 +657,14 @@ f=open(filename,O_RDONLY); if(f<0){ fprintf(stderr,"File not found: '%s'\n",filename);return 1; } len=lseek(f,0,SEEK_END); lseek(f,0,SEEK_SET); + if (len == -1) + perror("Error: lseek failed to obtain video file size"); + else +#ifdef _LARGEFILE_SOURCE + fprintf(stderr, "File size is %lld bytes\n", (long long)len); +#else + fprintf(stderr, "File size is %u bytes\n", (unsigned int)len); +#endif stream=new_stream(f,STREAMTYPE_FILE); stream->end_pos=len; #ifdef STREAMING Index: seek.c =================================================================== RCS file: /cvsroot/mplayer/main/seek.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- seek.c 29 Jul 2001 21:07:34 -0000 1.4 +++ seek.c 31 Jul 2001 23:18:16 -0000 1.5 @@ -58,6 +58,7 @@ switch(demuxer->file_format){ + //FIXME: OFF_T - Didn't check AVI case yet (avi files can't be >2G anyway?) case DEMUXER_TYPE_AVI: { //================= seek in AVI ========================== int rel_seek_frames=rel_seek_secs*sh_video->fps; @@ -187,12 +188,14 @@ } break; + //FIXME: OFF_T - didn't test ASF case yet (don't have a large asf...) + //FIXME: reports good or bad to steve(a)daviesfam.org please case DEMUXER_TYPE_ASF: { //================= seek in ASF ========================== float p_rate=10; // packets / sec - int rel_seek_packs=rel_seek_secs*p_rate; - int rel_seek_bytes=rel_seek_packs*asf_packetsize; - int newpos; + off_t rel_seek_packs=rel_seek_secs*p_rate; // FIXME: int may be enough? + off_t rel_seek_bytes=rel_seek_packs*asf_packetsize; + off_t newpos; //printf("ASF: packs: %d duration: %d \n",(int)fileh.packets,*((int*)&fileh.duration)); // printf("ASF_seek: %d secs -> %d packs -> %d bytes \n", // rel_seek_secs,rel_seek_packs,rel_seek_bytes); @@ -228,14 +231,18 @@ case DEMUXER_TYPE_MPEG_ES: case DEMUXER_TYPE_MPEG_PS: { //================= seek in MPEG ========================== - int newpos; + off_t newpos; if(!sh_video->i_bps) // unspecified? newpos=demuxer->filepos+2324*75*rel_seek_secs; // 174.3 kbyte/sec else newpos=demuxer->filepos+(sh_video->i_bps)*rel_seek_secs; if(newpos<seek_to_byte) newpos=seek_to_byte; +#ifdef _LARGEFILE_SOURCE + newpos&=~((long long)STREAM_BUFFER_SIZE-1); /* sector boundary */ +#else newpos&=~(STREAM_BUFFER_SIZE-1); /* sector boundary */ +#endif stream_seek(demuxer->stream,newpos); // re-sync video: Index: stream.c =================================================================== RCS file: /cvsroot/mplayer/main/stream.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- stream.c 21 Jun 2001 00:06:40 -0000 1.11 +++ stream.c 31 Jul 2001 23:18:16 -0000 1.12 @@ -1,10 +1,15 @@ -#include <stdio.h> -#include <stdlib.h> +#include "config.h" +#include <sys/types.h> +#include <sys/stat.h> #include <sys/ioctl.h> +#include <fcntl.h> #include <unistd.h> +#include <stdio.h> +#include <stdlib.h> + #include "stream.h" extern int verbose; // defined in mplayer.c @@ -40,14 +45,19 @@ return len; } -int stream_seek_long(stream_t *s,unsigned int pos){ -unsigned int newpos; +int stream_seek_long(stream_t *s,off_t pos){ +off_t newpos; -// if(verbose>=3) printf("seek to 0x%X\n",pos); +// if(verbose>=3) printf("seek to 0x%X\n",(unsigned int)pos); if(verbose>=3){ +#ifdef _LARGEFILE_SOURCE + printf("s->pos=%llX newpos=%llX new_bufpos=%llX buflen=%X \n", + (long long)s->pos,(long long)newpos,(long long)pos,s->buf_len); +#else printf("s->pos=%X newpos=%X new_bufpos=%X buflen=%X \n", (unsigned int)s->pos,newpos,pos,s->buf_len); +#endif } s->buf_pos=s->buf_len=0; @@ -55,7 +65,11 @@ switch(s->type){ case STREAMTYPE_FILE: case STREAMTYPE_STREAM: +#ifdef _LARGEFILE_SOURCE + newpos=pos&(~((long long)STREAM_BUFFER_SIZE-1));break; +#else newpos=pos&(~(STREAM_BUFFER_SIZE-1));break; +#endif case STREAMTYPE_VCD: newpos=(pos/VCD_SECTOR_DATA)*VCD_SECTOR_DATA;break; } @@ -97,7 +111,11 @@ s->buf_pos=pos; // byte position in sector return 1; } - if(verbose) printf("stream_seek: WARNING! Can't seek to 0x%X !\n",pos+newpos); +#ifdef _LARGEFILE_SOURCE + if(verbose) printf("stream_seek: WARNING! Can't seek to 0x%llX !\n",(long long)(pos+newpos)); +#else + if(verbose) printf("stream_seek: WARNING! Can't seek to 0x%X !\n",(pos+newpos)); +#endif return 0; } Index: stream.h =================================================================== RCS file: /cvsroot/mplayer/main/stream.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- stream.h 4 Jun 2001 17:51:17 -0000 1.5 +++ stream.h 31 Jul 2001 23:18:16 -0000 1.6 @@ -20,16 +20,17 @@ typedef struct { int fd; - long pos; + off_t pos; int eof; int type; // 0=file 1=VCD unsigned int buf_pos,buf_len; - long start_pos,end_pos; + off_t start_pos,end_pos; unsigned char buffer[STREAM_BUFFER_SIZE>VCD_SECTOR_SIZE?STREAM_BUFFER_SIZE:VCD_SECTOR_SIZE]; } stream_t; int stream_fill_buffer(stream_t *s); -int stream_seek_long(stream_t *s,unsigned int pos); + +int stream_seek_long(stream_t *s,off_t pos); inline static int stream_read_char(stream_t *s){ return (s->buf_pos<s->buf_len)?s->buffer[s->buf_pos++]: @@ -91,16 +92,16 @@ return s->eof; } -inline static int stream_tell(stream_t *s){ +inline static off_t stream_tell(stream_t *s){ return s->pos+s->buf_pos-s->buf_len; } -inline static int stream_seek(stream_t *s,unsigned int pos){ +inline static int stream_seek(stream_t *s,off_t pos){ -// if(verbose>=3) printf("seek to 0x%X\n",pos); +// if(verbose>=3) printf("seek to 0x%qX\n",(long long)pos); if(pos<s->pos){ - int x=pos-(s->pos-s->buf_len); + off_t x=pos-(s->pos-s->buf_len); if(x>=0){ s->buf_pos=x; // putchar('*');fflush(stdout);

1 0

CVS: main/DOCS codecs.conf,1.47,1.48
by Arpi of Ize 31 Jul '01

31 Jul '01

Update of /cvsroot/mplayer/main/DOCS In directory mplayer:/var/tmp.root/cvs-serv17594/DOCS Modified Files: codecs.conf Log Message: largefile patch by Stephen Davies <steve(a)daviesfam.org> Index: codecs.conf =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/codecs.conf,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- codecs.conf 26 Jul 2001 00:29:00 -0000 1.47 +++ codecs.conf 31 Jul 2001 23:18:16 -0000 1.48 @@ -108,7 +108,7 @@ driver divx4 dll "libdivxdecore.0" ; out YV12 ; works, but odivx driver is faster with YV12 (DEC_USER) - out I420 +; out I420 out YUY2 out UYVY out BGR32,BGR24,BGR16,BGR15

2 1

CVS: main/opendivx Makefile,1.6,1.7
by Arpi of Ize 31 Jul '01

31 Jul '01

Update of /cvsroot/mplayer/main/opendivx In directory mplayer:/var/tmp.root/cvs-serv14593 Modified Files: Makefile Log Message: divx4linux autodetection Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/opendivx/Makefile,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Makefile 26 Jun 2001 23:15:58 -0000 1.6 +++ Makefile 31 Jul 2001 22:22:01 -0000 1.7 @@ -3,7 +3,11 @@ include ../config.mak -SRCS = basic_prediction.c decore.c getbits.c idct.c mp4_block.c mp4_decoder.c mp4_header.c mp4_mblock.c mp4_picture.c mp4_predict.c mp4_recon.c mp4_vld.c postprocess.c +SRCS = postprocess.c +ifeq ($(DIVX4LINUX),yes) +SRCS+= basic_prediction.c decore.c getbits.c idct.c mp4_block.c mp4_decoder.c mp4_header.c mp4_mblock.c mp4_picture.c mp4_predict.c mp4_recon.c mp4_vld.c +endif + OBJS = $(SRCS:.c=.o) INCLUDE = -I. -I.. -I../libmpeg2 $(EXTRA_INC) CFLAGS = $(OPTFLAGS) $(INCLUDE) -D_DECORE -DO_BINARY=0 -DLINUX

1 0

CVS: main/libvo2 libvo2.c,NONE,1.1 vo2_def.h,NONE,1.1
by Arpi of Ize 31 Jul '01

31 Jul '01

Update of /cvsroot/mplayer/main/libvo2 In directory mplayer:/var/tmp.root/cvs-serv4806 Added Files: libvo2.c vo2_def.h Log Message: libvo2 base --- NEW FILE --- #include <stdio.h> #include <stdlib.h> #include "libvo2.h" // libvo2 core interface vo2_handle_t* vo2_init_sample(); vo2_handle_t* vo2_new(char *drvname){ // do it better... (later: plugin loader stuff) if(!strcmp(drvname,"sample")) return vo2_init_sample(); if(!strcmp(drvname,"mga")) return vo2_init_mga(); // if(!strcmp(drvname,"x11")) return vo2_new_mga(); // ... fprintf(stderr,"No such driver: %s\n",drvname); return NULL; } int vo2_start(vo2_handle_t* vo, int w,int h,int format,int buffering,int flags){ return vo->functions->start(vo->priv,w,h,format,buffering,flags); } int vo2_query_format(vo2_handle_t* vo){ return 1; } int vo2_close(vo2_handle_t* vo){ return vo->functions->stop(vo->priv); } --- NEW FILE --- // include only from vo2_*.c drivers! static int control(void *p, int cmd, void* param); static int start(void *p, int w,int h,int format,int buffering,int flags); static int stop(void *p); static vo2_surface_t* get_surface(void *p, int num); static void flip_image(void *p, int num); static vo2_functions_t functions = { control, start, stop, get_surface, flip_image }; static vo2_handle_t* new_handle(){ vo2_handle_t* h=malloc(sizeof(vo2_handle_t)); if(!h) return NULL; h->priv=malloc(sizeof(priv_t)); if(!h->priv){ free(h); return NULL; } memset(h->priv,0,sizeof(priv_t)); h->info=&info; h->functions=&functions; h->surface=NULL; return h; }

1 0

CVS: main/libvo2 Makefile,NONE,1.1 img_format.c,NONE,1.1 img_format.h,NONE,1.1 vo2_sample.c,NONE,1.1
by Arpi of Ize 31 Jul '01

31 Jul '01

Update of /cvsroot/mplayer/main/libvo2 In directory mplayer:/var/tmp.root/cvs-serv4666 Added Files: Makefile img_format.c img_format.h vo2_sample.c Log Message: libvo2 base --- NEW FILE --- include ../config.mak LIBNAME = libvo2.a SRCS=draw.c libvo2.c vo2_sample.c vo2_mga.c img_format.c OBJS=$(SRCS:.c=.o) CFLAGS = -Wall $(OPTFLAGS) -I. -I.. $(SDL_INC) $(X11_INC) $(EXTRA_INC) # -I/usr/X11R6/include/ .SUFFIXES: .c .o # .PHONY: all clean .c.o: $(CC) -c $(CFLAGS) -o $@ $< $(LIBNAME): $(OBJS) $(AR) r $(LIBNAME) $(OBJS) all: $(LIBNAME) clean: rm -f *.o *.a *~ distclean: rm -f Makefile.bak *.o *.a *~ .depend dep: depend depend: $(CC) -MM $(CFLAGS) $(SRCS) 1>.depend # # include dependency files if they exist # ifneq ($(wildcard .depend),) include .depend endif --- NEW FILE --- #include "img_format.h" char *vo_format_name(int format) { switch(format) { case IMGFMT_RGB8: return("RGB 8-bit"); case IMGFMT_RGB15: return("RGB 15-bit"); case IMGFMT_RGB16: return("RGB 16-bit"); case IMGFMT_RGB24: return("RGB 24-bit"); case IMGFMT_RGB32: return("RGB 32-bit"); case IMGFMT_BGR8: return("BGR 8-bit"); case IMGFMT_BGR15: return("BGR 15-bit"); case IMGFMT_BGR16: return("BGR 16-bit"); case IMGFMT_BGR24: return("BGR 24-bit"); case IMGFMT_BGR32: return("BGR 32-bit"); case IMGFMT_YVU9: return("Planar YVU9"); case IMGFMT_IF09: return("Planar IF09"); case IMGFMT_YV12: return("Planar YV12"); case IMGFMT_I420: return("Planar I420"); case IMGFMT_IYUV: return("Planar IYUV"); case IMGFMT_CLPL: return("Planar CLPL"); case IMGFMT_IYU1: return("Packed IYU1"); case IMGFMT_IYU2: return("Packed IYU2"); case IMGFMT_UYVY: return("Packed UYVY"); case IMGFMT_UYNV: return("Packed UYNV"); case IMGFMT_cyuv: return("Packed CYUV"); case IMGFMT_YUY2: return("Packed YUY2"); case IMGFMT_YUNV: return("Packed YUNV"); case IMGFMT_YVYU: return("Packed YVYU"); case IMGFMT_Y41P: return("Packed Y41P"); case IMGFMT_Y211: return("Packed Y211"); case IMGFMT_Y41T: return("Packed Y41T"); case IMGFMT_Y42T: return("Packed Y42T"); case IMGFMT_V422: return("Packed V422"); case IMGFMT_V655: return("Packed V655"); case IMGFMT_CLJR: return("Packed CLJR"); case IMGFMT_YUVP: return("Packed YUVP"); case IMGFMT_UYVP: return("Packed UYVP"); } return("Unknown"); } --- NEW FILE --- #ifndef __IMG_FORMAT_H #define __IMG_FORMAT_H /* RGB/BGR Formats */ #define IMGFMT_RGB_MASK 0xFFFFFF00 #define IMGFMT_RGB (('R'<<24)|('G'<<16)|('B'<<8)) #define IMGFMT_RGB8 (IMGFMT_RGB|8) #define IMGFMT_RGB15 (IMGFMT_RGB|15) #define IMGFMT_RGB16 (IMGFMT_RGB|16) #define IMGFMT_RGB24 (IMGFMT_RGB|24) #define IMGFMT_RGB32 (IMGFMT_RGB|32) #define IMGFMT_BGR_MASK 0xFFFFFF00 #define IMGFMT_BGR (('B'<<24)|('G'<<16)|('R'<<8)) #define IMGFMT_BGR8 (IMGFMT_BGR|8) #define IMGFMT_BGR15 (IMGFMT_BGR|15) #define IMGFMT_BGR16 (IMGFMT_BGR|16) #define IMGFMT_BGR24 (IMGFMT_BGR|24) #define IMGFMT_BGR32 (IMGFMT_BGR|32) /* Planar YUV Formats */ #define IMGFMT_YVU9 0x39555659 #define IMGFMT_IF09 0x39304649 #define IMGFMT_YV12 0x32315659 #define IMGFMT_I420 0x30323449 #define IMGFMT_IYUV 0x56555949 #define IMGFMT_CLPL 0x4C504C43 /* Packed YUV Formats */ #define IMGFMT_IYU1 0x31555949 #define IMGFMT_IYU2 0x32555949 #define IMGFMT_UYVY 0x59565955 #define IMGFMT_UYNV 0x564E5955 #define IMGFMT_cyuv 0x76757963 #define IMGFMT_YUY2 0x32595559 #define IMGFMT_YUNV 0x564E5559 #define IMGFMT_YVYU 0x55595659 #define IMGFMT_Y41P 0x50313459 #define IMGFMT_Y211 0x31313259 #define IMGFMT_Y41T 0x54313459 #define IMGFMT_Y42T 0x54323459 #define IMGFMT_V422 0x32323456 #define IMGFMT_V655 0x35353656 #define IMGFMT_CLJR 0x524A4C43 #define IMGFMT_YUVP 0x50565559 #define IMGFMT_UYVP 0x50565955 char *vo_format_name(int format); #endif --- NEW FILE --- #include <stdio.h> #include <stdlib.h> #include "libvo2.h" #include "img_format.h" // Driver info: static vo2_info_t info = { "dummy sample vo2 driver", "dummy", "Arpad Gereoffy <arpi(a)thot.banki.hu>", "does nothing" }; // Local, driver-dependent data: (do not use globals! -> reentrancy) typedef struct { int double_buffering; int current_surface; vo2_surface_t surfaces[3]; } priv_t; #include "vo2_def.h" // open hardware/lib, get capabilities // this function will be called first, before any other control() or start() calls // return: 1=success 0=failed vo2_handle_t* vo2_init_sample(){ printf("vo2_sample: init()\n"); return new_handle(); } // control (get/set/query) device parameters // for example: query supported pixel formats, en/disable double buffering, // query hw/sw scaling capabilities, switch window/fullscreen, // get best matching resolution for a given image size etc... static int control(void *p, int cmd, void* param){ printf("vo2_sample: control(0x%X)\n",cmd); return -1; } // start drawing (set video mode, allocate image buffers etc.) // w,h: requested surface size (actual size may be larger!!!) // format: IMGFMT_* requested surface pixel format // buffering: 0 - single temporary frame buffer (for draw_* stuff) // 1 - single static buffer (for win32 direct rendering) // 2 - 2 static + 1 temp buffer (for mpeg direct rendering) // flags: various things, like fullscreen, sw/hw zoom and vidmode change // return: 1=success 0=fail (fail if pixel format or buffering not supported) static int start(void *p, int w,int h,int format,int buffering,int flags){ // open window / switch vidmode, set up surfaces etc... printf("vo2_sample: start() %dx%d %s %d 0x%X\n",w,h,vo_format_name(format),buffering,flags); return 1; } static int stop(void *p){ // stop rendering, close device printf("vo2_sample: stop()\n"); return 1; } // get destination surface (for direct rendering or generic draw_ functions) // num: number of frame. 0 = temporary frame - can be dropped/modified // 1-2 = static frames - should not be modified // Note: mpeg will use 0,1,2 frames for B,Pf,Pb (or fallback to 0-only) // win32 will use only 0 static vo2_surface_t* get_surface(void *p, int num){ printf("vo2_sample: get_surface(%d)\n",num); return &((priv_t*)p)->surfaces[((priv_t*)p)->current_surface]; } static void flip_image(void *p, int num){ // we can assume that num is valid (get_surface(num) will return non-NULL) printf("vo2_sample: flip_image(%d)\n",num); // let's show surface[num] // if(double_buffering) current_surface=current_surface^1; // swap buffers }

1 0

CVS: main/libvo2 vo2_mga.c,NONE,1.1
by Arpi of Ize 31 Jul '01

31 Jul '01

Update of /cvsroot/mplayer/main/libvo2 In directory mplayer:/var/tmp.root/cvs-serv4567 Added Files: vo2_mga.c Log Message: control() implemented --- NEW FILE --- #include <stdio.h> #include <stdlib.h> #include <string.h> #include <sys/ioctl.h> #include <unistd.h> #include <fcntl.h> #include <sys/mman.h> #include "libvo2.h" #include "img_format.h" #include "../drivers/mga_vid.h" // Driver info: static vo2_info_t info = { "Matrox G200/G4x0 mga_vid.o", "mga", "Arpad Gereoffy <arpi(a)thot.banki.hu>", "requires mga_vid.o kernel module" }; // Local, driver-dependent data: (do not use globals! -> reentrancy) typedef struct { int f; int mga_next_frame; mga_vid_config_t mga_vid_config; vo2_surface_t surfaces[4]; } priv_t; #include "vo2_def.h" // open hardware/lib, get capabilities // this function will be called first, before any other control() or start() calls // return: 1=success 0=failed vo2_handle_t* vo2_init_mga(){ vo2_handle_t* h; char *devname="/dev/mga_vid"; int f; printf("vo2_mga: init()\n"); f = open(devname,O_RDWR); if(f == -1) { printf("Couldn't open %s\n",devname); return(NULL); } h=new_handle(); if(!h) return NULL; ((priv_t*)h->priv)->f=f; ((priv_t*)h->priv)->mga_vid_config.num_frames=4; ((priv_t*)h->priv)->mga_next_frame=0; return h; } #define PRIV ((priv_t*)p) // control (get/set/query) device parameters // for example: query supported pixel formats, en/disable double buffering, // query hw/sw scaling capabilities, switch window/fullscreen, // get best matching resolution for a given image size etc... static int control(void *p, int cmd, void* param){ printf("vo2_mga: control(0x%X)\n",cmd); switch(cmd){ case VO2CTRL_QUERY_SURFACE_FAST: return VO2_FALSE; case VO2CTRL_QUERY_SURFACE_DIRECT: return VO2_TRUE; case VO2CTRL_GET_MAX_SURFACES: return 4; case VO2CTRL_QUERY_FORMAT: switch((int)param){ case IMGFMT_YV12: case IMGFMT_I420: case IMGFMT_IYUV: case IMGFMT_YUY2: case IMGFMT_UYVY: return VO2_TRUE; } return VO2_FALSE; case VO2CTRL_QUERY_SWSCALE: return VO2_FALSE; case VO2CTRL_QUERY_HWSCALE: return VO2_TRUE; } return VO2_UNKNOWN; } // start drawing (set video mode, allocate image buffers etc.) // w,h: requested surface size (actual size may be larger!!!) // format: IMGFMT_* requested surface pixel format // surfaces: 0=audo 1..x=number of requested surfaces/buffers // flags: various things, like fullscreen, sw/hw zoom and vidmode change // return: 0=fail (fail if pixel format or buffering not supported) // n=number of surfaces allocated static int start(void *p, int w,int h,int format,int surfaces,int flags){ int width=((w+31)&(~31)); int height=h; int planar=0; // open window / switch vidmode, set up surfaces etc... printf("vo2_mga: start() %dx%d %s %d 0x%X\n",w,h,vo_format_name(format),surfaces,flags); if(surfaces){ if(surfaces>4) return 0; // can't make more than 4 surfaces! (yet) PRIV->mga_vid_config.num_frames=surfaces; } switch(format){ case IMGFMT_YV12: planar=1; PRIV->mga_vid_config.frame_size = width * height + (width * height) / 2; PRIV->mga_vid_config.format=MGA_VID_FORMAT_YV12; break; case IMGFMT_I420: planar=1; PRIV->mga_vid_config.frame_size = width * height + (width * height) / 2; PRIV->mga_vid_config.format=MGA_VID_FORMAT_I420; break; case IMGFMT_IYUV: planar=1; PRIV->mga_vid_config.frame_size = width * height + (width * height) / 2; PRIV->mga_vid_config.format=MGA_VID_FORMAT_IYUV; break; case IMGFMT_YUY2: PRIV->mga_vid_config.frame_size = width * height * 2; PRIV->mga_vid_config.format=MGA_VID_FORMAT_YUY2; break; case IMGFMT_UYVY: PRIV->mga_vid_config.frame_size = width * height * 2; PRIV->mga_vid_config.format=MGA_VID_FORMAT_UYVY; break; default: printf("mga: invalid output format %0X\n",format); return 0; } PRIV->mga_vid_config.colkey_on=0; PRIV->mga_vid_config.src_width = w; PRIV->mga_vid_config.src_height= h; PRIV->mga_vid_config.dest_width = w; PRIV->mga_vid_config.dest_height= h; PRIV->mga_vid_config.x_org= 0; // (720-mga_vid_config.dest_width)/2; PRIV->mga_vid_config.y_org= 0; // (576-mga_vid_config.dest_height)/2; PRIV->mga_vid_config.version=MGA_VID_VERSION; if (ioctl(PRIV->f,MGA_VID_CONFIG,&PRIV->mga_vid_config)) { perror("Error in mga_vid_config ioctl()"); printf("Your mga_vid driver version is incompatible with this MPlayer version!\n"); return 0; } { char * ptr=(char*)mmap(0,PRIV->mga_vid_config.frame_size*PRIV->mga_vid_config.num_frames,PROT_WRITE,MAP_SHARED,PRIV->f,0); int i; if(!ptr) { printf("mmap failed\n"); return 0; } // clear the buffer: memset(ptr,0x80,PRIV->mga_vid_config.frame_size*PRIV->mga_vid_config.num_frames); // create surfaces: for(i=0;i<PRIV->mga_vid_config.num_frames;i++){ vo2_surface_t* s=&PRIV->surfaces[i]; s->w=w; s->h=h; s->x=s->y=0; s->img[0]=ptr; if(planar){ s->img[1]=ptr+width*height; s->img[2]=s->img[1]+width*height/4; s->stride[0]=width; s->stride[1]=s->stride[2]=s->stride[0]/2; s->bpp=12; } else { s->stride[0]=2*width; s->bpp=16; } s->format=format; ptr+=PRIV->mga_vid_config.frame_size; } } // enable display: ioctl(PRIV->f,MGA_VID_ON,0); return PRIV->mga_vid_config.num_frames; } static int stop(void *p){ // stop rendering, close device printf("vo2_mga: stop()\n"); ioctl( PRIV->f,MGA_VID_OFF,0 ); return 1; } // get destination surface (for direct rendering or generic draw_ functions) // num: number of frame. 0 = temporary frame - can be dropped/modified // 1-2 = static frames - should not be modified // Note: mpeg will use 0,1,2 frames for B,Pf,Pb (or fallback to 0-only) // win32 will use only 0 static vo2_surface_t* get_surface(void *p, int num){ printf("vo2_mga: get_surface(%d) -> %d\n",num,PRIV->mga_next_frame); return &PRIV->surfaces[PRIV->mga_next_frame]; } static void flip_image(void *p, int num){ // we can assume that num is valid (get_surface(num) will return non-NULL) printf("vo2_mga: flip_image(%d)\n",num); ioctl(PRIV->f,MGA_VID_FSEL,&PRIV->mga_next_frame); PRIV->mga_next_frame=(PRIV->mga_next_frame+1)%PRIV->mga_vid_config.num_frames; // vid_data=frames[mga_next_frame]; // let's show surface[num] // if(double_buffering) current_surface=current_surface^1; // swap buffers }

1 0

CVS: main/libvo2 draw.c,1.2,1.3 libvo2.h,1.2,1.3
by Arpi of Ize 31 Jul '01

31 Jul '01

Update of /cvsroot/mplayer/main/libvo2 In directory mplayer:/var/tmp.root/cvs-serv4283 Modified Files: draw.c libvo2.h Log Message: changed buffering method Index: draw.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo2/draw.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- draw.c 30 Jul 2001 02:00:54 -0000 1.2 +++ draw.c 31 Jul 2001 00:24:28 -0000 1.3 @@ -3,6 +3,104 @@ #include "libvo2.h" +// type: +// 1 = single, temporary buffer (yuv->rgb, or indirect render) +// 2 = single, static buffer (direct rendering for buggy vfw codecs) +// 3 = P+P+B buffering (for mpeg 1/2/4) +// doublebuf: +// 0 = auto (not specified by the user) +// 1 = no doublebuffering +// 2 = double buffering +// 3 = triple buffering +void vo2_choose_buffering(vo2_handle_t *vo,int type,int doublebuf){ + int speed=vo->functions->control(vo,VO2CTRL_QUERY_SURFACE_FAST,0); + int direct=vo->functions->control(vo,VO2CTRL_QUERY_SURFACE_DIRECT,0); + int max=vo->functions->control(vo,VO2CTRL_GET_MAX_SURFACES,0); + int bufs=0; // buffers in driver + int vo2_bufs=0; // buffers in vo2 + + switch(type){ + case 1: + // full update of buffer for each frames + // USED BY: divx4linux, and codecs with YV12->RGB conversion + if(doublebuf==1 || direct==0){ + // user disabled double buffering or driver does memcpy: + bufs=1; + break; + } + if(doublebuf>1 && max==1) { + // user wants doublebuf, but driver has only 1 direct surface: + vo2_bufs=1; // vo2 does double buffering (allocates surface) + bufs=1; + break; + } + // try double buffering... + bufs=(doublebuf>1) ? doublebuf : 3; + if(max>0 && bufs>max) bufs=max; + break; + case 2: + // partial update of buffer. buffer address shouldn't change. + // used by VfW divx codecs. + if(doublebuf>1 && direct!=0){ + // user wants double buffering & not indirect -> use internal buffer + bufs=1; + vo2_bufs=1; // vo2 does double buffering (allocates surface) + break; + } + // direct rendering! + bufs=1; + break; + case 3: + // mixed mode: 2 static and 1 temporary frames (for MPEG codecs) + if(speed==1 && max>=3){ + // buffers are in fast memory. keep P frames in driver. + if(direct==0){ + // we have enough indirect buffers + bufs=3; + break; + } + // I think we never reach this point: + // fast & direct at the same time... but who knows :) + // (maybe some overlay driver with shared/AGP memory?) + if(max>4){ + // direct, triple buffering is possible + if(doublebuf==0 || doublebuf>=3){ + bufs=5; + break; + } + } + if(max>3){ + // direct, double buffering is possible + if(doublebuf==0 || doublebuf>=2){ + bufs=4; + break; + } + } + bufs=3; // no doublebuffering :( + break; + } + // ok. no enough fast buffers. + // try mixed mode: P in system, B in video ram ? + vo2_bufs=2; // two P buffers + if(doublebuf==1 || direct==0){ + // user doesn't want double buffering or indirect + bufs=1; break; + } + // double buffering (if possible) + if(max==0){ + // user forces double buffering, but we don't know how many + // buffers we have (hope user knows) + bufs=(doublebuf>1) ? doublebuf : 1; + break; + } + bufs=(max>3)?3:max; + break; + } + + printf("choose_buffering: system: %d video: %d\n",vo2_bufs,bufs); + +} + // field: 0=frame 1=top_field 2=bottom_field void vo2_draw_slice_start(vo2_handle_t *vo,int field){ // setup surface Index: libvo2.h =================================================================== RCS file: /cvsroot/mplayer/main/libvo2/libvo2.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libvo2.h 30 Jul 2001 02:00:54 -0000 1.2 +++ libvo2.h 31 Jul 2001 00:24:28 -0000 1.3 @@ -1,4 +1,30 @@ +#define VO2_FALSE 0 +#define VO2_TRUE 1 +#define VO2_NA -1 +#define VO2_UNKNOWN -2 + +// return true if surface is in fast system ram, false if slow (video?) memory +// USED for storing mpeg2 I/P frames only if it's fast enough +#define VO2CTRL_QUERY_SURFACE_FAST 0x101 + +// return true if surface is direct rendered, false if indirect (copied first) +// Note: it's usually same as VO2CTRL_GET_SURFACE_SPEED, except for some +// special cases, when video card does the copy from video ram (opengl...) +// USED for deciding external double buffering mode (using 2 surfaces) +#define VO2CTRL_QUERY_SURFACE_DIRECT 0x102 + +// Get the upper hardware/Driver limitation (used for double buffering) +#define VO2CTRL_GET_MAX_SURFACES 0x103 + +// Query support of a given video pixel format (use IMGFMT_ constants) +#define VO2CTRL_QUERY_FORMAT 0x111 + +// Query that software and/or hardware scaling is supported by driver +#define VO2CTRL_QUERY_SWSCALE 0x121 +#define VO2CTRL_QUERY_HWSCALE 0x122 + + typedef struct vo2_info_s { /* driver name ("Matrox Millennium G200/G400" */ @@ -31,12 +57,11 @@ // start drawing (set video mode, allocate image buffers etc.) // w,h: requested surface size (actual size may be larger!!!) // format: IMGFMT_* requested surface pixel format -// buffering: 0 - single temporary frame buffer (for draw_* stuff) -// 1 - single static buffer (for win32 direct rendering) -// 2 - 2 static + 1 temp buffer (for mpeg direct rendering) +// buffers: requested number of surfaces (0=auto) // flags: various things, like fullscreen, sw/hw zoom and vidmode change -// return: 1=success 0=fail (fail if pixel format or buffering not supported) - int (*start)(void *p, int w,int h,int format,int buffering,int flags); +// return: 0=fail (fail if pixel format or buffering not supported) +// n=number of surfaces allocated + int (*start)(void *p, int w,int h,int format,int surfaces,int flags); // stop rendering, close device int (*stop)(void *p);

1 0

CVS: main/DOCS documentation.html,1.7,1.8
by Winner of tha face compo 30 Jul '01

30 Jul '01

Update of /cvsroot/mplayer/main/DOCS In directory mplayer:/var/tmp.root/cvs-serv13643/DOCS Modified Files: documentation.html Log Message: Index: documentation.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/documentation.html,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- documentation.html 25 Jul 2001 17:28:16 -0000 1.7 +++ documentation.html 30 Jul 2001 18:09:50 -0000 1.8 @@ -1410,6 +1410,15 @@ Q: I can't compile SVGAlib.. I'm using 2.3/2.4 kernel. A: You have to edit SVGAlib's Makefile.cfg and comment "BACKGROUND = y" out. + Q: I compiled MPlayer with libcss support, but when I try to start + it, it says : + > error while loading shared libraries: libcss.so.0: cannot load + > shared object file: No such file or directory + I checked up on the file and it IS there in /usr/local/lib. + A: What are you doing on Linux? Can't you install a library? Why do + we get these questions? It's not MPlayer specific at all! Add + /usr/local/lib to /etc/ld.so.conf and run ldconfig . + <A NAME=6.2>6.2. General questions Q: What about DVD playback?

1 0

CVS: main configure,1.123,1.124
by Atmosfear 30 Jul '01

30 Jul '01

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv408 Modified Files: configure Log Message: sdl-config fixed - again =) huje atmos Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.123 retrieving revision 1.124 diff -u -r1.123 -r1.124 --- configure 30 Jul 2001 11:14:59 -0000 1.123 +++ configure 30 Jul 2001 14:53:07 -0000 1.124 @@ -343,10 +343,12 @@ _extralibdir=-L/usr/local/lib _extraincdir=-I/usr/local/include -if [ x"$_sdlconfig" = x"" -a "$system_name" = "FreeBSD" ]; then -_sdlconfig='sdl11-config' -else -_sdlconfig='sdl-config' +if [ x"$_sdlconfig" = x"" ]; then + if [ "$system_name" = "FreeBSD" ]; then + _sdlconfig='sdl11-config' + else + _sdlconfig='sdl-config' + fi fi # ---

1 0