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

CVS: main help_mp-nl.h,1.4,1.5
by Winner of tha face compo 02 Dec '01

02 Dec '01

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv28379 Modified Files: help_mp-nl.h Log Message: Patch applied from Panagiotis Issaris <takis(a)lumumba.luc.ac.be> Index: help_mp-nl.h =================================================================== RCS file: /cvsroot/mplayer/main/help_mp-nl.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- help_mp-nl.h 25 Nov 2001 00:01:13 -0000 1.4 +++ help_mp-nl.h 2 Dec 2001 11:16:25 -0000 1.5 @@ -28,6 +28,7 @@ #ifdef USE_FAKE_MONO " -stereo <mode> selecteer MPEG1 stereo uitvoer (0:stereo 1:links 2:rechts)\n" #endif +" -channels <n> gewenst aantal audio uitvoer kanalen\n" " -fs -vm -zoom volledig scherm afspeel opties (fullscr,vidmode chg,softw.scale)\n" " -x <x> -y <y> herschaal beeld naar <x> * <y> resolutie [als -vo driver het ondersteunt!]\n" " -sub <bestand> specificeer het te gebruiken ondertitel bestand (zie ook -subfps, -subdelay)\n" @@ -39,16 +40,16 @@ " -framedrop activeer frame-dropping (voor trage machines)\n" "\n" "Toetsen:\n" -" <- of -> ga 10 seconden achterwaards/voorwaards\n" -" omhoog of omlaag ga 1 minuut achterwaards/voorwaards\n" -" PGUP of PGDOWN ga 10 minuten achterwaards/voorwaards\n" +" <- of -> ga 10 seconden achterwaarts/voorwaarts\n" +" omhoog of omlaag ga 1 minuut achterwaarts/voorwaarts\n" +" PGUP of PGDOWN ga 10 minuten achterwaarts/voorwaarts\n" " < or > ga naar vorige/volgende item in playlist\n" " p of SPACE pauzeer film (druk eender welke toets om verder te gaan)\n" " q of ESC stop afspelen en sluit programma af\n" -" + of - pas audio vertraging aan met +/- 0.1 second\n" +" + of - pas audio vertraging aan met +/- 0.1 seconde\n" " o cycle OSD mode: geen / zoekbalk / zoekbalk+tijd\n" " * of / verhoog of verlaag volume (druk 'm' om master/pcm te selecteren)\n" -" z of x pas ondertiteling vertraging aan met +/- 0.1 second\n" +" z of x pas ondertiteling vertraging aan met +/- 0.1 seconde\n" "\n" " * * * ZIE MANPAGE VOOR DETAILS, OVERIGE (GEAVANCEERDE) OPTIES EN TOETSEN ! * * *\n" "\n"; @@ -66,7 +67,7 @@ #define MSGTR_IntBySignal "\nMPlayer onderbroken door signal %d in module: %s \n" #define MSGTR_NoHomeDir "Kan HOME dir niet vinden\n" #define MSGTR_GetpathProblem "get_path(\"config\") probleem\n" -#define MSGTR_CreatingCfgFile "Bezig met het creeren van config bestand: %s\n" +#define MSGTR_CreatingCfgFile "Bezig met het creëren van config bestand: %s\n" #define MSGTR_InvalidVOdriver "Foutieve video uitvoer driver naam: %s\nGebruik '-vo help' om een lijst met beschikbare video drivers te verkrijgen.\n" #define MSGTR_InvalidAOdriver "Foutieve audio uitvoer driver naam: %s\nGebruik '-ao help' om een lijst met beschikbare audio drivers te verkrijgen.\n" #define MSGTR_CopyCodecsConf "(copy/ln etc/codecs.conf (van MPlayer source tree) naar ~/.mplayer/codecs.conf)\n" @@ -83,7 +84,7 @@ #define MSGTR_TryForceAudioFmt "Probeer audio codec driver familie %d te forceren...\n" #define MSGTR_CantFindAfmtFallback "Kan audio codec voor geforceerde driver familie niet vinden, val terug op andere drivers.\n" #define MSGTR_CantFindAudioCodec "Kan codec voor audio format 0x%X niet vinden!\n" -#define MSGTR_TryUpgradeCodecsConfOrRTFM "*** Probeer %s te upgraden van etc/codecs.conf\n*** Als het nog steeds niet OK is, lees dan DOCS/CODECS!\n" +#define MSGTR_TryUpgradeCodecsConfOrRTFM "*** Probeer %s te upgraden van etc/codecs.conf\n*** Als het nog steeds niet OK is, lees dan DOCS/codecs.html!\n" #define MSGTR_CouldntInitAudioCodec "Kon audio codec niet initialiseren! -> nosound\n" #define MSGTR_TryForceVideoFmt "Probeer video codec driver familie %d te forceren...\n" #define MSGTR_CantFindVfmtFallback "Kan video codec voor geforceerde driver familie niet vinden, val terug op andere drivers.\n" @@ -91,7 +92,7 @@ #define MSGTR_VOincompCodec "Sorry, geselecteerde video_out device is incompatibel met deze codec.\n" #define MSGTR_CouldntInitVideoCodec "FATAL: Kon video codec niet initialiseren :(\n" #define MSGTR_EncodeFileExists "Bestand bestaat reeds: %s (overschrijf uw favoriete AVI niet!)\n" -#define MSGTR_CantCreateEncodeFile "Kan bestand voor encoding niet creeren\n" +#define MSGTR_CantCreateEncodeFile "Kan bestand voor encoding niet creëren\n" #define MSGTR_CannotInitVO "FATAL: Kan video driver niet initialiseren!\n" #define MSGTR_CannotInitAO "Kon audio device niet open/init -> NOSOUND\n" #define MSGTR_StartPlaying "Start afspelen...\n" @@ -157,8 +158,8 @@ #define MSGTR_CantSeekRawAVI "Kan niet in raw .AVI streams verplaatsen! (index nodig, probeer met de -idx optie!) \n" #define MSGTR_CantSeekFile "Kan niet verplaatsen in dit bestand! \n" -#define MSGTR_EncryptedVOB "Geencrypteerd VOB bestand (niet gecompileerd met libcss ondersteuning)! Lees DOCS/DVD bestand\n" -#define MSGTR_EncryptedVOBauth "Geencrypteerde stream maar autenticatie was niet aangevraagd door u!!\n" +#define MSGTR_EncryptedVOB "Geencrypteerd VOB bestand (niet gecompileerd met libcss ondersteuning)! Lees DOCS/cd-dvd.html bestand\n" +#define MSGTR_EncryptedVOBauth "Geencrypteerde stream maar authenticatie was niet aangevraagd door u!!\n" #define MSGTR_MOVcomprhdr "MOV: Gecomprimeerde headers (nog) niet ondersteund!\n" #define MSGTR_MOVvariableFourCC "MOV: Waarschuwing! variabele FOURCC gedetecteerd!?\n" @@ -180,7 +181,7 @@ #define MSGTR_NoACMSupport "Win32/ACM audio codec uitgeschakeld, of niet beschikbaar op niet-x86 CPU -> forceer nosound :(\n" #define MSGTR_NoDShowAudio "Gecompileerd zonder DirectShow ondersteuning -> forceer nosound :(\n" #define MSGTR_NoOggVorbis "OggVorbis audio codec uigeschakeld -> forceer nosound :(\n" - +#define MSGTR_NoXAnimSupport "MPlayer werd gecompileerd ZONDER XAnim ondersteuning!\n" #define MSGTR_MpegPPhint "WAARSCHUWING! Je vroeg beeld postprocessing aan voor een MPEG 1/2 video,\n" \ " maar compileerde MPlayer zonder MPEG 1/2 postprocessing ondersteuning!\n" \ " #define MPEG12_POSTPROC in config.h, en hercompileer libmpeg2!\n"

