Commit Graph

56 Commits

Author SHA1 Message Date
wm4 fdc8b0451c vo_direct3d: add EOSD support
This allows rendering subtitles in display resolution. It also makes
inserting the vf_ass video filter unnecessary.
2012-03-17 20:58:16 +01:00
wm4 0d929bc532 vo_direct3d: minor cleanup
The code assumed the last format passed to query_format will be the one
that is used on playback. This is probably true and thus didn't cause any
bugs, but make query_format side effect free just like the other VOs.
2012-03-17 20:58:16 +01:00
diego 94d3e6a710 cleanup: vo_direct3d: Mark a function static
This fixes the warning:
libvo/vo_direct3d.c:984:6: warning: no previous prototype for 'vo_draw_alpha_l8a8'

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33499 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-07-06 07:24:52 +03:00
Uoti Urpala c9026cb321 sub/OSD: move some related files to sub/ 2011-01-26 20:39:05 +02:00
Uoti Urpala 17eb7f2c4b Merge svn changes up to r30195 2010-01-08 02:06:42 +02:00
reimar 3b34c55178 Avoid memleaks when vo_direct3d initialization fails.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30191 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-03 17:04:04 +00:00
reimar f31ed10742 Modify -vo direct3d so we do not have to link against d3d9.dll, it might
not be available on some rare systems.
Based on patch used for builds by Gianluigi Tiesi [sherpya netfarm it]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30190 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-03 17:00:51 +00:00
Anton Khirnov 87366694d8 Remove the internal GUI
The GUI is badly designed and too closely coupled to the internal
details of other code. The GUI code is in bad shape and unmaintained
for years. There is no indication that anyone would maintain it in the
future either. Even if someone did volunteer to implement a better
integrated GUI having the current code in the tree probably wouldn't
help much. So get rid of it.
2009-07-07 21:49:42 +03:00
Uoti Urpala 186e5a998c Merge svn changes up to r28641
Convert vo_x11_border (used in vo_gl/gl2 though the vo_gl_border
macro) to use a wrapper macro in old-style VOs which do not provide a
VO object argument. Before this function had an explicit global_vo
argument in vo_gl/gl2. New vo_vdpau uses it too so use the same
mechanism as most other functions.
2009-02-18 01:45:36 +02:00
reimar 01ef7e4579 Extend calc_src_dst_rects to also calculate the border values needed for
correctly placed dvdnav highlights, and fix direct3d and vdpau accordingly.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28633 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-17 11:59:49 +00:00
Uoti Urpala 738f66b1bc Merge svn changes up to r28549 2009-02-13 03:52:51 +02:00
reimar 694c3dc03f Add a calc_src_dst_rects that calculates from window size, panscan etc.
which part of the video source must be scaled onto which part of the window.
Direct3D and (future) VDPAU need this, for XvMC it makes it easier to add
cropping support and Xv is changed to keep the diff to XvMC small.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28546 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-12 17:40:53 +00:00
Uoti Urpala 1e86963828 Merge svn changes up to r28537 2009-02-12 04:17:55 +02:00
gogothebee ff0c8c1e35 Avoid message spam during video adapter uncooperative state.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28469 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-05 09:07:58 +00:00
gogothebee 680578839d Unify info/error messages to a common style:
<vo_direct3d> in the beginning, "." at the end.
Shorter/more descriptive sentences.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28468 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-05 09:06:09 +00:00
Uoti Urpala 9790f4e6e7 Merge svn changes up to r28461 2009-02-04 00:28:17 +02:00
reimar 0fcb101267 Add checks that a D3D device is available before attempting rendering.
We may have lost the device e.g. because it became uncooperative e.g.
when using remote desktop or Vista's UAC is activated.
Patch by Georgi Petrov [gogothebee gmail com]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28457 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-03 11:00:09 +00:00
reimar cd8ef8a8f6 Remove the Present call after adapter reinitialization, it can not work anyway
since no video frame is uploaded to the new context yet.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28456 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-03 10:54:27 +00:00
reimar 680eb1a1e4 Cosmetics: remove empty line, improve some messages.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28454 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-03 10:21:17 +00:00
reimar fbac650de3 Whitespace/comment typo cosmetics.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28453 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-03 10:17:14 +00:00
reimar af87ab3afd Check for change_d3d_backbuffer failure.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28452 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-03 10:16:03 +00:00
reimar ad8c8f6f28 Fix several return values
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28451 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-03 10:14:44 +00:00
Uoti Urpala ccf4d9e96c Merge svn changes up to r28403 2009-01-31 04:52:15 +02:00
reimar 7fcf438a2f Allocate a larger backbuffer to allow resizing without reinit.
Patch by Georgi Petrov [gogothebee gmail com] and Jim Hauxwell [james (at) dattrax co uk]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28379 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-27 10:02:47 +00:00
Uoti Urpala a3ab9e8e46 Merge svn changes up to r28149 2008-12-14 17:28:16 +02:00
reimar 98d227c9fd Set d3d_handle to NULL after release.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28121 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-09 18:44:48 +00:00
reimar d0952d0b19 Forgotten part of previous cosmetics commit
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28120 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-09 18:41:41 +00:00
reimar 6f621f00d8 Slightly simplify the conditional release/free code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28119 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-09 18:36:15 +00:00
reimar 1dd432665e First version of OSD support for vo_direct3d
Patch by Jim Hauxwell [james dattrax co uk] with modifications by me


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28118 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-09 18:31:52 +00:00
diego a9c80bee77 cosmetics: indentation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28113 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-08 11:30:43 +00:00
reimar 38005bd941 Remove pointless or even wrong N/A return values doxy comments
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28112 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-08 11:04:27 +00:00
Uoti Urpala 8c144171bb Merge svn changes up to r28087
Conflicts:
	command.c
	libao2/ao_ivtv.c
	libao2/ao_v4l2.c
	libmpcodecs/dec_video.h
	libvo/aspect.h
	libvo/sub.c
	libvo/sub.h
	libvo/vo_directx.c
	libvo/vo_macosx.m
	libvo/vo_quartz.c
	mp_core.h
	mplayer.c
	mplayer.h
	osdep/getch2.h
	osdep/timer.h
