summaryrefslogtreecommitdiffstats
path: root/libvo
Commit message (Collapse)AuthorAgeFilesLines
* cleanup: some warning fixes and minor cleanupsreimar2011-06-292-4/+4
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33399 b3059339-0415-0410-9bf9-f77b7e298cf2 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33400 b3059339-0415-0410-9bf9-f77b7e298cf2 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33421 b3059339-0415-0410-9bf9-f77b7e298cf2 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33425 b3059339-0415-0410-9bf9-f77b7e298cf2 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33426 b3059339-0415-0410-9bf9-f77b7e298cf2
* Windows: vo/input: handle WM_XBUTTONDOWN messageRudolf Polzer2011-06-191-1/+16
| | | | | | | WM_XBUTTONDOWN is used for extra mouse buttons (mapped to button 5 and button 6 in mplayer2). Previously only vo_directx handled this message. Add support to w32_common.c event handling too (used by vo_direct3d and vo_gl/vo_gl2 on Windows).
* vo_xvmc: drop XvMC supportUoti Urpala2011-05-092-1319/+0
| | | | | | | | | Due to libavcodec changes vo_xvmc would have needed some modifications to keep working. However, I think there's little real demand for XvMC, so I'll just drop XvMC support. XvMC only supported MPEG-2, making it of very limited usefulness nowadays, plus the vo_xvmc implementation was not high quality and never worked particularly well or reliably anyway.
* cleanup: shut up more warningsClément Bœsch2011-05-064-23/+8
|
* vo_svga: fix build after previous commit 6506d4adClément Bœsch2011-05-031-1/+1
| | | | | | | vo_svga.c used its static query_format() function before defining it, but had no prototype before the use. Thus is depended on the otherwise useless static declaration in a shared header, and broke after that was removed. Fix by adding an advance declaration inside the file.
* cleanup: remove more warningsClément Bœsch2011-05-022-8/+3
|
* Merge branch 'mplayer1_changes'Uoti Urpala2011-05-023-60/+45
|\
| * cleanup: vo_fbdev: simplify some codereimar2011-05-021-39/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify by using FFMAX3. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33300 b3059339-0415-0410-9bf9-f77b7e298cf2 Simplify colormap generation code, avoid some mallocs and add frees for one error case. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33302 b3059339-0415-0410-9bf9-f77b7e298cf2 Use memcpy_pic instead of reimplementing it. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33303 b3059339-0415-0410-9bf9-f77b7e298cf2
| * vo_fbdev: clip x/y offsets to avoid bad video placementreimar2011-05-022-3/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33299 b3059339-0415-0410-9bf9-f77b7e298cf2
| * vo_fbdev: Add -geometry support reusing common codereimar2011-05-021-13/+10
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33298 b3059339-0415-0410-9bf9-f77b7e298cf2
| * vo_fbdev: add RGB framebuffer supportreimar2011-05-021-7/+13
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33289 b3059339-0415-0410-9bf9-f77b7e298cf2
| * vo_gl: fix "gamma" equalizer settingreimar2011-04-121-0/+2
| | | | | | | | | | | | | | The "gamma" setting only changed red gamma. Fix it to change all of red, green and blue gamma. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32895 b3059339-0415-0410-9bf9-f77b7e298cf2
* | input: move all key code lists to input/keycodes.hUoti Urpala2011-05-0213-26/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | vo_dga: replace xf86dga.h with Xxf86dga.hClément Bœsch2011-04-202-2/+2
| | | | | | | | xf86dga.h is deprecated and may be removed in the future.
* | cleanup: avoid various GCC warningsClément Bœsch2011-04-203-11/+9
|/
* VO: don't wait for map event in X VO initializationUoti Urpala2011-04-081-4/+0
| | | | | | | | | | | After creating a video window the common X code waited for a MapNotify event before proceeding. This meant that if the window was opened on another workspace the player would be stuck until the user switched to that workspace and the window could become actually visible. Remove this waiting code. I don't know why it was there or if it was actually beneficial/needed for some setup (at least common uses seem to work fine without it); it comes from the earliest MPlayer versions visible in VCS history.
* vo_mga, build: change include from "libavcore" to "libavutil"Uoti Urpala2011-03-281-1/+1
| | | | | | | | | Libavcore was merged back to libavutil. Change the mga_template.c include of libavcore/imgutils.h to match. This means that split libavcore/libavutil versions won't work any more; but since this only affects people who enable vo_mga and there was no released version using the split libs I won't bother with any conditionals for the include.
* vo_corevideo: add key_modifier_alt only when pressing left option keyStefano Pigozzi2011-03-181-1/+4
|
* vo_corevideo: fix menubar showing 2 apples on snow leopardStefano Pigozzi2011-03-111-1/+4
|
* vo_corevideo: support modifier keys in keyboard inputStefano Pigozzi2011-03-031-2/+11
|
* core: hr-seek: fix soft hang with hrseek past EOFUoti Urpala2011-03-032-0/+6
| | | | | | | | | | | | | | | | When doing a precise seek video_out->frame_loaded was left to true while frames were being skipped. However vo_get_buffered_frame() always returns success if a frame is already loaded; due to this the EOF detection in update_video() never triggered, and a hr-seek past EOF could cause a soft hang (commands were still processed and it was possible to seek again to exit the loop). This could also happen with Matroska files using ordered chapters if an underlying file was actually shorter than the chapter that was supposed to come from it. Then seeking to a timestamp after the end of the file but before the end of the chapter would trigger the bug. Fix the problem by setting frame_loaded to false when we decide to skip the frame in question.
* x11_common: fix for reconfig with pos/xineramascreen setUoti Urpala2011-02-032-9/+9
| | | | | | | | | | | | | vo_x11_create_vo_window() only called vo_x11_update_geometry() if no window position had been specified by -geometry or -xineramascreen, to avoid overwriting the specified position with values from the existing window. However window size should be initialized to the existing window here, and setting new window title for -use-filename-title is also done in vo_x11_update_geometry() (for whatever reason, it doesn't match what else that function does). Change the code in vo_x11_create_vo_window() to always call vo_x11_update_geometry() for size variable and window title updates, but add a flag that tells it not to update position variables.
* vo_zr2: drop Zoran supportUoti Urpala2011-01-316-1909/+0
| | | | | | | There were multiple files specific to Zoran support, and they also depended on internal FFmpeg headers (so it would probably have been hard to get them to compile now even if you tried). It's obsolete now, so just drop the whole mess.
* vo_dxr2, ao_dxr2: drop dxr2 supportUoti Urpala2011-01-312-972/+0
| | | | | | dxr2 support had been broken quite a while and nobody noticed. There were finally commits to fix it in the svn repo, but rather than apply those I'll just drop dxr2 support.
* vidix: drop VIDIX supportUoti Urpala2011-01-319-1914/+0
| | | | | | | | | | | | | By now VIDIX is too obscure to justify the amount of code and complexity it requires in the sources. Although there is no pressing need to drop it just now from a code point of view, I'll rather remove it before release than release with VIDIX support and then drop it later. Some of the manpage mentions of VIDIX were in "this option supported for these VOs" lists that looked outdated and failed to mention vdpau for example. Replace such incorrect lists with a generic "not supported for all VOs" mention.
* cleanup: vo_md5sum: Remove unused define/undefcboesch2011-01-311-15/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32786 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_gl: mark llvmpipe as a software rendererreimar2011-01-291-1/+2
| | | | | | | llvmpipe, while only slow instead of insanely slow, is a software renderer. Recognize it as such and disable -vo gl_nosw on it. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32719 b3059339-0415-0410-9bf9-f77b7e298cf2
* sub/OSD: move some related files to sub/Uoti Urpala2011-01-2639-3746/+39
|
* subs: use correct font aspect ratio for libass + converted subsUoti Urpala2011-01-261-0/+4
| | | | | | | | | | | | | | | | | | | | | | Rendering of ASS subtitles tries to be bug compatible with VSFilter and stretches fonts when the video is anamorphic (some scripts try to compensate for this VSFilter behavior, so trying to render them "correctly" would give the wrong result). However this behavior is not appropriate for subtitles we converted to ASS format ourselves for libass rendering, as they certainly don't have VSFilter bug workarounds. Change the code to use different behavior for "native" ASS tracks and converted ones. It's questionable whether the VSFilter-compatible behavior is appropriate for external .ass files either, as there could be anamorphic and non-anamorphic versions of the same video and the bug-compatible behavior can only be correct for one alternative at most. However it's probably better to keep it as a default at least, so that extracting a muxed subtitle track and using that does not give behavior different from the original muxed one. The aspect ratio setting is per ASS_Renderer, and changing it resets libass caches. For that reason this commit adds separate renderer instances to use for the "correct" and "VSFilter bug compatible" cases.
* cleanup: some random minor code simplification and cleanupUoti Urpala2011-01-262-2/+2
|
* cleanup: move MP_NOPTS_VALUE definition to mpcommon.hUoti Urpala2011-01-151-4/+1
|
* subtitles: move global ass_track to struct osd_stateUoti Urpala2011-01-151-0/+1
|
* core: move global "subdata" and "vo_sub_last" to mpctxUoti Urpala2011-01-111-1/+0
|
* vo_vdpau: allow "deint=-N" to specify mode without enabling deintUoti Urpala2011-01-041-3/+7
| | | | | | | | | Allow negative values of the "deint" parameter and make them select the same deinterlacing mode as the corresponding positive value, but without enabling deinterlace on startup. This is useful for configuration files. Also tweak the overall manpage description of vo_vdpau a bit to make it sound less as if the VO would be for hardware acceleration only.
* Merge branch 'hr-seek'Uoti Urpala2010-12-205-25/+41
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * hr-seek: input: add default keybindings Shift+[arrow] for small exact seeks input: support bindings with modifier keys for X input core: audio: make ogg missing audio timing workaround more complex core: add support for precise non-keyframe-limited seeks core: add struct for queued seek info commands: add generic option -> property wrapper options: add "choice" option type, use for -pts-association-mode core: remove looping in update_video(), modify command handling a bit core: seek: use accurate seek mode with audio-only files core: avoid using sh_video->pts as "current pts" libvo: register X11 connection fd in input event system core: timing: add special handling of long frame intervals core: move central play loop to a separate function Conflicts: DOCS/tech/slave.txt
| * input: support bindings with modifier keys for X inputUoti Urpala2010-12-202-8/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for binding commands to modifier+key combinations like "Shift+Left" or "Ctrl+Alt+x", and support reading such combinations from the output window of X VOs. The recognized modifier names are Shift, Ctrl, Alt and Meta. Any combination of those and then a non-modifier key name, separated by '+', is accepted as a key name in input.conf. For non-special keys that produce characters shift is ignored as a modifier. For example "A" is handled as a key without modifiers even if you use shift to write the capital letter; 'a' vs 'A' already distinguishes the combinations with a normal keymap, and having separate 'a', 'Shift+A' and 'A' (written with caps lock for example) would bring more confusion than benefit. Currently reading the modifier+key combinations is only supported in the output window of those VOs that use x11_common.c event handling. It's not possible to input the key combinations in other VOs or in a terminal window.
| * libvo: register X11 connection fd in input event systemUoti Urpala2010-12-144-17/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | cosmetics: remove unused code, small formatting tweaksUoti Urpala2010-12-201-6/+6
| |
* | font_load_ft.c: disable -fontconfig if compiled without libfontconfigkomh2010-12-161-0/+4
|/ | | | | | | | Set the option value to disabled, not enabled, if the functionality is not available at all. Without this, -font and -subfont do not work when using -ass. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32636 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_vdpau: remove wrong mp_image usage_count change (no visible effect)Uoti Urpala2010-12-131-1/+1
| | | | | | | The wrong variable was used as a function argument, and as a result the code modified the usage_count field of non-refcounted mp_image types. This error did not have any effect on visible behavior as no code cares about the field value in the affected case.
* cleanup: remove NULL checks before free() all over the codecboesch2010-11-1422-94/+52
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32624 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_gl: create stereo-capable window when using Quadbuffer 3Dreimar2010-11-143-0/+5
| | | | | | | Select a stereo pixel format for window when Quadbuffer OpenGL was selected as 3D mode. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32620 b3059339-0415-0410-9bf9-f77b7e298cf2
* libvo/w32_common.c: Move setting of pixel format from init to configreimar2010-11-141-21/+21
| | | | | | This allows it to depend on flags etc. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32619 b3059339-0415-0410-9bf9-f77b7e298cf2
* libvo/w32_common.c: minor cleanupreimar2010-11-141-18/+19
| | | | | | | | | | Some indentation fixes. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32611 b3059339-0415-0410-9bf9-f77b7e298cf2 Simplify: Use early return instead of large if block. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32612 b3059339-0415-0410-9bf9-f77b7e298cf2
* cleanup: don't check for NULL before free()diego2010-11-082-21/+17
| | | | | | patch by Clément Bœsch, ubitux gmail com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32598 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_kva: Restore all the attributes after changing aspect ratiokomh2010-11-071-0/+9
| | | | | | kvaSetup() resets all the attributes, so there is need to restore them. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32570 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_kva: Prevent a parent window from painting over ours in slave modekomh2010-11-071-0/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32569 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
* options: move -name and -title to option structClément Bœsch2010-11-043-10/+5
|
* vo_gl: Move the read_pnm function into a separate filecigaes2010-11-021-60/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32513 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_gl: Extract code to read a pnm file into a separate functionreimar2010-11-021-24/+48
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32479 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_dxr3: Fix validity checks before closing a file descriptorreimar2010-11-021-3/+3
| | | | | | -1 is invalid (and the initial value), 0 is not. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32467 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_dxr3: Fix indentationreimar2010-11-021-20/+17
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32466 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_mga: minor code cleanupreimar2010-11-021-13/+16
| | | | | | | | | | | | | | Spelling fix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32459 b3059339-0415-0410-9bf9-f77b7e298cf2 Use FFALIGN macro. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32460 b3059339-0415-0410-9bf9-f77b7e298cf2 Spelling fix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32461 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_xmga: Remove an unmotivated and pointless panscan_calc callreimar2010-11-021-2/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32458 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_xvidix: reconfigure also on window movereimar2010-11-021-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32457 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_xmga: fix event handlingreimar2010-11-021-4/+4
| | | | | | | Fix xmga event handling: Reconfigure hardware on move and resize, redraw colorkey on resize and expose. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32456 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_xmga: Remove a useless MGA_VID_CONFIG ioctlreimar2010-11-021-3/+0
| | | | | | set_window already does this. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32455 b3059339-0415-0410-9bf9-f77b7e298cf2
* x11_common: add VO_EVENT_MOVEreimar2010-11-022-2/+7
| | | | | | | | | Add VO_EVENT_MOVE which is required for VOs that interact directly with hardware like MGA and VIDIX. Patch by Dirk Porezag [porezag yahoo com] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32454 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_mga: switch to newer screen dimension handling APIreimar2010-11-022-79/+23
| | | | | | | Switch (x)mga vo to new libvo API to reduce code duplication and improve consistency between vos. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32453 b3059339-0415-0410-9bf9-f77b7e298cf2
* aspect.c: use fallback if screen dimensions are not knownreimar2010-11-021-0/+6
| | | | | | | | | | | | Add fallback values to aspect_save_screenres to avoid division by 0 if screen dimensions are not known. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32452 b3059339-0415-0410-9bf9-f77b7e298cf2 Fix handling of invalid values in aspect_save_s