summaryrefslogtreecommitdiffstats
path: root/libvo
Commit message (Collapse)AuthorAgeFilesLines
* Merge svn changes up to r29912Uoti Urpala2009-11-166-24/+76
|\
| * Added -name, -title and -use-filename-title options and implementation in ↵ptt2009-11-123-1/+12
| | | | | | | | | | | | X11 vos git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29904 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Do not dynamically load libvdpau.so.1, but link at compile time.cehoyos2009-11-111-20/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29903 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Support VDPAU hardware accelerated decoding of MPEG-4 ASP on capablecehoyos2009-11-101-0/+4
| | | | | | | | | | | | | | | | | | hardware. Original patch by NVIDIA corporation. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29885 b3059339-0415-0410-9bf9-f77b7e298cf2
| * 100: Fix function parameters when calling create_vdp_decoder() from ↵cehoyos2009-11-101-1/+1
| | | | | | | | | | | | query_format(). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29872 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Cosmetics: Fix indentation after last commit.cehoyos2009-11-101-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29871 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fail in query_format() if a VDPAU decoder is not available.cehoyos2009-11-101-5/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29870 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add a default to switch(image_format), suppresses a warning after a future ↵cehoyos2009-11-101-0/+3
| | | | | | | | | | | | patch. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29869 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix compilation of teletext code without freetype supportreimar2009-11-091-0/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29864 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Change type of teletext color specification from unsigned charreimar2009-11-091-1/+1
| | | | | | | | | | | | | | to static const uint8_t git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29863 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove CONFIG_TV_TELETEXT.cehoyos2009-11-071-10/+0
| | | | | | | | | | | | | | | | DVB teletext support is nearly finished, it will be possible to read teletext from file, it will not be depending on reception any more. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29851 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add new VDPAU feature high-quality-scaling (and require newer library).cehoyos2009-11-041-1/+9
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29823 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unneeded initializationreynaldo2009-11-031-1/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29818 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Slightly change behavior of "none" if fstype specification.corey2009-10-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | In a list of enabled fstypes, "none" now clears the list rather than disabling all fstypes and interrupting the parser. To enable only one (or more) fstypes, list the types to enable after "none". For example: "-fstype none" is the same as before: all disabled "-fstype none,fullscreen" enables only the fullscreen type git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29805 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Move teletext specific code from stream into libmpcodecs.cehoyos2009-10-291-1/+1
| | | | | | | | | | | | | | Patch by Francesco Lavra, francescolavra interfree it git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29801 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Cosmetics: Reindent after last commit.cehoyos2009-10-271-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29799 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Allow image format BGRA when using vo vdpau.cehoyos2009-10-271-0/+38
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29798 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Move some variable initializations to the beginning of vo_x11_fullscreen().diego2009-10-241-9/+4
| | | | | | | | | | | | | | | | | | | | | | Fixes the warnings: libvo/x11_common.c:1344: warning: 'h' may be used uninitialized in this function libvo/x11_common.c:1344: warning: 'w' may be used uninitialized in this function libvo/x11_common.c:1344: warning: 'y' may be used uninitialized in this function libvo/x11_common.c:1344: warning: 'x' may be used uninitialized in this function git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29795 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Implement VFCAP_FLIP for vo_vdpau.cehoyos2009-10-231-3/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29794 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Free memory allocated in ff_vdpau_add_data_chunk() on uninit.cehoyos2009-10-221-0/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29793 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix aspect test program linking.diego2009-10-191-0/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29785 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Try to recover from VDPAU display pre-emptions.cehoyos2009-10-171-0/+76
| | | | | | | | | | | | | | Original patch by Uoti. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29777 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Support SMPTE-240M colourspace in vo_vdpau.cehoyos2009-10-121-3/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29771 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add colorspace option to vo_vdpau.cehoyos2009-10-101-12/+39
| | | | | | | | | | | | | | | | | | Allows to use ITU-R BT.709 instead of the default ITU-R BT.601. Patch by Lauri Mylläri, lauri D myllari gmail git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29769 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Remove some pointless parentheses from return calls.diego2009-10-081-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29759 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Break two more lines.diego2009-10-081-2/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29758 b3059339-0415-0410-9bf9-f77b7e298cf2
| * K&R coding style and whitespace cosmeticsdiego2009-10-061-162/+170
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29755 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add keycode definitions for older versions of OSX. Fixes compilation on 10.4.adrian2009-10-061-0/+51
| | | | | | | | | | | | | | Patch by Aaro Koskinen, aaro D koskinen A iki D fi git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29754 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Support VDPAU MPEG4 hardware decodingUoti Urpala2009-11-161-0/+6
| | | | | | | | Original patch by NVIDIA.
* | vo_vdpau: Remove custom help messageUoti Urpala2009-11-161-24/+7
| | | | | | | | | | | | | | | | | | | | Remove the help text explaining -vo vdpau suboptions that was printed in case of parsing errors. It did perhaps have some value, but there are also reasons to remove it: it was printed in an ugly manner in the middle of output, most other MPlayer options do not have such internal help texts either, and it was detailed enough that it required maintaining documentation about the options in two separate places (the man page and the help message).
* | vo_vdpau: Add support for high-quality scaling featureUoti Urpala2009-11-152-2/+25
| | | | | | | | | | | | | | Part of the code is currently under #ifdef to allow compilation with older VDPAU library versions; that can be removed later. Partially based on a patch by Carl Eugen Hoyos.
* | vo_vdpau: add support for VFCAP_FLIPUoti Urpala2009-11-151-3/+6
| | | | | | | | Patch by Carl Eugen Hoyos.
* | vo_vdpau: Free buffers allocated by FFmpeg on uninitUoti Urpala2009-11-151-0/+4
| |
* | Add yuv_colorspace property, implemented in vo_vdpau and vo_xvUoti Urpala2009-11-154-15/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Implement vsync-aware frame timing for VDPAUUoti Urpala2009-11-156-16/+239
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Main things added are custom frame dropping for VDPAU to work around the display FPS limit, frame timing adjustment to avoid jitter when video frame times keep falling near vsyncs, and use of VDPAU's timing feature to keep one future frame queued in advance. NVIDIA's VDPAU implementation refuses to change the displayed frame more than once per vsync. This set a limit on how much video could be sped up, and caused problems for nearly all videos on low-FPS video projectors (playing 24 FPS video on a 24 FPS projector would not work reliably as MPlayer may need to slightly speed up the video for AV sync). This commit adds a framedrop mechanism that drops some frames so that no more than one is sent for display per vsync. The code tries to select the dropped frames smartly, selecting the best one to show for each vsync. Because of the timing features needed the drop functionality currently does not work if the correct-pts option is disabled. The code also adjusts frame timing slightly to avoid jitter. If you for example play 24 FPS video content on a 72 FPS display then normally a frame would be shown for 3 vsyncs, but if the frame times happen to fall near vsyncs and change between just before and just after then there could be frames alternating between 2 and 4 vsyncs. The code changes frame timing by up to one quarter vsync interval to avoid this. The above functionality depends on having reliable vsync timing information available. The display refresh rate is not directly provided by the VDPAU API. The current code uses information from the XF86VidMode extension if available; I'm not sure how common cases where that is inaccurate are. The refresh rate can be specified manually if necessary. After the changes in this commit MPlayer now always tries to keep one frame queued for future display using VDPAU's internal timing mechanism (however no more than 50 ms to the future). This should make video playback somewhat more robust against timing inaccuracies caused by system load.
* | vo_vdpau: Modify frame buffering codeUoti Urpala2009-11-153-55/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up code related to frame buffering and generate pts information also for the next frame in the output queue. The timing information will be used in a following framedrop patch. This commit adds one frame of buffering delay in vo_vdpau and increases the number of buffered vdpau video surfaces from 3 to 4. The delay increase makes it more important to fix remaining code in MPlayer that doesn't deal well with filter/VO delay; OTOH it should help any decoding/filtering parallelism in the underlying VDPAU implementation as now filtering a frame for display can happen while the next one is being decoded.
* | cosmetics: Add two missing "static"Uoti Urpala2009-10-222-2/+2
| | | | | | | | Add missing 'static' to internal functions in vo_xv.c and vo_vdpau.c.
* | Merge svn changes up to r29752Uoti Urpala2009-10-067-23/+53
|\| | | | | | | | | | | | | | | | | 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.
| * Fix definition of KEY_PAGE_DOWN.cehoyos2009-10-041-1/+1
| | | | | | | | | | | | | | Patch by Aaro Koskinen, aaro D koskinen A iki D fi git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29749 b3059339-0415-0410-9bf9-f77b7e298cf2
| * 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
| * Also check GLX client and server strings for extensionsreimar2009-09-271-2/+27
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29721 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix teletext font autoscaling.cehoyos2009-09-221-2/+2
| | | | | | | | | | | | | | Patch by Francesco Lavra, francescolavra interfree it git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29702 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix vo_corevideo with shared buffer after r29606: Only do GUI dependent ↵adrian2009-09-201-4/+5
| | | | | | | | | | | | display config if shared buffer is not enabled. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29699 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
| * Use vo_w32_window directly instead of via the vo_window macro in ↵reimar2009-09-181-2/+2
| | | | | | | | | | | | Windows-only code. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29689 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
| * Use ecx instead of ebx to avoid unnecessary issues with PIC.reimar2009-09-171-9/+9
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29687 b3059339-0415-0410-9bf9-f77b7e298cf2
* | osx_common.c: Fix compilationUoti Urpala2009-09-261-1/+2
| | | | | | | | | | This file should have been fixed when merging it from svn. Broke compilation with OS X-specific VOs enabled.
* | Merge branch 'vdpau' into buildUoti Urpala2009-09-196-872/+1263
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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: Prefer vo_vdpau over vo_xv againUoti Urpala2009-09-191-3/+3
| | |