1
0
mirror of https://github.com/mpv-player/mpv synced 2025-02-23 00:06:56 +00:00
Commit Graph

2983 Commits

Author SHA1 Message Date
reimar
a3dbab1813 Cropping parameter to calc_src_dst_rects is const
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28626 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-17 08:09:36 +00:00
reimar
4ed961f7e5 100l, reset ass_border when switching out of fullscreen mode.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28625 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-17 08:05:14 +00:00
diego
de53a241ed The CONFIG_TV_TELETEXT preprocessor directive is defined/undefined,
so use it with #ifdef instead of #if; fixes the warning:
libvo/sub.c:1233:5: warning: "CONFIG_TV_TELETEXT" is not defined


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28621 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-17 02:57:10 +00:00
uau
991d64b31f Fix compilation without VDPAU
The commit adding vo_vdpau had two bugs that broke compilation when
VDPAU was not enabled.
- video_out.c used "#ifdef CONFIG_VDPAU", but it's always set to 0 or 1
- In configure, MPEG1_VDPAU_DECODER was dropped from the list of
  libavcodec codecs to disable when moving VDPAU-related ones from the
  always-disabled list to a conditinal one.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28620 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-17 00:09:15 +00:00
reimar
7e9fd9351c Add support for VDPAU video out, including hardware decoding.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28617 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-16 20:58:13 +00:00
diego
1b915e419e Replace double semicolon by single semicolon.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28611 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-16 02:00:29 +00:00
diego
eacf4421f4 Sync renaming of xvmc struct members in FFmpeg.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28610 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-16 00:29:25 +00:00
diego
a452d22384 The AV_XVMC_RENDER_MAGIC constant was renamed to AV_XVMC_ID in FFmpeg.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28608 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-15 22:02:24 +00:00
iive
33f7ff9403 Reflect ffmpeg change of xvmc struct field to xvmc_id.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28607 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-15 20:29:29 +00:00
diego
e3638bae19 whitespace cosmetics: Remove all tabs and trailing whitespace.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28604 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-15 17:55:57 +00:00
diego
d274cbbbb5 The xvmc_pixfmt_render structure was renamed to xvmc_pix_fmt in FFmpeg.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28603 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-15 17:49:42 +00:00
diego
3a058c8c6a Remove unnecessary #ifdef around internal #include.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28602 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-15 17:38:47 +00:00
diego
0c4e65f15a The xmvc structure member magic_id was renamed to unique_id.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28601 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-15 17:35:24 +00:00
iive
c97692ac9d Reflect the change of xvmc struct name.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28583 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-15 08:46:18 +00:00
reimar
078091e5de Move direct-rendering hack from vo_xvmc to vf_vo, so it does not need to
be duplicated for other systems like VDPAU or VAAPI.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28581 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-15 08:07:36 +00:00
iive
d999d7652d Now xvmc struct uses magic_id field
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28578 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-15 02:38:20 +00:00
iive
ebe578fc77 Remove display_flag remains as the member has been removed from the xvmc struct.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28577 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-15 02:08:45 +00:00
iive
22e11d3bfe Remove some xvmc field initializations. They are not used by
the libavcodec decoder. They are a copy of the queried surface
and are meaningful only for pixel format selection, not during decoding.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28570 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-14 23:31:24 +00:00
diego
1538fddada Remove local copy of xvmc_render.h, it is now an installed header in FFmpeg.
Also adapt MPlayer to definition name changes in libavcodec/xvmc.h.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28557 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-14 17:18:55 +00:00
reimar
dbc106f4da Remove now unused vo_calc_drwXY function.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28547 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-12 18:03:38 +00:00
reimar
694c3dc03f Add a calc_src_dst_rects that calculates from window size, panscan etc.
which part of the video source must be scaled onto which part of the window.
Direct3D and (future) VDPAU need this, for XvMC it makes it easier to add
cropping support and Xv is changed to keep the diff to XvMC small.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28546 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-12 17:40:53 +00:00
reimar
36d0d92f21 Only set VO_EVENT_RESIZE if size actually changed, not if e.g. the window was
only moved to the foreground.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28541 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-12 12:43:14 +00:00
diego
49f88ad861 Conditionally compile aclib.c instead of placing #ifdef around its content.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28483 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-08 03:42:00 +00:00
diego
befc528297 Add standard license headers, unify header formatting.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28481 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-08 03:27:30 +00:00
gogothebee
ff0c8c1e35 Avoid message spam during video adapter uncooperative state.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28469 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-05 09:07:58 +00:00
gogothebee
680578839d Unify info/error messages to a common style:
<vo_direct3d> in the beginning, "." at the end.
Shorter/more descriptive sentences.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28468 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-05 09:06:09 +00:00
reimar
406a602ecc Add [gl] in front of vo_gl message
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28459 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-03 11:47:07 +00:00
reimar
9b8170ca54 Latest 9.1 ATI drivers finally fixed PBOs, thus do not need ati-hack and are much
faster without it. Change autodetection accordingly.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28458 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-03 11:46:31 +00:00
reimar
0fcb101267 Add checks that a D3D device is available before attempting rendering.
We may have lost the device e.g. because it became uncooperative e.g.
when using remote desktop or Vista's UAC is activated.
Patch by Georgi Petrov [gogothebee gmail com]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28457 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-03 11:00:09 +00:00
reimar
cd8ef8a8f6 Remove the Present call after adapter reinitialization, it can not work anyway
since no video frame is uploaded to the new context yet.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28456 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-03 10:54:27 +00:00
reimar
680eb1a1e4 Cosmetics: remove empty line, improve some messages.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28454 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-03 10:21:17 +00:00
reimar
fbac650de3 Whitespace/comment typo cosmetics.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28453 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-03 10:17:14 +00:00
reimar
af87ab3afd Check for change_d3d_backbuffer failure.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28452 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-03 10:16:03 +00:00
reimar
ad8c8f6f28 Fix several return values
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28451 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-03 10:14:44 +00:00
diego
12b7948773 Remove pointless #ifdef around internal header includes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28436 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-01 13:40:15 +00:00
diego
dc4b6fcddc Make CONFIG_XVMC a proper FFmpeg-style 0/1 definition.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28402 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-30 23:58:07 +00:00
reimar
7fcf438a2f Allocate a larger backbuffer to allow resizing without reinit.
Patch by Georgi Petrov [gogothebee gmail com] and Jim Hauxwell [james (at) dattrax co uk]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28379 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-27 10:02:47 +00:00
diego
eb4a4604c0 HAVE_3DNOW --> HAVE_AMD3DNOW
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28370 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-26 09:29:53 +00:00
diego
8d242b60e0 cosmetics: Remove pointless period after copyright statement non-sentences.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28342 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-19 17:12:43 +00:00
gpoirier
39cb032fd1 fix device_id option after r28165
patch by Adrian Stutz %adrian A sttz P ch%
Original thread:
date     Fri, Jan 9, 2009 at 4:03 PM
subject  [MPlayer-dev-eng] [PATCH] vo_macosx: fix device_id option after r28165


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28341 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-18 18:05:16 +00:00
reimar
f14ff6d054 100l, forgot to delete two defines left over from old HAVE_MMX handling code.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28337 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-16 21:04:52 +00:00
reimar
97df2f9162 More #ifdef HAVE_MMX etc. missed by earlier search.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28327 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-16 09:32:54 +00:00
reimar
4abf191c5d More #ifdef -> #if fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28326 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-16 09:29:20 +00:00
reimar
93d598c7b2 Lots and lots of #ifdef ARCH_... -> #if ARCH_...
and #ifdef HAVE_MMX etc -> #if HAVE_MMX.
There might be still more that need to be fixed.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28325 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-16 09:21:21 +00:00
reimar
07fb95d10b Change vo_draw_text to a vo_draw_text_ext function which draws DVD navigation
highlights at the correct position with the high-resolution OSD of -vo gl.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28290 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-10 13:47:41 +00:00
diego
20109f0a2e Fix build: calc_drwXY was factorized into vo_calc_drwXY.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28286 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-09 20:50:25 +00:00
cehoyos
0fa2d1abd7 Factor calc_drwXY out of vo_xv and vo_xvmc.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28285 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-09 15:25:24 +00:00
eugeni
d3b5452f49 Support loading font faces other then the first one in a font file.
With -fontconfig, it is possible to select a face with index higher than
0 in a multi-face font file. Currently, with the old rendering code,
this information is lost and the first face is loaded. With this change,
index supplied by fontconfig is used for font loading.

