Mercurial > mplayer.hg
annotate libvo/vo_directx.c @ 33815:4d75b3bf9561
Split out read/write part from data struct and make read-only
struct const.
author | reimar |
---|---|
date | Sun, 24 Jul 2011 19:29:10 +0000 |
parents | ccbef55f408c |
children | 65c7223dd37a |
rev | line source |
---|---|
26739
2a34d9fa52ab
Use standard license headers with standard formatting.
diego
parents:
25962
diff
changeset
|
1 /* |
2a34d9fa52ab
Use standard license headers with standard formatting.
diego
parents:
25962
diff
changeset
|
2 * Directx v2 or later DirectDraw interface |
7537 | 3 * |
26739
2a34d9fa52ab
Use standard license headers with standard formatting.
diego
parents:
25962
diff
changeset
|
4 * Copyright (c) 2002 - 2005 Sascha Sommer <saschasommer@freenet.de> |
2a34d9fa52ab
Use standard license headers with standard formatting.
diego
parents:
25962
diff
changeset
|
5 * |
2a34d9fa52ab
Use standard license headers with standard formatting.
diego
parents:
25962
diff
changeset
|
6 * This file is part of MPlayer. |
2a34d9fa52ab
Use standard license headers with standard formatting.
diego
parents:
25962
diff
changeset
|
7 * |
2a34d9fa52ab
Use standard license headers with standard formatting.
diego
parents:
25962
diff
changeset
|
8 * MPlayer is free software; you can redistribute it and/or modify |
7537 | 9 * it under the terms of the GNU General Public License as published by |
10 * the Free Software Foundation; either version 2 of the License, or | |
11 * (at your option) any later version. | |
12 * | |
26739
2a34d9fa52ab
Use standard license headers with standard formatting.
diego
parents:
25962
diff
changeset
|
13 * MPlayer is distributed in the hope that it will be useful, |
7537 | 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
16 * GNU General Public License for more details. | |
17 * | |
26739
2a34d9fa52ab
Use standard license headers with standard formatting.
diego
parents:
25962
diff
changeset
|
18 * You should have received a copy of the GNU General Public License along |
2a34d9fa52ab
Use standard license headers with standard formatting.
diego
parents:
25962
diff
changeset
|
19 * with MPlayer; if not, write to the Free Software Foundation, Inc., |
2a34d9fa52ab
Use standard license headers with standard formatting.
diego
parents:
25962
diff
changeset
|
20 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
2a34d9fa52ab
Use standard license headers with standard formatting.
diego
parents:
25962
diff
changeset
|
21 */ |
7537 | 22 |
23 #include <windows.h> | |
24 #include <windowsx.h> | |
25 #include <ddraw.h> | |
12005
a8adfcf47f4e
adapter selection patch by Rune <runner at mail.tele.dk> +first attempt to implement 2 window fullscreenswitching by me
faust3
parents:
11542
diff
changeset
|
26 #include <stdio.h> |
7537 | 27 #include <stdlib.h> |
28 #include <errno.h> | |
29 #include "config.h" | |
30 #include "video_out.h" | |
31 #include "video_out_internal.h" | |
33301
899d817e56fc
Implement control() VOCTRL_SET/GET_EQUALIZER using a vf_equalize struct,
iive
parents:
32537
diff
changeset
|
32 #include "libmpcodecs/vf.h" |
7537 | 33 #include "fastmemcpy.h" |
30653
3d23e24c5c60
Declare externally used variables from vd.c as extern in vd.h.
diego
parents:
30301
diff
changeset
|
34 #include "libmpcodecs/vd.h" |
13787
e047e70a9767
Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.
diego
parents:
13775
diff
changeset
|
35 #include "mp_msg.h" |
8519 | 36 #include "aspect.h" |
32467 | 37 #include "sub/sub.h" |
33569 | 38 #include "w32_common.h" |
7537 | 39 |
33808 | 40 static LPDIRECTDRAWCOLORCONTROL g_cc = NULL; //color control interface |
41 static LPDIRECTDRAW7 g_lpdd = NULL; //DirectDraw Object | |
42 static LPDIRECTDRAWSURFACE7 g_lpddsPrimary = NULL; //Primary Surface: viewport through the Desktop | |
43 static LPDIRECTDRAWSURFACE7 g_lpddsOverlay = NULL; //Overlay Surface | |
44 static LPDIRECTDRAWSURFACE7 g_lpddsBack = NULL; //Back surface | |
45 static LPDIRECTDRAWCLIPPER g_lpddclipper; //clipper object, can only be used without overlay | |
46 static DDSURFACEDESC2 ddsdsf; //surface descripiton needed for locking | |
47 static HINSTANCE hddraw_dll; //handle to ddraw.dll | |
48 static RECT rd; //rect of our stretched image | |
49 static RECT rs; //rect of our source image | |
50 static HBRUSH colorbrush = NULL; // Handle to colorkey brush | |
51 static HBRUSH blackbrush = NULL; // Handle to black brush | |
7537 | 52 static uint32_t image_width, image_height; //image width and height |
33808 | 53 static uint8_t *image = NULL; //image data |
54 static void *tmp_image = NULL; | |
55 static uint32_t image_format = 0; //image format | |
10640
01e0d93182f8
fix playback of rgb files when overlay is not disabled
faust3
parents:
9943
diff
changeset
|
56 static uint32_t primary_image_format; |
33808 | 57 static uint32_t vm_height = 0; |
58 static uint32_t vm_width = 0; | |
59 static uint32_t vm_bpp = 0; | |
7537 | 60 static uint32_t dstride; //surface stride |
7682 | 61 static uint32_t nooverlay = 0; //NonOverlay mode |
33808 | 62 static DWORD destcolorkey; //colorkey for our surface |
63 static COLORREF windowcolor = RGB(0, 0, 16); //windowcolor == colorkey | |
64 static int adapter_count = 0; | |
12005
a8adfcf47f4e
adapter selection patch by Rune <runner at mail.tele.dk> +first attempt to implement 2 window fullscreenswitching by me
faust3
parents:
11542
diff
changeset
|
65 static GUID selected_guid; |
a8adfcf47f4e
adapter selection patch by Rune <runner at mail.tele.dk> +first attempt to implement 2 window fullscreenswitching by me
faust3
parents:
11542
diff
changeset
|
66 static GUID *selected_guid_ptr = NULL; |
7537 | 67 |
68 /***************************************************************************** | |
69 * DirectDraw GUIDs. | |
70 * Defining them here allows us to get rid of the dxguid library during | |
71 * the linking stage. | |
72 *****************************************************************************/ | |
30301
a33cf9c69731
Change GUID declarations in vo_directx to be static.
reimar
parents:
29263
diff
changeset
|
73 #define IID_IDirectDraw7 MP_IID_IDirectDraw7 |
33808 | 74 static const GUID MP_IID_IDirectDraw7 = { |
75 0x15e65ec0, 0x3b9c, 0x11d2, { 0xb9, 0x2f, 0x00, 0x60, 0x97, 0x97, 0xea, 0x5b } | |
8667 | 76 }; |
7537 | 77 |
30301
a33cf9c69731
Change GUID declarations in vo_directx to be static.
reimar
parents:
29263
diff
changeset
|
78 #define IID_IDirectDrawColorControl MP_IID_IDirectDrawColorControl |
33808 | 79 static const GUID MP_IID_IDirectDrawColorControl = { |
80 0x4b9f0ee0, 0x0d7e, 0x11d0, { 0x9b, 0x06, 0x00, 0xa0, 0xc9, 0x03, 0xa3, 0xb8 } | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29212
diff
changeset
|
81 }; |
13736
e4281b5463a4
overlay color control support based on patch by Vitos Laszlo <laca <at> evol.ro>
faust3
parents:
13438
diff
changeset
|
82 |
33808 | 83 typedef struct directx_fourcc_caps { |
84 char *img_format_name; //human readable name | |
85 uint32_t img_format; //as MPlayer image format | |
86 DDPIXELFORMAT g_ddpfOverlay; //as Directx Sourface description | |
7537 | 87 } directx_fourcc_caps; |
88 | |
33815
4d75b3bf9561
Split out read/write part from data struct and make read-only
reimar
parents:
33814
diff
changeset
|
89 static const directx_fourcc_caps g_ddpf[] = { |
4d75b3bf9561
Split out read/write part from data struct and make read-only
reimar
parents:
33814
diff
changeset
|
90 { "YV12 ", IMGFMT_YV12, { sizeof(DDPIXELFORMAT), DDPF_FOURCC, MAKEFOURCC('Y', 'V', '1', '2'), 0, 0, 0, 0, 0 } }, |
4d75b3bf9561
Split out read/write part from data struct and make read-only
reimar
parents:
33814
diff
changeset
|
91 { "I420 ", IMGFMT_I420, { sizeof(DDPIXELFORMAT), DDPF_FOURCC, MAKEFOURCC('I', '4', '2', '0'), 0, 0, 0, 0, 0 } }, //yv12 with swapped uv |
4d75b3bf9561
Split out read/write part from data struct and make read-only
reimar
parents:
33814
diff
changeset
|
92 { "IYUV ", IMGFMT_IYUV, { sizeof(DDPIXELFORMAT), DDPF_FOURCC, MAKEFOURCC('I', 'Y', 'U', 'V'), 0, 0, 0, 0, 0 } }, //same as i420 |
4d75b3bf9561
Split out read/write part from data struct and make read-only
reimar
parents:
33814
diff
changeset
|
93 { "YVU9 ", IMGFMT_YVU9, { sizeof(DDPIXELFORMAT), DDPF_FOURCC, MAKEFOURCC('Y', 'V', 'U', '9'), 0, 0, 0, 0, 0 } }, |
4d75b3bf9561
Split out read/write part from data struct and make read-only
reimar
parents:
33814
diff
changeset
|
94 { "YUY2 ", IMGFMT_YUY2, { sizeof(DDPIXELFORMAT), DDPF_FOURCC, MAKEFOURCC('Y', 'U', 'Y', '2'), 0, 0, 0, 0, 0 } }, |
4d75b3bf9561
Split out read/write part from data struct and make read-only
reimar
parents:
33814
diff
changeset
|
95 { "UYVY ", IMGFMT_UYVY, { sizeof(DDPIXELFORMAT), DDPF_FOURCC, MAKEFOURCC('U', 'Y', 'V', 'Y'), 0, 0, 0, 0, 0 } }, |
4d75b3bf9561
Split out read/write part from data struct and make read-only
reimar
parents:
33814
diff
changeset
|
96 { "BGR8 ", IMGFMT_BGR8, { sizeof(DDPIXELFORMAT), DDPF_RGB, 0, 8, 0x00000000, 0x00000000, 0x00000000, 0 } }, |
4d75b3bf9561
Split out read/write part from data struct and make read-only
reimar
parents:
33814
diff
changeset
|
97 { "RGB15", IMGFMT_RGB15, { sizeof(DDPIXELFORMAT), DDPF_RGB, 0, 16, 0x0000001F, 0x000003E0, 0x00007C00, 0 } }, //RGB 5:5:5 |
4d75b3bf9561
Split out read/write part from data struct and make read-only
reimar
parents:
33814
diff
changeset
|
98 { "BGR15", IMGFMT_BGR15, { sizeof(DDPIXELFORMAT), DDPF_RGB, 0, 16, 0x00007C00, 0x000003E0, 0x0000001F, 0 } }, |
4d75b3bf9561
Split out read/write part from data struct and make read-only
reimar
parents:
33814
diff
changeset
|
99 { "RGB16", IMGFMT_RGB16, { sizeof(DDPIXELFORMAT), DDPF_RGB, 0, 16, 0x0000001F, 0x000007E0, 0x0000F800, 0 } }, //RGB 5:6:5 |
4d75b3bf9561
Split out read/write part from data struct and make read-only
reimar
parents:
33814
diff
changeset
|
100 { "BGR16", IMGFMT_BGR16, { sizeof(DDPIXELFORMAT), DDPF_RGB, 0, 16, 0x0000F800, 0x000007E0, 0x0000001F, 0 } }, |
4d75b3bf9561
Split out read/write part from data struct and make read-only
reimar
parents:
33814
diff
changeset
|
101 { "RGB24", IMGFMT_RGB24, { sizeof(DDPIXELFORMAT), DDPF_RGB, 0, 24, 0x000000FF, 0x0000FF00, 0x00FF0000, 0 } }, |
4d75b3bf9561
Split out read/write part from data struct and make read-only
reimar
parents:
33814
diff
changeset
|
102 { "BGR24", IMGFMT_BGR24, { sizeof(DDPIXELFORMAT), DDPF_RGB, 0, 24, 0x00FF0000, 0x0000FF00, 0x000000FF, 0 } }, |
4d75b3bf9561
Split out read/write part from data struct and make read-only
reimar
parents:
33814
diff
changeset
|
103 { "RGB32", IMGFMT_RGB32, { sizeof(DDPIXELFORMAT), DDPF_RGB, 0, 32, 0x000000FF, 0x0000FF00, 0x00FF0000, 0 } }, |
4d75b3bf9561
Split out read/write part from data struct and make read-only
reimar
parents:
33814
diff
changeset
|
104 { "BGR32", IMGFMT_BGR32, { sizeof(DDPIXELFORMAT), DDPF_RGB, 0, 32, 0x00FF0000, 0x0000FF00, 0x000000FF, 0 } } |
7537 | 105 }; |
106 #define NUM_FORMATS (sizeof(g_ddpf) / sizeof(g_ddpf[0])) | |
107 | |
33815
4d75b3bf9561
Split out read/write part from data struct and make read-only
reimar
parents:
33814
diff
changeset
|
108 // what hw supports with corresponding format in g_ddpf |
4d75b3bf9561
Split out read/write part from data struct and make read-only
reimar
parents:
33814
diff
changeset
|
109 static uint32_t drv_caps[NUM_FORMATS]; |
4d75b3bf9561
Split out read/write part from data struct and make read-only
reimar
parents:
33814
diff
changeset
|
110 |
33808 | 111 static const vo_info_t info = { |
112 "Directx DDraw YUV/RGB/BGR renderer", | |
113 "directx", | |
114 "Sascha Sommer <saschasommer@freenet.de>", | |
115 "" | |
7537 | 116 }; |
117 | |
25220
c9e9ac2008c2
Mark the vo_functions_t definitions as const where possible.
reimar
parents:
25216
diff
changeset
|
118 const LIBVO_EXTERN(directx) |
7537 | 119 |
120 static void draw_alpha(int x0, int y0, int w, int h, unsigned char *src, | |
33808 | 121 unsigned char *srca, int stride) |
7537 | 122 { |
33808 | 123 switch (image_format) { |
124 case IMGFMT_YV12: | |
125 case IMGFMT_I420: | |
126 case IMGFMT_IYUV: | |
127 case IMGFMT_YVU9: | |
128 vo_draw_alpha_yv12(w, h, src, srca, stride, ((uint8_t *)image) + dstride * y0 + x0, dstride); | |
129 break; | |
130 case IMGFMT_YUY2: | |
131 vo_draw_alpha_yuy2(w, h, src, srca, stride, ((uint8_t *)image) + dstride * y0 + 2 * x0, dstride); | |
132 break; | |
133 case IMGFMT_UYVY: | |
134 vo_draw_alpha_yuy2(w, h, src, srca, stride, ((uint8_t *)image) + dstride * y0 + 2 * x0 + 1, dstride); | |
135 break; | |
136 case IMGFMT_RGB15: | |
7537 | 137 case IMGFMT_BGR15: |
33808 | 138 vo_draw_alpha_rgb15(w, h, src, srca, stride, ((uint8_t *)image) + dstride * y0 + 2 * x0, dstride); |
139 break; | |
7537 | 140 case IMGFMT_RGB16: |
33808 | 141 case IMGFMT_BGR16: |
142 vo_draw_alpha_rgb16(w, h, src, srca, stride, ((uint8_t *)image) + dstride * y0 + 2 * x0, dstride); | |
143 break; | |
7537 | 144 case IMGFMT_RGB24: |
33808 | 145 case IMGFMT_BGR24: |
146 vo_draw_alpha_rgb24(w, h, src, srca, stride, ((uint8_t *)image) + dstride * y0 + 4 * x0, dstride); | |
147 break; | |
7537 | 148 case IMGFMT_RGB32: |
33808 | 149 case IMGFMT_BGR32: |
150 vo_draw_alpha_rgb32(w, h, src, srca, stride, ((uint8_t *)image) + dstride * y0 + 4 * x0, dstride); | |
151 break; | |
7537 | 152 } |
153 } | |
154 | |
155 static void draw_osd(void) | |
156 { | |
33808 | 157 vo_draw_text(image_width, image_height, draw_alpha); |
7537 | 158 } |
159 | |
33808 | 160 static int query_format(uint32_t format) |
7537 | 161 { |
33808 | 162 uint32_t i = 0; |
163 while (i < NUM_FORMATS) { | |
164 if (g_ddpf[i].img_format == format) | |
33815
4d75b3bf9561
Split out read/write part from data struct and make read-only
reimar
parents:
33814
diff
changeset
|
165 return drv_caps[i]; |
33808 | 166 i++; |
7537 | 167 } |
168 return 0; | |
169 } | |
170 | |
29212
eda346733b8c
Add missing 'void' to parameterless function declarations.
diego
parents:
28121
diff
changeset
|
171 static uint32_t Directx_CreatePrimarySurface(void) |
7537 | 172 { |
33814 | 173 DDSURFACEDESC2 ddsd = { .dwSize = sizeof(ddsd) }; |
7537 | 174 //cleanup |
33808 | 175 if (g_lpddsPrimary) |
176 g_lpddsPrimary->lpVtbl->Release(g_lpddsPrimary); | |
177 g_lpddsPrimary = NULL; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29212
diff
changeset
|
178 |
33808 | 179 if (vidmode) |
180 g_lpdd->lpVtbl->SetDisplayMode(g_lpdd, vm_width, vm_height, vm_bpp, vo_refresh_rate, 0); | |
7537 | 181 //set flags and create a primary surface. |
182 ddsd.dwFlags = DDSD_CAPS; | |
183 ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; | |
33808 | 184 if (g_lpdd->lpVtbl->CreateSurface(g_lpdd, &ddsd, &g_lpddsPrimary, NULL) == DD_OK) |
185 mp_msg(MSGT_VO, MSGL_DBG3, "<vo_directx><INFO>primary surface created\n"); | |
186 else { | |
187 mp_msg(MSGT_VO, MSGL_FATAL, "<vo_directx><FATAL ERROR>could not create primary surface\n"); | |
188 return 1; | |
189 } | |
190 return 0; | |
7537 | 191 } |
192 | |
193 static uint32_t Directx_CreateOverlay(uint32_t imgfmt) | |
194 { | |
195 HRESULT ddrval; | |
33814 | 196 DDSURFACEDESC2 ddsdOverlay = { |
197 .dwSize = sizeof(ddsdOverlay), | |
198 .ddsCaps.dwCaps = DDSCAPS_OVERLAY | DDSCAPS_FLIP | DDSCAPS_COMPLEX | DDSCAPS_VIDEOMEMORY, | |
199 .dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH | DDSD_BACKBUFFERCOUNT | DDSD_PIXELFORMAT, | |
200 .dwWidth = image_width, | |
201 .dwHeight = image_height, | |
202 .dwBackBufferCount = 2, | |
203 }; | |
33808 | 204 uint32_t i = 0; |
205 while (i < NUM_FORMATS && imgfmt != g_ddpf[i].img_format) | |
206 i++; | |
207 if (!g_lpdd || !g_lpddsPrimary || i == NUM_FORMATS) | |
7537 | 208 return 1; |
209 //cleanup | |
33808 | 210 if (g_lpddsOverlay) |
211 g_lpddsOverlay->lpVtbl->Release(g_lpddsOverlay); | |
212 if (g_lpddsBack) | |
213 g_lpddsBack->lpVtbl->Release(g_lpddsBack); | |
214 g_lpddsOverlay = NULL; | |
215 g_lpddsBack = NULL; | |
216 //create our overlay | |
217 ddsdOverlay.ddpfPixelFormat = g_ddpf[i].g_ddpfOverlay; | |
218 if (vo_doublebuffering) { //tribblebuffering | |
219 if (g_lpdd->lpVtbl->CreateSurface(g_lpdd, &ddsdOverlay, &g_lpddsOverlay, NULL) == DD_OK) { | |
220 mp_msg(MSGT_VO, MSGL_V, "<vo_directx><INFO>overlay with format %s created\n", g_ddpf[i].img_format_name); | |
7537 | 221 //get the surface directly attached to the primary (the back buffer) |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29212
diff
changeset
|
222 ddsdOverlay.ddsCaps.dwCaps = DDSCAPS_BACKBUFFER; |
33808 | 223 if (g_lpddsOverlay->lpVtbl->GetAttachedSurface(g_lpddsOverlay, &ddsdOverlay.ddsCaps, &g_lpddsBack) != DD_OK) { |
224 mp_msg(MSGT_VO, MSGL_FATAL, "<vo_directx><FATAL ERROR>can't get attached surface\n"); | |
225 return 1; | |
226 } | |
227 return 0; | |
228 } | |
229 vo_doublebuffering = 0; //disable tribblebuffering | |
230 mp_msg(MSGT_VO, MSGL_V, "<vo_directx><WARN>cannot create tribblebuffer overlay with format %s\n", g_ddpf[i].img_format_name); | |
231 } | |
232 //single buffer | |
233 mp_msg(MSGT_VO, MSGL_V, "<vo_directx><INFO>using singlebuffer overlay\n"); | |
234 ddsdOverlay.dwBackBufferCount = 0; | |
235 ddsdOverlay.ddsCaps.dwCaps = DDSCAPS_OVERLAY | DDSCAPS_VIDEOMEMORY; | |
236 ddsdOverlay.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT; | |
237 ddsdOverlay.ddpfPixelFormat = g_ddpf[i].g_ddpfOverlay; | |
238 // try to create the overlay surface | |
239 ddrval = g_lpdd->lpVtbl->CreateSurface(g_lpdd, &ddsdOverlay, &g_lpddsOverlay, NULL); | |
240 if (ddrval != DD_OK) { | |
241 if (ddrval == DDERR_INVALIDPIXELFORMAT) | |
242 mp_msg(MSGT_VO, MSGL_V, "<vo_directx><ERROR> invalid pixelformat: %s\n", g_ddpf[i].img_format_name); | |
243 else | |
244 mp_msg(MSGT_VO, MSGL_ERR, "<vo_directx><ERROR>"); | |
245 switch (ddrval) { | |
246 case DDERR_INCOMPATIBLEPRIMARY: | |
33810 | 247 mp_msg(MSGT_VO, MSGL_ERR, "incompatible primary surface\n"); |
33808 | 248 break; |
249 case DDERR_INVALIDCAPS: | |
33810 | 250 mp_msg(MSGT_VO, MSGL_ERR, "invalid caps\n"); |
33808 | 251 break; |
33810 | 252 case DDERR_INVALIDOBJECT: |
253 mp_msg(MSGT_VO, MSGL_ERR, "invalid object\n"); | |
254 break; | |
33808 | 255 case DDERR_INVALIDPARAMS: |
33810 | 256 mp_msg(MSGT_VO, MSGL_ERR, "invalid parameters\n"); |
33808 | 257 break; |
258 case DDERR_NODIRECTDRAWHW: | |
33810 | 259 mp_msg(MSGT_VO, MSGL_ERR, "no directdraw hardware\n"); |
33808 | 260 break; |
33810 | 261 case DDERR_NOEMULATION: |
262 mp_msg(MSGT_VO, MSGL_ERR, "can't emulate\n"); | |
33808 | 263 break; |
33810 | 264 case DDERR_NOFLIPHW: |
265 mp_msg(MSGT_VO, MSGL_ERR, "hardware can't do flip\n"); | |
266 break; | |
33808 | 267 case DDERR_NOOVERLAYHW: |
33810 | 268 mp_msg(MSGT_VO, MSGL_ERR, "hardware can't do overlay\n"); |
33808 | 269 break; |
270 case DDERR_OUTOFMEMORY: | |
33810 | 271 mp_msg(MSGT_VO, MSGL_ERR, "not enough system memory\n"); |
33808 | 272 break; |
33810 | 273 case DDERR_UNSUPPORTEDMODE: |
274 mp_msg(MSGT_VO, MSGL_ERR, "unsupported mode\n"); | |
275 break; | |
33808 | 276 case DDERR_OUTOFVIDEOMEMORY: |
33810 | 277 mp_msg(MSGT_VO, MSGL_ERR, "not enough video memory\n"); |
33808 | 278 break; |
279 default: | |
280 mp_msg(MSGT_VO, MSGL_ERR, "create surface failed with 0x%x\n", ddrval); | |
281 } | |
282 return 1; | |
283 } | |
7537 | 284 g_lpddsBack = g_lpddsOverlay; |
33808 | 285 return 0; |
7537 | 286 } |
287 | |
29212
eda346733b8c
Add missing 'void' to parameterless function declarations.
diego
parents:
28121
diff
changeset
|
288 static uint32_t Directx_CreateBackpuffer(void) |
7537 | 289 { |
33814 | 290 DDSURFACEDESC2 ddsd = { |
291 .dwSize = sizeof(ddsd), | |
292 .ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY, | |
293 .dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT, | |
294 .dwWidth = image_width, | |
295 .dwHeight = image_height, | |
296 }; | |
33808 | 297 //cleanup |
298 if (g_lpddsBack) | |
299 g_lpddsBack->lpVtbl->Release(g_lpddsBack); | |
300 g_lpddsBack = NULL; | |
301 if (g_lpdd->lpVtbl->CreateSurface(g_lpdd, &ddsd, &g_lpddsBack, 0) != DD_OK) { | |
302 mp_msg(MSGT_VO, MSGL_FATAL, "<vo_directx><FATAL ERROR>can't create backpuffer\n"); | |
303 return 1; | |
304 } | |
305 mp_msg(MSGT_VO, MSGL_DBG3, "<vo_directx><INFO>backbuffer created\n"); | |
306 return 0; | |
7537 | 307 } |
308 | |
309 static void uninit(void) | |
310 { | |
33811 | 311 if (g_cc) |
33808 | 312 g_cc->lpVtbl->Release(g_cc); |
313 g_cc = NULL; | |
33811 | 314 if (g_lpddclipper) |
33808 | 315 g_lpddclipper->lpVtbl->Release(g_lpddclipper); |
316 g_lpddclipper = NULL; | |
317 mp_msg(MSGT_VO, MSGL_DBG3, "<vo_directx><INFO>clipper released\n"); | |
33811 | 318 if (g_lpddsBack) |
33808 | 319 g_lpddsBack->lpVtbl->Release(g_lpddsBack); |
320 g_lpddsBack = NULL; | |
321 mp_msg(MSGT_VO, MSGL_DBG3, "<vo_directx><INFO>back surface released\n"); | |
322 if (vo_doublebuffering && !nooverlay) { | |
33811 | 323 if (g_lpddsOverlay) |
33808 | 324 g_lpddsOverlay->lpVtbl->Release(g_lpddsOverlay); |
7537 | 325 g_lpddsOverlay = NULL; |
33808 | 326 mp_msg(MSGT_VO, MSGL_DBG3, "<vo_directx><INFO>overlay surface released\n"); |
327 } | |
33811 | 328 if (g_lpddsPrimary) |
33808 | 329 g_lpddsPrimary->lpVtbl->Release(g_lpddsPrimary); |
7682 | 330 g_lpddsPrimary = NULL; |
33808 | 331 mp_msg(MSGT_VO, MSGL_DBG3, "<vo_directx><INFO>primary released\n"); |
332 if (colorbrush) | |
333 DeleteObject(colorbrush); | |
334 colorbrush = NULL; | |
335 mp_msg(MSGT_VO, MSGL_DBG3, "<vo_directx><INFO>GDI resources deleted\n"); | |
33811 | 336 if (g_lpdd) { |
33808 | 337 if (vidmode) |
338 g_lpdd->lpVtbl->RestoreDisplayMode(g_lpdd); | |
339 g_lpdd->lpVtbl->Release(g_lpdd); | |
340 } | |
341 mp_msg(MSGT_VO, MSGL_DBG3, "<vo_directx><INFO>directdrawobject released\n"); | |
342 FreeLibrary(hddraw_dll); | |
343 hddraw_dll = NULL; | |
344 mp_msg(MSGT_VO, MSGL_DBG3, "<vo_directx><INFO>ddraw.dll freed\n"); | |
345 mp_msg(MSGT_VO, MSGL_DBG3, "<vo_directx><INFO>uninitialized\n"); | |
346 vo_w32_uninit(); | |
7537 | 347 } |
348 | |
33808 | 349 static BOOL WINAPI EnumCallbackEx(GUID FAR *lpGUID, LPSTR lpDriverDescription, LPSTR lpDriverName, LPVOID lpContext, HMONITOR hm) |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29212
diff
changeset
|
350 { |
12005
a8adfcf47f4e
adapter selection patch by Rune <runner at mail.tele.dk> +first attempt to implement 2 window fullscreenswitching by me
faust3
parents:
11542
diff
changeset
|
351 if (!lpGUID) |
33584 | 352 lpDriverDescription = "Primary Display Adapter"; |
33808 | 353 mp_msg(MSGT_VO, MSGL_INFO, "<vo_directx> adapter %d: %s", adapter_count, lpDriverDescription); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29212
diff
changeset
|
354 |
33808 | 355 if (adapter_count == vo_adapter_num) { |
12005
a8adfcf47f4e
adapter selection patch by Rune <runner at mail.tele.dk> +first attempt to implement 2 window fullscreenswitching by me
faust3
parents:
11542
diff
changeset
|
356 if (!lpGUID) |
a8adfcf47f4e
adapter selection patch by Rune <runner at mail.tele.dk> +first attempt to implement 2 window fullscreenswitching by me
faust3
parents:
11542
diff
changeset
|
357 selected_guid_ptr = NULL; |
33808 | 358 else { |
359 selected_guid = *lpGUID; | |
12005
a8adfcf47f4e
adapter selection patch by Rune <runner at mail.tele.dk> +first attempt to implement 2 window fullscreenswitching by me
faust3
parents:
11542
diff
changeset
|
360 selected_guid_ptr = &selected_guid; |
a8adfcf47f4e
adapter selection patch by Rune <runner at mail.tele.dk> +first attempt to implement 2 window fullscreenswitching by me
faust3
parents:
11542
diff
changeset
|
361 } |
14302
9929eafe6be5
win95 fix fix by Rune Petersen <rune.mail-list at mail.tele.dk>
faust3
parents:
14253
diff
changeset
|
362 |
33808 | 363 mp_msg(MSGT_VO, MSGL_INFO, "\t\t<--"); |
12005
a8adfcf47f4e
adapter selection patch by Rune <runner at mail.tele.dk> +first attempt to implement 2 window fullscreenswitching by me
faust3
parents:
11542
diff
changeset
|
364 } |
33808 | 365 mp_msg(MSGT_VO, MSGL_INFO, "\n"); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29212
diff
changeset
|
366 |
12005
a8adfcf47f4e
adapter selection patch by Rune <runner at mail.tele.dk> +first attempt to implement 2 window fullscreenswitching by me
faust3
parents:
11542
diff
changeset
|
367 adapter_count++; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29212
diff
changeset
|
368 |
12005
a8adfcf47f4e
adapter selection patch by Rune <runner at mail.tele.dk> +first attempt to implement 2 window fullscreenswitching by me
faust3
parents:
11542
diff
changeset
|
369 return 1; // list all adapters |
a8adfcf47f4e
adapter selection patch by Rune <runner at mail.tele.dk> +first attempt to implement 2 window fullscreenswitching by me
faust3
parents:
11542
diff
changeset
|
370 } |
a8adfcf47f4e
adapter selection patch by Rune <runner at mail.tele.dk> +first attempt to implement 2 window fullscreenswitching by me
faust3
parents:
11542
diff
changeset
|
371 |
29212
eda346733b8c
Add missing 'void' to parameterless function declarations.
diego
parents:
28121
diff
changeset
|
372 static uint32_t Directx_InitDirectDraw(void) |
7537 | 373 { |
33808 | 374 HRESULT (WINAPI *OurDirectDrawCreateEx)(GUID *, LPVOID *, REFIID, IUnknown FAR *); |
375 DDSURFACEDESC2 ddsd; | |
376 LPDIRECTDRAWENUMERATEEX OurDirectDrawEnumerateEx; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29212
diff
changeset
|
377 |
33808 | 378 adapter_count = 0; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29212
diff
changeset
|
379 |
33808 | 380 mp_msg(MSGT_VO, MSGL_DBG3, "<vo_directx><INFO>Initing DirectDraw\n"); |
7537 | 381 |
33808 | 382 //load direct draw DLL: based on videolans code |
383 hddraw_dll = LoadLibrary("DDRAW.DLL"); | |
33811 | 384 if (!hddraw_dll) { |
33808 | 385 mp_msg(MSGT_VO, MSGL_FATAL, "<vo_directx><FATAL ERROR>failed loading ddraw.dll\n"); |
386 return 1; | |
7537 | 387 } |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29212
diff
changeset
|
388 |
33808 | 389 if (vo_adapter_num) { //display other than default |
390 OurDirectDrawEnumerateEx = (LPDIRECTDRAWENUMERATEEX)GetProcAddress(hddraw_dll, "DirectDrawEnumerateExA"); | |
391 if (!OurDirectDrawEnumerateEx) { | |
392 FreeLibrary(hddraw_dll); | |
12005
a8adfcf47f4e
adapter selection patch by Rune <runner at mail.tele.dk> +first attempt to implement 2 window fullscreenswitching by me
faust3
parents:
11542
diff
changeset
|
393 hddraw_dll = NULL; |
33808 | 394 mp_msg(MSGT_VO, MSGL_FATAL, "<vo_directx><FATAL ERROR>failed geting proc address: DirectDrawEnumerateEx\n"); |
395 mp_msg(MSGT_VO, MSGL_FATAL, "<vo_directx><FATAL ERROR>no directx 7 or higher installed\n"); | |
12005
a8adfcf47f4e
adapter selection patch by Rune <runner at mail.tele.dk> +first attempt to implement 2 window fullscreenswitching by me
faust3
parents:
11542
diff
changeset
|
396 return 1; |
a8adfcf47f4e
adapter selection patch by Rune <runner at mail.tele.dk> +first attempt to implement 2 window fullscreenswitching by me
faust3
parents:
11542
diff
changeset
|
397 } |
a8adfcf47f4e
adapter selection patch by Rune <runner at mail.tele.dk> +first attempt to implement 2 window fullscreenswitching by me
faust3
parents:
11542
diff
changeset
|
398 |
a8adfcf47f4e
adapter selection patch by Rune <runner at mail.tele.dk> +first attempt to implement 2 window fullscreenswitching by me
faust3
parents:
11542
diff
changeset
|
399 // enumerate all display devices attached to the desktop |
33808 | 400 OurDirectDrawEnumerateEx(EnumCallbackEx, NULL, DDENUM_ATTACHEDSECONDARYDEVICES); |
12005
a8adfcf47f4e
adapter selection patch by Rune <runner at mail.tele.dk> +first attempt to implement 2 window fullscreenswitching by me
faust3
parents:
11542
diff
changeset
|
401 |
33808 | 402 if (vo_adapter_num >= adapter_count) |
403 mp_msg(MSGT_VO, MSGL_ERR, "Selected adapter (%d) doesn't exist: Default Display Adapter selected\n", vo_adapter_num); | |
12005
a8adfcf47f4e
adapter selection patch by Rune <runner at mail.tele.dk> +first attempt to implement 2 window fullscreenswitching by me
faust3
parents:
11542
diff
changeset
|
404 } |
a8adfcf47f4e
adapter selection patch by Rune <runner at mail.tele.dk> +first attempt to implement 2 window fullscreenswitching by me
faust3
parents:
11542
diff
changeset
|
405 |
33808 | 406 OurDirectDrawCreateEx = (void *)GetProcAddress(hddraw_dll, "DirectDrawCreateEx"); |
33811 | 407 if (!OurDirectDrawCreateEx) { |
33808 | 408 FreeLibrary(hddraw_dll); |
409 hddraw_dll = NULL; | |
410 mp_msg(MSGT_VO, MSGL_FATAL, "<vo_directx><FATAL ERROR>failed geting proc address: DirectDrawCreateEx\n"); | |
411 return 1; | |
412 } | |
12005
a8adfcf47f4e
adapter selection patch by Rune <runner at mail.tele.dk> +first attempt to implement 2 window fullscreenswitching by me
faust3
parents:
11542
diff
changeset
|
413 |
33808 | 414 // initialize DirectDraw and create directx v7 object |
415 if (OurDirectDrawCreateEx(selected_guid_ptr, (VOID **)&g_lpdd, &IID_IDirectDraw7, NULL) != DD_OK) { | |
416 FreeLibrary(hddraw_dll); | |
7537 | 417 hddraw_dll = NULL; |
33808 | 418 mp_msg(MSGT_VO, MSGL_FATAL, "<vo_directx><FATAL ERROR>can't initialize ddraw\n"); |
419 return 1; | |
7537 | 420 } |
12005
a8adfcf47f4e
adapter selection patch by Rune <runner at mail.tele.dk> +first attempt to implement 2 window fullscreenswitching by me
faust3
parents:
11542
diff
changeset
|
421 |
33808 | 422 //get current screen siz for selected monitor ... |
423 ddsd.dwSize = sizeof(ddsd); | |
424 ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; | |
425 g_lpdd->lpVtbl->GetDisplayMode(g_lpdd, &ddsd); | |
426 if (vo_screenwidth && vo_screenheight) { | |
427 vm_height = vo_screenheight; | |
428 vm_width = vo_screenwidth; | |
429 } else { | |
430 vm_height = ddsd.dwHeight; | |
431 vm_width = ddsd.dwWidth; | |
432 } | |
433 | |
434 if (vo_dbpp) | |
435 vm_bpp = vo_dbpp; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29212
diff
changeset
|
436 else |
33808 | 437 vm_bpp = ddsd.ddpfPixelFormat.dwRGBBitCount; |
12005
a8adfcf47f4e
adapter selection patch by Rune <runner at mail.tele.dk> +first attempt to implement 2 window fullscreenswitching by me
faust3
parents:
11542
diff
changeset
|
438 |
33808 | 439 if (vidmode) { |
440 if (g_lpdd->lpVtbl->SetCooperativeLevel(g_lpdd, vo_w32_window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN) != DD_OK) { | |
441 mp_msg(MSGT_VO, MSGL_FATAL, "<vo_directx><FATAL ERROR>can't set cooperativelevel for exclusive mode\n"); | |
442 return 1; | |
443 } | |
444 /*SetDisplayMode(ddobject,width,height,bpp,refreshrate,aditionalflags)*/ | |
445 if (g_lpdd->lpVtbl->SetDisplayMode(g_lpdd, vm_width, vm_height, vm_bpp, 0, 0) != DD_OK) { | |
446 mp_msg(MSGT_VO, MSGL_FATAL, "<vo_directx><FATAL ERROR>can't set displaymode\n"); | |
12005
a8adfcf47f4e
adapter selection patch by Rune <runner at mail.tele.dk> +first attempt to implement 2 window fullscreenswitching by me
faust3
parents:
11542
diff
changeset
|
447 return 1; |
33808 | 448 } |
449 mp_msg(MSGT_VO, MSGL_V, "<vo_directx><INFO>Initialized adapter %i for %i x %i @ %i \n", vo_adapter_num, vm_width, vm_height, vm_bpp); | |
450 return 0; | |
7537 | 451 } |
33808 | 452 if (g_lpdd->lpVtbl->SetCooperativeLevel(g_lpdd, vo_w32_window, DDSCL_NORMAL) != DD_OK) { // or DDSCL_SETFOCUSWINDOW |
453 mp_msg(MSGT_VO, MSGL_FATAL, "<vo_directx><FATAL ERROR>could not set cooperativelevel for hardwarecheck\n"); | |
454 return 1; | |
455 } | |
456 mp_msg(MSGT_VO, MSGL_DBG3, "<vo_directx><INFO>DirectDraw Initialized\n"); | |
457 return 0; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29212
diff
changeset
|
458 } |
7537 | 459 |
29212
eda346733b8c
Add missing 'void' to parameterless function declarations.
diego
parents:
28121
diff
changeset
|
460 static uint32_t Directx_ManageDisplay(void) |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29212
diff
changeset
|
461 { |
33808 | 462 HRESULT ddrval; |
33814 | 463 DDCAPS capsDrv = { .dwSize = sizeof(capsDrv) }; |
464 DDOVERLAYFX ovfx = { .dwSize = sizeof(ovfx) }; | |
33808 | 465 DWORD dwUpdateFlags = 0; |
466 int width, height; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29212
diff
changeset
|
467 |
33569 | 468 rd.left = vo_dx - xinerama_x; |
469 rd.top = vo_dy - xinerama_y; | |
33808 | 470 width = vo_dwidth; |
471 height = vo_dheight; | |
17853
33ec9a9f4eef
fix for MPlayer taking 100% CPU with -wid on some systems, patch by Martin Fiedler <martin.fiedler at gmx.net>
faust3
parents:
17534
diff
changeset
|
472 |
33569 | 473 aspect(&width, &height, A_WINZOOM); |
474 panscan_calc_windowed(); | |
33808 | 475 width += vo_panscan_x; |
476 height += vo_panscan_y; | |
477 width = FFMIN(width, vo_screenwidth); | |
478 height = FFMIN(height, vo_screenheight); | |
479 rd.left += (vo_dwidth - width) / 2; | |
33569 | 480 rd.top += (vo_dheight - height) / 2; |
481 | |
33808 | 482 rd.right = rd.left + width; |
483 rd.bottom = rd.top + height; | |
12005
a8adfcf47f4e
adapter selection patch by Rune <runner at mail.tele.dk> +first attempt to implement 2 window fullscreenswitching by me
faust3
parents:
11542
diff
changeset
|
484 |
33808 | 485 /*ok, let's workaround some overlay limitations*/ |
486 if (!nooverlay) { | |
487 uint32_t uStretchFactor1000; //minimum stretch | |
488 uint32_t xstretch1000, ystretch1000; | |
33807 | 489 |
490 if (!width || !height) { | |
491 // window is minimized, so we should hide the overlay in case | |
492 // colorkeying is not used or working. | |
493 // In addition trying to set width/height to 0 would crash | |
494 g_lpddsOverlay->lpVtbl->UpdateOverlay(g_lpddsOverlay, NULL, g_lpddsPrimary, NULL, DDOVER_HIDE, NULL); | |
495 return 0; | |
496 } | |
497 | |
33808 | 498 /*get driver capabilities*/ |
499 if (g_lpdd->lpVtbl->GetCaps(g_lpdd, &capsDrv, NULL) != DD_OK) | |
500 return 1; | |
501 /*get minimum stretch, depends on display adaptor and mode (refresh rate!) */ | |
502 uStretchFactor1000 = capsDrv.dwMinOverlayStretch > 1000 ? capsDrv.dwMinOverlayStretch : 1000; | |
503 rd.right = ((width + rd.left) * uStretchFactor1000 + 999) / 1000; | |
504 rd.bottom = (height + rd.top) * uStretchFactor1000 / 1000; | |
12485
d6885dbe1017
more sane order for overlay workarounds, fixed a bug where the mouse would stay hidden on win98
faust3
parents:
12387
diff
changeset
|
505 /*calculate xstretch1000 and ystretch1000*/ |
33808 | 506 xstretch1000 = ((rd.right - rd.left) * 1000) / image_width; |
507 ystretch1000 = ((rd.bottom - rd.top) * 1000) / image_height; | |
508 rs.left = 0; | |
509 rs.right = image_width; | |
510 rs.top = 0; | |
511 rs.bottom = image_height; | |
512 if (rd.left < 0) | |
513 rs.left = (-rd.left * 1000) / xstretch1000; | |
514 if (rd.top < 0) | |
515 rs.top = (-rd.top * 1000) / ystretch1000; | |
516 if (rd.right > vo_screenwidth) | |
517 rs.right = ((vo_screenwidth - rd.left) * 1000) / xstretch1000; | |
518 if (rd.bottom > vo_screenheight) | |
519 rs.bottom = ((vo_screenheight - rd.top) * 1000) / ystretch1000; | |
520 /*do not allow to zoom or shrink if hardware isn't able to do so*/ | |
33810 | 521 if (width < image_width && !(capsDrv.dwFXCaps & DDFXCAPS_OVERLAYSHRINKX)) { |
33808 | 522 if (capsDrv.dwFXCaps & DDFXCAPS_OVERLAYSHRINKXN) |
523 mp_msg(MSGT_VO, MSGL_ERR, "<vo_directx><ERROR>can only shrinkN\n"); | |
524 else | |
525 mp_msg(MSGT_VO, MSGL_ERR, "<vo_directx><ERROR>can't shrink x\n"); | |
526 rd.right = rd.left + image_width; | |
33810 | 527 } else if (width > image_width && !(capsDrv.dwFXCaps & DDFXCAPS_OVERLAYSTRETCHX)) { |
33808 | 528 if (capsDrv.dwFXCaps & DDFXCAPS_OVERLAYSTRETCHXN) |
529 mp_msg(MSGT_VO, MSGL_ERR, "<vo_directx><ERROR>can only stretchN\n"); | |
530 else | |
531 mp_msg(MSGT_VO, MSGL_ERR, "<vo_directx><ERROR>can't stretch x\n"); | |
532 rd.right = rd.left + image_width; | |
533 } | |
33810 | 534 if (height < image_height && !(capsDrv.dwFXCaps & DDFXCAPS_OVERLAYSHRINKY)) { |
33808 | 535 if (capsDrv.dwFXCaps & DDFXCAPS_OVERLAYSHRINKYN) |
536 mp_msg(MSGT_VO, MSGL_ERR, "<vo_directx><ERROR>can only shrinkN\n"); | |
537 else | |
538 mp_msg(MSGT_VO, MSGL_ERR, "<vo_directx><ERROR>can't shrink y\n"); | |
539 rd.bottom = rd.top + image_height; | |
33810 | 540 } else if (height > image_height && !(capsDrv.dwFXCaps & DDFXCAPS_OVERLAYSTRETCHY)) { |
33808 | 541 if (capsDrv.dwFXCaps & DDFXCAPS_OVERLAYSTRETCHYN) |
542 mp_msg(MSGT_VO, MSGL_ERR, "<vo_directx><ERROR>can only stretchN\n"); | |
543 else | |
544 mp_msg(MSGT_VO, MSGL_ERR, "<vo_directx><ERROR>can't stretch y\n"); | |
545 rd.bottom = rd.top + image_height; | |
546 } | |
547 /*the last thing to check are alignment restrictions | |
548 * these expressions (x & -y) just do alignment by dropping low order bits... | |
549 * so to round up, we add first, then truncate*/ | |
550 if ((capsDrv.dwCaps & DDCAPS_ALIGNBOUNDARYSRC) && capsDrv.dwAlignBoundarySrc) | |
551 rs.left = (rs.left + capsDrv.dwAlignBoundarySrc / 2) & - (signed)(capsDrv.dwAlignBoundarySrc); | |
552 if ((capsDrv.dwCaps & DDCAPS_ALIGNSIZESRC) && capsDrv.dwAlignSizeSrc) | |
553 rs.right = rs.left + ((rs.right - rs.left + capsDrv.dwAlignSizeSrc / 2) & - (signed)(capsDrv.dwAlignSizeSrc)); | |
554 if ((capsDrv.dwCaps & DDCAPS_ALIGNBOUNDARYDEST) && capsDrv.dwAlignBoundaryDest) | |
555 rd.left = (rd.left + capsDrv.dwAlignBoundaryDest / 2) & - (signed)(capsDrv.dwAlignBoundaryDest); | |
556 if ((capsDrv.dwCaps & DDCAPS_ALIGNSIZEDEST) && capsDrv.dwAlignSizeDest) | |
557 rd.right = rd.left + ((rd.right - rd.left) & - (signed)(capsDrv.dwAlignSizeDest)); | |
558 /*create an overlay FX structure to specify a destination color key*/ | |
559 if (vo_fs || vidmode) { | |
560 ovfx.dckDestColorkey.dwColorSpaceLowValue = 0; | |
8667 | 561 ovfx.dckDestColorkey.dwColorSpaceHighValue = 0; |
33808 | 562 } else { |
563 ovfx.dckDestColorkey.dwColorSpaceLowValue = destcolorkey; | |
8667 | 564 ovfx.dckDestColorkey.dwColorSpaceHighValue = destcolorkey; |
33808 | 565 } |
22289
780caed72ac7
cosmetics: typo fixes, usefuLL --> useful and aswell --> as well
diego
parents:
20394
diff
changeset
|
566 // set the flags we'll send to UpdateOverlay //DDOVER_AUTOFLIP|DDOVERFX_MIRRORLEFTRIGHT|DDOVERFX_MIRRORUPDOWN could be useful?; |
8667 | 567 dwUpdateFlags = DDOVER_SHOW | DDOVER_DDFX; |
568 /*if hardware can't do colorkeying set the window on top*/ | |
33808 | 569 if (capsDrv.dwCKeyCaps & DDCKEYCAPS_DESTOVERLAY) |
570 dwUpdateFlags |= DDOVER_KEYDESTOVERRIDE; | |
571 else if (!tmp_image) | |
572 vo_ontop = 1; | |
573 } else { | |
33569 | 574 g_lpddclipper->lpVtbl->SetHWnd(g_lpddclipper, 0, vo_w32_window); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29212
diff
changeset
|
575 } |
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29212
diff
changeset
|
576 |
12387
5c2e728f5a00
keepaspect support, tryed to clean up DirectxManageDisplay a bit, enabled UYVY support and fixed bugs where switching to fullscreen would keep the console window on top and where the initial window position is wrongly calculated
faust3
parents:
12192
diff
changeset
|
577 /*make sure the overlay is inside the screen*/ |
33813 | 578 rd.top = FFMAX(rd.top, 0); |
579 rd.left = FFMAX(rd.left, 0); | |
580 rd.bottom = FFMIN(rd.bottom, vo_screenheight); | |
581 rd.right = FFMIN(rd.right, vo_screenwidth); | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29212
diff
changeset
|
582 |
33808 | 583 /*for nonoverlay mode we are finished, for overlay mode we have to display the overlay first*/ |
584 if (nooverlay) | |
585 return 0; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29212
diff
changeset
|
586 |
12387
5c2e728f5a00
keepaspect support, tryed to clean up DirectxManageDisplay a bit, enabled UYVY support and fixed bugs where switching to fullscreen would keep the console window on top and where the initial window position is wrongly calculated
faust3
parents:
12192
diff
changeset
|
587 // printf("overlay: %i %i %ix%i\n",rd.left,rd.top,rd.right - rd.left,rd.bottom - rd.top); |
33808 | 588 ddrval = g_lpddsOverlay->lpVtbl->UpdateOverlay(g_lpddsOverlay, &rs, g_lpddsPrimary, &rd, dwUpdateFlags, &ovfx); |
589 if (FAILED(ddrval)) { | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29212
diff
changeset
|
590 // one cause might be the driver lied about minimum stretch |
7537 | 591 // we should try upping the destination size a bit, or |
592 // perhaps shrinking the source size | |
33808 | 593 mp_msg(MSGT_VO, MSGL_ERR, "<vo_directx><ERROR>UpdateOverlay failed\n"); |
594 mp_msg(MSGT_VO, MSGL_ERR, "<vo_directx><ERROR>Overlay:x1:%i,y1:%i,x2:%i,y2:%i,w:%i,h:%i\n", rd.left, rd.top, rd.right, rd.bottom, rd.right - rd.left, rd.bottom - rd.top); | |
595 mp_msg(MSGT_VO, MSGL_ERR, "<vo_directx><ERROR>"); | |
596 switch (ddrval) { | |
597 case DDERR_NOSTRETCHHW: | |
33810 | 598 mp_msg(MSGT_VO, MSGL_ERR, "hardware can't stretch: try to size the window back\n"); |
33808 | 599 break; |
600 case DDERR_INVALIDRECT: | |
33810 | 601 mp_msg(MSGT_VO, MSGL_ERR, "invalid rectangle\n"); |
33808 | 602 break; |
603 case DDERR_INVALIDPARAMS: | |
33810 | 604 mp_msg(MSGT_VO, MSGL_ERR, "invalid parameters\n"); |
33808 | 605 break; |
606 case DDERR_HEIGHTALIGN: | |
33810 | 607 mp_msg(MSGT_VO, MSGL_ERR, "height align\n"); |
33808 | 608 break; |
609 case DDERR_XALIGN: | |
33810 | 610 mp_msg(MSGT_VO, MSGL_ERR, "x align\n"); |
33808 | 611 break; |
612 case DDERR_UNSUPPORTED: | |
33810 | 613 mp_msg(MSGT_VO, MSGL_ERR, "unsupported\n"); |
33808 | 614 break; |
615 case DDERR_INVALIDSURFACETYPE: | |
33810 | 616 mp_msg(MSGT_VO, MSGL_ERR, "invalid surfacetype\n"); |
33808 | 617 break; |
618 case DDERR_INVALIDOBJECT: | |
33810 | 619 mp_msg(MSGT_VO, MSGL_ERR, "invalid object\n"); |
33808 | 620 break; |
621 case DDERR_SURFACELOST: | |
622 mp_msg(MSGT_VO, MSGL_ERR, "surfaces lost\n"); | |
623 g_lpddsOverlay->lpVtbl->Restore(g_lpddsOverlay); //restore and try again | |
624 g_lpddsPrimary->lpVtbl->Restore(g_lpddsPrimary); | |
625 ddrval = g_lpddsOverlay->lpVtbl->UpdateOverlay(g_lpddsOverlay, &rs, g_lpddsPrimary, &rd, dwUpdateFlags, &ovfx); | |
626 if (ddrval != DD_OK) | |
627 mp_msg(MSGT_VO, MSGL_FATAL, "<vo_directx><FATAL ERROR>UpdateOverlay failed again\n"); | |
628 break; | |
629 default: | |
630 mp_msg(MSGT_VO, MSGL_ERR, " 0x%x\n", ddrval); | |
631 } | |
632 /*ok we can't do anything about it -> hide overlay*/ | |
633 if (ddrval != DD_OK) { | |
634 ddrval = g_lpddsOverlay->lpVtbl->UpdateOverlay(g_lpddsOverlay, NULL, g_lpddsPrimary, NULL, DDOVER_HIDE, NULL); | |
7537 | 635 return 1; |
33808 | 636 } |
637 } | |
7537 | 638 return 0; |
639 } | |
640 | |
33590
b213f28fc17a
Move check_events function to avoid forward declaration.
reimar
parents:
33589
diff
changeset
|
641 static void check_events(void) |
b213f28fc17a
Move check_events function to avoid forward declaration.
reimar
parents:
33589
diff
changeset
|
642 { |
b213f28fc17a
Move check_events function to avoid forward declaration.
reimar
parents:
33589
diff
changeset
|
643 int evt = vo_w32_check_events(); |
b213f28fc17a
Move check_events function to avoid forward declaration.
reimar
parents:
33589
diff
changeset
|
644 if (evt & (VO_EVENT_RESIZE | VO_EVENT_MOVE)) |
b213f28fc17a
Move check_events function to avoid forward declaration.
reimar
parents:
33589
diff
changeset
|
645 Directx_ManageDisplay(); |
b213f28fc17a
Move check_events function to avoid forward declaration.
reimar
parents:
33589
diff
changeset
|
646 if (evt & (VO_EVENT_RESIZE | VO_EVENT_MOVE | VO_EVENT_EXPOSE)) { |
b213f28fc17a
Move check_events function to avoid forward declaration.
reimar
parents:
33589
diff
changeset
|
647 HDC dc = vo_w32_get_dc(vo_w32_window); |
b213f28fc17a
Move check_events function to avoid forward declaration.
reimar
parents:
33589
diff
changeset
|
648 RECT r; |
b213f28fc17a
Move check_events function to avoid forward declaration.
reimar
parents:
33589
diff
changeset
|
649 GetClientRect(vo_w32_window, &r); |
b213f28fc17a
Move check_events function to avoid forward declaration.
reimar
parents:
33589
diff
changeset
|
650 FillRect(dc, &r, vo_fs || vidmode ? blackbrush : colorbrush); |
b213f28fc17a
Move check_events function to avoid forward declaration.
reimar
parents:
33589
diff
changeset
|
651 vo_w32_release_dc(vo_w32_window, dc); |
b213f28fc17a
Move check_events function to avoid forward declaration.
reimar
parents:
33589
diff
changeset
|
652 } |
b213f28fc17a
Move check_events function to avoid forward declaration.
reimar
parents:
33589
diff
changeset
|
653 } |
b213f28fc17a
Move check_events function to avoid forward declaration.
reimar
parents:
33589
diff
changeset
|
654 |
7537 | 655 //find out supported overlay pixelformats |
29212
eda346733b8c
Add missing 'void' to parameterless function declarations.
diego
parents:
28121
diff
changeset
|
656 static uint32_t Directx_CheckOverlayPixelformats(void) |
7537 | 657 { |
33814 | 658 DDCAPS capsDrv = { .dwSize = sizeof(capsDrv) }; |
33808 | 659 HRESULT ddrval; |
33814 | 660 DDSURFACEDESC2 ddsdOverlay = { |
661 .dwSize = sizeof(ddsdOverlay), | |
662 .ddsCaps.dwCaps = DDSCAPS_OVERLAY | DDSCAPS_VIDEOMEMORY, | |
663 .dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT, | |
664 .dwWidth = 300, | |
665 .dwHeight = 280, | |
666 .dwBackBufferCount = 0, | |
667 }; | |
33808 | 668 uint32_t i; |
669 uint32_t formatcount = 0; | |
670 //get driver caps to determine overlay support | |
671 ddrval = g_lpdd->lpVtbl->GetCaps(g_lpdd, &capsDrv, NULL); | |
672 if (FAILED(ddrval)) { | |
673 mp_msg(MSGT_VO, MSGL_ERR, "<vo_directx><ERROR>failed getting ddrawcaps\n"); | |
674 return 1; | |
675 } | |
676 if (!(capsDrv.dwCaps & DDCAPS_OVERLAY)) { | |
677 mp_msg(MSGT_VO, MSGL_ERR, "<vo_directx><ERROR>Your card doesn't support overlay\n"); | |
678 return 1; | |
679 } | |
680 mp_msg(MSGT_VO, MSGL_V, "<vo_directx><INFO>testing supported overlay pixelformats\n"); | |
7537 | 681 //it is not possible to query for pixel formats supported by the |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29212
diff
changeset
|
682 //overlay hardware: try out various formats till one works |
7537 | 683 //try to create an overlay surface using one of the pixel formats in our global list |
33808 | 684 i = 0; |
685 do { | |
686 ddsdOverlay.ddpfPixelFormat = g_ddpf[i].g_ddpfOverlay; | |
687 ddrval = g_lpdd->lpVtbl->CreateSurface(g_lpdd, &ddsdOverlay, &g_lpddsOverlay, NULL); | |
688 if (ddrval == DD_OK) { | |
689 mp_msg(MSGT_VO, MSGL_V, "<vo_directx><FORMAT OVERLAY>%i %s supported\n", i, g_ddpf[i].img_format_name); | |
33815
4d75b3bf9561
Split out read/write part from data struct and make read-only
reimar
parents:
33814
diff
changeset
|
690 drv_caps[i] = VFCAP_CSP_SUPPORTED | VFCAP_OSD | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_HWSCALE_UP; |
33808 | 691 formatcount++; |
692 } else | |
693 mp_msg(MSGT_VO, MSGL_V, "<vo_directx><FORMAT OVERLAY>%i %s not supported\n", i, g_ddpf[i].img_format_name); | |
33811 | 694 if (g_lpddsOverlay) { |
33808 | 695 g_lpddsOverlay->lpVtbl->Release(g_lpddsOverlay); |
696 g_lpddsOverlay = NULL; | |
697 } | |
698 } while (++i < NUM_FORMATS); | |
699 mp_msg(MSGT_VO, MSGL_V, "<vo_directx><INFO>Your card supports %i of %i overlayformats\n", formatcount, NUM_FORMATS); | |
700 if (formatcount == 0) { | |
701 mp_msg(MSGT_VO, MSGL_V, "<vo_directx><WARN>Your card supports overlay, but we couldn't create one\n"); | |
702 mp_msg(MSGT_VO, MSGL_V, "<vo_directx><INFO>This can have the following reasons:\n"); | |
703 mp_msg(MSGT_VO, MSGL_V, "<vo_directx><INFO>- you are already using an overlay with another app\n"); | |
704 mp_msg(MSGT_VO, MSGL_V, "<vo_directx><INFO>- you don't have enough videomemory\n"); | |
705 mp_msg(MSGT_VO, MSGL_V, "<vo_directx><INFO>- vo_directx doesn't support the cards overlay pixelformat\n"); | |
706 return 1; | |
707 } | |
708 if (capsDrv.dwFXCaps & DDFXCAPS_OVERLAYMIRRORLEFTRIGHT) | |
709 mp_msg(MSGT_VO, MSGL_V, "<vo_directx><INFO>can mirror left right\n"); //I don't have hardware which | |
710 if (capsDrv.dwFXCaps & DDFXCAPS_OVERLAYMIRRORUPDOWN) | |
711 mp_msg(MSGT_VO, MSGL_V, "<vo_directx><INFO>can mirror up down\n"); //supports those send me one and I'll implement ;) | |
712 return 0; | |
7537 | 713 } |
714 | |
715 //find out the Pixelformat of the Primary Surface | |
29212
eda346733b8c
Add missing 'void' to parameterless function declarations.
diego
parents:
28121
diff
changeset
|
716 static uint32_t Directx_CheckPrimaryPixelformat(void) |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29212
diff
changeset
|
717 { |
33808 | 718 uint32_t i = 0; |
7537 | 719 uint32_t formatcount = 0; |
33808 | 720 DDPIXELFORMAT ddpf; |
721 DDSURFACEDESC2 ddsd; | |
722 HDC hdc; | |
723 HRESULT hres; | |
724 COLORREF rgbT = RGB(0, 0, 0); | |
725 mp_msg(MSGT_VO, MSGL_V, "<vo_directx><INFO>checking primary surface\n"); | |
726 memset(&ddpf, 0, sizeof(DDPIXELFORMAT)); | |
727 ddpf.dwSize = sizeof(DDPIXELFORMAT); | |
7537 | 728 //we have to create a primary surface first |
33808 | 729 if (Directx_CreatePrimarySurface() != 0) |
730 return 1; | |
731 if (g_lpddsPrimary->lpVtbl->GetPixelFormat(g_lpddsPrimary, &ddpf) != DD_OK) { | |
732 mp_msg(MSGT_VO, MSGL_FATAL, "<vo_directx><FATAL ERROR>can't get pixelformat\n"); | |
733 return 1; | |
734 } | |
735 while (i < NUM_FORMATS) { | |
736 if (g_ddpf[i].g_ddpfOverlay.dwRGBBitCount == ddpf.dwRGBBitCount) { | |
737 if (g_ddpf[i].g_ddpfOverlay.dwRBitMask == ddpf.dwRBitMask) { | |
738 mp_msg(MSGT_VO, MSGL_V, "<vo_directx><FORMAT PRIMARY>%i %s supported\n", i, g_ddpf[i].img_format_name); | |
33815
4d75b3bf9561
Split out read/write part from data struct and make read-only
reimar
parents:
33814
diff
changeset
|
739 drv_caps[i] = VFCAP_CSP_SUPPORTED | VFCAP_OSD; |
33808 | 740 formatcount++; |
741 primary_image_format = g_ddpf[i].img_format; | |
742 } | |
743 } | |
744 i++; | |
7537 | 745 } |
7624
b1a3b979c630
This patch hopefully fixes colorkeying and a segfault in exclusive mode
arpi
parents:
7537
diff
changeset
|
746 //get the colorkey for overlay mode |
33808 | 747 destcolorkey = CLR_INVALID; |
748 if (windowcolor != CLR_INVALID && g_lpddsPrimary->lpVtbl->GetDC(g_lpddsPrimary, &hdc) == DD_OK) { | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29212
diff
changeset
|
749 rgbT = GetPixel(hdc, 0, 0); |
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29212
diff
changeset
|
750 SetPixel(hdc, 0, 0, windowcolor); |
33808 | 751 g_lpddsPrimary->lpVtbl->ReleaseDC(g_lpddsPrimary, hdc); |
7624
b1a3b979c630
This patch hopefully fixes colorkeying and a segfault in exclusive mode
arpi
parents:
7537
diff
changeset
|
752 } |
b1a3b979c630
This patch hopefully fixes colorkeying and a segfault in exclusive mode
arpi
parents:
7537
diff
changeset
|
753 // read back the converted color |
b1a3b979c630
This patch hopefully fixes colorkeying and a segfault in exclusive mode
arpi
parents:
7537
diff
changeset
|
754 ddsd.dwSize = sizeof(ddsd); |
33808 | 755 while ((hres = g_lpddsPrimary->lpVtbl->Lock(g_lpddsPrimary, NULL, &ddsd, 0, NULL)) == DDERR_WASSTILLDRAWING) |
7624
b1a3b979c630
This patch hopefully fixes colorkeying and a segfault in exclusive mode
arpi
parents:
7537
diff
changeset
|
756 ; |
33808 | 757 if (hres == DD_OK) { |
758 destcolorkey = *(DWORD *)ddsd.lpSurface; | |
7624
b1a3b979c630
This patch hopefully fixes colorkeying and a segfault in exclusive mode
arpi
parents:
7537
diff
changeset
|
759 if (ddsd.ddpfPixelFormat.dwRGBBitCount < 32) |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29212
diff
changeset
|
760 destcolorkey &= (1 << ddsd.ddpfPixelFormat.dwRGBBitCount) - 1; |
33808 | 761 g_lpddsPrimary->lpVtbl->Unlock(g_lpddsPrimary, NULL); |
7624
b1a3b979c630
This patch hopefully fixes colorkeying and a segfault in exclusive mode
arpi
parents:
7537
diff
changeset
|
762 } |
33808 | 763 if (windowcolor != CLR_INVALID && g_lpddsPrimary->lpVtbl->GetDC(g_lpddsPrimary, &hdc) == DD_OK) { |
7624
b1a3b979c630
This patch hopefully fixes colorkeying and a segfault in exclusive mode
arpi
parents:
7537
diff
changeset
|
764 SetPixel(hdc, 0, 0, rgbT); |
33808 | 765 g_lpddsPrimary->lpVtbl->ReleaseDC(g_lpddsPrimary, hdc); |
7624
b1a3b979c630
This patch hopefully fixes colorkeying and a segfault in exclusive mode
arpi
parents:
7537
diff
changeset
|
766 } |
33808 | 767 //release primary |
768 g_lpddsPrimary->lpVtbl->Release(g_lpddsPrimary); | |
769 g_lpddsPrimary = NULL; | |
770 if (formatcount == 0) { | |
771 mp_msg(MSGT_VO, MSGL_FATAL, "<vo_directx><FATAL ERROR>Unknown Pixelformat\n"); | |
772 return 1; | |
773 } | |
774 return 0; | |
7537 | 775 } |
776 | |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15690
diff
changeset
|
777 static int preinit(const char *arg) |
7537 | 778 { |
33808 | 779 if (arg) { |
780 if (strstr(arg, "noaccel")) { | |
781 mp_msg(MSGT_VO, MSGL_V, "<vo_directx><INFO>disabled overlay\n"); | |
782 nooverlay = 1; | |
783 } | |
784 } | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29212
diff
changeset
|
785 |
14205 | 786 windowcolor = vo_colorkey; |
33808 | 787 colorbrush = CreateSolidBrush(windowcolor); |
788 blackbrush = (HBRUSH)GetStockObject(BLACK_BRUSH); | |
789 if (!vo_w32_init()) | |
790 return 1; | |
791 if (!vo_w32_config(100, 100, VOFLAG_HIDDEN)) | |
792 return 1; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29212
diff
changeset
|
793 |
33808 | 794 if (Directx_InitDirectDraw() != 0) |
795 return 1; //init DirectDraw | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29212
diff
changeset
|
796 |
33808 | 797 if (Directx_CheckPrimaryPixelformat() != 0) |
798 return 1; | |
799 if (!nooverlay && Directx_CheckOverlayPixelformats() == 0) { //check for supported hardware | |
800 mp_msg(MSGT_VO, MSGL_V, "<vo_directx><INFO>hardware supports overlay\n"); | |
801 nooverlay = 0; | |
802 } else { //if we can't have overlay we create a backpuffer with the same imageformat as the primary surface | |
803 mp_msg(MSGT_VO, MSGL_V, "<vo_directx><INFO>using backpuffer\n"); | |
804 nooverlay = 1; | |
805 } | |
806 mp_msg(MSGT_VO, MSGL_DBG3, "<vo_directx><INFO>preinit succesfully finished\n"); | |
807 return 0; | |
7537 | 808 } |
809 | |
33808 | 810 static int draw_slice(uint8_t *src[], int stride[], int w, int h, int x, int y) |
7537 | 811 { |
33808 | 812 uint8_t *s; |
7537 | 813 uint8_t *d; |
33808 | 814 uint32_t uvstride = dstride / 2; |
815 // copy Y | |
816 d = image + dstride * y + x; | |
817 s = src[0]; | |
818 mem2agpcpy_pic(d, s, w, h, dstride, stride[0]); | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29212
diff
changeset
|
819 |
33808 | 820 w /= 2; |
821 h /= 2; | |
822 x /= 2; | |
823 y /= 2; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29212
diff
changeset
|
824 |
33808 | 825 // copy U |
826 d = image + dstride * image_height + uvstride * y + x; | |
827 if (image_format == IMGFMT_YV12) | |
828 s = src[2]; | |
829 else | |
830 s = src[1]; | |
831 mem2agpcpy_pic(d, s, w, h, uvstride, stride[1]); | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29212
diff
changeset
|
832 |
33808 | 833 // copy V |
834 d = image + dstride * image_height + uvstride * (image_height / 2) + uvstride * y + x; | |
835 if (image_format == IMGFMT_YV12) | |
836 s = src[1]; | |
837 else | |
838 s = src[2]; | |
839 mem2agpcpy_pic(d, s, w, h, uvstride, stride[2]); | |
7537 | 840 return 0; |
841 } | |
842 | |
843 static void flip_page(void) | |
844 { | |
33808 | 845 HRESULT dxresult; |
846 g_lpddsBack->lpVtbl->Unlock(g_lpddsBack, NULL); | |
847 if (vo_doublebuffering) { | |
848 // flip to the next image in the sequence | |
849 dxresult = g_lpddsOverlay->lpVtbl->Flip(g_lpddsOverlay, NULL, DDFLIP_WAIT); | |
850 if (dxresult == DDERR_SURFACELOST) { | |
851 mp_msg(MSGT_VO, MSGL_ERR, "<vo_directx><ERROR><vo_directx><INFO>Restoring Surface\n"); | |
852 g_lpddsBack->lpVtbl->Restore(g_lpddsBack); | |
853 // restore overlay and primary before calling | |
854 // Directx_ManageDisplay() to avoid error messages | |
855 g_lpddsOverlay->lpVtbl->Restore(g_lpddsOverlay); | |
856 g_lpddsPrimary->lpVtbl->Restore(g_lpddsPrimary); | |
857 // update overlay in case we return from screensaver | |
858 Directx_ManageDisplay(); | |
859 dxresult = g_lpddsOverlay->lpVtbl->Flip(g_lpddsOverlay, NULL, DDFLIP_WAIT); | |
860 } | |
861 if (dxresult != DD_OK) | |
862 mp_msg(MSGT_VO, MSGL_ERR, "<vo_directx><ERROR>can't flip page\n"); | |
7537 | 863 } |
33808 | 864 if (nooverlay) { |
865 DDBLTFX ddbltfx; | |
7537 | 866 // ask for the "NOTEARING" option |
33808 | 867 memset(&ddbltfx, 0, sizeof(DDBLTFX)); |
7537 | 868 ddbltfx.dwSize = sizeof(DDBLTFX); |
869 ddbltfx.dwDDFX = DDBLTFX_NOTEARING; | |
870 g_lpddsPrimary->lpVtbl->Blt(g_lpddsPrimary, &rd, g_lpddsBack, NULL, DDBLT_WAIT, &ddbltfx); | |
33808 | 871 } |
872 if (g_lpddsBack->lpVtbl->Lock(g_lpddsBack, NULL, &ddsdsf, DDLOCK_NOSYSLOCK | DDLOCK_WAIT, NULL) == DD_OK) { | |
873 if (vo_directrendering && (dstride != ddsdsf.lPitch)) { | |
874 mp_msg(MSGT_VO, MSGL_WARN, "<vo_directx><WARN>stride changed !!!! disabling direct rendering\n"); | |
875 vo_directrendering = 0; | |
876 } | |
877 free(tmp_image); | |
878 tmp_image = NULL; | |
879 dstride = ddsdsf.lPitch; | |
880 image = ddsdsf.lpSurface; | |
881 } else if (!tmp_image) { | |
882 mp_msg(MSGT_VO, MSGL_WARN, "<vo_directx><WARN>Locking the surface failed, rendering to a hidden surface!\n"); | |
883 tmp_image = image = calloc(1, image_height * dstride * 2); | |
884 } | |
7537 | 885 } |
886 | |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15690
diff
changeset
|
887 static int draw_frame(uint8_t *src[]) |
7537 | 888 { |
33808 | 889 fast_memcpy(image, *src, dstride * image_height); |
890 return 0; | |
7537 | 891 } |
892 | |
893 static uint32_t get_image(mp_image_t *mpi) | |
894 { | |
33808 | 895 if (mpi->flags & MP_IMGFLAG_READABLE) { |
896 mp_msg(MSGT_VO, MSGL_V, "<vo_directx><ERROR>slow video ram\n"); | |
897 return VO_FALSE; | |
898 } | |
899 if (mpi->type == MP_IMGTYPE_STATIC) { | |
900 mp_msg(MSGT_VO, MSGL_V, "<vo_directx><ERROR>not static\n"); | |
901 return VO_FALSE; | |
902 } | |
33810 | 903 if (mpi->width == dstride || (mpi->flags & (MP_IMGFLAG_ACCEPT_STRIDE | MP_IMGFLAG_ACCEPT_WIDTH))) { |
33808 | 904 if (mpi->flags & MP_IMGFLAG_PLANAR) { |
905 if (image_format == IMGFMT_YV12) { | |
906 mpi->planes[2] = image + dstride * image_height; | |
907 mpi->planes[1] = image + dstride * image_height + dstride * image_height / 4; | |
908 mpi->stride[1] = mpi->stride[2] = dstride / 2; | |
909 } else if (image_format == IMGFMT_IYUV || image_format == IMGFMT_I420) { | |
910 mpi->planes[1] = image + dstride * image_height; | |
911 mpi->planes[2] = image + dstride * image_height + dstride * image_height / 4; | |
912 mpi->stride[1] = mpi->stride[2] = dstride / 2; | |
913 } else if (image_format == IMGFMT_YVU9) { | |
914 mpi->planes[2] = image + dstride * image_height; | |
915 mpi->planes[1] = image + dstride * image_height + dstride * image_height / 16; | |
916 mpi->stride[1] = mpi->stride[2] = dstride / 4; | |
917 } | |
918 } | |
919 mpi->planes[0] = image; | |
920 mpi->stride[0] = dstride; | |
921 mpi->width = image_width; | |
922 mpi->height = image_height; | |
923 mpi->flags |= MP_IMGFLAG_DIRECT; | |
7537 | 924 mp_msg(MSGT_VO, MSGL_DBG3, "<vo_directx><INFO>Direct Rendering ENABLED\n"); |
925 return VO_TRUE; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29212
diff
changeset
|
926 } |
7537 | 927 return VO_FALSE; |
928 } | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29212
diff
changeset
|
929 |
33808 | 930 static uint32_t put_image(mp_image_t *mpi) |
931 { | |
932 uint8_t *d; | |
933 uint8_t *s; | |
7537 | 934 uint32_t x = mpi->x; |
33808 | 935 uint32_t y = mpi->y; |
936 uint32_t w = mpi->w; | |
937 uint32_t h = mpi->h; | |
14207 | 938 |
33808 | 939 if ((mpi->flags & MP_IMGFLAG_DIRECT) || (mpi->flags & MP_IMGFLAG_DRAW_CALLBACK)) { |
940 mp_msg(MSGT_VO, MSGL_DBG3, "<vo_directx><INFO>put_image: nothing to do: drawslices\n"); | |
941 return VO_TRUE; | |
7537 | 942 } |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29212
diff
changeset
|
943 |
33808 | 944 if (mpi->flags & MP_IMGFLAG_PLANAR) { |
945 if (image_format != IMGFMT_YVU9) | |
946 draw_slice(mpi->planes, mpi->stride, mpi->w, mpi->h, 0, 0); | |
947 else { | |
948 // copy Y | |
949 d = image + dstride * y + x; | |
950 s = mpi->planes[0]; | |
951 mem2agpcpy_pic(d, s, w, h, dstride, mpi->stride[0]); | |
952 w /= 4; | |
953 h /= 4; | |
954 x /= 4; | |
955 y /= 4; | |
956 // copy V | |
957 d = image + dstride * image_height + dstride * y / 4 + x; | |
958 s = mpi->planes[2]; | |
959 mem2agpcpy_pic(d, s, w, h, dstride / 4, mpi->stride[1]); | |
960 // copy U | |
961 d = image + dstride * image_height + dstride * image_height / 16 + dstride / 4 * y + x; | |
962 s = mpi->planes[1]; | |
963 mem2agpcpy_pic(d, s, w, h, dstride / 4, mpi->stride[2]); | |
964 } | |
965 } else { //packed | |
966 mem2agpcpy_pic(image, mpi->planes[0], w * (mpi->bpp / 8), h, dstride, mpi->stride[0]); | |
967 } | |
968 return VO_TRUE; | |
7537 | 969 } |
970 | |
33808 | 971 static int config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t options, char *title, uint32_t format) |
7537 | 972 { |
33808 | 973 image_format = format; |
974 image_width = width; | |
975 image_height = height; | |
976 if (format != primary_image_format) | |
977 nooverlay = 0; | |
15428
3d26652b8d29
multifile leak fixes by Timothy Lee <timothy.lee at siriushk.com> +some more -fixed-vo fixes
faust3
parents:
14692
diff
changeset
|
978 |
3d26652b8d29
multifile leak fixes by Timothy Lee <timothy.lee at siriushk.com> +some more -fixed-vo fixes
faust3
parents:
14692
diff
changeset
|
979 /*release all directx objects*/ |
33811 | 980 if (g_cc) |
33808 | 981 g_cc->lpVtbl->Release(g_cc); |
982 g_cc = NULL; | |
983 if (g_lpddclipper) | |
984 g_lpddclipper->lpVtbl->Release(g_lpddclipper); | |
985 g_lpddclipper = NULL; | |
33811 | 986 if (g_lpddsBack) |
33808 | 987 g_lpddsBack->lpVtbl->Release(g_lpddsBack); |
15428
3d26652b8d29
multifile leak fixes by Timothy Lee <timothy.lee at siriushk.com> +some more -fixed-vo fixes
faust3
parents:
14692
diff
changeset
|
988 g_lpddsBack = NULL; |
33808 | 989 if (vo_doublebuffering) |
33811 | 990 if (g_lpddsOverlay) |
33808 | 991 g_lpddsOverlay->lpVtbl->Release(g_lpddsOverlay); |
15428
3d26652b8d29
multifile leak fixes by Timothy Lee <timothy.lee at siriushk.com> +some more -fixed-vo fixes
faust3
parents:
14692
diff
changeset
|
992 g_lpddsOverlay = NULL; |
33811 | 993 if (g_lpddsPrimary) |
33808 | 994 g_lpddsPrimary->lpVtbl->Release(g_lpddsPrimary); |
15428
3d26652b8d29
multifile leak fixes by Timothy Lee <timothy.lee at siriushk.com> +some more -fixed-vo fixes
faust3
parents:
14692
diff
changeset
|
995 g_lpddsPrimary = NULL; |
33808 | 996 mp_msg(MSGT_VO, MSGL_DBG3, "<vo_directx><INFO>overlay surfaces released\n"); |
15428
3d26652b8d29
multifile leak fixes by Timothy Lee <timothy.lee at siriushk.com> +some more -fixed-vo fixes
faust3
parents:
14692
diff
changeset
|
997 |
33808 | 998 if (!vo_w32_config(d_width, d_height, options)) |
999 return 1; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29212
diff
changeset
|
1000 |
33808 | 1001 if (WinID == -1) |
1002 SetWindowText(vo_w32_window, title); | |
12005
a8adfcf47f4e
adapter selection patch by Rune <runner at mail.tele.dk> +first attempt to implement 2 window fullscreenswitching by me
faust3
parents:
11542
diff
changeset
|
1003 |
33808 | 1004 /*create the surfaces*/ |
1005 if (Directx_CreatePrimarySurface()) | |
1006 return 1; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29212
diff
changeset
|
1007 |
33808 | 1008 //create palette for 256 color mode |
1009 if (image_format == IMGFMT_BGR8) { | |
1010 LPDIRECTDRAWPALETTE ddpalette = NULL; | |
1011 LPPALETTEENTRY palette = calloc(256, sizeof(*palette)); | |
1012 int i; | |
1013 for (i = 0; i < 256; i++) { | |
1014 palette[i].peRed = ((i >> 5) & 0x07) * 255 / 7; | |
1015 palette[i].peGreen = ((i >> 2) & 0x07) * 255 / 7; | |
1016 palette[i].peBlue = ((i >> 0) & 0x03) * 255 / 3; | |
1017 palette[i].peFlags = PC_NOCOLLAPSE; | |
1018 } | |
1019 g_lpdd->lpVtbl->CreatePalette(g_lpdd, DDPCAPS_8BIT | DDPCAPS_INITIALIZE, palette, &ddpalette, NULL); | |
1020 g_lpddsPrimary->lpVtbl->SetPalette(g_lpddsPrimary, ddpalette); | |
1021 free(palette); | |
1022 ddpalette->lpVtbl->Release(ddpalette); | |
1023 } | |
14400
50d99489dfe5
256 color mode support, use -vm to get better output when overlay is not supported
faust3
parents:
14302
diff
changeset
|
1024 |
33808 | 1025 if (!nooverlay && Directx_CreateOverlay(image_format)) { |
1026 if (format == primary_image_format) | |
1027 nooverlay = 1; /*overlay creation failed*/ | |
1028 else { | |
1029 mp_msg(MSGT_VO, MSGL_FATAL, "<vo_directx><FATAL ERROR>can't use overlay mode: please use -vo directx:noaccel\n"); | |
1030 return 1; | |
1031 } | |
1032 } | |
1033 if (nooverlay) { | |
1034 if (Directx_CreateBackpuffer()) { | |
1035 mp_msg(MSGT_VO, MSGL_FATAL, "<vo_directx><FATAL ERROR>can't get the driver to work on your system :(\n"); | |
1036 return 1; | |
1037 } | |
1038 mp_msg(MSGT_VO, MSGL_V, "<vo_directx><INFO>back surface created\n"); | |
1039 vo_doublebuffering = 0; | |
1040 /*create clipper for nonoverlay mode*/ | |
1041 if (g_lpdd->lpVtbl->CreateClipper(g_lpdd, 0, &g_lpddclipper, NULL) != DD_OK) { | |
1042 mp_msg(MSGT_VO, MSGL_FATAL, "<vo_directx><FATAL ERROR>can't create clipper\n"); | |
1043 return 1; | |
1044 } | |
1045 if (g_lpddclipper->lpVtbl->SetHWnd(g_lpddclipper, 0, vo_w32_window) != DD_OK) { | |
1046 mp_msg(MSGT_VO, MSGL_FATAL, "<vo_directx><FATAL ERROR>can't associate clipper with window\n"); | |
1047 return 1; | |
1048 } | |
1049 if (g_lpddsPrimary->lpVtbl->SetClipper(g_lpddsPrimary, g_lpddclipper) != DD_OK) { | |
1050 mp_msg(MSGT_VO, MSGL_FATAL, "<vo_directx><FATAL ERROR>can't associate primary surface with clipper\n"); | |
1051 return 1; | |
1052 } | |
1053 mp_msg(MSGT_VO, MSGL_DBG3, "<vo_directx><INFO>clipper succesfully created\n"); | |
1054 } else { | |
1055 if (DD_OK != g_lpddsOverlay->lpVtbl->QueryInterface(g_lpddsOverlay, &IID_IDirectDrawColorControl, (void **)&g_cc)) | |
1056 mp_msg(MSGT_VO, MSGL_V, "<vo_directx><WARN>unable to get DirectDraw ColorControl interface\n"); | |
1057 } | |
1058 Directx_ManageDisplay(); | |
1059 memset(&ddsdsf, 0, sizeof(DDSURFACEDESC2)); | |
1060 ddsdsf.dwSize = sizeof(DDSURFACEDESC2); | |
1061 if (g_lpddsBack->lpVtbl->Lock(g_lpddsBack, NULL, &ddsdsf, DDLOCK_NOSYSLOCK | DDLOCK_WAIT, NULL) == DD_OK) { | |
24835 | 1062 dstride = ddsdsf.lPitch; |
33808 | 1063 image = ddsdsf.lpSurface; |
24835 | 1064 return 0; |
33808 | 1065 } |
1066 mp_msg(MSGT_VO, MSGL_V, "<vo_directx><ERROR>Initial Lock on the Surface failed.\n"); | |
1067 return 1; | |
7537 | 1068 } |
1069 | |
13736
e4281b5463a4
overlay color control support based on patch by Vitos Laszlo <laca <at> evol.ro>
faust3
parents:
13438
diff
changeset
|
1070 //function to set color controls |
e4281b5463a4
overlay color control support based on patch by Vitos Laszlo <laca <at> evol.ro>
faust3
parents:
13438
diff
changeset
|
1071 // brightness [0, 10000] |
e4281b5463a4
overlay color control support based on patch by Vitos Laszlo <laca <at> evol.ro>
faust3
parents:
13438
diff
changeset
|
1072 // contrast [0, 20000] |
e4281b5463a4
overlay color control support based on patch by Vitos Laszlo <laca <at> evol.ro>
faust3
parents:
13438
diff
changeset
|
1073 // hue [-180, 180] |
e4281b5463a4
overlay color control support based on patch by Vitos Laszlo <laca <at> evol.ro>
faust3
parents:
13438
diff
changeset
|
1074 // saturation [0, 20000] |
33592 | 1075 static uint32_t color_ctrl_set(const char *what, int value) |
13736
e4281b5463a4
overlay color control support based on patch by Vitos Laszlo <laca <at> evol.ro>
faust3
parents:
13438
diff
changeset
|
1076 { |
33808 | 1077 uint32_t r = VO_NOTIMPL; |
33814 | 1078 DDCOLORCONTROL dcc = { .dwSize = sizeof(dcc) }; |
33808 | 1079 //printf("\n*** %s = %d\n", what, value); |
1080 if (!g_cc) { | |
1081 //printf("\n *** could not get color control interface!!!\n"); | |
1082 return VO_NOTIMPL; | |
1083 } | |
13736
e4281b5463a4
overlay color control support based on patch by Vitos Laszlo <laca <at> evol.ro>
faust3
parents:
13438
diff
changeset
|
1084 |
33808 | 1085 if (!strcmp(what, "brightness")) { |
1086 dcc.dwFlags = DDCOLOR_BRIGHTNESS; | |
1087 dcc.lBrightness = (value + 100) * 10000 / 200; | |
1088 r = VO_TRUE; | |
1089 } else if (!strcmp(what, "contrast")) { | |
1090 dcc.dwFlags = DDCOLOR_CONTRAST; | |
1091 dcc.lContrast = (value + 100) * 20000 / 200; | |
1092 r = VO_TRUE; | |
1093 } else if (!strcmp(what, "hue")) { | |
1094 dcc.dwFlags = DDCOLOR_HUE; | |
1095 dcc.lHue = value * 180 / 100; | |
1096 r = VO_TRUE; | |
1097 } else if (!strcmp(what, "saturation")) { | |
1098 dcc.dwFlags = DDCOLOR_SATURATION; | |
1099 dcc.lSaturation = (value + 100) * 20000 / 200; | |
1100 r = VO_TRUE; | |
1101 } | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29212
diff
changeset
|
1102 |
33808 | 1103 if (r == VO_TRUE) { |
1104 g_cc->lpVtbl->SetColorControls(g_cc, &dcc); | |
1105 } | |
1106 return r; | |
13736
e4281b5463a4
overlay color control support based on patch by Vitos Laszlo <laca <at> evol.ro>
faust3
parents:
13438
diff
changeset
|
1107 } |
e4281b5463a4
overlay color control support based on patch by Vitos Laszlo <laca <at> evol.ro>
faust3
parents:
13438
diff
changeset
|
1108 |
e4281b5463a4
overlay color control support based on patch by Vitos Laszlo <laca <at> evol.ro>
faust3
parents:
13438
diff
changeset
|
1109 //analoguous to color_ctrl_set |
33592 | 1110 static uint32_t color_ctrl_get(const char *what, int *value) |
13736
e4281b5463a4
overlay color control support based on patch by Vitos Laszlo <laca <at> evol.ro>
faust3
parents:
13438
diff
changeset
|
1111 { |
33808 | 1112 uint32_t r = VO_NOTIMPL; |
33814 | 1113 DDCOLORCONTROL dcc = { .dwSize = sizeof(dcc) }; |
33808 | 1114 if (!g_cc) { |
1115 //printf("\n *** could not get color control interface!!!\n"); | |
1116 return VO_NOTIMPL; | |
1117 } | |
13736
e4281b5463a4
overlay color control support based on patch by Vitos Laszlo <laca <at> evol.ro>
faust3
parents:
13438
diff
changeset
|
1118 |
33808 | 1119 if (g_cc->lpVtbl->GetColorControls(g_cc, &dcc) != DD_OK) { |
1120 return r; | |
1121 } | |
13736
e4281b5463a4
overlay color control support based on patch by Vitos Laszlo <laca <at> evol.ro>
faust3
parents:
13438
diff
changeset
|
1122 |
33808 | 1123 if (!strcmp(what, "brightness") && (dcc.dwFlags & DDCOLOR_BRIGHTNESS)) { |
1124 *value = dcc.lBrightness * 200 / 10000 - 100; | |
1125 r = VO_TRUE; | |
1126 } else if (!strcmp(what, "contrast") && (dcc.dwFlags & DDCOLOR_CONTRAST)) { | |
1127 *value = dcc.lContrast * 200 / 20000 - 100; | |
1128 r = VO_TRUE; | |
1129 } else if (!strcmp(what, "hue") && (dcc.dwFlags & DDCOLOR_HUE)) { | |
1130 *value = dcc.lHue * 100 / 180; | |
1131 r = VO_TRUE; | |
1132 } else if (!strcmp(what, "saturation") && (dcc.dwFlags & DDCOLOR_SATURATION)) { | |
1133 *value = dcc.lSaturation * 200 / 20000 - 100; | |
1134 r = VO_TRUE; | |
1135 } | |
13736
e4281b5463a4
overlay color control support based on patch by Vitos Laszlo <laca <at> evol.ro>
faust3
parents:
13438
diff
changeset
|
1136 // printf("\n*** %s = %d\n", what, *value); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29212
diff
changeset
|
1137 |
33808 | 1138 return r; |
13736
e4281b5463a4
overlay color control support based on patch by Vitos Laszlo <laca <at> evol.ro>
faust3
parents:
13438
diff
changeset
|
1139 } |
e4281b5463a4
overlay color control support based on patch by Vitos Laszlo <laca <at> evol.ro>
faust3
parents:
13438
diff
changeset
|
1140 |
33305
ddb45e9443ec
Remove the variable arguments from the libvo control() functions.
iive
parents:
33301
diff
changeset
|
1141 static int control(uint32_t request, void *data) |
7537 | 1142 { |
1143 switch (request) { | |
33808 | 1144 case VOCTRL_GET_IMAGE: |
1145 return get_image(data); | |
7537 | 1146 case VOCTRL_QUERY_FORMAT: |
33810 | 1147 return query_format(*(uint32_t *)data); |
33808 | 1148 case VOCTRL_DRAW_IMAGE: |
7537 | 1149 return put_image(data); |
16968
e9d849bf8050
add a switch, slave command, and vo control to toggle borderless window.
joey
parents:
16966
diff
changeset
|
1150 case VOCTRL_BORDER: |
33569 | 1151 vo_w32_border(); |
1152 Directx_ManageDisplay(); | |
33808 | 1153 return VO_TRUE; |
11542 | 1154 case VOCTRL_ONTOP: |
33569 | 1155 vo_w32_ontop(); |
33808 | 1156 return VO_TRUE; |
13091 | 1157 case VOCTRL_ROOTWIN: |
33808 | 1158 if (WinID != -1) |
1159 return VO_TRUE; | |
1160 if (vidmode) { | |
1161 mp_msg(MSGT_VO, MSGL_ERR, "<vo_directx><ERROR>rootwin has no meaning in exclusive mode\n"); | |
1162 } else { | |
1163 if (vo_rootwin) | |
1164 vo_rootwin = 0; | |
1165 else | |
1166 vo_rootwin = 1; | |
1167 Directx_ManageDisplay(); | |
1168 } | |
1169 return VO_TRUE; | |
7537 | 1170 case VOCTRL_FULLSCREEN: |
33808 | 1171 vo_w32_fullscreen(); |
1172 Directx_ManageDisplay(); | |
1173 return VO_TRUE; | |
1174 case VOCTRL_SET_EQUALIZER: { | |
1175 vf_equalizer_t *eq = data; | |
1176 return color_ctrl_set(eq->item, eq->value); | |
1177 } | |
1178 case VOCTRL_GET_EQUALIZER: { | |
1179 vf_equalizer_t *eq = data; | |
1180 return color_ctrl_get(eq->item, &eq->value); | |
1181 } | |
22459
d870e862d272
Simplify config by using code available in video_out.c
reimar
parents:
22289
diff
changeset
|
1182 case VOCTRL_UPDATE_SCREENINFO: |
33569 | 1183 w32_update_xinerama_info(); |
22459
d870e862d272
Simplify config by using code available in video_out.c
reimar
parents:
22289
diff
changeset
|
1184 return VO_TRUE; |
33808 | 1185 } |
7537 | 1186 return VO_NOTIMPL; |
1187 } |