summaryrefslogtreecommitdiffstats
path: root/libvo/vo_gl.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge svn changes up to r30798Uoti Urpala2010-03-101-4/+56
|\
| * Update -vo gl info structs, it isn't X11-only since ages and there's basicallyreimar2010-02-271-4/+4
| | | | | | | | | | | | | | no code left from Arpi and it's unlikely the email address is still working anyway. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30763 b3059339-0415-0410-9bf9-f77b7e298cf2
| * 100l, remove forgotten debugging code.reimar2010-02-271-1/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30762 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Only prefer -vo gl over -vo x11 if hardware acceleration is available.reimar2010-02-271-2/+36
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30761 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30514Uoti Urpala2010-03-091-6/+6
|\|
| * Print messages only after we are sure preinit will not fail anymore.reimar2010-02-051-5/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30510 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Create the OpenGL probe window as a hidden Window on X11.reimar2010-02-041-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30507 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30494Uoti Urpala2010-03-091-25/+42
|\| | | | | | | | | | | Conflicts: libvo/vo_gl.c libvo/x11_common.c
| * Add support for autodetection during preinit and use that to detect a defaultreimar2010-02-021-22/+42
| | | | | | | | | | | | | | value for the yuv suboption. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30489 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Avoid using options before autodetectGlExtensions to allow it to change them ↵reimar2010-02-021-5/+3
| | | | | | | | | | | | properly. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30488 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove vo_config_count check from uninit, it should always be safe to run.reimar2010-02-021-1/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30487 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30375Uoti Urpala2010-01-251-1/+14
|\|
| * Add support for adjustable TV <-> PC level conversion.reimar2010-01-161-1/+14
| | | | | | | | | | | | | | | | This could also be done by modifying contrast and brightness, but this seems a bit more flexible and easier to use. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30335 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30195Uoti Urpala2010-01-081-0/+1
|\|
| * Make vo gl print the OpenGL vendor and version strings.reimar2010-01-031-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30193 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30165Uoti Urpala2010-01-081-35/+70
|\|
| * Fix function declarations to avoid casting function pointers.reimar2010-01-011-5/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30164 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Slightly generalize code to generate YUV->RGB conversion table and addreimar2010-01-011-0/+1
| | | | | | | | | | | | | | XYZ->RGB conversion as an example for that. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30163 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make YUV->RGB conversion coefficients selectable for -vo gl.reimar2010-01-011-1/+16
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30161 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add support for 16-bit per component YUV formats.reimar2009-12-311-1/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30152 b3059339-0415-0410-9bf9-f77b7e298cf2
| * First steps to supporting different YUV->RGB conversion definitions.reimar2009-12-311-1/+1
| | | | | | | | | | | | | | The numbers are possibly still wrong though. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30151 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Put the colourspace-related variables into a separate struct to easereimar2009-12-311-1/+1
| | | | | | | | | | | | | | extracting the code and sharing with other vos. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30149 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Support all planar YUV formats in OpenGL vos.reimar2009-12-301-29/+47
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30139 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30136Uoti Urpala2009-12-301-32/+30
|\| | | | | | | Ignore another broken correct-pts change in 30134.
| * Move do_render_osd function to avoid a forward declaration.reimar2009-12-271-32/+30
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30126 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Some ugly hacks to make compiling against a newer external version of libass ↵reimar2009-12-241-0/+1
| | | | | | | | | | | | work. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30107 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove more direct includes of libass/ass.hreimar2009-12-241-1/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30105 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30104Uoti Urpala2009-12-301-22/+32
|\| | | | | | | Ignore the broken correct-pts change in r30100.
| * Slightly improve vo_gl suboption documentation.reimar2009-12-191-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30075 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add support for auto-generating mipmaps in vo_gl, should easereimar2009-12-191-3/+15
| | | | | | | | | | | | | | implementing anything that needs blur filters with large support. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30072 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make -vo gl:customprog also work with RGB input (obviously those need to bereimar2009-12-191-17/+15
| | | | | | | | | | | | | | special RGB fragment programs). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30071 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30065Uoti Urpala2009-12-291-6/+6
|\|
| * Rename GL_* defines to CONFIG_GL_*reimar2009-12-191-6/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30065 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make the check for X11 and WIN32 backends for OpenGL separate.reimar2009-12-191-4/+4
| | | | | | | | | | | | This fixes compilation on Windows with X11 but no GLX available. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30063 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30055Uoti Urpala2009-12-181-87/+84
|\|
| * Pass all OpenGL functions through a function pointer indirection.reimar2009-12-081-65/+65
| | | | | | | | | | | | | | | | This still needs more work, but should allow supporting e.g. GLX-OpenGL and Win32-OpenGL with a single binary. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29981 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Very preliminary code to allow selecting the OpenGL backend at runtime.reimar2009-12-081-22/+19
| | | | | | | | | | | | | | | | | | Works in the currently supported cases for only Win32 and only X11, the mixed case is not working yet though. But applied anyway since the code is slightly less messy than the current one. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29980 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r29962Uoti Urpala2009-11-231-0/+1
|\|
| * Print which visual glXChooseVisual chose when running in verbose mode.reimar2009-11-211-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29948 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r29752Uoti Urpala2009-10-061-3/+7
|\| | | | | | | | | | | | | | | | | As part of merging subtitle-in-terminal changes make update_subtitles() only clear existing subtitles if called with the reset argument, and not try to set new ones. Later calls should set the needed new subtitles, and this change avoids some problems with trying to set subtitles when mp_property_sub() in command.c gets called from initialization code before full initialization.
| * Set sensible write frequency/priority values for AllocateMemoryMESAreimar2009-09-271-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29723 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Print error instead of crashing when mesa-buffer is used on systemsreimar2009-09-271-0/+4
| | | | | | | | | | | | | | that do not support it. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29722 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Re-add some ifdefs, partially reverting r29688, since mDisplay andreimar2009-09-181-0/+4
| | | | | | | | | | | | | | mScreen are undefined during a Windows build without X11 support. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29690 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Get rid of several (probably) pointless ifdefsreimar2009-09-181-6/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29688 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r29644Uoti Urpala2009-09-041-11/+10
|\|
| * Check setGlWindow return value to fail properly instead of crashing if e.g.reimar2009-09-011-1/+2
| | | | | | | | | | | | | | no OpenGL support is available. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29612 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add infrastructure and test code to enable aspect scaling and panscan in ↵reimar2009-08-271-5/+5
| | | | | | | | | | | | windowed mode. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29566 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Simplify -vo gl ass border etc. dimension calculation one bit more.reimar2009-08-271-3/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29563 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Simplify and fix ass border calculations for -vo gl and -wid -fs mode.reimar2009-08-271-6/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29561 b3059339-0415-0410-9bf9-f77b7e298cf2
| * First attempts at supporting -fs with -wid, -vo gl on X11 only so farreimar2009-08-271-0/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29556 b3059339-0415-0410-9bf9-f77b7e298cf2
| * whitespace cosmetics: Remove all trailing whitespace.diego2009-05-131-4/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Change type names to match upstream libassGrigori Goronzy2009-08-071-4/+4
| |
* | Remove internal libass treeUoti Urpala2009-07-261-2/+1
| | | | | | | | | | Remove the libass/ directory and use the newest standalone version of the library instead.
* | Remove the internal GUIAnton Khirnov2009-07-071-14/+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-4/+4
| |
* | 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.
* | | Merge svn changes up to r29117Uoti Urpala2009-04-011-0/+3
|\ \ \ | | |/ | |/|
| * | Check mpi type before returning an DR buffer in get_image, fixes jerkinessreimar2009-03-161-0/+3
| | | | | | | | | | | | | | | | | | | | | with MPEG1/2 and -dr -slices git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28974 b3059339-0415-0410-9bf9-f77b7e298cf2
* | | vo_gl: Fix libass subtitles disappearing during pauseUoti Urpala2009-03-221-0/+2
| |/ |/| | | | | | | | | | | EOSD bitmaps were not properly redrawn when the screen was updated to change other OSD content, resulting in libass subtitles disappearing if the OSD changed while paused. Fixed by adding a call to redraw the EOSD part too.
* | Merge svn changes up to r28951Uoti Urpala2009-03-141-1/+1
|\|
| * 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 r28862Uoti Urpala2009-03-071-27/+52
|\|
| * Refactor smalltex/tinytex EOSD optimization in vo_glreimar2009-03-061-18/+39
| | | | | |