RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-28 18:12:22 +00:00
Code Issues Releases Wiki Activity
29,992 Commits 41 Branches 0 Tags 145 MiB
b05d9ead6d
Commit Graph

128 Commits

Author SHA1 Message Date
Uoti Urpala
a2037a2eff Merge svn changes up to r29412 2009-07-07 02:56:01 +03:00
reimar
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
reimar
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
reimar
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
reimar
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
reimar
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
reimar
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
reimar
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
reimar
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
reimar
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
Uoti Urpala
1e86963828 Merge svn changes up to r28537 2009-02-12 04:17:55 +02: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
Uoti Urpala
835511ac39 Merge svn changes up to r28038 2008-11-25 21:12:01 +02: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
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
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
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
Uoti Urpala
b56858342f Merge svn changes up to r27514 2008-09-03 10:16:30 +03:00
reimar
d54c1f0309 -geometry support for -vo fbdev. 
Patch by Sander (thrill12 gmx net)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27475 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-22 17:26:16 +00:00
Uoti Urpala
d5c868325c Merge svn changes up to r26979 
Most of the conflicts are trivial.

Conflicts:

	Makefile
	cfg-mplayer.h
	input/input.c
	libmenu/vf_menu.c
	libmpcodecs/dec_video.c
	libmpcodecs/vf_expand.c
	libmpcodecs/vf_vo.c
	libmpdemux/demux_mkv.c
	libmpdemux/demuxer.c
	libmpdemux/demuxer.h
	libvo/vo_directfb2.c
	libvo/vo_gl.c
	libvo/vo_winvidix.c
	libvo/vo_xv.c
	libvo/vo_xvidix.c
	libvo/vo_xvmc.c
	libvo/x11_common.c
	mplayer.c
	osdep/timer-linux.c
	stream/cache2.c
 2008-06-04 08:10:48 +03:00
diego
ad603f5559 cosmetics: Remove useless parentheses from from return statements. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26787 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-16 08:33:27 +00:00
Uoti Urpala
2bcfe1e077 Add new video driver API 
Create new video driver API that has a per-instance context structure
and does not rely on keeping status in global or static variables.
Existing drivers are not yet converted to this API; instead there is a
wrapper which translates calls to them.

In the new API, an old API call vo_functions->xyz(args) is generally
replaced by vo_xyz(vo_instance, args).

The changes to keep the vesa, dxr2 and xover drivers compiling have
not been tested.
 2008-04-23 13:41:04 +03:00
Uoti Urpala
de56d2d9f5 Remove variable arguments from vo control() functions 
No voctrl uses them any more, and using them would not be a good idea
because it makes forwarding arguments to other functions harder.
 2008-04-23 13:41:03 +03:00
Uoti Urpala
dbe080ec9f Change VOCTRL_[GET|SET]_EQUALIZER argument passing 
These were the only voctrl types with more than one argument. The
second argument was passed using variable arguments. Change them to
use a single argument (address of a struct containing both old
arguments). This makes forwarding the arguments to other functions
easier and allows simplifying code.
 2008-04-23 13:41:03 +03:00
reimar
909887bdbe Make vo info structs const 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25244 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-02 14:06:03 +00:00
diego
be4cb72ebe Fix redundant redeclaration warnings. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24171 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-08-25 12:50:05 +00:00
reimar
6a09e8e2ed Replace implicit use of fast_memcpy via macro by explicit use to allow 
for future optimization.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23475 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-06-05 14:27:54 +00:00
rathann
f78363e244 Remove spurious casts to int. Blessed by Reimar. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20116 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-10-08 16:40:11 +00:00
pacman
2857c2e4d4 Don't multiply fb_line_len by fb_pixel_size. Fixes too-low placement of OSD 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17902 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-03-20 22:24:14 +00:00
pacman
6a6fec3656 Don't try to parse fb.modes more than once. Fixes playback of multiple files 
with mplayer -vm


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17901 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-03-20 22:07:30 +00:00
pacman
34e08d15ea When centering a video with odd width, be sure to start on a pixel boundary. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17729 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-03-04 20:00:06 +00:00
pacman
74e03a35f1 Fix colormap save/restore for directcolor fb devices 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17638 b3059339-0415-0410-9bf9-f77b7e298cf2
 2006-02-17 03:49:33 +00:00