1 0

CVS: main/drivers/radeon README,1.8,1.9 radeon_vid.c,1.18,1.19
by Nick Kurshev 02 Dec '01

02 Dec '01

Update of /cvsroot/mplayer/main/drivers/radeon In directory mplayer:/var/tmp.root/cvs-serv24810/main/drivers/radeon Modified Files: README radeon_vid.c Log Message: Fixed 'cat' problems Index: README =================================================================== RCS file: /cvsroot/mplayer/main/drivers/radeon/README,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- README 1 Dec 2001 20:23:47 -0000 1.8 +++ README 2 Dec 2001 10:44:45 -0000 1.9 @@ -53,10 +53,8 @@ echo "deinterlace=off">/dev/radeon_vid To know more about these parameters - try read /dev/radeon_vid file ;) -Note: don't use 'cat' since it can't detect EOF during reading such files. -(I use midnight commander for that ;) -or try this: -head -n 20 /dev/radeon_vid +For example: +cat /dev/radeon_vid List of parameters: ~~~~~~~~~~~~~~~~~~~ Index: radeon_vid.c =================================================================== RCS file: /cvsroot/mplayer/main/drivers/radeon/radeon_vid.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- radeon_vid.c 1 Dec 2001 20:23:47 -0000 1.18 +++ radeon_vid.c 2 Dec 2001 10:44:46 -0000 1.19 @@ -190,7 +190,10 @@ static uint32_t radeon_mem_base = 0; static int32_t radeon_overlay_off = 0; static uint32_t radeon_ram_size = 0; - +#define PARAM_BUFF_SIZE 4096 +static uint8_t *radeon_param_buff = NULL; +static uint32_t radeon_param_buff_size=0; +static uint32_t radeon_param_buff_len=0; /* real length of buffer */ static mga_vid_config_t radeon_config; #undef DEBUG @@ -776,29 +779,40 @@ #define PARAM_DEINTERLACE "deinterlace=" #define PARAM_DEINTERLACE_PATTERN "deinterlace_pattern=" -static ssize_t radeon_vid_read(struct file *file, char *buf, size_t count, loff_t *ppos) +static void radeon_param_buff_fill( void ) { unsigned len,saturation; long brightness; brightness = besr.brightness; saturation = besr.saturation; len = 0; - len += sprintf(&buf[len],"Interface version: %04X\nDriver version: %s\n",MGA_VID_VERSION,RADEON_VID_VERSION); - len += sprintf(&buf[len],"Chip: %s\n",ati_card_ids[detected_chip].name); - len += sprintf(&buf[len],"Memory: %p:%x\n",radeon_mem_base,radeon_ram_size*0x100000); - len += sprintf(&buf[len],"MMIO: %p\n",radeon_mmio_base); - len += sprintf(&buf[len],"Overlay offset: %p\n",radeon_overlay_off); - len += sprintf(&buf[len],"Last fourcc: %s\n\n",fourcc_format_name(besr.fourcc)); - len += sprintf(&buf[len],"Configurable stuff:\n"); - len += sprintf(&buf[len],"~~~~~~~~~~~~~~~~~~~\n"); - len += sprintf(&buf[len],PARAM_DOUBLE_BUFF"%s\n",besr.double_buff?"on":"off"); - len += sprintf(&buf[len],PARAM_BRIGHTNESS"%i\n",brightness); - len += sprintf(&buf[len],PARAM_SATURATION"%u\n",saturation); - len += sprintf(&buf[len],PARAM_COLOUR_KEY"%X\n",besr.graphics_key_clr); - len += sprintf(&buf[len],PARAM_DEINTERLACE"%s\n",besr.deinterlace_on?"on":"off"); - len += sprintf(&buf[len],PARAM_DEINTERLACE_PATTERN"%X\n",besr.deinterlace_pattern); - ppos += len; - return len; + len += sprintf(&radeon_param_buff[len],"Interface version: %04X\nDriver version: %s\n",MGA_VID_VERSION,RADEON_VID_VERSION); + len += sprintf(&radeon_param_buff[len],"Chip: %s\n",ati_card_ids[detected_chip].name); + len += sprintf(&radeon_param_buff[len],"Memory: %p:%x\n",radeon_mem_base,radeon_ram_size*0x100000); + len += sprintf(&radeon_param_buff[len],"MMIO: %p\n",radeon_mmio_base); + len += sprintf(&radeon_param_buff[len],"Overlay offset: %p\n",radeon_overlay_off); + len += sprintf(&radeon_param_buff[len],"Last fourcc: %s\n\n",fourcc_format_name(besr.fourcc)); + len += sprintf(&radeon_param_buff[len],"Configurable stuff:\n"); + len += sprintf(&radeon_param_buff[len],"~~~~~~~~~~~~~~~~~~~\n"); + len += sprintf(&radeon_param_buff[len],PARAM_DOUBLE_BUFF"%s\n",besr.double_buff?"on":"off"); + len += sprintf(&radeon_param_buff[len],PARAM_BRIGHTNESS"%i\n",brightness); + len += sprintf(&radeon_param_buff[len],PARAM_SATURATION"%u\n",saturation); + len += sprintf(&radeon_param_buff[len],PARAM_COLOUR_KEY"%X\n",besr.graphics_key_clr); + len += sprintf(&radeon_param_buff[len],PARAM_DEINTERLACE"%s\n",besr.deinterlace_on?"on":"off"); + len += sprintf(&radeon_param_buff[len],PARAM_DEINTERLACE_PATTERN"%X\n",besr.deinterlace_pattern); + radeon_param_buff_len = len; +} + +static ssize_t radeon_vid_read(struct file *file, char *buf, size_t count, loff_t *ppos) +{ + uint32_t size; + if(!radeon_param_buff) return -ESPIPE; + if(!(*ppos)) radeon_param_buff_fill(); + if(*ppos >= radeon_param_buff_len) return 0; + size = min(count,radeon_param_buff_len-(uint32_t)(*ppos)); + memcpy(buf,radeon_param_buff,size); + *ppos += size; + return size; } static ssize_t radeon_vid_write(struct file *file, const char *buf, size_t count, loff_t *ppos) @@ -848,6 +862,7 @@ dpat=simple_strtol(&buf[strlen(PARAM_DEINTERLACE_PATTERN)],NULL,16); OUTREG(OV0_DEINTERLACE_PATTERN, dpat); } + else count = -EIO; radeon_vid_preset(); return count; } @@ -947,6 +962,8 @@ unregister_chrdev(RADEON_VID_MAJOR, "radeon_vid"); return -EINVAL; } + radeon_param_buff = kmalloc(PARAM_BUFF_SIZE,GFP_KERNEL); + if(radeon_param_buff) radeon_param_buff_size = PARAM_BUFF_SIZE; radeon_vid_save_state(); radeon_vid_make_default(); radeon_vid_preset(); @@ -963,7 +980,7 @@ radeon_vid_restore_state(); if(radeon_mmio_base) iounmap(radeon_mmio_base); - + kfree(radeon_param_buff); RTRACE(RVID_MSG"Cleaning up module\n"); unregister_chrdev(RADEON_VID_MAJOR, "radeon_vid"); }

