d0c1992160
Consistently use sizeof(variable) instead of sizeof(type) where easily possible.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29632 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-02 14:18:01 +00:00
25cc492d90
Cosmetics: get rid of many pointless ()
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29631 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-02 14:11:30 +00:00
7a7c246709
Reduce code duplication for half/normal/double video size handling.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29630 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-02 14:02:15 +00:00
001e4be0ba
Remove unused variable.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29629 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-02 11:38:18 +00:00
144b7f5989
vo_quartz: change deallocation/uninit to more reliably free allocated data.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29618 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-02 09:51:38 +00:00
1b3c42472d
Make glContext a local variable, it is not needed outside the function
...
where it is allocated, reference counting takes care of freeing it.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29617 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-01 21:16:58 +00:00
9ad17fad92
Add a dealloc function to corevideo to reduce the memleaks from
...
(for my sample) about 12 MB to 2 MB.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29616 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-01 21:12:33 +00:00
cb9e32c88c
Fix some of the major memleaks of vo_corevideo with -fixed-vo
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29615 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-01 20:09:01 +00:00
e8d5289623
Do not do a unmap/map cycle on Windows given with -wid, with some window
...
managers this has the ugly side-effect of moving the window.
Instead call XInstallColormap to ensure the Colormap is installed.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29614 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-01 16:39:46 +00:00
a1f744cb07
Check setGlWindow return value to fail properly instead of crashing if e.g.
...
no OpenGL support is available.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29612 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-01 15:20:05 +00:00
7b7302b096
Make shm_fd a local variable and close it when we need it no longer, thus
...
fixing a file descriptor leak.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29609 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-01 12:12:45 +00:00
0f7fe32725
Reduce vo_corevideo memleaks by initializing static context etc. only once
...
in preinit and freeing the video-specific data before reallocating in config.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29608 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-01 10:48:47 +00:00
b125a31886
Fix memleak when using fontconfig without a font name.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29607 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-01 10:17:22 +00:00
d7676e783e
Use MPlayer's standard aspect handling functions in corevideo
...
instead of reimplementing them incompletely.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29606 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-09-01 09:36:04 +00:00
311db2c468
Port feature from corevideo: remember half/double size settings and reapply
...
them after an aspect change.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29579 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-28 14:39:42 +00:00
b7c7318352
Make aspect switching work again (used the wrong variable and always
...
switched to the original aspect).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29578 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-28 14:38:44 +00:00
cc1b58e348
Fix implicit declaration of mp_input_.. functions.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29577 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-28 14:02:32 +00:00
6497662b92
1l, use sizeof for snprintf size instead of hard-coding the current value.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29576 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-28 13:30:32 +00:00
fde99e3c5d
Reuse the osx_common convert_key function to convert OSX keycodes to MPlayer
...
keycodes instead of its own switch-case in vo_corevideo.m
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29575 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-28 13:29:07 +00:00
4ce7a48748
Move aspect change handling from vo_quartz to osx_common.
...
This could probably be even moved to video_out, though the names should
be improved.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29574 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-28 13:25:30 +00:00
0dadcc7bf0
Add osx_common.c and move the keycode conversion (OSX to MPlayer) there.
...
Also get rid of our own defines for the keycodes and instead use the
predefined ones from Carbon.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29573 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-28 12:54:33 +00:00
1ba0432474
Use the standard MPlayer aspect handling instead of reimplementing our own in vo_quartz.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29572 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-28 08:36:51 +00:00
6901602578
Remove unused movie_aspect extern declaration.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29571 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-27 23:40:36 +00:00
a4566be905
Use lookup_keymap_table function with data structure instead of huge switch-case
...
for mapping OSX keys onto MPlayer keys in vo_quartz.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29570 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-27 23:13:37 +00:00
435a7803d0
Enable calc_src_dst_rects for windowed aspect and panscan.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29569 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-27 19:13:19 +00:00
8082e89f6e
Remove panscan related conditions and code that only breaks future windowed
...
aspect and panscan without any real benefit.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29568 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-27 18:51:02 +00:00
f6e58b8a99
Make gl2 code capable of windowed aspect and panscan (no user option to enable it yet though).
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29567 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-27 18:42:08 +00:00
6765091bfa
Add infrastructure and test code to enable aspect scaling and panscan in windowed mode.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29566 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-27 18:36:51 +00:00
26d8e6a696
Fix video placement with -vo gl2 -fs -wid.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29565 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-27 14:12:38 +00:00
f10dcbacd5
-vo gl2 resize does not need to modify its arguments, so pass int instead of int *.
...
In particular, this avoids modifying vo_dwidth/vo_dheight which should only
be modified by the "windowing layer" (w32_common, x11_common).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29564 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-27 14:10:38 +00:00
c3067ee82f
Simplify -vo gl ass border etc. dimension calculation one bit more.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29563 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-27 14:07:15 +00:00
c2edb80335
Remove useless code that has no effect.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29562 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-27 14:01:39 +00:00
082c7b9446
Simplify and fix ass border calculations for -vo gl and -wid -fs mode.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29561 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-27 13:54:53 +00:00
6ec672e3cc
Make panscan cover the same range in -wid -fs mode as in normal mode.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29560 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-27 13:31:12 +00:00
16c2a6660a
Disable -keepaspect with -wid in w32_common code.
...
This does not work in a useful way and was unintentionally "enabled"
when -wid was made to use a separate window.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29559 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-27 13:20:21 +00:00
e18b64611c
Fix aspect_fit to work correctly when borders need to be added on top and
...
bottom, previous code accidentally compared against screen dimensions,
resulting in cropping instead of added borders.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29558 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-27 12:38:22 +00:00
4cbff98bad
Forgotten changes to aspect code to handle -wid with -fs.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29557 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-27 12:35:23 +00:00
e8429f1f5b
First attempts at supporting -fs with -wid, -vo gl on X11 only so far
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29556 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-27 12:03:02 +00:00
e5751ced4f
Replace WORDS_BIGENDIAN by HAVE_BIGENDIAN in all internal code.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29443 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-07-26 19:53:00 +00:00
95dcb65379
Use memcpy_pic2 instead of reimplementing it.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29402 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-26 16:20:15 +00:00
32a7d61acc
Close /dev/tty again on uninit.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29401 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-26 15:41:34 +00:00
158aca92ae
Fix indentation broken in last patch
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29400 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-26 15:39:35 +00:00
fc24a623a2
Get rid of completely pointless vt_doit variable
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29399 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-26 15:38:40 +00:00
83ed88fb96
10l, use fopen directly instead of open + fdopen
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29398 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-26 15:28:30 +00:00
b3e1578828
Use a single err_out in fb_preinit, also fixes a leak when vo_dbpp has an
...
unexpected value.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29397 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-26 15:22:15 +00:00
e56dbbfd3c
Use FFALIGN and FFMAX3
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29396 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-26 15:14:48 +00:00
96de64de92
Remove useless casts
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29395 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-26 14:43:03 +00:00
2b19b2dcba
fbdev: remove pointless ()
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29394 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-26 14:40:31 +00:00
eeb99c1c14
Use the RESET_GEOMETRY macro in one more place instead of duplicating its code.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29392 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-26 13:41:01 +00:00
8e2054934a
100l, RESET_GEOMETRY must reset values to INT_MIN, not -1, -1 is a
...
valid value for e.g. the offsets.
Patch by Benson Mitchell [benson mitchell gmail com]
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29391 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-26 13:34:40 +00:00
reimar
diego