ivo
cd55954e4e Fix the return types of all (six) libvo API functions. Used to be uint32_t, but 
return values can be negative (VO_ERROR, VO_NOTAVAIL and VO_NOTIMPL), so it's
changed to int now.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16172 b3059339-0415-0410-9bf9-f77b7e298cf2
 2005-08-05 01:24:37 +00:00
henry
dbb001bae2 replace VO and VF numeric flags with #defined identifiers 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15213 b3059339-0415-0410-9bf9-f77b7e298cf2
 2005-04-18 15:52:38 +00:00
rfelker
44d693368f remove old buggy workaround. kerneltwosix.h itself will be removed soon if this doesn't cause problems 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14095 b3059339-0415-0410-9bf9-f77b7e298cf2
 2004-12-03 20:55:00 +00:00
attila
3115b22def linux 2.6 patch by "ismail 'cartman' dönmez" <ismail.donmez@boun.edu.tr> 
no idea whether this really works :)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11766 b3059339-0415-0410-9bf9-f77b7e298cf2
 2004-01-10 09:48:15 +00:00
rathann
e1dc488097 Warning fixes (approved by A'rpi). 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11413 b3059339-0415-0410-9bf9-f77b7e298cf2
 2003-11-08 00:26:51 +00:00
alex
836d219075 fixed -nocolorkey 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11217 b3059339-0415-0410-9bf9-f77b7e298cf2
 2003-10-22 13:22:00 +00:00
alex
a34978c3a7 Colorkeying can be disabled. Fbdev, svga and vesa vidix colorkeying support 
by Jake Page <jake@CS.Stanford.EDU>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11159 b3059339-0415-0410-9bf9-f77b7e298cf2
 2003-10-17 09:08:37 +00:00
alex
4efe868ed8 correct handling of subdevice, -fb device is obsoleted 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11056 b3059339-0415-0410-9bf9-f77b7e298cf2
 2003-10-08 10:58:44 +00:00
alex
bf6af9920f vidix equalizer support by Jake Page <jake@CS.Stanford.EDU> 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11037 b3059339-0415-0410-9bf9-f77b7e298cf2
 2003-10-07 22:29:37 +00:00
alex
5a13436db5 4x10l fix. Vars used by the config layer must be malloc'd (strdup) as they will be freed at exit. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10619 b3059339-0415-0410-9bf9-f77b7e298cf2
 2003-08-15 13:04:37 +00:00
rfelker
a035351921 10000l, the old code was slow as hell, copying stuff extra times and 
actually broken -- blanking the whole screen at each 'page flip' with
-dr enabled. benchmarks:

before:
56% cpu for decode
56% cpu for vo with no -dr
25% cpu for vo with -dr

after:
56% cpu for decode
25% cpu for vo without -dr
0% cpu for vo with -dr

if vo_fbdev is going to do pageflip, it needs to do it for REAL, using
vertical scroll registers (like g2), not copying a temp buffer (which
will shear anyway and is super-slow).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10579 b3059339-0415-0410-9bf9-f77b7e298cf2
 2003-08-12 08:24:24 +00:00
joey
1badec0613 Changed all printf into mp_msg 
Removed extern int verbose
Removed some unneeded includes
Removed swscale, because this should be done by vf layer instead
Removed weird video_out_png definition
There is no more flip, zoom, or geometry support, so I removed those.
Slices, stride support for all supported CSP.
Replaced draw_frame with a stub.
Removed: do { ... } while (0)
Removed unused dstFourcc.
Added DR support
Removed USE_CONVERT2FB, since we have real DR now
Simplified some color depth checks


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10577 b3059339-0415-0410-9bf9-f77b7e298cf2
 2003-08-12 06:57:19 +00:00
alex
63e689e4ec removed yv12 support, but left some swscaler support for fast 15 vs 16bpp conversion 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10427 b3059339-0415-0410-9bf9-f77b7e298cf2
 2003-07-13 23:33:56 +00:00
rfelker
bae4a5cbb5 at least it works now, but it's horrible slow and broken. double buffer 
and direct rendering support are needed to make this remotely usable...


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9942 b3059339-0415-0410-9bf9-f77b7e298cf2
 2003-04-19 18:57:16 +00:00