aboutsummaryrefslogtreecommitdiffhomepage
path: root/libvo/sub.c
Commit message (Collapse)AuthorAge
* add new -subfont option, that allows having a different font for OSD ↵Gravatar ben2007-05-20
| | | | | | (controls and menu) and subtitles git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23356 b3059339-0415-0410-9bf9-f77b7e298cf2
* Mark utf8_get_char parameter as const and fix a compiler warningGravatar reimar2006-12-11
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21598 b3059339-0415-0410-9bf9-f77b7e298cf2
* Another simplificationGravatar reimar2006-12-11
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21597 b3059339-0415-0410-9bf9-f77b7e298cf2
* Reuse utf8_get_char in subtitle rendering code.Gravatar reimar2006-12-11
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21596 b3059339-0415-0410-9bf9-f77b7e298cf2
* 100l typo in 21380 disabled OSD with at least xvmc.Gravatar reimar2006-12-03
| | | | | | | Patch by Andrew Cohen [cohen bu edu] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21459 b3059339-0415-0410-9bf9-f77b7e298cf2
* EMISSINGBRAIN: No, OSD objects of size 0 sure are _not_ visible.Gravatar reimar2006-11-29
| | | | | | | | Fixes massive slowdown after adding dvdnav highlight support, at least with -vo xvmc, potentially others too. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21380 b3059339-0415-0410-9bf9-f77b7e298cf2
* keep nav highlight event in dvdnav priv structureGravatar ben2006-11-25
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21235 b3059339-0415-0410-9bf9-f77b7e298cf2
* better nav highlight handlingGravatar ben2006-11-25
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21216 b3059339-0415-0410-9bf9-f77b7e298cf2
* support for dvdnav menu buttons overlay as simple alpha boxes (rework from ↵Gravatar ben2006-11-25
| | | | | | Otvos Attila's series of patches) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21209 b3059339-0415-0410-9bf9-f77b7e298cf2
* Reuse UTF-8 reading code in libavutilGravatar reimar2006-08-12
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19372 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make some functions static.Gravatar uau2006-07-08
| | | | | | | Patch by Stefan Huehner, stefan at huehner org. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18955 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make utf8_get_char non-static.Gravatar eugeni2006-07-07
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18940 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support UTF8 in OSD textGravatar reimar2006-06-15
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18720 b3059339-0415-0410-9bf9-f77b7e298cf2
* Missing free for malloced char_seq in OSD codeGravatar reimar2006-06-15
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18719 b3059339-0415-0410-9bf9-f77b7e298cf2
* Patch by Stefan Huehner / stefan % huehner ! org \Gravatar rathann2006-02-09
| | | | | | | | | | | | | | | | | | | | | | patch replaces '()' for the correct '(void)' in function declarations/prototypes which have no parameters. The '()' syntax tell thats there is a variable list of arguments, so that the compiler cannot check this. The extra CFLAG '-Wstrict-declarations' shows those cases. Comments about a similar patch applied to ffmpeg: That in C++ these mean the same, but in ANSI C the semantics are different; function() is an (obsolete) K&R C style forward declaration, it basically means that the function can have any number and any types of parameters, effectively completely preventing the compiler from doing any sort of type checking. -- Erik Slagter Defining functions with unspecified arguments is allowed but bad. With arguments unspecified the compiler can't report an error/warning if the function is called with incorrect arguments. -- Måns Rullgård git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17567 b3059339-0415-0410-9bf9-f77b7e298cf2
* Added translatable messages for OSD localization to help/help_mp-en.hGravatar ptt2005-11-06
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16924 b3059339-0415-0410-9bf9-f77b7e298cf2
* make bottom alignment the default since it's the only sane mode when sub_pos ↵Gravatar rfelker2005-10-23
| | | | | | is near bottom (default) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16840 b3059339-0415-0410-9bf9-f77b7e298cf2
* reverse incorrect sub alignment change, ok'd by diegoGravatar rfelker2005-10-23
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16839 b3059339-0415-0410-9bf9-f77b7e298cf2
* The conditions for bottom (2) and top (1) subtitle alignment are reversed.Gravatar diego2005-10-23
| | | | | | | patch by Paul TT < paultt == at -- hackerjournal == dot -- it > git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16835 b3059339-0415-0410-9bf9-f77b7e298cf2
* defer loading of the font after display size change to avoid uselessGravatar henry2005-04-10
| | | | | | | | reloading - hack, but needed because for most of the vo's the panscan information and screen size are updated asynchronously git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15086 b3059339-0415-0410-9bf9-f77b7e298cf2
* reload font on each change of the display sizeGravatar henry2005-04-09
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15079 b3059339-0415-0410-9bf9-f77b7e298cf2
* Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.Gravatar diego2004-10-28
| | | | | | | Based on a patch by Sebastian Hegler <s_hegler at gmx dot de>. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13788 b3059339-0415-0410-9bf9-f77b7e298cf2
* This time is a patch to improve subtitle alignment management. ItGravatar faust32004-09-15
| | | | | | | | | | | implements SSA alignment styles; note that alignment for SSA files is not actually supported, but for SAMI files (which use the same alignment codes) it is. patch by Salvatore Falco <sfalco at studenti.ing.uniroma1.it> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13344 b3059339-0415-0410-9bf9-f77b7e298cf2
* don't use uninitialized font descriptionsGravatar faust32004-07-11
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12795 b3059339-0415-0410-9bf9-f77b7e298cf2
* prevent lockups on words which do not fit on the screen - temporary fixGravatar henry2003-10-27
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11298 b3059339-0415-0410-9bf9-f77b7e298cf2
* Get rid of the annoying and useless "Subtitles requested but not found" message.Gravatar mosu2003-10-21
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11202 b3059339-0415-0410-9bf9-f77b7e298cf2
* Subtitle alignment & smart splitting by Salvatore FalcoGravatar henry2003-09-21
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10917 b3059339-0415-0410-9bf9-f77b7e298cf2
* TiVo demuxer and sub-cc/osd decoderGravatar arpi2003-06-09
| | | | | | | | | | | | | patch by usenet@wingert.org (http://tivo-mplayer.sourceforge.net/releases/MPlayer-20030501-tivo-patch.gz) changes by me: - spit demux_ty to demux_ty and demux_ty_osd (later handles mpeg user-data decoding, ie sub-cc and osd) - removed some cosmetics changes - some compile fixes (gcc3 specific variable decl etc) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10264 b3059339-0415-0410-9bf9-f77b7e298cf2
* 1000lGravatar arpi2003-01-19
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9037 b3059339-0415-0410-9bf9-f77b7e298cf2
* Update font scale after changing pancan.Gravatar filon2003-01-06
| | | | | | | It makes fonts keep scale when they are set to be proportional to width. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8820 b3059339-0415-0410-9bf9-f77b7e298cf2
* sanity checkGravatar henry2003-01-05
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8795 b3059339-0415-0410-9bf9-f77b7e298cf2
* these patches let ,,oldstyle'' and freetype subtitle renderers liveGravatar arpi2002-12-29
| | | | | | | | | | | together happily. if an oldstyle subtitle (font.desc) is found, it will be used. otherwise mplayer will choose subfont.ttf, if freetype was detected during ./configure. (also you can use -font /path/to/font.desc and -font /path/to/foobar.ttf too) patch-set by Wojtek Kaniewski <wojtekka@bydg.pdi.net> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8636 b3059339-0415-0410-9bf9-f77b7e298cf2
* Me: -sub-bg-* would be nicer. "Background" is usually shortened as "bg", not ↵Gravatar rathann2002-12-28
| | | | | | | | | "bkg". Arpi: feel free to change... ASAP :) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8618 b3059339-0415-0410-9bf9-f77b7e298cf2
* The following patch adds two new command line options:Gravatar arpi2002-12-28
| | | | | | | | | | | | | | -sub-bkg-color n -sub-bkg-alpha n They control the color and alpha value used to initialize the subtitles and OSD BBOX. With this you can have subtitles inside a traslucent rectangle. This is useful when a movie already have "hardcoded" subtitles and you want to overwrite them with rendered subtitles avoiding too much confusion. patch by Salvador Eduardo Tropea <salvador@inti.gov.ar> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8602 b3059339-0415-0410-9bf9-f77b7e298cf2
* -subwidthGravatar arpi2002-12-27
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8584 b3059339-0415-0410-9bf9-f77b7e298cf2
* backward compatibility :)Gravatar arpi2002-12-27
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8579 b3059339-0415-0410-9bf9-f77b7e298cf2
* This patch adds support for vertical subtitle alignmentGravatar arpi2002-12-23
| | | | | | | | | | | | | | | | | | control. Possible values are top, center, and bottom, with bottom being the default. Alignment is relevant when it comes to positioning subtitles with one line (or fewer lines) of text relative to multi-line subtitles. It is implemented as a new command (sub_alignment) that without an argument cycles the alignment (between top, center, and bottom), or with an argument sets the alignment (0 for top, 1 for center, 2 for bottom). The key 'i' is bound to this command. patch by Oskar Liljeblad (oskar@osk.mine.nu) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8535 b3059339-0415-0410-9bf9-f77b7e298cf2
* compiler warning fixesGravatar arpi2002-12-14
| | | | | | | based on patch by Dominik Mierzejewski <dominik@rangers.eu.org> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8452 b3059339-0415-0410-9bf9-f77b7e298cf2
* progbar osd buffer height adjustment fixGravatar henry2002-12-10
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8423 b3059339-0415-0410-9bf9-f77b7e298cf2
* overlapping subtitles support is now optional, can be disabled (-nooverlapsub)Gravatar arpi2002-12-05
| | | | | | | patch by Salvatore Falco <sfalco@studenti.ing.uniroma1.it> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8362 b3059339-0415-0410-9bf9-f77b7e298cf2
* *HUGE* set of compiler warning fixes, unused variables removalGravatar arpi2002-11-06
| | | | | | | based on patch by Dominik Mierzejewski <dominik@rangers.eu.org> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8124 b3059339-0415-0410-9bf9-f77b7e298cf2
* This patch adds the functionality to disable/enable subtitles while playingGravatar arpi2002-10-06
| | | | | | | | | | | | a video. I mapped it to the input-keyword "sub_visibility". This keyword is mapped to the 'v' key on the keyboard. I tested the patch with old-fashioned subtitles, with freetype subtitles and DVD subtitles. Works fine. The patch also includes documentation updates. patch by Uwe.Reder@3SOFT.de git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7629 b3059339-0415-0410-9bf9-f77b7e298cf2
* subtitle/osd cache - pre-render text to a buffer with alpha and bitmap separatedGravatar arpi2002-08-28
| | | | | | | | | | - it solves overlapping alpha problem - speed up osd rendering (it renders bigger area but in a single pass) patch by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz> some cleanup by me git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7122 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix dxr3 subtitle handling and add some optimizationsGravatar pontscho2002-08-22
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7068 b3059339-0415-0410-9bf9-f77b7e298cf2
* warning fixes by Sylvain Petreolle <spetreolle@yahoo.fr>Gravatar arpi2002-08-14
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7004 b3059339-0415-0410-9bf9-f77b7e298cf2
* Bounding box and partial update patch for vob/dvdsub by Hephooey.Gravatar atmos42002-05-25
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6191 b3059339-0415-0410-9bf9-f77b7e298cf2
* Improvment for spu subtitles.Gravatar albeu2002-05-17
| | | | | | | | | | | | Removed the integreted spudec in vobsub. Various cleanup/bugfix in vobsub (no more auto palette when a true one is here) HW spu rendering moved in spudec because we first need to reassable the packet before sending them to the hw. Spudec is now created only if nedded. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6111 b3059339-0415-0410-9bf9-f77b7e298cf2
* bbox calculation fixed (font->height < real height)Gravatar arpi2002-04-17
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5665 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_osd_check_range_update() added + 10l fixGravatar arpi2002-04-16
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5646 b3059339-0415-0410-9bf9-f77b7e298cf2
* osd: ok, now it's possible to do partial draw/clear of the buffer only if ↵Gravatar arpi2002-04-15
| | | | | | changed git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5643 b3059339-0415-0410-9bf9-f77b7e298cf2