summaryrefslogtreecommitdiffstats
path: root/libvo/sub.c
Commit message (Collapse)AuthorAgeFilesLines
* Rename font-related preprocessor directives.diego2008-08-071-3/+3
| | | | | | | Switch them from a HAVE_ to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27425 b3059339-0415-0410-9bf9-f77b7e298cf2
* Change a bunch of video/audio-output-specific preprocessor directives fromdiego2008-08-031-6/+6
| | | | | | | a HAVE_ prefix to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27402 b3059339-0415-0410-9bf9-f77b7e298cf2
* Start unifying names of internal preprocessor directives.diego2008-07-301-6/+6
| | | | | | | | Replace all USE_ prefixes by CONFIG_ prefixes to indicate options which are configurable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27373 b3059339-0415-0410-9bf9-f77b7e298cf2
* Allow independent scaling of vo_font and sub_font.reimar2008-01-271-6/+6
| | | | | | | Patch by Guillaume LECERF (foxcore gmail com). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25879 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: misc typo fixesdiego2007-09-251-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24615 b3059339-0415-0410-9bf9-f77b7e298cf2
* warning fix:diego2007-09-241-1/+2
| | | | | | | | sub.c: In function 'vo_update_osd': sub.c:1104: warning: suggest explicit braces to avoid ambiguous 'else' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24602 b3059339-0415-0410-9bf9-f77b7e298cf2
* warning fix:diego2007-09-101-0/+1
| | | | | | | | sub.c: In function 'vo_update_text_teletext': sub.c:293: warning: implicit declaration of function 'GetTimer' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24398 b3059339-0415-0410-9bf9-f77b7e298cf2
* Implement boxes for subtitle teletext pages.voroshil2007-09-081-0/+1
| | | | | | | | | | Text is shown in opaque boxes inside transparent teletext page. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24364 b3059339-0415-0410-9bf9-f77b7e298cf2
* Proper support for flashing chars in teletext pages.voroshil2007-09-011-2/+4
| | | | | | | | Patch from Otvos Attila oattila at chello dot hu git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24312 b3059339-0415-0410-9bf9-f77b7e298cf2
* Identifiers should not start with two underscores.diego2007-08-151-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24066 b3059339-0415-0410-9bf9-f77b7e298cf2
* Teletext supportvoroshil2007-07-291-0/+263
| | | | | | | | Part 4/5: teletext page rendering git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23923 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use -font for subtitles when -subfont is not given, patch by kiriujazuxy2007-07-111-2/+8
| | | | | | | <mplayer-patches AT en-directo DOT net> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23762 b3059339-0415-0410-9bf9-f77b7e298cf2
* Revert r23530.voroshil2007-06-211-130/+0
| | | | | | | | | r23530 breaks policy: notification was not sent to mailing list, agreements of other devs were not received. Code also should be reviewed/cleaned up/fixed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23593 b3059339-0415-0410-9bf9-f77b7e298cf2
* The audio balance feature implemented with af_pan.zuxy2007-06-201-2/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23588 b3059339-0415-0410-9bf9-f77b7e298cf2
* Teletext support for tv:// (v4l and v4l2 only)voroshil2007-06-101-0/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified patch from Otvos Attila oattila at chello dot hu Module uses zvbi library for all low-level VBI operations (like I/O with vbi device, converting vbi pages into usefull vbi_page stuctures, rendering them into RGB32 images). All teletext related stuff (except properties, slave commands and rendering osd in text mode or RGB32 rendered teletext pages in spu mode) is implemented in tvi_vbi.c New properties: teletext_page - switching between pages teletext_mode - switch between on/off/opaque/transparent modes teletext_format - (currently read-only) allows to get format info (black/white,gray,text) teletext_half_page - trivial zooming (displaying top/bottom half of teletext page) New slave commands: teletext_add_dec - user interface for jumping to any page by editing page number interactively teletext_go_link - goes though links, specified on current page git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23530 b3059339-0415-0410-9bf9-f77b7e298cf2
* add new -subfont option, that allows having a different font for OSD ↵ben2007-05-201-28/+36
| | | | | | (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 warningreimar2006-12-111-6/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21598 b3059339-0415-0410-9bf9-f77b7e298cf2
* Another simplificationreimar2006-12-111-3/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21597 b3059339-0415-0410-9bf9-f77b7e298cf2
* Reuse utf8_get_char in subtitle rendering code.reimar2006-12-111-13/+6
| | | | 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.reimar2006-12-031-1/+1
| | | | | | | 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.reimar2006-11-291-2/+6
| | | | | | | | 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 structureben2006-11-251-6/+14
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21235 b3059339-0415-0410-9bf9-f77b7e298cf2
* better nav highlight handlingben2006-11-251-6/+8
| | | | 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 ↵ben2006-11-251-0/+34
| | | | | | 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 libavutilreimar2006-08-121-17/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19372 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make some functions static.uau2006-07-081-1/+1
| | | | | | | 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.eugeni2006-07-071-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18940 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support UTF8 in OSD textreimar2006-06-151-2/+31
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18720 b3059339-0415-0410-9bf9-f77b7e298cf2
* Missing free for malloced char_seq in OSD codereimar2006-06-151-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18719 b3059339-0415-0410-9bf9-f77b7e298cf2
* Patch by Stefan Huehner / stefan % huehner ! org \rathann2006-02-091-3/+3
| | | | | | | | | | | | | | | | | | | | | | 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.hptt2005-11-061-12/+13
| | | | 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 ↵rfelker2005-10-231-1/+1
| | | | | | 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 diegorfelker2005-10-231-1/+1
| | | | 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.diego2005-10-231-1/+1
| | | | | | | 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 uselesshenry2005-04-101-4/+26
| | | | | | | | 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 sizehenry2005-04-091-1/+4
| | | | 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.diego2004-10-281-1/+1
| | | | | | | 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. Itfaust32004-09-151-5/+12
| | | | | | | | | | | 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 descriptionsfaust32004-07-111-1/+1
| | | | 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 fixhenry2003-10-271-2/+2
| | | | 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.mosu2003-10-211-2/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11202 b3059339-0415-0410-9bf9-f77b7e298cf2
* Subtitle alignment & smart splitting by Salvatore Falcohenry2003-09-211-83/+303
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10917 b3059339-0415-0410-9bf9-f77b7e298cf2
* TiVo demuxer and sub-cc/osd decoderarpi2003-06-091-0/+3
| | | | | | | | | | | | | 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
* 1000larpi2003-01-191-1/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9037 b3059339-0415-0410-9bf9-f77b7e298cf2
* Update font scale after changing pancan.filon2003-01-061-1/+1
| | | | | | | 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 checkhenry2003-01-051-1/+9
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8795 b3059339-0415-0410-9bf9-f77b7e298cf2
* these patches let ,,oldstyle'' and freetype subtitle renderers livearpi2002-12-291-2/+2
| | | | | | | | | | | 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 ↵rathann2002-12-281-4/+4
| | | | | | | | | "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:arpi2002-12-281-2/+4
| | | | | | | | | | | | | | -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
* -subwidtharpi2002-12-271-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8584 b3059339-0415-0410-9bf9-f77b7e298cf2
* backward compatibility :)arpi2002-12-271-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8579 b3059339-0415-0410-9bf9-f77b7e298cf2
* This patch adds support for vertical subtitle alignmentarpi2002-12-231-6/+17
| | | | | | | | | | | | | | | | | | 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 fixesarpi2002-12-141-3/+4
| | | | | | | 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 fixhenry2002-12-101-4/+5
| | | | 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)arpi2002-12-051-1/+21
| | | | | | | 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 removalarpi2002-11-061-1/+4
| | | | | | | 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 playingarpi2002-10-061-3/+4
| | | | | | | | | | | | 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 separatedarpi2002-08-281-54/+154
| | | | | | | | | | - 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 optimizationspontscho2002-08-221-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7068 b3059339-0415-0410-9bf9-f77b7e298cf2
* warning fixes by Sylvain Petreolle <spetreolle@yahoo.fr>arpi2002-08-141-0/+2
| | | | 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.atmos42002-05-251-2/+20
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6191 b3059339-0415-0410-9bf9-f77b7e298cf2
* Improvment for spu subtitles.albeu2002-05-171-11/+1
| | | | | | | | | | | | 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)arpi2002-04-171-10/+35
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5665 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_osd_check_range_update() added + 10l fixarpi2002-04-161-0/+17
| | | | 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 ↵arpi2002-04-151-6/+25
| | | | | | changed git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5643 b3059339-0415-0410-9bf9-f77b7e298cf2
* osd: calculating bboxarpi2002-04-151-19/+55
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5641 b3059339-0415-0410-9bf9-f77b7e298cf2
* new osd code, use osd objs to follow changes and do minimal updatesarpi2002-04-151-65/+173
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5639 b3059339-0415-0410-9bf9-f77b7e298cf2
* #include cleanuparpi2002-04-061-2/+3
| | |