Commit Graph

2918 Commits

Author SHA1 Message Date
diego 2e903f7c75 Remove unnecessary malloc.h #includes and related #ifdeffery.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29126 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-02 09:20:48 +00:00
cehoyos a0dab6c1c0 Prefer vo vdpau over vo xv where available.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29118 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-31 22:06:40 +00:00
reimar 6b57f53f6f Get rid of nonsensical limits on -geometry x, y,w and h values, they only
cause confusion on multi-monitor setups.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29112 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-31 16:16:12 +00:00
cehoyos f7891c8e53 Support IMGFMT_NV12 for vo vdpau.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29109 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-30 21:17:42 +00:00
reimar 79568f8ea5 Make sure we do not accidentally use the vdp_get_error_string from the
previous initialization.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29106 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-30 12:11:12 +00:00
cehoyos 05be65cb86 Add support for IMGFMT_YUY2 and IMGFMT_UYVY to vo vdpau.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29105 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-29 19:43:52 +00:00
cehoyos c7990f8893 VDPAU supports IMGFMT_I420 and IMGFMT_IYUV.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29104 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-29 19:25:22 +00:00
reimar b4f5702c0a Consistently use MP_MAX_PLANES as size for plane pointer/stride arrays in libvo.
This might avoid some issues since sws_scale in some cases assumes these
have at least 4 valid entries.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29101 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-29 14:37:21 +00:00
cehoyos bdbf4f617d Cosmetics: Reindent after last commit.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29094 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-29 11:16:14 +00:00
cehoyos aa549a325b 10l: Don't use MP_IMGFIELD_TOP_FIRST if MP_IMGFIELD_ORDERED is not set.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29093 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-29 11:15:22 +00:00
cehoyos 38116c1f73 Simplify vdpau deinterlacing code and fix timing for deint=2.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29061 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-25 23:32:27 +00:00
cehoyos a0f0db79f4 New VDPAU deinterlacing code needs one reference surface less for software decoding.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29053 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-24 21:49:08 +00:00
cehoyos c266ad4de4 New vdpau deinterlacing code needs one reference surface less.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29052 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-24 21:47:56 +00:00
cehoyos 7ab8e44842 Stephen Warren reported that VDPAU deinterlacing did not work correctly.
New static function push_deint_surface() by Reimar.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29051 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-24 21:45:39 +00:00
cehoyos 9e8112128e Change function call order in config().
This stops creating a window even if hardware decoding is certainly
going to fail.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29040 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-22 23:58:40 +00:00
cehoyos 9970706263 10l: Only try to create vdpau decoder if hardware decoding is intended.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29028 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-21 22:53:18 +00:00
cehoyos a331f3fd15 Test if create_vdp_decoder() might succeed by calling it from config()
with a small value for max_reference_frames.
This does not make automatic recovery by using software decoder possible,
but lets MPlayer fail more graciously on - actually existing - buggy
hardware that does not support certain H264 widths when using
hardware accelerated decoding (784, 864, 944, 1024, 1808, 1888 pixels on
NVIDIA G98) and if the user tries to hardware-decode more samples at
the same time than supported.
Might break playback of H264 Intra-Only samples on hardware with very
little video memory.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29027 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-21 20:11:05 +00:00
cehoyos 9f47d4d37c Change return value for create_vdp_decoder().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29026 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-21 19:59:35 +00:00
cehoyos 8c820cce48 Factorize create_vdp_decoder().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29024 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-21 17:10:19 +00:00
cehoyos 115bfb9762 Allow to use vdpau temporal deinterlacers with hardware accelerated decoding.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28991 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-18 17:02:29 +00:00
cehoyos 02c87f0578 Add chroma-deint option to vo vdpau (nochroma-deint speeds up deinterlacing).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28979 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-16 23:03:18 +00:00
reimar 91dd12b122 Check mpi type before returning an DR buffer in get_image, fixes jerkiness
with MPEG1/2 and -dr -slices


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28974 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-16 14:25:03 +00:00
cehoyos 773c611884 Move initialisation of deint_surfaces[] to free_video_specific().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28971 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-15 22:19:05 +00:00
cehoyos 2ec3f259e5 Update -vo vdpau command line help.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28970 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-15 21:48:52 +00:00
cehoyos 7f3ddffb67 Cosmetics: Fix whitespace.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28969 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-15 21:26:10 +00:00
cehoyos e8113dc1c7 Initial support for advanced VDPAU deinterlacers (software-decoded video
only).

