Mercurial > mplayer.hg
annotate libvo/vo_xv.c @ 6295:3368f774d9a4
use offsets/pitches for OSD too
author | arpi |
---|---|
date | Mon, 03 Jun 2002 22:29:49 +0000 |
parents | e5031c75e940 |
children | ee65527096c2 |
rev | line source |
---|---|
676
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
1 |
1265 | 2 // Number of buffers _FOR_DOUBLEBUFFERING_MODE_ |
3 // Use option -double to enable double buffering! (default: single buffer) | |
4 #define NUM_BUFFERS 2 | |
1 | 5 |
182 | 6 /* |
7 * vo_xv.c, X11 Xv interface | |
1 | 8 * |
182 | 9 * Copyright (C) 1996, MPEG Software Simulation Group. All Rights Reserved. |
1 | 10 * |
11 * Hacked into mpeg2dec by | |
182 | 12 * |
1 | 13 * Aaron Holtzman <aholtzma@ess.engr.uvic.ca> |
14 * | |
15 * Xv image suuport by Gerd Knorr <kraxel@goldbach.in-berlin.de> | |
1265 | 16 * fullscreen support by Pontscho |
17 * double buffering support by A'rpi | |
1 | 18 */ |
19 | |
20 #include <stdio.h> | |
21 #include <stdlib.h> | |
22 #include <string.h> | |
23 | |
24 #include "config.h" | |
5935 | 25 #include "mp_msg.h" |
1 | 26 #include "video_out.h" |
27 #include "video_out_internal.h" | |
28 | |
29 LIBVO_EXTERN(xv) | |
30 | |
31 #include <X11/Xlib.h> | |
32 #include <X11/Xutil.h> | |
33 #include <X11/extensions/XShm.h> | |
34 #include <errno.h> | |
35 | |
31 | 36 #include "x11_common.h" |
37 | |
354 | 38 #include "fastmemcpy.h" |
616 | 39 #include "sub.h" |
2054 | 40 #include "aspect.h" |
350 | 41 |
4629 | 42 #include "../postproc/rgb2rgb.h" |
43 | |
5955
caac20b1ca79
fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents:
5945
diff
changeset
|
44 #ifdef HAVE_NEW_GUI |
caac20b1ca79
fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents:
5945
diff
changeset
|
45 #include "../Gui/interface.h" |
caac20b1ca79
fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents:
5945
diff
changeset
|
46 #endif |
caac20b1ca79
fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents:
5945
diff
changeset
|
47 |
182 | 48 static vo_info_t vo_info = |
1 | 49 { |
182 | 50 "X11/Xv", |
51 "xv", | |
52 "Gerd Knorr <kraxel@goldbach.in-berlin.de>", | |
53 "" | |
1 | 54 }; |
55 | |
4296
a20c333d6c09
Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents:
3990
diff
changeset
|
56 extern int verbose; |
a20c333d6c09
Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents:
3990
diff
changeset
|
57 |
1 | 58 /* since it doesn't seem to be defined on some platforms */ |
59 int XShmGetEventBase(Display*); | |
60 | |
61 /* local data */ | |
62 static unsigned char *ImageData; | |
63 | |
64 /* X11 related variables */ | |
65 static XImage *myximage; | |
66 static int depth, bpp, mode; | |
67 static XWindowAttributes attribs; | |
68 | |
69 #include <X11/extensions/Xv.h> | |
70 #include <X11/extensions/Xvlib.h> | |
71 // FIXME: dynamically allocate this stuff | |
72 static void allocate_xvimage(int); | |
73 static unsigned int ver,rel,req,ev,err; | |
74 static unsigned int formats, adaptors,i,xv_port,xv_format; | |
75 static XvAdaptorInfo *ai; | |
76 static XvImageFormatValues *fo; | |
676
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
77 |
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
78 static int current_buf=0; |
1265 | 79 static int num_buffers=1; // default |
676
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
80 static XvImage* xvimage[NUM_BUFFERS]; |
1 | 81 |
82 #include <sys/ipc.h> | |
83 #include <sys/shm.h> | |
84 #include <X11/extensions/XShm.h> | |
85 | |
86 static int Shmem_Flag; | |
5935 | 87 //static int Quiet_Flag; <-- What is that for ? Albeu. |
676
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
88 static XShmSegmentInfo Shminfo[NUM_BUFFERS]; |
1 | 89 static int gXErrorFlag; |
90 static int CompletionType = -1; | |
91 | |
92 static uint32_t image_width; | |
93 static uint32_t image_height; | |
94 static uint32_t image_format; | |
4629 | 95 static int flip_flag; |
1 | 96 |
182 | 97 static Window mRoot; |
5945 | 98 static uint32_t drwX,drwY,drwBorderWidth,drwDepth; |
99 static uint32_t dwidth,dheight; | |
1 | 100 |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
101 static void (*draw_alpha_fnc)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride); |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
102 |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
103 static void draw_alpha_yv12(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){ |
6295 | 104 vo_draw_alpha_yv12(w,h,src,srca,stride, |
105 xvimage[current_buf]->data+xvimage[current_buf]->offsets[0]+ | |
106 xvimage[current_buf]->pitches[0]*y0+x0,xvimage[current_buf]->pitches[0]); | |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
107 } |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
108 |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
109 static void draw_alpha_yuy2(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){ |
6295 | 110 vo_draw_alpha_yuy2(w,h,src,srca,stride, |
111 xvimage[current_buf]->data+xvimage[current_buf]->offsets[0]+ | |
112 xvimage[current_buf]->pitches[0]*y0+2*x0,xvimage[current_buf]->pitches[0]); | |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
113 } |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
114 |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
115 static void draw_alpha_uyvy(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){ |
6295 | 116 vo_draw_alpha_yuy2(w,h,src,srca,stride, |
117 xvimage[current_buf]->data+xvimage[current_buf]->offsets[0]+ | |
118 xvimage[current_buf]->pitches[0]*y0+2*x0+1,xvimage[current_buf]->pitches[0]); | |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
119 } |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
120 |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
121 static void draw_alpha_null(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){ |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
122 } |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
123 |
4396 | 124 static int __xv_set_video_eq( const vidix_video_eq_t *info,int use_reset) |
4296
a20c333d6c09
Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents:
3990
diff
changeset
|
125 { |
a20c333d6c09
Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents:
3990
diff
changeset
|
126 XvAttribute *attributes; |
4307 | 127 int howmany, xv_min,xv_max,xv_atomka; |
128 static int was_reset = 0; | |
129 /* get available attributes */ | |
4296
a20c333d6c09
Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents:
3990
diff
changeset
|
130 attributes = XvQueryPortAttributes(mDisplay, xv_port, &howmany); |
4307 | 131 /* first pass try reset */ |
4396 | 132 if(use_reset) |
4307 | 133 { |
4396 | 134 for (i = 0; i < howmany && attributes; i++) |
135 { | |
4307 | 136 if (attributes[i].flags & XvSettable && !strcmp(attributes[i].name,"XV_SET_DEFAULTS" |
137 )) | |
138 { | |
139 was_reset = 1; | |
5935 | 140 mp_msg(MSGT_VO,MSGL_V,"vo_xv: reset gamma correction\n"); |
4307 | 141 xv_atomka = XInternAtom(mDisplay, attributes[i].name, True); |
142 XvSetPortAttribute(mDisplay, xv_port, xv_atomka, attributes[i].max_value); | |
143 } | |
4396 | 144 } |
145 /* for safety purposes */ | |
146 if(!was_reset) return ENOSYS; | |
4307 | 147 } |
4296
a20c333d6c09
Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents:
3990
diff
changeset
|
148 for (i = 0; i < howmany && attributes; i++) |
a20c333d6c09
Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents:
3990
diff
changeset
|
149 { |
a20c333d6c09
Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents:
3990
diff
changeset
|
150 if (attributes[i].flags & XvSettable) |
a20c333d6c09
Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents:
3990
diff
changeset
|
151 { |
a20c333d6c09
Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents:
3990
diff
changeset
|
152 xv_min = attributes[i].min_value; |
a20c333d6c09
Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents:
3990
diff
changeset
|
153 xv_max = attributes[i].max_value; |
a20c333d6c09
Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents:
3990
diff
changeset
|
154 xv_atomka = XInternAtom(mDisplay, attributes[i].name, True); |
4307 | 155 /* since we have SET_DEFAULTS first in our list, we can check if it's available |
156 then trigger it if it's ok so that the other values are at default upon query */ | |
4296
a20c333d6c09
Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents:
3990
diff
changeset
|
157 if (xv_atomka != None) |
a20c333d6c09
Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents:
3990
diff
changeset
|
158 { |
a20c333d6c09
Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents:
3990
diff
changeset
|
159 int port_value,port_min,port_max,port_mid; |
4396 | 160 if(strcmp(attributes[i].name,"XV_BRIGHTNESS") == 0 |
161 && (info->cap & VEQ_CAP_BRIGHTNESS)) | |
162 port_value = info->brightness; | |
4296
a20c333d6c09
Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents:
3990
diff
changeset
|
163 else |
4396 | 164 if(strcmp(attributes[i].name,"XV_SATURATION") == 0 |
165 && (info->cap & VEQ_CAP_SATURATION)) | |
166 port_value = info->saturation; | |
4296
a20c333d6c09
Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents:
3990
diff
changeset
|
167 else |
4396 | 168 if(strcmp(attributes[i].name,"XV_CONTRAST") == 0 |
169 && (info->cap & VEQ_CAP_CONTRAST)) | |
170 port_value = info->contrast; | |
4296
a20c333d6c09
Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents:
3990
diff
changeset
|
171 else |
4396 | 172 if(strcmp(attributes[i].name,"XV_HUE") == 0 |
173 && (info->cap & VEQ_CAP_HUE)) | |
174 port_value = info->hue; | |
4320
bfcf2517876b
RGB independed correction for GATOS's radeon_video driver!
nick
parents:
4317
diff
changeset
|
175 else |
bfcf2517876b
RGB independed correction for GATOS's radeon_video driver!
nick
parents:
4317
diff
changeset
|
176 /* Note: since 22.01.2002 GATOS supports these attrs for radeons (NK) */ |
4396 | 177 if(strcmp(attributes[i].name,"XV_RED_INTENSITY") == 0 |
178 && (info->cap & VEQ_CAP_RGB_INTENSITY)) | |
179 port_value = info->red_intensity; | |
4320
bfcf2517876b
RGB independed correction for GATOS's radeon_video driver!
nick
parents:
4317
diff
changeset
|
180 else |
4396 | 181 if(strcmp(attributes[i].name,"XV_GREEN_INTENSITY") == 0 |
182 && (info->cap & VEQ_CAP_RGB_INTENSITY)) | |
183 port_value = info->green_intensity; | |
4320
bfcf2517876b
RGB independed correction for GATOS's radeon_video driver!
nick
parents:
4317
diff
changeset
|
184 else |
4396 | 185 if(strcmp(attributes[i].name,"XV_BLUE_INTENSITY") == 0 |
186 && (info->cap & VEQ_CAP_RGB_INTENSITY)) | |
187 port_value = info->blue_intensity; | |
4296
a20c333d6c09
Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents:
3990
diff
changeset
|
188 else continue; |
4320
bfcf2517876b
RGB independed correction for GATOS's radeon_video driver!
nick
parents:
4317
diff
changeset
|
189 /* means that user has untouched this parameter since |
bfcf2517876b
RGB independed correction for GATOS's radeon_video driver!
nick
parents:
4317
diff
changeset
|
190 NVidia driver has default == min for XV_HUE but not mid */ |
4406 | 191 if(!port_value && use_reset) continue; |
4296
a20c333d6c09
Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents:
3990
diff
changeset
|
192 port_min = xv_min; |
a20c333d6c09
Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents:
3990
diff
changeset
|
193 port_max = xv_max; |
a20c333d6c09
Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents:
3990
diff
changeset
|
194 port_mid = (port_min + port_max) / 2; |
a20c333d6c09
Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents:
3990
diff
changeset
|
195 port_value = port_mid + (port_value * (port_max - port_min)) / 2000; |
5935 | 196 mp_msg(MSGT_VO,MSGL_V,"vo_xv: set gamma %s to %i (min %i max %i mid %i)\n",attributes[i].name,port_value,port_min,port_max,port_mid); |
4296
a20c333d6c09
Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents:
3990
diff
changeset
|
197 XvSetPortAttribute(mDisplay, xv_port, xv_atomka, port_value); |
a20c333d6c09
Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents:
3990
diff
changeset
|
198 } |
a20c333d6c09
Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents:
3990
diff
changeset
|
199 } |
a20c333d6c09
Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents:
3990
diff
changeset
|
200 } |
4396 | 201 return 0; |
202 } | |
203 | |
204 | |
205 static int xv_set_video_eq( const vidix_video_eq_t *info) | |
206 { | |
207 return __xv_set_video_eq(info,0); | |
208 } | |
209 | |
210 static int xv_get_video_eq( vidix_video_eq_t *info) | |
211 { | |
212 XvAttribute *attributes; | |
213 int howmany, xv_min,xv_max,xv_atomka; | |
214 /* get available attributes */ | |
215 memset(info,0,sizeof(vidix_video_eq_t)); | |
216 attributes = XvQueryPortAttributes(mDisplay, xv_port, &howmany); | |
217 for (i = 0; i < howmany && attributes; i++) | |
218 { | |
219 if (attributes[i].flags & XvGettable) | |
220 { | |
221 xv_min = attributes[i].min_value; | |
222 xv_max = attributes[i].max_value; | |
223 xv_atomka = XInternAtom(mDisplay, attributes[i].name, True); | |
224 /* since we have SET_DEFAULTS first in our list, we can check if it's available | |
225 then trigger it if it's ok so that the other values are at default upon query */ | |
226 if (xv_atomka != None) | |
227 { | |
228 int port_value,port_min,port_max,port_mid; | |
229 XvGetPortAttribute(mDisplay, xv_port, xv_atomka, &port_value); | |
5935 | 230 mp_msg(MSGT_VO,MSGL_V,"vo_xv: get: %s = %i\n",attributes[i].name,port_value); |
4396 | 231 |
232 port_min = xv_min; | |
233 port_max = xv_max; | |
234 port_mid = (port_min + port_max) / 2; | |
235 port_value = ((port_value - port_mid)*2000)/(port_max-port_min); | |
236 | |
5935 | 237 mp_msg(MSGT_VO,MSGL_V,"vo_xv: assume: %s = %i\n",attributes[i].name,port_value); |
4396 | 238 |
239 if(strcmp(attributes[i].name,"XV_BRIGHTNESS") == 0) | |
240 { | |
241 info->cap |= VEQ_CAP_BRIGHTNESS; | |
242 info->brightness = port_value; | |
243 } | |
244 else | |
245 if(strcmp(attributes[i].name,"XV_SATURATION") == 0) | |
246 { | |
247 info->cap |= VEQ_CAP_SATURATION; | |
248 info->saturation = port_value; | |
249 } | |
250 else | |
251 if(strcmp(attributes[i].name,"XV_CONTRAST") == 0) | |
252 { | |
253 info->cap |= VEQ_CAP_CONTRAST; | |
254 info->contrast = port_value; | |
255 } | |
256 else | |
257 if(strcmp(attributes[i].name,"XV_HUE") == 0) | |
258 { | |
259 info->cap |= VEQ_CAP_HUE; | |
260 info->hue = port_value; | |
261 } | |
262 else | |
263 /* Note: since 22.01.2002 GATOS supports these attrs for radeons (NK) */ | |
264 if(strcmp(attributes[i].name,"XV_RED_INTENSITY") == 0) | |
265 { | |
266 info->cap |= VEQ_CAP_RGB_INTENSITY; | |
267 info->red_intensity = port_value; | |
268 } | |
269 else | |
270 if(strcmp(attributes[i].name,"XV_GREEN_INTENSITY") == 0) | |
271 { | |
272 info->cap |= VEQ_CAP_RGB_INTENSITY; | |
273 info->green_intensity = port_value; | |
274 } | |
275 else | |
276 if(strcmp(attributes[i].name,"XV_BLUE_INTENSITY") == 0) | |
277 { | |
278 info->cap |= VEQ_CAP_RGB_INTENSITY; | |
279 info->blue_intensity = port_value; | |
280 } | |
281 else continue; | |
282 } | |
283 } | |
284 } | |
285 return 0; | |
286 } | |
287 | |
288 extern int vo_gamma_brightness; | |
289 extern int vo_gamma_saturation; | |
290 extern int vo_gamma_contrast; | |
291 extern int vo_gamma_hue; | |
292 extern int vo_gamma_red_intensity; | |
293 extern int vo_gamma_green_intensity; | |
294 extern int vo_gamma_blue_intensity; | |
295 | |
296 static void set_gamma_correction( void ) | |
297 { | |
298 vidix_video_eq_t info; | |
299 /* try all */ | |
300 info.cap = VEQ_CAP_BRIGHTNESS | VEQ_CAP_CONTRAST | VEQ_CAP_SATURATION | | |
301 VEQ_CAP_HUE | VEQ_CAP_RGB_INTENSITY; | |
302 info.flags = 0; /* doesn't matter for xv */ | |
303 info.brightness = vo_gamma_brightness; | |
304 info.contrast = vo_gamma_contrast; | |
305 info.saturation = vo_gamma_saturation; | |
306 info.hue = vo_gamma_hue; | |
307 info.red_intensity = vo_gamma_red_intensity; | |
308 info.green_intensity = vo_gamma_green_intensity; | |
309 info.blue_intensity = vo_gamma_blue_intensity; | |
310 /* reset with XV_SET_DEFAULTS only once */ | |
311 __xv_set_video_eq(&info,1); | |
4296
a20c333d6c09
Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents:
3990
diff
changeset
|
312 } |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
313 |
182 | 314 /* |
315 * connect to server, create and map window, | |
1 | 316 * allocate colors and (shared) memory |
317 */ | |
4433 | 318 static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format,const vo_tune_info_t *info) |
1 | 319 { |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
320 // int screen; |
182 | 321 char *hello = (title == NULL) ? "Xv render" : title; |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
322 // char *name = ":0.0"; |
182 | 323 XSizeHints hint; |
324 XVisualInfo vinfo; | |
325 XEvent xev; | |
1 | 326 |
182 | 327 XGCValues xgcv; |
328 XSetWindowAttributes xswa; | |
329 unsigned long xswamask; | |
4426
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
330 #ifdef HAVE_XF86VM |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
331 int vm=0; |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
332 unsigned int modeline_width, modeline_height; |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
333 static uint32_t vm_width; |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
334 static uint32_t vm_height; |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
335 #endif |
1 | 336 |
2249
48f0ac1e9d13
Update to new (cleaner, more bugfree, better) aspect api. vo_gl vo_gl2 and vo_xmga are untested!
atmos4
parents:
2055
diff
changeset
|
337 aspect_save_orig(width,height); |
48f0ac1e9d13
Update to new (cleaner, more bugfree, better) aspect api. vo_gl vo_gl2 and vo_xmga are untested!
atmos4
parents:
2055
diff
changeset
|
338 aspect_save_prescale(d_width,d_height); |
48f0ac1e9d13
Update to new (cleaner, more bugfree, better) aspect api. vo_gl vo_gl2 and vo_xmga are untested!
atmos4
parents:
2055
diff
changeset
|
339 |
182 | 340 image_height = height; |
341 image_width = width; | |
342 image_format=format; | |
5955
caac20b1ca79
fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents:
5945
diff
changeset
|
343 |
caac20b1ca79
fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents:
5945
diff
changeset
|
344 vo_mouse_autohide=1; |
1 | 345 |
6043 | 346 vo_dx=( vo_screenwidth - d_width ) / 2; vo_dy=( vo_screenheight - d_height ) / 2; |
5945 | 347 vo_dwidth=d_width; vo_dheight=d_height; |
4981 | 348 |
4978 | 349 #ifdef HAVE_XF86VM |
4426
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
350 if( flags&0x02 ) vm = 1; |
4978 | 351 #endif |
4629 | 352 flip_flag=flags&8; |
1265 | 353 num_buffers=vo_doublebuffering?NUM_BUFFERS:1; |
5509
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
354 |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
355 /* check image formats */ |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
356 fo = XvListImageFormats(mDisplay, xv_port, (int*)&formats); |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
357 xv_format=0; |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
358 if(format==IMGFMT_BGR24) format=IMGFMT_YV12; |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
359 for(i = 0; i < formats; i++){ |
5935 | 360 mp_msg(MSGT_VO,MSGL_V,"Xvideo image format: 0x%x (%4.4s) %s\n", fo[i].id,(char*)&fo[i].id, (fo[i].format == XvPacked) ? "packed" : "planar"); |
5509
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
361 if (fo[i].id == format) xv_format = fo[i].id; |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
362 } |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
363 if (!xv_format) return -1; |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
364 |
2249
48f0ac1e9d13
Update to new (cleaner, more bugfree, better) aspect api. vo_gl vo_gl2 and vo_xmga are untested!
atmos4
parents:
2055
diff
changeset
|
365 aspect_save_screenres(vo_screenwidth,vo_screenheight); |
48f0ac1e9d13
Update to new (cleaner, more bugfree, better) aspect api. vo_gl vo_gl2 and vo_xmga are untested!
atmos4
parents:
2055
diff
changeset
|
366 |
1775 | 367 #ifdef HAVE_NEW_GUI |
5985 | 368 if(use_gui) |
369 guiGetEvent( guiSetShVideo,0 ); // let the GUI to setup/resize our window | |
370 else | |
371 #endif | |
182 | 372 { |
6043 | 373 hint.x = vo_dx; |
374 hint.y = vo_dy; | |
723 | 375 hint.width = d_width; |
376 hint.height = d_height; | |
2249
48f0ac1e9d13
Update to new (cleaner, more bugfree, better) aspect api. vo_gl vo_gl2 and vo_xmga are untested!
atmos4
parents:
2055
diff
changeset
|
377 aspect(&d_width,&d_height,A_NOZOOM); |
4426
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
378 #ifdef HAVE_XF86VM |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
379 if ( vm ) |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
380 { |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
381 if ((d_width==0) && (d_height==0)) |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
382 { vm_width=image_width; vm_height=image_height; } |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
383 else |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
384 { vm_width=d_width; vm_height=d_height; } |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
385 vo_vm_switch(vm_width, vm_height,&modeline_width, &modeline_height); |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
386 hint.x=(vo_screenwidth-modeline_width)/2; |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
387 hint.y=(vo_screenheight-modeline_height)/2; |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
388 hint.width=modeline_width; |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
389 hint.height=modeline_height; |
6125 | 390 aspect_save_screenres(modeline_width,modeline_height); |
4426
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
391 } |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
392 else |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
393 #endif |
4981 | 394 if ( vo_fs ) |
723 | 395 { |
2054 | 396 #ifdef X11_FULLSCREEN |
2031
624df8ea0e0e
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
1924
diff
changeset
|
397 /* this code replaces X11_FULLSCREEN hack in mplayer.c |
2054 | 398 * aspect() is available through aspect.h for all vos. |
2031
624df8ea0e0e
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
1924
diff
changeset
|
399 * besides zooming should only be done with -zoom, |
624df8ea0e0e
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
1924
diff
changeset
|
400 * but I leave the old -fs behaviour so users don't get |
624df8ea0e0e
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
1924
diff
changeset
|
401 * irritated for now (and send lots o' mails ;) ::atmos |
624df8ea0e0e
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
1924
diff
changeset
|
402 */ |
624df8ea0e0e
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
1924
diff
changeset
|
403 |
2249
48f0ac1e9d13
Update to new (cleaner, more bugfree, better) aspect api. vo_gl vo_gl2 and vo_xmga are untested!
atmos4
parents:
2055
diff
changeset
|
404 aspect(&d_width,&d_height,A_ZOOM); |
2031
624df8ea0e0e
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
1924
diff
changeset
|
405 #endif |
624df8ea0e0e
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
1924
diff
changeset
|
406 |
723 | 407 } |
5945 | 408 // dwidth=d_width; dheight=d_height; //XXX: what are the copy vars used for? |
409 vo_dwidth=d_width; vo_dheight=d_height; | |
5981 | 410 hint.flags = PPosition | PSize /* | PBaseSize */; |
411 hint.base_width = hint.width; hint.base_height = hint.height; | |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
412 XGetWindowAttributes(mDisplay, DefaultRootWindow(mDisplay), &attribs); |
723 | 413 depth=attribs.depth; |
414 if (depth != 15 && depth != 16 && depth != 24 && depth != 32) depth = 24; | |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
415 XMatchVisualInfo(mDisplay, mScreen, depth, TrueColor, &vinfo); |
723 | 416 |
417 xswa.background_pixel = 0; | |
418 xswa.border_pixel = 0; | |
419 xswamask = CWBackPixel | CWBorderPixel; | |
1 | 420 |
3830 | 421 if ( WinID>=0 ){ |
6043 | 422 vo_window = WinID ? ((Window)WinID) : mRootWin; |
423 if ( WinID ) | |
424 { | |
425 XUnmapWindow( mDisplay,vo_window ); | |
426 XChangeWindowAttributes( mDisplay,vo_window,xswamask,&xswa ); | |
427 XSelectInput( mDisplay,vo_window,StructureNotifyMask | KeyPressMask | PropertyChangeMask | PointerMotionMask | ButtonPressMask | ButtonReleaseMask | ExposureMask ); | |
428 } else { drwX=vo_dx; drwY=vo_dy; } | |
3830 | 429 } else |
6043 | 430 { |
431 vo_window = XCreateWindow(mDisplay, mRootWin, | |
432 hint.x, hint.y, hint.width, hint.height, | |
433 0, depth,CopyFromParent,vinfo.visual,xswamask,&xswa); | |
3830 | 434 |
6043 | 435 vo_x11_classhint( mDisplay,vo_window,"xv" ); |
436 vo_hidecursor(mDisplay,vo_window); | |
3830 | 437 |
6043 | 438 XSelectInput(mDisplay, vo_window, StructureNotifyMask | KeyPressMask | PropertyChangeMask | |
5822 | 439 ((WinID==0) ? 0 : (PointerMotionMask |
4658 | 440 #ifdef HAVE_NEW_INPUT |
441 | ButtonPressMask | ButtonReleaseMask | |
442 #endif | |
6043 | 443 ))); |
444 XSetStandardProperties(mDisplay, vo_window, hello, hello, None, NULL, 0, &hint); | |
445 XSetWMNormalHints( mDisplay,vo_window,&hint ); | |
446 XMapWindow(mDisplay, vo_window); | |
447 if ( flags&1 ) vo_x11_fullscreen(); | |
3990 | 448 #ifdef HAVE_XINERAMA |
6043 | 449 vo_x11_xinerama_move(mDisplay,vo_window); |
3990 | 450 #endif |
6043 | 451 } |
452 vo_gc = XCreateGC(mDisplay, vo_window, 0L, &xgcv); | |
453 XFlush(mDisplay); | |
454 XSync(mDisplay, False); | |
4426
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
455 #ifdef HAVE_XF86VM |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
456 if ( vm ) |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
457 { |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
458 /* Grab the mouse pointer in our window */ |
4795 | 459 XGrabPointer(mDisplay, vo_window, True, 0, |
4426
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
460 GrabModeAsync, GrabModeAsync, |
4795 | 461 vo_window, None, CurrentTime); |
462 XSetInputFocus(mDisplay, vo_window, RevertToNone, CurrentTime); | |
4426
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
463 } |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
464 #endif |
5985 | 465 } |
1 | 466 |
5935 | 467 mp_msg(MSGT_VO,MSGL_V, "using Xvideo port %d for hw scaling\n",xv_port ); |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
468 |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
469 switch (xv_format){ |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
470 case IMGFMT_YV12: |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
471 case IMGFMT_I420: |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
472 case IMGFMT_IYUV: draw_alpha_fnc=draw_alpha_yv12; break; |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
473 case IMGFMT_YUY2: |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
474 case IMGFMT_YVYU: draw_alpha_fnc=draw_alpha_yuy2; break; |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
475 case IMGFMT_UYVY: draw_alpha_fnc=draw_alpha_uyvy; break; |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
476 default: draw_alpha_fnc=draw_alpha_null; |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
477 } |
182 | 478 |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
479 for(current_buf=0;current_buf<num_buffers;++current_buf) |
676
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
480 allocate_xvimage(current_buf); |
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
481 |
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
482 current_buf=0; |
1 | 483 |
4396 | 484 set_gamma_correction(); |
1818 | 485 |
5945 | 486 aspect(&vo_dwidth,&vo_dheight,A_NOZOOM); |
6043 | 487 if ( ( flags&1 )&&( !WinID ) ) |
182 | 488 { |
5945 | 489 aspect(&vo_dwidth,&vo_dheight,A_ZOOM); |
490 drwX=( vo_screenwidth - (vo_dwidth > vo_screenwidth?vo_screenwidth:vo_dwidth) ) / 2; | |
491 drwY=( vo_screenheight - (vo_dheight > vo_screenheight?vo_screenheight:vo_dheight) ) / 2; | |
492 vo_dwidth=(vo_dwidth > vo_screenwidth?vo_screenwidth:vo_dwidth); | |
493 vo_dheight=(vo_dheight > vo_screenheight?vo_screenheight:vo_dheight); | |
494 mp_msg(MSGT_VO,MSGL_V, "[xv-fs] dx: %d dy: %d dw: %d dh: %d\n",drwX,drwY,vo_dwidth,vo_dheight ); | |
182 | 495 } |
6043 | 496 |
5945 | 497 mp_msg(MSGT_VO,MSGL_V, "[xv] dx: %d dy: %d dw: %d dh: %d\n",drwX,drwY,vo_dwidth,vo_dheight ); |
498 | |
4316 | 499 saver_off(mDisplay); // turning off screen saver |
182 | 500 return 0; |
1 | 501 } |
502 | |
182 | 503 static const vo_info_t * get_info(void) |
504 { return &vo_info; } | |
1 | 505 |
182 | 506 static void allocate_xvimage(int foo) |
1 | 507 { |
182 | 508 /* |
509 * allocate XvImages. FIXME: no error checking, without | |
510 * mit-shm this will bomb... | |
511 */ | |
5622
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
512 if ( mLocalDisplay && XShmQueryExtension( mDisplay ) ) Shmem_Flag = 1; |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
513 else |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
514 { |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
515 Shmem_Flag = 0; |
5935 | 516 mp_msg(MSGT_VO,MSGL_INFO, "Shared memory not supported\nReverting to normal Xv\n" ); |
5622
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
517 } |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
518 if ( Shmem_Flag ) |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
519 { |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
520 xvimage[foo] = XvShmCreateImage(mDisplay, xv_port, xv_format, 0, image_width, image_height, &Shminfo[foo]); |
1 | 521 |
5622
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
522 Shminfo[foo].shmid = shmget(IPC_PRIVATE, xvimage[foo]->data_size, IPC_CREAT | 0777); |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
523 Shminfo[foo].shmaddr = (char *) shmat(Shminfo[foo].shmid, 0, 0); |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
524 Shminfo[foo].readOnly = False; |
1 | 525 |
5622
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
526 xvimage[foo]->data = Shminfo[foo].shmaddr; |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
527 XShmAttach(mDisplay, &Shminfo[foo]); |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
528 XSync(mDisplay, False); |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
529 shmctl(Shminfo[foo].shmid, IPC_RMID, 0); |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
530 } |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
531 else |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
532 { |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
533 xvimage[foo] = XvCreateImage(mDisplay, xv_port, xv_format, 0, image_width, image_height); |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
534 xvimage[foo]->data = malloc(xvimage[foo]->data_size); |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
535 XSync(mDisplay,False); |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
536 } |
182 | 537 memset(xvimage[foo]->data,128,xvimage[foo]->data_size); |
538 return; | |
1 | 539 } |
540 | |
1794 | 541 static void deallocate_xvimage(int foo) |
542 { | |
5622
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
543 if ( Shmem_Flag ) |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
544 { |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
545 XShmDetach( mDisplay,&Shminfo[foo] ); |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
546 shmdt( Shminfo[foo].shmaddr ); |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
547 } |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
548 else |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
549 { |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
550 free(xvimage[foo]->data); |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
551 } |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
552 XFree(xvimage[foo]); |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
553 |
1794 | 554 XFlush( mDisplay ); |
555 XSync(mDisplay, False); | |
556 return; | |
557 } | |
558 | |
31 | 559 static void check_events(void) |
1 | 560 { |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
561 int e=vo_x11_check_events(mDisplay); |
182 | 562 if(e&VO_EVENT_RESIZE) |
563 { | |
5945 | 564 XGetGeometry( mDisplay,vo_window,&mRoot,&drwX,&drwY,&vo_dwidth,&vo_dheight,&drwBorderWidth,&drwDepth ); |
5981 | 565 drwX = drwY = 0; |
5945 | 566 mp_msg(MSGT_VO,MSGL_V, "[xv] dx: %d dy: %d dw: %d dh: %d\n",drwX,drwY,vo_dwidth,vo_dheight ); |
1 | 567 |
3558 | 568 aspect(&dwidth,&dheight,A_NOZOOM); |
4981 | 569 if ( vo_fs ) |
182 | 570 { |
3558 | 571 aspect(&dwidth,&dheight,A_ZOOM); |
182 | 572 drwX=( vo_screenwidth - (dwidth > vo_screenwidth?vo_screenwidth:dwidth) ) / 2; |
573 drwY=( vo_screenheight - (dheight > vo_screenheight?vo_screenheight:dheight) ) / 2; | |
5945 | 574 vo_dwidth=(dwidth > vo_screenwidth?vo_screenwidth:dwidth); |
575 vo_dheight=(dheight > vo_screenheight?vo_screenheight:dheight); | |
576 mp_msg(MSGT_VO,MSGL_V, "[xv-fs] dx: %d dy: %d dw: %d dh: %d\n",drwX,drwY,vo_dwidth,vo_dheight ); | |
182 | 577 } |
578 } | |
1858
88a88d0a3f94
fix skin changing, xv fullscreen redraw bug, etc.
pontscho
parents:
1852
diff
changeset
|
579 if ( e & VO_EVENT_EXPOSE ) |
88a88d0a3f94
fix skin changing, xv fullscreen redraw bug, etc.
pontscho
parents:
1852
diff
changeset
|
580 { |
5622
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
581 if ( Shmem_Flag ) |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
582 { |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
583 XvShmPutImage(mDisplay, xv_port, vo_window, vo_gc, xvimage[current_buf], 0, 0, image_width, image_height, drwX, drwY, 1, 1, False); |
5945 | 584 XvShmPutImage(mDisplay, xv_port, vo_window, vo_gc, xvimage[current_buf], 0, 0, image_width, image_height, drwX,drwY,vo_dwidth,(vo_fs?vo_dheight - 1:vo_dheight), False); |
5622
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
585 } |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
586 else |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
587 { |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
588 XvPutImage(mDisplay, xv_port, vo_window, vo_gc, xvimage[current_buf], 0, 0, image_width, image_height, drwX, drwY, 1, 1); |
5945 | 589 XvPutImage(mDisplay, xv_port, vo_window, vo_gc, xvimage[current_buf], 0, 0, image_width, image_height, drwX,drwY,vo_dwidth,(vo_fs?vo_dheight - 1:vo_dheight)); |
5622
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
590 } |
1858
88a88d0a3f94
fix skin changing, xv fullscreen redraw bug, etc.
pontscho
parents:
1852
diff
changeset
|
591 } |
1 | 592 } |
593 | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1265
diff
changeset
|
594 static void draw_osd(void) |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
595 { vo_draw_text(image_width,image_height,draw_alpha_fnc);} |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1265
diff
changeset
|
596 |
182 | 597 static void flip_page(void) |
1 | 598 { |
5622
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
599 if ( Shmem_Flag ) |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
600 { |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
601 XvShmPutImage(mDisplay, xv_port, vo_window, vo_gc, xvimage[current_buf], |
182 | 602 0, 0, image_width, image_height, |
5945 | 603 drwX,drwY,vo_dwidth,(vo_fs?vo_dheight - 1:vo_dheight), |
182 | 604 False); |
5622
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
605 } |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
606 else |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
607 { |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
608 XvPutImage(mDisplay, xv_port, vo_window, vo_gc, xvimage[current_buf], |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
609 0, 0, image_width, image_height, |
5945 | 610 drwX,drwY,vo_dwidth,(vo_fs?vo_dheight - 1:vo_dheight)); |
5622
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
611 } |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1265
diff
changeset
|
612 if (num_buffers>1){ |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1265
diff
changeset
|
613 current_buf=(current_buf+1)%num_buffers; |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1265
diff
changeset
|
614 XFlush(mDisplay); |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1265
diff
changeset
|
615 } else |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1265
diff
changeset
|
616 XSync(mDisplay, False); |
182 | 617 return; |
1 | 618 } |
619 | |
247 | 620 |
621 | |
182 | 622 static uint32_t draw_slice(uint8_t *image[], int stride[], int w,int h,int x,int y) |
1 | 623 { |
182 | 624 uint8_t *src; |
625 uint8_t *dst; | |
626 int i; | |
6231 | 627 int srcstride; |
182 | 628 |
6231 | 629 dst = xvimage[current_buf]->data + xvimage[current_buf]->offsets[0] + |
630 xvimage[current_buf]->pitches[0]*y + x; | |
182 | 631 src = image[0]; |
6231 | 632 if(w==stride[0] && w==xvimage[current_buf]->pitches[0]) memcpy(dst,src,w*h); |
182 | 633 else |
634 for(i=0;i<h;i++) | |
635 { | |
636 memcpy(dst,src,w); | |
637 src+=stride[0]; | |
6231 | 638 dst+=xvimage[current_buf]->pitches[0]; |
182 | 639 } |
640 | |
641 x/=2;y/=2;w/=2;h/=2; | |
1 | 642 |
6231 | 643 dst = xvimage[current_buf]->data + xvimage[current_buf]->offsets[1] + |
644 xvimage[current_buf]->pitches[1]*y + x; | |
645 src=image[2];srcstride=stride[2]; | |
646 if(image_format!=IMGFMT_YV12){ src=image[1];srcstride=stride[1]; } | |
647 if(w==srcstride && w==xvimage[current_buf]->pitches[1]) memcpy(dst,src,w*h); | |
182 | 648 else |
649 for(i=0;i<h;i++) | |
650 { | |
651 memcpy(dst,src,w); | |
6231 | 652 src+=srcstride; |
653 dst+=xvimage[current_buf]->pitches[1]; | |
182 | 654 } |
5316 | 655 |
6231 | 656 dst = xvimage[current_buf]->data + xvimage[current_buf]->offsets[2] + |
657 xvimage[current_buf]->pitches[2]*y + x; | |
658 src=image[2];srcstride=stride[2]; | |
659 if(image_format==IMGFMT_YV12){ src=image[1];srcstride=stride[1]; } | |
660 if(w==srcstride && w==xvimage[current_buf]->pitches[2]) memcpy(dst,src,w*h); | |
182 | 661 else |
662 for(i=0;i<h;i++) | |
663 { | |
664 memcpy(dst,src,w); | |
6231 | 665 src+=srcstride; |
666 dst+=xvimage[current_buf]->pitches[2]; | |
667 } | |
668 | |
182 | 669 return 0; |
1 | 670 } |
671 | |
182 | 672 static uint32_t draw_frame(uint8_t *src[]) |
1 | 673 { |
674 | |
4629 | 675 switch (image_format) { |
408 | 676 case IMGFMT_YUY2: |
677 case IMGFMT_UYVY: | |
678 case IMGFMT_YVYU: | |
679 | |
6231 | 680 // printf("off=0x%X pitch=%d width=%d \n",xvimage[current_buf]->offsets[0],xvimage[current_buf]->pitches[0],image_width); |
408 | 681 |
6231 | 682 // YUY2 packed |
683 if(image_width*2==xvimage[current_buf]->pitches[0]){ | |
684 memcpy(xvimage[current_buf]->data+xvimage[current_buf]->offsets[0], | |
685 src[0], image_width*image_height*2); | |
686 } else { | |
687 unsigned char* s=src[0]; | |
688 unsigned char* d=xvimage[current_buf]->data+xvimage[current_buf]->offsets[0]; | |
689 int i; | |
690 for(i=0;i<image_height;i++) { | |
691 memcpy(d,s,image_width*2); | |
692 s+=image_width*2; | |
693 d+=xvimage[current_buf]->pitches[0]; | |
694 } | |
695 } | |
696 break; | |
4629 | 697 |
698 case IMGFMT_BGR24: | |
699 | |
700 if(flip_flag) // tricky, using negative src stride: | |
701 rgb24toyv12(src[0]+3*image_width*(image_height-1), | |
6231 | 702 xvimage[current_buf]->data+xvimage[current_buf]->offsets[0], |
703 xvimage[current_buf]->data+xvimage[current_buf]->offsets[2], | |
704 xvimage[current_buf]->data+xvimage[current_buf]->offsets[1], | |
4629 | 705 image_width,image_height, |
6231 | 706 xvimage[current_buf]->pitches[0], |
707 xvimage[current_buf]->pitches[1], | |
708 -3*image_width); | |
4629 | 709 else |
710 rgb24toyv12(src[0], | |
6231 | 711 xvimage[current_buf]->data+xvimage[current_buf]->offsets[0], |
712 xvimage[current_buf]->data+xvimage[current_buf]->offsets[2], | |
713 xvimage[current_buf]->data+xvimage[current_buf]->offsets[1], | |
4629 | 714 image_width,image_height, |
6231 | 715 xvimage[current_buf]->pitches[0], |
716 xvimage[current_buf]->pitches[1], | |
717 3*image_width); | |
4629 | 718 break; |
719 | |
408 | 720 } |
182 | 721 |
722 return 0; | |
1 | 723 } |
724 | |
4980 | 725 static uint32_t get_image(mp_image_t *mpi){ |
726 if(mpi->type==MP_IMGTYPE_STATIC && num_buffers>1) return VO_FALSE; // it is not static | |
5466 | 727 if(mpi->type==MP_IMGTYPE_IPB && num_buffers<3 && mpi->flags&MP_IMGFLAG_READABLE) return VO_FALSE; // not enough |
5006 | 728 if(mpi->imgfmt!=image_format || mpi->imgfmt==IMGFMT_BGR24) return VO_FALSE; // needs conversion :( |
4980 | 729 // if(mpi->flags&MP_IMGFLAG_READABLE) return VO_FALSE; // slow video ram |
6231 | 730 if( (mpi->flags&(MP_IMGFLAG_ACCEPT_STRIDE|MP_IMGFLAG_ACCEPT_WIDTH)) || |
731 (mpi->width*(mpi->bpp/8)==xvimage[current_buf]->pitches[0]) ){ | |
732 mpi->planes[0]=xvimage[current_buf]->data+xvimage[current_buf]->offsets[0]; | |
733 mpi->stride[0]=xvimage[current_buf]->pitches[0]; | |
734 mpi->width=mpi->stride[0]/(mpi->bpp/8); | |
735 if(mpi->flags&MP_IMGFLAG_PLANAR){ | |
736 if(mpi->flags&MP_IMGFLAG_SWAPPED){ | |
737 // I420 | |
738 mpi->planes[1]=xvimage[current_buf]->data+xvimage[current_buf]->offsets[1]; | |
739 mpi->planes[2]=xvimage[current_buf]->data+xvimage[current_buf]->offsets[2]; | |
740 mpi->stride[1]=xvimage[current_buf]->pitches[1]; | |
741 mpi->stride[2]=xvimage[current_buf]->pitches[2]; | |
742 } else { | |
5316 | 743 // YV12 |
6231 | 744 mpi->planes[1]=xvimage[current_buf]->data+xvimage[current_buf]->offsets[2]; |
745 mpi->planes[2]=xvimage[current_buf]->data+xvimage[current_buf]->offsets[1]; | |
746 mpi->stride[1]=xvimage[current_buf]->pitches[2]; | |
747 mpi->stride[2]=xvimage[current_buf]->pitches[1]; | |
748 } | |
749 } | |
4980 | 750 mpi->flags|=MP_IMGFLAG_DIRECT; |
751 // printf("mga: get_image() SUCCESS -> Direct Rendering ENABLED\n"); | |
752 return VO_TRUE; | |
753 } | |
754 return VO_FALSE; | |
755 } | |
756 | |
182 | 757 static uint32_t query_format(uint32_t format) |
1 | 758 { |
5566 | 759 int flag=3|VFCAP_HWSCALE_UP|VFCAP_HWSCALE_DOWN|VFCAP_OSD; // FIXME! check for DOWN |
5509
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
760 /* check image formats */ |
5566 | 761 if(format==IMGFMT_BGR24){ format=IMGFMT_YV12;flag&=~2;flag|=VFCAP_FLIP;} // conversion! |
5509
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
762 for(i = 0; i < formats; i++){ |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
763 if (fo[i].id == format) return flag; //xv_format = fo[i].id; |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
764 } |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
765 return 0; |
1 | 766 } |
767 | |
1852 | 768 static void uninit(void) |
769 { | |
770 int i; | |
6016 | 771 if ( !vo_config_count ) return; |
772 saver_on(mDisplay); // screen saver back on | |
773 for( i=0;i<num_buffers;i++ ) deallocate_xvimage( i ); | |
774 #ifdef HAVE_XF86VM | |
775 vo_vm_close(mDisplay); | |
776 #endif | |
6095 | 777 vo_x11_uninit(); |
322
4e69a8e2700a
Screensaver and monitor powersafe function is switched off when playing a
laaz
parents:
249
diff
changeset
|
778 } |
1 | 779 |
4352 | 780 static uint32_t preinit(const char *arg) |
781 { | |
5509
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
782 XvPortID xv_p; |
6174
9676d7735332
different message for busy Xv ports and missing Xv ports
arpi
parents:
6125
diff
changeset
|
783 int busy_ports=0; |
6016 | 784 |
4737
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4658
diff
changeset
|
785 if(arg) |
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4658
diff
changeset
|
786 { |
5935 | 787 mp_msg(MSGT_VO,MSGL_ERR,"vo_xv: Unknown subdevice: %s\n",arg); |
4737
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4658
diff
changeset
|
788 return ENOSYS; |
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4658
diff
changeset
|
789 } |
5509
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
790 if (!vo_init()) return -1; |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
791 |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
792 xv_port = 0; |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
793 /* check for Xvideo extension */ |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
794 if (Success != XvQueryExtension(mDisplay,&ver,&rel,&req,&ev,&err)){ |
5935 | 795 mp_msg(MSGT_VO,MSGL_ERR,"Sorry, Xv not supported by this X11 version/driver\n"); |
796 mp_msg(MSGT_VO,MSGL_ERR,"******** Try with -vo x11 or -vo sdl *********\n"); | |
5509
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
797 return -1; |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
798 } |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
799 |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
800 /* check for Xvideo support */ |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
801 if (Success != XvQueryAdaptors(mDisplay,DefaultRootWindow(mDisplay), &adaptors,&ai)){ |
5935 | 802 mp_msg(MSGT_VO,MSGL_ERR,"Xv: XvQueryAdaptors failed"); |
5509
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
803 return -1; |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
804 } |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
805 |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
806 /* check adaptors */ |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
807 for (i = 0; i < adaptors && xv_port == 0; i++){ |
5935 | 808 if ((ai[i].type & XvInputMask) && (ai[i].type & XvImageMask)) { |
5509
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
809 for (xv_p = ai[i].base_id; xv_p < ai[i].base_id+ai[i].num_ports; ++xv_p) |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
810 if (!XvGrabPort(mDisplay, xv_p, CurrentTime)) { |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
811 xv_port = xv_p; |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
812 break; |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
813 } else { |
6174
9676d7735332
different message for busy Xv ports and missing Xv ports
arpi
parents:
6125
diff
changeset
|
814 mp_msg(MSGT_VO,MSGL_WARN,"Xv: could not grab port %i\n", (int)xv_p); |
9676d7735332
different message for busy Xv ports and missing Xv ports
arpi
parents:
6125
diff
changeset
|
815 ++busy_ports; |
5509
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
816 } |
5935 | 817 } |
5509
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
818 } |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
819 if(!xv_port){ |
6174
9676d7735332
different message for busy Xv ports and missing Xv ports
arpi
parents:
6125
diff
changeset
|
820 if(busy_ports) |
6249 | 821 mp_msg(MSGT_VO,MSGL_ERR,"Could not find free Xvideo port - maybe another process is already using it.\n" |
6174
9676d7735332
different message for busy Xv ports and missing Xv ports
arpi
parents:
6125
diff
changeset
|
822 "Close all video applications, and try again. If that does not help,\n" |
9676d7735332
different message for busy Xv ports and missing Xv ports
arpi
parents:
6125
diff
changeset
|
823 "see 'mplayer -vo help' for other (non-xv) video out drivers.\n"); |
9676d7735332
different message for busy Xv ports and missing Xv ports
arpi
parents:
6125
diff
changeset
|
824 else |
9676d7735332
different message for busy Xv ports and missing Xv ports
arpi
parents:
6125
diff
changeset
|
825 mp_msg(MSGT_VO,MSGL_ERR,"It seems there is no Xvideo support for your video card available.\n" |
9676d7735332
different message for busy Xv ports and missing Xv ports
arpi
parents:
6125
diff
changeset
|
826 "Run 'xvinfo' to verify its Xv support, and read Xv section of DOCS/video.html !\n" |
9676d7735332
different message for busy Xv ports and missing Xv ports
arpi
parents:
6125
diff
changeset
|
827 "See 'mplayer -vo help' for other (non-xv) video out drivers. Try -vo x11\n"); |
5509
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
828 return -1; |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
829 } |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
830 |
5566 | 831 fo = XvListImageFormats(mDisplay, xv_port, (int*)&formats); |
832 | |
4737
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4658
diff
changeset
|
833 return 0; |
4352 | 834 } |
1 | 835 |
4352 | 836 static void query_vaa(vo_vaa_t *vaa) |
837 { | |
838 memset(vaa,0,sizeof(vo_vaa_t)); | |
4396 | 839 vaa->get_video_eq = xv_get_video_eq; |
840 vaa->set_video_eq = xv_set_video_eq; | |
4352 | 841 } |
4592
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
842 |
4596 | 843 static uint32_t control(uint32_t request, void *data, ...) |
4592
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
844 { |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
845 switch (request) { |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
846 case VOCTRL_QUERY_VAA: |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
847 query_vaa((vo_vaa_t*)data); |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
848 return VO_TRUE; |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
849 case VOCTRL_QUERY_FORMAT: |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
850 return query_format(*((uint32_t*)data)); |
4980 | 851 case VOCTRL_GET_IMAGE: |
852 return get_image(data); | |
4981 | 853 case VOCTRL_FULLSCREEN: |
854 vo_x11_fullscreen(); | |
855 return VO_TRUE; | |
4592
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
856 } |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
857 return VO_NOTIMPL; |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
858 } |