diff options
| -rw-r--r-- | DOCS/man/en/mplayer.1 | 23 | ||||
| -rw-r--r-- | libvo/vo_vdpau.c | 10 |
2 files changed, 20 insertions, 13 deletions
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index cf429bcc14..f44367375b 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -3499,9 +3499,9 @@ Select the driver to use as source to overlay on top of X11. .PD 1 . .TP -.B vdpau (with \-vc ffmpeg12vdpau, ffwmv3vdpau, ffvc1vdpau, ffh264vdpau or ffodivxvdpau) -Video output that uses VDPAU to decode video via hardware. -Also supports displaying of software-decoded video. +.B vdpau (X11 only) +Uses the VDPAU interface to display and optionally also decode video. +Hardware decoding is used with \-vc ffmpeg12vdpau, ffwmv3vdpau, ffvc1vdpau, ffh264vdpau or ffodivxvdpau. .PD 0 .RSs .IPs sharpen=<\-1\-1> @@ -3509,22 +3509,25 @@ For positive values, apply a sharpening algorithm to the video, for negative values a blurring algorithm (default: 0). .IPs denoise=<0\-1> Apply a noise reduction algorithm to the video (default: 0, no noise reduction). -.IPs deint=<0\-4> -Select the deinterlacer (default: 0). -All modes > 0 respect \-field\-dominance. +.IPs deint=<-4\-4> +Select deinterlacing mode (default: -3). +Positive values choose mode and enable deinterlacing. +Corresponding negative values select the same deinterlacing mode, +but do not enable deinterlacing on startup (useful in configuration files +to specify what mode will be enabled by the "D" key). +All modes respect \-field\-dominance. .RSss .IPs 0 -no deinterlacing +same as -3 .IPs 1 Show only first field, similar to \-vf field. .IPs 2 Bob deinterlacing, similar to \-vf tfields=1. .IPs 3 -motion adaptive temporal deinterlacing +motion adaptive temporal deinterlacing. May lead to A/V desync with slow video hardware and/or high resolution. -This is the default if "D" is used to enable deinterlacing. .IPs 4 -motion adaptive temporal deinterlacing with edge-guided spatial interpolation +motion adaptive temporal deinterlacing with edge-guided spatial interpolation. Needs fast video hardware. .RE .IPs chroma\-deint diff --git a/libvo/vo_vdpau.c b/libvo/vo_vdpau.c index 01d97863b9..f8748b5574 100644 --- a/libvo/vo_vdpau.c +++ b/libvo/vo_vdpau.c @@ -635,7 +635,7 @@ static int create_vdp_mixer(struct vo *vo, VdpChromaType vdp_chroma_type) &vdp_chroma_type, }; features[feature_count++] = VDP_VIDEO_MIXER_FEATURE_DEINTERLACE_TEMPORAL; - if (vc->deint == 4) + if (vc->deint_type == 4) features[feature_count++] = VDP_VIDEO_MIXER_FEATURE_DEINTERLACE_TEMPORAL_SPATIAL; if (vc->pullup) @@ -669,6 +669,8 @@ static int create_vdp_mixer(struct vo *vo, VdpChromaType vdp_chroma_type) feature_enables[i] = VDP_TRUE; if (vc->deint < 3) feature_enables[0] = VDP_FALSE; + if (vc->deint_type == 4 && vc->deint < 4) + feature_enables[1] = VDP_FALSE; if (feature_count) { vdp_st = vdp->video_mixer_set_feature_enables(vc->video_mixer, feature_count, features, @@ -1621,7 +1623,7 @@ static int preinit(struct vo *vo, const char *arg) vc->flip_offset_fs = 50; vc->num_output_surfaces = 3; const opt_t subopts[] = { - {"deint", OPT_ARG_INT, &vc->deint, (opt_test_f)int_non_neg}, + {"deint", OPT_ARG_INT, &vc->deint, NULL}, {"chroma-deint", OPT_ARG_BOOL, &vc->chroma_deint, NULL}, {"pullup", OPT_ARG_BOOL, &vc->pullup, NULL}, {"denoise", OPT_ARG_FLOAT, &vc->denoise, NULL}, @@ -1655,7 +1657,9 @@ static int preinit(struct vo *vo, const char *arg) vc->num_output_surfaces = MAX_OUTPUT_SURFACES; } if (vc->deint) - vc->deint_type = vc->deint; + vc->deint_type = FFABS(vc->deint); + if (vc->deint < 0) + vc->deint = 0; if (!vo_init(vo)) return -1; |