RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-03 05:22:23 +00:00
Code Issues Releases Wiki Activity
32,543 Commits 41 Branches 86 Tags 152 MiB
21df1d5ec5
Commit Graph

110 Commits

Author SHA1 Message Date
Uoti Urpala
53eeb0e412 Merge branch 'ordered_chapters' 2009-04-08 02:43:44 +03:00
Uoti Urpala
7db6430959 VO: Don't reset pause status in VO config() functions 
Many VOs kept track of pause status, but reset the value when their
config() function was called. However it can be called while playback
stays in pause mode. Modify the VOs to not change anything in
config(). Also send the VO either VOCTRL_PAUSE or VOCTRL_RESUME when
the playback of a new file is starting to make sure they have the
right status.
 2009-04-02 06:51:26 +03:00
Uoti Urpala
cf9edda1d3 Merge svn changes up to r29117 2009-04-01 02:43:47 +03:00
cehoyos
f7891c8e53 Support IMGFMT_NV12 for vo vdpau. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29109 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-30 21:17:42 +00:00
reimar
79568f8ea5 Make sure we do not accidentally use the vdp_get_error_string from the 
previous initialization.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29106 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-30 12:11:12 +00:00
cehoyos
05be65cb86 Add support for IMGFMT_YUY2 and IMGFMT_UYVY to vo vdpau. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29105 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-29 19:43:52 +00:00
cehoyos
c7990f8893 VDPAU supports IMGFMT_I420 and IMGFMT_IYUV. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29104 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-29 19:25:22 +00:00
cehoyos
bdbf4f617d Cosmetics: Reindent after last commit. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29094 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-29 11:16:14 +00:00
cehoyos
aa549a325b 10l: Don't use MP_IMGFIELD_TOP_FIRST if MP_IMGFIELD_ORDERED is not set. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29093 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-29 11:15:22 +00:00
cehoyos
38116c1f73 Simplify vdpau deinterlacing code and fix timing for deint=2. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29061 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-25 23:32:27 +00:00
cehoyos
a0f0db79f4 New VDPAU deinterlacing code needs one reference surface less for software decoding. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29053 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-24 21:49:08 +00:00
cehoyos
c266ad4de4 New vdpau deinterlacing code needs one reference surface less. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29052 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-24 21:47:56 +00:00
cehoyos
7ab8e44842 Stephen Warren reported that VDPAU deinterlacing did not work correctly. 
New static function push_deint_surface() by Reimar.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29051 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-24 21:45:39 +00:00
cehoyos
9e8112128e Change function call order in config(). 
This stops creating a window even if hardware decoding is certainly
going to fail.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29040 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-22 23:58:40 +00:00
cehoyos
9970706263 10l: Only try to create vdpau decoder if hardware decoding is intended. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29028 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-21 22:53:18 +00:00
cehoyos
a331f3fd15 Test if create_vdp_decoder() might succeed by calling it from config() 
with a small value for max_reference_frames.
This does not make automatic recovery by using software decoder possible,
but lets MPlayer fail more graciously on - actually existing - buggy
hardware that does not support certain H264 widths when using
hardware accelerated decoding (784, 864, 944, 1024, 1808, 1888 pixels on
NVIDIA G98) and if the user tries to hardware-decode more samples at
the same time than supported.
Might break playback of H264 Intra-Only samples on hardware with very
little video memory.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29027 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-21 20:11:05 +00:00
cehoyos
9f47d4d37c Change return value for create_vdp_decoder(). 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29026 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-21 19:59:35 +00:00
cehoyos
8c820cce48 Factorize create_vdp_decoder(). 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29024 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-21 17:10:19 +00:00
cehoyos
115bfb9762 Allow to use vdpau temporal deinterlacers with hardware accelerated decoding. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28991 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-18 17:02:29 +00:00
cehoyos
02c87f0578 Add chroma-deint option to vo vdpau (nochroma-deint speeds up deinterlacing). 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28979 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-16 23:03:18 +00:00
cehoyos
773c611884 Move initialisation of deint_surfaces[] to free_video_specific(). 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28971 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-15 22:19:05 +00:00
cehoyos
2ec3f259e5 Update -vo vdpau command line help. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28970 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-15 21:48:52 +00:00
cehoyos
7f3ddffb67 Cosmetics: Fix whitespace. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28969 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-15 21:26:10 +00:00
cehoyos
e8113dc1c7 Initial support for advanced VDPAU deinterlacers (software-decoded video 
only).

