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