MPlayer-cvslog
Threads by month
- ----- 2025 -----
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2005 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2004 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2003 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2002 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2001 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
September 2002
- 44 participants
- 429 discussions
Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv32668
Modified Files:
ChangeLog
Log Message:
found 0.01-0.05
Index: ChangeLog
===================================================================
RCS file: /cvsroot/mplayer/main/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ChangeLog 10 Sep 2002 23:47:56 -0000 1.2
+++ ChangeLog 11 Sep 2002 00:07:48 -0000 1.3
@@ -698,7 +698,8 @@
- version changed in the files
- docs updated
-mplayer v0.09-pre3: bugfix test-release, X11 support testing
+mplayer v0.09-pre3: Dec 3 2000
+ bugfix test-release, X11 support testing
- fixed the if [ -z $pparam ] bug in ./configure [Christian Birchinger]
- many changes in AVI seek code, resulting near-perfect seeking now!
current method calc absolute audio position, so with VBR audio it
@@ -707,14 +708,16 @@
- avip: X11 support (24 & 32 bpp only, BGR format)
I need a very fast 15->16bpp converter for 16bpp support... anyone helps?
-mplayer v0.09-pre2: bugfix test-release
+mplayer v0.09-pre2:
+ bugfix test-release
- removed unnecessary code from libmpeg2/header.c
Walken told me that standard mpg/vob streams must NOT use framerate
and bitrate extension... and the ext. id check is done by the caller.
- CRC support to mp3lib's mpeg audio layer-2 decoder
thanks for bugreport & testfile to Samson
-mplayer v0.09-pre1: bugfix test-release
+mplayer v0.09-pre1: Dec 1 2000
+ bugfix test-release
- imported new libmpeg2 files (under testing...)
- GL renderer flickering bug fixed (MMX missing emms() between yuv2rgb and
glTexSubImage(), bug triggered by new Utah-GLX code)
@@ -754,14 +757,19 @@
- DOCS/INSTALL updated
- DOCS/SPEED updated, DivX benchmarks added
-mplayer v0.05: Nov 18 2000
+mplayer v0.05: Nov 18 2000
Merged with MPEGplayer 0.90pre6, first public release of AVI player
- code merged with mpegplayer, new Makefile, some small modifications
- docs updated and moved to DOCS
-mplayer v0.04: YUV support, some code cleanup, preview-release
+mplayer v0.04: Nov 17 2000
+ YUV (yuy2) support with divx 3.11 dll, some code cleanup, preview-release
-mplayer v0.01: first version based on new MPEGplayer's codebase.
+mplayer v0.03: Nov 14 2000
+
+mplayer v0.01: Nov 11 2000
+ first preview version based on new MPEGplayer's codebase.
+ it contains the win32 loader from avifile, and can decode divx 3.11 video.
mpg12play v0.9-v0.95pre5: Oct 21-Nov 2, 2000
Mpeg codec was libmpeg2 (mpeg2dec) by Aaron Holtzman & Michel
1
0
Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv24865
Modified Files:
ChangeLog
Log Message:
hmm. i've found a ChangeLog file in 0.18-pre tarball :) it's merged now.
Index: ChangeLog
===================================================================
RCS file: /cvsroot/mplayer/main/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ChangeLog 9 Sep 2002 21:39:43 -0000 1.1
+++ ChangeLog 10 Sep 2002 23:47:56 -0000 1.2
@@ -1,4 +1,13 @@
TODO: collect old version changelogs from freshmeat.net, news/maillist archive...
+ -> both was included, freshmeat somehow deleted all logs before 0.50 :((((
+
+TODO: cleanup old (<=0.17a) versions, find the place for these:
+ * new stream selection code (autodetected)
+ * pre-devel-alpha DVD code (libcss)
+ * subtitle code 100% (perfected timing code)
+ * new output drivers (SVGAlib, FBdev)
+ * faster memcpy() routine (MMX/3DNow!/SSE optimized)
+
mplayer (0.90)
@@ -224,22 +233,546 @@
* A-V sync for AVI files fixed (both -bps and -nobps)
-mplayer (0.17a) "The IdegCounter"
-
+mplayer v0.17a "IdegCounter++" : Apr 27 2001
+ - first 0.17 release failed - buggy files outdated docs etc :(
+ it's (hopefully) fixed now.
+
+mplayer v0.17 "IdegCounter" : Apr 27 2001
* DVD playing (libcss)
* OSD and subtitles with antialiased fonts
* new Win32 codecs (WMV1,AP42,ASV2 etc)
* new VO drivers (SVGAlib,fbdev,DGA,SDL etc)
* source cleanup, most part of the code rewritten
-mplayer (0.11pre 1-24)
-mplayer (0.10)
-mplayer (0.10 pre 1-7)
-mplayer (0.3-0.9)
+* jumped to 0.17 * (why 17? oh. chass just got a new 17" monitor :))
- * new stream selection code (autodetected)
- * pre-devel-alpha DVD code (libcss)
- * subtitle code 100% (perfected timing code)
- * new output drivers (SVGAlib, FBdev)
- * faster memcpy() routine (MMX/3DNow!/SSE optimized)
-
\ No newline at end of file
+mplayer v0.11-pre27-CVS:
+ - updated libmpeg2 source to libmpeg2-0.2.1-CVS version
+ - updated OpenDivX encore/decore to 4.0 alpha48
+ - cmdline/configfile handler by szabi
+ - added DirectShow support (now DivX-only)
+ - bugfix: stream.c/stream_new() uninitialized variables
+
+mplayer v0.11-pre26-CVS:
+ - updated libmpeg2 source to libmpeg2-0.2.0 version
+ - small fixes
+
+mplayer v0.11-pre25-CVS: yeah, we moved to SourceForge CVS!
+ - DOCS updated (email address changed from arpi@* -> maillist)
+ - LIRC fix, mplayer_lirc changed back to mplayer [Andreas Ackermann]
+ - stream.c: unsigned int fixes, required for some strange .asf files
+ - asfheader.c: using w=h=b=1 for audio_concealment_none
+ - VCD-related stuff moved from stream.c to vcd_read.c
+ - added DGA driver by Andreas Ackermann
+ - added debian/ subdir for the debian package makers... see DOCS/DEBIAN
+ - new Makefile/dependency system
+ - added check_events() to libvo, x11 stuff moved to x11_common.c
+
+mplayer v0.11-pre24: Feb 19 2001
+ small fixes again :(
+ - DOCS/LIRC changed: users *must* enable lirc support manually, it is
+ not autodetected yet. (./configure --enable-lirc)
+ - the {prefix} bug fixed by Gabucino
+ - added manpage by Gabucino
+ - manpage -vo fixes by A'rpi
+
+mplayer v0.11-pre23: Feb 18 2001
+ lirc support, text updates, mailinglists
+ - added "-ni" option to force usage of the non-interleaved AVI parser
+ - DOCS/* updated by Gabucino
+ - new homepage by Gabucino
+ - mplayer users & announce mailing lists by Dariusz Pietrzak (see README)
+ - LIRC support by Andreas Ackermann (see DOCS/LIRC)
+ enable with ./configure --enable-lirc
+ TODO: ./configure should detect LIRC installed and better Makefile handling
+ - added AVI_NINI parser for broken (no index) non-interleaved files
+
+mplayer v0.11-pre22: Feb 16 2001
+ last fixes, release is coming soon!
+ - non-interleaved avi EOF bug fixed [thanks to DC-1 for help]
+ - "You" strings in Makefile after make dep bug fixed... [thx to DC-1]
+ - SDL disabled by default. You have to ./configure --enable-sdl to enable.
+ - homepage updated by Gabucino
+ - homepage updated by A'rpi
+ - FAQ updated by A'rpi
+
+fork() -> 0.12pre1
+
+mplayer v0.11-pre21: Feb 12 2001
+ mpeg1 pp, stereo fix
+ - "Skip chunk xxxx" messages moved from -v to -v -v -v debug level...
+ [thanks to Christoph H. Lampert]
+ - divx postprocess filter works for mpeg1 files too! (-divxq 1/3/7/31)
+ - mpeg layer-2 audio fixed - it's stereo again!!!
+ - audio select() detection: if detected audio buffer size == 0, then
+ exit with message "recompile mplayer with #undef HAVE_AUDIO_SELECT"...
+ - syncfb driver added to the source tree, under drivers/
+ (it's very similar to mga_vid, but has syncronization to screen and
+ de-interlace features)
+ - draw_slice in syncfb finished for G400 cards (plays mpeg 1/2, opendivx)
+ (de-interlacing has been disabled, because it's buggy now)
+
+mplayer v0.11-pre20: Feb 11 2001
+ NI-AVI support, small fixes & patches...
+ - asf parser: flag 0x40 (explicit packet size) implemented [Marvin]
+ - new option to select DSP device: -dsp (default: /dev/dsp) [Pontscho]
+ - option -o changed to -vo
+ - ./configure: applied patches [LGB,Ian Kumlien,Magnus Pfeffer]
+ - avi chunk_id->ds mapper moved to demux_avi_select_stream()
+ - added non-interleaved .AVI parser
+ - added non-interleaved .AVI detection (if a_pos-v_pos distance > 1MB)
+
+mplayer v0.11-pre19: Feb 9 2001
+ small fixes...
+ - vo_xmga.c: G200 draw_slice fixed
+ xmga + mga: common part (draw_frame & draw_slice) moved to mga_common.c
+ - some independent code (asfinfo.c and GL-test) moved to the new TOOLS subdir
+ - movinfo.c added to TOOLS (small util to dump .mov file structure)
+ - AVI & ASF stream id detection changed: now using IDs from the header
+ (but still can be overriden by -aid or -vid) [Christoph H. Lampert]
+ - native MS-GSM audio codec ported from avifile source (-afm 6)
+ [thanks for the testfile to Christoph H. Lampert]
+ - README updated (input & codec lists)
+ - implemented .asf audio descrambling [Dirk Vornheder & Einon]
+ -> that weird_al_yankovic asf is not so weird now :)
+ - AUTHORS file changed
+
+mplayer v0.11-pre18: Feb 7 2001
+ patch release :)
+ - skip broken .asf fragments (for better seeking)
+ - seeking code cleanup in sources (now it's in a switch(){})
+ - opendivx encoding bitrate option changed from -divxq to -br
+ (for the divx -> divx re-encoding)
+ - TO DO section moved to file TODO
+ - applied ./configure and Makefile changes patch from LGB
+ - libvo function changes by Pontscho: x11 (with -fs), xmga (bugfixed!)
+ - libvo: driver sources renamed from video_out_*.c -> vo_*.c
+ - libvo: added uninit() function to drivers
+ - libvo: fork()'ed X11 eventhandler for x11 and xmga drivers [me & Pontscho]
+ (gl and xv version is coming soon!)
+ - libvo: sdl driver now closes SDL at QUIT...
+ - small english fixes (docs & messages) [Balazs Tibor]
+
+mplayer v0.11-pre17: Feb 4 2001
+ fixes
+ - asf "missing video stream" fixed (stream id & 0x7F) [Christoph H. Lampert]
+ - added GL-test directory, it contains source and compiler script of a
+ very simple open-gl texture updating (glTexSubImage) test program.
+ if it runs well, then mplayer -o gl should work too.
+ it works on G400+Utah-GLX, but segfaults in the G400 driver of X 4.0.2/DRI.
+ try it with different cards/drivers, and please report me the results.
+ - benchmarking in gltest.c: calculate fps and process times
+ - .asf seeking v0.01-pre0.1 :)
+
+mplayer v0.11-pre16: Feb 4 2001
+ ACM fixed
+ - Win32/ACM audio codec fixed (most important for asf with divx audio):
+ There was an output buffer size problem with the Win32/ACM audio codec
+ at low bitrates (usually used for .asf files with divx audio)
+ Input and output buffer sizes are now queryed, problem solved :)
+ - SDL support compiling hint by Michael Durller added to the FAQ
+ - opendivx support in .asf files [Gérard Lantau]
+ - ./configure & Makefiles patch by Aaron Hope applied.
+ (adds --with-win32libdir and fixes --with-x11libdir)
+ - ./configure fixed, now it defaults to /usr/lib/win32 if detection failed
+
+mplayer v0.11-pre15: Feb 2 2001
+ asf sync fixed
+ - asf parser: now supports other than 0x5D segments [Dirk Vornheder]
+ - new asf PTS reading: sync works now, including fps...
+ (-fps no longer required!) [thanks again to Eugene Kuznetsov for docs!]
+
+mplayer v0.11-pre14: Feb 1 2001
+ small fixes, asf sync v0.1 :)
+ - version number incremented :)))
+ - libvo / Xv driver swapped Red-Blue fixed
+ - asf timestamps implemented - now asf A-V should be in sync if you
+ specify the correct fps at commandline (-fps), +-1 fps allowed...
+ [i haven't yet found method to get fps out from asf headers :(((]
+ - some error and consistency checking into demux_asf
+ if you see many warning! messages playing an .asf file, then contact
+ me and upload the file (first 1MB is enough if it represents the problem)
+ Don't forget: there is no public doc about the .asf file format, so
+ everything we know is suspected and can be wrong... without your help
+ we never will have working .asf player...
+ - asf fragment offset checks disabled for grouping...
+
+mplayer v0.11-pre13: Jan 31 2001
+ libvo changes, mpeg bitrate, vcd fix, asf grouping
+ - libvo: draw_slice() interface changed, now it has src stride[3] and
+ destination rect dimension (w,h,x,y)
+ It's able to blit whole frames, not only 16-pixel slices...
+ - libmpeg2 and opendivx codec changed to use new draw_slice()
+ -> opendivx extra 64-pixel width band at right disappeared!
+ - mpeg bitrate fix: if picture->bitrate==0x3FFFF (means "unspecified" ?)
+ then using standard VCD bitrate (75*2324 bytes/sec)
+ -> fixed seeking for those mpegs with "16MBit/s" bitrate...
+ - drivers/sis_vid: video4linux interface disabled
+ - broken VCD playing fixed: stream_reset shouldn't seek to 0x0...
+ [bugreport: Kang Sun]
+ - asf_parser: grouping implemented! [test file provided by Gabucino :))]
+
+mplayer v0.11-pre12: Jan 30 2001
+ ./configure fixes, improved odivx-encoding, streaming fixes
+ - ./configure: using /tmp/main$$.c instead /tmp.main.c, and
+ remove file after tests [SaPe]
+ - ./configure: trying the gcc optimize options and fallback to 'pentium'
+ if fails (useful for people with old gcc and new cpu :))
+ - removed -fomit-frame-pointer from OPTFLAGS at config.mak
+ - version number incremented [Gabucino]
+ - odivx encoder fix: allow long (longer than xxxx.avi) destination filenames
+ (sizeof() changed to strlen()...) [Gabucino]
+ - avi writer - overwrite disabled (exits with error message if destination
+ file already exists...) [Gabucino]
+ - use -divxq to set encoding bitrate (in bits (no kbits!) default: 780000)
+ - no audio decoding if -encode option is used
+ - audio streaming disabled if -nosound specified (setting audio_id to -2)
+ - fast Mpeg-ES detection (doesn't read the whole Mpeg-PS file)
+ - compile-time option to disable using soundcard driver's select()
+ (requires for some people with buggy/pre-alpha/etc sound driver...)
+
+mplayer v0.11-pre11: Jan 29 2001
+ streaming fixes, asf support pre, indeo5 fix
+ - asf/asfinfo.c improved: now it dumps streams to files - need testing!
+ (it's ready to be converted to asf demuxer and intergated into MPlayer)
+ - stream.c / stream_reset() fix: now it really seek back to 0 position!
+ - .asf file format detection added (no .asf reading yet!!!)
+ - .asf demultiplexer added, changes in demuxer.c to handle fragmented packets
+ > it plays .asf video well, but still has problems with divx/wma audio. :(((
+ - indeo 5 playing fixed (removed ICDECOMPRESS_UPDATE from flags)
+ - xmga resizing problems with some window managers, so default order is
+ changed xmga,xma... to mga,xmga,...
+ - found gcc bug: compiling MPlayer with flags
+ OPTFLAGS=-O -g -march=i686 -mcpu=i686 -pipe -fomit-frame-pointer -ffast-math
+ cause image sizes negating -> mga_vid kernel driver Oops... :(((
+ - runaway.bride.sample.avi seeking segfault discovered: AC3 resync fails :(
+ - improved signal handling: module name is now printed. audio_resync added.
+ - RGB opendivx encoding implemented, now AVI->opendivx is possible.
+
+mplayer v0.11-pre10: Jan 22 2001
+ OpenDivX encoding, streaming fixes, avi seek fixes
+ - new libvo driver: odivx (OpenDivX File Writer)
+ - AVI file writting support, new option: -encode filename
+ to encode an mpeg/vob/vcd to opendivx:
+ mplayer file1.mpg -encode file2.avi -o odivx -nosound
+ (sound encoding/copy is not yet supported)
+ - libvo: default driver priority changed to: xmga,mga,syncfb,3dfx,xv,x11,gl
+ - avi writer: index support
+ - small fixes in avi writer to be compliant (adjusted chunk/list lengths)
+ - demuxer.c: stream buffering fixes:
+ - missing {} in mplayer.c occuring audio reads when has_audio=0
+ - reordered packet reader and pack count checks -> no more unwanted EOF
+ - added 4MB buffer memory usage limit to demuxed streams
+ - CPU flags in ./configure changed:
+ k7 -> k6 (current stable gcc doesn't supports k7)
+ 386,486 -> i386,i486 [Balazs Tibor]
+ - demux_avi: index check now accepts (raw.len+1)==idx.len [Balazs Tibor]
+ - FAQ added
+
+ ** Now we are ready with planned features & urgent fixes, **
+ ** it's time to final testing and then the 0.11 release!! **
+
+mplayer v0.11-pre9: Jan 18 2001
+ OpenDivX fixes,speedup
+ - solved OpenDivX width problem (stride=width+(Quality?0:64))
+ now -divxq 0 works, and 0 is the default
+ - libvo call moved out from my_convert_yuv() so it can be measured (cpu %)
+ - IDCT code ported from libmpeg2 -> much faster OpenDivX decoding
+
+mplayer v0.11-pre8: Jan 18 2001
+ SDL fixes, OpenDivX support
+ - added -I/usr/X11R6/include to libvo CFLAGS
+ - (removed later: applied libvo SDL driver fixes by Jeffrey Boser)
+ - OpenDivX support, initial hack, maybe not work for you...
+ (I need testfiles, I have just only one)
+ use -divxq option to adjust quality (1..29 works), 1=default
+
+mplayer v0.11-pre7: Jan 14 2001
+ SDL support
+ - ported SDL driver from mpeg2dec/libvo (currect CVS)
+ (it's slower than internal X11 driver, but supports software scaling!)
+ - fixed SDL driver to support -fs and pass keyboard events
+ - SDL driver changed to support YV12 and YUY2 formats instead of IYUV
+ (now works with DivX files too)
+ - 'q' (Quit) disabled in SDL fullscreen mode (because it's impossible
+ to restore screen before exiting so it gets unusable state now)
+
+mplayer v0.11-pre6: Jan 14 2001
+ audio fix
+ - fixed video_out_xv.c compiling problems [bugreport: Kalle Mellerup]
+ - modified audio playing: always keep buffer (both internal and card's)
+ filled using select() -> -alsa audio delays should be fixed.
+ - updated DOCS/AUTHORS and DOCS/README
+
+mplayer v0.11-pre5: Jan 12 2001
+ xmmp audio support, applied Pontscho's libvo patch
+ - xmmp audio driver support by Arthur Kleer
+ - new video_out driver by Pontscho: xmga (Matrox G200/G400 only!)
+ It does same under X 3.3.x what Xv extension does under X 4.0.x!
+ (you will have a moveable/resizeable window but see an YUV video
+ overlay in it using color keying)
+ - added keyboard event support in X11 windows [Pontscho]
+ (using mplayer_[put|get]_key() in codecctrl.c)
+
+mplayer v0.11-pre4: Jan 6 2001
+ x11 driver fixes, 15/16bpp support
+ - version in version.h fixed :))) [Pontscho]
+ - inttypes.h moved to DOCS/ (copy back to the root if you need it)
+ - depth calculation in vo_init() changed (Pontscho's version couldn't
+ make difference between 15 and 16bpp)
+ - x11 driver now uses vo_init() instead of get_depth()
+ - yuv2mmx: 15bpp not really supported -> removed from list, now
+ conversion is done (well) by the C code -> MPEG play in 15bpp works!
+ - avi playing support added in 15bpp (memcpy)
+ - avi playing support added in 16bpp (C 15->16 converter by me)
+ - avi playing support added in 16bpp (MMX 15->16 converter by Strepto)
+ - libvo/x11: yuv2rgb used MMX code on non-MMX CPUs too!!! fixed...
+ - all x11 modes tested (and mpeg/24bpp byteorder fixed):
+ MPEG: AVI/VfW:
+ 15bpp C convert memcpy
+ 16bpp MMX/C convert MMX/C convert
+ 24bpp C convert memcpy
+ 32bpp MMX/C convert memcpy / C conv.
+ => now all the movie types are viewable using the -o x11 driver!
+
+mplayer v0.11-pre3: Jan 5 2001
+ mpeg fixes, fullscreen support
+ - vertical.mpg serious libvo (x11,gl) segfaults fixed:
+ yuv2rgb_mmx requires one more lines that vertical image size...
+ fixed (allocating memory for width*(height+1)). [bugreport: Gabucino]
+ - Pontscho's fullscreen patch applied!
+ Using option -fs will maximize window size (for all resizeable drivers
+ including mga!) and disable window decorations (x11,Xv,gl only)
+ - simple inttypes.h included for libc5 (and glibc2.0 too?) users
+ - homepage updates (links changed ftp->http)
+
+mplayer v0.11-pre2: Jan 4 2001
+ better user messages, mp3 codec selection, demuxer changes
+ - w32codec.zip restored at the FTP site (somehow it damaged...)
+ - added version.h, and used its content everywhere
+ - 'premature end-of-file' problem fixed: freeing audio buffers and
+ setting d_audio->id=-2 if has_audio==0 [bugreport by Dmitri Pogosyan]
+ - some more messages added if verbose>=1
+ - demuxer.c: error message printed if A or V chunk buffer is full
+ 'mplayer test.avi -aid -2' still not works without option '-nosound'
+ - adding new config.h option to set default MP3 audio codec (mpg123/l3codeca)
+ ./configure selects mp3lib only if you have 3Dnow [idea: Gabucino]
+ - automatic fallback to mp3lib/mpg123 if l3codeca.acm can't be loaded/inited
+
+mplayer v0.11-pre1:
+ AVI sync fixes
+ - AVI audio seeking improvements: now using nBlockAlign value to seek
+ inside the chunk, so divx audio works without big delays!!!
+ - AVI PTS calculation modified: counting video PTS when skip_video_frames>0
+ so new audio PTS values will be correct. Solved many sync probs!
+ - A-V sync with AVI files fixed!
+ Now only the Desperado-trailer has 1.0 sec delay after seeking.
+ - fixed AVI sync in -bps mode too! :) (perfect except that Desperado avi)
+
+mplayer v0.10: Jan 1 2001 "The new year" release!
+ - testing
+ - docs changed
+ - it's time to release and remove the old buggy 0.09 version...
+ - release!!!
+
+mplayer v0.10-pre8: libvo/x11 changes
+ - libvo: x11/xv driver separated to x11 and xv drivers
+ - libvo: DUMMY_VO_FUNC removed from driver sources
+ - libvo: default driver order changed, because some users with software-only
+ opengl though that this 'slow' player can only play at 1-3fps :)
+
+mplayer v0.10-pre7: Dec 31 2000
+ libmpeg2 interface changes, display size/area changes, AVI fixes
+ - libmpeg2/decode.c modified:
+ - removed unused OMS and mpeg2dec stuff
+ - decode_data rewritten, now works like parse_es.c
+ => doesn't copy any data -> faster and less memory usage
+ - mplayer.c sends code 0x1FF after every frame, so libmpeg2 knows
+ when has to display it
+ - mplayer.c: in_frame flag fixes, didn't work well with mpeg2 streams
+ (because there is a 0x1B2 chunk between 0x100 and 0x101)
+ - 'picture' changed from static to shmem-allocated
+ -> better picture after codec restart (tested with JapAd.mpg)
+ -> keep information of the header changes (after init)
+ - mpeg image size changed, now only the real part of frame is displayed
+ (no more green strip at the bottom)
+ - picture struct: new fields: display_picture_width/height
+ - image buffer allocation (shmem) is done by decode.c instead of libvo
+ - new option: -xy <value> (resize both x/y direction)
+ if value<=8 -> x_scale = y_scale = value
+ else -> x_size=value y_size=aspectratio*x_size
+ - mplayer.c: video output moved out from avi/mpg init sections and
+ now it's common code (added movie_size_x/y variables and out_fmt global)
+ - new keys:
+ ESC => quit
+ + and - => adjust audio delay +- 0.1 second
+ k => kill/restart the mpeg codec process (for testing)
+ - codec control interface changed: wait for syncword after (re)start
+ to avoid receiving old frames => it's stable again!
+ - removed (now unused) allocate/free image buffer code from libvo
+ - mplayer: new internal variable for video format: has_video
+ 0 = none (unused yet)
+ 1 = mpeg 1/2 video
+ 2 = win32/VfW video codec
+ - config.h has defaults for bps-based AVI sync and ALSA timer code options:
+ #undef AVI_SYNC_BPS => now it's disabled by default!!! use -bps to enable
+ #define ALSA_TIMER => now it's enabled by default!!! use -noalsa to dis.
+ - help updated
+ - prints max compressed framesize at exit (both avi & mpeg)
+ - AVI audio seeking fixed: some ACM codecs (divx audio and ms-adpcm)
+ can't seek inside a chunk, they are only able to play whole chunks.
+ Current audio seeking has changed to seek inside the chunk only if the
+ codec supports it (only internal codecs and ACM/mp3 allows it).
+ - AVI: audio delay correction if can't seek inside the chunk
+
+mplayer v0.10-pre6: Dec 24 2000 "Xmas edition"
+ mpeg signal & EOF fixes
+ - ./configure: k6_mtrr (2.4.test11+) added [Pontscho]
+ - `term destroys if mplayer (mpg) called from mc.ext` bug fixed:
+ added sighandler to the 3rd process (mpeg codec) to avoid sig. recursion
+ - better output at exit (handled now by exit_player())
+ - mpeg EOF problem (codec restart) fixed: added EOF detection to parse_es.c
+ - internal flag 'current_module' added to get more info at segfaults
+ (contains module number where the segfault occured)
+ - audio detection changed: using afm=4 (Win32/ACM) for MP3 audio (AVI files)
+ (you MUST have l3codeca.acm at /usr/lib/win32, or you have to use '-afm 1')
+
+mplayer v0.10-pre5: Dec 22 2000
+ flipping fixed
+ - AVI image flipping reworked:
+ - new flag: avi_header.flipped, TRUE if upside-down
+ - image flipping code removed/disabled from libvo modules
+ - duplicate flip_page() calls removed (overload with x11 and mga)
+ - aLaw audio codec (AVI id 0x06) added (uses code from xanim source)
+
+mplayer v0.10-pre4: ???
+ test release, small fixes
+ - video_out driver <-> codec incompatibility message changed
+ - fixed the config.format bug in drivers/mga_vid_test, so it works again!
+ [thanks to David Whysong]
+ - libmpeg2 upgraded
+
+mplayer v0.10-pre3: Dec 10 2000
+ test release, verbose mode, new docs
+ - new option: -v = increment verbose level
+ (debug printf's changed to verbose level-dependent)
+ - default level: 0, only some informal output
+ - init debug: 1, some basic debug infos, avi header, function values
+ - player debug: 2, print avi indexes, chunk inputs, more debug infos
+ - parser debug: 3, prints everything related to input parsers
+ to increment verbose level, use multiple -v options (-v -v -v for level-3)
+ - bitrate calculation for AVI files
+ - README rewritten, added Troubleshooting and Bugreports sections
+ - TVout directory added (only the scripts)
+
+mplayer v0.10-pre2: Dec 8 2000
+ bugfix test release, bps-sync enabled
+ - avi: supporting both 0-based and movi-based index types (autodetect)
+ - avi: tested with VBR audio: plays well with -mc 0 option, seek doesn't
+ work yet [thanks to Alan Chen for testfile]
+ - avi: A-V sync to avg. byte/sec implemented (again) and enabled by default
+ (disable with -nobps if you want)
+ - ./configire: 3rd name ('kni') of the P3 added. Where is the compatibility?
+ - useless '\' removed from libac3/Makefile [Otvos Ferenc]
+
+mplayer v0.10-pre1: Dec 5 2000
+ test release, players merged!!!
+ - avip and mpegp has been merged to a single binary called 'mplayer'
+ - file type detection (AVI/MPEG-PS/MPEG-ES/Other)
+ - no redundant code (common code for common jobs)
+ - big format-dependent codes moved to functions (separated files)
+ - better error messages, removed some debug stuff, code cleanups
+ - old libmpeg2 version removed from source tree
+ - help texts merged (help_avi+help_mpg -> help_mp)
+ - new options: -x <x> -y <y> = scale image (if selected driver supports)
+ if value<=8 then image size will be multiplied by value, otherwise
+ image size will be scaled to <value> pixels.
+ For example:
+ 2x ZOOM: mplayer -x 2 -y 2 test.mpg
+ 800x600: mplayer -x 800 -y 600 test.mpg
+ [default values are still configurable at compile-time, see config.h]
+ - TV project (not finished) codebase added (see tvision.c, or: make tvision)
+
+mplayer v0.09: Dec 5 2000
+ Beta release [same as 0.09-pre3]
+ - version changed in the files
+ - docs updated
+
+mplayer v0.09-pre3: bugfix test-release, X11 support testing
+ - fixed the if [ -z $pparam ] bug in ./configure [Christian Birchinger]
+ - many changes in AVI seek code, resulting near-perfect seeking now!
+ current method calc absolute audio position, so with VBR audio it
+ doesn't work yet...
+ - avip: Xv support (YUY2 image format)
+ - avip: X11 support (24 & 32 bpp only, BGR format)
+ I need a very fast 15->16bpp converter for 16bpp support... anyone helps?
+
+mplayer v0.09-pre2: bugfix test-release
+ - removed unnecessary code from libmpeg2/header.c
+ Walken told me that standard mpg/vob streams must NOT use framerate
+ and bitrate extension... and the ext. id check is done by the caller.
+ - CRC support to mp3lib's mpeg audio layer-2 decoder
+ thanks for bugreport & testfile to Samson
+
+mplayer v0.09-pre1: bugfix test-release
+ - imported new libmpeg2 files (under testing...)
+ - GL renderer flickering bug fixed (MMX missing emms() between yuv2rgb and
+ glTexSubImage(), bug triggered by new Utah-GLX code)
+ [thanks for Christian Birchinger]
+
+mplayer v0.08: Nov 27 2000
+ Index support, avi seeking, DLL loader fix, compilation fixes
+ - Added support for chunk index usage (disable with -noidx option)
+ - Removed code optimization flags from loader/Makefile because
+ it segfaults if compile optimized code (it does some hacks with
+ pointers, maybe the reordered code confuses it)
+ - added new tool called aviparse (read and check avi file structure)
+ - indexed and raw chunk info comparing, bad chunks dropped
+ - termcap usage is optional (for those debian users without termcap)
+ - #if HAVE_* fixed (to #ifdef HAVE_*)
+ - ./configure supports new /proc/cpuinfo (2.4.0-test11)
+ - sse is called 'sse' again
+ - 'flags' field renamed to 'features'
+ - Xv benchmark results added to DOCS/SPEED
+ - avi seeking (and other goodies, pause etc) implemented
+ no PTS resync after seek yet.
+ - default video_out driver changed from 'mga' to the first available driver
+ new driver priority: mga_vid, opengl, x11
+
+mplayer v0.07: Nov 21 2000
+ Easier compile
+ - Added Pontscho's ./configure script (it's modified a lot)
+ - Updated makefiles, and tested a lot :)
+ - Updated DOCS/INSTALL
+
+mplayer v0.06: Nov 20 2000
+ Better codec selection
+ - avi audio&video codec selection moved to new codecs.c file,
+ loader/driver.c and loader/afl.c modified for this
+ - yuv support fixed, codecs.c setup flags to handle yuv properly
+ yuv works fine with divx, mpeg4, cvid, and upside-down iv50
+ - DOCS/INSTALL updated
+ - DOCS/SPEED updated, DivX benchmarks added
+
+mplayer v0.05: Nov 18 2000
+ Merged with MPEGplayer 0.90pre6, first public release of AVI player
+ - code merged with mpegplayer, new Makefile, some small modifications
+ - docs updated and moved to DOCS
+
+mplayer v0.04: YUV support, some code cleanup, preview-release
+
+mplayer v0.01: first version based on new MPEGplayer's codebase.
+
+mpg12play v0.9-v0.95pre5: Oct 21-Nov 2, 2000
+ Mpeg codec was libmpeg2 (mpeg2dec) by Aaron Holtzman & Michel
+ Lespinasse. It's great, optimized very fast C code with perfect
+ image quality and 100% MPEG standard conformance.
+
+mpg12play v0.5-v0.87: Sep 28-Oct 20, 2000
+ Mpeg codec replaced with DVDview by Dirk Farin, it was a great
+ stuff, but it was slow and was written in C++ (I hate C++!!!)
+
+mpg12play v0.1-v0.3: Sep 22-25, 2000
+ The first try, hacked together in a half hour! I've used libmpeg3
+ from www.heroinewarrior.com up to the version 0.3, but there were
+ image quality and speed problems with it.
1
0
Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv16967
Modified Files:
mencoder.c
Log Message:
count dropped frames in -v mode, patch by Andriy N. Gritsenko <andrej(a)lucky.net>
Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- mencoder.c 9 Sep 2002 11:47:54 -0000 1.157
+++ mencoder.c 10 Sep 2002 23:19:20 -0000 1.158
@@ -317,6 +317,7 @@
uint32_t videosamples=1;
uint32_t skippedframes=0;
uint32_t duplicatedframes=0;
+uint32_t badframes=0;
aviwrite_stream_t* mux_a=NULL;
aviwrite_stream_t* mux_v=NULL;
@@ -1039,7 +1040,9 @@
default:
// decode_video will callback down to ve_*.c encoders, through the video filters
blit_frame=decode_video(sh_video,start,in_size,(skip_flag>0)?1:0);
- if(!blit_frame && skip_flag<=0){
+ if(!blit_frame){
+ badframes++;
+ if(skip_flag<=0){
// unwanted skipping of a frame, what to do?
if(skip_limit==0){
// skipping not allowed -> write empty frame:
@@ -1048,6 +1051,7 @@
// skipping allowed -> skip it and distriubute timer error:
v_timer_corr-=(float)mux_v->h.dwScale/mux_v->h.dwRate;
}
+ }
}
}
@@ -1134,7 +1138,7 @@
(int)demuxer->movi_end);
#else
if(verbose) {
- mp_msg(MSGT_AVSYNC,MSGL_STATUS,"Pos:%6.1fs %6df (%2d%%) %3dfps Trem:%4dmin %3dmb A-V:%5.3f [%d:%d] A/Vms %d/%d D/S %d/%d \r",
+ mp_msg(MSGT_AVSYNC,MSGL_STATUS,"Pos:%6.1fs %6df (%2d%%) %3dfps Trem:%4dmin %3dmb A-V:%5.3f [%d:%d] A/Vms %d/%d D/B/S %d/%d/%d \r",
mux_v->timer, decoded_frameno, (int)(p*100),
(t>1) ? (int)(decoded_frameno/t+0.5) : 0,
(p>0.001) ? (int)((t/p-t)/60) : 0,
@@ -1143,7 +1147,7 @@
(mux_v->timer>1) ? (int)(mux_v->size/mux_v->timer/125) : 0,
(mux_a && mux_a->timer>1) ? (int)(mux_a->size/mux_a->timer/125) : 0,
audiorate/audiosamples, videorate/videosamples,
- duplicatedframes, skippedframes
+ duplicatedframes, badframes, skippedframes
);
} else
mp_msg(MSGT_AVSYNC,MSGL_STATUS,"Pos:%6.1fs %6df (%2d%%) %3dfps Trem:%4dmin %3dmb A-V:%5.3f [%d:%d]\r",
1
0
CVS: main/libmpcodecs vf_dint.c,NONE,1.1 Makefile,1.60,1.61 vf.c,1.48,1.49
by Arpi of Ize 10 Sep '02
by Arpi of Ize 10 Sep '02
10 Sep '02
Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var/tmp.root/cvs-serv16576
Modified Files:
Makefile vf.c
Added Files:
vf_dint.c
Log Message:
drop-deinterlace (dint) filter by Andriy N. Gritsenko <andrej(a)lucky.net>
--- NEW FILE ---
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <inttypes.h>
#include "../config.h"
#include "../mp_msg.h"
#include "../libvo/fastmemcpy.h"
#include "mp_image.h"
#include "img_format.h"
#include "vf.h"
struct vf_priv_s {
float sense; // first parameter
float level; // second parameter
unsigned int imgfmt;
char diff;
uint32_t max;
// int dfr;
// int rdfr;
int was_dint;
mp_image_t *pmpi; // previous mpi
};
#define MAXROWSIZE 1200
static int config (struct vf_instance_s* vf,
int width, int height, int d_width, int d_height,
unsigned int flags, unsigned int outfmt)
{
int rowsize;
vf->priv->pmpi = vf_get_image (vf->next, outfmt, MP_IMGTYPE_TEMP,
0, width, height);
if (!(vf->priv->pmpi->flags & MP_IMGFLAG_PLANAR) &&
outfmt != IMGFMT_RGB32 && outfmt != IMGFMT_BGR32 &&
outfmt != IMGFMT_RGB24 && outfmt != IMGFMT_BGR24 &&
outfmt != IMGFMT_RGB16 && outfmt != IMGFMT_BGR16)
{
mp_msg (MSGT_VFILTER, MSGL_WARN, "Drop-interlaced filter doesn't support this outfmt :(\n");
return 0;
}
vf->priv->imgfmt = outfmt;
// recalculate internal values
rowsize = vf->priv->pmpi->width;
if (rowsize > MAXROWSIZE) rowsize = MAXROWSIZE;
vf->priv->max = vf->priv->level * vf->priv->pmpi->height * rowsize / 2;
if (vf->priv->pmpi->flags & MP_IMGFLAG_PLANAR) // planar YUV
vf->priv->diff = vf->priv->sense * 256;
else
vf->priv->diff = vf->priv->sense * (1 << (vf->priv->pmpi->bpp/3));
if (vf->priv->diff < 0) vf->priv->diff = 0;
if (!(vf->priv->pmpi->flags & MP_IMGFLAG_PLANAR) &&
vf->priv->pmpi->bpp < 24 && vf->priv->diff > 31)
vf->priv->diff = 31;
mp_msg (MSGT_VFILTER, MSGL_INFO, "Drop-interlaced: %dx%d diff %d / level %u\n",
vf->priv->pmpi->width, vf->priv->pmpi->height,
(int)vf->priv->diff, (unsigned int)vf->priv->max);
// vf->priv->rdfr = vf->priv->dfr = 0;
vf->priv->was_dint = 0;
return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt);
}
static int put_image (struct vf_instance_s* vf, mp_image_t *mpi)
{
char rrow0[MAXROWSIZE];
char rrow1[MAXROWSIZE];
char rrow2[MAXROWSIZE];
char *row0 = rrow0, *row1 = rrow1, *row2 = rrow2/*, *row3 = rrow3*/;
int rowsize = mpi->width;
uint32_t nok = 0, max = vf->priv->max;
int diff = vf->priv->diff;
int i, j;
register int n1, n2;
unsigned char *cur0, *prv0;
register unsigned char *cur, *prv;
// check if nothing to do
if (mpi->imgfmt == vf->priv->imgfmt)
{
cur0 = mpi->planes[0] + mpi->stride[0];
prv0 = mpi->planes[0];
for (j = 1; j < mpi->height && nok <= max; j++)
{
cur = cur0;
prv = prv0;
// analyse row (row0)
if (mpi->flags & MP_IMGFLAG_PLANAR) // planar YUV - check luminance
for (i = 0; i < rowsize; i++)
{
if (cur[0] - prv[0] > diff)
row0[i] = 1;
else if (cur[0] - prv[0] < -diff)
row0[i] = -1;
else
row0[i] = 0;
cur++;
prv++;
// check if row0 is 1 but row1 is 0, and row2 is 1 or row2 is 0
// but row3 is 1 so it's interlaced ptr (nok++)
if (j > 2 && row0[i] > 0 && (row1[i] < 0 || (!row1[i] && row2[i] < 0)) &&
(++nok) > max)
break;
}
else if (mpi->bpp < 24) // RGB/BGR 16 - check all colors
for (i = 0; i < rowsize; i++)
{
n1 = cur[0] + (cur[1]<<8);
n2 = prv[0] + (prv[1]<<8);
if ((n1&0x1f) - (n2&0x1f) > diff ||
((n1>>5)&0x3f) - ((n2>>5)&0x3f) > diff ||
((n1>>11)&0x1f) - ((n2>>11)&0x1f) > diff)
row0[i] = 1;
else if ((n1&0x1f) - (n2&0x1f) < -diff ||
((n1>>5)&0x3f) - ((n2>>5)&0x3f) < -diff ||
((n1>>11)&0x1f) - ((n2>>11)&0x1f) < -diff)
row0[i] = -1;
else
row0[i] = 0;
cur += 2;
prv += 2;
// check if row0 is 1 but row1 is 0, and row2 is 1 or row2 is 0
// but row3 is 1 so it's interlaced ptr (nok++)
if (j > 2 && row0[i] > 0 && (row1[i] < 0 || (!row1[i] && row2[i] < 0)) &&
(++nok) > max)
break;
}
else // RGB/BGR 24/32
for (i = 0; i < rowsize; i++)
{
if (cur[0] - prv[0] > diff ||
cur[1] - prv[1] > diff ||
cur[2] - prv[2] > diff)
row0[i] = 1;
else if (prv[0] - cur[0] > diff ||
prv[1] - cur[1] > diff ||
prv[2] - cur[2] > diff)
row0[i] = -1;
else
row0[i] = 0;
cur += mpi->bpp/8;
prv += mpi->bpp/8;
// check if row0 is 1 but row1 is 0, and row2 is 1 or row2 is 0
// but row3 is 1 so it's interlaced ptr (nok++)
if (j > 2 && row0[i] > 0 && (row1[i] < 0 || (!row1[i] && row2[i] < 0)) &&
(++nok) > max)
break;
}
cur0 += mpi->stride[0];
prv0 += mpi->stride[0];
// rotate rows
cur = row2;
row2 = row1;
row1 = row0;
row0 = cur;
}
}
// check if number of interlaced is above of max
if (nok > max)
{
// vf->priv->dfr++;
if (vf->priv->was_dint < 1) // can skip at most one frame!
{
vf->priv->was_dint++;
// vf->priv->rdfr++;
// mp_msg (MSGT_VFILTER, MSGL_INFO, "DI:%d/%d ", vf->priv->rdfr, vf->priv->dfr);
return 0;
}
}
vf->priv->was_dint = 0;
// mp_msg (MSGT_VFILTER, MSGL_INFO, "DI:%d/%d ", vf->priv->rdfr, vf->priv->dfr);
return vf_next_put_image (vf, mpi);
}
static int open (vf_instance_t *vf, char* args){
vf->config = config;
vf->put_image = put_image;
// vf->default_reqs=VFCAP_ACCEPT_STRIDE;
vf->priv = malloc (sizeof(struct vf_priv_s));
vf->priv->sense = 0.01;
vf->priv->level = 0.15;
vf->priv->pmpi = NULL;
if (args)
sscanf (args, "%f:%f", &vf->priv->sense, &vf->priv->level);
return 1;
}
vf_info_t vf_info_dint = {
"drop interlaced frames",
"dint",
"A.G.",
"",
open
};
Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/Makefile,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- Makefile 10 Sep 2002 20:59:51 -0000 1.60
+++ Makefile 10 Sep 2002 23:18:31 -0000 1.61
@@ -6,7 +6,7 @@
AUDIO_SRCS=dec_audio.c ad.c ad_liba52.c ad_acm.c ad_alaw.c ad_dk3adpcm.c ad_dshow.c ad_dvdpcm.c ad_ffmpeg.c ad_hwac3.c ad_imaadpcm.c ad_mp3lib.c ad_msadpcm.c ad_pcm.c ad_roqaudio.c ad_msgsm.c ad_faad.c ad_libvorbis.c ad_libmad.c ad_realaud.c ad_libdv.c
VIDEO_SRCS=dec_video.c vd.c vd_null.c vd_realvid.c vd_cinepak.c vd_qtrpza.c vd_ffmpeg.c vd_dshow.c vd_vfw.c vd_vfwex.c vd_odivx.c vd_divx4.c vd_raw.c vd_xanim.c vd_msvidc.c vd_fli.c vd_qtrle.c vd_qtsmc.c vd_roqvideo.c vd_cyuv.c vd_nuv.c vd_libmpeg2.c vd_msrle.c vd_huffyuv.c vd_mpegpes.c vd_svq1.c vd_xvid.c vd_libdv.c vd_lcl.c vd_mtga.c
-VFILTER_SRCS=vf.c vf_vo.c vf_crop.c vf_expand.c vf_pp.c vf_scale.c vf_format.c vf_yuy2.c vf_flip.c vf_rgb2bgr.c vf_rotate.c vf_mirror.c vf_palette.c vf_lavc.c vf_dvbscale.c vf_cropdetect.c vf_test.c vf_noise.c vf_yvu9.c vf_rectangle.c vf_lavcdeint.c vf_eq.c vf_halfpack.c
+VFILTER_SRCS=vf.c vf_vo.c vf_crop.c vf_expand.c vf_pp.c vf_scale.c vf_format.c vf_yuy2.c vf_flip.c vf_rgb2bgr.c vf_rotate.c vf_mirror.c vf_palette.c vf_lavc.c vf_dvbscale.c vf_cropdetect.c vf_test.c vf_noise.c vf_yvu9.c vf_rectangle.c vf_lavcdeint.c vf_eq.c vf_halfpack.c vf_dint.c
ENCODER_SRCS=ve.c ve_divx4.c ve_lavc.c ve_vfw.c ve_rawrgb.c ve_libdv.c
NATIVE_SRCS=native/RTjpegN.c native/cinepak.c native/cyuv.c native/fli.c native/minilzo.c native/msvidc.c native/nuppelvideo.c native/qtrle.c native/qtrpza.c native/qtsmc.c native/roqav.c native/xa_gsm.c native/svq1.c
Index: vf.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- vf.c 10 Sep 2002 22:18:32 -0000 1.48
+++ vf.c 10 Sep 2002 23:18:31 -0000 1.49
@@ -40,6 +40,7 @@
extern vf_info_t vf_info_lavcdeint;
extern vf_info_t vf_info_eq;
extern vf_info_t vf_info_halfpack;
+extern vf_info_t vf_info_dint;
char** vo_plugin_args=(char**) NULL;
@@ -73,6 +74,7 @@
&vf_info_yvu9,
&vf_info_eq,
&vf_info_halfpack,
+ &vf_info_dint,
NULL
};
1
0
Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var/tmp.root/cvs-serv19613
Modified Files:
dec_video.c ve_divx4.c ve_lavc.c ve_libdv.c ve_rawrgb.c
ve_vfw.c vf.c vf.h vf_crop.c vf_cropdetect.c vf_eq.c
vf_expand.c vf_fame.c vf_flip.c vf_halfpack.c vf_lavc.c
vf_lavcdeint.c vf_mirror.c vf_noise.c vf_palette.c vf_pp.c
vf_rectangle.c vf_rgb2bgr.c vf_rotate.c vf_scale.c vf_test.c
vf_vo.c vf_yuy2.c vf_yvu9.c
Log Message:
changing return type of put_image void->int
Index: dec_video.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/dec_video.c,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- dec_video.c 31 Aug 2002 21:03:03 -0000 1.149
+++ dec_video.c 10 Sep 2002 22:18:32 -0000 1.150
@@ -212,6 +212,7 @@
unsigned int t=GetTimer();
unsigned int t2;
double tt;
+int ret;
//if(!(sh_video->ds->flags&1) || sh_video->ds->pack_no<5)
mpi=mpvdec->decode(sh_video, start, in_size, drop_frame);
@@ -237,12 +238,12 @@
//vo_draw_image(video_out,mpi);
vf=sh_video->vfilter;
-vf->put_image(vf,mpi);
-vf->control(vf,VFCTRL_DRAW_OSD,NULL);
+ret = vf->put_image(vf,mpi); // apply video filters and call the leaf vo/ve
+if(ret>0) vf->control(vf,VFCTRL_DRAW_OSD,NULL);
t2=GetTimer()-t2;
tt=t2*0.000001f;
vout_time_usage+=tt;
- return 1;
+return ret;
}
Index: ve_divx4.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_divx4.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ve_divx4.c 9 Sep 2002 12:12:30 -0000 1.7
+++ ve_divx4.c 10 Sep 2002 22:18:32 -0000 1.8
@@ -223,7 +223,7 @@
return 0;
}
-static void put_image(struct vf_instance_s* vf, mp_image_t *mpi){
+static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){
ENC_RESULT enc_result;
vf->priv->enc_frame.image=mpi->planes[0];
vf->priv->enc_frame.bitstream=mux_v->buffer;
@@ -273,6 +273,7 @@
}
}
mencoder_write_chunk(mux_v,vf->priv->enc_frame.length,enc_result.is_key_frame?0x10:0);
+ return 1;
}
//===========================================================================//
Index: ve_lavc.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_lavc.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ve_lavc.c 30 Aug 2002 00:38:42 -0000 1.27
+++ ve_lavc.c 10 Sep 2002 22:18:32 -0000 1.28
@@ -387,7 +387,7 @@
return 0;
}
-static void put_image(struct vf_instance_s* vf, mp_image_t *mpi){
+static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){
int out_size;
AVPicture lavc_venc_picture;
@@ -431,6 +431,7 @@
if(lavc_venc_context.stats_out && stats_file)
fprintf(stats_file, "%s", lavc_venc_context.stats_out);
#endif
+ return 1;
}
static void uninit(struct vf_instance_s* vf){
Index: ve_libdv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_libdv.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ve_libdv.c 28 Aug 2002 22:45:44 -0000 1.3
+++ ve_libdv.c 10 Sep 2002 22:18:32 -0000 1.4
@@ -72,13 +72,14 @@
return 0;
}
-static void put_image(struct vf_instance_s* vf, mp_image_t *mpi){
+static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){
dv_encode_full_frame(vf->priv->enc, mpi->planes,
(mpi->flags&MP_IMGFLAG_YUV) ? e_dv_color_yuv : e_dv_color_rgb,
mux_v->buffer);
mencoder_write_chunk(mux_v, 480 * (vf->priv->enc->isPAL ? 300 : 250) , 0x10);
+ return 1;
}
//===========================================================================//
Index: ve_rawrgb.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_rawrgb.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ve_rawrgb.c 28 Aug 2002 22:45:44 -0000 1.6
+++ ve_rawrgb.c 10 Sep 2002 22:18:32 -0000 1.7
@@ -46,9 +46,10 @@
return 0;
}
-static void put_image(struct vf_instance_s* vf, mp_image_t *mpi){
+static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){
mux_v->buffer=mpi->planes[0];
mencoder_write_chunk(mux_v, mpi->width*mpi->height*3, 0x10);
+ return 1;
}
//===========================================================================//
Index: ve_vfw.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_vfw.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ve_vfw.c 1 Sep 2002 23:06:15 -0000 1.8
+++ ve_vfw.c 10 Sep 2002 22:18:32 -0000 1.9
@@ -238,12 +238,13 @@
return 0;
}
-static void put_image(struct vf_instance_s* vf, mp_image_t *mpi){
+static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){
long flags=0;
int ret;
// flip_upside_down(vo_image_ptr,vo_image_ptr,3*vo_w,vo_h); // dirty hack
ret=vfw_encode_frame(mux_v->bih, mux_v->buffer, vfw_bih, mpi->planes[0], &flags, 10000);
mencoder_write_chunk(mux_v,mux_v->bih->biSizeImage,flags);
+ return 1;
}
//===========================================================================//
Index: vf.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- vf.c 30 Aug 2002 06:16:40 -0000 1.47
+++ vf.c 10 Sep 2002 22:18:32 -0000 1.48
@@ -347,8 +347,8 @@
return flags;
}
-void vf_next_put_image(struct vf_instance_s* vf,mp_image_t *mpi){
- vf->next->put_image(vf->next,mpi);
+int vf_next_put_image(struct vf_instance_s* vf,mp_image_t *mpi){
+ return vf->next->put_image(vf->next,mpi);
}
//============================================================================
Index: vf.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- vf.h 1 Sep 2002 14:30:54 -0000 1.14
+++ vf.h 10 Sep 2002 22:18:32 -0000 1.15
@@ -29,7 +29,7 @@
unsigned int fmt);
void (*get_image)(struct vf_instance_s* vf,
mp_image_t *mpi);
- void (*put_image)(struct vf_instance_s* vf,
+ int (*put_image)(struct vf_instance_s* vf,
mp_image_t *mpi);
void (*draw_slice)(struct vf_instance_s* vf,
unsigned char** src, int* stride, int w,int h, int x, int y);
@@ -77,7 +77,7 @@
unsigned int flags, unsigned int outfmt);
int vf_next_control(struct vf_instance_s* vf, int request, void* data);
int vf_next_query_format(struct vf_instance_s* vf, unsigned int fmt);
-void vf_next_put_image(struct vf_instance_s* vf,mp_image_t *mpi);
+int vf_next_put_image(struct vf_instance_s* vf,mp_image_t *mpi);
vf_instance_t* append_filters(vf_instance_t* last);
Index: vf_crop.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_crop.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- vf_crop.c 12 May 2002 19:06:15 -0000 1.5
+++ vf_crop.c 10 Sep 2002 22:18:32 -0000 1.6
@@ -39,7 +39,7 @@
return vf_next_config(vf,vf->priv->crop_w,vf->priv->crop_h,d_width,d_height,flags,outfmt);
}
-static void put_image(struct vf_instance_s* vf, mp_image_t *mpi){
+static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){
mp_image_t *dmpi=vf_get_image(vf->next,mpi->imgfmt,
MP_IMGTYPE_EXPORT, 0,
vf->priv->crop_w, vf->priv->crop_h);
@@ -59,7 +59,7 @@
}
dmpi->stride[0]=mpi->stride[0];
dmpi->width=mpi->width;
- vf_next_put_image(vf,dmpi);
+ return vf_next_put_image(vf,dmpi);
}
//===========================================================================//
Index: vf_cropdetect.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_cropdetect.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vf_cropdetect.c 29 Jun 2002 22:12:07 -0000 1.4
+++ vf_cropdetect.c 10 Sep 2002 22:18:32 -0000 1.5
@@ -55,7 +55,7 @@
return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt);
}
-static void put_image(struct vf_instance_s* vf, mp_image_t *mpi){
+static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){
mp_image_t *dmpi;
int bpp=mpi->bpp/8;
int x,y;
@@ -115,7 +115,7 @@
}
- vf_next_put_image(vf,dmpi);
+ return vf_next_put_image(vf,dmpi);
}
//===========================================================================//
Index: vf_eq.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_eq.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vf_eq.c 28 Aug 2002 00:24:27 -0000 1.4
+++ vf_eq.c 10 Sep 2002 22:18:32 -0000 1.5
@@ -109,7 +109,7 @@
/* FIXME: add packed yuv version of process */
-static void put_image(struct vf_instance_s* vf, mp_image_t *mpi)
+static int put_image(struct vf_instance_s* vf, mp_image_t *mpi)
{
mp_image_t *dmpi;
@@ -135,7 +135,7 @@
vf->priv->contrast);
}
- vf_next_put_image(vf,dmpi);
+ return vf_next_put_image(vf,dmpi);
}
static int control(struct vf_instance_s* vf, int request, void* data)
Index: vf_expand.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_expand.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- vf_expand.c 21 Aug 2002 19:12:13 -0000 1.15
+++ vf_expand.c 10 Sep 2002 22:18:32 -0000 1.16
@@ -221,14 +221,14 @@
}
}
-static void put_image(struct vf_instance_s* vf, mp_image_t *mpi){
+static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){
if(mpi->flags&MP_IMGFLAG_DIRECT){
vf->priv->dmpi=mpi->priv;
#ifdef OSD_SUPPORT
if(vf->priv->osd) draw_osd(vf,mpi->w,mpi->h);
#endif
- vf_next_put_image(vf,vf->priv->dmpi);
- return; // we've used DR, so we're ready...
+ // we've used DR, so we're ready...
+ return vf_next_put_image(vf,vf->priv->dmpi);
}
// hope we'll get DR buffer:
@@ -259,7 +259,7 @@
#ifdef OSD_SUPPORT
if(vf->priv->osd) draw_osd(vf,mpi->w,mpi->h);
#endif
- vf_next_put_image(vf,vf->priv->dmpi);
+ return vf_next_put_image(vf,vf->priv->dmpi);
}
//===========================================================================//
Index: vf_fame.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_fame.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- vf_fame.c 1 Jun 2002 20:57:26 -0000 1.7
+++ vf_fame.c 10 Sep 2002 22:18:32 -0000 1.8
@@ -45,7 +45,7 @@
return vf_next_config(vf,width,height,d_width,d_height,flags,IMGFMT_MPEGPES);
}
-static void put_image(struct vf_instance_s* vf, mp_image_t *mpi){
+static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){
fame_yuv_t yuv;
mp_image_t *dmpi;
int out_size;
@@ -62,7 +62,7 @@
out_size = fame_encode_slice(vf->priv->ctx);
fame_end_frame(vf->priv->ctx, NULL);
- if(out_size<=0) return;
+ if(out_size<=0) return 1;
dmpi=vf_get_image(vf->next,IMGFMT_MPEGPES,
MP_IMGTYPE_EXPORT, 0,
@@ -75,7 +75,7 @@
dmpi->planes[0]=&vf->priv->pes;
- vf_next_put_image(vf,dmpi);
+ return vf_next_put_image(vf,dmpi);
}
//===========================================================================//
Index: vf_flip.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_flip.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- vf_flip.c 3 Sep 2002 20:26:32 -0000 1.7
+++ vf_flip.c 10 Sep 2002 22:18:32 -0000 1.8
@@ -44,10 +44,10 @@
}
}
-static void put_image(struct vf_instance_s* vf, mp_image_t *mpi){
+static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){
if(mpi->flags&MP_IMGFLAG_DIRECT){
- vf_next_put_image(vf,vf->priv->dmpi);
- return; // we've used DR, so we're ready...
+ // we've used DR, so we're ready...
+ return vf_next_put_image(vf,vf->priv->dmpi);
}
vf->priv->dmpi=vf_get_image(vf->next,mpi->imgfmt,
@@ -68,7 +68,7 @@
} else
vf->priv->dmpi->planes[1]=mpi->planes[1]; // passthru bgr8 palette!!!
- vf_next_put_image(vf,vf->priv->dmpi);
+ return vf_next_put_image(vf,vf->priv->dmpi);
}
//===========================================================================//
Index: vf_halfpack.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_halfpack.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vf_halfpack.c 30 Aug 2002 14:32:47 -0000 1.2
+++ vf_halfpack.c 10 Sep 2002 22:18:32 -0000 1.3
@@ -140,7 +140,7 @@
unsigned int dststride, unsigned int srcstride[3], int w, int h);
-static void put_image(struct vf_instance_s* vf, mp_image_t *mpi)
+static int put_image(struct vf_instance_s* vf, mp_image_t *mpi)
{
mp_image_t *dmpi;
@@ -153,7 +153,7 @@
dmpi->stride[0], mpi->stride,
mpi->w, mpi->h);
- vf_next_put_image(vf,dmpi);
+ return vf_next_put_image(vf,dmpi);
}
static int config(struct vf_instance_s* vf,
Index: vf_lavc.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_lavc.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- vf_lavc.c 28 Aug 2002 22:45:44 -0000 1.5
+++ vf_lavc.c 10 Sep 2002 22:18:32 -0000 1.6
@@ -78,7 +78,7 @@
return vf_next_config(vf,width,height,d_width,d_height,flags,IMGFMT_MPEGPES);
}
-static void put_image(struct vf_instance_s* vf, mp_image_t *mpi){
+static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){
mp_image_t* dmpi;
int out_size;
AVPicture lavc_venc_picture;
@@ -93,7 +93,7 @@
out_size = avcodec_encode_video(&lavc_venc_context,
vf->priv->outbuf, vf->priv->outbuf_size, &lavc_venc_picture);
- if(out_size<=0) return;
+ if(out_size<=0) return 1;
dmpi=vf_get_image(vf->next,IMGFMT_MPEGPES,
MP_IMGTYPE_EXPORT, 0,
@@ -106,7 +106,7 @@
dmpi->planes[0]=(unsigned char*)&vf->priv->pes;
- vf_next_put_image(vf,dmpi);
+ return vf_next_put_image(vf,dmpi);
}
//===========================================================================//
Index: vf_lavcdeint.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_lavcdeint.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vf_lavcdeint.c 14 Aug 2002 21:43:49 -0000 1.3
+++ vf_lavcdeint.c 10 Sep 2002 22:18:32 -0000 1.4
@@ -107,7 +107,7 @@
flags, outfmt);
}
-static void
+static int
put_image (struct vf_instance_s* vf, mp_image_t *mpi)
{
struct vf_priv_s *priv = vf->priv;
@@ -137,10 +137,10 @@
priv->pix_fmt, priv->width, priv->height) < 0)
{
/* This should not happen -- see config() */
- return;
+ return 0;
}
- vf_next_put_image(vf, dmpi);
+ return vf_next_put_image(vf, dmpi);
}
Index: vf_mirror.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_mirror.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vf_mirror.c 23 Jun 2002 21:08:31 -0000 1.3
+++ vf_mirror.c 10 Sep 2002 22:18:32 -0000 1.4
@@ -42,7 +42,7 @@
//===========================================================================//
-static void put_image(struct vf_instance_s* vf, mp_image_t *mpi){
+static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){
mp_image_t *dmpi;
// hope we'll get DR buffer:
@@ -66,7 +66,7 @@
dmpi->w,dmpi->h,dmpi->bpp>>3);
}
- vf_next_put_image(vf,dmpi);
+ return vf_next_put_image(vf,dmpi);
}
//===========================================================================//
Index: vf_noise.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_noise.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- vf_noise.c 13 Aug 2002 17:53:32 -0000 1.9
+++ vf_noise.c 10 Sep 2002 22:18:32 -0000 1.10
@@ -334,7 +334,7 @@
mpi->flags|=MP_IMGFLAG_DIRECT;
}
-static void put_image(struct vf_instance_s* vf, mp_image_t *mpi){
+static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){
mp_image_t *dmpi;
if(!(mpi->flags&MP_IMGFLAG_DIRECT)){
@@ -361,7 +361,7 @@
if(gCpuCaps.hasMMX2) asm volatile ("sfence\n\t");
#endif
- vf_next_put_image(vf,dmpi);
+ return vf_next_put_image(vf,dmpi);
}
static void uninit(struct vf_instance_s* vf){
Index: vf_palette.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_palette.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- vf_palette.c 9 Sep 2002 16:13:51 -0000 1.7
+++ vf_palette.c 10 Sep 2002 22:18:32 -0000 1.8
@@ -68,7 +68,7 @@
return vf_next_config(vf,width,height,d_width,d_height,flags,vf->priv->fmt);
}
-static void put_image(struct vf_instance_s* vf, mp_image_t *mpi){
+static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){
mp_image_t *dmpi;
// hope we'll get DR buffer:
@@ -144,7 +144,7 @@
}
}
- vf_next_put_image(vf,dmpi);
+ return vf_next_put_image(vf,dmpi);
}
//===========================================================================//
Index: vf_pp.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_pp.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- vf_pp.c 28 Aug 2002 22:45:44 -0000 1.9
+++ vf_pp.c 10 Sep 2002 22:18:32 -0000 1.10
@@ -67,7 +67,7 @@
mpi->flags|=MP_IMGFLAG_DIRECT;
}
-static void put_image(struct vf_instance_s* vf, mp_image_t *mpi){
+static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){
if(!(mpi->flags&MP_IMGFLAG_DIRECT)){
// no DR, so get a new image! hope we'll get DR buffer:
vf->priv->dmpi=vf_get_image(vf->next,vf->priv->outfmt,
@@ -87,7 +87,7 @@
vf->priv->pp);
}
- vf_next_put_image(vf,vf->priv->dmpi);
+ return vf_next_put_image(vf,vf->priv->dmpi);
}
//===========================================================================//
Index: vf_rectangle.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_rectangle.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vf_rectangle.c 28 Aug 2002 22:45:44 -0000 1.3
+++ vf_rectangle.c 10 Sep 2002 22:18:32 -0000 1.4
@@ -62,7 +62,7 @@
return vf_next_control(vf, request, data);
return 0;
}
-static void
+static int
put_image(struct vf_instance_s* vf, mp_image_t* mpi){
mp_image_t* dmpi;
unsigned int bpp;
@@ -136,7 +136,7 @@
p += dmpi->stride[0];
}
}
- vf_next_put_image(vf, dmpi);
+ return vf_next_put_image(vf, dmpi);
}
static int
Index: vf_rgb2bgr.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_rgb2bgr.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vf_rgb2bgr.c 13 Apr 2002 19:14:31 -0000 1.4
+++ vf_rgb2bgr.c 10 Sep 2002 22:18:32 -0000 1.5
@@ -44,7 +44,7 @@
return vf_next_config(vf,width,height,d_width,d_height,flags,vf->priv->fmt);
}
-static void put_image(struct vf_instance_s* vf, mp_image_t *mpi){
+static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){
mp_image_t *dmpi;
// hope we'll get DR buffer:
@@ -72,7 +72,7 @@
rgb24tobgr24(mpi->planes[0],dmpi->planes[0],mpi->w*mpi->h*3);
}
- vf_next_put_image(vf,dmpi);
+ return vf_next_put_image(vf,dmpi);
}
//===========================================================================//
Index: vf_rotate.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_rotate.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vf_rotate.c 23 Jun 2002 21:08:31 -0000 1.2
+++ vf_rotate.c 10 Sep 2002 22:18:32 -0000 1.3
@@ -60,7 +60,7 @@
return vf_next_config(vf,height,width,d_height,d_width,flags,outfmt);
}
-static void put_image(struct vf_instance_s* vf, mp_image_t *mpi){
+static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){
mp_image_t *dmpi;
// hope we'll get DR buffer:
@@ -84,7 +84,7 @@
dmpi->w,dmpi->h,dmpi->bpp>>3,vf->priv->direction);
}
- vf_next_put_image(vf,dmpi);
+ return vf_next_put_image(vf,dmpi);
}
//===========================================================================//
Index: vf_scale.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_scale.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- vf_scale.c 18 Aug 2002 22:46:03 -0000 1.23
+++ vf_scale.c 10 Sep 2002 22:18:32 -0000 1.24
@@ -166,7 +166,7 @@
return vf_next_config(vf,vf->priv->w,vf->priv->h,d_width,d_height,flags,best);
}
-static void put_image(struct vf_instance_s* vf, mp_image_t *mpi){
+static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){
mp_image_t *dmpi;
// hope we'll get DR buffer:
@@ -182,7 +182,7 @@
dmpi->qstride=mpi->qstride;
}
- vf_next_put_image(vf,dmpi);
+ return vf_next_put_image(vf,dmpi);
}
//===========================================================================//
Index: vf_test.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_test.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vf_test.c 23 Jun 2002 21:08:31 -0000 1.3
+++ vf_test.c 10 Sep 2002 22:18:32 -0000 1.4
@@ -268,7 +268,7 @@
}
}
-static void put_image(struct vf_instance_s* vf, mp_image_t *mpi){
+static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){
mp_image_t *dmpi;
int frame= vf->priv->frame_num;
@@ -299,9 +299,9 @@
}
}
- vf_next_put_image(vf,dmpi);
frame++;
vf->priv->frame_num= frame;
+ return vf_next_put_image(vf,dmpi);
}
//===========================================================================//
Index: vf_vo.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_vo.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- vf_vo.c 1 Sep 2002 14:30:54 -0000 1.17
+++ vf_vo.c 10 Sep 2002 22:18:32 -0000 1.18
@@ -87,11 +87,11 @@
video_out->control(VOCTRL_GET_IMAGE,mpi);
}
-static void put_image(struct vf_instance_s* vf,
+static int put_image(struct vf_instance_s* vf,
mp_image_t *mpi){
- if(!vo_config_count) return; // vo not configured?
+ if(!vo_config_count) return 0; // vo not configured?
// first check, maybe the vo/vf plugin implements draw_image using mpi:
- if(video_out->control(VOCTRL_DRAW_IMAGE,mpi)==VO_TRUE) return; // done.
+ if(video_out->control(VOCTRL_DRAW_IMAGE,mpi)==VO_TRUE) return 1; // done.
// nope, fallback to old draw_frame/draw_slice:
if(!(mpi->flags&(MP_IMGFLAG_DIRECT|MP_IMGFLAG_DRAW_CALLBACK))){
// blit frame:
@@ -100,6 +100,7 @@
else
video_out->draw_frame(mpi->planes);
}
+ return 1;
}
static void draw_slice(struct vf_instance_s* vf,
Index: vf_yuy2.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_yuy2.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vf_yuy2.c 9 Sep 2002 20:55:57 -0000 1.4
+++ vf_yuy2.c 10 Sep 2002 22:18:32 -0000 1.5
@@ -27,7 +27,7 @@
return vf_next_config(vf,width,height,d_width,d_height,flags,IMGFMT_YUY2);
}
-static void put_image(struct vf_instance_s* vf, mp_image_t *mpi){
+static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){
mp_image_t *dmpi;
// hope we'll get DR buffer:
@@ -45,7 +45,7 @@
dmpi->qscale=mpi->qscale;
dmpi->qstride=mpi->qstride;
- vf_next_put_image(vf,dmpi);
+ return vf_next_put_image(vf,dmpi);
}
//===========================================================================//
Index: vf_yvu9.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_yvu9.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vf_yvu9.c 23 Jun 2002 15:03:54 -0000 1.3
+++ vf_yvu9.c 10 Sep 2002 22:18:32 -0000 1.4
@@ -27,7 +27,7 @@
return vf_next_config(vf,width,height,d_width,d_height,flags,IMGFMT_YV12);
}
-static void put_image(struct vf_instance_s* vf, mp_image_t *mpi){
+static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){
mp_image_t *dmpi;
int y,w,h;
@@ -58,7 +58,7 @@
dmpi->qscale=mpi->qscale;
dmpi->qstride=mpi->qstride;
- vf_next_put_image(vf,dmpi);
+ return vf_next_put_image(vf,dmpi);
}
//===========================================================================//
1
0
Update of /cvsroot/mplayer/main/DOCS
In directory mail:/var/tmp.root/cvs-serv14734
Modified Files:
video.html
Log Message:
Numbering corrected.
Index: video.html
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/video.html,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- video.html 5 Sep 2002 05:38:52 -0000 1.99
+++ video.html 10 Sep 2002 22:10:06 -0000 1.100
@@ -624,14 +624,14 @@
change: <CODE>echo "brightness=120" > /dev/mga_vid</CODE></P>
-<H4><A NAME="tdfxfb">2.3.1.9 3dfx YUV support (tdfxfb)</A></H4>
+<H4><A NAME="tdfxfb">2.3.1.8 3dfx YUV support (tdfxfb)</A></H4>
<P>This driver uses the kernel's tdfx framebuffer driver to play movies with
YUV acceleration. You'll need a kernel with tdfxfb support, and recompile
with <CODE>./configure --enable-tdfxfb</CODE></P>
-<H4><A NAME="opengl">2.3.1.10 OpenGL output</A></H4>
+<H4><A NAME="opengl">2.3.1.9 OpenGL output</A></H4>
<P><B>MPlayer</B> supports displaying movies using OpenGL, but if your
platform/driver supports xv as should be the case on a PC with Linux, use xv
@@ -649,7 +649,7 @@
for download and installation instructions.</P>
-<H4><A NAME="aalib">2.3.1.11 AAlib - text mode displaying</A></H4>
+<H4><A NAME="aalib">2.3.1.10 AAlib - text mode displaying</A></H4>
<P><B>AAlib</B> is a library for displaying graphics in text mode, using powerful
ASCII renderer. There are LOTS of programs already supporting it, like Doom,
@@ -713,7 +713,7 @@
for further tuning issues.</P>
-<H4><A NAME="vesa">2.3.1.12 VESA - output to VESA BIOS</A></H4>
+<H4><A NAME="vesa">2.3.1.11 VESA - output to VESA BIOS</A></H4>
<P>This driver was designed and introduced as a <B>generic driver</B> for any
video card which has VESA VBE 2.0 compatible BIOS. Another advantage of this
@@ -817,7 +817,7 @@
</UL>
-<H4><A NAME="x11">2.3.1.13 X11</A></H4>
+<H4><A NAME="x11">2.3.1.12 X11</A></H4>
<P>Avoid if possible. Outputs to X11 (uses shared memory extension), with no
hardware acceleration at all. Supports (MMX/3DNow/SSE accelerated, but still
@@ -847,7 +847,7 @@
video modes.</P>
-<H4><A NAME="vidix">2.3.1.14 VIDIX</A></H4>
+<H4><A NAME="vidix">2.3.1.13 VIDIX</A></H4>
<P>VIDIX is the abbreviation for <B>VID</B>eo <B>I</B>nterface for
*ni<B>X</B>.<BR>
@@ -980,7 +980,7 @@
filename.vob</CODE></P>
-<H4><A NAME="zr">2.3.1.15 Zr</A></H4>
+<H4><A NAME="zr">2.3.1.14 Zr</A></H4>
<P>This is a display-driver (<CODE>-vo zr</CODE>) for a number of MJPEG
capture/playback cards (tested for DC10+ and Buz, and it should work for the
@@ -1064,7 +1064,8 @@
<B>FIRST</B> start XawTV, <B>THEN</B> start <B>MPlayer</B>, wait for
<B>MPlayer</B> to finish and <B>THEN</B> stop XawTV.</P>
-<H4><A NAME="dvb">2.3.1.16 DVB</A></H4>
+
+<H4><A NAME="dvb">2.3.1.15 DVB</A></H4>
<P><B>MPlayer</B> supports cards with the Siemens DVB chipset from vendors like
Siemens, Technotrend, Galaxis or Hauppauge. The latest DVB drivers are
@@ -1167,7 +1168,7 @@
decompression).</P>
-<H4><A NAME="dxr3">2.3.1.17 DXR3/Hollywood+</A></H4>
+<H4><A NAME="dxr3">2.3.1.16 DXR3/Hollywood+</A></H4>
<P><B>MPlayer</B> supports hardware accelerated playback with the Creative DXR3
and Sigma Designs Hollywood Plus cards. These cards both use the em8300 MPEG
1
0
CVS: main/DOCS documentation.html,1.308,1.309 encoding.html,1.63,1.64 mplayer.1,1.231,1.232
by Jonas Jermann CVS 10 Sep '02
by Jonas Jermann CVS 10 Sep '02
10 Sep '02
Update of /cvsroot/mplayer/main/DOCS
In directory mail:/var/tmp.root/cvs-serv7633
Modified Files:
documentation.html encoding.html mplayer.1
Log Message:
tga support
Index: documentation.html
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/documentation.html,v
retrieving revision 1.308
retrieving revision 1.309
diff -u -r1.308 -r1.309
--- documentation.html 10 Sep 2002 21:56:05 -0000 1.308
+++ documentation.html 10 Sep 2002 21:59:52 -0000 1.309
@@ -187,7 +187,7 @@
<LI><A HREF="encoding.html#copying">2.4.2.3 Stream copying</A></LI>
<LI><A HREF="encoding.html#fixing">2.4.2.4 Fixing AVIs with broken index</A></LI>
<LI><A HREF="encoding.html#libavcodec">2.4.2.5 Encoding with the libavcodec codec family</A></LI>
- <LI><A HREF="encoding.html#image_files">2.4.2.6 Encoding from multiple input image files (JPEGs or PNGs)</A></LI>
+ <LI><A HREF="encoding.html#image_files">2.4.2.6 Encoding from multiple input image files (JPEGs, PNGs or TGAs)</A></LI>
<LI><A HREF="encoding.html#vobsub">2.4.2.7 Extracting DVD subtitles to Vobsub file</A></LI>
</UL>
</LI>
@@ -253,15 +253,20 @@
<LI><A HREF="#cygwin">6.8 Cygwin</A></LI>
</UL>
</LI>
- <LI><A HREF="#mailing_lists">Appendix A - Mailing lists</A></LI>
- <LI><A HREF="bugreports.html">Appendix B - How to report bugs</A>
+ <LI><A HREF="#authors">Appendix A - Authors</A>
<UL>
- <LI><A HREF="tech/patches.txt">Appendix B2 - How to send patches</A></LI>
+ <LI><A HREF="#maintainers">Appendix A2 - Maintainers</A></LI>
</UL>
</LI>
- <LI><A HREF="#known_bugs">Appendix C - Known bugs</A></LI>
- <LI><A HREF="skin-en.html">Appendix D - MPlayer skin format</A></LI>
- <LI><A HREF="users_against_developers.html">Appendix E - Developer Cries</A>
+ <LI><A HREF="#mailing_lists">Appendix B - Mailing lists</A></LI>
+ <LI><A HREF="bugreports.html">Appendix C - How to report bugs</A>
+ <UL>
+ <LI><A HREF="tech/patches.txt">Appendix C2 - How to send patches</A></LI>
+ </UL>
+ </LI>
+ <LI><A HREF="#known_bugs">Appendix D - Known bugs</A></LI>
+ <LI><A HREF="skin-en.html">Appendix E - MPlayer skin format</A></LI>
+ <LI><A HREF="users_against_developers.html">Appendix F - Developer Cries</A>
<UL>
<LI><A HREF="users_against_developers.html#gcc">GCC 2.96</A></LI>
<LI><A HREF="users_against_developers.html#binary">Binary distribution</A></LI>
@@ -1566,7 +1571,656 @@
-<H1><A NAME="mailing_lists">Appendix A - Mailing lists</A></H1>
+<H1><A NAME="authors">Appendix A - Authors</A></H1>
+
+<BLOCKQUOTE>
+ <B>Important</B><BR>
+ Do <B>not</B> send bug reports, help & feature requests directly to
+ the authors!
+</BLOCKQUOTE>
+
+<P>Read <A HREF="bugreports.html">Appendix C</A> and subscribe to mplayer-users mailing lists.</P>
+
+<H2>The <B>MPlayer</B> project:</H2>
+
+<UL>
+ <LI><B><A HREF="mailto:mplayer-users@mplayerhq.hu">Árpád Gereöffy (A'rpi/ESP-team)</A></B>
+ <UL>
+ <LI>mplayer, mencoder core, A-V sync</LI>
+ <LI>libmpdemux, demultiplexer for mpeg, asf, avi, various fixes in others</LI>
+ <LI>mp3lib, based on mpglib sources [MP3 audio decoder]</LI>
+ <LI>getch2 [keyboard handler]</LI>
+ <LI>some changes in libmpeg2 code (progressive frames, bitrate & fps support)</LI>
+ <LI>libvo improvements: adding OpenGL support, bugfix in mga driver...</LI>
+ <LI>triple buffering & YUY2 support (for DivX/MPEG4) into mga_vid driver</LI>
+ <LI>OSD & SUB display code</LI>
+ <LI>FFmpeg/libavcodec integration</LI>
+ <LI>DivX4Linux (Project Mayo) support (see documentation)</LI>
+ <LI>New DVD-Support using libdvdread</LI>
+ <LI>MPEG PES output & DVB card support</LI>
+ <LI>libmpcodecs design, porting video decoders, filters</LI>
+ </UL>
+ </LI>
+ <LI><B><A HREF="mailto:pontscho@makacs.poliod.hu">Zoltán Ponekker (Pontscho/Fresh!)</A></B>
+ <UL>
+ <LI>the original configure script and Makefiles for easy compile</LI>
+ <LI>GUI system</LI>
+ <LI>3DNow! support into mp3lib and fastmemcpy.h</LI>
+ <LI>various X11 driver changes, fixes (keyboard handling, fullscreen, bpp detect, etc)</LI>
+ <LI>libvo: adding xmga driver</LI>
+ <LI>audio mixer (volume) support</LI>
+ </UL>
+ </LI>
+ <LI><B><A HREF="mailto:lgb@lgb.hu">Gábor Lénárt (LGB)</A></B>
+ <UL>
+ <LI>configure script improvements</LI>
+ <LI>Makefile improvements</LI>
+ <LI>preliminary DVD support (libcss)</LI>
+ <LI>various X11 cleanups and fixes</LI>
+ <LI>HTMLization of documentation</LI>
+ </UL>
+ </LI>
+ <LI><B><A HREF="mailto:gabucino@mplayerhq.hu">Gábor Bérczi (Gabucino)</A></B>
+ <UL>
+ <LI>documentation writer & maintainer</LI>
+ <LI>Hungarian translation of documentation, homepage, and help output</LI>
+ <LI>second homepage design&gfx</LI>
+ <LI>homepage maintainer</LI>
+ <LI>testing, codecs quality & speed comparisons</LI>
+ <LI>IRC channels operator (#MPlayer is user channel)</LI>
+ <LI>experimental MINIX port :) (what's funny about it?)</LI>
+ <LI>MPsub subtitle format design</LI>
+ </UL>
+ </LI>
+ <LI><B><A HREF="mailto:szabi@inf.elte.hu">Szabolcs Berecz (Szabi)</A></B>
+ <UL>
+ <LI>codecs.conf file parser</LI>
+ <LI>config file and command line parser</LI>
+ <LI>mga_vid fixes, module option etc.</LI>
+ <LI>fbdev support in libvo</LI>
+ <LI>type #7 subtitle support</LI>
+ </UL>
+ </LI>
+ <LI><B><A HREF="mailto:lez@sch.bme.hu">László Megyer (Lez, Laaz)</A></B>
+ <UL>
+ <LI>SUB reader</LI>
+ <LI>screensaver+DPMS disable for libvo</LI>
+ </UL>
+ </LI>
+ <LI><B><A HREF="mailto:chass-@freemail.hu">Gyula László (Chass, Tégla)</A></B>
+ <UL>
+ <LI>first fonts (mp_font1.zip)</LI>
+ <LI>third homepage design&gfx</LI>
+ <LI>fourth (current) homepage design&gfx</LI>
+ </UL>
+ </LI>
+ <LI><B><A HREF="mailto:se7en@sch.bme.hu">Zoltán Márk Vicián (Se7en)</A></B>
+ <UL>
+ <LI>SVGAlib support in libvo</LI>
+ </UL>
+ </LI>
+ <LI><B><A HREF="mailto:alex@naxine.org">Alex Beregszaszi (al3x)</A></B>
+ <UL>
+ <LI>ALSA output driver in libao2</LI>
+ <LI>vo_ggi output driver in libvo (www.ggi-project.org)</LI>
+ <LI>XAnim codecs support</LI>
+ <LI>VIVO files, codecs support</LI>
+ <LI>TV grabbing support</LI>
+ <LI>Quicktime hackings</LI>
+ <LI>libavcodec support in MEncoder</LI>
+ <LI>RM file format demuxer</LI>
+ <LI>mencoder framecopy</LI>
+ <LI>yuv4mpeg1 support</LI>
+ <LI>NuppelVideo demuxer changes</LI>
+ <LI>subconfig</LI>
+ <LI>VIDIX and libdha hackings</LI>
+ <LI>Matrox driver port to Vidix</LI>
+ <LI>XVidix video output driver</LI>
+ <LI>and other various stuff (in libvo, libmad syncing, dec_audio/video and loader)</LI>
+ </UL>
+ </LI>
+ <LI><B><A HREF="mailto:asackerm@stud.informatik.uni-erlangen.de">Andreas Ackermann (Acki)</A></B>
+ <UL>
+ <LI>LIRC support (see documentation)</LI>
+ <LI>DGA support in libvo</LI>
+ </UL>
+ </LI>
+ <LI><B><A HREF="mailto:atmosfear@users.sourceforge.net">Felix Bünemann (Atmos)</A></B>
+ <UL>
+ <LI>SDL driver maintainer</LI>
+ <LI>Additional YUV formats fixes</LI>
+ <LI>New font (mp_font2.zip)</LI>
+ <LI>PNG file output support in libvo</LI>
+ <LI>flipping support (for Indeo 3/4, etc)</LI>
+ <LI>SDL audio driver in libao2</LI>
+ <LI>RAW PCM/WAVE file writer for libao2</LI>
+ <LI>Ogg Vorbis audio support</LI>
+ <LI>Various aspect ratio code, prescaling support</LI>
+ <LI>Win32 (Cygwin) port</LI>
+ <LI>DivX5Linux support</LI>
+ <LI>AAC decoding support via libfaad2</LI>
+ <LI>Darwin (MacOS X) port</LI>
+ </UL>
+ </LI>
+ <LI><B><A HREF="mailto:telenieko@telenieko.com">TeLeNiEkO</A></B>
+ <UL>
+ <LI>Spanish translation of documentation (outdated)</LI>
+ </UL>
+ </LI>
+ <LI><B><A HREF="mailto:mgraffam@idsi.net">Michael Graffam</A></B>
+ <UL>
+ <LI>XF86VidMode support to vo_x11 and vo_dga</LI>
+ <LI>Video mode switching code to vo_dga</LI>
+ </UL>
+ </LI>
+ <LI><B><A HREF="mailto:hoffmajs@gmx.de">Jens Hoffmann</A></B>
+ <UL>
+ <LI>Additional YUV formats support</LI>
+ <LI>found the big BITMAPINFOHEADER problem -> solved ASV2 pixelization</LI>
+ </UL>
+ </LI>
+ <LI><B><A HREF="mailto:nickols_k@mail.ru">Nick Kurshev</A></B>
+ <UL>
+ <LI>memcpy optimizations for AMD K7 and Intel Pentium III (fastmemcpy.h)</LI>
+ <LI>CD-ROM tune info</LI>
+ <LI>further 3DNow! optimizations into mp3lib and libac3 and FFmpeg</LI>
+ <LI>Russian translation of documentation (outdated)</LI>
+ <LI>radeon_vid, rage128_vid, radeonfb</LI>
+ <LI>libvo driver: vo_vesa</LI>
+ <LI>VIDIX and libdha design, programming, rage128/radeon vidix drivers</LI>
+ </UL>
+ </LI>
+ <LI><B><A HREF="mailto:german@piraos.com">German Gomez Garcia</A></B>
+ <UL>
+ <LI>SPDIF AC3 output for SBLive!</LI>
+ </UL>
+ </LI>
+ <LI><B><A HREF="mailto:eyck@incubus.ar.lublin.pl">Dariusz Pietrzak (Eyck)</A></B>
+ <UL>
+ <LI>Debian packaging support (see debian/* and this documentation)</LI>
+ <LI>support for vplayer subtitle format</LI>
+ <LI>preliminary support for .RT subtitle format</LI>
+ </UL>
+ </LI>
+ <LI><B><A HREF="mailto:marcus@idonex.se">Marcus Comstedt</A></B>
+ <UL>
+ <LI>initial Solaris8-x86 support</LI>
+ <LI>configure fixes</LI>
+ </UL>
+ </LI>
+ <LI><B><A HREF="mailto:jk@tools.de">Jürgen Keil</A></B>
+ <UL>
+ <LI>patched <B>MPlayer</B> to work on Solaris 8 x86</LI>
+ <LI>various fixes (win32, configure, etc)</LI>
+ <LI>SUN audio driver in libao2</LI>
+ <LI>mediaLib support in libavcodec</LI>
+ </UL>
+ </LI>
+ <LI><B><A HREF="mailto:vkushnir@Alfacom.net">Vladimir Kushnir</A></B>
+ <UL>
+ <LI>patched <B>MPlayer</B> to work on FreeBSD x86</LI>
+ </UL>
+ </LI>
+ <LI><B><A HREF="mailto:bertrand_baudet@yahoo.com">Bertrand Baudet</A></B>
+ <UL>
+ <LI>network streaming support author, maintainer</LI>
+ <LI>CDDB support</LI>
+ </UL>
+ </LI>
+ <LI><B><A HREF="mailto:djw@flinthills.com">Derek J Witt</A></B>
+ <UL>
+ <LI>MMS network streaming patches</LI>
+ </UL>
+ </LI>
+ <LI><B><A HREF="mailto:albeu@free.fr">Alban Bedel</A></B>
+ <UL>
+ <LI>MMS network streaming patches</LI>
+ <LI>Playtree and per-entry config</LI>
+ <LI>Playlist parsers</LI>
+ <LI>New input layer, slave mode improvements</LI>
+ <LI>Audio only support</LI>
+ <LI>MP3, WAV and Ogg demuxers, Ogg-in-AVI fixes</LI>
+ <LI>Support for audio from external file</LI>
+ <LI>DXR2 driver</LI>
+ <LI>vo_aa improvements</LI>
+ <LI>CDDA support</LI>
+ </UL>
+ </LI>
+ <LI><B><A HREF="mailto:zybi@fanthom.irc.pl">Artur Zaprzala</A></B>
+ <UL>
+ <LI>Complete font generator prog + OSD font (TOOLS/subfont-c)</LI>
+ </UL>
+ </LI>
+ <LI><B><A HREF="mailto:lanzz@lanzz.org">lanzz(a)lanzz.org</A></B>
+ <UL>
+ <LI>GIMP font generator plugin (TOOLS/subfont-gimp)</LI>
+ </UL>
+ </LI>
+ <LI><B><A HREF="mailto:atlka@pg.gda.pl">Adam Tla/lka</A></B>
+ <UL>
+ <LI>osd/sub review, fixes, optimization, utf8 support</LI>
+ <LI>various fixes</LI>
+ </UL>
+ </LI>
+ <LI><B><A HREF="mailto:folke@ashberg.de">Folke Ashberg</A></B>
+ <UL>
+ <LI>native AAlib driver (-vo aa)</LI>
+ </UL>
+ </LI>
+ <LI><B><A HREF="mailto:iive@yahoo.com">Ivan Kalvatchev</A></B>
+ <UL>
+ <LI>interlaced MPEG2 support (libmpeg2)</LI>
+ <LI>libvo2 draft</LI>
+ <LI>configfile parser fixes</LI>
+ </UL>
+ </LI>
+ <LI><B><A HREF="mailto:p_l@gmx.fr">pl</A></B>
+ <UL>
+ <LI>new configure script</LI>
+ <LI>general code maintaining, fixes, patch committing</LI>
+ </UL>
+ </LI>
+ <LI><B><A HREF="mailto:michaelni@gmx.at">Michael Niedermayer</A></B>
+ <UL>
+ <LI>new, GPL postprocessing code (with deinterlacing etc...)</LI>
+ <LI>software scaling with MMX/MMX2/3DNow support (swscale.c)</LI>
+ <LI>various rgb/yuv bpp converters</LI>
+ <LI>new, better IDCT code for libavcodec, speedup of divx decoders</LI>
+ <LI>runtime CPU detection</LI>
+ <LI>SSE optimization of liba52</LI>
+ <LI>various encoder/decoder fixes, improvements in libavcodec, DR support</LI>
+ </UL>
+ </LI>
+ <LI><B><A HREF="mailto:sgoethel@jausoft.com">Sven Goethel</A></B>
+ <UL>
+ <LI>libvo driver: vo_gl2</LI>
+ </UL>
+ </LI>
+ <LI><B><A HREF="mailto:joy@pingfm.org">joy_ping</A></B>
+ <UL>
+ <LI>ao_alsa9 fixes, AC3 passthrough support</LI>
+ </UL>
+ </LI>
+ <LI><B><A HREF="mailto:eanholt@gladstone.uoregon.edu">Eric Anholt</A></B>
+ <UL>
+ <LI>CPU detection code</LI>
+ </UL>
+ </LI>
+ <LI><B><A HREF="mailto:Jiri.Svoboda@seznam.cz">Jiri Svoboda</A></B>
+ <UL>
+ <LI>AQT type subtitles support</LI>
+ <LI>CRTC2 YUV support in mga_vid</LI>
+ <LI>DirectFB video output driver</LI>
+ </UL>
+ </LI>
+ <LI><B><A HREF="mailto:oliver.schoenbrunner@jku.at">Oliver Schoenbrunner</A></B>
+ <UL>
+ <LI>SGI audio driver</LI>
+ <LI>MIPS support</LI>
+ </UL>
+ </LI>
+ <LI><B><A HREF="mailto:jeroen.dobbelaere@acunia.com">Jeroen Dobbelaere</A></B>
+ <UL>
+ <LI>the original <A HREF="http://mad.sourceforge.net">libmad</A> support</LI>
+ </UL>
+ </LI>
+ <LI><B><A HREF="mailto:dholm@telia.com">David Holm</A></B>
+ <UL>
+ <LI>DXR3 support</LI>
+ </UL>
+ </LI>
+ <LI><B><A HREF="mailto:takis@lumumba.luc.ac.be">Panagiotis Issaris</A></B>
+ <UL>
+ <LI>-playlist option</LI>
+ <LI>NuppelVideo support</LI>
+ </UL>
+ </LI>
+ <LI><B><A HREF="mailto:melanson@pcisys.net">Mike Melanson</A></B>
+ <UL>
+ <LI>MS Video1 codec open-source implementation</LI>
+ <LI>FLI demuxer, decoder</LI>
+ <LI>Unified ADPCM Decoder (supports IMA/DVI, MS ADPCM, several others)</LI>
+ <LI>FILM (.cpk) file demuxer</LI>
+ <LI>RoQ file demuxer, Audio/Video decoder</LI>
+ <LI>QT SMC decoder</LI>
+ <LI>QT RLE decoder</LI>
+ <LI>MS RLE decoder re-implementation</LI>
+ </UL>
+ </LI>
+ <LI><B><A HREF="mailto:ranma@gmx.at">Tobias Diedrich</A></B>
+ <UL>
+ <LI>NAS audio output driver</LI>
+ <LI>DXR2 driver</LI>
+ </UL>
+ </LI>
+ <LI><B><A HREF="mailto:foth@informatik.uni-hamburg.de">Kilian A. Foth</A></B>
+ <UL>
+ <LI>-slave mode</LI>
+ </UL>
+ </LI>
+ <LI><B><A HREF="mailto:timf@mail.csse.monash.edu.au">Tim Ferguson</A></B>
+ <UL>
+ <LI>Open source Cinepak decoder</LI>
+ <LI>Open source CYUV decoder</LI>
+ </UL>
+ </LI>
+ <LI><B><A HREF="mailto:itrs@softwell.com.tw">Sam Lin</A></B>
+ <UL>
+ <LI>-wid (plugger) patch</LI>
+ </UL>
+ </LI>
+ <LI><B><A HREF="mailto:johannes.feigl@aon.at">Johannes Feigl</A></B>
+ <UL>
+ <LI>original German docs translation</LI>
+ <LI>some improvements in configure, small patches</LI>
+ <LI>found somebody (Thilo Wunderlich) who sent a DVB card</LI>
+ <LI>msg translations (help_mp-XX.h) maintainer</LI>
+ </UL>
+ </LI>
+ <LI><B><A HREF="mailto:kmkaplan@selfoffice.com">Kim Minh Kaplan</A></B>
+ <UL>
+ <LI>DVD and VobSub subtitles display support</LI>
+ <LI>DVD subtitles rip to VobSub</LI>
+ </UL>
+ </LI>
+ <LI><B><A HREF="mailto:bkuschak@yahoo.com">Brian Kuschak</A></B>
+ <UL>
+ <LI>RTP streaming support (reading)</LI>
+ </UL>
+ </LI>
+ <LI><B><A HREF="mailto:steve@daviesfam.org">Stephen Davies</A></B>
+ <UL>
+ <LI>support for large video files (>2^32 bytes in size)</LI>
+ <LI>surround sound</LI>
+ </UL>
+ </LI>
+ <LI><B><A HREF="mailto:rsnel@cube.dyndns.org">Rik Snel</A></B>
+ <UL>
+ <LI><CODE>zr</CODE> video output driver</LI>
+ </UL>
+ </LI>
+ <LI><B><A HREF="mailto:ajh@atri.curtin.edu.au">Anders Johansson</A></B>
+ <UL>
+ <LI>audio plugin system, some effect plugins</LI>
+ </UL>
+ </LI>
+ <LI><B><A HREF="mailto:rtogni@freemail.it">Roberto Togni</A></B>
+ <UL>
+ <LI>Open source QT RPZA decoder</LI>
+ <LI>Open source HuffYUV decoder</LI>
+ <LI>Open source MSZH/ZLIB decoder</LI>
+ </UL>
+ </LI>
+ <LI><B><A HREF="mailto:wojtekka@bydg.pdi.net">Wojtek Kaniewski</A></B>
+ <UL>
+ <LI>Mouse wheel support</LI>
+ </UL>
+ </LI>
+ <LI><B><A HREF="mailto:freku045@student.liu.se">Fredrik Kuivinen</A></B>
+ <UL>
+ <LI>OSD/subtitles outside movie - for SDL</LI>
+ <LI>video filter layer draft, first implementation</LI>
+ <LI>virtualdub filter support (not yet finised/commited)</LI>
+ </UL>
+ </LI>
+ <LI><B><A HREF="mailto:flo-mplayer-dev@gmx.net">Florian Schneider</A></B>
+ <UL>
+ <LI>RealVideo codec libraries interface, .rm demuxer fixes</LI>
+ </UL>
+ </LI>
+ <LI><B><A HREF="mailto:makovick@KMLinux.fjfi.cvut.cz">Jindrich Makovicka</A></B>
+ <UL>
+ <LI>various bugfixes</LI>
+ <LI>rewrote v4l video capturing, implemented audio capturing layer</LI>
+ <LI>freetype2 font rendering support</LI>
+ </UL>
+ </LI>
+ <LI><B><A HREF="mailto:dalias@aerifal.cx">D Richard Felker III</A></B>
+ <UL>
+ <LI>various bugfixes</LI>
+ <LI>soft eq and halfpack video filters</LI>
+ </UL>
+ </LI>
+ <LI><B><A HREF="mailto:dominik@rangers.eu.org">Dominik Mierzejewski</A></B>
+ <UL>
+ <LI>compiler warning fixes</LI>
+ <LI>official RPM packages</LI>
+ </UL>
+ </LI>
+</UL>
+
+<H2>Main testers:</H2>
+
+<UL>
+ <LI>Tibor Balázs (Tibcu)
+ <LI>Péter Sasi (SaPe)
+ <LI>Christoph H. Lampert
+ <LI>Attila Kinali
+ <LI>Dirk Vornheder
+ <LI>Bohdan Horst (Nexus)
+</UL>
+
+<H2>The codecs, libs:</H2>
+
+<UL>
+ <LI>Aaron Holtzman: <aholtzma(a)engr.uvic.ca>
+ <UL>
+ <LI>ac3dec (and libac3) author [old AC3 audio decoder]</LI>
+ <LI>the original mga_vid driver [Matrox G200/G400 YUV Back-end Scaler]</LI>
+ <LI>mpeg2dec [Fast MPEG1/MPEG2 video decoder, currently used in player]</LI>
+ </UL>
+ </LI>
+ <LI>Michel Lespinasse: <walken(a)zoy.org>
+ <UL>
+ <LI>did large libmpeg2 changes for better speed and mpeg conformance</LI>
+ <LI>liba52 author [current AC3 audio decoder]</LI>
+ </UL>
+ </LI>
+ <LI>Eugene Kuznetsov: <divx(a)euro.ru>
+ <UL>
+ <LI>avifile author [AVI player library for linux, using Win32 VfW/ACM codecs]</LI>
+ <LI>technical help about AVI and ASF formats, and how to get YUV using VfW...</LI>
+ <LI>divx4linux technical support</LI>
+ </UL>
+ </LI>
+ <LI>Zdenek Kabelac: <kabi(a)informatics.muni.cz>
+ <UL>
+ <LI>current avifile maintainer</LI>
+ <LI>some technical help about the win32 stuff, .asf formats and timers</LI>
+ </UL>
+ </LI>
+ <LI>Gerard Lantau: <glantau(a)yahoo.fr>
+ <UL>
+ <LI>FFmpeg/libavcodec author,maintainer (open source mpeg, mjpeg, divx en/decoder)</LI>
+ </UL>
+ </LI>
+ <LI>Project Mayo: <<A HREF="http://www.projectmayo.com">http://www.projectmayo.com</A>>
+ <UL>
+ <LI>the OpenDivX codec authors</LI>
+ </UL>
+ </LI>
+ <LI>Michael Hipp:
+ <UL>
+ <LI>mpglib author [isn't used directly but some parts in mp3lib]</LI>
+ </UL>
+ </LI>
+ <LI>Mark Podlipec:
+ <UL>
+ <LI>xa_gsm.c author [MS-GSM audio codec]
+ [from a GSM library by Jutta Degener and Carsten Bormann]</LI>
+ </UL>
+ </LI>
+ <LI>Jake Janovetz:
+ <UL>
+ <LI>remez.c author [Used to calculate audio filter coefficients]</LI>
+ </UL>
+ </LI>
+ <LI>Vivien Chappelier, Damien Vincent:
+ <UL>
+ <LI>libFAME authors [fast mpeg-1 encoder, used by -vo mpegpes/-vo dxr3]</LI>
+ </UL>
+ </LI>
+</UL>
+
+<P>Their code is not used in current player version, but I've got some ideas or
+ other technical help from:</P>
+
+<UL>
+ <LI>Avery Lee <phaeron(a)virtualdub.org>
+ <UL>
+ <LI>VirtualDub author, help understanding AVI with VBR audio and other AVI issues</LI>
+ </UL>
+ </LI>
+ <LI>John F. McGowan http://www.jmcgowan.com/
+ <UL>
+ <LI>AVI FAQ author/collector. [site with many useful docs on codecs and avi format]</LI>
+ </UL>
+ </LI>
+ <LI>Dirk Farin: <farin(a)ti.uni-mannheim.de>
+ <UL>
+ <LI>dvdview author [MPEG1/MPEG2 video decoder, used in v0.5-v0.8]</LI>
+ </UL>
+ </LI>
+ <LI>Adam Williams: <broadcast(a)earthling.net>
+ <UL>
+ <LI>libmpeg3 (and xmovie) author [MPEG1/MPEG2 video decoder, used in v0.1-v0.4]</LI>
+ </UL>
+ </LI>
+</UL>
+
+
+
+<H1><A NAME="maintainers">Appendix A2 - MPlayer code and documentation maintainers</A></H1>
+
+<H2>Homepage</H2>
+<UL>
+ <LI><B>Design:</B> Chass and Tornado</LI>
+ <LI><B>Contents:</B> Gabucino</LI>
+</UL>
+
+<H2>English documentation</H2>
+<UL>
+ <LI><B>user docs:</B> Gabucino</LI>
+ <LI><B>review, grammar fixes:</B> Diego Biurrun, Nilmoni Deb, Andras Mohari</LI>
+ <LI><B>input layer, lirc, slave mode docs:</B> Albeu</LI>
+ <LI><B>man page:</B> <A HREF="mailto:jjermann@gmx.net">Jonas Jermann</A></LI>
+ <LI><B>tech/* docs:</B> A'rpi</LI>
+</UL>
+
+<H2>Documentation translations</H2>
+<UL>
+ <LI><B>Hungarian:</B> Gabucino</LI>
+ <LI><B>German:</B> <A HREF="mailto:jjermann@gmx.net">Jonas Jermann</A></LI>
+ <LI><B>French:</B> <A HREF="mailto:smarteau@eso.org">Stephane Marteau</A> (outdated)</LI>
+ <LI><B>Spanish:</B> TeLeNiEkO (outdated)</LI>
+ <LI><B>Russian:</B> Nick Kurshev (outdated)</LI>
+ <LI><B>Polish:</B> <A HREF="mailto:nell@skrzynka.pl">Justyna Biala</A></LI>
+ <LI><B>Italian:</B> Matteo Balduzzi</LI>
+</UL>
+
+<H2>Platforms/ports</H2>
+<UL>
+ <LI><B>DEBIAN packaging:</B> Dariusz Pietrzak</LI>
+ <LI><B>RedHat/RPM packaging:</B> Dominik Mierzejewski</LI>
+ <LI><B>FreeBSD support:</B> Vladimir Kushnir, Nexus</LI>
+ <LI><B>BSD/OS support:</B> Steven Schultz</LI>
+ <LI><B>NetBSD support:</B> Bernd Ernesti</LI>
+ <LI><B>OpenBSD support:</B> Bjorn Sandell</LI>
+ <LI><B>Solaris 8 support:</B> Jürgen Keil, pl</LI>
+ <LI><B>MIPS support:</B> Oliver Schoenbrunner</LI>
+ <LI><B>Win32/Cygwin support:</B> Atmosfear</LI>
+</UL>
+
+<H2>MPlayer code:</H2>
+<UL>
+ <LI><B>A-V sync code:</B> A'rpi</LI>
+ <LI><B>libmpdemux, libmpcodecs:</B> A'rpi</LI>
+ <LI><B>TV input:</B> Alex, Jindrich Makovicka</LI>
+ <LI><B>DVD support (experimental - dvdnav):</B> -</LI>
+ <LI><B>DVD support (new - dvdread/dvdcss):</B> A'rpi</LI>
+ <LI><B>DVD support (old - libcss):</B> LGB</LI>
+ <LI><B>network streaming:</B> Bertrand Baudet</LI>
+ <LI><B>DVD/VOB subtitles:</B> Kim Minh Kaplan</LI>
+ <LI><B>config files & commandline parser:</B> Albeu, Szabi</LI>
+ <LI><B>playtree, input layer:</B> Albeu</LI>
+ <LI><B>postproc, colorspace converters:</B> Michael Niedermayer</LI>
+ <LI><B>libavcodec:</B> Michael Niedermayer, Fabrice Bellard @ ffmpeg</LI>
+ <LI><B>VIDIX core, libdha, drivers:</B> Alex, Nick Kurshev @ mplayerxp</LI>
+</UL>
+
+<H2>libvo drivers:</H2>
+<UL>
+ <LI><B>vo_3dfx.c</B> - OBSOLETED, use xv or tdfxfb</LI>
+ <LI><B>vo_aa.c</B> - Folke Ashberg</LI>
+ <LI><B>vo_dga.c</B> - Acki (outdated)</LI>
+ <LI><B>vo_directfb[2].c</B> - <A HREF="mailto:Jiri.Svoboda@seznam.cz">Jiri Svoboda</A></LI>
+ <LI><B>vo_dxr2.c</B> - Albeu</LI>
+ <LI><B>vo_dxr3.c</B> - David Holm</LI>
+ <LI><B>vo_fbdev.c</B> - Szabi</LI>
+ <LI><B>vo_ggi.c</B> - Alex</LI>
+ <LI><B>vo_gif89a.c</B> - Joey Parrish</LI>
+ <LI><B>vo_gl.c</B> - A'rpi (outdated)</LI>
+ <LI><B>vo_gl2.c</B> - <A HREF="mailto:sgoethel@jausoft.com">Sven Goethel</A></LI>
+ <LI><B>vo_jpeg.c</B> - Pontscho</LI>
+ <LI><B>vo_md5.c</B> - A'rpi</LI>
+ <LI><B>vo_mga.c</B> - A'rpi</LI>
+ <LI><B>vo_mpegpes.c</B> - A'rpi</LI>
+ <LI><B>vo_null.c</B> - A'rpi</LI>
+ <LI><B>vo_pgm.c</B> - A'rpi</LI>
+ <LI><B>vo_png.c</B> - Atmos</LI>
+ <LI><B>vo_sdl.c</B> - Atmos</LI>
+ <LI><B>vo_svga.c</B> - Matan Ziv-Av</LI>
+ <LI><B>vo_tdfxfb.c</B> - Mark Zealey (mark(a)zealos.org)</LI>
+ <LI><B>vo_vesa.c</B> - ? (Nick Kurshev)</LI>
+ <LI><B>vo_x11.c</B> - Pontscho</LI>
+ <LI><B>vo_xmga.c</B> - Pontscho, A'rpi</LI>
+ <LI><B>vo_xv.c</B> - Pontscho</LI>
+ <LI><B>vo_xvidix.c</B> - Pontscho, Alex</LI>
+ <LI><B>vo_yuv4mpeg.c</B> - ?</LI>
+ <LI><B>vo_zr.c</B> - <A HREF="mailto:rsnel@cube.dyndns.org">Rik Snel</A></LI>
+</UL>
+
+<H2>VIDIX drivers:</H2>
+<UL>
+ <LI><B>genfb_vid</B> - al3x</LI>
+ <LI><B>mach64_vid</B> - Michael Niedermayer, A'rpi</LI>
+ <LI><B>mga_vid</B> - al3x ?</LI>
+ <LI><B>nvidia_vid</B> - al3x (development stopped - don't expect it)</LI>
+ <LI><B>radeon_vid</B> - al3x, Nick Kurshev @ mplayerxp</LI>
+ <LI><B>rage128_vid</B> - ? , Nick Kurshev @ mplayerxp</LI>
+</UL>
+
+<H2>libao2 drivers:</H2>
+<UL>
+ <LI><B>ao_alsa5.c</B> - al3x</LI>
+ <LI><B>ao_alsa9.c</B> - <A HREF="mailto:joy@pingfm.org">joy_ping</A></LI>
+ <LI><B>ao_arts.c</B> - ?</LI>
+ <LI><B>ao_dxr2.c</B> - Albeu</LI>
+ <LI><B>ao_mpegpes.c</B> - A'rpi</LI>
+ <LI><B>ao_nas.c</B> - ?</LI>
+ <LI><B>ao_null.c</B> - A'rpi</LI>
+ <LI><B>ao_oss.c</B> - A'rpi</LI>
+ <LI><B>ao_pcm.c</B> - Atmos</LI>
+ <LI><B>ao_plugin.c</B> - Anders Johansson</LI>
+ <LI><B>ao_sdl.c</B> - Atmos</LI>
+ <LI><B>ao_sgi.c</B> - <A HREF="oliver.schoenbrunner(a)jku.at">Oliver Schoenbrunner</A></LI>
+ <LI><B>ao_sun.c</B> - Jürgen Keil</LI>
+</UL>
+
+<H2>TOOLS:</H2>
+<UL>
+ <LI><B>subfont-c</B> - Artur Zaprzala (zybi(a)fanthom.irc.pl)</LI>
+ <LI><B>subfont-GIMP</B> - lanzz(a)lanzz.org</LI>
+ <LI><B>*.pl</B> - Atmos</LI>
+ <LI><B>x2mpsub</B> - Gabucino</LI>
+ <LI><B>mencvcd</B> - Juergen Hammelmann (juergen.hammelmann(a)gmx.de)</LI>
+ <LI><B>subrip</B> - Kim Minh Kaplan</LI>
+ <LI><B>others</B> - A'rpi</LI>
+</UL>
+
+
+
+<H1><A NAME="mailing_lists">Appendix B - Mailing lists</A></H1>
<P>There are some public mailing lists on <B>MPlayer</B>. Subscribing can be
achieved on the following addresses:</P>
@@ -1582,7 +2236,7 @@
<A HREF="http://mplayerhq.hu/mailman/listinfo/mplayer-users">http://mplayerhq.hu/mailman/listinfo/mplayer-users</A>
<UL>
<LI>Send bug reports here (after reading the <A HREF="#known_bugs">Known Bugs</A>
- section, and <A HREF="bugreports.html">bug reporting section</A>).</LI>
+ section, and <A HREF="bugreports.html">Appendix C</A>).</LI>
<LI>Send feature requests here (after reading the WHOLE documentation).</LI>
<LI>Send user questions here (after reading the WHOLE documentation).</LI>
</UL>
@@ -1626,11 +2280,11 @@
-<H1><A NAME="bug_reports">Appendix B</A> - <A HREF="bugreports.html">How to report bugs</A></H1>
+<H1><A NAME="bug_reports">Appendix C</A> - <A HREF="bugreports.html">How to report bugs</A></H1>
-<H1><A NAME="known_bugs">Appendix C - Known bugs</A></H1>
+<H1><A NAME="known_bugs">Appendix D - Known bugs</A></H1>
<P>Special system/CPU-specific bugs/problems:</P>
<UL>
@@ -1727,15 +2381,6 @@
<P>Green image using mga_vid (-vo mga / -vo xmga):<BR>
- mga_vid misdetected your card's RAM amount, reload it using mga_ram_size option</P>
-
-
-
-<H1><A NAME="skin">Appendix D</A> - <A HREF="skin-en.html">MPlayer skin format</A></H1>
-
-
-
-<H1><A NAME="flame_wars">Appendix E</A> - <A HREF="users_against_developers.html">Developer Cries</A></H1>
-
</BODY>
</HTML>
Index: encoding.html
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/encoding.html,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- encoding.html 27 Aug 2002 18:06:07 -0000 1.63
+++ encoding.html 10 Sep 2002 21:59:52 -0000 1.64
@@ -252,11 +252,11 @@
-lavcopts vcodec=mjpeg</CODE></P>
-<H4><A NAME="image_files">2.4.2.6 Encoding from multiple input image files (JPEGs or PNGs)</A></H4>
+<H4><A NAME="image_files">2.4.2.6 Encoding from multiple input image files (JPEGs, PNGs or TGAs)</A></H4>
-<P><B>MEncoder</B> is capable of creating movies from one or more JPEG or PNG
- files. With simple framecopy it can create MJPEG (Motion JPEG) or MPNG
- (Motion PNG) files.</P>
+<P><B>MEncoder</B> is capable of creating movies from one or more JPEG, PNG or TGA
+ files. With simple framecopy it can create MJPEG (Motion JPEG), MPNG
+ (Motion PNG) or MTGA (Motion TGA) files.</P>
Explanation of the process:
@@ -293,6 +293,10 @@
<P><I>Creating a Motion PNG (MPNG) file from all the PNG files in the current dir:</I><BR>
<CODE>mencoder \*.png -mf on:w=800:h=600:fps=25:type=png -ovc copy
+ -o output.avi</CODE></P>
+
+<P><I>Creating a Motion TGA (MTGA) file from all the TGA files in the current dir:</I><BR>
+ <CODE>mencoder \*.tga -mf on:w=800:h=600:fps=25:type=tga -ovc copy
-o output.avi</CODE></P>
Index: mplayer.1
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/mplayer.1,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -r1.231 -r1.232
--- mplayer.1 5 Sep 2002 23:25:00 -0000 1.231
+++ mplayer.1 10 Sep 2002 21:59:52 -0000 1.232
@@ -432,7 +432,7 @@
.IPs fps=<value>
fps of the output (default: 25)
.IPs type=<value>
-type of input files (available types: jpeg, png)
+type of input files (available types: jpeg, png, tga)
.RE
.PD 1
.
3
2
CVS: main/DOCS bugreports.html,1.38,1.39 users_against_developers.html,1.32,1.33 documentation.html,1.307,1.308
by Diego Biurrun CVS 10 Sep '02
by Diego Biurrun CVS 10 Sep '02
10 Sep '02
Update of /cvsroot/mplayer/main/DOCS
In directory mail:/var/tmp.root/cvs-serv4880
Modified Files:
bugreports.html users_against_developers.html
documentation.html
Log Message:
Removed authors and maintainers section, now in txt format.
Index: bugreports.html
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/bugreports.html,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- bugreports.html 27 Aug 2002 22:28:03 -0000 1.38
+++ bugreports.html 10 Sep 2002 21:56:05 -0000 1.39
@@ -10,7 +10,7 @@
<BODY>
-<H1><A NAME=C>Appendix C - How to report bugs</A></H1>
+<H1><A NAME="B">Appendix B - How to report bugs</A></H1>
<P>Good bug reports are a very valuable contribution to the development of any
software project. But just like writing good software, good problem reports
Index: users_against_developers.html
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/users_against_developers.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- users_against_developers.html 27 Aug 2002 18:06:07 -0000 1.32
+++ users_against_developers.html 10 Sep 2002 21:56:05 -0000 1.33
@@ -10,7 +10,7 @@
<BODY>
-<H1>Appendix F - Developer Cries</H1>
+<H1>Appendix E - Developer Cries</H1>
<P>There are two major topics which always cause huge dispute and flame on the
<A HREF="http://mplayerhq.hu/pipermail/mplayer-users/">mplayer-users</A>
Index: documentation.html
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/documentation.html,v
retrieving revision 1.307
retrieving revision 1.308
diff -u -r1.307 -r1.308
--- documentation.html 10 Sep 2002 21:36:28 -0000 1.307
+++ documentation.html 10 Sep 2002 21:56:05 -0000 1.308
@@ -253,20 +253,15 @@
<LI><A HREF="#cygwin">6.8 Cygwin</A></LI>
</UL>
</LI>
- <LI><A HREF="#authors">Appendix A - Authors</A>
+ <LI><A HREF="#mailing_lists">Appendix A - Mailing lists</A></LI>
+ <LI><A HREF="bugreports.html">Appendix B - How to report bugs</A>
<UL>
- <LI><A HREF="#maintainers">Appendix A2 - Maintainers</A></LI>
+ <LI><A HREF="tech/patches.txt">Appendix B2 - How to send patches</A></LI>
</UL>
</LI>
- <LI><A HREF="#mailing_lists">Appendix B - Mailing lists</A></LI>
- <LI><A HREF="bugreports.html">Appendix C - How to report bugs</A>
- <UL>
- <LI><A HREF="tech/patches.txt">Appendix C2 - How to send patches</A></LI>
- </UL>
- </LI>
- <LI><A HREF="#known_bugs">Appendix D - Known bugs</A></LI>
- <LI><A HREF="skin-en.html">Appendix E - MPlayer skin format</A></LI>
- <LI><A HREF="users_against_developers.html">Appendix F - Developer Cries</A>
+ <LI><A HREF="#known_bugs">Appendix C - Known bugs</A></LI>
+ <LI><A HREF="skin-en.html">Appendix D - MPlayer skin format</A></LI>
+ <LI><A HREF="users_against_developers.html">Appendix E - Developer Cries</A>
<UL>
<LI><A HREF="users_against_developers.html#gcc">GCC 2.96</A></LI>
<LI><A HREF="users_against_developers.html#binary">Binary distribution</A></LI>
@@ -1571,656 +1566,7 @@
-<H1><A NAME="authors">Appendix A - Authors</A></H1>
-
-<BLOCKQUOTE>
- <B>Important</B><BR>
- Do <B>not</B> send bug reports, help & feature requests directly to
- the authors!
-</BLOCKQUOTE>
-
-<P>Read <A HREF="bugreports.html">Appendix C</A> and subscribe to mplayer-users mailing lists.</P>
-
-<H2>The <B>MPlayer</B> project:</H2>
-
-<UL>
- <LI><B><A HREF="mailto:mplayer-users@mplayerhq.hu">Árpád Gereöffy (A'rpi/ESP-team)</A></B>
- <UL>
- <LI>mplayer, mencoder core, A-V sync</LI>
- <LI>libmpdemux, demultiplexer for mpeg, asf, avi, various fixes in others</LI>
- <LI>mp3lib, based on mpglib sources [MP3 audio decoder]</LI>
- <LI>getch2 [keyboard handler]</LI>
- <LI>some changes in libmpeg2 code (progressive frames, bitrate & fps support)</LI>
- <LI>libvo improvements: adding OpenGL support, bugfix in mga driver...</LI>
- <LI>triple buffering & YUY2 support (for DivX/MPEG4) into mga_vid driver</LI>
- <LI>OSD & SUB display code</LI>
- <LI>FFmpeg/libavcodec integration</LI>
- <LI>DivX4Linux (Project Mayo) support (see documentation)</LI>
- <LI>New DVD-Support using libdvdread</LI>
- <LI>MPEG PES output & DVB card support</LI>
- <LI>libmpcodecs design, porting video decoders, filters</LI>
- </UL>
- </LI>
- <LI><B><A HREF="mailto:pontscho@makacs.poliod.hu">Zoltán Ponekker (Pontscho/Fresh!)</A></B>
- <UL>
- <LI>the original configure script and Makefiles for easy compile</LI>
- <LI>GUI system</LI>
- <LI>3DNow! support into mp3lib and fastmemcpy.h</LI>
- <LI>various X11 driver changes, fixes (keyboard handling, fullscreen, bpp detect, etc)</LI>
- <LI>libvo: adding xmga driver</LI>
- <LI>audio mixer (volume) support</LI>
- </UL>
- </LI>
- <LI><B><A HREF="mailto:lgb@lgb.hu">Gábor Lénárt (LGB)</A></B>
- <UL>
- <LI>configure script improvements</LI>
- <LI>Makefile improvements</LI>
- <LI>preliminary DVD support (libcss)</LI>
- <LI>various X11 cleanups and fixes</LI>
- <LI>HTMLization of documentation</LI>
- </UL>
- </LI>
- <LI><B><A HREF="mailto:gabucino@mplayerhq.hu">Gábor Bérczi (Gabucino)</A></B>
- <UL>
- <LI>documentation writer & maintainer</LI>
- <LI>Hungarian translation of documentation, homepage, and help output</LI>
- <LI>second homepage design&gfx</LI>
- <LI>homepage maintainer</LI>
- <LI>testing, codecs quality & speed comparisons</LI>
- <LI>IRC channels operator (#MPlayer is user channel)</LI>
- <LI>experimental MINIX port :) (what's funny about it?)</LI>
- <LI>MPsub subtitle format design</LI>
- </UL>
- </LI>
- <LI><B><A HREF="mailto:szabi@inf.elte.hu">Szabolcs Berecz (Szabi)</A></B>
- <UL>
- <LI>codecs.conf file parser</LI>
- <LI>config file and command line parser</LI>
- <LI>mga_vid fixes, module option etc.</LI>
- <LI>fbdev support in libvo</LI>
- <LI>type #7 subtitle support</LI>
- </UL>
- </LI>
- <LI><B><A HREF="mailto:lez@sch.bme.hu">László Megyer (Lez, Laaz)</A></B>
- <UL>
- <LI>SUB reader</LI>
- <LI>screensaver+DPMS disable for libvo</LI>
- </UL>
- </LI>
- <LI><B><A HREF="mailto:chass-@freemail.hu">Gyula László (Chass, Tégla)</A></B>
- <UL>
- <LI>first fonts (mp_font1.zip)</LI>
- <LI>third homepage design&gfx</LI>
- <LI>fourth (current) homepage design&gfx</LI>
- </UL>
- </LI>
- <LI><B><A HREF="mailto:se7en@sch.bme.hu">Zoltán Márk Vicián (Se7en)</A></B>
- <UL>
- <LI>SVGAlib support in libvo</LI>
- </UL>
- </LI>
- <LI><B><A HREF="mailto:alex@naxine.org">Alex Beregszaszi (al3x)</A></B>
- <UL>
- <LI>ALSA output driver in libao2</LI>
- <LI>vo_ggi output driver in libvo (www.ggi-project.org)</LI>
- <LI>XAnim codecs support</LI>
- <LI>VIVO files, codecs support</LI>
- <LI>TV grabbing support</LI>
- <LI>Quicktime hackings</LI>
- <LI>libavcodec support in MEncoder</LI>
- <LI>RM file format demuxer</LI>
- <LI>mencoder framecopy</LI>
- <LI>yuv4mpeg1 support</LI>
- <LI>NuppelVideo demuxer changes</LI>
- <LI>subconfig</LI>
- <LI>VIDIX and libdha hackings</LI>
- <LI>Matrox driver port to Vidix</LI>
- <LI>XVidix video output driver</LI>
- <LI>and other various stuff (in libvo, libmad syncing, dec_audio/video and loader)</LI>
- </UL>
- </LI>
- <LI><B><A HREF="mailto:asackerm@stud.informatik.uni-erlangen.de">Andreas Ackermann (Acki)</A></B>
- <UL>
- <LI>LIRC support (see documentation)</LI>
- <LI>DGA support in libvo</LI>
- </UL>
- </LI>
- <LI><B><A HREF="mailto:atmosfear@users.sourceforge.net">Felix Bünemann (Atmos)</A></B>
- <UL>
- <LI>SDL driver maintainer</LI>
- <LI>Additional YUV formats fixes</LI>
- <LI>New font (mp_font2.zip)</LI>
- <LI>PNG file output support in libvo</LI>
- <LI>flipping support (for Indeo 3/4, etc)</LI>
- <LI>SDL audio driver in libao2</LI>
- <LI>RAW PCM/WAVE file writer for libao2</LI>
- <LI>Ogg Vorbis audio support</LI>
- <LI>Various aspect ratio code, prescaling support</LI>
- <LI>Win32 (Cygwin) port</LI>
- <LI>DivX5Linux support</LI>
- <LI>AAC decoding support via libfaad2</LI>
- <LI>Darwin (MacOS X) port</LI>
- </UL>
- </LI>
- <LI><B><A HREF="mailto:telenieko@telenieko.com">TeLeNiEkO</A></B>
- <UL>
- <LI>Spanish translation of documentation (outdated)</LI>
- </UL>
- </LI>
- <LI><B><A HREF="mailto:mgraffam@idsi.net">Michael Graffam</A></B>
- <UL>
- <LI>XF86VidMode support to vo_x11 and vo_dga</LI>
- <LI>Video mode switching code to vo_dga</LI>
- </UL>
- </LI>
- <LI><B><A HREF="mailto:hoffmajs@gmx.de">Jens Hoffmann</A></B>
- <UL>
- <LI>Additional YUV formats support</LI>
- <LI>found the big BITMAPINFOHEADER problem -> solved ASV2 pixelization</LI>
- </UL>
- </LI>
- <LI><B><A HREF="mailto:nickols_k@mail.ru">Nick Kurshev</A></B>
- <UL>
- <LI>memcpy optimizations for AMD K7 and Intel Pentium III (fastmemcpy.h)</LI>
- <LI>CD-ROM tune info</LI>
- <LI>further 3DNow! optimizations into mp3lib and libac3 and FFmpeg</LI>
- <LI>Russian translation of documentation (outdated)</LI>
- <LI>radeon_vid, rage128_vid, radeonfb</LI>
- <LI>libvo driver: vo_vesa</LI>
- <LI>VIDIX and libdha design, programming, rage128/radeon vidix drivers</LI>
- </UL>
- </LI>
- <LI><B><A HREF="mailto:german@piraos.com">German Gomez Garcia</A></B>
- <UL>
- <LI>SPDIF AC3 output for SBLive!</LI>
- </UL>
- </LI>
- <LI><B><A HREF="mailto:eyck@incubus.ar.lublin.pl">Dariusz Pietrzak (Eyck)</A></B>
- <UL>
- <LI>Debian packaging support (see debian/* and this documentation)</LI>
- <LI>support for vplayer subtitle format</LI>
- <LI>preliminary support for .RT subtitle format</LI>
- </UL>
- </LI>
- <LI><B><A HREF="mailto:marcus@idonex.se">Marcus Comstedt</A></B>
- <UL>
- <LI>initial Solaris8-x86 support</LI>
- <LI>configure fixes</LI>
- </UL>
- </LI>
- <LI><B><A HREF="mailto:jk@tools.de">Jürgen Keil</A></B>
- <UL>
- <LI>patched <B>MPlayer</B> to work on Solaris 8 x86</LI>
- <LI>various fixes (win32, configure, etc)</LI>
- <LI>SUN audio driver in libao2</LI>
- <LI>mediaLib support in libavcodec</LI>
- </UL>
- </LI>
- <LI><B><A HREF="mailto:vkushnir@Alfacom.net">Vladimir Kushnir</A></B>
- <UL>
- <LI>patched <B>MPlayer</B> to work on FreeBSD x86</LI>
- </UL>
- </LI>
- <LI><B><A HREF="mailto:bertrand_baudet@yahoo.com">Bertrand Baudet</A></B>
- <UL>
- <LI>network streaming support author, maintainer</LI>
- <LI>CDDB support</LI>
- </UL>
- </LI>
- <LI><B><A HREF="mailto:djw@flinthills.com">Derek J Witt</A></B>
- <UL>
- <LI>MMS network streaming patches</LI>
- </UL>
- </LI>
- <LI><B><A HREF="mailto:albeu@free.fr">Alban Bedel</A></B>
- <UL>
- <LI>MMS network streaming patches</LI>
- <LI>Playtree and per-entry config</LI>
- <LI>Playlist parsers</LI>
- <LI>New input layer, slave mode improvements</LI>
- <LI>Audio only support</LI>
- <LI>MP3, WAV and Ogg demuxers, Ogg-in-AVI fixes</LI>
- <LI>Support for audio from external file</LI>
- <LI>DXR2 driver</LI>
- <LI>vo_aa improvements</LI>
- <LI>CDDA support</LI>
- </UL>
- </LI>
- <LI><B><A HREF="mailto:zybi@fanthom.irc.pl">Artur Zaprzala</A></B>
- <UL>
- <LI>Complete font generator prog + OSD font (TOOLS/subfont-c)</LI>
- </UL>
- </LI>
- <LI><B><A HREF="mailto:lanzz@lanzz.org">lanzz(a)lanzz.org</A></B>
- <UL>
- <LI>GIMP font generator plugin (TOOLS/subfont-gimp)</LI>
- </UL>
- </LI>
- <LI><B><A HREF="mailto:atlka@pg.gda.pl">Adam Tla/lka</A></B>
- <UL>
- <LI>osd/sub review, fixes, optimization, utf8 support</LI>
- <LI>various fixes</LI>
- </UL>
- </LI>
- <LI><B><A HREF="mailto:folke@ashberg.de">Folke Ashberg</A></B>
- <UL>
- <LI>native AAlib driver (-vo aa)</LI>
- </UL>
- </LI>
- <LI><B><A HREF="mailto:iive@yahoo.com">Ivan Kalvatchev</A></B>
- <UL>
- <LI>interlaced MPEG2 support (libmpeg2)</LI>
- <LI>libvo2 draft</LI>
- <LI>configfile parser fixes</LI>
- </UL>
- </LI>
- <LI><B><A HREF="mailto:p_l@gmx.fr">pl</A></B>
- <UL>
- <LI>new configure script</LI>
- <LI>general code maintaining, fixes, patch committing</LI>
- </UL>
- </LI>
- <LI><B><A HREF="mailto:michaelni@gmx.at">Michael Niedermayer</A></B>
- <UL>
- <LI>new, GPL postprocessing code (with deinterlacing etc...)</LI>
- <LI>software scaling with MMX/MMX2/3DNow support (swscale.c)</LI>
- <LI>various rgb/yuv bpp converters</LI>
- <LI>new, better IDCT code for libavcodec, speedup of divx decoders</LI>
- <LI>runtime CPU detection</LI>
- <LI>SSE optimization of liba52</LI>
- <LI>various encoder/decoder fixes, improvements in libavcodec, DR support</LI>
- </UL>
- </LI>
- <LI><B><A HREF="mailto:sgoethel@jausoft.com">Sven Goethel</A></B>
- <UL>
- <LI>libvo driver: vo_gl2</LI>
- </UL>
- </LI>
- <LI><B><A HREF="mailto:joy@pingfm.org">joy_ping</A></B>
- <UL>
- <LI>ao_alsa9 fixes, AC3 passthrough support</LI>
- </UL>
- </LI>
- <LI><B><A HREF="mailto:eanholt@gladstone.uoregon.edu">Eric Anholt</A></B>
- <UL>
- <LI>CPU detection code</LI>
- </UL>
- </LI>
- <LI><B><A HREF="mailto:Jiri.Svoboda@seznam.cz">Jiri Svoboda</A></B>
- <UL>
- <LI>AQT type subtitles support</LI>
- <LI>CRTC2 YUV support in mga_vid</LI>
- <LI>DirectFB video output driver</LI>
- </UL>
- </LI>
- <LI><B><A HREF="mailto:oliver.schoenbrunner@jku.at">Oliver Schoenbrunner</A></B>
- <UL>
- <LI>SGI audio driver</LI>
- <LI>MIPS support</LI>
- </UL>
- </LI>
- <LI><B><A HREF="mailto:jeroen.dobbelaere@acunia.com">Jeroen Dobbelaere</A></B>
- <UL>
- <LI>the original <A HREF="http://mad.sourceforge.net">libmad</A> support</LI>
- </UL>
- </LI>
- <LI><B><A HREF="mailto:dholm@telia.com">David Holm</A></B>
- <UL>
- <LI>DXR3 support</LI>
- </UL>
- </LI>
- <LI><B><A HREF="mailto:takis@lumumba.luc.ac.be">Panagiotis Issaris</A></B>
- <UL>
- <LI>-playlist option</LI>
- <LI>NuppelVideo support</LI>
- </UL>
- </LI>
- <LI><B><A HREF="mailto:melanson@pcisys.net">Mike Melanson</A></B>
- <UL>
- <LI>MS Video1 codec open-source implementation</LI>
- <LI>FLI demuxer, decoder</LI>
- <LI>Unified ADPCM Decoder (supports IMA/DVI, MS ADPCM, several others)</LI>
- <LI>FILM (.cpk) file demuxer</LI>
- <LI>RoQ file demuxer, Audio/Video decoder</LI>
- <LI>QT SMC decoder</LI>
- <LI>QT RLE decoder</LI>
- <LI>MS RLE decoder re-implementation</LI>
- </UL>
- </LI>
- <LI><B><A HREF="mailto:ranma@gmx.at">Tobias Diedrich</A></B>
- <UL>
- <LI>NAS audio output driver</LI>
- <LI>DXR2 driver</LI>
- </UL>
- </LI>
- <LI><B><A HREF="mailto:foth@informatik.uni-hamburg.de">Kilian A. Foth</A></B>
- <UL>
- <LI>-slave mode</LI>
- </UL>
- </LI>
- <LI><B><A HREF="mailto:timf@mail.csse.monash.edu.au">Tim Ferguson</A></B>
- <UL>
- <LI>Open source Cinepak decoder</LI>
- <LI>Open source CYUV decoder</LI>
- </UL>
- </LI>
- <LI><B><A HREF="mailto:itrs@softwell.com.tw">Sam Lin</A></B>
- <UL>
- <LI>-wid (plugger) patch</LI>
- </UL>
- </LI>
- <LI><B><A HREF="mailto:johannes.feigl@aon.at">Johannes Feigl</A></B>
- <UL>
- <LI>original German docs translation</LI>
- <LI>some improvements in configure, small patches</LI>
- <LI>found somebody (Thilo Wunderlich) who sent a DVB card</LI>
- <LI>msg translations (help_mp-XX.h) maintainer</LI>
- </UL>
- </LI>
- <LI><B><A HREF="mailto:kmkaplan@selfoffice.com">Kim Minh Kaplan</A></B>
- <UL>
- <LI>DVD and VobSub subtitles display support</LI>
- <LI>DVD subtitles rip to VobSub</LI>
- </UL>
- </LI>
- <LI><B><A HREF="mailto:bkuschak@yahoo.com">Brian Kuschak</A></B>
- <UL>
- <LI>RTP streaming support (reading)</LI>
- </UL>
- </LI>
- <LI><B><A HREF="mailto:steve@daviesfam.org">Stephen Davies</A></B>
- <UL>
- <LI>support for large video files (>2^32 bytes in size)</LI>
- <LI>surround sound</LI>
- </UL>
- </LI>
- <LI><B><A HREF="mailto:rsnel@cube.dyndns.org">Rik Snel</A></B>
- <UL>
- <LI><CODE>zr</CODE> video output driver</LI>
- </UL>
- </LI>
- <LI><B><A HREF="mailto:ajh@atri.curtin.edu.au">Anders Johansson</A></B>
- <UL>
- <LI>audio plugin system, some effect plugins</LI>
- </UL>
- </LI>
- <LI><B><A HREF="mailto:rtogni@freemail.it">Roberto Togni</A></B>
- <UL>
- <LI>Open source QT RPZA decoder</LI>
- <LI>Open source HuffYUV decoder</LI>
- <LI>Open source MSZH/ZLIB decoder</LI>
- </UL>
- </LI>
- <LI><B><A HREF="mailto:wojtekka@bydg.pdi.net">Wojtek Kaniewski</A></B>
- <UL>
- <LI>Mouse wheel support</LI>
- </UL>
- </LI>
- <LI><B><A HREF="mailto:freku045@student.liu.se">Fredrik Kuivinen</A></B>
- <UL>
- <LI>OSD/subtitles outside movie - for SDL</LI>
- <LI>video filter layer draft, first implementation</LI>
- <LI>virtualdub filter support (not yet finised/commited)</LI>
- </UL>
- </LI>
- <LI><B><A HREF="mailto:flo-mplayer-dev@gmx.net">Florian Schneider</A></B>
- <UL>
- <LI>RealVideo codec libraries interface, .rm demuxer fixes</LI>
- </UL>
- </LI>
- <LI><B><A HREF="mailto:makovick@KMLinux.fjfi.cvut.cz">Jindrich Makovicka</A></B>
- <UL>
- <LI>various bugfixes</LI>
- <LI>rewrote v4l video capturing, implemented audio capturing layer</LI>
- <LI>freetype2 font rendering support</LI>
- </UL>
- </LI>
- <LI><B><A HREF="mailto:dalias@aerifal.cx">D Richard Felker III</A></B>
- <UL>
- <LI>various bugfixes</LI>
- <LI>soft eq and halfpack video filters</LI>
- </UL>
- </LI>
- <LI><B><A HREF="mailto:dominik@rangers.eu.org">Dominik Mierzejewski</A></B>
- <UL>
- <LI>compiler warning fixes</LI>
- <LI>official RPM packages</LI>
- </UL>
- </LI>
-</UL>
-
-<H2>Main testers:</H2>
-
-<UL>
- <LI>Tibor Balázs (Tibcu)
- <LI>Péter Sasi (SaPe)
- <LI>Christoph H. Lampert
- <LI>Attila Kinali
- <LI>Dirk Vornheder
- <LI>Bohdan Horst (Nexus)
-</UL>
-
-<H2>The codecs, libs:</H2>
-
-<UL>
- <LI>Aaron Holtzman: <aholtzma(a)engr.uvic.ca>
- <UL>
- <LI>ac3dec (and libac3) author [old AC3 audio decoder]</LI>
- <LI>the original mga_vid driver [Matrox G200/G400 YUV Back-end Scaler]</LI>
- <LI>mpeg2dec [Fast MPEG1/MPEG2 video decoder, currently used in player]</LI>
- </UL>
- </LI>
- <LI>Michel Lespinasse: <walken(a)zoy.org>
- <UL>
- <LI>did large libmpeg2 changes for better speed and mpeg conformance</LI>
- <LI>liba52 author [current AC3 audio decoder]</LI>
- </UL>
- </LI>
- <LI>Eugene Kuznetsov: <divx(a)euro.ru>
- <UL>
- <LI>avifile author [AVI player library for linux, using Win32 VfW/ACM codecs]</LI>
- <LI>technical help about AVI and ASF formats, and how to get YUV using VfW...</LI>
- <LI>divx4linux technical support</LI>
- </UL>
- </LI>
- <LI>Zdenek Kabelac: <kabi(a)informatics.muni.cz>
- <UL>
- <LI>current avifile maintainer</LI>
- <LI>some technical help about the win32 stuff, .asf formats and timers</LI>
- </UL>
- </LI>
- <LI>Gerard Lantau: <glantau(a)yahoo.fr>
- <UL>
- <LI>FFmpeg/libavcodec author,maintainer (open source mpeg, mjpeg, divx en/decoder)</LI>
- </UL>
- </LI>
- <LI>Project Mayo: <<A HREF="http://www.projectmayo.com">http://www.projectmayo.com</A>>
- <UL>
- <LI>the OpenDivX codec authors</LI>
- </UL>
- </LI>
- <LI>Michael Hipp:
- <UL>
- <LI>mpglib author [isn't used directly but some parts in mp3lib]</LI>
- </UL>
- </LI>
- <LI>Mark Podlipec:
- <UL>
- <LI>xa_gsm.c author [MS-GSM audio codec]
- [from a GSM library by Jutta Degener and Carsten Bormann]</LI>
- </UL>
- </LI>
- <LI>Jake Janovetz:
- <UL>
- <LI>remez.c author [Used to calculate audio filter coefficients]</LI>
- </UL>
- </LI>
- <LI>Vivien Chappelier, Damien Vincent:
- <UL>
- <LI>libFAME authors [fast mpeg-1 encoder, used by -vo mpegpes/-vo dxr3]</LI>
- </UL>
- </LI>
-</UL>
-
-<P>Their code is not used in current player version, but I've got some ideas or
- other technical help from:</P>
-
-<UL>
- <LI>Avery Lee <phaeron(a)virtualdub.org>
- <UL>
- <LI>VirtualDub author, help understanding AVI with VBR audio and other AVI issues</LI>
- </UL>
- </LI>
- <LI>John F. McGowan http://www.jmcgowan.com/
- <UL>
- <LI>AVI FAQ author/collector. [site with many useful docs on codecs and avi format]</LI>
- </UL>
- </LI>
- <LI>Dirk Farin: <farin(a)ti.uni-mannheim.de>
- <UL>
- <LI>dvdview author [MPEG1/MPEG2 video decoder, used in v0.5-v0.8]</LI>
- </UL>
- </LI>
- <LI>Adam Williams: <broadcast(a)earthling.net>
- <UL>
- <LI>libmpeg3 (and xmovie) author [MPEG1/MPEG2 video decoder, used in v0.1-v0.4]</LI>
- </UL>
- </LI>
-</UL>
-
-
-
-<H1><A NAME="maintainers">Appendix A2 - MPlayer code and documentation maintainers</A></H1>
-
-<H2>Homepage</H2>
-<UL>
- <LI><B>Design:</B> Chass and Tornado</LI>
- <LI><B>Contents:</B> Gabucino</LI>
-</UL>
-
-<H2>English documentation</H2>
-<UL>
- <LI><B>user docs:</B> Gabucino</LI>
- <LI><B>review, grammar fixes:</B> Diego Biurrun, Nilmoni Deb, Andras Mohari</LI>
- <LI><B>input layer, lirc, slave mode docs:</B> Albeu</LI>
- <LI><B>man page:</B> <A HREF="mailto:jjermann@gmx.net">Jonas Jermann</A></LI>
- <LI><B>tech/* docs:</B> A'rpi</LI>
-</UL>
-
-<H2>Documentation translations</H2>
-<UL>
- <LI><B>Hungarian:</B> Gabucino</LI>
- <LI><B>German:</B> <A HREF="mailto:jjermann@gmx.net">Jonas Jermann</A></LI>
- <LI><B>French:</B> <A HREF="mailto:smarteau@eso.org">Stephane Marteau</A> (outdated)</LI>
- <LI><B>Spanish:</B> TeLeNiEkO (outdated)</LI>
- <LI><B>Russian:</B> Nick Kurshev (outdated)</LI>
- <LI><B>Polish:</B> <A HREF="mailto:nell@skrzynka.pl">Justyna Biala</A></LI>
- <LI><B>Italian:</B> Matteo Balduzzi</LI>
-</UL>
-
-<H2>Platforms/ports</H2>
-<UL>
- <LI><B>DEBIAN packaging:</B> Dariusz Pietrzak</LI>
- <LI><B>RedHat/RPM packaging:</B> Dominik Mierzejewski</LI>
- <LI><B>FreeBSD support:</B> Vladimir Kushnir, Nexus</LI>
- <LI><B>BSD/OS support:</B> Steven Schultz</LI>
- <LI><B>NetBSD support:</B> Bernd Ernesti</LI>
- <LI><B>OpenBSD support:</B> Bjorn Sandell</LI>
- <LI><B>Solaris 8 support:</B> Jürgen Keil, pl</LI>
- <LI><B>MIPS support:</B> Oliver Schoenbrunner</LI>
- <LI><B>Win32/Cygwin support:</B> Atmosfear</LI>
-</UL>
-
-<H2>MPlayer code:</H2>
-<UL>
- <LI><B>A-V sync code:</B> A'rpi</LI>
- <LI><B>libmpdemux, libmpcodecs:</B> A'rpi</LI>
- <LI><B>TV input:</B> Alex, Jindrich Makovicka</LI>
- <LI><B>DVD support (experimental - dvdnav):</B> -</LI>
- <LI><B>DVD support (new - dvdread/dvdcss):</B> A'rpi</LI>
- <LI><B>DVD support (old - libcss):</B> LGB</LI>
- <LI><B>network streaming:</B> Bertrand Baudet</LI>
- <LI><B>DVD/VOB subtitles:</B> Kim Minh Kaplan</LI>
- <LI><B>config files & commandline parser:</B> Albeu, Szabi</LI>
- <LI><B>playtree, input layer:</B> Albeu</LI>
- <LI><B>postproc, colorspace converters:</B> Michael Niedermayer</LI>
- <LI><B>libavcodec:</B> Michael Niedermayer, Fabrice Bellard @ ffmpeg</LI>
- <LI><B>VIDIX core, libdha, drivers:</B> Alex, Nick Kurshev @ mplayerxp</LI>
-</UL>
-
-<H2>libvo drivers:</H2>
-<UL>
- <LI><B>vo_3dfx.c</B> - OBSOLETED, use xv or tdfxfb</LI>
- <LI><B>vo_aa.c</B> - Folke Ashberg</LI>
- <LI><B>vo_dga.c</B> - Acki (outdated)</LI>
- <LI><B>vo_directfb[2].c</B> - <A HREF="mailto:Jiri.Svoboda@seznam.cz">Jiri Svoboda</A></LI>
- <LI><B>vo_dxr2.c</B> - Albeu</LI>
- <LI><B>vo_dxr3.c</B> - David Holm</LI>
- <LI><B>vo_fbdev.c</B> - Szabi</LI>
- <LI><B>vo_ggi.c</B> - Alex</LI>
- <LI><B>vo_gif89a.c</B> - Joey Parrish</LI>
- <LI><B>vo_gl.c</B> - A'rpi (outdated)</LI>
- <LI><B>vo_gl2.c</B> - <A HREF="mailto:sgoethel@jausoft.com">Sven Goethel</A></LI>
- <LI><B>vo_jpeg.c</B> - Pontscho</LI>
- <LI><B>vo_md5.c</B> - A'rpi</LI>
- <LI><B>vo_mga.c</B> - A'rpi</LI>
- <LI><B>vo_mpegpes.c</B> - A'rpi</LI>
- <LI><B>vo_null.c</B> - A'rpi</LI>
- <LI><B>vo_pgm.c</B> - A'rpi</LI>
- <LI><B>vo_png.c</B> - Atmos</LI>
- <LI><B>vo_sdl.c</B> - Atmos</LI>
- <LI><B>vo_svga.c</B> - Matan Ziv-Av</LI>
- <LI><B>vo_tdfxfb.c</B> - Mark Zealey (mark(a)zealos.org)</LI>
- <LI><B>vo_vesa.c</B> - ? (Nick Kurshev)</LI>
- <LI><B>vo_x11.c</B> - Pontscho</LI>
- <LI><B>vo_xmga.c</B> - Pontscho, A'rpi</LI>
- <LI><B>vo_xv.c</B> - Pontscho</LI>
- <LI><B>vo_xvidix.c</B> - Pontscho, Alex</LI>
- <LI><B>vo_yuv4mpeg.c</B> - ?</LI>
- <LI><B>vo_zr.c</B> - <A HREF="mailto:rsnel@cube.dyndns.org">Rik Snel</A></LI>
-</UL>
-
-<H2>VIDIX drivers:</H2>
-<UL>
- <LI><B>genfb_vid</B> - al3x</LI>
- <LI><B>mach64_vid</B> - Michael Niedermayer, A'rpi</LI>
- <LI><B>mga_vid</B> - al3x ?</LI>
- <LI><B>nvidia_vid</B> - al3x (development stopped - don't expect it)</LI>
- <LI><B>radeon_vid</B> - al3x, Nick Kurshev @ mplayerxp</LI>
- <LI><B>rage128_vid</B> - ? , Nick Kurshev @ mplayerxp</LI>
-</UL>
-
-<H2>libao2 drivers:</H2>
-<UL>
- <LI><B>ao_alsa5.c</B> - al3x</LI>
- <LI><B>ao_alsa9.c</B> - <A HREF="mailto:joy@pingfm.org">joy_ping</A></LI>
- <LI><B>ao_arts.c</B> - ?</LI>
- <LI><B>ao_dxr2.c</B> - Albeu</LI>
- <LI><B>ao_mpegpes.c</B> - A'rpi</LI>
- <LI><B>ao_nas.c</B> - ?</LI>
- <LI><B>ao_null.c</B> - A'rpi</LI>
- <LI><B>ao_oss.c</B> - A'rpi</LI>
- <LI><B>ao_pcm.c</B> - Atmos</LI>
- <LI><B>ao_plugin.c</B> - Anders Johansson</LI>
- <LI><B>ao_sdl.c</B> - Atmos</LI>
- <LI><B>ao_sgi.c</B> - <A HREF="oliver.schoenbrunner(a)jku.at">Oliver Schoenbrunner</A></LI>
- <LI><B>ao_sun.c</B> - Jürgen Keil</LI>
-</UL>
-
-<H2>TOOLS:</H2>
-<UL>
- <LI><B>subfont-c</B> - Artur Zaprzala (zybi(a)fanthom.irc.pl)</LI>
- <LI><B>subfont-GIMP</B> - lanzz(a)lanzz.org</LI>
- <LI><B>*.pl</B> - Atmos</LI>
- <LI><B>x2mpsub</B> - Gabucino</LI>
- <LI><B>mencvcd</B> - Juergen Hammelmann (juergen.hammelmann(a)gmx.de)</LI>
- <LI><B>subrip</B> - Kim Minh Kaplan</LI>
- <LI><B>others</B> - A'rpi</LI>
-</UL>
-
-
-
-<H1><A NAME="mailing_lists">Appendix B - Mailing lists</A></H1>
+<H1><A NAME="mailing_lists">Appendix A - Mailing lists</A></H1>
<P>There are some public mailing lists on <B>MPlayer</B>. Subscribing can be
achieved on the following addresses:</P>
@@ -2236,7 +1582,7 @@
<A HREF="http://mplayerhq.hu/mailman/listinfo/mplayer-users">http://mplayerhq.hu/mailman/listinfo/mplayer-users</A>
<UL>
<LI>Send bug reports here (after reading the <A HREF="#known_bugs">Known Bugs</A>
- section, and <A HREF="bugreports.html">Appendix C</A>).</LI>
+ section, and <A HREF="bugreports.html">bug reporting section</A>).</LI>
<LI>Send feature requests here (after reading the WHOLE documentation).</LI>
<LI>Send user questions here (after reading the WHOLE documentation).</LI>
</UL>
@@ -2280,11 +1626,11 @@
-<H1><A NAME="bug_reports">Appendix C</A> - <A HREF="bugreports.html">How to report bugs</A></H1>
+<H1><A NAME="bug_reports">Appendix B</A> - <A HREF="bugreports.html">How to report bugs</A></H1>
-<H1><A NAME="known_bugs">Appendix D - Known bugs</A></H1>
+<H1><A NAME="known_bugs">Appendix C - Known bugs</A></H1>
<P>Special system/CPU-specific bugs/problems:</P>
<UL>
@@ -2381,6 +1727,15 @@
<P>Green image using mga_vid (-vo mga / -vo xmga):<BR>
- mga_vid misdetected your card's RAM amount, reload it using mga_ram_size option</P>
+
+
+
+<H1><A NAME="skin">Appendix D</A> - <A HREF="skin-en.html">MPlayer skin format</A></H1>
+
+
+
+<H1><A NAME="flame_wars">Appendix E</A> - <A HREF="users_against_developers.html">Developer Cries</A></H1>
+
</BODY>
</HTML>
1
0
CVS: main/libmpdemux demux_pva.c,NONE,1.1 Makefile,1.35,1.36 demuxer.c,1.110,1.111 demuxer.h,1.45,1.46 video.c,1.26,1.27
by Arpi of Ize 10 Sep '02
by Arpi of Ize 10 Sep '02
10 Sep '02
Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var/tmp.root/cvs-serv31400/libmpdemux
Modified Files:
Makefile demuxer.c demuxer.h video.c
Added Files:
demux_pva.c
Log Message:
.PVA (mpeg-like fileformat used by MultiDec && WinTV) demuxer
slightly modified patch, original by Matteo Giani <matgiani(a)ctonet.it>
--- NEW FILE ---
/*
* demuxer for PVA files, such as the ones produced by software to manage DVB boards
* like the Hauppauge WinTV DVBs, for MPlayer.
*
* Uses info from the PVA file specifications found at
*
* http://www.technotrend.de/download/av_format_v1.pdf
*
* Known issue:
* - Does not seem to correctly demux files produced by MultiDec (on some channels).
* They seem not to be correctly formatted. In fact, other DVB software which uses
* the DVB board for playback plays them fine, but existing software which should
* convert PVAs to MPEG-PS streams fails on them as well.
* Feedback would be appreciated.
*
*
* written by Matteo Giani
*/
#include "config.h"
#include "mp_msg.h"
#include "help_mp.h"
#include "stream.h"
#include "demuxer.h"
#include "stheader.h"
#include "bswap.h"
/*
* #defines below taken from PVA spec (see URL above)
*/
#define PVA_MAX_VIDEO_PACK_LEN 6*1024
#define VIDEOSTREAM 0x01
#define MAINAUDIOSTREAM 0x02
typedef struct {
unsigned long offset;
long size;
uint8_t type;
uint8_t is_packet_start;
uint64_t pts;
} pva_payload_t;
typedef struct {
float last_audio_pts;
float last_video_pts;
uint8_t just_synced;
uint8_t synced_stream_id;
} pva_priv_t;
int pva_sync(demuxer_t * demuxer)
{
uint8_t buffer[5]={0,0,0,0,0};
int count;
pva_priv_t * priv = (pva_priv_t *) demuxer->priv;
/* This is a hack. Since this function is called both for actual syncing and by
* pva_check_file to check file type, we must check whether the priv structure has
* already been allocated, otherwise we will dereference NULL and segfault.
* So, if priv is NULL (not yet allocated) use a local variable, otherwise use priv->just_synced.
* This field is in the priv structure so that pva_get_payload knows that pva_sync has already
* read (part of) the PVA header. This way we can avoid to seek back and (hopefully) be able to read
* from pipes and such.
*/
uint8_t local_synced=0;
uint8_t * syncedptr;
syncedptr=(priv==NULL)?&local_synced:&priv->just_synced;
for(count=0 ; count<PVA_MAX_VIDEO_PACK_LEN && !demuxer->stream->eof && !*syncedptr ; count++)
{
buffer[0]=buffer[1];
buffer[1]=buffer[2];
buffer[2]=buffer[3];
buffer[3]=buffer[4];
buffer[4]=stream_read_char(demuxer->stream);
/*
* Check for a PVA packet beginning sequence: we check both the "AV" word at the
* very beginning and the "0x55" reserved byte (which is unused and set to 0x55 by spec)
*/
if(buffer[0]=='A' && buffer[1] == 'V' && buffer[4] == 0x55) *syncedptr=1;
//printf("demux_pva: pva_sync() current offset: %d\n",stream_tell(demuxer->stream));
}
if(*syncedptr)
{
if(priv!=NULL) priv->synced_stream_id=buffer[2];
return 1;
}
else
{
return 0;
}
}
int pva_check_file(demuxer_t * demuxer)
{
uint8_t buffer[5]={0,0,0,0,0};
mp_msg(MSGT_DEMUX, MSGL_V, "Checking for PVA\n");
stream_read(demuxer->stream,buffer,5);
if(buffer[0]=='A' && buffer[1] == 'V' && buffer[4] == 0x55)
{
mp_msg(MSGT_DEMUX,MSGL_DBG2, "Success: PVA\n");
return 1;
}
else
{
mp_msg(MSGT_DEMUX,MSGL_DBG2, "Failed: PVA\n");
return 0;
}
}
demuxer_t * demux_open_pva (demuxer_t * demuxer)
{
sh_video_t *sh_video = new_sh_video(demuxer,0);
sh_audio_t * sh_audio = new_sh_audio(demuxer,0);
pva_priv_t * priv;
unsigned char * buffer;
stream_reset(demuxer->stream);
stream_seek(demuxer->stream,0);
priv=malloc(sizeof(pva_priv_t));
if(demuxer->stream->type!=STREAMTYPE_FILE) demuxer->seekable=0;
else demuxer->seekable=1;
demuxer->priv=priv;
memset(demuxer->priv,0,sizeof(pva_priv_t));
if(!pva_sync(demuxer))
{
mp_msg(MSGT_DEMUX,MSGL_ERR,"Not a PVA file.\n");
return NULL;
}
//printf("priv->just_synced %s after initial sync!\n",priv->just_synced?"set":"UNSET");
demuxer->video->sh=sh_video;
demuxer->audio->sh=sh_audio;
mp_msg(MSGT_DEMUXER,MSGL_INFO,"Opened PVA demuxer...\n");
/*
* Audio and Video codecs:
* the PVA spec only allows MPEG2 video and MPEG layer II audio. No need to check the formats then.
* Moreover, there would be no way to do that since the PVA stream format has no fields to describe
* the used codecs.
*/
sh_video->format=0x10000002;
sh_video->ds=demuxer->video;
sh_audio->format=0x50;
sh_audio->ds=demuxer->audio;
priv->last_video_pts=-1;
priv->last_audio_pts=-1;
return demuxer;
}
// 0 = EOF or no stream found
// 1 = successfully read a packet
int demux_pva_fill_buffer (demuxer_t * demux)
{
uint8_t done=0;
demux_packet_t * dp;
pva_priv_t * priv=demux->priv;
pva_payload_t current_payload;
while(!done)
{
if(!pva_get_payload(demux,¤t_payload)) return 0;
switch(current_payload.type)
{
case VIDEOSTREAM:
if(!current_payload.is_packet_start && priv->last_video_pts==-1)
{
/* We should only be here at the beginning of a stream, when we have
* not yet encountered a valid Video PTS, or after a seek.
* So, skip these starting packets in order not to deliver the
* player a bogus PTS.
*/
done=0;
}
else
{
/*
* In every other condition, we are delivering the payload. Set this
* so that the following code knows whether to skip it or read it.
*/
done=1;
}
if(current_payload.is_packet_start)
{
priv->last_video_pts=((float)current_payload.pts)/90000;
//mp_msg(MSGT_DEMUXER,MSGL_DBG2,"demux_pva: Video PTS=%llu , delivered %f\n",current_payload.pts,priv->last_video_pts);
}
if(done)
{
dp=new_demux_packet(current_payload.size);
dp->pts=priv->last_video_pts;
stream_read(demux->stream,dp->buffer,current_payload.size);
ds_add_packet(demux->video,dp);
}
else
{
//printf("Skipping %u video bytes\n",current_payload.size);
stream_skip(demux->stream,current_payload.size);
}
break;
case MAINAUDIOSTREAM:
if(!current_payload.is_packet_start && priv->last_audio_pts==-1)
{
/* Same as above for invalid video PTS, just for audio. */
done=0;
}
else
{
done=1;
}
if(current_payload.is_packet_start)
{
priv->last_audio_pts=(float)current_payload.pts/90000;
}
if(done)
{
dp=new_demux_packet(current_payload.size);
dp->pts=priv->last_audio_pts;
stream_read(demux->stream,dp->buffer,current_payload.size);
ds_add_packet(demux->audio,dp);
}
else
{
stream_skip(demux->stream,current_payload.size);
}
break;
}
}
return 1;
}
int pva_get_payload(demuxer_t * d,pva_payload_t * payload)
{
uint8_t flags,pes_head_len;
uint16_t pack_size;
long long next_offset,pva_payload_start;
unsigned char buffer[256];
demux_packet_t * dp; //hack to deliver the preBytes (see PVA doc)
pva_priv_t * priv=(pva_priv_t *) d->priv;
if(d==NULL)
{
printf("demux_pva: pva_get_payload got passed a NULL pointer!\n");
return 0;
}
if(d->stream->eof)
{
mp_msg(MSGT_DEMUX,MSGL_V,"demux_pva: pva_get_payload() detected stream->eof!!!\n");
return 0;
}
//printf("priv->just_synced %s\n",priv->just_synced?"SET":"UNSET");
if(!priv->just_synced)
{
if(stream_read_word(d->stream) != (('A'<<8)|'V'))
{
mp_msg(MSGT_DEMUX,MSGL_V,"demux_pva: pva_get_payload() missed a SyncWord at %ld!! Trying to sync...\n",stream_tell(d->stream));
if(!pva_sync(d)) return 0;
}
}
if(priv->just_synced)
{
payload->type=priv->synced_stream_id;
priv->just_synced=0;
}
else
{
payload->type=stream_read_char(d->stream);
stream_skip(d->stream,2); //counter and reserved
}
flags=stream_read_char(d->stream);
payload->is_packet_start=flags & 0x10;
pack_size=le2me_16(stream_read_word(d->stream));
mp_msg(MSGT_DEMUX,MSGL_DBG2,"demux_pva::pva_get_payload(): pack_size=%u field read at offset %lu\n",pack_size,stream_tell(d->stream)-2);
pva_payload_start=stream_tell(d->stream);
next_offset=pva_payload_start+pack_size;
if(!payload->is_packet_start)
{
payload->offset=stream_tell(d->stream);
payload->size=pack_size;
}
else
{ //here comes the good part...
switch(payload->type)
{
case VIDEOSTREAM:
payload->pts=le2me_32(stream_read_dword(d->stream));
//printf("Video PTS: %llu\n",payload->pts);
if((flags&0x03) && ((pva_priv_t *)d->priv)->last_video_pts!=-1)
{
dp=new_demux_packet(flags&0x03);
stream_read(d->stream,dp->buffer,flags & 0x03); //read PreBytes
dp->pts=((pva_priv_t *)d->priv)->last_video_pts;
ds_add_packet(d->video,dp);
}
else
{
stream_skip(d->stream,flags&0x03);
}
//now we are at real beginning of payload.
payload->offset=stream_tell(d->stream);
//size is pack_size minus PTS size minus padding size.
payload->size=pack_size - 4 - (flags & 0x03);
break;
case MAINAUDIOSTREAM:
stream_skip(d->stream,8); //FIXME properly parse PES header.
//assuming byte 8 is PES residual header length.
pes_head_len=stream_read_char(d->stream);
stream_read(d->stream,buffer,pes_head_len);
//we should now be on start of real payload.
//let's now parse the PTS...
if((buffer[0] & 0xf0)!=0x20)
{
mp_msg(MSGT_DEMUX,MSGL_ERR,"demux_pva: expected audio PTS but badly formatted... (read 0x%02X)\n",buffer[0]);
return;
}
payload->pts=0LL;
payload->pts|=((uint64_t)(buffer[0] & 0x0e) << 29);
payload->pts|=buffer[1]<<22;
payload->pts|=(buffer[2] & 0xfe) << 14;
payload->pts|=buffer[3]<<7;
payload->pts|=(buffer[4] & 0xfe) >> 1;
/*
* PTS parsing is hopefully finished.
* Let's now fill in offset and size.
*/
payload->pts=le2me_64(payload->pts);
payload->offset=stream_tell(d->stream);
payload->size=pack_size-stream_tell(d->stream)+pva_payload_start;
break;
}
}
}
int demux_seek_pva(demuxer_t * demuxer,float rel_seek_secs,int flags)
{
int total_bitrate=0;
long dest_offset;
pva_priv_t * priv=demuxer->priv;
total_bitrate=((sh_audio_t *)demuxer->audio->sh)->i_bps + ((sh_video_t *)demuxer->video->sh)->i_bps;
/*
* Compute absolute offset inside the stream. Approximate total bitrate with sum of bitrates
* reported by the audio and video codecs. The seek is not accurate because, just like
* with MPEG streams, the bitrate is not constant. Moreover, we do not take into account
* the overhead caused by PVA and PES headers.
* If the calculated absolute offset is negative, seek to the beginning of the file.
*/
dest_offset=stream_tell(demuxer->stream)+rel_seek_secs*total_bitrate;
if(dest_offset<0) dest_offset=0;
stream_seek(demuxer->stream,dest_offset);
if(!pva_sync(demuxer))
{
mp_msg(MSGT_DEMUX,MSGL_V,"demux_pva: Couldn't seek!\n");
return 0;
}
/*
* Reset the PTS info inside the pva_priv_t structure. This way we don't deliver
* data with the wrong PTSs (the ones we had before seeking).
*
*/
priv->last_video_pts=-1;
priv->last_audio_pts=-1;
return 1;
}
void demux_close_pva(demuxer_t * demuxer)
{
if(demuxer->priv)
{
free(demuxer->priv);
demuxer->priv=NULL;
}
}
Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/Makefile,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- Makefile 30 Aug 2002 14:35:17 -0000 1.35
+++ Makefile 10 Sep 2002 21:50:03 -0000 1.36
@@ -3,7 +3,7 @@
include ../config.mak
-SRCS = mp3_hdr.c video.c mpeg_hdr.c cache2.c asfheader.c aviheader.c aviprint.c aviwrite.c demux_asf.c demux_avi.c demux_mov.c parse_mp4.c demux_mpg.c demux_viv.c demuxer.c dvdauth.c dvdnav_stream.c open.c parse_es.c stream.c tv.c tvi_dummy.c tvi_v4l.c tvi_bsdbt848.c frequencies.c demux_fli.c demux_real.c demux_y4m.c yuv4mpeg.c yuv4mpeg_ratio.c demux_nuv.c demux_film.c demux_roq.c mf.c demux_mf.c demux_audio.c demux_demuxers.c opt-reg.c mpdemux.c demux_ogg.c demux_bmp.c cdda.c demux_rawaudio.c cddb.c demux_rawdv.c ai_alsa.c ai_oss.c audio_in.c
+SRCS = mp3_hdr.c video.c mpeg_hdr.c cache2.c asfheader.c aviheader.c aviprint.c aviwrite.c demux_asf.c demux_avi.c demux_mov.c parse_mp4.c demux_mpg.c demux_pva.c demux_viv.c demuxer.c dvdauth.c dvdnav_stream.c open.c parse_es.c stream.c tv.c tvi_dummy.c tvi_v4l.c tvi_bsdbt848.c frequencies.c demux_fli.c demux_real.c demux_y4m.c yuv4mpeg.c yuv4mpeg_ratio.c demux_nuv.c demux_film.c demux_roq.c mf.c demux_mf.c demux_audio.c demux_demuxers.c opt-reg.c mpdemux.c demux_ogg.c demux_bmp.c cdda.c demux_rawaudio.c cddb.c demux_rawdv.c ai_alsa.c ai_oss.c audio_in.c
ifeq ($(STREAMING),yes)
SRCS += asf_streaming.c url.c http.c network.c asf_mmst_streaming.c
ifeq ($(STREAMING_LIVE_DOT_COM),yes)
Index: demuxer.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demuxer.c,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- demuxer.c 8 Sep 2002 23:00:01 -0000 1.110
+++ demuxer.c 10 Sep 2002 21:50:03 -0000 1.111
@@ -154,6 +154,7 @@
extern void demux_close_demuxers(demuxer_t* demuxer);
extern void demux_close_avi(demuxer_t *demuxer);
extern void demux_close_rawdv(demuxer_t* demuxer);
+extern void demux_close_pva(demuxer_t* demuxer);
#ifdef USE_TV
#include "tv.h"
@@ -170,6 +171,8 @@
int i;
mp_msg(MSGT_DEMUXER,MSGL_V,"DEMUXER: freeing demuxer at %p \n",demuxer);
switch(demuxer->type) {
+ case DEMUXER_TYPE_PVA:
+ demux_close_pva(demuxer); break;
case DEMUXER_TYPE_VIVO:
demux_close_vivo(demuxer); break;
case DEMUXER_TYPE_REAL:
@@ -284,6 +287,8 @@
int demux_rawdv_fill_buffer(demuxer_t *demuxer);
int demux_y4m_fill_buffer(demuxer_t *demux);
int demux_audio_fill_buffer(demux_stream_t *ds);
+int demux_pva_fill_buffer(demuxer_t *demux);
+
extern int demux_demuxers_fill_buffer(demuxer_t *demux,demux_stream_t *ds);
extern int demux_ogg_fill_buffer(demuxer_t *d);
extern int demux_rawaudio_fill_buffer(demuxer_t* demuxer, demux_stream_t *ds);
@@ -305,6 +310,7 @@
case DEMUXER_TYPE_ASF: return demux_asf_fill_buffer(demux);
case DEMUXER_TYPE_MOV: return demux_mov_fill_buffer(demux,ds);
case DEMUXER_TYPE_VIVO: return demux_vivo_fill_buffer(demux);
+ case DEMUXER_TYPE_PVA: return demux_pva_fill_buffer(demux);
#ifdef HAVE_LIBDV095
case DEMUXER_TYPE_RAWDV: return demux_rawdv_fill_buffer(demux);
#endif
@@ -532,10 +538,9 @@
extern int y4m_check_file(demuxer_t *demuxer);
extern void demux_open_y4m(demuxer_t *demuxer);
extern int roq_check_file(demuxer_t *demuxer);
-
+extern int pva_check_file(demuxer_t * demuxer);
extern int real_check_file(demuxer_t *demuxer);
extern void demux_open_real(demuxer_t *demuxer);
-
extern int nuv_check_file(demuxer_t *demuxer);
extern void demux_open_nuv(demuxer_t *demuxer);
extern int demux_audio_open(demuxer_t* demuxer);
@@ -740,6 +745,17 @@
demuxer = NULL;
}
}
+//=============== Try to open as PVA file: =================
+if(file_format == DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_PVA){
+ demuxer=new_demuxer(stream,DEMUXER_TYPE_PVA,audio_id,video_id,dvdsub_id);
+ if(pva_check_file(demuxer)) {
+ mp_msg(MSGT_DEMUXER,MSGL_INFO,"Detected PVA file...\n");
+ file_format=DEMUXER_TYPE_PVA;
+ } else {
+ free_demuxer(demuxer);
+ demuxer=NULL;
+ }
+}
//=============== Try to open as MPEG-PS file: =================
if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_MPEG_PS){
int pes=1;
@@ -921,6 +937,10 @@
demux_open_vivo(demuxer);
break;
}
+ case DEMUXER_TYPE_PVA: {
+ demux_open_pva(demuxer);
+ break;
+ }
case DEMUXER_TYPE_Y4M: {
demux_open_y4m(demuxer);
break;
@@ -1069,6 +1089,8 @@
int demux_seek_nuv(demuxer_t *demuxer,float rel_seek_secs,int flags);
void demux_seek_mov(demuxer_t *demuxer,float pts,int flags);
int demux_seek_real(demuxer_t *demuxer,float rel_seek_secs,int flags);
+int demux_seek_pva(demuxer_t *demuxer,float rel_seek_secs,int flags);
+
#ifdef HAVE_LIBDV095
int demux_seek_rawdv(demuxer_t *demuxer, float pts, int flags);
#endif
@@ -1140,6 +1162,9 @@
case DEMUXER_TYPE_MF:
demux_seek_mf(demuxer,rel_seek_secs,flags); break;
+
+ case DEMUXER_TYPE_PVA:
+ demux_seek_pva(demuxer,rel_seek_secs,flags); break;
case DEMUXER_TYPE_FLI:
demux_seek_fli(demuxer,rel_seek_secs,flags); break;
Index: demuxer.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demuxer.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- demuxer.h 5 Aug 2002 17:21:35 -0000 1.45
+++ demuxer.h 10 Sep 2002 21:50:03 -0000 1.46
@@ -31,10 +31,11 @@
#define DEMUXER_TYPE_RAWAUDIO 20
#define DEMUXER_TYPE_RTP 21
#define DEMUXER_TYPE_RAWDV 22
+#define DEMUXER_TYPE_PVA 23
// This should always match the higest demuxer type number.
// Unless you want to disallow users to force the demuxer to some types
#define DEMUXER_TYPE_MIN 0
-#define DEMUXER_TYPE_MAX 22
+#define DEMUXER_TYPE_MAX 23
#define DEMUXER_TYPE_DEMUXERS (1<<16)
// A virtual demuxer type for the network code
Index: video.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/video.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- video.c 6 Sep 2002 22:36:55 -0000 1.26
+++ video.c 10 Sep 2002 21:50:03 -0000 1.27
@@ -86,6 +86,7 @@
if (!demux_is_mpeg_rtp_stream(d_video->demuxer)) break;
// otherwise fall through to...
#endif
+ case DEMUXER_TYPE_PVA:
case DEMUXER_TYPE_MPEG_ES:
case DEMUXER_TYPE_MPEG_PS: {
//mpeg_header_parser:
@@ -219,6 +220,7 @@
*start=NULL;
if(demuxer->file_format==DEMUXER_TYPE_MPEG_ES || demuxer->file_format==DEMUXER_TYPE_MPEG_PS
+ || demuxer->file_format==DEMUXER_TYPE_PVA
#ifdef STREAMING_LIVE_DOT_COM
|| (demuxer->file_format==DEMUXER_TYPE_RTP && demux_is_mpeg_rtp_stream(demuxer))
#endif
1
0
Update of /cvsroot/mplayer/main/DOCS
In directory mail:/var/tmp.root/cvs-serv25437/DOCS
Modified Files:
documentation.html
Log Message:
Small HTML fix by Andras Mohari <mayday(a)varoshaza.nagyatad.hu>.
Index: documentation.html
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/documentation.html,v
retrieving revision 1.306
retrieving revision 1.307
diff -u -r1.306 -r1.307
--- documentation.html 8 Sep 2002 20:28:33 -0000 1.306
+++ documentation.html 10 Sep 2002 21:36:28 -0000 1.307
@@ -266,13 +266,14 @@
</LI>
<LI><A HREF="#known_bugs">Appendix D - Known bugs</A></LI>
<LI><A HREF="skin-en.html">Appendix E - MPlayer skin format</A></LI>
- <LI><A HREF="users_against_developers.html">Appendix F - Developer Cries</A></LI>
+ <LI><A HREF="users_against_developers.html">Appendix F - Developer Cries</A>
<UL>
<LI><A HREF="users_against_developers.html#gcc">GCC 2.96</A></LI>
<LI><A HREF="users_against_developers.html#binary">Binary distribution</A></LI>
<LI><A HREF="users_against_developers.html#nvidia">nVidia</A></LI>
<LI><A HREF="users_against_developers.html#barr">Joe Barr</A></LI>
- </UL>
+ </UL>
+ </LI>
</UL>
<HR>
1
0