Commit Graph

73 Commits

Author SHA1 Message Date
henry 1197d4d187 prevent lockups on words which do not fit on the screen - temporary fix
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11298 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-10-27 21:36:29 +00:00
mosu 01af53f132 Get rid of the annoying and useless "Subtitles requested but not found" message.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11202 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-10-21 08:45:13 +00:00
henry 1526dc6cdf Subtitle alignment & smart splitting by Salvatore Falco
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10917 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-09-21 13:20:06 +00:00
arpi 080311d08f TiVo demuxer and sub-cc/osd decoder
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
2003-06-09 00:24:49 +00:00
arpi 8fb42e1791 1000l
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9037 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-19 20:13:49 +00:00
filon cb66d1f0f7 Update font scale after changing pancan.
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
2003-01-06 12:27:39 +00:00
henry 34b70a1c77 sanity check
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8795 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-05 13:32:57 +00:00
arpi c8b0ddfe4e these patches let ,,oldstyle'' and freetype subtitle renderers live
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
2002-12-29 14:59:23 +00:00
rathann 64c7077884 Me: -sub-bg-* would be nicer. "Background" is usually shortened as "bg", not "bkg".
Arpi: feel free to change... ASAP :)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8618 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-28 15:03:23 +00:00
arpi 17c39c4e57 The following patch adds two new command line options:
-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
2002-12-28 13:41:02 +00:00
arpi 501706292e -subwidth
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8584 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-27 21:41:40 +00:00
arpi 62490c001c backward compatibility :)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8579 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-27 17:28:35 +00:00
arpi 725ff339e7 This patch adds support for vertical subtitle alignment
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
2002-12-23 01:37:43 +00:00
arpi b987127e0e compiler warning fixes
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
2002-12-14 17:56:35 +00:00
henry d9b33edbba progbar osd buffer height adjustment fix
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8423 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-10 23:10:24 +00:00
arpi 268b2c1a0f overlapping subtitles support is now optional, can be disabled (-nooverlapsub)
patch by Salvatore Falco <sfalco@studenti.ing.uniroma1.it>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8362 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-05 00:03:35 +00:00
arpi f859d013a8 *HUGE* set of compiler warning fixes, unused variables removal
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
2002-11-06 23:54:29 +00:00
arpi ce587559f7 This patch adds the functionality to disable/enable subtitles while playing
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
2002-10-06 17:40:51 +00:00
arpi 5e59ee3344 subtitle/osd cache - pre-render text to a buffer with alpha and bitmap separated
- 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
2002-08-28 20:45:42 +00:00
pontscho ae86e62a6a fix dxr3 subtitle handling and add some optimizations
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7068 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-08-22 13:58:38 +00:00
arpi 0deb4c4346 warning fixes by Sylvain Petreolle <spetreolle@yahoo.fr>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7004 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-08-14 21:28:18 +00:00
atmos4 73a97eb400 Bounding box and partial update patch for vob/dvdsub by Hephooey.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6191 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-05-25 17:40:40 +00:00
albeu 7562937d95 Improvment for spu subtitles.
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
2002-05-17 23:47:27 +00:00
arpi 76ad9ef86e bbox calculation fixed (font->height < real height)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5665 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-04-17 20:46:12 +00:00
arpi 5bb2eef3a1 vo_osd_check_range_update() added + 10l fix
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5646 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-04-16 00:35:01 +00:00
arpi 3fc73ead66 osd: ok, now it's possible to do partial draw/clear of the buffer only if changed
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5643 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-04-15 22:08:50 +00:00
arpi 7fd48f4833 osd: calculating bbox
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5641 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-04-15 20:51:34 +00:00
arpi dffeec9ce1 new osd code, use osd objs to follow changes and do minimal updates
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5639 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-04-15 19:17:12 +00:00
arpi a2a8eec208 #include cleanup
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5504 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-04-06 19:09:06 +00:00
arpi 2eba558fcd moved font_laod.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5295 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-03-24 00:32:13 +00:00
atmos4 06ebd66015 osd outside movie support for vo_sdl, patch by Fredrik Kuivinen
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4808 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-02-22 15:25:11 +00:00
atmos4 8337d9c26f subtitle positioning patch by Jiri Svoboda
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4774 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-02-20 22:43:34 +00:00
kmkaplan 940ceca1e7 Add DVD subtitles to menoder
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4089 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-01-11 16:06:45 +00:00
kmkaplan 610d48a930 Support software scaling with DVD subtitles
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4088 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-01-11 12:14:29 +00:00
kmkaplan 4d08add9a2 Add vobsub support, suppress conditionnal on USE_DVDREAD.
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
2002-01-10 17:21:00 +00:00
pl b7ff737901 spudec_new has a dvd_priv_t as an argument, which is defined in
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
2001-11-28 12:44:39 +00:00
arpi 7cb47d1cbc DVD sub patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3035 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-11-20 18:36:50 +00:00
nick c07c47b4c3 never declare variables in *.h files, pls
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2499 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-10-27 14:30:43 +00:00
atlka 8a1579e344 corrected previous error ;-(
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2206 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-10-15 08:16:54 +00:00
atlka bfeb215e95 optimizations and corrections
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2205 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-10-15 06:14:55 +00:00
atlka aeb64d7309 speed improvements
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2177 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-10-12 13:24:07 +00:00
pontscho 2a59fbf120 add gui support to config scripts, and fixed some warning.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1992 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-09-27 17:40:43 +00:00
atlka 87baa9c196 corrections to OSD mark position
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1879 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-09-10 13:23:27 +00:00
pontscho d62c80d3bd fix xshape, mixer, fullscreen, etc
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1853 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-09-04 15:21:00 +00:00
arpi acc7b7085f small fixes, and Y check put back to avoid sig11
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1825 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-09-01 17:56:31 +00:00
arpi 5c21ed495f fixed signal 8 bug
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1823 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-09-01 15:49:31 +00:00
atlka 7e4dac5d3d changes according to OSD calculations
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1728 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-08-28 14:22:37 +00:00
atlka 60737e3845 corrections to OSD progbar position calculations
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1727 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-08-28 12:43:41 +00:00
atlka 9d7ee85cd0 minor changes according to OSD
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1603 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-08-21 11:28:50 +00:00
atlka b160e4d958 draw speedups, cut text if too many lines
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1592 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-08-20 09:14:28 +00:00