Commit Graph

29 Commits

Author SHA1 Message Date
diego 5b0d96c6b4 Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.
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
2004-10-28 01:15:53 +00:00
gabucino fadce2d781 many small typo and grammar fixes
Based on Bernard Leak's mail <bernard 4t brenda-arkle.demon.co.uk>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11001 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-10-04 17:29:08 +00:00
rfelker 3b285a0e3b Improvements to spudec (DVD/VobSub) subtitle code:
- runtime selectable positioning, like with text subs
 - runtime selectable scaling/antialiasing algorithm
 - gaussian blur scaler (finally dvd/vobsub doesn't look like shit!)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9078 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-24 10:24:07 +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 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 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 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
arpi e598b63ddc pan&scan support with -vo xv by ?? <mplayer@svennevid.net>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6305 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-06-04 20:17:07 +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 278b3ae129 various openbsd and general warning fixes - patch by Björn Sandell <biorn@dce.chalmers.se>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6058 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-05-12 02:18:52 +00:00
arpi 51e8f97ef7 enabled new OSD code in -vop expand, subtitles rendering support to mencoder
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5670 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-04-17 21:51:18 +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 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 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
kmkaplan 1b6e300d94 Add vobsub support.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4081 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-01-10 17:20:27 +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
atmos4 2f70d8ead3 Fixed typo.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1911 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-09-18 14:19:33 +00:00
folke 6523f8ff3d changes made for vo_aa
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1553 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-08-16 15:18:46 +00:00
arpi_esp f14249d127 argh. i commented out wrong lines
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@899 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-05-28 15:12:14 +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
pontscho 4ff11b9949 clean up
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@617 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-04-24 11:42:04 +00:00
arpi_esp 744b828d4f use subreader's sub struct
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@255 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-03-30 03:01:50 +00:00
arpi_esp 180ba6b355 sub/osd interface changes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@219 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-03-27 00:32:24 +00:00