Mercurial > mplayer.hg
annotate libvo/vo_xv.c @ 4965:923605707de6
sorry, 10l:)
author | pontscho |
---|---|
date | Thu, 07 Mar 2002 00:03:51 +0000 |
parents | 178b524e5213 |
children | ae66f5ca2225 |
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 */ | |
60 static XImage *myximage; | |
61 static int depth, bpp, mode; | |
62 static XWindowAttributes attribs; | |
63 | |
64 #include <X11/extensions/Xv.h> | |
65 #include <X11/extensions/Xvlib.h> | |
66 // FIXME: dynamically allocate this stuff | |
67 static void allocate_xvimage(int); | |
68 static unsigned int ver,rel,req,ev,err; | |
69 static unsigned int formats, adaptors,i,xv_port,xv_format; | |
70 static XvAdaptorInfo *ai; | |
71 static XvImageFormatValues *fo; | |
676
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
72 |
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
73 static int current_buf=0; |
1265 | 74 static int num_buffers=1; // default |
676
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
75 static XvImage* xvimage[NUM_BUFFERS]; |
1 | 76 |
77 #include <sys/ipc.h> | |
78 #include <sys/shm.h> | |
79 #include <X11/extensions/XShm.h> | |
80 | |
81 static int Shmem_Flag; | |
82 static int Quiet_Flag; | |
676
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
83 static XShmSegmentInfo Shminfo[NUM_BUFFERS]; |
1 | 84 static int gXErrorFlag; |
85 static int CompletionType = -1; | |
86 | |
87 static uint32_t image_width; | |
88 static uint32_t image_height; | |
89 static uint32_t image_format; | |
4629 | 90 static int flip_flag; |
1 | 91 |
182 | 92 static Window mRoot; |
93 static uint32_t drwX,drwY,drwWidth,drwHeight,drwBorderWidth,drwDepth; | |
94 static uint32_t drwcX,drwcY,dwidth,dheight,mFullscreen; | |
1 | 95 |
1775 | 96 #ifdef HAVE_NEW_GUI |
723 | 97 static uint32_t mdwidth,mdheight; |
98 #endif | |
99 | |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
100 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
|
101 |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
102 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
|
103 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
|
104 } |
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 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
|
107 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
|
108 } |
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 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
|
111 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
|
112 } |
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 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
|
115 } |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
116 |
4396 | 117 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
|
118 { |
a20c333d6c09
Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents:
3990
diff
changeset
|
119 XvAttribute *attributes; |
4307 | 120 int howmany, xv_min,xv_max,xv_atomka; |
121 static int was_reset = 0; | |
122 /* 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
|
123 attributes = XvQueryPortAttributes(mDisplay, xv_port, &howmany); |
4307 | 124 /* first pass try reset */ |
4396 | 125 if(use_reset) |
4307 | 126 { |
4396 | 127 for (i = 0; i < howmany && attributes; i++) |
128 { | |
4307 | 129 if (attributes[i].flags & XvSettable && !strcmp(attributes[i].name,"XV_SET_DEFAULTS" |
130 )) | |
131 { | |
132 was_reset = 1; | |
133 if(verbose > 1) printf("vo_xv: reset gamma correction\n"); | |
134 xv_atomka = XInternAtom(mDisplay, attributes[i].name, True); | |
135 XvSetPortAttribute(mDisplay, xv_port, xv_atomka, attributes[i].max_value); | |
136 } | |
4396 | 137 } |
138 /* for safety purposes */ | |
139 if(!was_reset) return ENOSYS; | |
4307 | 140 } |
4296
a20c333d6c09
Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents:
3990
diff
changeset
|
141 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
|
142 { |
a20c333d6c09
Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents:
3990
diff
changeset
|
143 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
|
144 { |
a20c333d6c09
Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents:
3990
diff
changeset
|
145 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
|
146 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
|
147 xv_atomka = XInternAtom(mDisplay, attributes[i].name, True); |
4307 | 148 /* since we have SET_DEFAULTS first in our list, we can check if it's available |
149 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
|
150 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
|
151 { |
a20c333d6c09
Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents:
3990
diff
changeset
|
152 int port_value,port_min,port_max,port_mid; |
4396 | 153 if(strcmp(attributes[i].name,"XV_BRIGHTNESS") == 0 |
154 && (info->cap & VEQ_CAP_BRIGHTNESS)) | |
155 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
|
156 else |
4396 | 157 if(strcmp(attributes[i].name,"XV_SATURATION") == 0 |
158 && (info->cap & VEQ_CAP_SATURATION)) | |
159 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
|
160 else |
4396 | 161 if(strcmp(attributes[i].name,"XV_CONTRAST") == 0 |
162 && (info->cap & VEQ_CAP_CONTRAST)) | |
163 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
|
164 else |
4396 | 165 if(strcmp(attributes[i].name,"XV_HUE") == 0 |
166 && (info->cap & VEQ_CAP_HUE)) | |
167 port_value = info->hue; | |
4320
bfcf2517876b
RGB independed correction for GATOS's radeon_video driver!
nick
parents:
4317
diff
changeset
|
168 else |
bfcf2517876b
RGB independed correction for GATOS's radeon_video driver!
nick
parents:
4317
diff
changeset
|
169 /* Note: since 22.01.2002 GATOS supports these attrs for radeons (NK) */ |
4396 | 170 if(strcmp(attributes[i].name,"XV_RED_INTENSITY") == 0 |
171 && (info->cap & VEQ_CAP_RGB_INTENSITY)) | |
172 port_value = info->red_intensity; | |
4320
bfcf2517876b
RGB independed correction for GATOS's radeon_video driver!
nick
parents:
4317
diff
changeset
|
173 else |
4396 | 174 if(strcmp(attributes[i].name,"XV_GREEN_INTENSITY") == 0 |
175 && (info->cap & VEQ_CAP_RGB_INTENSITY)) | |
176 port_value = info->green_intensity; | |
4320
bfcf2517876b
RGB independed correction for GATOS's radeon_video driver!
nick
parents:
4317
diff
changeset
|
177 else |
4396 | 178 if(strcmp(attributes[i].name,"XV_BLUE_INTENSITY") == 0 |
179 && (info->cap & VEQ_CAP_RGB_INTENSITY)) | |
180 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
|
181 else continue; |
4320
bfcf2517876b
RGB independed correction for GATOS's radeon_video driver!
nick
parents:
4317
diff
changeset
|
182 /* means that user has untouched this parameter since |
bfcf2517876b
RGB independed correction for GATOS's radeon_video driver!
nick
parents:
4317
diff
changeset
|
183 NVidia driver has default == min for XV_HUE but not mid */ |
4406 | 184 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
|
185 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
|
186 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
|
187 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
|
188 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
|
189 if(verbose > 1) |
a20c333d6c09
Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents:
3990
diff
changeset
|
190 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
|
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); | |
224 if(verbose>1) printf("vo_xv: get: %s = %i\n",attributes[i].name,port_value); | |
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 | |
231 if(verbose>1) printf("vo_xv: assume: %s = %i\n",attributes[i].name,port_value); | |
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; | |
1186
beb0ee0f3a25
Xv port locking patch by Artur Zaprzala <artur.zaprzala@talex.com.pl>
arpi_esp
parents:
1137
diff
changeset
|
320 XvPortID xv_p; |
1 | 321 |
182 | 322 XGCValues xgcv; |
323 XSetWindowAttributes xswa; | |
324 unsigned long xswamask; | |
4426
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
325 #ifdef HAVE_XF86VM |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
326 int vm=0; |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
327 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
|
328 static uint32_t vm_width; |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
329 static uint32_t vm_height; |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
330 #endif |
1 | 331 |
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
|
332 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
|
333 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
|
334 |
182 | 335 image_height = height; |
336 image_width = width; | |
337 image_format=format; | |
1 | 338 |
1775 | 339 #ifdef HAVE_NEW_GUI |
340 mdwidth=width; | |
341 mdheight=height; | |
342 #endif | |
343 | |
844 | 344 mFullscreen=flags&1; |
4426
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
345 if( flags&0x02 ) vm = 1; |
4629 | 346 flip_flag=flags&8; |
1265 | 347 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
|
348 |
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
349 if (!vo_init()) return -1; |
1 | 350 |
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
|
351 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
|
352 |
1775 | 353 #ifdef HAVE_NEW_GUI |
723 | 354 if ( vo_window == None ) |
182 | 355 { |
723 | 356 #endif |
357 hint.x = 0; | |
358 hint.y = 0; | |
359 hint.width = d_width; | |
360 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
|
361 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
|
362 #ifdef HAVE_XF86VM |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
363 if ( vm ) |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
364 { |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
365 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
|
366 { 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
|
367 else |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
368 { 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
|
369 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
|
370 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
|
371 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
|
372 hint.width=modeline_width; |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
373 hint.height=modeline_height; |
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 else |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
376 #endif |
844 | 377 if ( mFullscreen ) |
723 | 378 { |
379 hint.width=vo_screenwidth; | |
380 hint.height=vo_screenheight; | |
2054 | 381 #ifdef X11_FULLSCREEN |
2031
624df8ea0e0e
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
1924
diff
changeset
|
382 /* this code replaces X11_FULLSCREEN hack in mplayer.c |
2054 | 383 * 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
|
384 * 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
|
385 * 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
|
386 * 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
|
387 */ |
624df8ea0e0e
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
1924
diff
changeset
|
388 |
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
|
389 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
|
390 #endif |
624df8ea0e0e
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
1924
diff
changeset
|
391 |
723 | 392 } |
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
|
393 dwidth=d_width; dheight=d_height; //XXX: what are the copy vars used for? |
723 | 394 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
|
395 XGetWindowAttributes(mDisplay, DefaultRootWindow(mDisplay), &attribs); |
723 | 396 depth=attribs.depth; |
397 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
|
398 XMatchVisualInfo(mDisplay, mScreen, depth, TrueColor, &vinfo); |
723 | 399 |
400 xswa.background_pixel = 0; | |
401 xswa.border_pixel = 0; | |
402 xswamask = CWBackPixel | CWBorderPixel; | |
1 | 403 |
3830 | 404 if ( WinID>=0 ){ |
4795 | 405 vo_window = WinID ? ((Window)WinID) : RootWindow(mDisplay,mScreen); |
406 XUnmapWindow( mDisplay,vo_window ); | |
407 XChangeWindowAttributes( mDisplay,vo_window,xswamask,&xswa ); | |
3830 | 408 } else |
409 | |
4795 | 410 vo_window = XCreateWindow(mDisplay, RootWindow(mDisplay,mScreen), |
3830 | 411 hint.x, hint.y, hint.width, hint.height, |
412 0, depth,CopyFromParent,vinfo.visual,xswamask,&xswa); | |
413 | |
4795 | 414 vo_x11_classhint( mDisplay,vo_window,"xv" ); |
415 vo_hidecursor(mDisplay,vo_window); | |
1 | 416 |
4795 | 417 XSelectInput(mDisplay, vo_window, StructureNotifyMask | KeyPressMask |
4658 | 418 #ifdef HAVE_NEW_INPUT |
419 | ButtonPressMask | ButtonReleaseMask | |
420 #endif | |
421 ); | |
4795 | 422 XSetStandardProperties(mDisplay, vo_window, hello, hello, None, NULL, 0, &hint); |
423 if ( mFullscreen ) vo_x11_decoration( mDisplay,vo_window,0 ); | |
424 XMapWindow(mDisplay, vo_window); | |
3990 | 425 #ifdef HAVE_XINERAMA |
4795 | 426 vo_x11_xinerama_move(mDisplay,vo_window); |
3990 | 427 #endif |
4795 | 428 vo_gc = XCreateGC(mDisplay, vo_window, 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
|
429 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
|
430 XSync(mDisplay, False); |
4426
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
431 #ifdef HAVE_XF86VM |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
432 if ( vm ) |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
433 { |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
434 /* Grab the mouse pointer in our window */ |
4795 | 435 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
|
436 GrabModeAsync, GrabModeAsync, |
4795 | 437 vo_window, None, CurrentTime); |
438 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
|
439 } |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
440 #endif |
1775 | 441 #ifdef HAVE_NEW_GUI |
723 | 442 } |
443 #endif | |
1 | 444 |
182 | 445 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
|
446 if (Success == XvQueryExtension(mDisplay,&ver,&rel,&req,&ev,&err)) |
182 | 447 { |
448 /* 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
|
449 if (Success != XvQueryAdaptors(mDisplay,DefaultRootWindow(mDisplay), &adaptors,&ai)) |
182 | 450 { |
614 | 451 printf("Xv: XvQueryAdaptors failed"); |
182 | 452 return -1; |
453 } | |
454 /* check adaptors */ | |
1186
beb0ee0f3a25
Xv port locking patch by Artur Zaprzala <artur.zaprzala@talex.com.pl>
arpi_esp
parents:
1137
diff
changeset
|
455 for (i = 0; i < adaptors && xv_port == 0; i++) |
182 | 456 { |
1186
beb0ee0f3a25
Xv port locking patch by Artur Zaprzala <artur.zaprzala@talex.com.pl>
arpi_esp
parents:
1137
diff
changeset
|
457 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
|
458 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
|
459 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
|
460 xv_port = xv_p; |
beb0ee0f3a25
Xv port locking patch by Artur Zaprzala <artur.zaprzala@talex.com.pl>
arpi_esp
parents:
1137
diff
changeset
|
461 break; |
beb0ee0f3a25
Xv port locking patch by Artur Zaprzala <artur.zaprzala@talex.com.pl>
arpi_esp
parents:
1137
diff
changeset
|
462 } else { |
beb0ee0f3a25
Xv port locking patch by Artur Zaprzala <artur.zaprzala@talex.com.pl>
arpi_esp
parents:
1137
diff
changeset
|
463 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
|
464 } |
182 | 465 } |
466 /* check image formats */ | |
467 if (xv_port != 0) | |
468 { | |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
469 fo = XvListImageFormats(mDisplay, xv_port, (int*)&formats); |
182 | 470 xv_format=0; |
4629 | 471 if(format==IMGFMT_BGR24) format=IMGFMT_YV12; |
472 for(i = 0; i < formats; i++){ | |
614 | 473 printf("Xvideo image format: 0x%x (%4.4s) %s\n", fo[i].id,(char*)&fo[i].id, (fo[i].format == XvPacked) ? "packed" : "planar"); |
4629 | 474 if (fo[i].id == format) xv_format = fo[i].id; |
475 } | |
182 | 476 if (!xv_format) xv_port = 0; |
477 } | |
478 | |
479 if (xv_port != 0) | |
480 { | |
614 | 481 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
|
482 |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
483 switch (xv_format){ |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
484 case IMGFMT_YV12: |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
485 case IMGFMT_I420: |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
486 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
|
487 case IMGFMT_YUY2: |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
488 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
|
489 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
|
490 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
|
491 } |
182 | 492 |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
493 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
|
494 allocate_xvimage(current_buf); |
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
495 |
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
496 current_buf=0; |
1 | 497 |
4396 | 498 #ifdef HAVE_NEW_GUI |
1818 | 499 if ( vo_window != None ) |
500 { | |
501 mFullscreen=0; | |
502 dwidth=mdwidth; dheight=mdheight; | |
503 if ( ( vo_dwidth == vo_screenwidth )&&( vo_dheight == vo_screenheight ) ) | |
504 { | |
505 mFullscreen=1; | |
506 dwidth=vo_screenwidth; | |
507 dheight=vo_screenwidth * mdheight / mdwidth; | |
508 } | |
509 } | |
4396 | 510 #endif |
511 set_gamma_correction(); | |
1818 | 512 |
4795 | 513 XGetGeometry( mDisplay,vo_window,&mRoot,&drwX,&drwY,&drwWidth,&drwHeight,&drwBorderWidth,&drwDepth ); |
182 | 514 drwX=0; drwY=0; |
4795 | 515 XTranslateCoordinates( mDisplay,vo_window,mRoot,0,0,&drwcX,&drwcY,&mRoot ); |
614 | 516 printf( "[xv] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",drwcX,drwcY,drwX,drwY,drwWidth,drwHeight ); |
1 | 517 |
3558 | 518 aspect(&dwidth,&dheight,A_NOZOOM); |
182 | 519 if ( mFullscreen ) |
520 { | |
3558 | 521 aspect(&dwidth,&dheight,A_ZOOM); |
2055
f5146118777e
Simplified aspect() for the loss of some functionality to get ansi compatibility.
atmos4
parents:
2054
diff
changeset
|
522 drwX=( vo_screenwidth - (dwidth > vo_screenwidth?vo_screenwidth:dwidth) ) / 2; |
182 | 523 drwcX+=drwX; |
2055
f5146118777e
Simplified aspect() for the loss of some functionality to get ansi compatibility.
atmos4
parents:
2054
diff
changeset
|
524 drwY=( vo_screenheight - (dheight > vo_screenheight?vo_screenheight:dheight) ) / 2; |
182 | 525 drwcY+=drwY; |
2055
f5146118777e
Simplified aspect() for the loss of some functionality to get ansi compatibility.
atmos4
parents:
2054
diff
changeset
|
526 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
|
527 drwHeight=(dheight > vo_screenheight?vo_screenheight:dheight); |
614 | 528 printf( "[xv-fs] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",drwcX,drwcY,drwX,drwY,drwWidth,drwHeight ); |
182 | 529 } |
4316 | 530 saver_off(mDisplay); // turning off screen saver |
182 | 531 return 0; |
532 } | |
533 } | |
1 | 534 |
182 | 535 printf("Sorry, Xv not supported by this X11 version/driver\n"); |
536 printf("******** Try with -vo x11 or -vo sdl *********\n"); | |
537 return 1; | |
1 | 538 } |
539 | |
182 | 540 static const vo_info_t * get_info(void) |
541 { return &vo_info; } | |
1 | 542 |
182 | 543 static void allocate_xvimage(int foo) |
1 | 544 { |
182 | 545 /* |
546 * allocate XvImages. FIXME: no error checking, without | |
547 * mit-shm this will bomb... | |
548 */ | |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
549 xvimage[foo] = XvShmCreateImage(mDisplay, xv_port, xv_format, 0, image_width, image_height, &Shminfo[foo]); |
1 | 550 |
182 | 551 Shminfo[foo].shmid = shmget(IPC_PRIVATE, xvimage[foo]->data_size, IPC_CREAT | 0777); |
552 Shminfo[foo].shmaddr = (char *) shmat(Shminfo[foo].shmid, 0, 0); | |
553 Shminfo[foo].readOnly = False; | |
1 | 554 |
182 | 555 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
|
556 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
|
557 XSync(mDisplay, False); |
182 | 558 shmctl(Shminfo[foo].shmid, IPC_RMID, 0); |
559 memset(xvimage[foo]->data,128,xvimage[foo]->data_size); | |
560 return; | |
1 | 561 } |
562 | |
1794 | 563 static void deallocate_xvimage(int foo) |
564 { | |
565 XShmDetach( mDisplay,&Shminfo[foo] ); | |
566 shmdt( Shminfo[foo].shmaddr ); | |
567 XFlush( mDisplay ); | |
568 XSync(mDisplay, False); | |
569 return; | |
570 } | |
571 | |
31 | 572 static void check_events(void) |
1 | 573 { |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
574 int e=vo_x11_check_events(mDisplay); |
182 | 575 if(e&VO_EVENT_RESIZE) |
576 { | |
4795 | 577 XGetGeometry( mDisplay,vo_window,&mRoot,&drwX,&drwY,&drwWidth,&drwHeight,&drwBorderWidth,&drwDepth ); |
182 | 578 drwX=0; drwY=0; |
4795 | 579 XTranslateCoordinates( mDisplay,vo_window,mRoot,0,0,&drwcX,&drwcY,&mRoot ); |
614 | 580 printf( "[xv] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",drwcX,drwcY,drwX,drwY,drwWidth,drwHeight ); |
1 | 581 |
1775 | 582 #ifdef HAVE_NEW_GUI |
723 | 583 if ( vo_window != None ) |
584 { | |
585 mFullscreen=0; | |
586 dwidth=mdwidth; dheight=mdheight; | |
1818 | 587 if ( ( vo_dwidth == vo_screenwidth )&&( vo_dheight == vo_screenheight ) ) |
723 | 588 { |
589 mFullscreen=1; | |
590 dwidth=vo_screenwidth; | |
591 dheight=vo_screenwidth * mdheight / mdwidth; | |
592 } | |
593 } | |
594 #endif | |
595 | |
3558 | 596 aspect(&dwidth,&dheight,A_NOZOOM); |
182 | 597 if ( mFullscreen ) |
598 { | |
3558 | 599 aspect(&dwidth,&dheight,A_ZOOM); |
182 | 600 drwX=( vo_screenwidth - (dwidth > vo_screenwidth?vo_screenwidth:dwidth) ) / 2; |
601 drwcX+=drwX; | |
602 drwY=( vo_screenheight - (dheight > vo_screenheight?vo_screenheight:dheight) ) / 2; | |
603 drwcY+=drwY; | |
604 drwWidth=(dwidth > vo_screenwidth?vo_screenwidth:dwidth); | |
605 drwHeight=(dheight > vo_screenheight?vo_screenheight:dheight); | |
614 | 606 printf( "[xv-fs] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",drwcX,drwcY,drwX,drwY,drwWidth,drwHeight ); |
182 | 607 } |
608 } | |
1858
88a88d0a3f94
fix skin changing, xv fullscreen redraw bug, etc.
pontscho
parents:
1852
diff
changeset
|
609 if ( e & VO_EVENT_EXPOSE ) |
88a88d0a3f94
fix skin changing, xv fullscreen redraw bug, etc.
pontscho
parents:
1852
diff
changeset
|
610 { |
4795 | 611 XvShmPutImage(mDisplay, xv_port, vo_window, vo_gc, xvimage[current_buf], 0, 0, image_width, image_height, drwX, drwY, 1, 1, False); |
612 XvShmPutImage(mDisplay, xv_port, vo_window, vo_gc, xvimage[current_buf], 0, 0, image_width, image_height, drwX,drwY,drwWidth,(mFullscreen?drwHeight - 1:drwHeight), False); | |
1858
88a88d0a3f94
fix skin changing, xv fullscreen redraw bug, etc.
pontscho
parents:
1852
diff
changeset
|
613 } |
1 | 614 } |
615 | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1265
diff
changeset
|
616 static void draw_osd(void) |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
617 { 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
|
618 |
182 | 619 static void flip_page(void) |
1 | 620 { |
4795 | 621 XvShmPutImage(mDisplay, xv_port, vo_window, vo_gc, xvimage[current_buf], |
182 | 622 0, 0, image_width, image_height, |
623 drwX,drwY,drwWidth,(mFullscreen?drwHeight - 1:drwHeight), | |
624 False); | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1265
diff
changeset
|
625 if (num_buffers>1){ |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1265
diff
changeset
|
626 current_buf=(current_buf+1)%num_buffers; |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1265
diff
changeset
|
627 XFlush(mDisplay); |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1265
diff
changeset
|
628 } else |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1265
diff
changeset
|
629 XSync(mDisplay, False); |
182 | 630 return; |
1 | 631 } |
632 | |
247 | 633 |
634 | |
182 | 635 static uint32_t draw_slice(uint8_t *image[], int stride[], int w,int h,int x,int y) |
1 | 636 { |
182 | 637 uint8_t *src; |
638 uint8_t *dst; | |
639 int i; | |
640 | |
676
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
641 dst = xvimage[current_buf]->data + image_width * y + x; |
182 | 642 src = image[0]; |
643 if(w==stride[0] && w==image_width) memcpy(dst,src,w*h); | |
644 else | |
645 for(i=0;i<h;i++) | |
646 { | |
647 memcpy(dst,src,w); | |
648 src+=stride[0]; | |
649 dst+=image_width; | |
650 } | |
651 | |
652 x/=2;y/=2;w/=2;h/=2; | |
1 | 653 |
676
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
654 dst = xvimage[current_buf]->data + image_width * image_height + image_width/2 * y + x; |
182 | 655 src = image[2]; |
656 if(w==stride[2] && w==image_width/2) memcpy(dst,src,w*h); | |
657 else | |
658 for(i=0;i<h;i++) | |
659 { | |
660 memcpy(dst,src,w); | |
661 src+=stride[2]; | |
662 dst+=image_width/2; | |
663 } | |
676
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
664 dst = xvimage[current_buf]->data + image_width * image_height * 5 / 4 + image_width/2 * y + x; |
182 | 665 src = image[1]; |
666 if(w==stride[1] && w==image_width/2) memcpy(dst,src,w*h); | |
667 else | |
668 for(i=0;i<h;i++) | |
669 { | |
670 memcpy(dst,src,w); | |
671 src+=stride[1]; | |
672 dst+=image_width/2; | |
673 } | |
674 return 0; | |
1 | 675 } |
676 | |
182 | 677 static uint32_t draw_frame(uint8_t *src[]) |
1 | 678 { |
679 | |
4629 | 680 switch (image_format) { |
408 | 681 case IMGFMT_YUY2: |
682 case IMGFMT_UYVY: | |
683 case IMGFMT_YVYU: | |
684 | |
685 // YUY2 packed, flipped | |
1 | 686 #if 0 |
408 | 687 int i; |
688 unsigned short *s=(unsigned short *)src[0]; | |
676
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
689 unsigned short *d=(unsigned short *)xvimage[current_buf]->data; |
408 | 690 s+=image_width*image_height; |
691 for(i=0;i<image_height;i++) { | |
692 s-=image_width; | |
693 memcpy(d,s,image_width*2); | |
694 d+=image_width; | |
695 } | |
1 | 696 #else |
676
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
697 memcpy(xvimage[current_buf]->data,src[0],image_width*image_height*2); |
1 | 698 #endif |
408 | 699 break; |
700 | |
701 case IMGFMT_YV12: | |
702 case IMGFMT_I420: | |
703 case IMGFMT_IYUV: | |
704 | |
182 | 705 // YV12 planar |
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); |
4351 | 707 if (xv_format == IMGFMT_YV12) |
708 { | |
709 memcpy(xvimage[current_buf]->data+image_width*image_height,src[2],image_width*image_height/4); | |
710 memcpy(xvimage[current_buf]->data+image_width*image_height*5/4,src[1],image_width*image_height/4); | |
711 } | |
712 else | |
713 { | |
714 memcpy(xvimage[current_buf]->data+image_width*image_height,src[1],image_width*image_height/4); | |
715 memcpy(xvimage[current_buf]->data+image_width*image_height*5/4,src[2],image_width*image_height/4); | |
716 } | |
408 | 717 break; |
4629 | 718 |
719 case IMGFMT_BGR24: | |
720 | |
721 if(flip_flag) // tricky, using negative src stride: | |
722 rgb24toyv12(src[0]+3*image_width*(image_height-1), | |
723 xvimage[current_buf]->data, | |
724 xvimage[current_buf]->data+image_width*image_height*5/4, | |
725 xvimage[current_buf]->data+image_width*image_height, | |
726 image_width,image_height, | |
727 image_width,image_width/2,-3*image_width); | |
728 else | |
729 rgb24toyv12(src[0], | |
730 xvimage[current_buf]->data, | |
731 xvimage[current_buf]->data+image_width*image_height*5/4, | |
732 xvimage[current_buf]->data+image_width*image_height, | |
733 image_width,image_height, | |
734 image_width,image_width/2,3*image_width); | |
735 break; | |
736 | |
408 | 737 } |
182 | 738 |
739 return 0; | |
1 | 740 } |
741 | |
182 | 742 static uint32_t query_format(uint32_t format) |
1 | 743 { |
408 | 744 |
4629 | 745 switch(format){ |
746 case IMGFMT_YUY2: | |
747 case IMGFMT_UYVY: | |
748 case IMGFMT_YVYU: | |
749 | |
750 case IMGFMT_YV12: | |
751 case IMGFMT_I420: | |
752 case IMGFMT_IYUV: | |
753 | |
754 case IMGFMT_BGR24: | |
755 | |
408 | 756 // umm, this is a kludge, we need to ask the server.. (see init function above) |
757 return 1; | |
4629 | 758 } |
759 | |
760 return 0; | |
761 | |
1 | 762 } |
763 | |
1852 | 764 static void uninit(void) |
765 { | |
766 int i; | |
4316 | 767 saver_on(mDisplay); // screen saver back on |
1852 | 768 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
|
769 #ifdef HAVE_XF86VM |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
770 vo_vm_close(mDisplay); |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
771 #endif |
4815
178b524e5213
Bugfix in x11_common.c mainly. Don't screw up the display name,
albeu
parents:
4795
diff
changeset
|
772 vo_x11_uninit(mDisplay, vo_window); |
322
4e69a8e2700a
Screensaver and monitor powersafe function is switched off when playing a
laaz
parents:
249
diff
changeset
|
773 } |
1 | 774 |
4352 | 775 static uint32_t preinit(const char *arg) |
776 { | |
4737
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4658
diff
changeset
|
777 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
|
778 { |
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4658
diff
changeset
|
779 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
|
780 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
|
781 } |
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4658
diff
changeset
|
782 return 0; |
4352 | 783 } |
1 | 784 |
4352 | 785 static void query_vaa(vo_vaa_t *vaa) |
786 { | |
787 memset(vaa,0,sizeof(vo_vaa_t)); | |
4396 | 788 vaa->get_video_eq = xv_get_video_eq; |
789 vaa->set_video_eq = xv_set_video_eq; | |
4352 | 790 } |
4592
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
791 |
4596 | 792 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
|
793 { |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
794 switch (request) { |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
795 case VOCTRL_QUERY_VAA: |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
796 query_vaa((vo_vaa_t*)data); |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
797 return VO_TRUE; |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
798 case VOCTRL_QUERY_FORMAT: |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
799 return query_format(*((uint32_t*)data)); |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
800 } |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
801 return VO_NOTIMPL; |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
802 } |