Mercurial > mplayer.hg
annotate libvo/vo_xv.c @ 6185:7e769ea2acc7
jump to next file (or exit) if can't decode audio && video
author | alex |
---|---|
date | Sat, 25 May 2002 11:40:29 +0000 |
parents | 9676d7735332 |
children | 3acbdbc8f212 |
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){ |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
104 vo_draw_alpha_yv12(w,h,src,srca,stride,xvimage[current_buf]->data+image_width*y0+x0,image_width); |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
105 } |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
106 |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
107 static void draw_alpha_yuy2(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
|
108 vo_draw_alpha_yuy2(w,h,src,srca,stride,xvimage[current_buf]->data+2*(image_width*y0+x0),2*image_width); |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
109 } |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
110 |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
111 static void draw_alpha_uyvy(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
|
112 vo_draw_alpha_yuy2(w,h,src,srca,stride,xvimage[current_buf]->data+2*(image_width*y0+x0)+1,2*image_width); |
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_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
|
116 } |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
117 |
4396 | 118 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
|
119 { |
a20c333d6c09
Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents:
3990
diff
changeset
|
120 XvAttribute *attributes; |
4307 | 121 int howmany, xv_min,xv_max,xv_atomka; |
122 static int was_reset = 0; | |
123 /* 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
|
124 attributes = XvQueryPortAttributes(mDisplay, xv_port, &howmany); |
4307 | 125 /* first pass try reset */ |
4396 | 126 if(use_reset) |
4307 | 127 { |
4396 | 128 for (i = 0; i < howmany && attributes; i++) |
129 { | |
4307 | 130 if (attributes[i].flags & XvSettable && !strcmp(attributes[i].name,"XV_SET_DEFAULTS" |
131 )) | |
132 { | |
133 was_reset = 1; | |
5935 | 134 mp_msg(MSGT_VO,MSGL_V,"vo_xv: reset gamma correction\n"); |
4307 | 135 xv_atomka = XInternAtom(mDisplay, attributes[i].name, True); |
136 XvSetPortAttribute(mDisplay, xv_port, xv_atomka, attributes[i].max_value); | |
137 } | |
4396 | 138 } |
139 /* for safety purposes */ | |
140 if(!was_reset) return ENOSYS; | |
4307 | 141 } |
4296
a20c333d6c09
Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents:
3990
diff
changeset
|
142 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
|
143 { |
a20c333d6c09
Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents:
3990
diff
changeset
|
144 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
|
145 { |
a20c333d6c09
Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents:
3990
diff
changeset
|
146 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
|
147 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
|
148 xv_atomka = XInternAtom(mDisplay, attributes[i].name, True); |
4307 | 149 /* since we have SET_DEFAULTS first in our list, we can check if it's available |
150 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
|
151 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
|
152 { |
a20c333d6c09
Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents:
3990
diff
changeset
|
153 int port_value,port_min,port_max,port_mid; |
4396 | 154 if(strcmp(attributes[i].name,"XV_BRIGHTNESS") == 0 |
155 && (info->cap & VEQ_CAP_BRIGHTNESS)) | |
156 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
|
157 else |
4396 | 158 if(strcmp(attributes[i].name,"XV_SATURATION") == 0 |
159 && (info->cap & VEQ_CAP_SATURATION)) | |
160 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
|
161 else |
4396 | 162 if(strcmp(attributes[i].name,"XV_CONTRAST") == 0 |
163 && (info->cap & VEQ_CAP_CONTRAST)) | |
164 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
|
165 else |
4396 | 166 if(strcmp(attributes[i].name,"XV_HUE") == 0 |
167 && (info->cap & VEQ_CAP_HUE)) | |
168 port_value = info->hue; | |
4320
bfcf2517876b
RGB independed correction for GATOS's radeon_video driver!
nick
parents:
4317
diff
changeset
|
169 else |
bfcf2517876b
RGB independed correction for GATOS's radeon_video driver!
nick
parents:
4317
diff
changeset
|
170 /* Note: since 22.01.2002 GATOS supports these attrs for radeons (NK) */ |
4396 | 171 if(strcmp(attributes[i].name,"XV_RED_INTENSITY") == 0 |
172 && (info->cap & VEQ_CAP_RGB_INTENSITY)) | |
173 port_value = info->red_intensity; | |
4320
bfcf2517876b
RGB independed correction for GATOS's radeon_video driver!
nick
parents:
4317
diff
changeset
|
174 else |
4396 | 175 if(strcmp(attributes[i].name,"XV_GREEN_INTENSITY") == 0 |
176 && (info->cap & VEQ_CAP_RGB_INTENSITY)) | |
177 port_value = info->green_intensity; | |
4320
bfcf2517876b
RGB independed correction for GATOS's radeon_video driver!
nick
parents:
4317
diff
changeset
|
178 else |
4396 | 179 if(strcmp(attributes[i].name,"XV_BLUE_INTENSITY") == 0 |
180 && (info->cap & VEQ_CAP_RGB_INTENSITY)) | |
181 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
|
182 else continue; |
4320
bfcf2517876b
RGB independed correction for GATOS's radeon_video driver!
nick
parents:
4317
diff
changeset
|
183 /* means that user has untouched this parameter since |
bfcf2517876b
RGB independed correction for GATOS's radeon_video driver!
nick
parents:
4317
diff
changeset
|
184 NVidia driver has default == min for XV_HUE but not mid */ |
4406 | 185 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
|
186 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
|
187 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
|
188 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
|
189 port_value = port_mid + (port_value * (port_max - port_min)) / 2000; |
5935 | 190 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
|
191 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
|
192 } |
a20c333d6c09
Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents:
3990
diff
changeset
|
193 } |
a20c333d6c09
Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents:
3990
diff
changeset
|
194 } |
4396 | 195 return 0; |
196 } | |
197 | |
198 | |
199 static int xv_set_video_eq( const vidix_video_eq_t *info) | |
200 { | |
201 return __xv_set_video_eq(info,0); | |
202 } | |
203 | |
204 static int xv_get_video_eq( vidix_video_eq_t *info) | |
205 { | |
206 XvAttribute *attributes; | |
207 int howmany, xv_min,xv_max,xv_atomka; | |
208 /* get available attributes */ | |
209 memset(info,0,sizeof(vidix_video_eq_t)); | |
210 attributes = XvQueryPortAttributes(mDisplay, xv_port, &howmany); | |
211 for (i = 0; i < howmany && attributes; i++) | |
212 { | |
213 if (attributes[i].flags & XvGettable) | |
214 { | |
215 xv_min = attributes[i].min_value; | |
216 xv_max = attributes[i].max_value; | |
217 xv_atomka = XInternAtom(mDisplay, attributes[i].name, True); | |
218 /* since we have SET_DEFAULTS first in our list, we can check if it's available | |
219 then trigger it if it's ok so that the other values are at default upon query */ | |
220 if (xv_atomka != None) | |
221 { | |
222 int port_value,port_min,port_max,port_mid; | |
223 XvGetPortAttribute(mDisplay, xv_port, xv_atomka, &port_value); | |
5935 | 224 mp_msg(MSGT_VO,MSGL_V,"vo_xv: get: %s = %i\n",attributes[i].name,port_value); |
4396 | 225 |
226 port_min = xv_min; | |
227 port_max = xv_max; | |
228 port_mid = (port_min + port_max) / 2; | |
229 port_value = ((port_value - port_mid)*2000)/(port_max-port_min); | |
230 | |
5935 | 231 mp_msg(MSGT_VO,MSGL_V,"vo_xv: assume: %s = %i\n",attributes[i].name,port_value); |
4396 | 232 |
233 if(strcmp(attributes[i].name,"XV_BRIGHTNESS") == 0) | |
234 { | |
235 info->cap |= VEQ_CAP_BRIGHTNESS; | |
236 info->brightness = port_value; | |
237 } | |
238 else | |
239 if(strcmp(attributes[i].name,"XV_SATURATION") == 0) | |
240 { | |
241 info->cap |= VEQ_CAP_SATURATION; | |
242 info->saturation = port_value; | |
243 } | |
244 else | |
245 if(strcmp(attributes[i].name,"XV_CONTRAST") == 0) | |
246 { | |
247 info->cap |= VEQ_CAP_CONTRAST; | |
248 info->contrast = port_value; | |
249 } | |
250 else | |
251 if(strcmp(attributes[i].name,"XV_HUE") == 0) | |
252 { | |
253 info->cap |= VEQ_CAP_HUE; | |
254 info->hue = port_value; | |
255 } | |
256 else | |
257 /* Note: since 22.01.2002 GATOS supports these attrs for radeons (NK) */ | |
258 if(strcmp(attributes[i].name,"XV_RED_INTENSITY") == 0) | |
259 { | |
260 info->cap |= VEQ_CAP_RGB_INTENSITY; | |
261 info->red_intensity = port_value; | |
262 } | |
263 else | |
264 if(strcmp(attributes[i].name,"XV_GREEN_INTENSITY") == 0) | |
265 { | |
266 info->cap |= VEQ_CAP_RGB_INTENSITY; | |
267 info->green_intensity = port_value; | |
268 } | |
269 else | |
270 if(strcmp(attributes[i].name,"XV_BLUE_INTENSITY") == 0) | |
271 { | |
272 info->cap |= VEQ_CAP_RGB_INTENSITY; | |
273 info->blue_intensity = port_value; | |
274 } | |
275 else continue; | |
276 } | |
277 } | |
278 } | |
279 return 0; | |
280 } | |
281 | |
282 extern int vo_gamma_brightness; | |
283 extern int vo_gamma_saturation; | |
284 extern int vo_gamma_contrast; | |
285 extern int vo_gamma_hue; | |
286 extern int vo_gamma_red_intensity; | |
287 extern int vo_gamma_green_intensity; | |
288 extern int vo_gamma_blue_intensity; | |
289 | |
290 static void set_gamma_correction( void ) | |
291 { | |
292 vidix_video_eq_t info; | |
293 /* try all */ | |
294 info.cap = VEQ_CAP_BRIGHTNESS | VEQ_CAP_CONTRAST | VEQ_CAP_SATURATION | | |
295 VEQ_CAP_HUE | VEQ_CAP_RGB_INTENSITY; | |
296 info.flags = 0; /* doesn't matter for xv */ | |
297 info.brightness = vo_gamma_brightness; | |
298 info.contrast = vo_gamma_contrast; | |
299 info.saturation = vo_gamma_saturation; | |
300 info.hue = vo_gamma_hue; | |
301 info.red_intensity = vo_gamma_red_intensity; | |
302 info.green_intensity = vo_gamma_green_intensity; | |
303 info.blue_intensity = vo_gamma_blue_intensity; | |
304 /* reset with XV_SET_DEFAULTS only once */ | |
305 __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
|
306 } |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
307 |
182 | 308 /* |
309 * connect to server, create and map window, | |
1 | 310 * allocate colors and (shared) memory |
311 */ | |
4433 | 312 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 | 313 { |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
314 // int screen; |
182 | 315 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
|
316 // char *name = ":0.0"; |
182 | 317 XSizeHints hint; |
318 XVisualInfo vinfo; | |
319 XEvent xev; | |
1 | 320 |
182 | 321 XGCValues xgcv; |
322 XSetWindowAttributes xswa; | |
323 unsigned long xswamask; | |
4426
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
324 #ifdef HAVE_XF86VM |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
325 int vm=0; |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
326 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
|
327 static uint32_t vm_width; |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
328 static uint32_t vm_height; |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
329 #endif |
1 | 330 |
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
|
331 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
|
332 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
|
333 |
182 | 334 image_height = height; |
335 image_width = width; | |
336 image_format=format; | |
5955
caac20b1ca79
fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents:
5945
diff
changeset
|
337 |
caac20b1ca79
fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents:
5945
diff
changeset
|
338 vo_mouse_autohide=1; |
1 | 339 |
6043 | 340 vo_dx=( vo_screenwidth - d_width ) / 2; vo_dy=( vo_screenheight - d_height ) / 2; |
5945 | 341 vo_dwidth=d_width; vo_dheight=d_height; |
4981 | 342 |
4978 | 343 #ifdef HAVE_XF86VM |
4426
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
344 if( flags&0x02 ) vm = 1; |
4978 | 345 #endif |
4629 | 346 flip_flag=flags&8; |
1265 | 347 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
|
348 |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
349 /* check image formats */ |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
350 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
|
351 xv_format=0; |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
352 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
|
353 for(i = 0; i < formats; i++){ |
5935 | 354 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
|
355 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
|
356 } |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
357 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
|
358 |
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
|
359 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
|
360 |
1775 | 361 #ifdef HAVE_NEW_GUI |
5985 | 362 if(use_gui) |
363 guiGetEvent( guiSetShVideo,0 ); // let the GUI to setup/resize our window | |
364 else | |
365 #endif | |
182 | 366 { |
6043 | 367 hint.x = vo_dx; |
368 hint.y = vo_dy; | |
723 | 369 hint.width = d_width; |
370 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
|
371 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
|
372 #ifdef HAVE_XF86VM |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
373 if ( vm ) |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
374 { |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
375 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
|
376 { 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
|
377 else |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
378 { 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
|
379 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
|
380 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
|
381 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
|
382 hint.width=modeline_width; |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
383 hint.height=modeline_height; |
6125 | 384 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
|
385 } |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
386 else |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
387 #endif |
4981 | 388 if ( vo_fs ) |
723 | 389 { |
2054 | 390 #ifdef X11_FULLSCREEN |
2031
624df8ea0e0e
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
1924
diff
changeset
|
391 /* this code replaces X11_FULLSCREEN hack in mplayer.c |
2054 | 392 * 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
|
393 * 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
|
394 * 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
|
395 * 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
|
396 */ |
624df8ea0e0e
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
1924
diff
changeset
|
397 |
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
|
398 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
|
399 #endif |
624df8ea0e0e
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
1924
diff
changeset
|
400 |
723 | 401 } |
5945 | 402 // dwidth=d_width; dheight=d_height; //XXX: what are the copy vars used for? |
403 vo_dwidth=d_width; vo_dheight=d_height; | |
5981 | 404 hint.flags = PPosition | PSize /* | PBaseSize */; |
405 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
|
406 XGetWindowAttributes(mDisplay, DefaultRootWindow(mDisplay), &attribs); |
723 | 407 depth=attribs.depth; |
408 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
|
409 XMatchVisualInfo(mDisplay, mScreen, depth, TrueColor, &vinfo); |
723 | 410 |
411 xswa.background_pixel = 0; | |
412 xswa.border_pixel = 0; | |
413 xswamask = CWBackPixel | CWBorderPixel; | |
1 | 414 |
3830 | 415 if ( WinID>=0 ){ |
6043 | 416 vo_window = WinID ? ((Window)WinID) : mRootWin; |
417 if ( WinID ) | |
418 { | |
419 XUnmapWindow( mDisplay,vo_window ); | |
420 XChangeWindowAttributes( mDisplay,vo_window,xswamask,&xswa ); | |
421 XSelectInput( mDisplay,vo_window,StructureNotifyMask | KeyPressMask | PropertyChangeMask | PointerMotionMask | ButtonPressMask | ButtonReleaseMask | ExposureMask ); | |
422 } else { drwX=vo_dx; drwY=vo_dy; } | |
3830 | 423 } else |
6043 | 424 { |
425 vo_window = XCreateWindow(mDisplay, mRootWin, | |
426 hint.x, hint.y, hint.width, hint.height, | |
427 0, depth,CopyFromParent,vinfo.visual,xswamask,&xswa); | |
3830 | 428 |
6043 | 429 vo_x11_classhint( mDisplay,vo_window,"xv" ); |
430 vo_hidecursor(mDisplay,vo_window); | |
3830 | 431 |
6043 | 432 XSelectInput(mDisplay, vo_window, StructureNotifyMask | KeyPressMask | PropertyChangeMask | |
5822 | 433 ((WinID==0) ? 0 : (PointerMotionMask |
4658 | 434 #ifdef HAVE_NEW_INPUT |
435 | ButtonPressMask | ButtonReleaseMask | |
436 #endif | |
6043 | 437 ))); |
438 XSetStandardProperties(mDisplay, vo_window, hello, hello, None, NULL, 0, &hint); | |
439 XSetWMNormalHints( mDisplay,vo_window,&hint ); | |
440 XMapWindow(mDisplay, vo_window); | |
441 if ( flags&1 ) vo_x11_fullscreen(); | |
3990 | 442 #ifdef HAVE_XINERAMA |
6043 | 443 vo_x11_xinerama_move(mDisplay,vo_window); |
3990 | 444 #endif |
6043 | 445 } |
446 vo_gc = XCreateGC(mDisplay, vo_window, 0L, &xgcv); | |
447 XFlush(mDisplay); | |
448 XSync(mDisplay, False); | |
4426
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
449 #ifdef HAVE_XF86VM |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
450 if ( vm ) |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
451 { |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
452 /* Grab the mouse pointer in our window */ |
4795 | 453 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
|
454 GrabModeAsync, GrabModeAsync, |
4795 | 455 vo_window, None, CurrentTime); |
456 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
|
457 } |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
458 #endif |
5985 | 459 } |
1 | 460 |
5935 | 461 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
|
462 |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
463 switch (xv_format){ |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
464 case IMGFMT_YV12: |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
465 case IMGFMT_I420: |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
466 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
|
467 case IMGFMT_YUY2: |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
468 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
|
469 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
|
470 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
|
471 } |
182 | 472 |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
473 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
|
474 allocate_xvimage(current_buf); |
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
475 |
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
476 current_buf=0; |
1 | 477 |
4396 | 478 set_gamma_correction(); |
1818 | 479 |
5945 | 480 aspect(&vo_dwidth,&vo_dheight,A_NOZOOM); |
6043 | 481 if ( ( flags&1 )&&( !WinID ) ) |
182 | 482 { |
5945 | 483 aspect(&vo_dwidth,&vo_dheight,A_ZOOM); |
484 drwX=( vo_screenwidth - (vo_dwidth > vo_screenwidth?vo_screenwidth:vo_dwidth) ) / 2; | |
485 drwY=( vo_screenheight - (vo_dheight > vo_screenheight?vo_screenheight:vo_dheight) ) / 2; | |
486 vo_dwidth=(vo_dwidth > vo_screenwidth?vo_screenwidth:vo_dwidth); | |
487 vo_dheight=(vo_dheight > vo_screenheight?vo_screenheight:vo_dheight); | |
488 mp_msg(MSGT_VO,MSGL_V, "[xv-fs] dx: %d dy: %d dw: %d dh: %d\n",drwX,drwY,vo_dwidth,vo_dheight ); | |
182 | 489 } |
6043 | 490 |
5945 | 491 mp_msg(MSGT_VO,MSGL_V, "[xv] dx: %d dy: %d dw: %d dh: %d\n",drwX,drwY,vo_dwidth,vo_dheight ); |
492 | |
4316 | 493 saver_off(mDisplay); // turning off screen saver |
182 | 494 return 0; |
1 | 495 } |
496 | |
182 | 497 static const vo_info_t * get_info(void) |
498 { return &vo_info; } | |
1 | 499 |
182 | 500 static void allocate_xvimage(int foo) |
1 | 501 { |
182 | 502 /* |
503 * allocate XvImages. FIXME: no error checking, without | |
504 * mit-shm this will bomb... | |
505 */ | |
5622
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
506 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
|
507 else |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
508 { |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
509 Shmem_Flag = 0; |
5935 | 510 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
|
511 } |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
512 if ( Shmem_Flag ) |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
513 { |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
514 xvimage[foo] = XvShmCreateImage(mDisplay, xv_port, xv_format, 0, image_width, image_height, &Shminfo[foo]); |
1 | 515 |
5622
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
516 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
|
517 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
|
518 Shminfo[foo].readOnly = False; |
1 | 519 |
5622
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
520 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
|
521 XShmAttach(mDisplay, &Shminfo[foo]); |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
522 XSync(mDisplay, False); |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
523 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
|
524 } |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
525 else |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
526 { |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
527 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
|
528 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
|
529 XSync(mDisplay,False); |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
530 } |
182 | 531 memset(xvimage[foo]->data,128,xvimage[foo]->data_size); |
532 return; | |
1 | 533 } |
534 | |
1794 | 535 static void deallocate_xvimage(int foo) |
536 { | |
5622
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
537 if ( Shmem_Flag ) |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
538 { |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
539 XShmDetach( mDisplay,&Shminfo[foo] ); |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
540 shmdt( Shminfo[foo].shmaddr ); |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
541 } |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
542 else |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
543 { |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
544 free(xvimage[foo]->data); |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
545 } |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
546 XFree(xvimage[foo]); |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
547 |
1794 | 548 XFlush( mDisplay ); |
549 XSync(mDisplay, False); | |
550 return; | |
551 } | |
552 | |
31 | 553 static void check_events(void) |
1 | 554 { |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
555 int e=vo_x11_check_events(mDisplay); |
182 | 556 if(e&VO_EVENT_RESIZE) |
557 { | |
5945 | 558 XGetGeometry( mDisplay,vo_window,&mRoot,&drwX,&drwY,&vo_dwidth,&vo_dheight,&drwBorderWidth,&drwDepth ); |
5981 | 559 drwX = drwY = 0; |
5945 | 560 mp_msg(MSGT_VO,MSGL_V, "[xv] dx: %d dy: %d dw: %d dh: %d\n",drwX,drwY,vo_dwidth,vo_dheight ); |
1 | 561 |
3558 | 562 aspect(&dwidth,&dheight,A_NOZOOM); |
4981 | 563 if ( vo_fs ) |
182 | 564 { |
3558 | 565 aspect(&dwidth,&dheight,A_ZOOM); |
182 | 566 drwX=( vo_screenwidth - (dwidth > vo_screenwidth?vo_screenwidth:dwidth) ) / 2; |
567 drwY=( vo_screenheight - (dheight > vo_screenheight?vo_screenheight:dheight) ) / 2; | |
5945 | 568 vo_dwidth=(dwidth > vo_screenwidth?vo_screenwidth:dwidth); |
569 vo_dheight=(dheight > vo_screenheight?vo_screenheight:dheight); | |
570 mp_msg(MSGT_VO,MSGL_V, "[xv-fs] dx: %d dy: %d dw: %d dh: %d\n",drwX,drwY,vo_dwidth,vo_dheight ); | |
182 | 571 } |
572 } | |
1858
88a88d0a3f94
fix skin changing, xv fullscreen redraw bug, etc.
pontscho
parents:
1852
diff
changeset
|
573 if ( e & VO_EVENT_EXPOSE ) |
88a88d0a3f94
fix skin changing, xv fullscreen redraw bug, etc.
pontscho
parents:
1852
diff
changeset
|
574 { |
5622
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
575 if ( Shmem_Flag ) |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
576 { |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
577 XvShmPutImage(mDisplay, xv_port, vo_window, vo_gc, xvimage[current_buf], 0, 0, image_width, image_height, drwX, drwY, 1, 1, False); |
5945 | 578 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
|
579 } |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
580 else |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
581 { |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
582 XvPutImage(mDisplay, xv_port, vo_window, vo_gc, xvimage[current_buf], 0, 0, image_width, image_height, drwX, drwY, 1, 1); |
5945 | 583 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
|
584 } |
1858
88a88d0a3f94
fix skin changing, xv fullscreen redraw bug, etc.
pontscho
parents:
1852
diff
changeset
|
585 } |
1 | 586 } |
587 | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1265
diff
changeset
|
588 static void draw_osd(void) |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
589 { 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
|
590 |
182 | 591 static void flip_page(void) |
1 | 592 { |
5622
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
593 if ( Shmem_Flag ) |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
594 { |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
595 XvShmPutImage(mDisplay, xv_port, vo_window, vo_gc, xvimage[current_buf], |
182 | 596 0, 0, image_width, image_height, |
5945 | 597 drwX,drwY,vo_dwidth,(vo_fs?vo_dheight - 1:vo_dheight), |
182 | 598 False); |
5622
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
599 } |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
600 else |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
601 { |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
602 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
|
603 0, 0, image_width, image_height, |
5945 | 604 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
|
605 } |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1265
diff
changeset
|
606 if (num_buffers>1){ |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1265
diff
changeset
|
607 current_buf=(current_buf+1)%num_buffers; |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1265
diff
changeset
|
608 XFlush(mDisplay); |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1265
diff
changeset
|
609 } else |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1265
diff
changeset
|
610 XSync(mDisplay, False); |
182 | 611 return; |
1 | 612 } |
613 | |
247 | 614 |
615 | |
182 | 616 static uint32_t draw_slice(uint8_t *image[], int stride[], int w,int h,int x,int y) |
1 | 617 { |
182 | 618 uint8_t *src; |
619 uint8_t *dst; | |
620 int i; | |
621 | |
676
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
622 dst = xvimage[current_buf]->data + image_width * y + x; |
182 | 623 src = image[0]; |
624 if(w==stride[0] && w==image_width) memcpy(dst,src,w*h); | |
625 else | |
626 for(i=0;i<h;i++) | |
627 { | |
628 memcpy(dst,src,w); | |
629 src+=stride[0]; | |
630 dst+=image_width; | |
631 } | |
632 | |
633 x/=2;y/=2;w/=2;h/=2; | |
1 | 634 |
5316 | 635 dst = xvimage[current_buf]->data + image_width * image_height + (image_width>>1) * y + x; |
636 if(image_format!=IMGFMT_YV12) dst+=(image_width>>1)*(image_height>>1); | |
182 | 637 src = image[2]; |
638 if(w==stride[2] && w==image_width/2) memcpy(dst,src,w*h); | |
639 else | |
640 for(i=0;i<h;i++) | |
641 { | |
642 memcpy(dst,src,w); | |
643 src+=stride[2]; | |
644 dst+=image_width/2; | |
645 } | |
5316 | 646 |
647 dst = xvimage[current_buf]->data + image_width * image_height + (image_width>>1) * y + x; | |
648 if(image_format==IMGFMT_YV12) dst+=(image_width>>1)*(image_height>>1); | |
182 | 649 src = image[1]; |
650 if(w==stride[1] && w==image_width/2) memcpy(dst,src,w*h); | |
651 else | |
652 for(i=0;i<h;i++) | |
653 { | |
654 memcpy(dst,src,w); | |
655 src+=stride[1]; | |
656 dst+=image_width/2; | |
657 } | |
658 return 0; | |
1 | 659 } |
660 | |
182 | 661 static uint32_t draw_frame(uint8_t *src[]) |
1 | 662 { |
663 | |
4629 | 664 switch (image_format) { |
408 | 665 case IMGFMT_YUY2: |
666 case IMGFMT_UYVY: | |
667 case IMGFMT_YVYU: | |
668 | |
669 // YUY2 packed, flipped | |
1 | 670 #if 0 |
408 | 671 int i; |
672 unsigned short *s=(unsigned short *)src[0]; | |
676
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
673 unsigned short *d=(unsigned short *)xvimage[current_buf]->data; |
408 | 674 s+=image_width*image_height; |
675 for(i=0;i<image_height;i++) { | |
676 s-=image_width; | |
677 memcpy(d,s,image_width*2); | |
678 d+=image_width; | |
679 } | |
1 | 680 #else |
676
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
681 memcpy(xvimage[current_buf]->data,src[0],image_width*image_height*2); |
1 | 682 #endif |
408 | 683 break; |
684 | |
685 case IMGFMT_YV12: | |
686 case IMGFMT_I420: | |
687 case IMGFMT_IYUV: | |
688 | |
182 | 689 // YV12 planar |
676
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
690 memcpy(xvimage[current_buf]->data,src[0],image_width*image_height); |
4351 | 691 if (xv_format == IMGFMT_YV12) |
692 { | |
693 memcpy(xvimage[current_buf]->data+image_width*image_height,src[2],image_width*image_height/4); | |
694 memcpy(xvimage[current_buf]->data+image_width*image_height*5/4,src[1],image_width*image_height/4); | |
695 } | |
696 else | |
697 { | |
698 memcpy(xvimage[current_buf]->data+image_width*image_height,src[1],image_width*image_height/4); | |
699 memcpy(xvimage[current_buf]->data+image_width*image_height*5/4,src[2],image_width*image_height/4); | |
700 } | |
408 | 701 break; |
4629 | 702 |
703 case IMGFMT_BGR24: | |
704 | |
705 if(flip_flag) // tricky, using negative src stride: | |
706 rgb24toyv12(src[0]+3*image_width*(image_height-1), | |
707 xvimage[current_buf]->data, | |
708 xvimage[current_buf]->data+image_width*image_height*5/4, | |
709 xvimage[current_buf]->data+image_width*image_height, | |
710 image_width,image_height, | |
711 image_width,image_width/2,-3*image_width); | |
712 else | |
713 rgb24toyv12(src[0], | |
714 xvimage[current_buf]->data, | |
715 xvimage[current_buf]->data+image_width*image_height*5/4, | |
716 xvimage[current_buf]->data+image_width*image_height, | |
717 image_width,image_height, | |
718 image_width,image_width/2,3*image_width); | |
719 break; | |
720 | |
408 | 721 } |
182 | 722 |
723 return 0; | |
1 | 724 } |
725 | |
4980 | 726 static uint32_t get_image(mp_image_t *mpi){ |
727 if(mpi->type==MP_IMGTYPE_STATIC && num_buffers>1) return VO_FALSE; // it is not static | |
5466 | 728 if(mpi->type==MP_IMGTYPE_IPB && num_buffers<3 && mpi->flags&MP_IMGFLAG_READABLE) return VO_FALSE; // not enough |
5006 | 729 if(mpi->imgfmt!=image_format || mpi->imgfmt==IMGFMT_BGR24) return VO_FALSE; // needs conversion :( |
4980 | 730 // if(mpi->flags&MP_IMGFLAG_READABLE) return VO_FALSE; // slow video ram |
731 if(mpi->width==image_width){ | |
732 if(mpi->flags&MP_IMGFLAG_PLANAR){ | |
733 mpi->planes[0]=xvimage[current_buf]->data; | |
5316 | 734 if(mpi->flags&MP_IMGFLAG_SWAPPED){ |
735 // I420 | |
736 mpi->planes[1]=xvimage[current_buf]->data+image_width*image_height; | |
737 mpi->planes[2]=mpi->planes[1]+(image_width>>1)*(image_height>>1); | |
738 } else { | |
739 // YV12 | |
740 mpi->planes[2]=xvimage[current_buf]->data+image_width*image_height; | |
741 mpi->planes[1]=mpi->planes[2]+(image_width>>1)*(image_height>>1); | |
742 } | |
4980 | 743 mpi->stride[0]=image_width; |
744 mpi->stride[1]=mpi->stride[2]=image_width/2; | |
745 } else { | |
746 mpi->planes[0]=xvimage[current_buf]->data; | |
5761 | 747 mpi->stride[0]=image_width*(mpi->bpp>>3); |
4980 | 748 } |
749 mpi->flags|=MP_IMGFLAG_DIRECT; | |
750 // printf("mga: get_image() SUCCESS -> Direct Rendering ENABLED\n"); | |
751 return VO_TRUE; | |
752 } | |
753 return VO_FALSE; | |
754 } | |
755 | |
182 | 756 static uint32_t query_format(uint32_t format) |
1 | 757 { |
5566 | 758 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
|
759 /* check image formats */ |
5566 | 760 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
|
761 for(i = 0; i < formats; i++){ |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
762 // printf("Xvideo image format: 0x%x (%4.4s) %s\n", fo[i].id,(char*)&fo[i].id, (fo[i].format == XvPacked) ? "packed" : "planar"); |
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; |
408 | 766 |
5509
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
767 /* |
4629 | 768 switch(format){ |
769 case IMGFMT_YUY2: | |
770 case IMGFMT_UYVY: | |
771 case IMGFMT_YVYU: | |
772 | |
773 case IMGFMT_YV12: | |
774 case IMGFMT_I420: | |
775 case IMGFMT_IYUV: | |
776 | |
777 case IMGFMT_BGR24: | |
778 | |
408 | 779 // umm, this is a kludge, we need to ask the server.. (see init function above) |
780 return 1; | |
4629 | 781 } |
782 return 0; | |
5509
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
783 */ |
4629 | 784 |
1 | 785 } |
786 | |
1852 | 787 static void uninit(void) |
788 { | |
789 int i; | |
6016 | 790 #if 0 |
791 | |
5203
2f5ff1968d1c
hotfix (i doubt it will really fix this issue) by Fredrik Kuivinen <freku045@student.liu.se>
arpi
parents:
5006
diff
changeset
|
792 if(!mDisplay) return; |
4316 | 793 saver_on(mDisplay); // screen saver back on |
5509
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
794 if(vo_config_count) for( i=0;i<num_buffers;i++ ) deallocate_xvimage( i ); |
4426
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
795 #ifdef HAVE_XF86VM |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
796 vo_vm_close(mDisplay); |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
797 #endif |
6095 | 798 if(vo_config_count) vo_x11_uninit(); |
6016 | 799 |
800 #else | |
801 | |
802 if ( !vo_config_count ) return; | |
803 saver_on(mDisplay); // screen saver back on | |
804 for( i=0;i<num_buffers;i++ ) deallocate_xvimage( i ); | |
805 #ifdef HAVE_XF86VM | |
806 vo_vm_close(mDisplay); | |
807 #endif | |
6095 | 808 vo_x11_uninit(); |
6016 | 809 |
810 #endif | |
322
4e69a8e2700a
Screensaver and monitor powersafe function is switched off when playing a
laaz
parents:
249
diff
changeset
|
811 } |
1 | 812 |
4352 | 813 static uint32_t preinit(const char *arg) |
814 { | |
5509
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
815 XvPortID xv_p; |
6174
9676d7735332
different message for busy Xv ports and missing Xv ports
arpi
parents:
6125
diff
changeset
|
816 int busy_ports=0; |
6016 | 817 |
4737
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4658
diff
changeset
|
818 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
|
819 { |
5935 | 820 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
|
821 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
|
822 } |
5509
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
823 if (!vo_init()) return -1; |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
824 |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
825 xv_port = 0; |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
826 /* check for Xvideo extension */ |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
827 if (Success != XvQueryExtension(mDisplay,&ver,&rel,&req,&ev,&err)){ |
5935 | 828 mp_msg(MSGT_VO,MSGL_ERR,"Sorry, Xv not supported by this X11 version/driver\n"); |
829 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
|
830 return -1; |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
831 } |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
832 |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
833 /* check for Xvideo support */ |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
834 if (Success != XvQueryAdaptors(mDisplay,DefaultRootWindow(mDisplay), &adaptors,&ai)){ |
5935 | 835 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
|
836 return -1; |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
837 } |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
838 |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
839 /* check adaptors */ |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
840 for (i = 0; i < adaptors && xv_port == 0; i++){ |
5935 | 841 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
|
842 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
|
843 if (!XvGrabPort(mDisplay, xv_p, CurrentTime)) { |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
844 xv_port = xv_p; |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
845 break; |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
846 } else { |
6174
9676d7735332
different message for busy Xv ports and missing Xv ports
arpi
parents:
6125
diff
changeset
|
847 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
|
848 ++busy_ports; |
5509
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
849 } |
5935 | 850 } |
5509
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
851 } |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
852 if(!xv_port){ |
6174
9676d7735332
different message for busy Xv ports and missing Xv ports
arpi
parents:
6125
diff
changeset
|
853 if(busy_ports) |
9676d7735332
different message for busy Xv ports and missing Xv ports
arpi
parents:
6125
diff
changeset
|
854 mp_msg(MSGT_VO,MSGL_ERR,"Couldn't find free Xvideo port - maybe other applications keep open it.\n" |
9676d7735332
different message for busy Xv ports and missing Xv ports
arpi
parents:
6125
diff
changeset
|
855 "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
|
856 "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
|
857 else |
9676d7735332
different message for busy Xv ports and missing Xv ports
arpi
parents:
6125
diff
changeset
|
858 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
|
859 "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
|
860 "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
|
861 return -1; |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
862 } |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
863 |
5566 | 864 fo = XvListImageFormats(mDisplay, xv_port, (int*)&formats); |
865 | |
4737
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4658
diff
changeset
|
866 return 0; |
4352 | 867 } |
1 | 868 |
4352 | 869 static void query_vaa(vo_vaa_t *vaa) |
870 { | |
871 memset(vaa,0,sizeof(vo_vaa_t)); | |
4396 | 872 vaa->get_video_eq = xv_get_video_eq; |
873 vaa->set_video_eq = xv_set_video_eq; | |
4352 | 874 } |
4592
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
875 |
4596 | 876 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
|
877 { |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
878 switch (request) { |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
879 case VOCTRL_QUERY_VAA: |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
880 query_vaa((vo_vaa_t*)data); |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
881 return VO_TRUE; |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
882 case VOCTRL_QUERY_FORMAT: |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
883 return query_format(*((uint32_t*)data)); |
4980 | 884 case VOCTRL_GET_IMAGE: |
885 return get_image(data); | |
4981 | 886 case VOCTRL_FULLSCREEN: |
887 vo_x11_fullscreen(); | |
888 return VO_TRUE; | |
4592
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
889 } |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
890 return VO_NOTIMPL; |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
891 } |