1 0

CVS: main/DOCS documentation.html,1.122,1.123
by Winner of tha face compo 01 Dec '01

01 Dec '01

Update of /cvsroot/mplayer/main/DOCS In directory mplayer:/var/tmp.root/cvs-serv20455 Modified Files: documentation.html Log Message: restructured Installation section Index: documentation.html =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/documentation.html,v retrieving revision 1.122 retrieving revision 1.123 diff -u -r1.122 -r1.123 --- documentation.html 30 Nov 2001 17:19:11 -0000 1.122 +++ documentation.html 1 Dec 2001 09:58:58 -0000 1.123 @@ -249,8 +249,8 @@ <A NAME=1.3>1.3. Installation</A> -You'll need the following packages and versions if you don't want to -experience any problems: +REQUIREMENTS + <UL> <LI>binutils - suggested version is 2.11.x . This program is responsible for generating MMX/3DNow!/etc instructions, thus very important.</LI> @@ -270,49 +270,73 @@ <UL> <LI>If you have gcc 2.96 on your system, <A HREF="users_against_developers.html">READ -THIS</A> or the <A HREF="faq.html">FAQ</A> !</LI> +THIS</A> and the <A HREF="faq.html">FAQ</A> !</LI> +</UL> + +CODECS + +<UL> +<LI>libavcodec : If you want to use this DivX3/DivX4/etc codec, check the +<A HREF="codecs.html#2.2.1.2">2.2.1.2</A> section before compiling. Features : +<UL> + <LI>you can gain DivX/DivX4 playing on non-x86 machines</LI> + <LI>this codec has the greatest decoding speed for DivX and DivX4 +movies (even faster than the original DivX4 library itself) !</LI> +</UL> +</LI> + +<LI>Win32 codecs : If you plan to use MPlayer on x86 +architecture, you will possibly need them. Download and unzip w32codecs.zip to +/usr/lib/win32 . Note: the avifile project has similar codecs package, but it +differs from ours, so if you want to use all supported codecs, then use our +package! However, you can use our codecs package with avifile. Features : +<UL> + <LI>you need this if you want to play or encode for example movies recorded + with digital cameras (example: DV)</LI> + <LI>needed if you want to play WMV movies or older ASF's</LI> +</UL> +</LI> -<LI>If you plan to use MPlayer on x86 architecture, you possibly want to -use Win32 codecs. If you want to play or encode for example movies recorded -with digital cameras (example: DV), you must install them. Download and unzip -w32codecs.zip to /usr/lib/win32 . Note: the avifile project has similar codecs -package, but it differs from ours, so if you want to use all supported codecs, -then use our package! However, you can use our codecs package with -avifile.</LI> +<LI>DivX4 : information about this codec is available in the +<A HREF="codecs.html#2.2.1.1">2.2.1.1</A> section. If you don't want to use +MEncoder, you possibly don't want this codec as libavcodec (see +above) is much faster than this. +Features :<UL> + <LI>can play old DivX3 movies much faster than the Win32 DLL</LI> + <LI>it's closed-source, and only an x86 version is available.</LI> + <LI>You also need this codec for MEncoder, see below !</LI> +</UL> +</LI> -<LI>If you own a Matrox G200/G400/G450/G550 card, then please see the <A HREF="video.html#2.3.1.7">mga_vid</A> +<LI>If you want to play 3ivx movies, check the <A HREF=codecs.html#2.2.1.3> +XAnim codecs section</A>.</LI> +</UL> + +VIDEOCARDS + +<UL> +<LI>Matrox G200/G400/G450/G550 cards : please see the <A HREF="video.html#2.3.1.7">mga_vid</A> section in order to gain big speedup. It is important to do these steps before compiling MPlayer, otherwise no Matrox-specific support will be built. Also check out the <A HREF="video.html#2.3.1.A.1">Matrox TV-out</A> section.</LI> -<LI>If you own a 3Dfx Voodoo3/Banshee card, then please see the <A +<LI>3Dfx Voodoo3/Banshee cards : please see the <A HREF="video.html#2.3.1.9">2.3.1.9</A> section in order to gain big speedup. It is important to do these steps before compiling MPlayer, otherwise no 3Dfx support will be built. Also see the <A HREF="video.html#2.3.1.A.3">3dfx TV out section</A>.</LI> -<LI>If you own an ATI card, see the <A HREF="video.html#2.3.1.A.2">ATI cards +<LI>ATI cards : see the <A HREF="video.html#2.3.1.A.2">ATI cards section</A> of the TV-out documentation, to know what features of your card is -supported under Linux/MPlayer. If you have a Radeon card, we have a -radeon_vid driver for you, with TV out ! Check <A +supported under Linux/MPlayer. If you have a Radeon or Rage128 card, we have a +XXX_vid driver for you, with TV out ! Check <A HREF="video.html#2.3.1.14">this</A> section !</LI> +</UL> -<LI>If you plan to use the ProjectMayo's DivX4 codec, check the -<A HREF="codecs.html#2.2.1.1">2.2.1.1</A> section before compiling. -This codec can play old DivX movies much faster than the Win32 DLL. -If you want to play movies with the new DivX4 codec, it's -recommended to use this library, instead the DivX.dll in the -w32codecs.zip package. The codec itself is closed-source, and only an x86 -version is available. You also need this codec for MEncoder, see -below !</LI> - -<LI>If you plan to use ffmpeg's libavcodec, check the -<A HREF="codecs.html#2.2.1.2">2.2.1.2</A> section before compiling. -You'll need this to gain DivX/DivX4 playing on non-x86 machines, -and this codec has the greatest decoding speed for DivX and DivX4 -movies (even faster than the original DivX4 library itself) !</LI> +FEATURES +<UL> <LI>For DVD support, you'll have to compile libdvdread and libdvdcss. See <A HREF="cd-dvd.html#4.2">section 4.2</A> for more information.</LI> @@ -322,8 +346,6 @@ <LI>If you want to install MEncoder (our great all-purpose encoder), see the <A HREF="encoding.html#2.4">MEncoder section</A> .</LI> -<LI>If you want to play 3ivx movies, check the <A HREF=codecs.html#2.2.1.3> -XAnim codecs section</A>.</LI> <LI>If you have a V4L compatible TV tuner card, and wish to watch/grab and encode movies with MPlayer, read the <A HREF=#2.5>TV input</A> section.</LI>

