History

vo_vdpau: remove deprecated/inactive --vo-vdpau-deint option

I think this has been dead code for quite a while. It was deprecated anyway.

wm4 committed 6 years ago

Commit 92e7f751 parent 9b9ce744 files · +1 −30Browse files

Unified · Split

4 files
  1. DOCS/interface-changes.rst +1 −0
  2. DOCS/man/vo.rst +0 −23
  3. video/out/vo.h +0 −2
  4. video/out/vo_vdpau.c +0 −5
DOCS/interface-changes.rst+1−0
@@ -78,6 +78,7 @@ Interface changes · 77 unmodified lines
78 To get the old behavior, set the "passthrough_stdin" argument to true.78 To get the old behavior, set the "passthrough_stdin" argument to true.
79 - key/value list options do not accept ":" as item separator anymore,79 - key/value list options do not accept ":" as item separator anymore,
80 only ",". This means ":" is always considered part of the value.80 only ",". This means ":" is always considered part of the value.
81 - remove deprecated --vo-vdpau-deint option
81 --- mpv 0.32.0 ---82 --- mpv 0.32.0 ---
82 - change behavior when using legacy option syntax with options that start83 - change behavior when using legacy option syntax with options that start
83 with two dashes (``--`` instead of a ``-``). Now, using the recommended84 with two dashes (``--`` instead of a ``-``). Now, using the recommended
DOCS/man/vo.rst+0−23
@@ -99,29 +99,6 @@ Available video output drivers are: · 98 unmodified lines
99 99
100 Apply a noise reduction algorithm to the video (default: 0; no noise100 Apply a noise reduction algorithm to the video (default: 0; no noise
101 reduction).101 reduction).
102 ``--vo-vdpau-deint=<-4-4>``
103 (Deprecated. See note about ``vdpaupp``.)
104
105 Select deinterlacing mode (default: 0). In older versions (as well as
106 MPlayer/mplayer2) you could use this option to enable deinterlacing.
107 This doesn't work anymore, and deinterlacing is enabled with either
108 the ``d`` key (by default mapped to the command ``cycle deinterlace``),
109 or the ``--deinterlace`` option. Also, to select the default deint mode,
110 you should use something like ``--vf-defaults=vdpaupp:deint-mode=temporal``
111 instead of this sub-option.
112
113 0
114 Pick the ``vdpaupp`` video filter default, which corresponds to 3.
115 1
116 Show only first field.
117 2
118 Bob deinterlacing.
119 3
120 Motion-adaptive temporal deinterlacing. May lead to A/V desync
121 with slow video hardware and/or high resolution.
122 4
123 Motion-adaptive temporal deinterlacing with edge-guided spatial
124 interpolation. Needs fast video hardware.
125 ``--vo-vdpau-chroma-deint``102 ``--vo-vdpau-chroma-deint``
126 (Deprecated. See note about ``vdpaupp``.)103 (Deprecated. See note about ``vdpaupp``.)
127 104
video/out/vo.h+0−2
@@ -121,8 +121,6 @@ enum mp_voctrl { · 120 unmodified lines
121 VOCTRL_GET_DISPLAY_FPS, // double*121 VOCTRL_GET_DISPLAY_FPS, // double*
122 VOCTRL_GET_HIDPI_SCALE, // double*122 VOCTRL_GET_HIDPI_SCALE, // double*
123 123
124 VOCTRL_GET_PREF_DEINT, // int*
125
126 /* private to vo_gpu */124 /* private to vo_gpu */
127 VOCTRL_EXTERNAL_RESIZE,125 VOCTRL_EXTERNAL_RESIZE,
128};126};
video/out/vo_vdpau.c+0−5
@@ -88,7 +88,6 @@ struct vdpctx { · 87 unmodified lines
88 88
89 int force_yuv;89 int force_yuv;
90 struct mp_vdpau_mixer *video_mixer;90 struct mp_vdpau_mixer *video_mixer;
91 int deint;
92 int pullup;91 int pullup;
93 float denoise;92 float denoise;
94 float sharpen;93 float sharpen;
@@ -1080,9 +1079,6 @@ static int control(struct vo *vo, uint32_t request, void *data) · 985 unmodified lines
1080 return false;1079 return false;
1081 *(struct mp_image **)data = get_window_screenshot(vo);1080 *(struct mp_image **)data = get_window_screenshot(vo);
1082 return true;1081 return true;
1083 case VOCTRL_GET_PREF_DEINT:
1084 *(int *)data = vc->deint;
1085 return true;
1086 }1082 }
1087 1083
1088 int events = 0;1084 int events = 0;
@@ -1115,7 +1111,6 @@ const struct vo_driver video_out_vdpau = { · 26 unmodified lines
1115 .uninit = uninit,1111 .uninit = uninit,
1116 .priv_size = sizeof(struct vdpctx),1112 .priv_size = sizeof(struct vdpctx),
1117 .options = (const struct m_option []){1113 .options = (const struct m_option []){
1118 {"deint", OPT_INT(deint), M_RANGE(-4, 4)},
1119 {"chroma-deint", OPT_FLAG(chroma_deint), OPTDEF_INT(1)},1114 {"chroma-deint", OPT_FLAG(chroma_deint), OPTDEF_INT(1)},
1120 {"pullup", OPT_FLAG(pullup)},1115 {"pullup", OPT_FLAG(pullup)},
1121 {"denoise", OPT_FLOAT(denoise), M_RANGE(0, 1)},1116 {"denoise", OPT_FLOAT(denoise), M_RANGE(0, 1)},

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t