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