4 5

CVS: main/DOCS/tech TODO,1.4,1.5
by Arpi of Ize 01 Dec '01

01 Dec '01

Update of /cvsroot/mplayer/main/DOCS/tech In directory mplayer:/var/tmp.root/cvs-serv22186 Modified Files: TODO Log Message: some DONE added Index: TODO =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/tech/TODO,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- TODO 1 Dec 2001 21:06:52 -0000 1.4 +++ TODO 1 Dec 2001 23:43:16 -0000 1.5 @@ -3,12 +3,12 @@ ===== demuxer: -- .VDR files from stdinput (ff detection bug) -- CivIIIE3Teaser.wmv (asf demuxer bug) +- .VDR files from stdinput (ff detection bug) -- DONE (?) +- CivIIIE3Teaser.wmv (asf demuxer bug) -- DONE (not bug!, just use -vid 4) - test and cleanup FLI/FLC support (and implement seek) -- check dvdread/dvdcss version problems -- add -dumpstream -- clean up vcd support (so it can be en/disabled) +- check dvdread/dvdcss version problems -- .so ? +- add -dumpstream -- DONE! +- clean up vcd support (so it can be en/disabled) -- DONE! - implement forward seeking in indexed avi streams decoders:

2 1

CVS: main/libmpdemux open.c,1.25,1.26 vcd_read.h,1.10,1.11 stream.c,1.23,1.24
by Arpi of Ize 01 Dec '01

