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