summaryrefslogtreecommitdiffstats
path: root/libvo/vo_gl.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge svn changes up to r27441Uoti Urpala2008-08-081-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cfg-common-opts.h command.c configure input/input.c libmpcodecs/dec_video.c libmpcodecs/vd.c libmpdemux/stheader.h libvo/sub.c libvo/video_out.c libvo/vo_xv.c libvo/vosub_vidix.c libvo/x11_common.c libvo/x11_common.h mp_core.h mplayer.c stream/stream.h
| * Rename font-related preprocessor directives.diego2008-08-071-1/+1
| | | | | | | | | | | | | | Switch them from a HAVE_ to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27425 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 r27347Uoti Urpala2008-07-251-3/+1
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: libvo/x11_common.c libvo/x11_common.h Rename the vo_gl macro "vo_border()" to "vo_gl_border" as it conflicts with the global variable "vo_border"; done in the merge commit because uses of the macro needed changes anyway to resolve conflicts.
| * Enable runtime border/window decorations-toggling for Linux gl and gl2 vos.reimar2008-07-221-3/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27338 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27242Uoti Urpala2008-07-091-3/+6
|\| | | | | | | | | | | | | Conflicts: Makefile configure
| * One more hack for PBOs on ATI cards.reimar2008-07-061-0/+3
| | | | | | | | | | | | | | Either I am doing something very wrong or they managed to code at about 1 bug per line... git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27216 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Move at-hack code a bit up for further changesreimar2008-07-061-3/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27215 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27202Uoti Urpala2008-07-051-2/+5
|\|
| * 100l: finally understood ATI PBO problem: width must be a power of two.reimar2008-07-041-2/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27201 b3059339-0415-0410-9bf9-f77b7e298cf2
| * More stride alignment is needed to work reliably on ATI cards :-(reimar2008-07-041-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27200 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27123Uoti Urpala2008-06-231-2/+2
|\| | | | | | | | | | | | | Conflicts: libmenu/menu_filesel.c libmenu/menu_pt.c
| * 100l, bpp is bits per pixel, not bytesreimar2008-06-221-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27121 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r26979Uoti Urpala2008-06-041-73/+73
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most of the conflicts are trivial. Conflicts: Makefile cfg-mplayer.h input/input.c libmenu/vf_menu.c libmpcodecs/dec_video.c libmpcodecs/vf_expand.c libmpcodecs/vf_vo.c libmpdemux/demux_mkv.c libmpdemux/demuxer.c libmpdemux/demuxer.h libvo/vo_directfb2.c libvo/vo_gl.c libvo/vo_winvidix.c libvo/vo_xv.c libvo/vo_xvidix.c libvo/vo_xvmc.c libvo/x11_common.c mplayer.c osdep/timer-linux.c stream/cache2.c
| * Render everything as early as possible, doing as little as possible inreimar2008-05-251-4/+19
| | | | | | | | | | | | | | | | flip_page. Can improve A-V sync when playing a video that uses little CPU with GPU filtering that is very slow. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26874 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Reorder flip_page to make moving around do_render call easierreimar2008-05-251-8/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26873 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Split flip_page functionreimar2008-05-251-3/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26872 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add a filter strength parameter for blurring/sharpening scalers.reimar2008-05-241-1/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26868 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use a struct instead of a huge and further growing argument list.reimar2008-05-241-3/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26866 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Saner handling of VOCTRL_PAUSE/VOCTRL_RESUMEreimar2008-05-221-2/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26855 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Simplify equalizer handling for vo glreimar2008-05-221-54/+32
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26854 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Remove useless parentheses from from return statements.diego2008-05-161-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26787 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r26783Uoti Urpala2008-05-151-2/+29
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile common.mak configure libmpcodecs/vd_ffmpeg.c libmpdemux/demux_mkv.c libvo/vo_xv.c mplayer.c
| * Add force-pbo suboption for faster OpenGL output.reimar2008-05-101-2/+22
| | | | | | | | | | | | | | | | Based on a patch by Sven Gothel sgothel-jausoftcom. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26713 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add ati-hack suboption that aligns the lines to 32/64 bytes for PBO transfersreimar2008-05-101-0/+7
| | | | | | | | | | | | | | to avoid what is probably a bug in the driver. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26709 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r26680Uoti Urpala2008-05-071-5/+3
|\| | | | | | | | | | | | | | | Conflicts: Makefile configure osdep/timer-darwin.c
| * vo_gl -dr actually works fine with non-readable MP_IMGTYPE_IP and ↵reimar2008-05-031-2/+0
| | | | | | | | | | | | MP_IMGTYPE_IPB. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26656 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix 100l: mpi->height must be used to calculate required memory, not mpi->h.reimar2008-05-031-3/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26654 b3059339-0415-0410-9bf9-f77b7e298cf2
* | vo_gl[2]: Rename conflicting vo_ontop macroUoti Urpala2008-04-231-1/+1
| | | | | | | | | | | | | | | | Rename the vo_ontop() macro to vo_gl_ontop(). It caused problems with other changes because it conflicts with a global variable name (gl2 actually called vo_ontop() as a function and used vo_ontop as an int - this only worked because vo_ontop was defined as a function-like macro and use without parentheses didn't trigger replacement).
* | 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-42/+34
|/ | | | | | | | 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.
* Slightly document alpha for OSD colorreimar2008-02-111-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25984 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support alpha for vo gl osdcolorreimar2008-02-111-4/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25983 b3059339-0415-0410-9bf9-f77b7e298cf2
* Redraw display on toggling borderreimar2008-02-011-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25944 b3059339-0415-0410-9bf9-f77b7e298cf2
* Always redraw video on resize.reimar2008-01-311-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25943 b3059339-0415-0410-9bf9-f77b7e298cf2
* Small typo in messagereimar2008-01-181-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25782 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add experimental unsharp-mask OpenGL scaler. Certainly not yet perfect.reimar2008-01-151-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25757 b3059339-0415-0410-9bf9-f77b7e298cf2
* Document vo gl lscale=3reimar2008-01-151-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25756 b3059339-0415-0410-9bf9-f77b7e298cf2
* Set vo_mouse_autohide in gl and gl2 vos, so the mouse hiding behaviourreimar2007-12-221-0/+1
| | | | | | | becomes the same as for the other vos using X11. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25513 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
* Avoid text deformation and subtitles moving outside the screen in pan-and-scaneugeni2007-10-191-2/+2
| | | | | | | | | | | | mode. For this, crop amounts are passed from vo_gl as negative margins sizes. They are used to calculate aspect ratio. They are ignored when calculating subtitle positions, so subtitles will stay on screen most of the time. Based on a patch by Jindrich Makovicka [makovick gmail com]. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24815 b3059339-0415-0410-9bf9-f77b7e298cf2
* Handle case where get_image is called twice without a draw_image in-betweenreimar2007-08-031-1/+6
| | | | | | | (-vc ffmpeg12 seems to do this sometimes). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24007 b3059339-0415-0410-9bf9-f77b7e298cf2
* Set -vo gl slice-height default to 0, the current default of 4 seemsreimar2007-07-281-3/+1
| | | | | | | | to never be much faster, but there were multiple reports where it was a lot slower (mostly those where gl2 was faster). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23898 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make X11 window creation and (with -fixed-vo) management simpler and morereimar2007-06-271-52/+5
| | | | | | | | | consistent by introducing a new function that handles most of the ugly things. Changes of behaviour with some vos is unavoidable, bug reports welcome. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23675 b3059339-0415-0410-9bf9-f77b7e298cf2
* set the window aspect hinthenry2007-06-091-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23525 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove some unused variables, patch by timwoj ieee org.diego2007-05-281-1/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23399 b3059339-0415-0410-9bf9-f77b7e298cf2
* Do not set VFCAP_EOSD_UNSCALED if we use scaled-osdreimar2007-04-271-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23153 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add -ass-hinting option for setting font hinting method.eugeni2007-04-271-1/+1
| | | | | | | | | 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
* Gui --> guidiego2007-04-231-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23095 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add a new GPU-based scaling method to vo glreimar2007-03-111-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22507 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move common vo initialization code to video_out.creimar2007-02-171-14/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22250 b3059339-0415-0410-9bf9-f77b7e298cf2
* Avoid calling aspect on each frame and make ass subtitles work better with ↵reimar2007-02-061-4/+5
| | | | | | panscan git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22167 b3059339-0415-0410-9bf9-f77b7e298cf2
* Update gl:help output a bitreimar2007-02-031-2/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22105 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix compilation under MinGW with X11 enabledreimar2006-12-171-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21647 b3059339-0415-0410-9bf9-f77b7e298cf2
* Speed up ASS subtitles display by detecting changes between two consecutiveeugeni2006-12-061-1/+12
| | | | | | | rendering results. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21522 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix single-black-pixel-in-upper-left-corner bug (how do people notice a singlereimar2006-10-241-1/+1
| | | | | | | black pixel?? Amazing...). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20436 b3059339-0415-0410-9bf9-f77b7e298cf2
* EOSD performance debugging info.reimar2006-10-061-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20090 b3059339-0415-0410-9bf9-f77b7e298cf2
* Whitespace-only cosmeticsreimar2006-09-221-13/+13
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19945 b3059339-0415-0410-9bf9-f77b7e298cf2
* Aggregate multiple small EOSD textures into one large since hundreds ofreimar2006-09-221-2/+57
| | | | | | | | | texture creates are very slow. Might cause artefacts with scaled OSD since large textures are not cleared each time. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19944 b3059339-0415-0410-9bf9-f77b7e298cf2
* Cosmetics: move curtex++ out of for () into code body, needed for coming patchreimar2006-09-221-4/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19943 b3059339-0415-0410-9bf9-f77b7e298cf2
* use eosdDispList != 0 to check if eosd should be drawn instead of eosdtexCnt > 0reimar2006-09-221-2/+2
| | | | | | | in preparation of upcoming patch git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19942 b3059339-0415-0410-9bf9-f77b7e298cf2
*