1
mirror of https://github.com/mpv-player/mpv synced 2025-01-01 04:36:24 +01:00
Commit Graph

2038 Commits

Author SHA1 Message Date
Uoti Urpala
31db39d8ec Make video decoder description structs const
This makes the per-decoder struct vd_functions and its ->info
struct constants. Same for the mpcodecs_vd_drivers[] table of
pointers to those structs.
2008-04-25 07:16:32 +03:00
Uoti Urpala
7dc4226348 Move vd_use_slices to options struct 2008-04-25 07:15:07 +03:00
Uoti Urpala
bb679dd40a Remove global vo_flags
Move the information to struct sh_video field.
2008-04-25 07:15:07 +03:00
Uoti Urpala
60f104d4aa vd.c: Cosmetic changes + remove malloc.h
Adjust formatting slightly and remove some comments. Also remove
"#include malloc.h" which seems completely irrelevant.
2008-04-25 07:15:07 +03:00
Uoti Urpala
6e0199537c Reformat vd.c
"indent -kr -l79 -nut dec_video.c --ignore-newlines vd.c", fix two
"sh_video_t * sh" to "sh_video_t *sh" by hand.
2008-04-25 07:14:44 +03:00
Uoti Urpala
60e2c8604d Move movie_aspect to options struct 2008-04-25 03:34:28 +03:00
Uoti Urpala
0a39709c15 Move screen_size_xy to options struct 2008-04-25 03:34:28 +03:00
Uoti Urpala
b14909a955 Move opt_screen_size_[x|y] to options struct 2008-04-25 03:34:27 +03:00
Uoti Urpala
1351b50ea5 Move flip and softzoom to options struct 2008-04-25 03:34:27 +03:00
Uoti Urpala
0dc3a72273 Move vidmode to options struct 2008-04-25 03:34:27 +03:00
Uoti Urpala
41d6879236 Move fullscreen to options struct 2008-04-25 03:34:27 +03:00
Uoti Urpala
342ae8d3b5 Store video decoder functions in struct sh_video field
Remove the global variable mpvdec and move the video decoder pointer
to struct sh_video field vd_driver. Audio already had a similar
ad_driver field from before.
2008-04-25 03:34:27 +03:00
Uoti Urpala
0e757bf9da Remove _s/_st suffix from some struct names
Since the names are always used after the keyword "struct" having a
suffix as in "struct demuxer_st" is almost completely pointless.
2008-04-25 03:34:22 +03:00
Uoti Urpala
6f971b6354 dec_video.c: A couple of cosmetic changes 2008-04-25 03:31:57 +03:00
Uoti Urpala
e5b3655e90 Reformat dec_video.c
"indent -kr -l79 -nut dec_video.c --ignore-newlines dec_video.c", fix
some "unknown_typedef * arg" in parameter lists by hand to
"unrecognized_typedef *arg".
2008-04-25 03:31:57 +03:00
Uoti Urpala
3fa6f2d3e1 Move -lavdopts to options struct 2008-04-25 03:31:57 +03:00
Uoti Urpala
15b34d1fd8 vd_ffmpeg.c: Eliminate some compiler warnings
Make the functions used in avctx->draw_horiz_band match its type (add
a "const"). Add cast to avoid void * arithmetic.
2008-04-25 03:29:27 +03:00
Uoti Urpala
7521aac665 Move global vo_config_count to vo struct
Remove the global and Add a corresponding field to the vo struct, plus
another which tells whether the LAST config call was successful.The
latter value which tells whether the VO should be properly configured
at the moment seems a better match for the semantics actually needed
in most places where the old value was used. The 'count' field with
the old semantics is not currently used by anything, but I'm leaving
it there for vo drivers which would need those semantics if converted
to use the struct.

