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