summaryrefslogtreecommitdiffstats
path: root/libvo
Commit message (Collapse)AuthorAgeFilesLines
* Merge svn changes up to r28951Uoti Urpala2009-03-1422-50/+1114
|\
| * KVA vo driver for OS/2, patch by KO Myung-Hun, komh chollian netdiego2009-03-142-0/+1091
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28950 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Output number of reference frames before creating H264 vdpau decoder.cehoyos2009-03-091-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28927 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge two preprocessor conditions in order to drop one duplicated #else case.diego2009-03-091-9/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28902 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Change default OSD/subtitle font sizes.greg2009-03-091-2/+2
| | | | | | | | | | | | | | | | | | | | This was discussed on -dev-eng and IRC. The consensus seems to be that 3-4% of the diagonal is a good default, and most people use something along these lines. The subtitle font size is set to 3.5% and the OSD is kept a little bigger with 4%. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28900 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: spelling fixesdiego2009-03-071-7/+7
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28872 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Reformat file header.diego2009-03-071-8/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28871 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Setting vo_fs is handled by x11_common.c, so remove that code from ↵reimar2009-03-072-4/+0
| | | | | | | | | | | | vo_xv/vo_xvmc. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28864 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make data related to suboption parsing const in libvoreimar2009-03-0717-20/+20
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28863 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28862Uoti Urpala2009-03-075-34/+128
|\|
| * Refactor smalltex/tinytex EOSD optimization in vo_glreimar2009-03-061-18/+39
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28849 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Simplify EOSD code by rendering it in VOCTRL_DRAW_EOSD instead of genEOSD,reimar2009-03-061-3/+2
| | | | | | | | | | | | | | just like vo_vdpau. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28843 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove duplicate OSD drawing introduced due to a conflict between r28840 and ↵reimar2009-03-061-3/+1
| | | | | | | | | | | | r28839. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28842 b3059339-0415-0410-9bf9-f77b7e298cf2
| * As for vo_gl, do not rely on draw_osd to render EOSD.reimar2009-03-061-1/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28840 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Draw EOSD with VOCTRL_DRAW_EOSD instead of along with OSD.greg2009-03-061-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28839 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Do not rely on draw_osd to render the EOSD, instead draw it already at thereimar2009-03-061-10/+15
| | | | | | | | | | | | | | | | end of genOSD. Fixes that the EOSD was drawn one frame too late. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28838 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make sure all output_surfaces are initialized in preinit.reimar2009-03-041-1/+1
| | | | | | | | | | | | | | Patch by Dan Oscarsson [Dan Oscarsson (at) tietoenator com] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28809 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make sure vo_x11_create_vo_window sets vo_dwidth and vo_dheight rightreimar2009-03-041-0/+6
| | | | | | | | | | | | | | when we were in fullscreen mode and stay there. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28806 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make WinID a 64 bit integer, this should avoid issues with valid Windowreimar2009-03-022-2/+2
| | | | | | | | | | | | | | handles on windows being interpreted as "no wid set". git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28795 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use M_PI for pi.cehoyos2009-02-281-2/+3
| | | | | | | | | | | | | | Suggested by Reimar. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28764 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make VdpVideoMixerAttribute attributes[] static const.cehoyos2009-02-281-1/+1
| | | | | | | | | | | | | | Suggested by Reimar. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28763 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Support brightness, contrast, hue and saturation adjustments viacehoyos2009-02-281-2/+54
| | | | | | | | | | | | | | | | | | custom color space conversion matrices in VDPAU. Patch by Grigori Goronzy, greg A chown D ath D cx git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28760 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix OSD for vo vdpau:deint>1.cehoyos2009-02-281-1/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28759 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Handle vdp_decoder_create failures better, in particular avoid unrelatedreimar2009-02-281-0/+5
| | | | | | | | | | | | | | error messages and retry creating a decoder. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28758 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28755Uoti Urpala2009-02-282-18/+35
|\|
| * Do not forget the chosen deinterlacer for -vo vdpau.cehoyos2009-02-271-0/+6
| | | | | | | | | | | | | | | | Make temporal deinterlacing standard when pressing "D" to activate deinterlacer. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28744 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add one-field-only output for -vo vdpau.cehoyos2009-02-271-6/+7
| | | | | | | | | | | | | | Change syntax of -vo vdpau:deint for the last time. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28743 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Document that all vdpau deinterlacers respect -field-dominance.cehoyos2009-02-271-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28742 b3059339-0415-0410-9bf9-f77b7e298cf2
| * 10l: Remove debug printf() from last commit.cehoyos2009-02-261-1/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28737 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Support "D" to (de-)activate deinterlacing when using vo vdpau.cehoyos2009-02-261-0/+7
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28736 b3059339-0415-0410-9bf9-f77b7e298cf2
| * 10l: Add missing braces for VOCTRL_GET_EOSD_RES.cehoyos2009-02-251-2/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28734 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use memset to make sure all parts of struct sockaddr_in are always initialized.reimar2009-02-251-0/+1
| | | | | | | | | | | | | | Problem reported by [kmkaplan+mplayer-dev-eng (at) kim kim-minh com] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28732 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Change code to actually work when NUM_OUTPUT_SURFACES is changed.reimar2009-02-251-9/+10
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28731 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28728Uoti Urpala2009-02-252-24/+39
|\|
| * Cosmetics: Fix indentation and line length.cehoyos2009-02-241-6/+7
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28724 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Enable Bob de-interlacing for VDPAU.cehoyos2009-02-241-13/+26
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28719 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Calculate border size in aspect keeping code by using AdjustWindowRectreimar2009-02-231-5/+6
| | | | | | | | | | | | | | | | instead of GetClientRect and GetWindowRect since GetClientRect returns nonsensical values if Window is still minimized. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28713 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28712Uoti Urpala2009-02-231-5/+192
|\|
| * Only check for vdp_video_mixer_destroy failure when we actually executed ↵reimar2009-02-231-2/+3
| | | | | | | | | | | | that function. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28711 b3059339-0415-0410-9bf9-f77b7e298cf2
| * EOSD/ASS support for vo_vdpau.creimar2009-02-231-1/+187
| | | | | | | | | | | | | | Patch by Grigori G (greg <at> chown ath cx) with minor cosmetic changes by me. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28710 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add forgotten type to variable declaration.reimar2009-02-211-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28693 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28690Uoti Urpala2009-02-214-1474/+1509
|\|
| * 100l, place vdpau below xv, it should not normally be preferred for ↵reimar2009-02-211-3/+3
| | | | | | | | | | | | auto-selection (yet). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28688 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Cosmetics. Reindent to 4 spaces.iive2009-02-211-473/+473
| | | | | | | | | | | | | | | | Checked for equality with diff -w. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28684 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Cleanup.iive2009-02-211-20/+2
| | | | | | | | | | | | | | | | Turn a number of if(mp_msg_test()) mp_msg(); into single mp_msg() git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28683 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Cosmetics. Remove all trailing whitespacesiive2009-02-211-61/+61
| | | | | | | | | | | | | | and convert the few tabs into spaces. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28681 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Turn all remaining printf() into mp_msg().iive2009-02-201-84/+85
| | | | | | | | | | | | | | Try to set appropriate levels for them. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28680 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Cleanup.iive2009-02-201-53/+29
| | | | | | | | | | | | | | Turn a number of if(mp_msg_test()) printf(); into normal mp_msg() git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28679 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Cosmetics part2. Indent local variable definitions like the rest of the code.iive2009-02-201-55/+62
| | | | | | | | | | | | | | Checked for equality by diff -wB . git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28678 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Cosmetics part 1. Reindent to 4 spaces.iive2009-02-201-916/+916
| | | | | | | | | | | | | | Checked for equality with diff -b. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28677 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Comment out "else" statement without following block.iive2009-02-201-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28676 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Move libavcodec includes together.iive2009-02-201-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28675 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Document that and why deinterlacing is not workingreimar2009-02-201-3/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28674 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add support for VDPAU deinterlacing, pullup, denoise and sharpening.reimar2009-02-201-5/+71
| | | | | | | | | | | | | | | | Deinterlacing can not yet be toggled at runtime, and actually it does not seem to work at all... git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28673 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28655Uoti Urpala2009-02-192-2/+4
|\|
| * Use the same code to convert fps in float to fraction as used in mencoder,reimar2009-02-181-1/+1
| | | | | | | | | | | | | | | | it ensures all the common frame rates work right. If this causes issues, it should be changed in the same way in mencoder.c git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28650 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add VOCAP_NOSLICES and use it to allow vo_vdpau to not support slices forreimar2009-02-181-1/+3
| | | | | | | | | | | | | | | | YV12 - since VDPAU only has functions to upload the full frame at once there is no sense in supporting draw_slice for that. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28646 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28641Uoti Urpala2009-02-1812-13/+842
|\| | | | | | | | | | | | | | | Convert vo_x11_border (used in vo_gl/gl2 though the vo_gl_border macro) to use a wrapper macro in old-style VOs which do not provide a VO object argument. Before this function had an explicit global_vo argument in vo_gl/gl2. New vo_vdpau uses it too so use the same mechanism as most other functions.
| * Extend calc_src_dst_rects to also calculate the border values needed forreimar2009-02-176-8/+30
| | | | | | | | | | | | | | correctly placed dvdnav highlights, and fix direct3d and vdpau accordingly. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28633 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Convert HAVE_MALLOC_H into a 0/1 definition, fixes the warning:diego2009-02-173-3/+3
| | | | | | | | | | | | | | mem.c:32:5: warning: "HAVE_MALLOC_H" is not defined git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28629 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix compilation after last commit.cehoyos2009-02-171-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28627 b3059339-0415-0