01 Dec '01

Update of /cvsroot/mplayer/main/libmpdemux In directory mplayer:/var/tmp.root/cvs-serv21612 Modified Files: open.c vcd_read.h stream.c Log Message: using #ifdef HAVE_VCD Index: open.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/open.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- open.c 21 Nov 2001 10:30:59 -0000 1.25 +++ open.c 1 Dec 2001 23:40:24 -0000 1.26 @@ -75,6 +75,7 @@ #endif //============ Open VideoCD track ============== +#ifdef HAVE_VCD if(vcd_track){ int ret,ret2; if(!filename) filename=DEFAULT_CDROM_DEVICE; @@ -100,6 +101,7 @@ stream->end_pos=ret2; return stream; } +#endif //============ Open DVD title ============== #ifdef USE_DVDREAD Index: vcd_read.h =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/vcd_read.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- vcd_read.h 24 Oct 2001 14:02:19 -0000 1.10 +++ vcd_read.h 1 Dec 2001 23:40:24 -0000 1.11 @@ -254,31 +254,8 @@ } #endif -#else /* linux || sun */ +#else /* linux || sun || __bsdi__ */ -int vcd_seek_to_track(int fd,int track) -{ - return -1; -} +#error vcd is not yet supported on this arch... -int vcd_get_track_end(int fd,int track) -{ - return -1; -} - -void vcd_read_toc(int fd) -{ -} - -static char vcd_buf[VCD_SECTOR_SIZE]; - -static int vcd_read(int fd,char *mem) -{ - return -1; -} - -static inline void vcd_set_msf(unsigned int sect) -{ -} - -#endif /* !linux && !sun */ +#endif Index: stream.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/stream.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- stream.c 20 Nov 2001 22:22:21 -0000 1.23 +++ stream.c 1 Dec 2001 23:40:24 -0000 1.24 @@ -17,12 +17,16 @@ extern int verbose; // defined in mplayer.c +#ifdef HAVE_VCD + #ifdef __FreeBSD__ #include "vcd_read_fbsd.h" #else #include "vcd_read.h" #endif +#endif + #ifdef USE_DVDREAD int dvd_read_sector(void* d,void* p2); void dvd_seek(void* d,off_t pos); @@ -45,12 +49,14 @@ #else len=read(s->fd,s->buffer,STREAM_BUFFER_SIZE);break; #endif +#ifdef HAVE_VCD case STREAMTYPE_VCD: #ifdef VCD_CACHE len=vcd_cache_read(s->fd,s->buffer);break; #else len=vcd_read(s->fd,s->buffer);break; #endif +#endif #ifdef USE_DVDREAD case STREAMTYPE_DVD: { off_t pos=dvd_read_sector(s->priv,s->buffer); @@ -117,6 +123,7 @@ s->pos=newpos; // real seek if(lseek(s->fd,s->pos,SEEK_SET)<0) s->eof=1; break; +#ifdef HAVE_VCD case STREAMTYPE_VCD: s->pos=newpos; // real seek #ifdef VCD_CACHE @@ -125,6 +132,7 @@ vcd_set_msf(s->pos/VCD_SECTOR_DATA); #endif break; +#endif #ifdef USE_DVDREAD case STREAMTYPE_DVD: s->pos=newpos; // real seek

