Mercurial > mplayer.hg
view Copyright @ 27518:e54c9b7eb0d8
Revert bad changes to SSA/ASS subtitle packet format
The following commits are reverted partially or completely:
"a valid ASS line contains 9 ',' before actual text"
"demux_mkv: output correctly formated ASS packets"
"libass: add a new ass_process_data() to process demuxed subtitle packets"
These commits converted the internal representation of SSA/ASS
subtitle packets from the format used by Matroska to a custom format
where each packet has contents exactly matching one line in complete
SSA script files. AFAIK no files natively use such a format for muxed
subtitles. The stated reason for this change was to use a format that
could in principle be muxed into a maximal number of containers. SSA
subtitles do not have an implicit duration so both start time and
duration or end time need to be specified explicitly; the new format
moved timing information inside the codec packet data so it could be
muxed without modification into containers that can represent only
start time at the container level. However such a change is wrong from
the viewpoint of program architecture. Timing information belongs to
the demuxer level, but these commits moved not only the duration but
also the authoritative value of the start time to inside the codec
data. Additionally the new format lost the value of the Matroska
ReadOrder field which is used by MPlayer.
This commit changes the internal packet format back to that used by
Matroska and makes the internal Matroska demuxer output that format
again. Libavformat still outputs the "new" format; it could be
converted back to the Matroska format in demux_lavf.c, but I'm not
adding that code at least yet. The current lavf code has similar
problems as the reverted code in MPlayer, and it also currently fails
to provide any way to access the value of the ReadOrder field. I hope
that the lavf side will be improved; if it isn't conversion can be
added later. For now I'll make MPlayer default to the internal Matroska
demuxer instead of the lavf one in a separate commit.
author | uau |
---|---|
date | Mon, 08 Sep 2008 21:26:22 +0000 |
parents | ea01824701a5 |
children | da2271c341ee |
line wrap: on
line source
MPlayer was originally written by Árpád Gereöffy and has been extended and worked on by many more since then, see the AUTHORS file for an (incomplete) list. You are free to use it under the terms of the GNU General Public License, as described in the LICENSE file. MPlayer as a whole is copyrighted by the MPlayer team. Individual copyright notices can be found in the file headers. Furthermore, MPlayer includes code from several external sources: Name: FFmpeg Version: Subversion HEAD Homepage: http://www.ffmpeg.org Directory: libavcodec, libavformat, libavutil, libpostproc Copyright: Many, see individual files for copyright notices. License: GNU Lesser General Public License, some parts GNU General Public License, GNU General Public License when combined Name: FAAD2 Version: 2.1 beta (20040915 CVS snapshot) + fixes and portability patches Homepage: http://www.audiocoding.com Directory: libfaad2 Copyright: 2003-2004 M. Bakker, Ahead Software AG, http://www.nero.com License: GNU General Public License Name: GSM 06.10 library Version: patchlevel 10 Homepage: http://kbs.cs.tu-berlin.de/~jutta/toast.html Directory: libmpcodecs/native/ Copyright: 1992 by Jutta Degener and Carsten Bormann, TU Berlin License: permissive, see libmpcodecs/native/xa_gsm.c Name: liba52 Version: 0.7.4 + patches Homepage: http://liba52.sourceforge.net/ Directory: liba52 Copyright: 1999-2000 Aaron Holtzman <aholtzma@ess.engr.uvic.ca> 2000-2001 Michel Lespinasse <walken@zoy.org> 2000 Yuqing Deng <Yuqing_Deng@brown.edu> 2002 Nick Kurshev 2004 Romain Dolbeau <romain@dolbeau.org> License: GNU General Public License Name: libdvdcss Version: 1.2.10 Homepage: http://developers.videolan.org/libdvdcss/ Directory: libdvdcss Copyright: 1998-2008 VideoLAN License: GNU General Public License Name: libdvdread Version: 0.9.7 + patches Homepage: http://www.dtek.chalmers.se/groups/dvd/development.shtml Directory: libdvdread Copyright: 1998, 1999 Eric Smith <eric@brouhaha.com> 1999 Christian Wolff for convergence integrated media 2000-2001 Billy Biggs <vektor@dumbterm.net>, 2001-2002 Samuel Hocevar <sam@zoy.org>, 2000-2003 Björn Englund <d4bjorn@dtek.chalmers.se>, 2000-2003 Håkan Hjort <d95hjort@dtek.chalmers.se> License: GNU General Public License Name: libmpeg2 Version: 0.4.1 + patches Homepage: http://libmpeg2.sourceforge.net/ Directory: libmpeg2 Copyright: 1999-2000 Aaron Holtzman <aholtzma@ess.engr.uvic.ca> 2000-2003 Michel Lespinasse <walken@zoy.org> 2002-2003 Falk Hueffner <falk@debian.org> 2003 David S. Miller <davem@redhat.com> 2003 Regis Duchesne <hpreg@zoy.org> 2003 Peter Gubanov <peter@elecard.net.ru> License: GNU General Public License Name: mpg123 Version: 0.59s + significant changes Homepage: http://www.mpg123.de/ Directory: mp3lib Copyright: 1995-1999 by Michael Hipp 2004 Romain Dolbeau <romain@dolbeau.org> 2006 Zuxy Meng <zuxy.meng@gmail.com License: GNU General Public License Name: Tremor Version: 1.0 + parts CVS from December 2004 + patches Homepage: http://xiph.org/ Directory: tremor Copyright: 1994-2002, Xiph.org Foundation http://www.xiph.org/ License: BSD-like, see tremor/COPYING Name: avifile DLL loader Version: 0.47 + patches + CVS updates Homepage: http://avifile.sourceforge.net/ Directory: loader/ Copyright: 1993 Robert J. Amstadt 1994 Eric Youndale & Erik Bos 1995 Thomas Sandford 1995-1996 Alexandre Julliard 1996-1998 Marcus Meissner 1996 Martin von Loewis 2000-2001 Eugene Kuznetsov (divx@euro.ru) License: GNU General Public License Name: dvbstream Version: 0.4.3-pre3 (CVS checkout) Homepage: http://sourceforge.net/projects/dvbtools/ Directory: stream/dvbin.h stream/rtp.[ch] stream/stream_dvb.c Copyright: 2001-2002 Dave Chapman <dave@dchapman.com> License: GNU General Public License Name: librtsp Version: xine CVS 2003/04/10 + patches Homepage: http://www.xinehq.de Directory: stream/librtsp/ Copyright: 2000-2002 the xine project License: GNU General Public License Name: realrtsp Version: xine CVS 2003/04/17 + patches Homepage: http://www.xinehq.de Directory: stream/realrtsp/ Copyright: 2002 the xine project License: GNU General Public License Name: pnm protocol implementation Version: xine CVS 2002/12/26 + patches Homepage: http://www.xinehq.de Directory: stream/pnm.[ch] Copyright: 2000-2002 the xine project License: GNU General Public License Name: id3edit Version: 1.9 + patches Homepage: http://id3edit.sourceforge.net/ Directory: libmpdemux/genres.h Copyright: 2001 Jason Carter License: GNU General Public License Name: FreeSDP Version: 0.4.1 Homepage: https://savannah.nongnu.org/projects/freesdp/ Directory: stream/freesdp/ Copyright: 2001-2003 Federico Montesino Pouzols <fedemp@suidzer0.org> License: GNU General Public License Name: MJPEG Tools Version: post 2001-12-03 release or CVS snapshot Homepage: http://mjpeg.sourceforge.net/ Directory: libmpdemux/yuv4mpeg* Copyright: 2001 Matthew J. Marjanovic <maddog@mir.com> 2001 Andrew Stevens <andrew.stevens@philips.com> License: GNU General Public License Name: NuppelVideo / RTJPEG Version: 0.52a + patches Homepage: http://web.archive.org/web/20060219034716/http://frost.htu.tuwien.ac.at/~roman/nuppelvideo/ Directory: libmpcodecs/native/rtjpegn.[ch] libmpdemux/nuppelvideo.h Copyright: 1998 Justin Schoeman (justin@suntiger.ee.up.ac.za) 1998, 1999 Joerg Walter <trouble@moes.pmnet.uni-oldenburg.de> 1999 Wim Taymans <wim.taymans@tvd.be> License: GNU General Public License Name: ReactOS Version: r25937 Homepage: http://www.reactos.org/ Directory: vidix/dhahelperwin/ntverp.h vidix/dhahelperwin/common.ver Copyright: Alex Ionescu (alex.ionescu@reactos.org) License: GNU General Public License