Mercurial > mplayer.hg
annotate libvo/vo_xv.c @ 5945:f9fe22a52e80
fix aspect ratio handling
author | pontscho |
---|---|
date | Fri, 03 May 2002 13:12:46 +0000 |
parents | 5074aa8fae5a |
children | caac20b1ca79 |
rev | line source |
---|---|
676
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
1 |
1265 | 2 // Number of buffers _FOR_DOUBLEBUFFERING_MODE_ |
3 // Use option -double to enable double buffering! (default: single buffer) | |
4 #define NUM_BUFFERS 2 | |
1 | 5 |
182 | 6 /* |
7 * vo_xv.c, X11 Xv interface | |
1 | 8 * |
182 | 9 * Copyright (C) 1996, MPEG Software Simulation Group. All Rights Reserved. |
1 | 10 * |
11 * Hacked into mpeg2dec by | |
182 | 12 * |
1 | 13 * Aaron Holtzman <aholtzma@ess.engr.uvic.ca> |
14 * | |
15 * Xv image suuport by Gerd Knorr <kraxel@goldbach.in-berlin.de> | |
1265 | 16 * fullscreen support by Pontscho |
17 * double buffering support by A'rpi | |
1 | 18 */ |
19 | |
20 #include <stdio.h> | |
21 #include <stdlib.h> | |
22 #include <string.h> | |
23 | |
24 #include "config.h" | |
5935 | 25 #include "mp_msg.h" |
1 | 26 #include "video_out.h" |
27 #include "video_out_internal.h" | |
28 | |
29 LIBVO_EXTERN(xv) | |
30 | |
31 #include <X11/Xlib.h> | |
32 #include <X11/Xutil.h> | |
33 #include <X11/extensions/XShm.h> | |
34 #include <errno.h> | |
35 | |
31 | 36 #include "x11_common.h" |
37 | |
354 | 38 #include "fastmemcpy.h" |
616 | 39 #include "sub.h" |
2054 | 40 #include "aspect.h" |
350 | 41 |
4629 | 42 #include "../postproc/rgb2rgb.h" |
43 | |
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; | |
5935 | 83 //static int Quiet_Flag; <-- What is that for ? Albeu. |
676
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
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; |
5945 | 94 static uint32_t drwX,drwY,drwBorderWidth,drwDepth; |
95 static uint32_t 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; | |
5935 | 130 mp_msg(MSGT_VO,MSGL_V,"vo_xv: reset gamma correction\n"); |
4307 | 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; |
5935 | 186 mp_msg(MSGT_VO,MSGL_V,"vo_xv: set gamma %s to %i (min %i max %i mid %i)\n",attributes[i].name,port_value,port_min,port_max,port_mid); |
4296
a20c333d6c09
Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents:
3990
diff
changeset
|
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); | |
5935 | 220 mp_msg(MSGT_VO,MSGL_V,"vo_xv: get: %s = %i\n",attributes[i].name,port_value); |
4396 | 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 | |
5935 | 227 mp_msg(MSGT_VO,MSGL_V,"vo_xv: assume: %s = %i\n",attributes[i].name,port_value); |
4396 | 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 |
5945 | 334 vo_dwidth=d_width; vo_dheight=d_height; |
4981 | 335 vo_fs=flags&1; |
336 if ( vo_fs ) | |
337 { vo_old_width=d_width; vo_old_height=d_height; } | |
338 | |
4978 | 339 #ifdef HAVE_XF86VM |
4426
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
340 if( flags&0x02 ) vm = 1; |
4978 | 341 #endif |
4629 | 342 flip_flag=flags&8; |
1265 | 343 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
|
344 |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
345 /* check image formats */ |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
346 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
|
347 xv_format=0; |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
348 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
|
349 for(i = 0; i < formats; i++){ |
5935 | 350 mp_msg(MSGT_VO,MSGL_V,"Xvideo image format: 0x%x (%4.4s) %s\n", fo[i].id,(char*)&fo[i].id, (fo[i].format == XvPacked) ? "packed" : "planar"); |
5509
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
351 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
|
352 } |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
353 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
|
354 |
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
|
355 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
|
356 |
1775 | 357 #ifdef HAVE_NEW_GUI |
723 | 358 if ( vo_window == None ) |
182 | 359 { |
723 | 360 #endif |
361 hint.x = 0; | |
362 hint.y = 0; | |
363 hint.width = d_width; | |
364 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
|
365 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
|
366 #ifdef HAVE_XF86VM |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
367 if ( vm ) |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
368 { |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
369 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
|
370 { 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
|
371 else |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
372 { 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
|
373 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
|
374 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
|
375 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
|
376 hint.width=modeline_width; |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
377 hint.height=modeline_height; |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
378 } |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
379 else |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
380 #endif |
4981 | 381 if ( vo_fs ) |
723 | 382 { |
383 hint.width=vo_screenwidth; | |
384 hint.height=vo_screenheight; | |
2054 | 385 #ifdef X11_FULLSCREEN |
2031
624df8ea0e0e
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
1924
diff
changeset
|
386 /* this code replaces X11_FULLSCREEN hack in mplayer.c |
2054 | 387 * 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
|
388 * 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
|
389 * 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
|
390 * 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
|
391 */ |
624df8ea0e0e
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
1924
diff
changeset
|
392 |
2249
48f0ac1e9d13
Update to new (cleaner, more bugfree, better) aspect api. vo_gl vo_gl2 and vo_xmga are untested!
atmos4
parents:
2055
diff
changeset
|
393 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
|
394 #endif |
624df8ea0e0e
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
1924
diff
changeset
|
395 |
723 | 396 } |
5945 | 397 // dwidth=d_width; dheight=d_height; //XXX: what are the copy vars used for? |
398 vo_dwidth=d_width; vo_dheight=d_height; | |
723 | 399 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
|
400 XGetWindowAttributes(mDisplay, DefaultRootWindow(mDisplay), &attribs); |
723 | 401 depth=attribs.depth; |
402 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
|
403 XMatchVisualInfo(mDisplay, mScreen, depth, TrueColor, &vinfo); |
723 | 404 |
405 xswa.background_pixel = 0; | |
406 xswa.border_pixel = 0; | |
407 xswamask = CWBackPixel | CWBorderPixel; | |
1 | 408 |
3830 | 409 if ( WinID>=0 ){ |
4795 | 410 vo_window = WinID ? ((Window)WinID) : RootWindow(mDisplay,mScreen); |
411 XUnmapWindow( mDisplay,vo_window ); | |
412 XChangeWindowAttributes( mDisplay,vo_window,xswamask,&xswa ); | |
3830 | 413 } else |
414 | |
4795 | 415 vo_window = XCreateWindow(mDisplay, RootWindow(mDisplay,mScreen), |
3830 | 416 hint.x, hint.y, hint.width, hint.height, |
417 0, depth,CopyFromParent,vinfo.visual,xswamask,&xswa); | |
418 | |
4795 | 419 vo_x11_classhint( mDisplay,vo_window,"xv" ); |
420 vo_hidecursor(mDisplay,vo_window); | |
1 | 421 |
5835 | 422 XSelectInput(mDisplay, vo_window, StructureNotifyMask | KeyPressMask | PropertyChangeMask | |
5822 | 423 ((WinID==0) ? 0 : (PointerMotionMask |
4658 | 424 #ifdef HAVE_NEW_INPUT |
425 | ButtonPressMask | ButtonReleaseMask | |
426 #endif | |
5822 | 427 )) |
4658 | 428 ); |
4795 | 429 XSetStandardProperties(mDisplay, vo_window, hello, hello, None, NULL, 0, &hint); |
4981 | 430 if ( vo_fs ) vo_x11_decoration( mDisplay,vo_window,0 ); |
4795 | 431 XMapWindow(mDisplay, vo_window); |
3990 | 432 #ifdef HAVE_XINERAMA |
4795 | 433 vo_x11_xinerama_move(mDisplay,vo_window); |
3990 | 434 #endif |
4795 | 435 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
|
436 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
|
437 XSync(mDisplay, False); |
4426
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
438 #ifdef HAVE_XF86VM |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
439 if ( vm ) |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
440 { |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
441 /* Grab the mouse pointer in our window */ |
4795 | 442 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
|
443 GrabModeAsync, GrabModeAsync, |
4795 | 444 vo_window, None, CurrentTime); |
445 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
|
446 } |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
447 #endif |
1775 | 448 #ifdef HAVE_NEW_GUI |
723 | 449 } |
450 #endif | |
1 | 451 |
5935 | 452 mp_msg(MSGT_VO,MSGL_V, "using Xvideo port %d for hw scaling\n",xv_port ); |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
453 |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
454 switch (xv_format){ |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
455 case IMGFMT_YV12: |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
456 case IMGFMT_I420: |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
457 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
|
458 case IMGFMT_YUY2: |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
459 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
|
460 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
|
461 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
|
462 } |
182 | 463 |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
464 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
|
465 allocate_xvimage(current_buf); |
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
466 |
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
467 current_buf=0; |
1 | 468 |
4396 | 469 set_gamma_correction(); |
1818 | 470 |
5945 | 471 aspect(&vo_dwidth,&vo_dheight,A_NOZOOM); |
4981 | 472 if ( vo_fs ) |
182 | 473 { |
5945 | 474 aspect(&vo_dwidth,&vo_dheight,A_ZOOM); |
475 drwX=( vo_screenwidth - (vo_dwidth > vo_screenwidth?vo_screenwidth:vo_dwidth) ) / 2; | |
476 drwY=( vo_screenheight - (vo_dheight > vo_screenheight?vo_screenheight:vo_dheight) ) / 2; | |
477 vo_dwidth=(vo_dwidth > vo_screenwidth?vo_screenwidth:vo_dwidth); | |
478 vo_dheight=(vo_dheight > vo_screenheight?vo_screenheight:vo_dheight); | |
479 mp_msg(MSGT_VO,MSGL_V, "[xv-fs] dx: %d dy: %d dw: %d dh: %d\n",drwX,drwY,vo_dwidth,vo_dheight ); | |
182 | 480 } |
5945 | 481 |
482 mp_msg(MSGT_VO,MSGL_V, "[xv] dx: %d dy: %d dw: %d dh: %d\n",drwX,drwY,vo_dwidth,vo_dheight ); | |
483 | |
4316 | 484 saver_off(mDisplay); // turning off screen saver |
182 | 485 return 0; |
1 | 486 } |
487 | |
182 | 488 static const vo_info_t * get_info(void) |
489 { return &vo_info; } | |
1 | 490 |
182 | 491 static void allocate_xvimage(int foo) |
1 | 492 { |
182 | 493 /* |
494 * allocate XvImages. FIXME: no error checking, without | |
495 * mit-shm this will bomb... | |
496 */ | |
5622
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
497 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
|
498 else |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
499 { |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
500 Shmem_Flag = 0; |
5935 | 501 mp_msg(MSGT_VO,MSGL_INFO, "Shared memory not supported\nReverting to normal Xv\n" ); |
5622
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
502 } |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
503 if ( Shmem_Flag ) |
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 xvimage[foo] = XvShmCreateImage(mDisplay, xv_port, xv_format, 0, image_width, image_height, &Shminfo[foo]); |
1 | 506 |
5622
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
507 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
|
508 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
|
509 Shminfo[foo].readOnly = False; |
1 | 510 |
5622
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
511 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
|
512 XShmAttach(mDisplay, &Shminfo[foo]); |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
513 XSync(mDisplay, False); |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
514 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
|
515 } |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
516 else |
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 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
|
519 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
|
520 XSync(mDisplay,False); |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
521 } |
182 | 522 memset(xvimage[foo]->data,128,xvimage[foo]->data_size); |
523 return; | |
1 | 524 } |
525 | |
1794 | 526 static void deallocate_xvimage(int foo) |
527 { | |
5622
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
528 if ( Shmem_Flag ) |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
529 { |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
530 XShmDetach( mDisplay,&Shminfo[foo] ); |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
531 shmdt( Shminfo[foo].shmaddr ); |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
532 } |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
533 else |
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 free(xvimage[foo]->data); |
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 XFree(xvimage[foo]); |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
538 |
1794 | 539 XFlush( mDisplay ); |
540 XSync(mDisplay, False); | |
541 return; | |
542 } | |
543 | |
31 | 544 static void check_events(void) |
1 | 545 { |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
546 int e=vo_x11_check_events(mDisplay); |
182 | 547 if(e&VO_EVENT_RESIZE) |
548 { | |
5945 | 549 XGetGeometry( mDisplay,vo_window,&mRoot,&drwX,&drwY,&vo_dwidth,&vo_dheight,&drwBorderWidth,&drwDepth ); |
550 mp_msg(MSGT_VO,MSGL_V, "[xv] dx: %d dy: %d dw: %d dh: %d\n",drwX,drwY,vo_dwidth,vo_dheight ); | |
1 | 551 |
3558 | 552 aspect(&dwidth,&dheight,A_NOZOOM); |
4981 | 553 if ( vo_fs ) |
182 | 554 { |
3558 | 555 aspect(&dwidth,&dheight,A_ZOOM); |
182 | 556 drwX=( vo_screenwidth - (dwidth > vo_screenwidth?vo_screenwidth:dwidth) ) / 2; |
557 drwY=( vo_screenheight - (dheight > vo_screenheight?vo_screenheight:dheight) ) / 2; | |
5945 | 558 vo_dwidth=(dwidth > vo_screenwidth?vo_screenwidth:dwidth); |
559 vo_dheight=(dheight > vo_screenheight?vo_screenheight:dheight); | |
560 mp_msg(MSGT_VO,MSGL_V, "[xv-fs] dx: %d dy: %d dw: %d dh: %d\n",drwX,drwY,vo_dwidth,vo_dheight ); | |
182 | 561 } |
562 } | |
1858
88a88d0a3f94
fix skin changing, xv fullscreen redraw bug, etc.
pontscho
parents:
1852
diff
changeset
|
563 if ( e & VO_EVENT_EXPOSE ) |
88a88d0a3f94
fix skin changing, xv fullscreen redraw bug, etc.
pontscho
parents:
1852
diff
changeset
|
564 { |
5622
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
565 if ( Shmem_Flag ) |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
566 { |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
567 XvShmPutImage(mDisplay, xv_port, vo_window, vo_gc, xvimage[current_buf], 0, 0, image_width, image_height, drwX, drwY, 1, 1, False); |
5945 | 568 XvShmPutImage(mDisplay, xv_port, vo_window, vo_gc, xvimage[current_buf], 0, 0, image_width, image_height, drwX,drwY,vo_dwidth,(vo_fs?vo_dheight - 1:vo_dheight), False); |
5622
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
569 } |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
570 else |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
571 { |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
572 XvPutImage(mDisplay, xv_port, vo_window, vo_gc, xvimage[current_buf], 0, 0, image_width, image_height, drwX, drwY, 1, 1); |
5945 | 573 XvPutImage(mDisplay, xv_port, vo_window, vo_gc, xvimage[current_buf], 0, 0, image_width, image_height, drwX,drwY,vo_dwidth,(vo_fs?vo_dheight - 1:vo_dheight)); |
5622
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
574 } |
1858
88a88d0a3f94
fix skin changing, xv fullscreen redraw bug, etc.
pontscho
parents:
1852
diff
changeset
|
575 } |
1 | 576 } |
577 | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1265
diff
changeset
|
578 static void draw_osd(void) |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
579 { 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
|
580 |
182 | 581 static void flip_page(void) |
1 | 582 { |
5622
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
583 if ( Shmem_Flag ) |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
584 { |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
585 XvShmPutImage(mDisplay, xv_port, vo_window, vo_gc, xvimage[current_buf], |
182 | 586 0, 0, image_width, image_height, |
5945 | 587 drwX,drwY,vo_dwidth,(vo_fs?vo_dheight - 1:vo_dheight), |
182 | 588 False); |
5622
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
589 } |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
590 else |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
591 { |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
592 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
|
593 0, 0, image_width, image_height, |
5945 | 594 drwX,drwY,vo_dwidth,(vo_fs?vo_dheight - 1:vo_dheight)); |
5622
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
595 } |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1265
diff
changeset
|
596 if (num_buffers>1){ |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1265
diff
changeset
|
597 current_buf=(current_buf+1)%num_buffers; |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1265
diff
changeset
|
598 XFlush(mDisplay); |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1265
diff
changeset
|
599 } else |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1265
diff
changeset
|
600 XSync(mDisplay, False); |
182 | 601 return; |
1 | 602 } |
603 | |
247 | 604 |
605 | |
182 | 606 static uint32_t draw_slice(uint8_t *image[], int stride[], int w,int h,int x,int y) |
1 | 607 { |
182 | 608 uint8_t *src; |
609 uint8_t *dst; | |
610 int i; | |
611 | |
676
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
612 dst = xvimage[current_buf]->data + image_width * y + x; |
182 | 613 src = image[0]; |
614 if(w==stride[0] && w==image_width) memcpy(dst,src,w*h); | |
615 else | |
616 for(i=0;i<h;i++) | |
617 { | |
618 memcpy(dst,src,w); | |
619 src+=stride[0]; | |
620 dst+=image_width; | |
621 } | |
622 | |
623 x/=2;y/=2;w/=2;h/=2; | |
1 | 624 |
5316 | 625 dst = xvimage[current_buf]->data + image_width * image_height + (image_width>>1) * y + x; |
626 if(image_format!=IMGFMT_YV12) dst+=(image_width>>1)*(image_height>>1); | |
182 | 627 src = image[2]; |
628 if(w==stride[2] && w==image_width/2) memcpy(dst,src,w*h); | |
629 else | |
630 for(i=0;i<h;i++) | |
631 { | |
632 memcpy(dst,src,w); | |
633 src+=stride[2]; | |
634 dst+=image_width/2; | |
635 } | |
5316 | 636 |
637 dst = xvimage[current_buf]->data + image_width * image_height + (image_width>>1) * y + x; | |
638 if(image_format==IMGFMT_YV12) dst+=(image_width>>1)*(image_height>>1); | |
182 | 639 src = image[1]; |
640 if(w==stride[1] && w==image_width/2) memcpy(dst,src,w*h); | |
641 else | |
642 for(i=0;i<h;i++) | |
643 { | |
644 memcpy(dst,src,w); | |
645 src+=stride[1]; | |
646 dst+=image_width/2; | |
647 } | |
648 return 0; | |
1 | 649 } |
650 | |
182 | 651 static uint32_t draw_frame(uint8_t *src[]) |
1 | 652 { |
653 | |
4629 | 654 switch (image_format) { |
408 | 655 case IMGFMT_YUY2: |
656 case IMGFMT_UYVY: | |
657 case IMGFMT_YVYU: | |
658 | |
659 // YUY2 packed, flipped | |
1 | 660 #if 0 |
408 | 661 int i; |
662 unsigned short *s=(unsigned short *)src[0]; | |
676
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
663 unsigned short *d=(unsigned short *)xvimage[current_buf]->data; |
408 | 664 s+=image_width*image_height; |
665 for(i=0;i<image_height;i++) { | |
666 s-=image_width; | |
667 memcpy(d,s,image_width*2); | |
668 d+=image_width; | |
669 } | |
1 | 670 #else |
676
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
671 memcpy(xvimage[current_buf]->data,src[0],image_width*image_height*2); |
1 | 672 #endif |
408 | 673 break; |
674 | |
675 case IMGFMT_YV12: | |
676 case IMGFMT_I420: | |
677 case IMGFMT_IYUV: | |
678 | |
182 | 679 // YV12 planar |
676
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
680 memcpy(xvimage[current_buf]->data,src[0],image_width*image_height); |
4351 | 681 if (xv_format == IMGFMT_YV12) |
682 { | |
683 memcpy(xvimage[current_buf]->data+image_width*image_height,src[2],image_width*image_height/4); | |
684 memcpy(xvimage[current_buf]->data+image_width*image_height*5/4,src[1],image_width*image_height/4); | |
685 } | |
686 else | |
687 { | |
688 memcpy(xvimage[current_buf]->data+image_width*image_height,src[1],image_width*image_height/4); | |
689 memcpy(xvimage[current_buf]->data+image_width*image_height*5/4,src[2],image_width*image_height/4); | |
690 } | |
408 | 691 break; |
4629 | 692 |
693 case IMGFMT_BGR24: | |
694 | |
695 if(flip_flag) // tricky, using negative src stride: | |
696 rgb24toyv12(src[0]+3*image_width*(image_height-1), | |
697 xvimage[current_buf]->data, | |
698 xvimage[current_buf]->data+image_width*image_height*5/4, | |
699 xvimage[current_buf]->data+image_width*image_height, | |
700 image_width,image_height, | |
701 image_width,image_width/2,-3*image_width); | |
702 else | |
703 rgb24toyv12(src[0], | |
704 xvimage[current_buf]->data, | |
705 xvimage[current_buf]->data+image_width*image_height*5/4, | |
706 xvimage[current_buf]->data+image_width*image_height, | |
707 image_width,image_height, | |
708 image_width,image_width/2,3*image_width); | |
709 break; | |
710 | |
408 | 711 } |
182 | 712 |
713 return 0; | |
1 | 714 } |
715 | |
4980 | 716 static uint32_t get_image(mp_image_t *mpi){ |
717 if(mpi->type==MP_IMGTYPE_STATIC && num_buffers>1) return VO_FALSE; // it is not static | |
5466 | 718 if(mpi->type==MP_IMGTYPE_IPB && num_buffers<3 && mpi->flags&MP_IMGFLAG_READABLE) return VO_FALSE; // not enough |
5006 | 719 if(mpi->imgfmt!=image_format || mpi->imgfmt==IMGFMT_BGR24) return VO_FALSE; // needs conversion :( |
4980 | 720 // if(mpi->flags&MP_IMGFLAG_READABLE) return VO_FALSE; // slow video ram |
721 if(mpi->width==image_width){ | |
722 if(mpi->flags&MP_IMGFLAG_PLANAR){ | |
723 mpi->planes[0]=xvimage[current_buf]->data; | |
5316 | 724 if(mpi->flags&MP_IMGFLAG_SWAPPED){ |
725 // I420 | |
726 mpi->planes[1]=xvimage[current_buf]->data+image_width*image_height; | |
727 mpi->planes[2]=mpi->planes[1]+(image_width>>1)*(image_height>>1); | |
728 } else { | |
729 // YV12 | |
730 mpi->planes[2]=xvimage[current_buf]->data+image_width*image_height; | |
731 mpi->planes[1]=mpi->planes[2]+(image_width>>1)*(image_height>>1); | |
732 } | |
4980 | 733 mpi->stride[0]=image_width; |
734 mpi->stride[1]=mpi->stride[2]=image_width/2; | |
735 } else { | |
736 mpi->planes[0]=xvimage[current_buf]->data; | |
5761 | 737 mpi->stride[0]=image_width*(mpi->bpp>>3); |
4980 | 738 } |
739 mpi->flags|=MP_IMGFLAG_DIRECT; | |
740 // printf("mga: get_image() SUCCESS -> Direct Rendering ENABLED\n"); | |
741 return VO_TRUE; | |
742 } | |
743 return VO_FALSE; | |
744 } | |
745 | |
182 | 746 static uint32_t query_format(uint32_t format) |
1 | 747 { |
5566 | 748 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
|
749 /* check image formats */ |
5566 | 750 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
|
751 for(i = 0; i < formats; i++){ |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
752 // 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
|
753 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
|
754 } |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
755 return 0; |
408 | 756 |
5509
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
757 /* |
4629 | 758 switch(format){ |
759 case IMGFMT_YUY2: | |
760 case IMGFMT_UYVY: | |
761 case IMGFMT_YVYU: | |
762 | |
763 case IMGFMT_YV12: | |
764 case IMGFMT_I420: | |
765 case IMGFMT_IYUV: | |
766 | |
767 case IMGFMT_BGR24: | |
768 | |
408 | 769 // umm, this is a kludge, we need to ask the server.. (see init function above) |
770 return 1; | |
4629 | 771 } |
772 return 0; | |
5509
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
773 */ |
4629 | 774 |
1 | 775 } |
776 | |
1852 | 777 static void uninit(void) |
778 { | |
779 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
|
780 if(!mDisplay) return; |
4316 | 781 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
|
782 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
|
783 #ifdef HAVE_XF86VM |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
784 vo_vm_close(mDisplay); |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
785 #endif |
5509
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
786 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
|
787 } |
1 | 788 |
4352 | 789 static uint32_t preinit(const char *arg) |
790 { | |
5509
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
791 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
|
792 if(arg) |
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4658
diff
changeset
|
793 { |
5935 | 794 mp_msg(MSGT_VO,MSGL_ERR,"vo_xv: Unknown subdevice: %s\n",arg); |
4737
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4658
diff
changeset
|
795 return ENOSYS; |
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4658
diff
changeset
|
796 } |
5509
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
797 if (!vo_init()) return -1; |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
798 |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
799 xv_port = 0; |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
800 /* check for Xvideo extension */ |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
801 if (Success != XvQueryExtension(mDisplay,&ver,&rel,&req,&ev,&err)){ |
5935 | 802 mp_msg(MSGT_VO,MSGL_ERR,"Sorry, Xv not supported by this X11 version/driver\n"); |
803 mp_msg(MSGT_VO,MSGL_ERR,"******** Try with -vo x11 or -vo sdl *********\n"); | |
5509
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
804 return -1; |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
805 } |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
806 |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
807 /* check for Xvideo support */ |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
808 if (Success != XvQueryAdaptors(mDisplay,DefaultRootWindow(mDisplay), &adaptors,&ai)){ |
5935 | 809 mp_msg(MSGT_VO,MSGL_ERR,"Xv: XvQueryAdaptors failed"); |
5509
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
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 adaptors */ |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
814 for (i = 0; i < adaptors && xv_port == 0; i++){ |
5935 | 815 if ((ai[i].type & XvInputMask) && (ai[i].type & XvImageMask)) { |
5509
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
816 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
|
817 if (!XvGrabPort(mDisplay, xv_p, CurrentTime)) { |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
818 xv_port = xv_p; |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
819 break; |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
820 } else { |
5935 | 821 mp_msg(MSGT_VO,MSGL_ERR,"Xv: could not grab port %i\n", (int)xv_p); |
5509
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
822 } |
5935 | 823 } |
5509
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
824 } |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
825 if(!xv_port){ |
5935 | 826 mp_msg(MSGT_VO,MSGL_ERR,"Couldn't find free Xvideo port - maybe other applications keep open it\n"); |
5509
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
827 return -1; |
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 |
5566 | 830 fo = XvListImageFormats(mDisplay, xv_port, (int*)&formats); |
831 | |
4737
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4658
diff
changeset
|
832 return 0; |
4352 | 833 } |
1 | 834 |
4352 | 835 static void query_vaa(vo_vaa_t *vaa) |
836 { | |
837 memset(vaa,0,sizeof(vo_vaa_t)); | |
4396 | 838 vaa->get_video_eq = xv_get_video_eq; |
839 vaa->set_video_eq = xv_set_video_eq; | |
4352 | 840 } |
4592
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
841 |
4596 | 842 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
|
843 { |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
844 switch (request) { |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
845 case VOCTRL_QUERY_VAA: |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
846 query_vaa((vo_vaa_t*)data); |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
847 return VO_TRUE; |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
848 case VOCTRL_QUERY_FORMAT: |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
849 return query_format(*((uint32_t*)data)); |
4980 | 850 case VOCTRL_GET_IMAGE: |
851 return get_image(data); | |
4981 | 852 case VOCTRL_FULLSCREEN: |
853 vo_x11_fullscreen(); | |
854 return VO_TRUE; | |
4592
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
855 } |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
856 return VO_NOTIMPL; |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
857 } |