github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-10-30 04:46:41 +01:00
Code Releases Activity
29,090 Commits 41 Branches 86 Tags 179 MiB
e0172b96e3
Commit Graph

270 Commits

Author SHA1 Message Date
Uoti Urpala
e0172b96e3 Merge svn changes up to r28862 2009-03-07 01:04:41 +02:00
reimar
0f43db1769 Add another hack to work-around the currently completely inconsistent way in 
which libavcodec sets AVCodecContext::pix_fmt.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28801 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-03 13:38:33 +00:00
reimar
aacd081579 10l, replace a tab that slipped in. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28767 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-01 09:09:49 +00:00
reimar
1002389056 Create a set_format_params function that sets all the special options needed 
for XvMC/VDPAU acceleration in a single place.
This should get closer to working with selecting acceleration via pix_fmt instead
of via a special codec for each method.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28766 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-01 09:03:01 +00:00
Uoti Urpala
ebb541c655 Merge svn changes up to r28690 2009-02-21 17:39:30 +02:00
iive
c73f0e18bd Return PIX_FMT_NONE if the video system refuses all other formats. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28662 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-19 09:21:46 +00:00
Uoti Urpala
e46317a1db Merge svn changes up to r28655 2009-02-19 03:23:50 +02:00
reimar
0248741426 Handle mpcodecs_get_image returning NULL, FFmpeg most of the time handles 
it correctly (VDPAU and probably H.264 currently don't, MPEG1/2 does etc.).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28643 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-18 07:52:17 +00:00
Uoti Urpala
186e5a998c Merge svn changes up to r28641 
Convert vo_x11_border (used in vo_gl/gl2 though the vo_gl_border
macro) to use a wrapper macro in old-style VOs which do not provide a
VO object argument. Before this function had an explicit global_vo
argument in vo_gl/gl2. New vo_vdpau uses it too so use the same
mechanism as most other functions.
 2009-02-18 01:45:36 +02:00
reimar
8e5edec13e Set avctx->opaque already at init instead of decode so it can be used in 
get_format and get_buffer would not crash if called during avcodec_open.
Patch by Gwenole Beauchesne [gbeauchesne splitted-desktop com]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28636 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-17 16:40:50 +00:00
diego
687655ff2f cosmetics: Remove stray empty lines. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28630 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-17 11:29:43 +00:00
cehoyos
288f25d8d9 Fix #endif comment. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28619 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-16 23:56:19 +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
Uoti Urpala
0bf2bd91ec Merge svn changes up to r28610 2009-02-16 02:39:58 +02: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
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
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
reimar
b2c338819e Remove unnecessary #if around forward declaration. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28600 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-15 17:29:00 +00:00
reimar
de96ea2e01 Restructure get_format so it can easily be extended to handle VDPAU 
and hardware-acceleration selected via get_format.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28599 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-15 17:23:05 +00:00
reimar
14b1991a42 Reuse the code for the general do_dr1 case to set get_buffer/release_buffer for XvMC. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28598 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-15 16:57:08 +00:00
reimar
c6ae3112f2 Use PIX_FMT_NONE instead of -1 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28595 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-15 15:27:12 +00:00
reimar
2a57385958 Remove apparently unneeded CODEC_FLAG_EMU_EDGE for XvMC 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28594 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-15 15:24:32 +00:00
reimar
c618bdde05 Extend get_buffer to handle the XvMC case and remove mc_get_buffer 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28591 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-15 14:10:47 +00:00
reimar
5d21955bb1 Unset MP_IMGFLAG_IN_USE in release_buffer. 
This is only needed for MPI_IMGTYPE_NUMBERED support and will probably
first be used for VDPAU, but it is still "the right thing to do".


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28590 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-15 13:24:17 +00:00
reimar
9275737b40 Merge two checks for mpi != NULL 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28589 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-15 13:17:04 +00:00
reimar
eee0fbd3af Make the default release_buffer work for XvMC, use it and remove mc_release_buffer 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28588 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-15 13:14:17 +00:00
reimar
d1e711b21b Get rid of mc_render_slice and use the generic draw_slice instead. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28587 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-15 13:04:57 +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
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
reimar
e41470a32e Use fmt-conversion.h in vd_ffmpeg.c 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28562 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-14 17:58:33 +00:00
reimar
c4854a0ead Consistently place whitespace around * ( ) and , 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28560 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-14 17:43:06 +00:00
reimar
f2eb312f74 Remove useless break 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28559 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-14 17:30:41 +00:00
reimar
c81dd09974 Indentation and other whitespace fixes 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28558 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-14 17:29:59 +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
Uoti Urpala
738f66b1bc Merge svn changes up to r28549 2009-02-13 03:52:51 +02:00
reimar
8c2821f32d 100l, removed a #ifdef the wrong way, CODEC_FLAG_NOT_TRUNCATED no longer exists, 
so remove reference to it to fix compilation.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28545 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-12 16:58:47 +00:00
reimar
403de5ac6e Remove trailing whitespace from vd_ffmpeg. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28544 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-12 15:41:59 +00:00
reimar
9fc1c19f7a Replace tabs in vd_ffmpeg by 8 spaces to better match FFmpeg's coding style. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28543 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-12 15:39:32 +00:00
reimar
706f148b78 Remove several #ifdefs that check for libavcodec features from vd_ffmpeg. 
They make no sense since only recent libavcodec versions are supported anyway.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28542 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-12 15:35:18 +00:00
Uoti Urpala
1e86963828 Merge svn changes up to r28537 2009-02-12 04:17:55 +02:00
aurel
de03d58545 change internal real video packetizing format to the more straight forward one 
see [MPlayer-dev-eng] [PATCH] cleanup/uniformize real video packetizing
patch blessed by Roberto


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28503 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-09 22:00:57 +00:00
Uoti Urpala
9790f4e6e7 Merge svn changes up to r28461 2009-02-04 00:28:17 +02:00
zuxy
edc3c57aee Convert CONFIG_XVMC into a 0/1 definition. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28447 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-02 07:26:05 +00:00
gpoirier
0f224d32dc revert #ifdef WORDS_BIGENDIAN => #if WORDS_BIGENDIAN changes from r28331 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28334 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-01-16 13:19:29 +00:00
gpoirier
5538dcf03b fix compilation on non x86 machines (PPC here) 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28331 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-01-16 10:07:14 +00:00
Uoti Urpala
9bcd12fdf5 Merge svn changes up to r28310 
The libdvdread4 and libdvdnav directories, which are externals in the
svn repository, are at least for now not included in any form. I added
configure checks to automatically disable internal libdvdread and
libdvdnav if the corresponding directories are not present; if they're
added manually then things work the same as in svn.
 2009-01-15 05:57:31 +02: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
Uoti Urpala
71b25cca76 Merge svn changes up to r28162 2008-12-19 00:29:24 +02: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