summaryrefslogtreecommitdiffstats
path: root/libvo/vo_directx.c
Commit message (Collapse)AuthorAgeFilesLines
* VO: remove VO direct renderingwm42012-08-021-43/+0
| | | | | | | | | | | | | | | | | | | This was disabled by default, and could be enabled with -dr. It was disabled by default because it was buggy: there were issues with OSD corruption. It wasn't entirely sane for OpenGL based VOs either. OpenGL can chose to drop mapped pixel buffer objects, requiring the application to map and fill the buffer again. But there was no mechanism in mplayer to fill the lost buffer again. (It seems this rarely happened in practice, though.) On the other side, users liked the --dr flag, because it promised them more speed. I'm not sure if it actually helped with speed, but it's unlikely it had any real advantages on modern systems. In order to evade the --dr cargo culting in mplayer config files, it's best to get rid of it.
* vo_directx: clear panscan borders in windowed modewm42012-04-241-5/+32
| | | | | | | | The window size is normally clipped against desktop size due to the usage of WM_SIZING in w32_common.c. This is a useful (if accidental) feature, but vo_directx didn't handle it well: the areas not covered by video were filled with the colorkey, which looked ugly. Explicitly clear these borders with black.
* win32: move global variables into a struct & some refactoringwm42012-04-141-11/+13
| | | | | | | | | | This reflects the changes done to x11_common in mplayer2 some years ago. It makes it possible to open multiple VOs at once. The removed defines are probably for ancient versions of MinGW with incomplete headers. Remove some minor code duplication.
* vo_directx: do not do aspect scaling in windowed mode.reimar2012-04-061-4/+6
| | | | | | This matches behaviour of other vos. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34840 b3059339-0415-0410-9bf9-f77b7e298cf2
* win32: properly set window titlewm42012-03-171-3/+0
| | | | | | | | | | | | Set the window title on win32 based VOs using the same logic as on X11 and Cocoa. Until now, the window title when using vo_direct3d and vo_gl was hardcoded to "MPlayer - The Movie Player", and vo_directx showed "MPlayer". Now it will show "mplayer2", unless the --title or --use-filename-title options are used. Change the internal window class name to the string "mplayer2" too.
* vo_directx: do not clip overlay against screen sizewm42012-03-171-3/+1
| | | | | | Clipping it makes the video output look extremely crappy. There seems no good reason to do this, and VirtualBox is fine with overlays larger than the screen.
* win32, vo_directx: don't use vo_dx/dy, directly query window positionwm42012-03-171-2/+5
| | | | | This should be a bit robuster than trying to maintain vo_dx/dy. vo_dy/dy are now completely unused on win32, except for initialization.
* vo_directx: minor fixes and reformatreimar2012-03-171-883/+847
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore hunk disabling overlay when the Window is minimized. This was accidentally removed in r33657. Fixes bug 1950. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33894 b3059339-0415-0410-9bf9-f77b7e298cf2 Simplify code handling minimized state. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33895 b3059339-0415-0410-9bf9-f77b7e298cf2 Apply uncrustify to vo_directx.c. The vast majority of changes are whitespace changes, but in some cases {} was merged with other lines or a ; was removed after a } from a switch and similar minor and obviously correct changes. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33896 b3059339-0415-0410-9bf9-f77b7e298cf2 Fix array layout uncrustify messed up. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33897 b3059339-0415-0410-9bf9-f77b7e298cf2 Remove pointless () and {}. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33898 b3059339-0415-0410-9bf9-f77b7e298cf2 Make NULL checks simpler/more consistent. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33899 b3059339-0415-0410-9bf9-f77b7e298cf2 Use FFMIN/FFMAX. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33901 b3059339-0415-0410-9bf9-f77b7e298cf2 Simplify struct initialization. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33902 b3059339-0415-0410-9bf9-f77b7e298cf2 Split out read/write part from data struct and make read-only struct const. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33903 b3059339-0415-0410-9bf9-f77b7e298cf2 Store fixed-length string directly in struct, avoid pointer indirection. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33904 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace some inappropriate while() loops with for() git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33905 b3059339-0415-0410-9bf9-f77b7e298cf2 Simplify some more struct initializations. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33906 b3059339-0415-0410-9bf9-f77b7e298cf2 Avoid typedef. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33907 b3059339-0415-0410-9bf9-f77b7e298cf2 Use struct initializer in one more case. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33908 b3059339-0415-0410-9bf9-f77b7e298cf2 Simplify printing of error strings. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33909 b3059339-0415-0410-9bf9-f77b7e298cf2 Conflicts: libvo/vo_directx.c
* Merge remote-tracking branch 'origin/master' into my_masterwm42012-03-161-3/+3
|\ | | | | | | | | | | | | | | Conflicts: command.c mp_core.h mplayer.c screenshot.c
| * cleanup: Silence compilation warnings on MinGW-w64wm42012-03-011-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some of the code, especially the dshow and windows codec loader parts, are extremely hacky and likely full of bugs. The goal is merely getting rid of warnings that could obscure more important warnings and actual bugs, instead of fixing actual problems. This reduces the number of warnings from over 500 to almost the same as when compiling on Linux. Note that many problems stem from using the ancient wine-derived windows headers. There are some differences to the "proper" windows header. Changing the code to compile with the proper headers would be too much trouble, and it still has to work on Unix. Some of the changes might actually break compilation on legacy MinGW, but we don't support that anymore. Always use MinGW-w64, even when compiling to 32 bit. Fixes some warnings in the win32 loader code on Linux too.
* | mpcodecs: remove mp_image_t.x/ywm42012-02-241-2/+2
|/ | | | These were never used.
* vo_directx: include <libavutil/common.h> for FFMINUoti Urpala2011-07-071-0/+1
| | | | | 070491f1029ca3d74322146e646d653f9f5dc153 added an use of FFMIN to vo_directx.c but failed to include a header for the macro. Fix.
* cleanup: vo_directx: remove redundant codereimar2011-07-061-94/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify code for printing display adapter list. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33672 b3059339-0415-0410-9bf9-f77b7e298cf2 Remove left-over code from icon/cursor handling that is now done by w32_common.c git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33673 b3059339-0415-0410-9bf9-f77b7e298cf2 Remove more code and variables that have no purpose anymore. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33674 b3059339-0415-0410-9bf9-f77b7e298cf2 Remove some #includes that are no longer needed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33675 b3059339-0415-0410-9bf9-f77b7e298cf2 Remove more unnecessary code/defines. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33677 b3059339-0415-0410-9bf9-f77b7e298cf2 Move check_events function to avoid forward declaration. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33678 b3059339-0415-0410-9bf9-f77b7e298cf2 Remove more unused variables. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33679 b3059339-0415-0410-9bf9-f77b7e298cf2 Add const to avoid compiler warning. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33680 b3059339-0415-0410-9bf9-f77b7e298cf2 Use the proper type for the palette, fixes compiler warning. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33681 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_directx: Change vo_directx to use w32_common.creimar2011-07-061-370/+43
| | | | | | | | | | | While I tested it quite thoroughly, with and without -wid, -vm, -fs, ... it is _very_ likely to break something, please report any regressions! In the worst case it can still be reverted, however since it has very little relevance nowadays it will rot all the faster if not at least some code is shared. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33657 b3059339-0415-0410-9bf9-f77b7e298cf2
* input: move all key code lists to input/keycodes.hUoti Urpala2011-05-021-2/+1
| | | | | | | | | | | | | Move the definitions of all special key codes (those not passed by ASCII value) to input/keycodes.h. Before they were spread between osdep/keycodes.h, input/joystick.h, input/mouse.h and input/ar.h, plus some special values in input.h. This was especially inconvenient as the codes had to be coordinated to not conflict between the files. The change requires a bit of ugliness as appleir.c includes <linux/input.h> which contains various conflicting KEY_* definitions. Work around this by adding a special preprocessor variable which can be used to avoid defining these in keycodes.h.
* sub/OSD: move some related files to sub/Uoti Urpala2011-01-261-1/+1
|
* cleanup: remove NULL checks before free() all over the codecboesch2010-11-141-2/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32624 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_directx: Fix possible out-of-bounds accessreimar2010-11-071-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32568 b3059339-0415-0410-9bf9-f77b7e298cf2
* Merge svn changes up to r30375Uoti Urpala2010-01-251-2/+4
|\
| * Change GUID declarations in vo_directx to be static.reimar2010-01-171-2/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30343 b3059339-0415-0410-9bf9-f77b7e298cf2
| * whitespace cosmetics: Remove all trailing whitespace.diego2009-05-131-123/+123
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Remove the internal GUIAnton Khirnov2009-07-071-9/+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.
* | Remove trailing whitespace from most filesUoti Urpala2009-07-071-121/+121
| |
* | Merge svn changes up to r29277Uoti Urpala2009-05-081-6/+6
|\|
| * Add missing 'void' to parameterless function declarations.diego2009-05-041-6/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29254 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28162Uoti Urpala2008-12-191-0/+1
|\|
| * #include sub.h instead of locally declaring vo_draw_text().diego2008-12-171-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28156 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Get rid of pointless 'extern' keywords.diego2008-12-031-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28085 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to 27824Uoti Urpala2008-10-251-1/+1
|\| | | | | | | | | | | | | | | | | | | Conflicts: cfg-common-opts.h libmpcodecs/dec_video.c libmpcodecs/vd.c libvo/x11_common.h mplayer.c stream/cache2.c
| * Honour differences between src and dst stride for packed yuvfaust32008-10-141-1/+1
| | | | | | | | | | | | | | | | patch by Laurent <laurent.aml at gmail.com> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27772 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27399Uoti Urpala2008-08-021-2/+2
|\| | | | | | | | | | | | | | | | | | | Conflicts: libmpcodecs/vd.c libmpcodecs/ve_raw.c libvo/video_out.c libvo/x11_common.c mplayer.c
| * Rename two GUI-related preprocessor directives:diego2008-07-301-2/+2
| | | | | | | | | | | | | | HAVE_NEW_GUI --> CONFIG_GUI, HAVE_GTK2_GUI --> CONFIG_GTK2 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27375 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r26783Uoti Urpala2008-05-151-10/+12
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile common.mak configure libmpcodecs/vd_ffmpeg.c libmpdemux/demux_mkv.c libvo/vo_xv.c mplayer.c
| * Use standard license headers with standard formatting.diego2008-05-141-10/+12
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26771 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Move vidmode to options structUoti Urpala2008-04-251-2/+0
| |
* | Add context variable to vo_draw_text callbackUoti Urpala2008-04-231-1/+0
| | | | | | | | | | Add a context variable and rename the function to osd_draw_text. Create a new vo_draw_text that is a wrapper for VOs using old API.
* | Remove variable arguments from vo control() functionsUoti Urpala2008-04-231-1/+1
| | | | | | | | | | No voctrl uses them any more, and using them would not be a good idea because it makes forwarding arguments to other functions harder.
* | Change VOCTRL_[GET|SET]_EQUALIZER argument passingUoti Urpala2008-04-231-14/+4
|/ | | | | | | | These were the only voctrl types with more than one argument. The second argument was passed using variable arguments. Change them to use a single argument (address of a struct containing both old arguments). This makes forwarding the arguments to other functions easier and allows simplifying code.
* typo fix: inited --> initializeddiego2008-02-141-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25994 b3059339-0415-0410-9bf9-f77b7e298cf2
* Mark the vo_functions_t definitions as const where possible.reimar2007-12-021-1/+1
| | | | | | | | This is not possible for xover and anything supporting vidix due to horrible hacks. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25248 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make vo info structs constreimar2007-12-021-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25244 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove unused variables.zuxy2007-10-271-3/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24868 b3059339-0415-0410-9bf9-f77b7e298cf2
* Cosmetic fix for r24861zuxy2007-10-271-12/+12
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24863 b3059339-0415-0410-9bf9-f77b7e298cf2
* Avoid crash after recovering from screensaverzuxy2007-10-271-4/+21
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24861 b3059339-0415-0410-9bf9-f77b7e298cf2
* Replace implicit use of fast_memcpy via macro by explicit use to allowreimar2007-06-051-2/+2
| | | | | | | for future optimization. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23475 b3059339-0415-0410-9bf9-f77b7e298cf2
* Gui --> guidiego2007-04-231-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23095 b3059339-0415-0410-9bf9-f77b7e298cf2
* Code cleanup: don't include a .c file in mplayer.c and fix a fewrathann2007-03-291-1/+1
| | | | | | | | | | | "implicit declaration of function ‘mplayer_put_key’" warnings Based on Attila's suggestions. Approved by Uoti and Ivan. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22841 b3059339-0415-0410-9bf9-f77b7e298cf2
* Simplify config by using code available in video_out.creimar2007-03-061-19/+11
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22477 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: typo fixes, usefuLL --> useful and aswell --> as welldiego2007-02-221-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22307 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove a declaration-after-statement warning.diego2006-10-231-1/+2
| | | | | | | patch by Zuxy Meng, zuxy.meng gmail com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20410 b3059339-0415-0410-9bf9-f77b7e298cf2
* The FSF changed postal address.diego2006-09-011-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19620 b3059339-0415-0410-9bf9-f77b7e298cf2
* optimize and simplify memcpy usage, use mem2agpcpy_picreimar2006-07-291-30/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19247 b3059339-0415-0410-9bf9-f77b7e298cf2
* handle sub-window WinID checks in the gui.vayne2006-07-081-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18957 b3059339-0415-0410-9bf9-f77b7e298cf2
* Initial win32 gui release.vayne2006-07-061-0/+11
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18918 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10l the cpu hog fix broke fullscreenswitching with -widfaust32006-03-151-0/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17871 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix for MPlayer taking 100% CPU with -wid on some systems, patch by Martin ↵faust32006-03-131-0/+18
| | | | | | Fiedler <martin.fiedler at gmx.net> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17854 b3059339-0415-0410-9bf9-f77b7e298cf2
* reinitialize adapter_count to 0, EnumCallbackEx will not work otherwisereimar2006-02-051-0/+1
| | | | | | | | (when playing more that one file). Fixes bug #429. Based on patch by Miguel Scaramozzino - dyingshell at yahoo com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17535 b3059339-0415-0410-9bf9-f77b7e298cf2
* Generate double-click mouse events.joey2005-11-111-1/+29
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16976 b3059339-0415-0410-9bf9-f77b7e298cf2
*