summaryrefslogtreecommitdiffstats
path: root/libvo
Commit message (Collapse)AuthorAgeFilesLines
* cleanup: silence some clang warningsreimar2011-07-063-4/+4
| | | | | | | | | | | | | | | | | Cosmetics: vo_mpegpes.c: Fix strange space placement Avoids clang warning that =- might have been intended as -=. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33797 b3059339-0415-0410-9bf9-f77b7e298cf2 vo_jpeg: Use "const char *" type for paths. Fixes a clang warning due to sign mismatch when calling open(). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33799 b3059339-0415-0410-9bf9-f77b7e298cf2 mga_template.c: Remove pointless and in addition incorrect cast. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33800 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_gl: fix YUY2/YVYU colorspace mixupreimar2011-07-062-2/+4
| | | | | | Second GL_YCBCR_MESA format is YVYU, not YUY2. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33694 b3059339-0415-0410-9bf9-f77b7e298cf2
* cleanup: vo_directx: remove redundant codereimar2011-07-061-94/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify code for printing display adapter list. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33672 b3059339-0415-0410-9bf9-f77b7e298cf2 Remove left-over code from icon/cursor handling that is now done by w32_common.c git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33673 b3059339-0415-0410-9bf9-f77b7e298cf2 Remove more code and variables that have no purpose anymore. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33674 b3059339-0415-0410-9bf9-f77b7e298cf2 Remove some #includes that are no longer needed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33675 b3059339-0415-0410-9bf9-f77b7e298cf2 Remove more unnecessary code/defines. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33677 b3059339-0415-0410-9bf9-f77b7e298cf2 Move check_events function to avoid forward declaration. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33678 b3059339-0415-0410-9bf9-f77b7e298cf2 Remove more unused variables. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33679 b3059339-0415-0410-9bf9-f77b7e298cf2 Add const to avoid compiler warning. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33680 b3059339-0415-0410-9bf9-f77b7e298cf2 Use the proper type for the palette, fixes compiler warning. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33681 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_directx: Change vo_directx to use w32_common.creimar2011-07-061-370/+43
| | | | | | | | | | | While I tested it quite thoroughly, with and without -wid, -vm, -fs, ... it is _very_ likely to break something, please report any regressions! In the worst case it can still be reverted, however since it has very little relevance nowadays it will rot all the faster if not at least some code is shared. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33657 b3059339-0415-0410-9bf9-f77b7e298cf2
* VO: w32_common: also generate VO_EVENT_MOVEreimar2011-07-061-0/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33650 b3059339-0415-0410-9bf9-f77b7e298cf2 Generate VO_EVENT_MOVE also with -wid. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33656 b3059339-0415-0410-9bf9-f77b7e298cf2
* VO: support Pause/Break key in X11 inputdiego2011-07-062-1/+3
| | | | | | | Allow Pause/Break key to be bound as MPlayer input key under X11. patch by Steaphan Greene, sgreene cs.binghamton edu git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33609 b3059339-0415-0410-9bf9-f77b7e298cf2
* cleanup: x11_common: remove pointless GC operationsiive2011-07-061-3/+2
| | | | | | | | | | | | | | | Remove useless XSetBackground() call right before freeing the graphic context. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33524 b3059339-0415-0410-9bf9-f77b7e298cf2 Create empty vo_gc graphic context instead of one with undefined foreground color. The code that uses vo_gc already employs XSetForeground()/XSetBackground() to change the context accordingly. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33525 b3059339-0415-0410-9bf9-f77b7e298cf2
* 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
* vo_gl: Support 9- and 10-bit YUV input for OpenGL VOsreimar2011-07-065-15/+46
| | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33502 b3059339-0415-0410-9bf9-f77b7e298cf2 Fix clear/border color of chroma texture for 9- and 10-bit formats. Avoids pink borders for those formats. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33504 b3059339-0415-0410-9bf9-f77b7e298cf2
* cleanup: vo_direct3d: Mark a function staticdiego2011-07-061-2/+3
| | | | | | | This fixes the warning: libvo/vo_direct3d.c:984:6: warning: no previous prototype for 'vo_draw_alpha_l8a8' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33499 b3059339-0415-0410-9bf9-f77b7e298cf2
* debug output: reduce verbosity of some frequent messagesUoti Urpala2011-07-051-5/+4
| | | | | Drop from frequent (per-frame) messages from DBG2 to DBG3. Drop VDPAU clock adjustment messages from V to DBG2.
* VO: silence "[ASPECT] Warning: No suitable new res found!"Uoti Urpala2011-07-051-1/+1
| | | | | | | | | | The warning "[ASPECT] Warning: No suitable new res found!" was printed from aspect() if the video ended up being downscaled from the original size AND the horizontal direction was the more limiting one for aspect-aware scaling. Also, because aspect() can run multiple times when starting playback this warning could be output multiple times. Change the code so that downscaling alone no longer triggers this message.
* VO: clean up aspect.c, remove aspecttest toolUoti Urpala2011-07-052-133/+43
| | | | | | | | | | Clean up aspect.c code and simplify it somewhat (without changing the overall logic). Replace debug output printf calls under #ifdef with mp_msg() debug output (somewhat modified). Remove the file aspecttest.c which created a binary to test aspect.c functionality. It did not compile and would not be particularly useful anyway. Remove some support lines from aspect.c and Makefile.
* cleanup: mark some vo_directfb2.c and vo_s3fb.c functions staticUoti Urpala2011-06-292-12/+22
|
* vo_gl: Request GL_LUMINANCE16 for 16-bit YUV inputreimar2011-06-292-2/+5
| | | | | | | Request GL_LUMINANCE16 as internal format for > 8 bit YUV formats. Have yet to find a system that actually provides that though. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33453 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_gl: don't accept 9/10-bit formats as inputreimar2011-06-293-14/+18
| | | | | | | | | Make mp_get_chroma_shift() simpler/more generic and add an argument to get the per-component bit depth. Use this to check more properly for supported formats in gl and gl2 vos (only 8 and 16 bit are supported, 9 and 10 are not). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33452 b3059339-0415-0410-9bf9-f77b7e298cf2
* 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
|/ | | | |