1 0

CVS: main cfg-common.h,1.10,1.11
by Arpi of Ize 01 Dec '01

01 Dec '01

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv21375 Modified Files: cfg-common.h Log Message: -vcd prints message if not supported Index: cfg-common.h =================================================================== RCS file: /cvsroot/mplayer/main/cfg-common.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- cfg-common.h 17 Nov 2001 00:23:13 -0000 1.10 +++ cfg-common.h 1 Dec 2001 23:39:47 -0000 1.11 @@ -6,7 +6,11 @@ #else {"cache", "MPlayer was compiled WITHOUT cache2 support", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0}, #endif +#ifdef HAVE_VCD {"vcd", &vcd_track, CONF_TYPE_INT, CONF_RANGE, 1, 99}, +#else + {"vcd", "VCD support is NOT available on this system!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0}, +#endif #ifdef USE_DVDREAD {"dvd", &dvd_title, CONF_TYPE_INT, CONF_RANGE, 1, 99}, {"dvdangle", &dvd_angle, CONF_TYPE_INT, CONF_RANGE, 1, 99},

1 0

CVS: main configure,1.311,1.312
by Arpi of Ize 01 Dec '01

01 Dec '01

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv21186 Modified Files: configure Log Message: HAVE_VCD, some obsolete stuff removed (-alsa, xmmp) Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.311 retrieving revision 1.312 diff -u -r1.311 -r1.312 --- configure 1 Dec 2001 17:17:32 -0000 1.311 +++ configure 1 Dec 2001 23:38:57 -0000 1.312 @@ -1895,8 +1895,10 @@ echocheck "VCD support" if linux || bsdos || freebsd || sunos ; then _inputmodules="vcd $_inputmodules" + _def_vcd='#define HAVE_VCD 1' echores "ok" else + _def_vcd='#undef HAVE_VCD' echores "not supported on this OS" fi @@ -2649,12 +2651,6 @@ -bps gives better sync for vbr mp3 audio, it is now default */ #define AVI_SYNC_BPS 1 -/* Undefine this if you want soundcard-only timing by default: - You can still change this with the -alsa or -noalsa command-line option! - (This function was originally impemented to solve ALSA driver's big - buffer problems, but it seems to be useful for every soundcard drivers) */ -#define ALSA_TIMER 1 - /* Undefine this if you do not want to select mono audio (left or right) with a stereo MPEG layer 2/3 audio stream. The command-line option -stereo has three possible values (0 for stereo, 1 for left-only, 2 for @@ -2677,12 +2673,7 @@ #define MAX_OUTBURST 65536 /* set up audio OUTBURST. Do not change this! */ -#ifdef USE_XMMP_AUDIO -#define OUTBURST 4096 -#else -//#define OUTBURST 1024 #define OUTBURST 512 -#endif /* Define this if your system has the header file for the OSS sound interface */ $_def_sys_soundcard @@ -2788,6 +2779,8 @@ #define __CPU__ $iproc $_def_linux + +$_def_vcd #ifdef sun #define DEFAULT_CDROM_DEVICE "/vol/dev/aliases/cdrom0"

1 0

CVS: main/DOCS/tech cvs-howto.txt,1.2,1.3
by David Holm 01 Dec '01

01 Dec '01

