summaryrefslogtreecommitdiffstats
path: root/libvo/vo_xv.c
Commit message (Collapse)AuthorAgeFilesLines
* vo_xv: avoid setting background color due to resize flickeriive2011-07-061-4/+5
| | | | | | | | | Set background color only when using ck-method=background. In the other cases clearing of the non-video image area should be done manually. Not drawing on the video image area prevents flickering (visible when resizing). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33522 b3059339-0415-0410-9bf9-f77b7e298cf2
* cleanup: shut up more warningsClément Bœsch2011-05-061-2/+2
|
* sub/OSD: move some related files to sub/Uoti Urpala2011-01-261-1/+1
|
* libvo: register X11 connection fd in input event systemUoti Urpala2010-12-141-16/+0
| | | | | | | | | | | | | | Register the X11 connection fd in the input system so that mp_input_get_cmd() can immediately wake up and handle keyboard or other X events. The callback calls vo_check_events() and tells the input system to handle any input possibly recorded during that. Before this was done for vo_xv only; this commit generalizes it to all VOs that call vo_x11_create_vo_window() - those are hopefully ones that will handle all X events in check_events(). The callback is only kept registered while the vo is properly configured. At other times calling check_events() would not clear pending input and so could lead to a busy loop.
* Merge svn changes up to r31303Uoti Urpala2010-06-021-6/+14
|\
| * Factor out some common code and ensure we will not try to draw OSDreimar2010-05-311-3/+12
| | | | | | | | | | | | | | elements outside the streams and thus crash. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31297 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Delete things related to old translation systemUoti Urpala2010-03-101-1/+0
| | | | | | | | | | Remove the help/ subdirectory, configure code to create toplevel help_mp.h, and all the '#include "help_mp.h"' lines from .c files.
* | Restore collapsed whitespace in output messagesUoti Urpala2010-03-071-1/+1
| | | | | | | | | | | | | | | | | | For some reason commit e306174952d42e1cd6cc5efc50ae6bb0410501bc, which replaced translation macro names with the corresponding English strings, also collapsed multiple consecutive space characters into one. Change most of these back. In a couple of cases the amount of whitespace is important for alignment, and for the rest it at least keeps the strings closer to the existing translations.
* | Merge svn changes up to r30165Uoti Urpala2010-01-081-7/+8
|\|
| * Fix function declarations to avoid casting function pointers.reimar2010-01-011-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30164 b3059339-0415-0410-9bf9-f77b7e298cf2
* | cosmetics: remove some unused variablesUoti Urpala2009-11-171-2/+0
| |
* | Add yuv_colorspace property, implemented in vo_vdpau and vo_xvUoti Urpala2009-11-151-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a property to select YUV colorspace. Currently implemented only in vo_vdpau and vo_xv. Allows switching between BT.601, BT.709 and SMPTE-240M (vdpau only). The xv support uses the "XV_ITURBT_709" attribute. At least my NVIDIA card supports that; I don't know whether other xv implementations do. Bind the colorspace switch to the 'c' key by default. 'c' is currently used by vo_sdl for some fullscreen mode change thing, but at the moment that does not conflict and if it will in the future then vo_sdl can change. VDPAU part based on a patch from Lauri Mylläri <lauri.myllari@gmail.com>
* | cosmetics: Add two missing "static"Uoti Urpala2009-10-221-1/+1
| | | | | | | | Add missing 'static' to internal functions in vo_xv.c and vo_vdpau.c.
* | Merge branch 'vdpau' into buildUoti Urpala2009-09-191-6/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * vdpau: (22 commits) VO: Prefer vo_vdpau over vo_xv again vo_vdpau: Fix X event handling bugs vo_vdpau: Fix memory corruption bug with MP_IMGTYPE_NUMBERED core/VO: Allow VO drivers to add/modify frames video_out.h: Cosmetics VO interface: Remove obsolete draw_frame() from new interface vo_vdpau: Support recovering from VDPAU display preemption vo_vdpau: Support updating OSD while paused vo_vdpau.c: Reindent control() switch statement vo_vdpau: Allocate one large surface for EOSD content vo_vdpau.c: cosmetics vo_vdpau: reindent after GUI code removal vo_vpdau: Clean up uninit logic vo_vdpau: Make CHECK_ST macro safer vo_vdpau: Move all remaining static/global variables to context vo_vdpau: Move things to context struct vo_vdpau: Make info struct const vo_vdpau: Replace global function table with context variable vo_vdpau: Move VDPAU interface pointers into one struct vo_vdpau: Add template file for VDPAU functions ...
| * | VO interface: Remove obsolete draw_frame() from new interfaceUoti Urpala2009-09-171-6/+0
| | |
* | | Merge svn changes up to r29644Uoti Urpala2009-09-041-13/+1
|\ \ \ | |/ / |/| / | |/
| * Remove panscan related conditions and code that only breaks future windowedreimar2009-08-271-14/+0
| | | | | | | | | | | | | | aspect and panscan without any real benefit. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29568 b3059339-0415-0410-9bf9-f77b7e298cf2
| * whitespace cosmetics: Remove all trailing whitespace.diego2009-05-131-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Remove the internal GUIAnton Khirnov2009-07-071-11/+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.
* | Translation system changes part 2: replace macros by stringsAmar Takhar2009-07-071-8/+16
| | | | | | | | | | Replace all MSGTR_ macros in the source by the corresponding English string.
* | Translation system changes part 1: wrap translated stringsAmar Takhar2009-07-071-8/+8
| | | | | | | | | | Replace mp_msg() calls which have a translated string as the format argument with mp_tmsg and add _() around all other translated strings.
* | Merge branch 'ordered_chapters'Uoti Urpala2009-04-081-1/+0
|\ \
| * | VO: Don't reset pause status in VO config() functionsUoti Urpala2009-04-021-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Many VOs kept track of pause status, but reset the value when their config() function was called. However it can be called while playback stays in pause mode. Modify the VOs to not change anything in config(). Also send the VO either VOCTRL_PAUSE or VOCTRL_RESUME when the playback of a new file is starting to make sure they have the right status.
* | | vo_xv: Fix context Shminfo table sizeUoti Urpala2009-04-051-1/+1
|/ / | | | | | | | | This bug could cause problems if you used -dr with xv. The most likely symptom was crash at uninit.
* | Merge svn changes up to r28951Uoti Urpala2009-03-141-3/+1
|\|
| * Setting vo_fs is handled by x11_common.c, so remove that code from ↵reimar2009-03-071-2/+0
| | | | | | | | | | | | vo_xv/vo_xvmc. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28864 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make data related to suboption parsing const in libvoreimar2009-03-071-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28863 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28641Uoti Urpala2009-02-181-1/+1
|\| | | | | | | | | | | | | | | 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-1/+1
| | | | | | | | | | | | | | 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-36/+24
|\|
| * Add a calc_src_dst_rects that calculates from window size, panscan etc.reimar2009-02-121-36/+18
| | | | | | | | | | | | | | | | | | 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-1/+19
|\|
| * Add standard license headers, unify header formatting.diego2009-02-081-1/+19
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28481 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28310Uoti Urpala2009-01-151-20/+2
|\| | | | | | | | | | | | | | | The libdvdread4 and libdvdnav directories, which are externals in the svn repository, are at least for now not included in any form. I added configure checks to automatically disable internal libdvdread and libdvdnav if the corresponding directories are not present; if they're added manually then things work the same as in svn.
| * Factor calc_drwXY out of vo_xv and vo_xvmc.cehoyos2009-01-091-18/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28285 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Simplify handling of VOFLAG_MODESWITCHNG, merge assignment and declarationreimar2008-11-231-5/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27986 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unused flip_flag variablereimar2008-11-231-2/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27985 b3059339-0415-0410-9bf9-f77b7e298cf2
* | vo_xv: Always support updating OSD if none was drawn yetUoti Urpala2008-12-101-4/+19
| | | | | | | | | | | | | | If the main image buffer was not altered for OSD then allow updating OSD even if no separate OSD-less copy was made. The code now makes a copy at that time (another possibility would be to not make a copy and disallow further updates).
* | Update OSD while pausedUoti Urpala2008-12-091-15/+60
| | | | | | | | | | | | | | | | | | | | | | | | When OSD contents change while paused, try to change the OSD drawn in the currently visible frame. If such OSD updates are not supported then advance by one frame and draw the OSD normally. Add some support for OSD redrawing to vo xv. The new xv code makes a copy of the original frame contents before drawing the OSD if MPlayer is already paused when the frame is drawn. If such a copy of the current frame exists then the frame contents can be restored and a different OSD drawn on top of the same frame.
* | vo_xv: Reformat codeUoti Urpala2008-12-091-268/+221
| | | | | | | | | | Reformat vo_xv.c completely to K & R style and remove a couple of outdated comments.
* | Merge svn changes up to r27979Uoti Urpala2008-11-221-32/+0
|\|
| * Remove a aspect calculation line.reimar2008-11-211-1/+0
| | | | | | | | | | | | | | | | | | | | It is useless because with the new API enabled by VOCTRL_UPDATE_SCREENINFO it is not necessary because it is already done in video_out.c:config_video_out. Secondly, the removal of the aspect_save_prescale triggered a regression because of it, with -wid the window would not be filled completely initially. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27978 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Factor common code like -wid handling, vo_gc creation etc. out intoreimar2008-11-191-31/+0
| | | | | | | | | | | | | | x11_common.c git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27961 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27949Uoti Urpala2008-11-171-57/+8
|\| | | | | | | | | | | | | | | | | Conflicts: common.mak libvo/vo_xv.c libvo/x11_common.c libvo/x11_common.h stream/cache2.c
| * Remove explicit setting of vo_ontop since that is already done by ↵reimar2008-11-151-3/+0
| | | | | | | | | | | | vo_x11_create_vo_window git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27937 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Sync with vo_x11: make sure we get expose events even when drawing to the ↵reimar2008-11-151-1/+2
| | | | | | | | | | | | root window. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27933 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove a nonsensical "else" for the video mode switching case.reimar2008-11-151-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27929 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove now unused variables.reimar2008-11-151-5/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27926 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use vo_dwidth/vo_dheight for creating the windows instead of d_width/d_height.reimar2008-11-151-1/+1
| | | | | | | | | | | | | | This fixes the -vm bug that the created window is too small. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27925 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Simplify vo_vm_switch and vo_vm_close, everyone was using the (almost) samereimar2008-11-151-12/+2
| | | | | | | | | | | | | | boiler-plate code with them, just with different bugs. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27924 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Set modified window position and monitor aspect in vo_vm_switch instead of inreimar2008-11-151-1/+0
| | | | | | | | | | | | | | individual vo drivers. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27923 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Get rid of (besides useless assignments) unused XSizeHints variablereimar2008-11-151-12/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27922 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Replace some of the different inconsistent XGetGeometry uses by areimar2008-11-151-5/+1
| | | | | | | | | | | | | | vo_x11_update_geometry function. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27919 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove a useless XGetGeometry call, the X11 event handling already takes ↵reimar2008-11-151-5/+0
| | | | | | | | | | | | care of this. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27918 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove code from unused and since ages deprecated draw_frame function.reimar2008-11-151-2/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27917 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove vo_xv code that has been under #if 0 since ages.reimar2008-11-151-29/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27916 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix grammar of comment and sync it with vo_x11.creimar2008-11-151-1/+1
|