1
0
mirror of https://github.com/mpv-player/mpv synced 2025-03-29 15:00:27 +00:00
Commit Graph

27 Commits

Author SHA1 Message Date
Uoti Urpala
577587ec6c vf_ass: Copy less unnecessary data to/from work area
The filter copied the chroma planes from every potentially changed row
of the original image to its non-subsampled work area. Change it to
calculate the minimum and maximum x coordinate for each chroma row and
only copy the part between those.

The performance increase is only minor (though observable), but I
think the resulting code is no more complex than the original.
2008-07-25 01:55:14 +03:00
Uoti Urpala
4dab4347f5 vf_ass: Optimize alpha multiply
The effect of alpha blending was calculated as
color = orig_color * alpha / 255
where alpha and color range from 0 to 255.
Change this to
color = (orig_color * alpha + 255) / 256
where the "/ 256" can be expressed as a shift whereas the compiler
would probably generate a multiply+shift for the original "/ 255".
This formula gives a result that is too high by 1 for some inputs.
However it gives the exact result if alpha is 0 or 255 which is
probably the case where small errors would matter most.
2008-07-23 02:05:55 +03:00
Uoti Urpala
a41db36b22 Merge svn changes up to r26783
Conflicts:

	Makefile
	common.mak
	configure
	libmpcodecs/vd_ffmpeg.c
	libmpdemux/demux_mkv.c
	libvo/vo_xv.c
	mplayer.c
2008-05-15 21:19:35 +03:00
diego
47ef593617 Use standard license headers.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26759 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-13 10:16:20 +00:00
Uoti Urpala
b14909a955 Move opt_screen_size_[x|y] to options struct 2008-04-25 03:34:27 +03:00
Uoti Urpala
0e757bf9da Remove _s/_st suffix from some struct names
Since the names are always used after the keyword "struct" having a
suffix as in "struct demuxer_st" is almost completely pointless.
2008-04-25 03:34:22 +03:00
eugeni
00cce8eb30 Add global ass_force_reload flag.
If it is set, renderer is reconfigured before the next frame.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25841 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-23 21:18:30 +00:00
rfelker
f713cb0faf begin moving const filter data to .text/.rodata sections
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24997 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-09 06:58:32 +00:00
diego
1660e3c123 Replace stdint.h #include by functionally equivalent inttypes.h.
The use of inttypes.h is more common throughout MPlayer and stdint.h
can create problems on obscure systems like HP-UX, see Bugzilla #831.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24565 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-18 09:30:42 +00:00
eugeni
c67220c86f Add -ass-hinting option for setting font hinting method.
It is possible to separately configure hinting for scaled and unscaled osd.
The default is native hinter for unscaled osd (only vo_gl at this point),
no hinting for vf_ass.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23152 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-27 14:25:36 +00:00
reimar
6d32d91eca Mark m_struct_t defaults as const
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22045 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-28 16:48:01 +00:00
eugeni
e15d11c89e Speed up ASS subtitles display by detecting changes between two consecutive
rendering results.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21522 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-06 18:44:26 +00:00
eugeni
6e736f6cac Fix incorrect stride used in vf_ass.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21170 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-22 17:00:03 +00:00
eugeni
aca2396794 Initialize fontconfig in VFCTRL_INIT_EOSD handler.
Recent libass api changes moved fontconfig initialization to filter's
config() function. It is bad, because cache update can take a long time,
resulting in unpleasant sound effects. This change restores the original
behaviour.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20722 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-05 18:56:31 +00:00
reimar
1fd844ab06 ass renderer absolutely needs readable target mpi.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20672 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-04 20:48:15 +00:00
eugeni
6fef7a200f Introduce MSGT_ASS, use it for all libass messages.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20645 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-03 18:15:33 +00:00
eugeni
efea99c2c9 Libass interface reworked:
- ass_instance_t renamed to ass_renderer_t
- ass_library_t introduced
- use of mplayer-specific global variables limited to ass_mp.c


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20493 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-28 15:07:18 +00:00
eugeni
e8733cbf9d Split ass_configure() into several smaller functions.
FontConfig initialization moved from ass_init() to ass_set_fonts().


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20462 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-26 20:08:46 +00:00
eugeni
4f3df622bf Simplify and optimize bitmap blending.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20018 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-02 17:30:18 +00:00
eugeni
50ca7a4f72 Add copyright notice and vim/emacs comments to libass and vf_ass.c.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20014 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-01 17:09:04 +00:00
eugeni
432868f92c Add -(no)ass-use-margins option.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19569 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-28 15:12:45 +00:00
eugeni
a7146f5551 Zero fill ass_settings_t before use.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19556 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-27 10:57:29 +00:00
eugeni
2ddfdc85b3 Add VFCTRL_DRAW_EOSD.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19527 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-24 22:10:43 +00:00
eugeni
43a971a720 Simplify vf_ass initialization.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19523 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-24 15:36:20 +00:00
eugeni
d6f16f6889 "[ass] init" message looks better when it starts with the capital letter 'I'.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19347 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-06 18:02:42 +00:00
reynaldo
d8c03e95a5 drops casts from void * on malloc/calloc, leftover on libmpcodecs
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19070 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-13 20:23:34 +00:00
eugeni
e15ae9a600 Initial libass release (without mencoder support).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18942 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-07 18:26:51 +00:00