Update of /cvsroot/mplayer/main/DOCS/tech In directory mplayer:/var/tmp.root/cvs-serv20253/DOCS/tech Modified Files: cvs-howto.txt Log Message: Added a beginners guide Index: cvs-howto.txt =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/tech/cvs-howto.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- cvs-howto.txt 27 Nov 2001 00:12:27 -0000 1.2 +++ cvs-howto.txt 1 Dec 2001 23:32:46 -0000 1.3 @@ -102,3 +102,131 @@ ask me to reverse it instead of commiting previous version! I think our rules aren't too hard. If you have comments, contact me. + +III. Beginners Guide by David Holm +==================== +When I first got CVS write access I got banned after only a few hours +because I didn't fully understand this documentation. This part is for +those of you who have just got cvs write access and want to avoid the +most common pitfalls leading to cvs ban. +I will introduce a step-by-step guide explaining how I'm making sure +that my cvs commits are proper and won't get me banned. + +1. You should set up two dirs for mplayer, one which contains the stable + version and has the :ext: option instead of :pserver: in CVS/Root. + The other should be your development dir and have the CVS/Root set to + :pserver: instead of :ext:, that way you can't commit development code + by accident (since only :ext: allows writes). + This is my setup: + ~/mplayer + /main + /main.dev + NOTE: I'll use these dir names from hereon in the guide, what you want + to call your dirs are entirely up to you. This is _only_ an example. + +2. When you are satisfied with the changes in "main.dev" and think you are + ready to commit the changes to CVS start by doing the following in the + "~/mplayer" dir": + diff -Nur -x "CVS" -x ".*" main main.dev > dev2stable + dev2stable is the filename for the patchfile, it doesn't matter what you + call it. + +3. Now comes one of the tricky parts, editing the patch. + I prefer using mcedit (comes with Midnight Commander) since it does syntax + highlighting in patches (= it uses colors to identify lines =), But most + ascii editors should do (meaning don't use staroffice and save it as a + star office document for instance ;) + I will try to explain this as good as I can. + Read throught the patch and remove all occurances of: + * diff -Nur.... that are affecting files YOU have NOT modified + these occur when either main or main.dev are different version + (not checked out at the same time) + EVERYTHING from the diff -Nur... line until the next diff -Nur... + line are changes to the file specified after the diff options, + and ONLY that file. + + * Lines containing "Binary files..." if you add the 'a' switch to + -N(a)ur binary files will be added to the patch as well, making it + huge and puts alot of unnecessary data in it (since you seldom + commit any binaries). + + * If you find changes within a diff block that you don't want to + commit you can delete them if they are the only changes ranging + from the @@ -x,y +x,y @@ until the line before the next + @@ -x,y +x,y @@. You _cannot_ remove single lines after a + @@ -x,y +x,y @@ because that will break the patch!. + example: + ... + @@ -15,34 +15,6 @@ + - old_option; + + new_option; + @@ -65,13 +65,3 @@ + ... + + Ok: + ... + @@ -65,13 +65,3 @@ + ... + + Will break patch: + ... + @@ -15,34 +15,6 @@ + old_option; + @@ -65,13 +65,3 @@ + ... + + When I end up in situation where I have to remove just smoe lines from + a block I leave it alone, remember (write down) which file it is in and + then edit the file in "main" after I've applied the patch. + + * Now it's time for applying the patch to the "main" (stable) dir. This + should be done in two steps: + 1. enter "main" and run "patch -p1 --dry-run < ../dev2stable" + -p1 means that you are one level deep (that you have entered + the "main" directory and that should be stripped when patching, + if you run it from "~/mplayer" you would use -p0). + --dry-run means that patch does everything it normally does + but without modifying ANY files, this is a great way of testing + whether your patch works or not. + "../dev2stable" is your patchfile. (don't forget the '<') + If the dry run fails check the line it failed on and figure out + why it failed, make a new patch, and try again. + 2. Ok, you finally have a working patch, remove --dry-run and patch + "main" and you are done with the patching part =). + +4. It's almost time for the final step, commiting the changes. But first you MUST make + sure your changes compiles without breaking anything and that it follows the Policy + mentioned in section 2. (Read it until your eyes are bleeding if you want to keep CVS + access!) + Don't worry about object files etc that will be created in your "main" dir, they won't + be sent to CVS on commit, you must use the add command to add new files (discuss it on + the list before adding new files!). + Now to make sure your additions follow policy do the following on every file you will + commit: + "cvs -z3 diff -u <filename> > <filename.d> of course the output file (<filename.d>) can + have any name you want. This will create a file showing the differences between the + file on cvs and your updated local file. + I will explain some of the policy rules I had a hard time understanding: + 5. This means that if for instance you have lines in <filename.d> that look + something like this: + - + + + That means that you have either added or removed a tab or spaces on that line. + That qualifies as cosmetical changes and is disallowed. Edit the file and put + back/remove the added/removed tab/spaces. + Do a new diff on the file and make sure it fixed the cosmetics. + 6. Make sure you read and understand this properly before commiting anything. Commit + one file at a time! + +5. Ok, you have a working patch following the cvs policy, excellent work. Now for the + final step, commiting. This is real simple. Just run the following command in "main" + for each file you want to commit: + "cvs -z3 commit -m "<comment (changes)>" <filename>" or + "cvs -z3 commit <filename>" + The latter will bring up your default text editor for writing comments (I prefer this + method). + +You are done, congratulations. If you are certain you have followed all the policies you +shouldn't have any troubles with CVS maintainers at all. +At first I thought the policy was too strict, I discussed it with Arpi and he made some +very good points, so don't complain.

1 0

CVS: main mplayer.c,1.331,1.332 cfg-mplayer.h,1.106,1.107
by Arpi of Ize 01 Dec '01

