summaryrefslogtreecommitdiffstats
path: root/libvo/sub.c
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5504 b3059339-0415-0410-9bf9-f77b7e298cf2
* moved font_laod.harpi2002-03-241-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5295 b3059339-0415-0410-9bf9-f77b7e298cf2
* osd outside movie support for vo_sdl, patch by Fredrik Kuivinenatmos42002-02-221-0/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4808 b3059339-0415-0410-9bf9-f77b7e298cf2
* subtitle positioning patch by Jiri Svobodaatmos42002-02-201-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4774 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add DVD subtitles to menoderkmkaplan2002-01-111-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4089 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support software scaling with DVD subtitleskmkaplan2002-01-111-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4088 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add vobsub support, suppress conditionnal on USE_DVDREAD.kmkaplan2002-01-101-7/+12
| | | | | | | DVD and VobSub subtitles are displayed even if fonts can't be loaded. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4082 b3059339-0415-0410-9bf9-f77b7e298cf2
* spudec_new has a dvd_priv_t as an argument, which is defined inpl2001-11-281-2/+4
| | | | | | | libmpdemux/stream.h only if USE_DVDREAD is defined. (Arpi) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3181 b3059339-0415-0410-9bf9-f77b7e298cf2
* DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>arpi2001-11-201-0/+10
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3035 b3059339-0415-0410-9bf9-f77b7e298cf2
* never declare variables in *.h files, plsnick2001-10-271-0/+17
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2499 b3059339-0415-0410-9bf9-f77b7e298cf2
* corrected previous error ;-(atlka2001-10-151-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2206 b3059339-0415-0410-9bf9-f77b7e298cf2
* optimizations and correctionsatlka2001-10-151-16/+20
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2205 b3059339-0415-0410-9bf9-f77b7e298cf2
* speed improvementsatlka2001-10-121-24/+13
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2177 b3059339-0415-0410-9bf9-f77b7e298cf2
* add gui support to config scripts, and fixed some warning.pontscho2001-09-271-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1992 b3059339-0415-0410-9bf9-f77b7e298cf2
* corrections to OSD mark positionatlka2001-09-101-4/+9
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1879 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix xshape, mixer, fullscreen, etcpontscho2001-09-041-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1853 b3059339-0415-0410-9bf9-f77b7e298cf2
* small fixes, and Y check put back to avoid sig11arpi2001-09-011-5/+21
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1825 b3059339-0415-0410-9bf9-f77b7e298cf2
* fixed signal 8 bugarpi2001-09-011-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1823 b3059339-0415-0410-9bf9-f77b7e298cf2
* changes according to OSD calculationsatlka2001-08-281-8/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1728 b3059339-0415-0410-9bf9-f77b7e298cf2
* corrections to OSD progbar position calculationsatlka2001-08-281-3/+19
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1727 b3059339-0415-0410-9bf9-f77b7e298cf2
* minor changes according to OSDatlka2001-08-211-18/+22
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1603 b3059339-0415-0410-9bf9-f77b7e298cf2
* draw speedups, cut text if too many linesatlka2001-08-201-56/+51
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1592 b3059339-0415-0410-9bf9-f77b7e298cf2
* minor changes according to subtitle positioningatlka2001-08-171-3/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1575 b3059339-0415-0410-9bf9-f77b7e298cf2
* changes according to max of vo_font->pic_a[font]->h for the last line of subsatlka2001-08-171-10/+15
| | | | | | | changes for skiping subtitle lines which y pos is negative git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1574 b3059339-0415-0410-9bf9-f77b7e298cf2
* skip lines with negative y position if there is too many lines to displayatlka2001-08-171-17/+25
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1570 b3059339-0415-0410-9bf9-f77b7e298cf2
* minor changes in sub.catlka2001-08-161-7/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1550 b3059339-0415-0410-9bf9-f77b7e298cf2
* changes according to proper subfont bar positioning and char spaceing - sub.catlka2001-08-161-7/+12
| | | | | | | changes to scale from 0.100 to 0..255 for proper OSD displaying - mplayer.c git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1549 b3059339-0415-0410-9bf9-f77b7e298cf2
* segfault fixedarpi2001-08-151-2/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1525 b3059339-0415-0410-9bf9-f77b7e298cf2
* modified mplayer.c to rewert to PLAY after rewinding after 1 secatlka2001-08-131-2/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1505 b3059339-0415-0410-9bf9-f77b7e298cf2
* libvo/sub.c correctionsatlka2001-08-131-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1504 b3059339-0415-0410-9bf9-f77b7e298cf2
* atlka@pg.gda.pl:atlka2001-08-131-29/+0
| | | | | | | | | | utf8 opion corrected added draw_osd() funcion to libvo/vo_*.c files corrected indicators (brightness, sound etc.) to be in 0..100 range if we have Name.utf file it automatically switches to utf8 mode git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1503 b3059339-0415-0410-9bf9-f77b7e298cf2
* changes according to -utf8 option, draw_osd() function addedatlka2001-08-131-87/+145
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1502 b3059339-0415-0410-9bf9-f77b7e298cf2
* -Wall like fixesal3x2001-06-121-8/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1110 b3059339-0415-0410-9bf9-f77b7e298cf2
* FAST_OSD option to disable font outline antialiasingarpi_esp2001-06-021-0/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@948 b3059339-0415-0410-9bf9-f77b7e298cf2
* removed redundant osd.h includesarpi_esp2001-05-241-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@866 b3059339-0415-0410-9bf9-f77b7e298cf2
* j->k for correct unicode...arpi_esp2001-05-141-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@806 b3059339-0415-0410-9bf9-f77b7e298cf2
* sub splitting patch applied by Vlada V.Dubsky@sh.cvut.czarpi_esp2001-05-141-29/+79
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@804 b3059339-0415-0410-9bf9-f77b7e298cf2
* Deal with unicode subs (-unicode -nounicode).atmosfear2001-05-081-2/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@727 b3059339-0415-0410-9bf9-f77b7e298cf2
* better .smi support and display two-byte characters- patch by Sunjin Yangarpi_esp2001-05-061-4/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@707 b3059339-0415-0410-9bf9-f77b7e298cf2
* clean uppontscho2001-04-241-2/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@617 b3059339-0415-0410-9bf9-f77b7e298cf2
* progress bar width increasedarpi_esp2001-04-121-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@373 b3059339-0415-0410-9bf9-f77b7e298cf2
* use subreader's sub structarpi_esp2001-03-301-6/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@255 b3059339-0415-0410-9bf9-f77b7e298cf2
* sub/osd interface changesarpi_esp2001-03-271-15/+89
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@219 b3059339-0415-0410-9bf9-f77b7e298cf2
* subtitle+OSD font supportarpi_esp2001-03-251-57/+68
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@214 b3059339-0415-0410-9bf9-f77b7e298cf2
* grey+alpha rendering support (for .sub)arpi_esp2001-03-241-0/+71
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@203 b3059339-0415-0410-9bf9-f77b7e298cf2
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-14 03:09:19 +0000