Mercurial > mplayer.hg
annotate libvo/vo_xv.c @ 4790:50288f9f6b15
Fix return value of VOCTRL_FULLSCREEN
author | atmos4 |
---|---|
date | Thu, 21 Feb 2002 16:17:15 +0000 |
parents | 32e1f5042f65 |
children | b18e61cb457a |
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" | |
25 #include "video_out.h" | |
26 #include "video_out_internal.h" | |
27 | |
28 LIBVO_EXTERN(xv) | |
29 | |
30 #include <X11/Xlib.h> | |
31 #include <X11/Xutil.h> | |
32 #include <X11/extensions/XShm.h> | |
33 #include <errno.h> | |
34 | |
31 | 35 #include "x11_common.h" |
36 | |
354 | 37 #include "fastmemcpy.h" |
616 | 38 #include "sub.h" |
2054 | 39 #include "aspect.h" |
350 | 40 |
4629 | 41 #include "../postproc/rgb2rgb.h" |
42 | |
182 | 43 static vo_info_t vo_info = |
1 | 44 { |
182 | 45 "X11/Xv", |
46 "xv", | |
47 "Gerd Knorr <kraxel@goldbach.in-berlin.de>", | |
48 "" | |
1 | 49 }; |
50 | |
4296
a20c333d6c09
Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents:
3990
diff
changeset
|
51 extern int verbose; |
a20c333d6c09
Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents:
3990
diff
changeset
|
52 |
1 | 53 /* since it doesn't seem to be defined on some platforms */ |
54 int XShmGetEventBase(Display*); | |
55 | |
56 /* local data */ | |
57 static unsigned char *ImageData; | |
58 | |
59 /* X11 related variables */ | |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
60 //static Display *mydisplay; |
1 | 61 static Window mywindow; |
62 static GC mygc; | |
63 static XImage *myximage; | |
64 static int depth, bpp, mode; | |
65 static XWindowAttributes attribs; | |
66 | |
67 #include <X11/extensions/Xv.h> | |
68 #include <X11/extensions/Xvlib.h> | |
69 // FIXME: dynamically allocate this stuff | |
70 static void allocate_xvimage(int); | |
71 static unsigned int ver,rel,req,ev,err; | |
72 static unsigned int formats, adaptors,i,xv_port,xv_format; | |
73 static XvAdaptorInfo *ai; | |
74 static XvImageFormatValues *fo; | |
676
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
75 |
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
76 static int current_buf=0; |
1265 | 77 static int num_buffers=1; // default |
676
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
78 static XvImage* xvimage[NUM_BUFFERS]; |
1 | 79 |
80 #include <sys/ipc.h> | |
81 #include <sys/shm.h> | |
82 #include <X11/extensions/XShm.h> | |
83 | |
84 static int Shmem_Flag; | |
85 static int Quiet_Flag; | |
676
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
86 static XShmSegmentInfo Shminfo[NUM_BUFFERS]; |
1 | 87 static int gXErrorFlag; |
88 static int CompletionType = -1; | |
89 | |
90 static uint32_t image_width; | |
91 static uint32_t image_height; | |
92 static uint32_t image_format; | |
4629 | 93 static int flip_flag; |
1 | 94 |
182 | 95 static Window mRoot; |
96 static uint32_t drwX,drwY,drwWidth,drwHeight,drwBorderWidth,drwDepth; | |
97 static uint32_t drwcX,drwcY,dwidth,dheight,mFullscreen; | |
1 | 98 |
1775 | 99 #ifdef HAVE_NEW_GUI |
723 | 100 static uint32_t mdwidth,mdheight; |
101 #endif | |
102 | |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
103 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
|
104 |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
105 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
|
106 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
|
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){ |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
110 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
|
111 } |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
112 |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
113 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
|
114 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
|
115 } |
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 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
|
118 } |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
119 |
4396 | 120 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
|
121 { |
a20c333d6c09
Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents:
3990
diff
changeset
|
122 XvAttribute *attributes; |
4307 | 123 int howmany, xv_min,xv_max,xv_atomka; |
124 static int was_reset = 0; | |
125 /* 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
|
126 attributes = XvQueryPortAttributes(mDisplay, xv_port, &howmany); |
4307 | 127 /* first pass try reset */ |
4396 | 128 if(use_reset) |
4307 | 129 { |
4396 | 130 for (i = 0; i < howmany && attributes; i++) |
131 { | |
4307 | 132 if (attributes[i].flags & XvSettable && !strcmp(attributes[i].name,"XV_SET_DEFAULTS" |
133 )) | |
134 { | |
135 was_reset = 1; | |
136 if(verbose > 1) printf("vo_xv: reset gamma correction\n"); | |
137 xv_atomka = XInternAtom(mDisplay, attributes[i].name, True); | |
138 XvSetPortAttribute(mDisplay, xv_port, xv_atomka, attributes[i].max_value); | |
139 } | |
4396 | 140 } |
141 /* for safety purposes */ | |
142 if(!was_reset) return ENOSYS; | |
4307 | 143 } |
4296
a20c333d6c09
Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents:
3990
diff
changeset
|
144 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
|
145 { |
a20c333d6c09
Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents:
3990
diff
changeset
|
146 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
|
147 { |
a20c333d6c09
Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents:
3990
diff
changeset
|
148 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
|
149 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
|
150 xv_atomka = XInternAtom(mDisplay, attributes[i].name, True); |
4307 | 151 /* since we have SET_DEFAULTS first in our list, we can check if it's available |
152 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
|
153 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
|
154 { |
a20c333d6c09
Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents:
3990
diff
changeset
|
155 int port_value,port_min,port_max,port_mid; |
4396 | 156 if(strcmp(attributes[i].name,"XV_BRIGHTNESS") == 0 |
157 && (info->cap & VEQ_CAP_BRIGHTNESS)) | |
158 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
|
159 else |
4396 | 160 if(strcmp(attributes[i].name,"XV_SATURATION") == 0 |
161 && (info->cap & VEQ_CAP_SATURATION)) | |
162 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
|
163 else |
4396 | 164 if(strcmp(attributes[i].name,"XV_CONTRAST") == 0 |
165 && (info->cap & VEQ_CAP_CONTRAST)) | |
166 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
|
167 else |
4396 | 168 if(strcmp(attributes[i].name,"XV_HUE") == 0 |
169 && (info->cap & VEQ_CAP_HUE)) | |
170 port_value = info->hue; | |
4320
bfcf2517876b
RGB independed correction for GATOS's radeon_video driver!
nick
parents:
4317
diff
changeset
|
171 else |
bfcf2517876b
RGB independed correction for GATOS's radeon_video driver!
nick
parents:
4317
diff
changeset
|
172 /* Note: since 22.01.2002 GATOS supports these attrs for radeons (NK) */ |
4396 | 173 if(strcmp(attributes[i].name,"XV_RED_INTENSITY") == 0 |
174 && (info->cap & VEQ_CAP_RGB_INTENSITY)) | |
175 port_value = info->red_intensity; | |
4320
bfcf2517876b
RGB independed correction for GATOS's radeon_video driver!
nick
parents:
4317
diff
changeset
|
176 else |
4396 | 177 if(strcmp(attributes[i].name,"XV_GREEN_INTENSITY") == 0 |
178 && (info->cap & VEQ_CAP_RGB_INTENSITY)) | |
179 port_value = info->green_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_BLUE_INTENSITY") == 0 |
182 && (info->cap & VEQ_CAP_RGB_INTENSITY)) | |
183 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
|
184 else continue; |
4320
bfcf2517876b
RGB independed correction for GATOS's radeon_video driver!
nick
parents:
4317
diff
changeset
|
185 /* means that user has untouched this parameter since |
bfcf2517876b
RGB independed correction for GATOS's radeon_video driver!
nick
parents:
4317
diff
changeset
|
186 NVidia driver has default == min for XV_HUE but not mid */ |
4406 | 187 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
|
188 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
|
189 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
|
190 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
|
191 port_value = port_mid + (port_value * (port_max - port_min)) / 2000; |
a20c333d6c09
Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents:
3990
diff
changeset
|
192 if(verbose > 1) |
a20c333d6c09
Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents:
3990
diff
changeset
|
193 printf("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); |
a20c333d6c09
Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents:
3990
diff
changeset
|
194 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
|
195 } |
a20c333d6c09
Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents:
3990
diff
changeset
|
196 } |
a20c333d6c09
Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents:
3990
diff
changeset
|
197 } |
4396 | 198 return 0; |
199 } | |
200 | |
201 | |
202 static int xv_set_video_eq( const vidix_video_eq_t *info) | |
203 { | |
204 return __xv_set_video_eq(info,0); | |
205 } | |
206 | |
207 static int xv_get_video_eq( vidix_video_eq_t *info) | |
208 { | |
209 XvAttribute *attributes; | |
210 int howmany, xv_min,xv_max,xv_atomka; | |
211 /* get available attributes */ | |
212 memset(info,0,sizeof(vidix_video_eq_t)); | |
213 attributes = XvQueryPortAttributes(mDisplay, xv_port, &howmany); | |
214 for (i = 0; i < howmany && attributes; i++) | |
215 { | |
216 if (attributes[i].flags & XvGettable) | |
217 { | |
218 xv_min = attributes[i].min_value; | |
219 xv_max = attributes[i].max_value; | |
220 xv_atomka = XInternAtom(mDisplay, attributes[i].name, True); | |
221 /* since we have SET_DEFAULTS first in our list, we can check if it's available | |
222 then trigger it if it's ok so that the other values are at default upon query */ | |
223 if (xv_atomka != None) | |
224 { | |
225 int port_value,port_min,port_max,port_mid; | |
226 XvGetPortAttribute(mDisplay, xv_port, xv_atomka, &port_value); | |
227 if(verbose>1) printf("vo_xv: get: %s = %i\n",attributes[i].name,port_value); | |
228 | |
229 port_min = xv_min; | |
230 port_max = xv_max; | |
231 port_mid = (port_min + port_max) / 2; | |
232 port_value = ((port_value - port_mid)*2000)/(port_max-port_min); | |
233 | |
234 if(verbose>1) printf("vo_xv: assume: %s = %i\n",attributes[i].name,port_value); | |
235 | |
236 if(strcmp(attributes[i].name,"XV_BRIGHTNESS") == 0) | |
237 { | |
238 info->cap |= VEQ_CAP_BRIGHTNESS; | |
239 info->brightness = port_value; | |
240 } | |
241 else | |
242 if(strcmp(attributes[i].name,"XV_SATURATION") == 0) | |
243 { | |
244 info->cap |= VEQ_CAP_SATURATION; | |
245 info->saturation = port_value; | |
246 } | |
247 else | |
248 if(strcmp(attributes[i].name,"XV_CONTRAST") == 0) | |
249 { | |
250 info->cap |= VEQ_CAP_CONTRAST; | |
251 info->contrast = port_value; | |
252 } | |
253 else | |
254 if(strcmp(attributes[i].name,"XV_HUE") == 0) | |
255 { | |
256 info->cap |= VEQ_CAP_HUE; | |
257 info->hue = port_value; | |
258 } | |
259 else | |
260 /* Note: since 22.01.2002 GATOS supports these attrs for radeons (NK) */ | |
261 if(strcmp(attributes[i].name,"XV_RED_INTENSITY") == 0) | |
262 { | |
263 info->cap |= VEQ_CAP_RGB_INTENSITY; | |
264 info->red_intensity = port_value; | |
265 } | |
266 else | |
267 if(strcmp(attributes[i].name,"XV_GREEN_INTENSITY") == 0) | |
268 { | |
269 info->cap |= VEQ_CAP_RGB_INTENSITY; | |
270 info->green_intensity = port_value; | |
271 } | |
272 else | |
273 if(strcmp(attributes[i].name,"XV_BLUE_INTENSITY") == 0) | |
274 { | |
275 info->cap |= VEQ_CAP_RGB_INTENSITY; | |
276 info->blue_intensity = port_value; | |
277 } | |
278 else continue; | |
279 } | |
280 } | |
281 } | |
282 return 0; | |
283 } | |
284 | |
285 extern int vo_gamma_brightness; | |
286 extern int vo_gamma_saturation; | |
287 extern int vo_gamma_contrast; | |
288 extern int vo_gamma_hue; | |
289 extern int vo_gamma_red_intensity; | |
290 extern int vo_gamma_green_intensity; | |
291 extern int vo_gamma_blue_intensity; | |
292 | |
293 static void set_gamma_correction( void ) | |
294 { | |
295 vidix_video_eq_t info; | |
296 /* try all */ | |
297 info.cap = VEQ_CAP_BRIGHTNESS | VEQ_CAP_CONTRAST | VEQ_CAP_SATURATION | | |
298 VEQ_CAP_HUE | VEQ_CAP_RGB_INTENSITY; | |
299 info.flags = 0; /* doesn't matter for xv */ | |
300 info.brightness = vo_gamma_brightness; | |
301 info.contrast = vo_gamma_contrast; | |
302 info.saturation = vo_gamma_saturation; | |
303 info.hue = vo_gamma_hue; | |
304 info.red_intensity = vo_gamma_red_intensity; | |
305 info.green_intensity = vo_gamma_green_intensity; | |
306 info.blue_intensity = vo_gamma_blue_intensity; | |
307 /* reset with XV_SET_DEFAULTS only once */ | |
308 __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
|
309 } |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
310 |
182 | 311 /* |
312 * connect to server, create and map window, | |
1 | 313 * allocate colors and (shared) memory |
314 */ | |
4433 | 315 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 | 316 { |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
317 // int screen; |
182 | 318 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
|
319 // char *name = ":0.0"; |
182 | 320 XSizeHints hint; |
321 XVisualInfo vinfo; | |
322 XEvent xev; | |
1186
beb0ee0f3a25
Xv port locking patch by Artur Zaprzala <artur.zaprzala@talex.com.pl>
arpi_esp
parents:
1137
diff
changeset
|
323 XvPortID xv_p; |
1 | 324 |
182 | 325 XGCValues xgcv; |
326 XSetWindowAttributes xswa; | |
327 unsigned long xswamask; | |
4426
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
328 #ifdef HAVE_XF86VM |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
329 int vm=0; |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
330 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
|
331 static uint32_t vm_width; |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
332 static uint32_t vm_height; |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
333 #endif |
1 | 334 |
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
|
335 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
|
336 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
|
337 |
182 | 338 image_height = height; |
339 image_width = width; | |
340 image_format=format; | |
1 | 341 |
1775 | 342 #ifdef HAVE_NEW_GUI |
343 mdwidth=width; | |
344 mdheight=height; | |
345 #endif | |
346 | |
844 | 347 mFullscreen=flags&1; |
4426
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
348 if( flags&0x02 ) vm = 1; |
4629 | 349 flip_flag=flags&8; |
1265 | 350 num_buffers=vo_doublebuffering?NUM_BUFFERS: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
|
351 |
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
352 if (!vo_init()) return -1; |
1 | 353 |
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
|
354 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
|
355 |
1775 | 356 #ifdef HAVE_NEW_GUI |
723 | 357 if ( vo_window == None ) |
182 | 358 { |
723 | 359 #endif |
360 hint.x = 0; | |
361 hint.y = 0; | |
362 hint.width = d_width; | |
363 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
|
364 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
|
365 #ifdef HAVE_XF86VM |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
366 if ( vm ) |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
367 { |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
368 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
|
369 { 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
|
370 else |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
371 { 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
|
372 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
|
373 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
|
374 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
|
375 hint.width=modeline_width; |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
376 hint.height=modeline_height; |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
377 } |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
378 else |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
379 #endif |
844 | 380 if ( mFullscreen ) |
723 | 381 { |
382 hint.width=vo_screenwidth; | |
383 hint.height=vo_screenheight; | |
2054 | 384 #ifdef X11_FULLSCREEN |
2031
624df8ea0e0e
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
1924
diff
changeset
|
385 /* this code replaces X11_FULLSCREEN hack in mplayer.c |
2054 | 386 * 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
|
387 * 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
|
388 * 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
|
389 * 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
|
390 */ |
624df8ea0e0e
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
1924
diff
changeset
|
391 |
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
|
392 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
|
393 #endif |
624df8ea0e0e
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
1924
diff
changeset
|
394 |
723 | 395 } |
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
|
396 dwidth=d_width; dheight=d_height; //XXX: what are the copy vars used for? |
723 | 397 hint.flags = PPosition | PSize; |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
398 XGetWindowAttributes(mDisplay, DefaultRootWindow(mDisplay), &attribs); |
723 | 399 depth=attribs.depth; |
400 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
|
401 XMatchVisualInfo(mDisplay, mScreen, depth, TrueColor, &vinfo); |
723 | 402 |
403 xswa.background_pixel = 0; | |
404 xswa.border_pixel = 0; | |
405 xswamask = CWBackPixel | CWBorderPixel; | |
1 | 406 |
3830 | 407 if ( WinID>=0 ){ |
408 mywindow = WinID ? ((Window)WinID) : RootWindow(mDisplay,mScreen); | |
409 XUnmapWindow( mDisplay,mywindow ); | |
410 XChangeWindowAttributes( mDisplay,mywindow,xswamask,&xswa ); | |
411 } else | |
412 | |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
413 mywindow = XCreateWindow(mDisplay, RootWindow(mDisplay,mScreen), |
3830 | 414 hint.x, hint.y, hint.width, hint.height, |
415 0, depth,CopyFromParent,vinfo.visual,xswamask,&xswa); | |
416 | |
1137
4c7b219e126c
patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents:
922
diff
changeset
|
417 vo_x11_classhint( mDisplay,mywindow,"xv" ); |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
418 vo_hidecursor(mDisplay,mywindow); |
1 | 419 |
4658 | 420 XSelectInput(mDisplay, mywindow, StructureNotifyMask | KeyPressMask |
421 #ifdef HAVE_NEW_INPUT | |
422 | ButtonPressMask | ButtonReleaseMask | |
423 #endif | |
424 ); | |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
425 XSetStandardProperties(mDisplay, mywindow, hello, hello, None, NULL, 0, &hint); |
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
426 if ( mFullscreen ) vo_x11_decoration( mDisplay,mywindow,0 ); |
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
427 XMapWindow(mDisplay, mywindow); |
3990 | 428 #ifdef HAVE_XINERAMA |
429 vo_x11_xinerama_move(mDisplay,mywindow); | |
430 #endif | |
1775 | 431 mygc = XCreateGC(mDisplay, mywindow, 0L, &xgcv); |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
432 XFlush(mDisplay); |
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
433 XSync(mDisplay, False); |
4426
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
434 #ifdef HAVE_XF86VM |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
435 if ( vm ) |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
436 { |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
437 /* Grab the mouse pointer in our window */ |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
438 XGrabPointer(mDisplay, mywindow, True, 0, |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
439 GrabModeAsync, GrabModeAsync, |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
440 mywindow, None, CurrentTime); |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
441 XSetInputFocus(mDisplay, mywindow, RevertToNone, CurrentTime); |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
442 } |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
443 #endif |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
444 |
1775 | 445 #ifdef HAVE_NEW_GUI |
723 | 446 } |
447 else | |
448 { | |
449 mywindow=vo_window; | |
450 mygc=vo_gc; | |
451 } | |
452 #endif | |
1 | 453 |
182 | 454 xv_port = 0; |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
455 if (Success == XvQueryExtension(mDisplay,&ver,&rel,&req,&ev,&err)) |
182 | 456 { |
457 /* check for Xvideo support */ | |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
458 if (Success != XvQueryAdaptors(mDisplay,DefaultRootWindow(mDisplay), &adaptors,&ai)) |
182 | 459 { |
614 | 460 printf("Xv: XvQueryAdaptors failed"); |
182 | 461 return -1; |
462 } | |
463 /* check adaptors */ | |
1186
beb0ee0f3a25
Xv port locking patch by Artur Zaprzala <artur.zaprzala@talex.com.pl>
arpi_esp
parents:
1137
diff
changeset
|
464 for (i = 0; i < adaptors && xv_port == 0; i++) |
182 | 465 { |
1186
beb0ee0f3a25
Xv port locking patch by Artur Zaprzala <artur.zaprzala@talex.com.pl>
arpi_esp
parents:
1137
diff
changeset
|
466 if ((ai[i].type & XvInputMask) && (ai[i].type & XvImageMask)) |
beb0ee0f3a25
Xv port locking patch by Artur Zaprzala <artur.zaprzala@talex.com.pl>
arpi_esp
parents:
1137
diff
changeset
|
467 for (xv_p = ai[i].base_id; xv_p < ai[i].base_id+ai[i].num_ports; ++xv_p) |
beb0ee0f3a25
Xv port locking patch by Artur Zaprzala <artur.zaprzala@talex.com.pl>
arpi_esp
parents:
1137
diff
changeset
|
468 if (!XvGrabPort(mDisplay, xv_p, CurrentTime)) { |
beb0ee0f3a25
Xv port locking patch by Artur Zaprzala <artur.zaprzala@talex.com.pl>
arpi_esp
parents:
1137
diff
changeset
|
469 xv_port = xv_p; |
beb0ee0f3a25
Xv port locking patch by Artur Zaprzala <artur.zaprzala@talex.com.pl>
arpi_esp
parents:
1137
diff
changeset
|
470 break; |
beb0ee0f3a25
Xv port locking patch by Artur Zaprzala <artur.zaprzala@talex.com.pl>
arpi_esp
parents:
1137
diff
changeset
|
471 } else { |
beb0ee0f3a25
Xv port locking patch by Artur Zaprzala <artur.zaprzala@talex.com.pl>
arpi_esp
parents:
1137
diff
changeset
|
472 printf("Xv: could not grab port %i\n", (int)xv_p); |
beb0ee0f3a25
Xv port locking patch by Artur Zaprzala <artur.zaprzala@talex.com.pl>
arpi_esp
parents:
1137
diff
changeset
|
473 } |
182 | 474 } |
475 /* check image formats */ | |
476 if (xv_port != 0) | |
477 { | |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
478 fo = XvListImageFormats(mDisplay, xv_port, (int*)&formats); |
182 | 479 xv_format=0; |
4629 | 480 if(format==IMGFMT_BGR24) format=IMGFMT_YV12; |
481 for(i = 0; i < formats; i++){ | |
614 | 482 printf("Xvideo image format: 0x%x (%4.4s) %s\n", fo[i].id,(char*)&fo[i].id, (fo[i].format == XvPacked) ? "packed" : "planar"); |
4629 | 483 if (fo[i].id == format) xv_format = fo[i].id; |
484 } | |
182 | 485 if (!xv_format) xv_port = 0; |
486 } | |
487 | |
488 if (xv_port != 0) | |
489 { | |
614 | 490 printf( "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
|
491 |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
492 switch (xv_format){ |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
493 case IMGFMT_YV12: |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
494 case IMGFMT_I420: |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
495 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
|
496 case IMGFMT_YUY2: |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
497 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
|
498 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
|
499 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
|
500 } |
182 | 501 |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
502 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
|
503 allocate_xvimage(current_buf); |
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
504 |
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
505 current_buf=0; |
1 | 506 |
4396 | 507 #ifdef HAVE_NEW_GUI |
1818 | 508 if ( vo_window != None ) |
509 { | |
510 mFullscreen=0; | |
511 dwidth=mdwidth; dheight=mdheight; | |
512 if ( ( vo_dwidth == vo_screenwidth )&&( vo_dheight == vo_screenheight ) ) | |
513 { | |
514 mFullscreen=1; | |
515 dwidth=vo_screenwidth; | |
516 dheight=vo_screenwidth * mdheight / mdwidth; | |
517 } | |
518 } | |
4396 | 519 #endif |
520 set_gamma_correction(); | |
1818 | 521 |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
522 XGetGeometry( mDisplay,mywindow,&mRoot,&drwX,&drwY,&drwWidth,&drwHeight,&drwBorderWidth,&drwDepth ); |
182 | 523 drwX=0; drwY=0; |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
524 XTranslateCoordinates( mDisplay,mywindow,mRoot,0,0,&drwcX,&drwcY,&mRoot ); |
614 | 525 printf( "[xv] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",drwcX,drwcY,drwX,drwY,drwWidth,drwHeight ); |
1 | 526 |
3558 | 527 aspect(&dwidth,&dheight,A_NOZOOM); |
182 | 528 if ( mFullscreen ) |
529 { | |
3558 | 530 aspect(&dwidth,&dheight,A_ZOOM); |
2055
f5146118777e
Simplified aspect() for the loss of some functionality to get ansi compatibility.
atmos4
parents:
2054
diff
changeset
|
531 drwX=( vo_screenwidth - (dwidth > vo_screenwidth?vo_screenwidth:dwidth) ) / 2; |
182 | 532 drwcX+=drwX; |
2055
f5146118777e
Simplified aspect() for the loss of some functionality to get ansi compatibility.
atmos4
parents:
2054
diff
changeset
|
533 drwY=( vo_screenheight - (dheight > vo_screenheight?vo_screenheight:dheight) ) / 2; |
182 | 534 drwcY+=drwY; |
2055
f5146118777e
Simplified aspect() for the loss of some functionality to get ansi compatibility.
atmos4
parents:
2054
diff
changeset
|
535 drwWidth=(dwidth > vo_screenwidth?vo_screenwidth:dwidth); |
f5146118777e
Simplified aspect() for the loss of some functionality to get ansi compatibility.
atmos4
parents:
2054
diff
changeset
|
536 drwHeight=(dheight > vo_screenheight?vo_screenheight:dheight); |
614 | 537 printf( "[xv-fs] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",drwcX,drwcY,drwX,drwY,drwWidth,drwHeight ); |
182 | 538 } |
4316 | 539 saver_off(mDisplay); // turning off screen saver |
182 | 540 return 0; |
541 } | |
542 } | |
1 | 543 |
182 | 544 printf("Sorry, Xv not supported by this X11 version/driver\n"); |
545 printf("******** Try with -vo x11 or -vo sdl *********\n"); | |
546 return 1; | |
1 | 547 } |
548 | |
182 | 549 static const vo_info_t * get_info(void) |
550 { return &vo_info; } | |
1 | 551 |
182 | 552 static void allocate_xvimage(int foo) |
1 | 553 { |
182 | 554 /* |
555 * allocate XvImages. FIXME: no error checking, without | |
556 * mit-shm this will bomb... | |
557 */ | |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
558 xvimage[foo] = XvShmCreateImage(mDisplay, xv_port, xv_format, 0, image_width, image_height, &Shminfo[foo]); |
1 | 559 |
182 | 560 Shminfo[foo].shmid = shmget(IPC_PRIVATE, xvimage[foo]->data_size, IPC_CREAT | 0777); |
561 Shminfo[foo].shmaddr = (char *) shmat(Shminfo[foo].shmid, 0, 0); | |
562 Shminfo[foo].readOnly = False; | |
1 | 563 |
182 | 564 xvimage[foo]->data = Shminfo[foo].shmaddr; |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
565 XShmAttach(mDisplay, &Shminfo[foo]); |
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
566 XSync(mDisplay, False); |
182 | 567 shmctl(Shminfo[foo].shmid, IPC_RMID, 0); |
568 memset(xvimage[foo]->data,128,xvimage[foo]->data_size); | |
569 return; | |
1 | 570 } |
571 | |
1794 | 572 static void deallocate_xvimage(int foo) |
573 { | |
574 XShmDetach( mDisplay,&Shminfo[foo] ); | |
575 shmdt( Shminfo[foo].shmaddr ); | |
576 XFlush( mDisplay ); | |
577 XSync(mDisplay, False); | |
578 return; | |
579 } | |
580 | |
31 | 581 static void check_events(void) |
1 | 582 { |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
583 int e=vo_x11_check_events(mDisplay); |
182 | 584 if(e&VO_EVENT_RESIZE) |
585 { | |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
586 XGetGeometry( mDisplay,mywindow,&mRoot,&drwX,&drwY,&drwWidth,&drwHeight,&drwBorderWidth,&drwDepth ); |
182 | 587 drwX=0; drwY=0; |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
588 XTranslateCoordinates( mDisplay,mywindow,mRoot,0,0,&drwcX,&drwcY,&mRoot ); |
614 | 589 printf( "[xv] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",drwcX,drwcY,drwX,drwY,drwWidth,drwHeight ); |
1 | 590 |
1775 | 591 #ifdef HAVE_NEW_GUI |
723 | 592 if ( vo_window != None ) |
593 { | |
594 mFullscreen=0; | |
595 dwidth=mdwidth; dheight=mdheight; | |
1818 | 596 if ( ( vo_dwidth == vo_screenwidth )&&( vo_dheight == vo_screenheight ) ) |
723 | 597 { |
598 mFullscreen=1; | |
599 dwidth=vo_screenwidth; | |
600 dheight=vo_screenwidth * mdheight / mdwidth; | |
601 } | |
602 } | |
603 #endif | |
604 | |
3558 | 605 aspect(&dwidth,&dheight,A_NOZOOM); |
182 | 606 if ( mFullscreen ) |
607 { | |
3558 | 608 aspect(&dwidth,&dheight,A_ZOOM); |
182 | 609 drwX=( vo_screenwidth - (dwidth > vo_screenwidth?vo_screenwidth:dwidth) ) / 2; |
610 drwcX+=drwX; | |
611 drwY=( vo_screenheight - (dheight > vo_screenheight?vo_screenheight:dheight) ) / 2; | |
612 drwcY+=drwY; | |
613 drwWidth=(dwidth > vo_screenwidth?vo_screenwidth:dwidth); | |
614 drwHeight=(dheight > vo_screenheight?vo_screenheight:dheight); | |
614 | 615 printf( "[xv-fs] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",drwcX,drwcY,drwX,drwY,drwWidth,drwHeight ); |
182 | 616 } |
617 } | |
1858
88a88d0a3f94
fix skin changing, xv fullscreen redraw bug, etc.
pontscho
parents:
1852
diff
changeset
|
618 if ( e & VO_EVENT_EXPOSE ) |
88a88d0a3f94
fix skin changing, xv fullscreen redraw bug, etc.
pontscho
parents:
1852
diff
changeset
|
619 { |
88a88d0a3f94
fix skin changing, xv fullscreen redraw bug, etc.
pontscho
parents:
1852
diff
changeset
|
620 XvShmPutImage(mDisplay, xv_port, mywindow, mygc, xvimage[current_buf], 0, 0, image_width, image_height, drwX, drwY, 1, 1, False); |
88a88d0a3f94
fix skin changing, xv fullscreen redraw bug, etc.
pontscho
parents:
1852
diff
changeset
|
621 XvShmPutImage(mDisplay, xv_port, mywindow, mygc, xvimage[current_buf], 0, 0, image_width, image_height, drwX,drwY,drwWidth,(mFullscreen?drwHeight - 1:drwHeight), False); |
88a88d0a3f94
fix skin changing, xv fullscreen redraw bug, etc.
pontscho
parents:
1852
diff
changeset
|
622 } |
1 | 623 } |
624 | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1265
diff
changeset
|
625 static void draw_osd(void) |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
626 { 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
|
627 |
182 | 628 static void flip_page(void) |
1 | 629 { |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
630 XvShmPutImage(mDisplay, xv_port, mywindow, mygc, xvimage[current_buf], |
182 | 631 0, 0, image_width, image_height, |
632 drwX,drwY,drwWidth,(mFullscreen?drwHeight - 1:drwHeight), | |
633 False); | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1265
diff
changeset
|
634 if (num_buffers>1){ |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1265
diff
changeset
|
635 current_buf=(current_buf+1)%num_buffers; |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1265
diff
changeset
|
636 XFlush(mDisplay); |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1265
diff
changeset
|
637 } else |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1265
diff
changeset
|
638 XSync(mDisplay, False); |
182 | 639 return; |
1 | 640 } |
641 | |
247 | 642 |
643 | |
182 | 644 static uint32_t draw_slice(uint8_t *image[], int stride[], int w,int h,int x,int y) |
1 | 645 { |
182 | 646 uint8_t *src; |
647 uint8_t *dst; | |
648 int i; | |
649 | |
676
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
650 dst = xvimage[current_buf]->data + image_width * y + x; |
182 | 651 src = image[0]; |
652 if(w==stride[0] && w==image_width) memcpy(dst,src,w*h); | |
653 else | |
654 for(i=0;i<h;i++) | |
655 { | |
656 memcpy(dst,src,w); | |
657 src+=stride[0]; | |
658 dst+=image_width; | |
659 } | |
660 | |
661 x/=2;y/=2;w/=2;h/=2; | |
1 | 662 |
676
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
663 dst = xvimage[current_buf]->data + image_width * image_height + image_width/2 * y + x; |
182 | 664 src = image[2]; |
665 if(w==stride[2] && w==image_width/2) memcpy(dst,src,w*h); | |
666 else | |
667 for(i=0;i<h;i++) | |
668 { | |
669 memcpy(dst,src,w); | |
670 src+=stride[2]; | |
671 dst+=image_width/2; | |
672 } | |
676
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
673 dst = xvimage[current_buf]->data + image_width * image_height * 5 / 4 + image_width/2 * y + x; |
182 | 674 src = image[1]; |
675 if(w==stride[1] && w==image_width/2) memcpy(dst,src,w*h); | |
676 else | |
677 for(i=0;i<h;i++) | |
678 { | |
679 memcpy(dst,src,w); | |
680 src+=stride[1]; | |
681 dst+=image_width/2; | |
682 } | |
683 return 0; | |
1 | 684 } |
685 | |
182 | 686 static uint32_t draw_frame(uint8_t *src[]) |
1 | 687 { |
688 | |
4629 | 689 switch (image_format) { |
408 | 690 case IMGFMT_YUY2: |
691 case IMGFMT_UYVY: | |
692 case IMGFMT_YVYU: | |
693 | |
694 // YUY2 packed, flipped | |
1 | 695 #if 0 |
408 | 696 int i; |
697 unsigned short *s=(unsigned short *)src[0]; | |
676
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
698 unsigned short *d=(unsigned short *)xvimage[current_buf]->data; |
408 | 699 s+=image_width*image_height; |
700 for(i=0;i<image_height;i++) { | |
701 s-=image_width; | |
702 memcpy(d,s,image_width*2); | |
703 d+=image_width; | |
704 } | |
1 | 705 #else |
676
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
706 memcpy(xvimage[current_buf]->data,src[0],image_width*image_height*2); |
1 | 707 #endif |
408 | 708 break; |
709 | |
710 case IMGFMT_YV12: | |
711 case IMGFMT_I420: | |
712 case IMGFMT_IYUV: | |
713 | |
182 | 714 // YV12 planar |
676
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
715 memcpy(xvimage[current_buf]->data,src[0],image_width*image_height); |
4351 | 716 if (xv_format == IMGFMT_YV12) |
717 { | |
718 memcpy(xvimage[current_buf]->data+image_width*image_height,src[2],image_width*image_height/4); | |
719 memcpy(xvimage[current_buf]->data+image_width*image_height*5/4,src[1],image_width*image_height/4); | |
720 } | |
721 else | |
722 { | |
723 memcpy(xvimage[current_buf]->data+image_width*image_height,src[1],image_width*image_height/4); | |
724 memcpy(xvimage[current_buf]->data+image_width*image_height*5/4,src[2],image_width*image_height/4); | |
725 } | |
408 | 726 break; |
4629 | 727 |
728 case IMGFMT_BGR24: | |
729 | |
730 if(flip_flag) // tricky, using negative src stride: | |
731 rgb24toyv12(src[0]+3*image_width*(image_height-1), | |
732 xvimage[current_buf]->data, | |
733 xvimage[current_buf]->data+image_width*image_height*5/4, | |
734 xvimage[current_buf]->data+image_width*image_height, | |
735 image_width,image_height, | |
736 image_width,image_width/2,-3*image_width); | |
737 else | |
738 rgb24toyv12(src[0], | |
739 xvimage[current_buf]->data, | |
740 xvimage[current_buf]->data+image_width*image_height*5/4, | |
741 xvimage[current_buf]->data+image_width*image_height, | |
742 image_width,image_height, | |
743 image_width,image_width/2,3*image_width); | |
744 break; | |
745 | |
408 | 746 } |
182 | 747 |
748 return 0; | |
1 | 749 } |
750 | |
182 | 751 static uint32_t query_format(uint32_t format) |
1 | 752 { |
408 | 753 |
4629 | 754 switch(format){ |
755 case IMGFMT_YUY2: | |
756 case IMGFMT_UYVY: | |
757 case IMGFMT_YVYU: | |
758 | |
759 case IMGFMT_YV12: | |
760 case IMGFMT_I420: | |
761 case IMGFMT_IYUV: | |
762 | |
763 case IMGFMT_BGR24: | |
764 | |
408 | 765 // umm, this is a kludge, we need to ask the server.. (see init function above) |
766 return 1; | |
4629 | 767 } |
768 | |
769 return 0; | |
770 | |
1 | 771 } |
772 | |
1852 | 773 static void uninit(void) |
774 { | |
775 int i; | |
4316 | 776 saver_on(mDisplay); // screen saver back on |
1794 | 777 #ifdef HAVE_NEW_GUI |
1852 | 778 if ( vo_window == None ) |
1794 | 779 #endif |
1924 | 780 { |
781 XDestroyWindow( mDisplay,mywindow ); | |
782 } | |
1852 | 783 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
|
784 #ifdef HAVE_XF86VM |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
785 vo_vm_close(mDisplay); |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
786 #endif |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
787 |
322
4e69a8e2700a
Screensaver and monitor powersafe function is switched off when playing a
laaz
parents:
249
diff
changeset
|
788 } |
1 | 789 |
4352 | 790 static uint32_t preinit(const char *arg) |
791 { | |
4737
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4658
diff
changeset
|
792 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
|
793 { |
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4658
diff
changeset
|
794 printf("vo_xv: Unknown subdevice: %s\n",arg); |
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4658
diff
changeset
|
795 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
|
796 } |
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4658
diff
changeset
|
797 return 0; |
4352 | 798 } |
1 | 799 |
4352 | 800 static void query_vaa(vo_vaa_t *vaa) |
801 { | |
802 memset(vaa,0,sizeof(vo_vaa_t)); | |
4396 | 803 vaa->get_video_eq = xv_get_video_eq; |
804 vaa->set_video_eq = xv_set_video_eq; | |
4352 | 805 } |
4592
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
806 |
4596 | 807 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
|
808 { |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
809 switch (request) { |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
810 case VOCTRL_QUERY_VAA: |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
811 query_vaa((vo_vaa_t*)data); |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
812 return VO_TRUE; |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
813 case VOCTRL_QUERY_FORMAT: |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
814 return query_format(*((uint32_t*)data)); |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
815 } |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
816 return VO_NOTIMPL; |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
817 } |