summaryrefslogtreecommitdiffstats
path: root/libvo/vo_direct3d.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge svn changes up to r30195Uoti Urpala2010-01-081-7/+30
|\
| * Avoid memleaks when vo_direct3d initialization fails.reimar2010-01-031-8/+14
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30191 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Modify -vo direct3d so we do not have to link against d3d9.dll, it mightreimar2010-01-031-2/+19
| | | | | | | | | | | | | | | | 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
* | Remove the internal GUIAnton Khirnov2009-07-071-2/+0
| | | | | | | | | | | | | | | | | | 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.
* | Merge svn changes up to r28641Uoti Urpala2009-02-181-2/+8
|\| | | | | | | | | | | | | | | 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.
| * Extend calc_src_dst_rects to also calculate the border values needed forreimar2009-02-171-2/+8
| | | | | | | | | | | | | | 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
* | Merge svn changes up to r28549Uoti Urpala2009-02-131-41/+12
|\|
| * Add a calc_src_dst_rects that calculates from window size, panscan etc.reimar2009-02-121-41/+12
| | | | | | | | | | | | | | | | | | 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
* | Merge svn changes up to r28537Uoti Urpala2009-02-121-44/+44
|\|
| * Avoid message spam during video adapter uncooperative state.gogothebee2009-02-051-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28469 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Unify info/error messages to a common style:gogothebee2009-02-051-43/+43
| | | | | | | | | | | | | | <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
* | Merge svn changes up to r28461Uoti Urpala2009-02-041-18/+28
|\|
| * Add checks that a D3D device is available before attempting rendering.reimar2009-02-031-1/+16
| | | | | | | | | | | | | | | | | | 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
| * Remove the Present call after adapter reinitialization, it can not work anywayreimar2009-02-031-4/+0
| | | | | | | | | | | | | | 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
| * Cosmetics: remove empty line, improve some messages.reimar2009-02-031-5/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28454 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Whitespace/comment typo cosmetics.reimar2009-02-031-5/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28453 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Check for change_d3d_backbuffer failure.reimar2009-02-031-1/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28452 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix several return valuesreimar2009-02-031-3/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28451 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28403Uoti Urpala2009-01-311-43/+113
|\|
| * Allocate a larger backbuffer to allow resizing without reinit.reimar2009-01-271-43/+113
| | | | | | | | | | | | | | 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
* | Merge svn changes up to r28149Uoti Urpala2008-12-141-31/+295
|\|
| * Set d3d_handle to NULL after release.reimar2008-12-091-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28121 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Forgotten part of previous cosmetics commitreimar2008-12-091-3/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28120 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Slightly simplify the conditional release/free codereimar2008-12-091-21/+14
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28119 b3059339-0415-0410-9bf9-f77b7e298cf2
| * First version of OSD support for vo_direct3dreimar2008-12-091-7/+282
| | | | | | | | | | | | | | 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
| * cosmetics: indentationdiego2008-12-081-1/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28113 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove pointless or even wrong N/A return values doxy commentsreimar2008-12-081-5/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28112 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28087Uoti Urpala2008-12-041-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Fix indentation.reimar2008-12-031-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28076 b3059339-0415-0410-9bf9-f77b7e298cf2
* | w32_common.c, vo_direct3d.c: Fix Windows compilation issuesUoti Urpala2008-12-021-1/+1
|/ | | | | | 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.
* Remove resize_d3d call from render_d3d_frame that was made uselessreimar2008-12-021-2/+0
| | | | | | | | | 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
* 100l, do not call check_events from resize_d3d since there should bereimar2008-12-021-3/+0
| | | | | | | | 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
* Cosmetics: Remove unnecessary ()reimar2008-12-021-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28063 b3059339-0415-0410-9bf9-f77b7e298cf2
* Consistency cosmetics: do not compare against NULL in ifsreimar2008-12-021-6/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28062 b3059339-0415-0410-9bf9-f77b7e298cf2
* Cosmetics: remove spaces before argument (reimar2008-12-021-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28061 b3059339-0415-0410-9bf9-f77b7e298cf2
* Reorganize Direct3D initialization code.reimar2008-12-021-51/+150
| | | | | | | Patch by Georgi Petrov [gogothebee gmail com] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28060 b3059339-0415-0410-9bf9-f77b7e298cf2
* whitespace cosmetics: prettyprinting and indentationdiego2008-11-281-77/+81
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28045 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use D3DFMT_ constants where possible instead of MAKEFOURCCreimar2008-11-261-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28041 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add support for RGB formats to vo_direct3dreimar2008-11-261-0/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28040 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove a ColorFill that is not necessary since the surface it is usedreimar2008-11-241-4/+0
| | | | | | | | 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
* Make sure the backbuffer is cleared when the border size might have changed.reimar2008-11-241-1/+14
| | | | | | | Patch by Georgi Petrov [gogothebee gmail com] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28018 b3059339-0415-0410-9bf9-f77b7e298cf2
* Patch to improve/consistify coding style.reimar2008-11-231-20/+20
| | | | | | | Patch by Georgi Petrov [gogothebee gmail com] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28005 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix indentationreimar2008-11-231-12/+12
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28004 b3059339-0415-0410-9bf9-f77b7e298cf2
* Lock/unlock surface only once even when drawing many slices.reimar2008-11-231-7/+14
| | | | | | | Patch originally by Jim Hauxwell [james dattrax co.uk] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28003 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move locked_rect from stack to priv struct in preparation for following patch.reimar2008-11-231-17/+13
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28002 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move the StretchRect call from draw_slices to render_d3d_frame.reimar2008-11-231-28/+8
| | | | | | | | 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
* Remove pointless is_cfG_finished variable.reimar2008-11-231-17/+3
| | | | | | | Patch by Georgi Petrov [gogothebee gmail com] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28000 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix and enable panscan handling for vo_direct3dreimar2008-11-211-77/+43
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27971 b3059339-0415-0410-9bf9-f77b7e298cf2
* Cosmetics: rename variables etc. in vo_direct3d.creimar2008-11-201-253/+225
| | | | | | | Patch by Georgi Petrov (gogothebee gmail com) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27962 b3059339-0415-0410-9bf9-f77b7e298cf2
* Simplify conditions in direct3d vo: remove == 1, change == 0 to ! etc.reimar2008-11-191-12/+13
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27959 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add missing "static" qualifiers to vo_direct3dreimar2008-11-181-18/+18
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27957 b3059339-0415-0410-9bf9-f77b7e298cf2
* Direct3D based video_out module.reimar2008-11-181-0/+751
Patch by Georgi Petrov (gogothebee gmail com) Panscan handling is still disabled and needs to be fixed for negative -panscan. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27955 b3059339-0415-0410-9bf9-f77b7e298cf2
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 12:41:11 +0000