Existing uses of the global outside old vo drivers are either converted
to use the struct field or moved inside the vo_xyz() calls (instead of
"if (vo_config_count) vo_flip_page(..." just call vo_flip_page which
will now do nothing if not configured). The removal of the check in
mpcommon.c/update_subtitles() is less trivial than the others, but I
think it shouldn't cause problems.
2008-04-23 13:46:39 +03:00
Uoti Urpala
5045066574 vf.c: malloc+memset -> calloc 2008-04-23 13:41:06 +03:00
Uoti Urpala
9b06b5ed85 Move correct_pts to options struct 2008-04-23 13:41:05 +03:00
Uoti Urpala
0d59f81e54 Add option pointer to vf struct 2008-04-23 13:41:05 +03:00
Uoti Urpala
8716df2a41 Add context variable to vo_draw_text callback
Add a context variable and rename the function to osd_draw_text. Create
a new vo_draw_text that is a wrapper for VOs using old API.
2008-04-23 13:41:04 +03: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
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
zuxy
64f6c99f59 Set dll_type and rv_handle for drvc.dll
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26430 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-13 02:35:30 +00:00
diego
06cbb5007c Restore grayscale decoding support with FFmpeg.
Removing support was done due to a silly misunderstanding.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26427 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-13 00:03:11 +00:00
diego
fabb1b271a Backport SSE2-optimized IDCT routines from upstream libmpeg2.
Thanks to Alexander Strange for finding and fixing some bugs.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26425 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-12 22:42:00 +00:00
zuxy
5bbf5ec2d0 Oops...should be "drv43260.dll" instead of "drv34260.dll"
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26421 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-12 18:35:11 +00:00
zuxy
a2aed6e8bf Cosmetic fix for r26419
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26420 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-12 18:31:08 +00:00
zuxy
339a79e1c3 Dlls can be relocated when loading so rely on filename instead of absolute
address to check if it's drv43260.dll and hence needs patching.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26419 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-12 18:29:57 +00:00
zuxy
8fd56cbb88 Indentation fix for r26417
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26418 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-12 18:24:25 +00:00
zuxy
221c40a86c Don't print "Could not patch" messages when we haven't actually tried to patch.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26417 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-12 18:23:26 +00:00
zuxy
b7e24c2758 Check for drvc.dll entries for mingw32
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26416 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-12 18:19:51 +00:00
diego
5948bebaf8 vf_pp7 does not depend on libavcodec.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26390 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-11 08:13:36 +00:00
diego
5e8800e052 vf_screenshot depends on libavcodec.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26389 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-11 08:11:16 +00:00
rtogni
2a1bc4f6ec 1000l fix linking after r26378
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26381 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-09 21:49:27 +00:00
diego
9087c4270b Update Makefile to account for native/RTjpegN.c --> native/rtjpegn.c renaming.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26339 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-06 23:08:15 +00:00
diego
f4d87d3e88 Rename RTJPEG files so that filenames consist of lowercase name only.
Parts of the build system assume lowercase-only filenames.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26336 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-06 18:17:59 +00:00
iive
2ae2955f09 Change I_TYPE -> FF_I_TYPE to fix compilation.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26323 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-04 01:09:36 +00:00
diego
c32f706c96 Do not #include libavutil/common.h. It is not used directly and mpbswap.h
now #includes all required headers on its own.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26312 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-04-01 14:19:45 +00:00
diego
9e1ccf7447 Introduce HAVE_QUICKTIME definition and use it where appropriate.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26248 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-15 11:31:28 +00:00
diego
f3185d2ca4 Simplify preprocessor condition for QT codecs, configure already does the
necessary checks, no need to duplicate them.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26238 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-15 08:07:24 +00:00
diego
d473822ae4 Remove duplicate #include of mpbswap.h.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26237 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-14 16:59:08 +00:00
diego
37ea342f85 #include config.h before all other headers.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26235 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-14 16:46:13 +00:00
diego
ca1fb12840 Grayscale encoding/decoding with FFmpeg is no longer enabled, remove references
from the documentation and the relevant options from the glue code.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26198 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-07 21:30:01 +00:00
diego
bcf021b76e Fix printf format string mismatch, eliminates the warning:
ve_vfw.c:252: warning: format '%d' expects type 'int', but argument 2 has type 'long int'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26180 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-06 08:43:20 +00:00
diego
db85806a9c Add necessary header #includes to fix 'make checkheaders'.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26179 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-06 08:34:50 +00:00
uau
a0a5afc0c5 ve_vfw.c: #include aviheader.h instead of wine avifmt.h
Compilation was broken after libmpdemux/muxer.h started including
libmpdemux/aviheader.h. ve_vfw.c included both muxer.h and
loader/wine/avifmt.h, and the latter has definitions that conflict with
aviheader.h ones. Fix by removing the avifmt.h include.

I did not carefully check that changing the includes doesn't break
any ve_vfw.c code. However it at least fixes compilation, and if the
avifmt.h versions differ in some significant way then the code is
fundamentally broken anyway: ve_vfw cannot use different versions of
the avi struct definitions when it also uses shared muxer.h types
(those must use the standard definitions to keep the type compatible
with what's used in other files).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26178 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-06 01:57:26 +00:00
ulion
6b8b2a51e5 Fix ffvorbis decoder's output channel order with channel reordering function.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26164 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-05 02:46:50 +00:00
diego
db9f691b6c Remove ugly workaround for conflicting dca.h headers, it is no longer
necessary now that -I../libavcodec is not in CFLAGS anymore.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26154 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-03 19:40:39 +00:00