With a lot of help from Reimar


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28968 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-15 21:20:06 +00:00
Uoti Urpala
ae2faad666 Merge svn changes up to r28951 2009-03-14 23:52:45 +02:00
cehoyos
919793e643 Output number of reference frames before creating H264 vdpau decoder. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28927 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-09 23:46:28 +00:00
reimar
05119ecaf6 Make data related to suboption parsing const in libvo 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28863 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-07 08:51:40 +00:00
Uoti Urpala
e0172b96e3 Merge svn changes up to r28862 2009-03-07 01:04:41 +02:00
reimar
eb761e688f Remove duplicate OSD drawing introduced due to a conflict between r28840 and r28839. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28842 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-06 10:50:43 +00:00
reimar
d4748622fa As for vo_gl, do not rely on draw_osd to render EOSD. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28840 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-06 10:39:58 +00:00
greg
658bcd5e35 Draw EOSD with VOCTRL_DRAW_EOSD instead of along with OSD. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28839 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-06 10:38:27 +00:00
reimar
81ce92ba78 Make sure all output_surfaces are initialized in preinit. 
Patch by Dan Oscarsson [Dan Oscarsson (at) tietoenator com]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28809 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-04 19:37:07 +00:00
cehoyos
40fb81669a Use M_PI for pi. 
Suggested by Reimar.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28764 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-28 15:45:24 +00:00
cehoyos
f099431791 Make VdpVideoMixerAttribute attributes[] static const. 
Suggested by Reimar.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28763 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-28 15:42:17 +00:00
cehoyos
82ed008f7a Support brightness, contrast, hue and saturation adjustments via 
custom color space conversion matrices in VDPAU.

Patch by Grigori Goronzy, greg A chown D ath D cx


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28760 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-28 13:20:01 +00:00
cehoyos
2661a2b7fc Fix OSD for vo vdpau:deint>1. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28759 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-28 13:02:52 +00:00
reimar
5437a538d5 Handle vdp_decoder_create failures better, in particular avoid unrelated 
error messages and retry creating a decoder.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28758 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-28 10:43:28 +00:00
Uoti Urpala
0c6f667896 Merge svn changes up to r28755 2009-02-28 05:58:59 +02:00
cehoyos
b739f69217 Do not forget the chosen deinterlacer for -vo vdpau. 
Make temporal deinterlacing standard when pressing "D" to activate
deinterlacer.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28744 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-27 21:55:28 +00:00
cehoyos
7c186eed15 Add one-field-only output for -vo vdpau. 
Change syntax of -vo vdpau:deint for the last time.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28743 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-27 21:52:59 +00:00
cehoyos
317b16725c Document that all vdpau deinterlacers respect -field-dominance. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28742 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-27 21:46:13 +00:00
cehoyos
cd1dc957fe 10l: Remove debug printf() from last commit. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28737 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-26 19:34:04 +00:00
cehoyos
2614be14cc Support "D" to (de-)activate deinterlacing when using vo vdpau. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28736 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-26 18:20:32 +00:00
cehoyos
115c0fddae 10l: Add missing braces for VOCTRL_GET_EOSD_RES. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28734 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-25 15:17:14 +00:00
reimar
99caf8cc68 Change code to actually work when NUM_OUTPUT_SURFACES is changed. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28731 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-25 12:01:00 +00:00
Uoti Urpala
54bb7a2582 Merge svn changes up to r28728 2009-02-25 05:03:51 +02:00
cehoyos
4cd920182b Cosmetics: Fix indentation and line length. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28724 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-24 22:45:29 +00:00
cehoyos
4cfb4ba7d8 Enable Bob de-interlacing for VDPAU. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28719 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-24 21:46:25 +00:00
Uoti Urpala
66f6f9f076 Merge svn changes up to r28712 2009-02-23 21:00:52 +02:00
reimar
53e6c7777e Only check for vdp_video_mixer_destroy failure when we actually executed that function. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28711 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-23 09:22:57 +00:00
reimar
51d0a5fcc1 EOSD/ASS support for vo_vdpau.c 
Patch by Grigori G (greg <at> chown ath cx) with minor cosmetic changes by me.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28710 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-23 09:21:57 +00:00
reimar
adbe22d1b4 Add forgotten type to variable declaration. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28693 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-21 18:15:55 +00:00
Uoti Urpala
ebb541c655 Merge svn changes up to r28690 2009-02-21 17:39:30 +02:00
reimar
b588457f52 Document that and why deinterlacing is not working 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28674 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-20 10:00:15 +00:00
reimar
d6a97f889a Add support for VDPAU deinterlacing, pullup, denoise and sharpening. 
Deinterlacing can not yet be toggled at runtime, and actually it does
not seem to work at all...


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28673 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-20 09:45:48 +00:00
Uoti Urpala
e46317a1db Merge svn changes up to r28655 2009-02-19 03:23:50 +02:00
reimar
60fa5a134d Add VOCAP_NOSLICES and use it to allow vo_vdpau to not support slices for 
YV12 - since VDPAU only has functions to upload the full frame at once
there is no sense in supporting draw_slice for that.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28646 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-18 12:30:15 +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
01ef7e4579 Extend calc_src_dst_rects to also calculate the border values needed for 
correctly placed dvdnav highlights, and fix direct3d and vdpau accordingly.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28633 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-17 11:59:49 +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