Patch by Adrian Stutz, adrian sttz ch.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28276 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-06 16:44:47 +00:00
diego
824abb5a65 Add missing 'void' keyword to parameterless function declarations.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28267 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-05 14:48:03 +00:00
gpoirier
fd99631e06 Fix deinit problem due to r28215
original thread:
date: Fri, Jan 2, 2009 at 10:00 PM
subject: [PATCH] Fix deinit problem due to r28215 (was Re: [MPlayer-cvslog] r28215 - in trunk: DOCS/man/en/mplayer.1 libvo/vo_macosx.m)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28239 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-03 22:33:04 +00:00
diego
339746a776 Sync with latest round of xvmc changes in FFmpeg.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28237 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-02 17:06:09 +00:00
diego
d19fef9187 Conditionally define render_one_glyph and kerning dummy functions in
font_load.c when FreeType is not enabled instead of conditionally
defining them in font_load.h. This moves the workaround closer to
where the actual problem is.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28235 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-02 14:41:38 +00:00
diego
7b64246370 Remove unused debug code.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28234 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-01-02 13:25:00 +00:00
gpoirier
80cf435529 Add an option to vo_macosx to set a custom buffer_name.
This allows to have multiple instances of MPlayerOSX running
without stepping on each other's toes.

Patch by Adrian Stutz % adrian A sttz P ch %