2008-12-04 01:55:52 +02:00
reimar 2b12cb43f1 Fix indentation.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28076 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-03 12:22:32 +00:00
Uoti Urpala a6af927ea1 w32_common.c, vo_direct3d.c: Fix Windows compilation issues
In w32_common.c the special "old_vo_defines.h" header was included too
late. vo_direct3d.c was copied from svn without fixing the type of the
control() function.
2008-12-02 20:15:45 +02:00
reimar 27b167bb75 Remove resize_d3d call from render_d3d_frame that was made useless
by previous commit. If this is necessary e.g. to prevent flicker
while resizing, check_events should be called instead or even
better the functionality be moved to some higher layer.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28065 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-02 15:03:19 +00:00
reimar bb89a7696d 100l, do not call check_events from resize_d3d since there should be
no reason to do it and it might call resize_d3d again which makes it
hard to guarantee that it works correctly.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28064 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-02 14:51:46 +00:00
reimar 2d330d3c01 Cosmetics: Remove unnecessary ()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28063 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-02 09:46:08 +00:00
reimar ef4313fd77 Consistency cosmetics: do not compare against NULL in ifs
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28062 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-02 09:40:09 +00:00
reimar e84d33f00f Cosmetics: remove spaces before argument (
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28061 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-02 09:38:24 +00:00
reimar bbc8a57160 Reorganize Direct3D initialization code.
Patch by Georgi Petrov [gogothebee gmail com]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28060 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-02 09:36:47 +00:00
diego 5e2bec3344 whitespace cosmetics: prettyprinting and indentation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28045 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-28 09:24:20 +00:00
reimar 669b0697b0 Use D3DFMT_ constants where possible instead of MAKEFOURCC
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28041 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-26 16:30:42 +00:00
reimar 513bd7461d Add support for RGB formats to vo_direct3d
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28040 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-26 16:27:39 +00:00
reimar 2c6a12c01d Remove a ColorFill that is not necessary since the surface it is used
on has exactly the same size as the video image and the video will
be copied into it before it is used the first time.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28019 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-24 09:46:23 +00:00
reimar 5cb896b7eb Make sure the backbuffer is cleared when the border size might have changed.
Patch by Georgi Petrov [gogothebee gmail com]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28018 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-24 09:44:33 +00:00
reimar 97eeb07265 Patch to improve/consistify coding style.
Patch by Georgi Petrov [gogothebee gmail com]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28005 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 18:50:39 +00:00
reimar d86a77d8ba Fix indentation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28004 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 18:45:01 +00:00
reimar cc7e0dae7e Lock/unlock surface only once even when drawing many slices.
Patch originally by Jim Hauxwell [james dattrax co.uk]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28003 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 18:42:29 +00:00
reimar 161092eb35 Move locked_rect from stack to priv struct in preparation for following patch.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28002 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 18:24:53 +00:00
reimar e148ffb3ec Move the StretchRect call from draw_slices to render_d3d_frame.
This avoids calling it (and BeginScene/EndScene) many times with
slices and also avoids code duplication.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28001 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 18:13:56 +00:00