Commit Graph

56 Commits

Author SHA1 Message Date
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
atlka c82d672838 minor changes according to subtitle positioning
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1575 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-08-17 11:44:46 +00:00
atlka 18133a83bb changes according to max of vo_font->pic_a[font]->h for the last line of subs
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
2001-08-17 11:14:57 +00:00
atlka dc2db77418 skip lines with negative y position if there is too many lines to display
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1570 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-08-17 08:47:58 +00:00
atlka 01f3a2a3a4 minor changes in sub.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1550 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-08-16 11:36:13 +00:00
atlka aad3a2ec86 changes according to proper subfont bar positioning and char spaceing - sub.c
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
2001-08-16 09:25:32 +00:00
arpi b15e5745af segfault fixed
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1525 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-08-15 00:35:35 +00:00
atlka 8632ea0526 modified mplayer.c to rewert to PLAY after rewinding after 1 sec
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1505 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-08-13 13:12:49 +00:00
atlka 0a9ae48206 libvo/sub.c corrections
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1504 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-08-13 11:45:21 +00:00
atlka 8a50a66922 atlka@pg.gda.pl:
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
2001-08-13 11:33:34 +00:00
atlka ca99c8dc89 changes according to -utf8 option, draw_osd() function added
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1502 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-08-13 11:08:18 +00:00
al3x 790fa570cf -Wall like fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1110 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-06-12 14:03:18 +00:00
arpi_esp ba8f720ce0 FAST_OSD option to disable font outline antialiasing
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@948 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-06-02 16:02:38 +00:00
arpi_esp 6daab845ea removed redundant osd.h includes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@866 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-05-24 20:48:45 +00:00
arpi_esp c232fa7e86 j->k for correct unicode...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@806 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-05-14 23:38:18 +00:00
arpi_esp 3d5aea9555 sub splitting patch applied by Vlada V.Dubsky@sh.cvut.cz
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@804 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-05-14 22:08:12 +00:00
atmosfear b1d77e6840 Deal with unicode subs (-unicode -nounicode).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@727 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-05-08 19:40:10 +00:00
arpi_esp e3d4468a24 better .smi support and display two-byte characters- patch by Sunjin Yang
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@707 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-05-06 02:26:17 +00:00