Original thread:
date: Tue, Dec 9, 2008 at 2:46 PM
subject: [MPlayer-dev-eng] [PATCH] vo_macosx: option to set shared buffer name to allow multiple instances



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28215 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-30 21:39:42 +00:00
reimar
c51ba3aed9 Support F- and numpad keys for w32_common based vos.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28214 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-30 17:00:11 +00:00
reimar
256c9152fe Fix ugly borders problem with ati-hack
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28199 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-27 13:00:03 +00:00
diego
1e1de192f8 Remove unused variable.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28191 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-24 16:57:35 +00:00
reimar
5be3fc9c94 Warn when using features that are broken due to ATI driver bugs.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28188 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-23 20:56:45 +00:00
reimar
8eda502f59 Do not default to rectangle=2, it is at least for ATI HD4850 cards with 8.12 drivers 20% slower at HD resolutions
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28187 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-23 19:31:56 +00:00
diego
d76a585366 Remove pointless forward declaration.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28184 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-23 13:31:04 +00:00
reimar
01405c8f50 100l, forgot an assignment, broke special keys handling for X11-based vos.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28175 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-21 04:11:51 +00:00
reimar
d1065dffe1 Add and use a special lookup function to do table-based translation to MPlayer keycodes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28172 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-20 11:52:11 +00:00
reimar
4f3d487e06 Cosmetics: get rid of some tabs and trailing whitespace.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28171 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-20 11:49:00 +00:00
reimar
c4460fd32c Use a table to translate X11 to MPlayer keycodes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28170 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-20 11:12:45 +00:00
reimar
7d037f66a5 Get rid of pointless and now unused defines.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28169 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-20 10:26:17 +00:00
reimar
ca468a5f84 Simplify handling of X11 key events that are just passed through.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28168 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-20 10:25:13 +00:00
gpoirier
a03b56aeec Replace vo_macosx's custom options parsing with a subopt_parse()-based one
(in the same way as vo_gl).
Patch by Adrian Stutz %adrian A sttz P ch%
Original thread:
date: Tue, Dec 9, 2008 at 3:20 PM
subject: Re: [MPlayer-dev-eng] [PATCH] vo_macosx: option to set shared buffer name to allow multiple instances


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28165 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-19 20:33:54 +00:00
diego
762197410a Do not use full relative #include path for headers in the same directory.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28157 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-17 00:08:04 +00:00
diego
b664d474d2 #include sub.h instead of locally declaring vo_draw_text().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28156 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-17 00:06:03 +00:00
diego
93574faeee xvmc is now a CONFIG_ option in FFmpeg.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28154 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-15 22:25:39 +00:00
reimar
b291f84901 Add support for writing PNG files with alpha channel in -vo png
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28126 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-10 16:44:12 +00:00
reimar
9c0caf340f Try to auto-detect several vo_gl settings (ati-hack, force-pbo and rectangle).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28125 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-10 16:39:45 +00:00
diego
57f19d3935 Fix MGSTR vs. MSGTR typo.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28122 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-09 20:25:49 +00:00
reimar
98d227c9fd Set d3d_handle to NULL after release.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28121 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-09 18:44:48 +00:00
reimar
d0952d0b19 Forgotten part of previous cosmetics commit
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28120 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-09 18:41:41 +00:00
reimar
6f621f00d8 Slightly simplify the conditional release/free code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28119 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-09 18:36:15 +00:00
reimar
1dd432665e First version of OSD support for vo_direct3d
Patch by Jim Hauxwell [james dattrax co uk] with modifications by me


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28118 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-09 18:31:52 +00:00
diego
a9c80bee77 cosmetics: indentation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28113 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-08 11:30:43 +00:00
reimar
38005bd941 Remove pointless or even wrong N/A return values doxy comments
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28112 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-08 11:04:27 +00:00
diego
9bdda2ec49 Add missing unistd.h #include, fixes the warning:
libvo/vo_macosx.m:177: warning: implicit declaration of function 'ftruncate'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28111 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-08 00:12:53 +00:00
diego
4c7dc59a04 Remove unused variable, fixes the warning:
libvo/vo_macosx.m:735: warning: unused variable 'lastTime'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28110 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-08 00:11:03 +00:00
diego
1f5caf1867 #include appropriate headers instead of locally declaring function prototypes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28109 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-08 00:02:07 +00:00
reimar
d761fd207a ati_hack only makes sense when PBOs are used, not with mesa_buffer.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28108 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-06 12:13:14 +00:00
reimar
e70a7dde5e More possible fixes for mesa-buffer mode.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28107 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-06 06:44:54 +00:00
reimar
5daa1bf60f Move one ati_hack check to a better place.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28106 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-06 06:41:36 +00:00
reimar
66fc5a8ffb Reindent
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28105 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-06 06:40:47 +00:00
reimar
39f24a83c7 100l, forgot setting GL_UNPACK_CLIENT_STORAGE_APPLE for mesa-buffer mode.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28104 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-06 06:18:57 +00:00
reimar
c6ef662318 10l, add forgotten a #ifndef GL_WIN32, fixes win32 builds.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28103 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-05 23:35:32 +00:00
reimar
a86076ac44 Fix indentation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28102 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-05 22:35:24 +00:00
reimar
b6e113841c Add experimental support for glXAllocateMemoryMESA
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28101 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-05 22:16:45 +00:00
reimar
7fd346bc71 Avoid one more duplicated logic.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28099 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-05 20:56:49 +00:00
reimar
e7d53f6d86 Simplify, do not duplicate buffer size calculation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28098 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-05 20:50:43 +00:00
reimar
476c9bfd95 Set the base size window manager hint, otherwise some subtract the minimum
size of 4x4 from the numbers displayed to the user which might be confusing.
Based on patch by Bert Wesarg [bert wesarg googlemail com].


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28097 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-05 19:01:49 +00:00
reimar
173e7ebc35 Add some forgotten documentation for gl suboptions
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28094 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-05 15:50:24 +00:00
reimar
0ca415447d Add support for YCBCR MESA texture format to vo_gl.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28093 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-05 15:36:54 +00:00
diego
0864f92e7a Get rid of pointless 'extern' keywords.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28085 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-03 23:01:03 +00:00
diego
fda888c61c Remove unused declarations and references to vo_draw_text_osd(),
vo_draw_text_progbar(), vo_draw_text_sub().


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28083 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-03 18:53:35 +00:00
reimar
2b12cb43f1 Fix indentation.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28076 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-03 12:22:32 +00:00
reimar
70dbf549e6 More robust w32 -wid size handling
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28074 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-03 10:54:01 +00:00
reimar
23a8967a4c Reindent after previous commit
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28073 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-03 10:42:53 +00:00
reimar
c4386a8333 Do not override the vo_dwidth/vo_dheight values in vo_w32_config
in -wid mode because we ignore the requested size in that case. 


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28072 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-03 10:38:50 +00:00
reimar
a3e78418b9 Cosmetics, whitespace and "... == NULL" to "!..."
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28070 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-03 09:58:11 +00:00
reimar
7ba61c19c3 Some whitespace and () cosmetics
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28069 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-03 09:27:19 +00:00
reimar
27b167bb75 Remove resize_d3d call from render_d3d_frame that was made useless
by previous commit. If this is necessary e.g. to prevent flicker
while resizing, check_events should be called instead or even
better the functionality be moved to some higher layer.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28065 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-02 15:03:19 +00:00
reimar
bb89a7696d 100l, do not call check_events from resize_d3d since there should be
no reason to do it and it might call resize_d3d again which makes it
hard to guarantee that it works correctly.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28064 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-02 14:51:46 +00:00
reimar
2d330d3c01 Cosmetics: Remove unnecessary ()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28063 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-02 09:46:08 +00:00
reimar
ef4313fd77 Consistency cosmetics: do not compare against NULL in ifs
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28062 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-02 09:40:09 +00:00
reimar
e84d33f00f Cosmetics: remove spaces before argument (
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28061 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-02 09:38:24 +00:00
reimar
bbc8a57160 Reorganize Direct3D initialization code.
Patch by Georgi Petrov [gogothebee gmail com]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28060 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-02 09:36:47 +00:00
reimar
5a0c4f3b61 Remove a lot of completely pointless mp_msg_test calls.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28055 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-01 16:37:06 +00:00
nplourde
7baeb6bcfc use mmap instead of shmat for MPlayerOSX, patch by Adrian Stutz<adrian@sttz.ch>
Original thread:
date: Sun, Oct 12, 2008 at 10:32 PM
subject: [MPlayer-dev-eng] [PATCH] vo_macosx: use mmap instead of shmat for MPlayerOSX


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28050 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-30 12:55:11 +00:00
diego
5e2bec3344 whitespace cosmetics: prettyprinting and indentation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28045 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-28 09:24:20 +00:00
gpoirier
cfedb9374f factorize mouse hiding and screensaver disabling code
Based on the patch posted in thread:
from  Gregor Riepl %onitake A gmail P com%
date: Wed, Oct 29, 2008 at 7:26 PM
subject: Re: [MPlayer-dev-eng] [PATCH] Replaced deprecated QuickDraw calls in vo_quartz


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28044 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-27 11:34:26 +00:00
reimar
669b0697b0 Use D3DFMT_ constants where possible instead of MAKEFOURCC
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28041 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-26 16:30:42 +00:00
reimar
513bd7461d Add support for RGB formats to vo_direct3d
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28040 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-26 16:27:39 +00:00
reimar
16a685b00c 100l, OSD alpha textures were cleared to the wrong value.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28036 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-25 18:24:23 +00:00
gpoirier
a5581ec3b8 typo fix + readability improvement
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28035 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-25 09:54:34 +00:00
diego
9051c1348d Remove unnecessary #ifdef around a struct and a bunch of extern declarations.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28031 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-24 17:35:08 +00:00
diego
c27cdb7288 Do not initialize fb_dev_fd to -1, similar to vo_fbdev.c.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28028 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-24 14:44:09 +00:00
diego
1add1d6597 cosmetics: Add/remove a few newlines similar to vo_fbdev.c.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28027 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-24 14:35:08 +00:00
gpoirier
76797a077c cosmetics (svn diff --diff-cmd diff -x '-duwbBE' gives no differences)
replace tabs by 4 spaces.
prettier intentation.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28026 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-24 14:29:32 +00:00
gpoirier
20011636d2 avoid putting several statements on a single line
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28025 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-24 14:25:14 +00:00
gpoirier
40a450c69b Use doxygen-style comments in file header. Remove tabs usage.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28024 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-24 13:34:31 +00:00
gpoirier
45b0d94b60 whitespace-cleanup
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28023 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-24 13:28:56 +00:00
gpoirier
6f60722148 Allow vo_macosx to be compiled in 64-bits mode:
- Replace usage of undocumented Apple function CPSEnableForegroundOperation()
   (which is available in 32-bits mode, but not in 64-bits mode) by
   TransformProcessType() which is public, documented, and available since OSX 10.3.
 - Work around Apple bug #6267445 since OSServices Power API is diabled in
   64-bits systems
Based on patch by Gregor Riepl %onitake A gmail P com%
posted in thread:
date: Fri, Oct 3, 2008 at 4:49 PM
subject: Re: [MPlayer-dev-eng] [PATCH] Replaced deprecated QuickDraw calls in vo_quartz


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28022 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-24 13:22:18 +00:00
reimar
9d065b41e8 More hacks around ATI driver problems, 8.11 ignores UNPACK_BUFFER pointer offsets.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28021 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-24 11:04:50 +00:00
gpoirier
b236cc711b Replace QuickDraw calls in vo_quartz.c to fix warnings when compiling with current SDK versions.
Patch by Gregor Riepl %onitake A gmail P com%
Original thread:
Date: Wed, Oct 29, 2008 at 7:26 PM
Subject: Re: [MPlayer-dev-eng] [PATCH] Replaced deprecated QuickDraw calls in vo_quartz


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28020 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-24 10:01:03 +00:00
reimar
2c6a12c01d Remove a ColorFill that is not necessary since the surface it is used
on has exactly the same size as the video image and the video will
be copied into it before it is used the first time.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28019 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-24 09:46:23 +00:00
reimar
5cb896b7eb Make sure the backbuffer is cleared when the border size might have changed.
Patch by Georgi Petrov [gogothebee gmail com]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28018 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-24 09:44:33 +00:00
diego
582bb322d7 Remove useless setting of frame_buffer to NULL as suggested by Reimar.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28017 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-24 08:43:13 +00:00
diego
4daa28d0a5 cosmetics: indentation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28016 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-24 08:41:44 +00:00
diego
472e68dace Move setting of frame_buffer variable out of 'if', as preferred by Reimar.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28015 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-24 08:40:11 +00:00
reimar
6c3457bd0e Clear the whole window on resize in vo_x11 since we do not
yet know how large the borders will be.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28011 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 20:49:05 +00:00
reimar
7428efabee Simplify vo_x11 check_events function
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28010 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 20:47:04 +00:00
reimar
b704defedd Do not draw in window if our image has not yet been adjusted to the new window size.
Fixes some cases of borders not being black in fullscreen when fullscreen image
is scaled down.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28009 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 20:39:15 +00:00
reimar
af80fe7f12 Remove unnecessary xf86vmode.h include.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28008 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 20:20:51 +00:00
reimar
ff05d203b2 Remove some usnused variables and commented-out code.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28007 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 20:19:06 +00:00
reimar
307953643d Use aspect.c code in vo_x11.c. Removes some inconsistencies in -wid handling.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28006 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 20:17:46 +00:00
reimar
97eeb07265 Patch to improve/consistify coding style.
Patch by Georgi Petrov [gogothebee gmail com]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28005 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 18:50:39 +00:00
reimar
d86a77d8ba Fix indentation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28004 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 18:45:01 +00:00
reimar
cc7e0dae7e Lock/unlock surface only once even when drawing many slices.
Patch originally by Jim Hauxwell [james dattrax co.uk]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28003 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 18:42:29 +00:00
reimar
161092eb35 Move locked_rect from stack to priv struct in preparation for following patch.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28002 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 18:24:53 +00:00
reimar
e148ffb3ec Move the StretchRect call from draw_slices to render_d3d_frame.
This avoids calling it (and BeginScene/EndScene) many times with
slices and also avoids code duplication.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28001 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 18:13:56 +00:00
reimar
2e5c6e2f4e Remove pointless is_cfG_finished variable.
Patch by Georgi Petrov [gogothebee gmail com]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28000 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 17:25:46 +00:00
diego
5b239d47bd Handle fb_dev_name similar to vo_fbdev in vo_wii.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27999 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 14:57:51 +00:00
diego
9aa2edf9d1 Merge another if condition check to lessen differences to vo_fbdev.c.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27998 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 14:32:39 +00:00
diego
df58b1815f Use static variable instead of #define to lessen differences to vo_fbdev.c.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27997 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 14:15:54 +00:00
diego
9c8445f5f9 Get rid of TTY_DEV_NAME #define to lessen differences to vo_fbdev.c.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27996 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 13:55:23 +00:00
diego
c6af321ba7 Merge another if condition check to lessen differences to vo_fbdev.c.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27995 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 13:51:16 +00:00
diego
2a044df222 Merge if condition check to lessen differences to vo_fbdev.c.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27994 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 13:42:41 +00:00
diego
3e0abbff54 Remove debug function.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27993 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 13:41:57 +00:00
diego
ce17f21bb1 cosmetics: one more round of whitespace changes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27992 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 13:23:14 +00:00
diego
8ea5ce98d8 cosmetics: further reformatting to lessen differences to vo_fbdev.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27991 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 13:19:43 +00:00
diego
92ea709db2 cosmetics: complete reformatting, tabs to spaces, etc.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27990 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 13:06:37 +00:00
diego
21a6361d95 cosmetics: Lessen differences to vo_wii.c.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27989 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 13:02:10 +00:00
diego
d0a4035bad cosmetics: consistent formatting for if/else/case
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27988 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 12:46:42 +00:00
reimar
9542118efe Simplify handling of VOFLAG_MODESWITCHNG, merge assignment and declaration
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27986 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 12:30:39 +00:00
reimar
be6e3bf79f Remove unused flip_flag variable
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27985 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 12:25:41 +00:00
diego
73fab6a412 cosmetics: Reformat some lines to lessen differences to vo_fbdev.c.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27984 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 12:08:18 +00:00
diego
b2fb201a6b Remove unused variables and the related warnings along with them.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27980 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 11:53:17 +00:00
reimar
61a0561122 Remove a aspect calculation line.
It is useless because with the new API enabled by VOCTRL_UPDATE_SCREENINFO it
is not necessary because it is already done in video_out.c:config_video_out.
Secondly, the removal of the aspect_save_prescale triggered a regression because of
it, with -wid the window would not be filled completely initially.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27978 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-21 23:22:53 +00:00
reimar
b8a0605f4b Simplify handling of "flags" parameter
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27977 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-21 23:17:26 +00:00
reimar
3095b31c26 Add forgotten initialization if Flip_Flag to 0.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27976 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-21 23:14:38 +00:00
diego
529028ff5d cosmetics: typo fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27975 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-21 19:32:19 +00:00
reimar
157343aeb3 Fix and enable panscan handling for vo_direct3d
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27971 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-21 12:22:16 +00:00
reimar
f525ba25e7 Cosmetics: rename variables etc. in vo_direct3d.c
Patch by Georgi Petrov (gogothebee gmail com)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27962 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-20 15:13:14 +00:00
reimar
c351d29392 Factor common code like -wid handling, vo_gc creation etc. out into
x11_common.c


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27961 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-19 20:19:25 +00:00
reimar
82e0e9055a Simplify conditions in direct3d vo: remove == 1, change == 0 to ! etc.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27959 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-19 13:39:07 +00:00
reimar
0ebdbc02d8 Add missing "static" qualifiers to vo_direct3d
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27957 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-18 14:51:54 +00:00
reimar
af25bb3acf 100l, the video_out_drivers list must be sorted by priority, not
alphabetically. For now, vo_directx should be preferred over
vo_direct3d.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27956 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-18 13:18:55 +00:00
reimar
af366bff51 Direct3D based video_out module.
Patch by Georgi Petrov (gogothebee gmail com)
Panscan handling is still disabled and needs to be fixed for negative
-panscan.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27955 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-18 12:23:42 +00:00
reimar
04d6de5ee2 Doxygen documentation for w32_common.c
Patch by Georgi Petrov (gogothebee gmail com) with several modifications by me.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27954 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-18 12:23:23 +00:00
reimar
330e951cf0 Remove a useless XGetGeometry call, the X11 event handling already
updates vo_dwidth/vo_dheight.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27946 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-17 13:12:01 +00:00
reimar
d12df3ab12 Get rid of (besides useless assignments) unused XSizeHints variable
in vo_xvmc.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27942 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-16 17:16:08 +00:00
reimar
8cc27a3561 Remove explicit setting of vo_ontop since that is already done by vo_x11_create_vo_window
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27937 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 23:09:31 +00:00
reimar
f5ce35ec8c Remove a duplicated vo_x11_selectinput_witherr
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27936 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 22:49:49 +00:00
reimar
554ce917df respect -vf dsize etc. also for -rootwin, just like vo_xv does.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27935 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 22:48:41 +00:00
reimar
936420385a Sync with vo_x11: make sure we get expose events even when drawing to the root window.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27933 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 22:33:36 +00:00
reimar
39e42b26e9 Remove a nonsensical "else" for the video mode switching case.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27929 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 19:14:09 +00:00
reimar
4fa4e8744d include limits.h for INT_MAX.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27927 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 19:06:25 +00:00
reimar
55175c457d Remove now unused variables.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27926 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 19:03:21 +00:00
reimar
21040bb951 Use vo_dwidth/vo_dheight for creating the windows instead of d_width/d_height.
This fixes the -vm bug that the created window is too small.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27925 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 18:58:14 +00:00
reimar
4b9ee2e206 Simplify vo_vm_switch and vo_vm_close, everyone was using the (almost) same
boiler-plate code with them, just with different bugs.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27924 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 18:56:25 +00:00
reimar
c8d9e2eb60 Set modified window position and monitor aspect in vo_vm_switch instead of in
individual vo drivers.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27923 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 18:28:35 +00:00
reimar
f2bceedc49 Get rid of (besides useless assignments) unused XSizeHints variable
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27922 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 18:14:03 +00:00
reimar
ebff32237b Set modeline_width/height to sane values in vo_vm_switch even when
the XF86VidMode extension is not available.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27921 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 18:11:10 +00:00
reimar
8b0b5bee77 Cosmetics: remove useless "extern"
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27920 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 17:48:27 +00:00
reimar
87bee02b19 Replace some of the different inconsistent XGetGeometry uses by a
vo_x11_update_geometry function.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27919 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 17:45:55 +00:00
reimar
252f6d5093 Remove a useless XGetGeometry call, the X11 event handling already takes care of this.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27918 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 17:41:30 +00:00
reimar
18fac2d947 Remove code from unused and since ages deprecated draw_frame function.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27917 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 16:40:48 +00:00
reimar
eb4f31f73b Remove vo_xv code that has been under #if 0 since ages.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27916 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 16:36:39 +00:00
reimar
08367541bc vo_x11: do not replace the vo_gc created by the Gui.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27915 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 16:34:44 +00:00
reimar
60b5834701 Cosmetic changes to vo_x11 to reduce diff to vo_xv for future refactoring.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27914 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 15:50:47 +00:00
reimar
e0a4769570 Cosmetics for vo_x11 control() to make it more similar to vo_xv.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27913 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 14:24:32 +00:00
reimar
f850757249 Fix grammar of comment and sync it with vo_x11.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27912 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-15 14:21:02 +00:00
reimar
930c37da56 Fix ati-hack to work again with ATI 8.9 and later drivers.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27908 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-14 10:31:15 +00:00
reimar
36dade7693 Use the proper IMGFMT_RGB24 and IMGFMT_BGR24 defines instead of
IMGFMT_RGB|24 and IMGFMT_BGR|24.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27907 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-13 19:05:07 +00:00
reimar
69c3d22e00 Fix Windows OpenGL -wid:
Disable the Window instead of explicitly passing on click events.
This also makes Drag-and-Drop work if the -wid window supports it.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27904 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-11 19:21:36 +00:00
reimar
14eb21fce0 For fragment programs, check GL_MAX_TEXTURE_IMAGE_UNITS instead of GL_MAX_TEXTURE_UNITS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27899 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-06 18:39:37 +00:00
diego
69ad7080f9 Add #include <string.h> for memset.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27896 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-04 21:00:29 +00:00