Commit Graph
2870 Commits
Author SHA1 Message Date
reimar 8864662b13 Make WinID a 64 bit integer, this should avoid issues with valid Window
handles on windows being interpreted as "no wid set".


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28795 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-02 11:24:20 +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
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 8605d7090e Use memset to make sure all parts of struct sockaddr_in are always initialized.
Problem reported by [kmkaplan+mplayer-dev-eng (at) kim kim-minh com]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28732 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-25 12:51:20 +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
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
reimar 74efde9480 Calculate border size in aspect keeping code by using AdjustWindowRect
instead of GetClientRect and GetWindowRect since GetClientRect returns
nonsensical values if Window is still minimized.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28713 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-23 21:40:02 +00: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
reimar db74aa4315 100l, place vdpau below xv, it should not normally be preferred for auto-selection (yet).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28688 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-21 11:44:10 +00:00
iive d9850fbbfc Cosmetics. Reindent to 4 spaces.
Checked for equality with diff -w.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28684 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-21 08:33:43 +00:00
iive 29d6f83335 Cleanup.
Turn a number of if(mp_msg_test()) mp_msg(); into single mp_msg()



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28683 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-21 07:32:56 +00:00
iive 9ed1027a00 Cosmetics. Remove all trailing whitespaces
and convert the few tabs into spaces.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28681 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-21 00:30:53 +00:00
iive dbf0e084ab Turn all remaining printf() into mp_msg().
Try to set appropriate levels for them.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28680 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-20 23:46:24 +00:00
iive f772287521 Cleanup.
Turn a number of if(mp_msg_test()) printf(); into normal mp_msg()


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28679 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-20 23:18:28 +00:00
iive 3b4e9aa2d1 Cosmetics part2. Indent local variable definitions like the rest of the code.
Checked for equality by diff -wB .


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28678 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-20 22:49:09 +00:00
iive d238dc2d1f Cosmetics part 1. Reindent to 4 spaces.
Checked for equality with diff -b.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28677 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-20 22:13:31 +00:00
iive 8011ebfc9a Comment out "else" statement without following block.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28676 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-20 19:17:10 +00:00
iive 344ac5a068 Move libavcodec includes together.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28675 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-20 18:39:02 +00: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
reimar 73c3ff74e0 Use the same code to convert fps in float to fraction as used in mencoder,
it ensures all the common frame rates work right.
If this causes issues, it should be changed in the same way in mencoder.c


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28650 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-18 16:49:12 +00: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
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
diego be8c67909b Convert HAVE_MALLOC_H into a 0/1 definition, fixes the warning:
mem.c:32:5: warning: "HAVE_MALLOC_H" is not defined


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28629 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-17 11:16:19 +00:00
cehoyos 4a8a46fafd Fix compilation after last commit.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28627 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-17 10:13:08 +00:00
reimar a3dbab1813 Cropping parameter to calc_src_dst_rects is const
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28626 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-17 08:09:36 +00:00
reimar 4ed961f7e5 100l, reset ass_border when switching out of fullscreen mode.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28625 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-17 08:05:14 +00:00
diego de53a241ed The CONFIG_TV_TELETEXT preprocessor directive is defined/undefined,
so use it with #ifdef instead of #if; fixes the warning:
libvo/sub.c:1233:5: warning: "CONFIG_TV_TELETEXT" is not defined


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28621 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-17 02:57:10 +00:00
uau 991d64b31f Fix compilation without VDPAU
The commit adding vo_vdpau had two bugs that broke compilation when
VDPAU was not enabled.
- video_out.c used "#ifdef CONFIG_VDPAU", but it's always set to 0 or 1
- In configure, MPEG1_VDPAU_DECODER was dropped from the list of
  libavcodec codecs to disable when moving VDPAU-related ones from the
  always-disabled list to a conditinal one.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28620 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-17 00:09:15 +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
diego 1b915e419e Replace double semicolon by single semicolon.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28611 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-16 02:00:29 +00:00
diego eacf4421f4 Sync renaming of xvmc struct members in FFmpeg.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28610 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-16 00:29:25 +00: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 e3638bae19 whitespace cosmetics: Remove all tabs and trailing whitespace.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28604 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-15 17:55:57 +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 3a058c8c6a Remove unnecessary #ifdef around internal #include.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28602 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-15 17:38:47 +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