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