01 Dec '01

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv14414 Modified Files: mplayer.c cfg-mplayer.h Log Message: -dumpstream Index: mplayer.c =================================================================== RCS file: /cvsroot/mplayer/main/mplayer.c,v retrieving revision 1.331 retrieving revision 1.332 diff -u -r1.331 -r1.332 --- mplayer.c 30 Nov 2001 23:44:04 -0000 1.331 +++ mplayer.c 1 Dec 2001 22:54:17 -0000 1.332 @@ -199,7 +199,7 @@ #endif // dump: -static char *stream_dump_name=NULL; +static char *stream_dump_name="stream.dump"; static int stream_dump_type=0; // A-V sync: @@ -775,14 +775,34 @@ } } - - current_module="open_stream"; stream=open_stream(filename,vcd_track,&file_format); if(!stream) goto goto_next_file;// exit_player(MSGTR_Exit_error); // error... inited_flags|=INITED_STREAM; stream->start_pos+=seek_to_byte; +if(stream_dump_type==5){ + unsigned char buf[4096]; + int len; + FILE *f; + current_module="dump"; + stream_reset(stream); + stream_seek(stream,stream->start_pos); + f=fopen(stream_dump_name,"wb"); + if(!f){ + mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_CantOpenDumpfile); + exit_player(MSGTR_Exit_error); + } + while(!stream->eof){ + len=stream_read(stream,buf,4096); + if(len>0) fwrite(buf,len,1,f); + } + fclose(f); + mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_CoreDumped); + exit_player(MSGTR_Exit_eof); +} + + #ifdef USE_DVDREAD current_module="spudec"; vo_spudec=spudec_new(stream->priv); @@ -816,6 +836,7 @@ //============ Open & Sync stream and detect file format =============== + if(!has_audio) audio_id=-2; // do NOT read audio packets... current_module="demux_open"; @@ -850,7 +871,7 @@ if(d_video && d_video!=ds) {ds_free_packs(d_video); d_video->id=-2; } if(d_dvdsub && d_dvdsub!=ds) {ds_free_packs(d_dvdsub); d_dvdsub->id=-2; } // let's dump it! - f=fopen(stream_dump_name?stream_dump_name:"stream.dump","wb"); + f=fopen(stream_dump_name,"wb"); if(!f){ mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_CantOpenDumpfile); exit_player(MSGTR_Exit_error); Index: cfg-mplayer.h =================================================================== RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v retrieving revision 1.106 retrieving revision 1.107 diff -u -r1.106 -r1.107 --- cfg-mplayer.h 29 Nov 2001 12:44:00 -0000 1.106 +++ cfg-mplayer.h 1 Dec 2001 22:54:17 -0000 1.107 @@ -164,6 +164,7 @@ {"dumpvideo", &stream_dump_type, CONF_TYPE_FLAG, 0, 0, 2}, {"dumpsub", &stream_dump_type, CONF_TYPE_FLAG, 0, 0, 3}, {"dumpmpsub", &stream_dump_type, CONF_TYPE_FLAG, 0, 0, 4}, + {"dumpstream", &stream_dump_type, CONF_TYPE_FLAG, 0, 0, 5}, {"aofile", &ao_outputfilename, CONF_TYPE_STRING, 0, 0, 0}, {"waveheader", &ao_pcm_waveheader, CONF_TYPE_FLAG, 0, 0, 1},

1 0

CVS: main/libmpdemux demuxer.c,1.52,1.53
by Arpi of Ize 01 Dec '01

01 Dec '01

Update of /cvsroot/mplayer/main/libmpdemux In directory mplayer:/var/tmp.root/cvs-serv8329 Modified Files: demuxer.c Log Message: file format detection reordered to get better hits Index: demuxer.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demuxer.c,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- demuxer.c 27 Nov 2001 00:42:39 -0000 1.52 +++ demuxer.c 1 Dec 2001 22:12:58 -0000 1.53 @@ -385,19 +385,6 @@ file_format=DEMUXER_TYPE_TV; } #endif -//=============== Try to open as FLI file: ================= -if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_FLI){ - demuxer=new_demuxer(stream,DEMUXER_TYPE_FLI,audio_id,video_id,dvdsub_id); - { - int size=stream_read_dword_le(demuxer->stream); - int id=stream_read_word_le(demuxer->stream); - // chech for the FLI file magic number - if((id==0xAF11) || (id==0xAF12)){ - mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedFLIfile); - file_format=DEMUXER_TYPE_FLI; - } - } -} //=============== Try to open as AVI file: ================= if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_AVI){ @@ -430,6 +417,27 @@ file_format=DEMUXER_TYPE_MOV; } } +//=============== Try to open as VIVO file: ================= +if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_VIVO){ + demuxer=new_demuxer(stream,DEMUXER_TYPE_VIVO,audio_id,video_id,dvdsub_id); + if(vivo_check_file(demuxer)){ + mp_msg(MSGT_DEMUXER,MSGL_INFO,"Detected VIVO file format!\n"); + file_format=DEMUXER_TYPE_VIVO; + } +} +//=============== Try to open as FLI file: ================= +if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_FLI){ + demuxer=new_demuxer(stream,DEMUXER_TYPE_FLI,audio_id,video_id,dvdsub_id); + { + int size=stream_read_dword_le(demuxer->stream); + int id=stream_read_word_le(demuxer->stream); + // chech for the FLI file magic number + if((id==0xAF11) || (id==0xAF12)){ + mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedFLIfile); + file_format=DEMUXER_TYPE_FLI; + } + } +} //=============== Try to open as MPEG-PS file: ================= if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_MPEG_PS){ int pes=1; @@ -475,14 +483,6 @@ file_format=DEMUXER_TYPE_UNKNOWN; } else { mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedMPEGESfile); - } -} -//=============== Try to open as VIVO file: ================= -if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_VIVO){ - demuxer=new_demuxer(stream,DEMUXER_TYPE_VIVO,audio_id,video_id,dvdsub_id); - if(vivo_check_file(demuxer)){ - mp_msg(MSGT_DEMUXER,MSGL_INFO,"Detected VIVO file format!\n"); - file_format=DEMUXER_TYPE_VIVO; } } //=============== Unknown, exiting... ===========================

1 0