With a lot of help from Reimar


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28968 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-15 21:20:06 +00:00
iive 2db1a43c2e Fix warning: Add forgotten 'int' to variable declaration.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28965 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-15 20:02:45 +00:00
diego a21feef029 cosmetics: Remove file names from file header, it only causes trouble.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28959 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-15 12:45:16 +00:00
diego 8484309af2 Remove obsolete extra elements from opt_t struct initialization.
Fixes a bunch of 'excess elements in struct initializer' warnings.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28957 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-15 10:03:09 +00:00
diego 17d0933e57 Get rid of pointless preprocessor condition indirection and use ARCH_X86
directly instead of CAN_COMPILE_X86_ASM.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28956 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-15 10:01:02 +00:00
diego 7155671f37 "MPlayer - The Movie Player" should be used as the player name.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28955 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-15 09:47:51 +00:00
diego bf1c189439 cosmetics: typo fix
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28954 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-15 09:47:09 +00:00
diego 366c3fa13d KVA vo driver for OS/2, patch by KO Myung-Hun, komh chollian net
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28950 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-14 18:44:58 +00:00
cehoyos 919793e643 Output number of reference frames before creating H264 vdpau decoder.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28927 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-09 23:46:28 +00:00
diego 1753d37fc7 Merge two preprocessor conditions in order to drop one duplicated #else case.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28902 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-09 11:02:54 +00:00
greg 708819105f Change default OSD/subtitle font sizes.
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
2009-03-09 01:48:42 +00:00
diego 41bd5a75fd cosmetics: spelling fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28872 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-07 17:41:34 +00:00
diego 1e94c915a2 cosmetics: Reformat file header.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28871 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-07 13:45:48 +00:00
reimar fca7818668 Setting vo_fs is handled by x11_common.c, so remove that code from vo_xv/vo_xvmc.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28864 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-07 08:52:57 +00:00
reimar 05119ecaf6 Make data related to suboption parsing const in libvo
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28863 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-07 08:51:40 +00:00
reimar b33adcdd02 Refactor smalltex/tinytex EOSD optimization in vo_gl
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28849 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-06 12:56:13 +00:00
reimar 175cfc985c Simplify EOSD code by rendering it in VOCTRL_DRAW_EOSD instead of genEOSD,
just like vo_vdpau.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28843 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-06 10:53:30 +00:00
reimar eb761e688f Remove duplicate OSD drawing introduced due to a conflict between r28840 and r28839.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28842 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-06 10:50:43 +00:00
reimar d4748622fa As for vo_gl, do not rely on draw_osd to render EOSD.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28840 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-06 10:39:58 +00:00
greg 658bcd5e35 Draw EOSD with VOCTRL_DRAW_EOSD instead of along with OSD.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28839 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-06 10:38:27 +00:00
reimar 397c4db88b Do not rely on draw_osd to render the EOSD, instead draw it already at the
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
2009-03-06 10:33:35 +00:00
reimar 81ce92ba78 Make sure all output_surfaces are initialized in preinit.
Patch by Dan Oscarsson [Dan Oscarsson (at) tietoenator com]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28809 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-04 19:37:07 +00:00
reimar 76f7f3aa0d Make sure vo_x11_create_vo_window sets vo_dwidth and vo_dheight right
when we were in fullscreen mode and stay there.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28806 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-04 08:37:54 +00:00
reimar 8864662b13 Make WinID a 64 bit integer, this should avoid issues with valid Window
handles on windows being interpreted as "no wid set".


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28795 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-02 11:24:20 +00:00
cehoyos 40fb81669a Use M_PI for pi.
Suggested by Reimar.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28764 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-28 15:45:24 +00:00