Mercurial > mplayer.hg
annotate libvo/vo_xv.c @ 6540:5b3cace64e9d
100l (non mmx versions didnt compile)
some cleanup
author | michael |
---|---|
date | Mon, 24 Jun 2002 00:18:29 +0000 |
parents | 44bca09c1edd |
children | 5291d74a60c9 |
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 <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 | |
5955
caac20b1ca79
fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents:
5945
diff
changeset
|
43 #ifdef HAVE_NEW_GUI |
caac20b1ca79
fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents:
5945
diff
changeset
|
44 #include "../Gui/interface.h" |
caac20b1ca79
fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents:
5945
diff
changeset
|
45 #endif |
caac20b1ca79
fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents:
5945
diff
changeset
|
46 |
182 | 47 static vo_info_t vo_info = |
1 | 48 { |
182 | 49 "X11/Xv", |
50 "xv", | |
51 "Gerd Knorr <kraxel@goldbach.in-berlin.de>", | |
52 "" | |
1 | 53 }; |
54 | |
4296
a20c333d6c09
Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents:
3990
diff
changeset
|
55 extern int verbose; |
a20c333d6c09
Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents:
3990
diff
changeset
|
56 |
1 | 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> | |
6416 | 79 #ifdef HAVE_SHM |
1 | 80 #include <sys/shm.h> |
81 #include <X11/extensions/XShm.h> | |
82 | |
6416 | 83 /* since it doesn't seem to be defined on some platforms */ |
84 int XShmGetEventBase(Display*); | |
85 | |
86 static XShmSegmentInfo Shminfo[NUM_BUFFERS]; | |
6417
44bca09c1edd
100l accidently removed a line too much (Shmem_Flag)
atmos4
parents:
6416
diff
changeset
|
87 static int Shmem_Flag; |
6416 | 88 #endif |
89 | |
5935 | 90 //static int Quiet_Flag; <-- What is that for ? Albeu. |
1 | 91 static int gXErrorFlag; |
92 static int CompletionType = -1; | |
93 | |
94 static uint32_t image_width; | |
95 static uint32_t image_height; | |
96 static uint32_t image_format; | |
4629 | 97 static int flip_flag; |
1 | 98 |
182 | 99 static Window mRoot; |
5945 | 100 static uint32_t drwX,drwY,drwBorderWidth,drwDepth; |
101 static uint32_t dwidth,dheight; | |
1 | 102 |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
103 static void (*draw_alpha_fnc)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride); |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
104 |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
105 static void draw_alpha_yv12(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){ |
6332
ff858ab25b11
-vm pan&scan fixes by Jesper Svennevid <mplayer@svennevid.ne>
arpi
parents:
6311
diff
changeset
|
106 x0+=(vo_panscan_x>>2); |
6295 | 107 vo_draw_alpha_yv12(w,h,src,srca,stride, |
108 xvimage[current_buf]->data+xvimage[current_buf]->offsets[0]+ | |
109 xvimage[current_buf]->pitches[0]*y0+x0,xvimage[current_buf]->pitches[0]); | |
1647
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 |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
112 static void draw_alpha_yuy2(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){ |
6332
ff858ab25b11
-vm pan&scan fixes by Jesper Svennevid <mplayer@svennevid.ne>
arpi
parents:
6311
diff
changeset
|
113 x0+=(vo_panscan_x>>2); |
6295 | 114 vo_draw_alpha_yuy2(w,h,src,srca,stride, |
115 xvimage[current_buf]->data+xvimage[current_buf]->offsets[0]+ | |
116 xvimage[current_buf]->pitches[0]*y0+2*x0,xvimage[current_buf]->pitches[0]); | |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
117 } |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
118 |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
119 static void draw_alpha_uyvy(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){ |
6332
ff858ab25b11
-vm pan&scan fixes by Jesper Svennevid <mplayer@svennevid.ne>
arpi
parents:
6311
diff
changeset
|
120 x0+=(vo_panscan_x>>2); |
6295 | 121 vo_draw_alpha_yuy2(w,h,src,srca,stride, |
122 xvimage[current_buf]->data+xvimage[current_buf]->offsets[0]+ | |
123 xvimage[current_buf]->pitches[0]*y0+2*x0+1,xvimage[current_buf]->pitches[0]); | |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
124 } |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
125 |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
126 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
|
127 } |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
128 |
4396 | 129 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
|
130 { |
a20c333d6c09
Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents:
3990
diff
changeset
|
131 XvAttribute *attributes; |
4307 | 132 int howmany, xv_min,xv_max,xv_atomka; |
133 static int was_reset = 0; | |
134 /* 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
|
135 attributes = XvQueryPortAttributes(mDisplay, xv_port, &howmany); |
4307 | 136 /* first pass try reset */ |
4396 | 137 if(use_reset) |
4307 | 138 { |
4396 | 139 for (i = 0; i < howmany && attributes; i++) |
140 { | |
4307 | 141 if (attributes[i].flags & XvSettable && !strcmp(attributes[i].name,"XV_SET_DEFAULTS" |
142 )) | |
143 { | |
144 was_reset = 1; | |
5935 | 145 mp_msg(MSGT_VO,MSGL_V,"vo_xv: reset gamma correction\n"); |
4307 | 146 xv_atomka = XInternAtom(mDisplay, attributes[i].name, True); |
147 XvSetPortAttribute(mDisplay, xv_port, xv_atomka, attributes[i].max_value); | |
148 } | |
4396 | 149 } |
150 /* for safety purposes */ | |
151 if(!was_reset) return ENOSYS; | |
4307 | 152 } |
4296
a20c333d6c09
Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents:
3990
diff
changeset
|
153 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
|
154 { |
a20c333d6c09
Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents:
3990
diff
changeset
|
155 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
|
156 { |
a20c333d6c09
Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents:
3990
diff
changeset
|
157 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
|
158 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
|
159 xv_atomka = XInternAtom(mDisplay, attributes[i].name, True); |
4307 | 160 /* since we have SET_DEFAULTS first in our list, we can check if it's available |
161 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
|
162 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
|
163 { |
a20c333d6c09
Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents:
3990
diff
changeset
|
164 int port_value,port_min,port_max,port_mid; |
4396 | 165 if(strcmp(attributes[i].name,"XV_BRIGHTNESS") == 0 |
166 && (info->cap & VEQ_CAP_BRIGHTNESS)) | |
167 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
|
168 else |
4396 | 169 if(strcmp(attributes[i].name,"XV_SATURATION") == 0 |
170 && (info->cap & VEQ_CAP_SATURATION)) | |
171 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
|
172 else |
4396 | 173 if(strcmp(attributes[i].name,"XV_CONTRAST") == 0 |
174 && (info->cap & VEQ_CAP_CONTRAST)) | |
175 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
|
176 else |
4396 | 177 if(strcmp(attributes[i].name,"XV_HUE") == 0 |
178 && (info->cap & VEQ_CAP_HUE)) | |
179 port_value = info->hue; | |
4320
bfcf2517876b
RGB independed correction for GATOS's radeon_video driver!
nick
parents:
4317
diff
changeset
|
180 else |
bfcf2517876b
RGB independed correction for GATOS's radeon_video driver!
nick
parents:
4317
diff
changeset
|
181 /* Note: since 22.01.2002 GATOS supports these attrs for radeons (NK) */ |
4396 | 182 if(strcmp(attributes[i].name,"XV_RED_INTENSITY") == 0 |
183 && (info->cap & VEQ_CAP_RGB_INTENSITY)) | |
184 port_value = info->red_intensity; | |
4320
bfcf2517876b
RGB independed correction for GATOS's radeon_video driver!
nick
parents:
4317
diff
changeset
|
185 else |
4396 | 186 if(strcmp(attributes[i].name,"XV_GREEN_INTENSITY") == 0 |
187 && (info->cap & VEQ_CAP_RGB_INTENSITY)) | |
188 port_value = info->green_intensity; | |
4320
bfcf2517876b
RGB independed correction for GATOS's radeon_video driver!
nick
parents:
4317
diff
changeset
|
189 else |
4396 | 190 if(strcmp(attributes[i].name,"XV_BLUE_INTENSITY") == 0 |
191 && (info->cap & VEQ_CAP_RGB_INTENSITY)) | |
192 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
|
193 else continue; |
4320
bfcf2517876b
RGB independed correction for GATOS's radeon_video driver!
nick
parents:
4317
diff
changeset
|
194 /* means that user has untouched this parameter since |
bfcf2517876b
RGB independed correction for GATOS's radeon_video driver!
nick
parents:
4317
diff
changeset
|
195 NVidia driver has default == min for XV_HUE but not mid */ |
4406 | 196 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
|
197 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
|
198 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
|
199 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
|
200 port_value = port_mid + (port_value * (port_max - port_min)) / 2000; |
5935 | 201 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
|
202 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
|
203 } |
a20c333d6c09
Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents:
3990
diff
changeset
|
204 } |
a20c333d6c09
Gamma correction (based on patch of P«”sztor Szil«”rd <silicon@falcon.sch.bme.hu>)
nick
parents:
3990
diff
changeset
|
205 } |
4396 | 206 return 0; |
207 } | |
208 | |
209 | |
210 static int xv_set_video_eq( const vidix_video_eq_t *info) | |
211 { | |
212 return __xv_set_video_eq(info,0); | |
213 } | |
214 | |
215 static int xv_get_video_eq( vidix_video_eq_t *info) | |
216 { | |
217 XvAttribute *attributes; | |
218 int howmany, xv_min,xv_max,xv_atomka; | |
219 /* get available attributes */ | |
220 memset(info,0,sizeof(vidix_video_eq_t)); | |
221 attributes = XvQueryPortAttributes(mDisplay, xv_port, &howmany); | |
222 for (i = 0; i < howmany && attributes; i++) | |
223 { | |
224 if (attributes[i].flags & XvGettable) | |
225 { | |
226 xv_min = attributes[i].min_value; | |
227 xv_max = attributes[i].max_value; | |
228 xv_atomka = XInternAtom(mDisplay, attributes[i].name, True); | |
229 /* since we have SET_DEFAULTS first in our list, we can check if it's available | |
230 then trigger it if it's ok so that the other values are at default upon query */ | |
231 if (xv_atomka != None) | |
232 { | |
233 int port_value,port_min,port_max,port_mid; | |
234 XvGetPortAttribute(mDisplay, xv_port, xv_atomka, &port_value); | |
5935 | 235 mp_msg(MSGT_VO,MSGL_V,"vo_xv: get: %s = %i\n",attributes[i].name,port_value); |
4396 | 236 |
237 port_min = xv_min; | |
238 port_max = xv_max; | |
239 port_mid = (port_min + port_max) / 2; | |
240 port_value = ((port_value - port_mid)*2000)/(port_max-port_min); | |
241 | |
5935 | 242 mp_msg(MSGT_VO,MSGL_V,"vo_xv: assume: %s = %i\n",attributes[i].name,port_value); |
4396 | 243 |
244 if(strcmp(attributes[i].name,"XV_BRIGHTNESS") == 0) | |
245 { | |
246 info->cap |= VEQ_CAP_BRIGHTNESS; | |
247 info->brightness = port_value; | |
248 } | |
249 else | |
250 if(strcmp(attributes[i].name,"XV_SATURATION") == 0) | |
251 { | |
252 info->cap |= VEQ_CAP_SATURATION; | |
253 info->saturation = port_value; | |
254 } | |
255 else | |
256 if(strcmp(attributes[i].name,"XV_CONTRAST") == 0) | |
257 { | |
258 info->cap |= VEQ_CAP_CONTRAST; | |
259 info->contrast = port_value; | |
260 } | |
261 else | |
262 if(strcmp(attributes[i].name,"XV_HUE") == 0) | |
263 { | |
264 info->cap |= VEQ_CAP_HUE; | |
265 info->hue = port_value; | |
266 } | |
267 else | |
268 /* Note: since 22.01.2002 GATOS supports these attrs for radeons (NK) */ | |
269 if(strcmp(attributes[i].name,"XV_RED_INTENSITY") == 0) | |
270 { | |
271 info->cap |= VEQ_CAP_RGB_INTENSITY; | |
272 info->red_intensity = port_value; | |
273 } | |
274 else | |
275 if(strcmp(attributes[i].name,"XV_GREEN_INTENSITY") == 0) | |
276 { | |
277 info->cap |= VEQ_CAP_RGB_INTENSITY; | |
278 info->green_intensity = port_value; | |
279 } | |
280 else | |
281 if(strcmp(attributes[i].name,"XV_BLUE_INTENSITY") == 0) | |
282 { | |
283 info->cap |= VEQ_CAP_RGB_INTENSITY; | |
284 info->blue_intensity = port_value; | |
285 } | |
286 else continue; | |
287 } | |
288 } | |
289 } | |
290 return 0; | |
291 } | |
292 | |
293 extern int vo_gamma_brightness; | |
294 extern int vo_gamma_saturation; | |
295 extern int vo_gamma_contrast; | |
296 extern int vo_gamma_hue; | |
297 extern int vo_gamma_red_intensity; | |
298 extern int vo_gamma_green_intensity; | |
299 extern int vo_gamma_blue_intensity; | |
300 | |
301 static void set_gamma_correction( void ) | |
302 { | |
303 vidix_video_eq_t info; | |
304 /* try all */ | |
305 info.cap = VEQ_CAP_BRIGHTNESS | VEQ_CAP_CONTRAST | VEQ_CAP_SATURATION | | |
306 VEQ_CAP_HUE | VEQ_CAP_RGB_INTENSITY; | |
307 info.flags = 0; /* doesn't matter for xv */ | |
308 info.brightness = vo_gamma_brightness; | |
309 info.contrast = vo_gamma_contrast; | |
310 info.saturation = vo_gamma_saturation; | |
311 info.hue = vo_gamma_hue; | |
312 info.red_intensity = vo_gamma_red_intensity; | |
313 info.green_intensity = vo_gamma_green_intensity; | |
314 info.blue_intensity = vo_gamma_blue_intensity; | |
315 /* reset with XV_SET_DEFAULTS only once */ | |
316 __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
|
317 } |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
318 |
182 | 319 /* |
320 * connect to server, create and map window, | |
1 | 321 * allocate colors and (shared) memory |
322 */ | |
4433 | 323 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 | 324 { |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
325 // int screen; |
182 | 326 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
|
327 // char *name = ":0.0"; |
182 | 328 XSizeHints hint; |
329 XVisualInfo vinfo; | |
330 XEvent xev; | |
1 | 331 |
182 | 332 XGCValues xgcv; |
333 XSetWindowAttributes xswa; | |
334 unsigned long xswamask; | |
4426
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
335 #ifdef HAVE_XF86VM |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
336 int vm=0; |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
337 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
|
338 static uint32_t vm_width; |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
339 static uint32_t vm_height; |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
340 #endif |
1 | 341 |
6307 | 342 panscan_init(); |
6304
ee65527096c2
pan&scan support with -vo xv by ?? <mplayer@svennevid.net>
arpi
parents:
6295
diff
changeset
|
343 |
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
|
344 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
|
345 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
|
346 |
182 | 347 image_height = height; |
348 image_width = width; | |
349 image_format=format; | |
5955
caac20b1ca79
fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents:
5945
diff
changeset
|
350 |
caac20b1ca79
fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents:
5945
diff
changeset
|
351 vo_mouse_autohide=1; |
1 | 352 |
6043 | 353 vo_dx=( vo_screenwidth - d_width ) / 2; vo_dy=( vo_screenheight - d_height ) / 2; |
5945 | 354 vo_dwidth=d_width; vo_dheight=d_height; |
4981 | 355 |
4978 | 356 #ifdef HAVE_XF86VM |
4426
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
357 if( flags&0x02 ) vm = 1; |
4978 | 358 #endif |
4629 | 359 flip_flag=flags&8; |
1265 | 360 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
|
361 |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
362 /* check image formats */ |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
363 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
|
364 xv_format=0; |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
365 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
|
366 for(i = 0; i < formats; i++){ |
5935 | 367 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
|
368 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
|
369 } |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
370 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
|
371 |
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
|
372 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
|
373 |
1775 | 374 #ifdef HAVE_NEW_GUI |
5985 | 375 if(use_gui) |
376 guiGetEvent( guiSetShVideo,0 ); // let the GUI to setup/resize our window | |
377 else | |
378 #endif | |
182 | 379 { |
6043 | 380 hint.x = vo_dx; |
381 hint.y = vo_dy; | |
723 | 382 hint.width = d_width; |
383 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
|
384 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
|
385 #ifdef HAVE_XF86VM |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
386 if ( vm ) |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
387 { |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
388 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
|
389 { 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
|
390 else |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
391 { 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
|
392 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
|
393 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
|
394 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
|
395 hint.width=modeline_width; |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
396 hint.height=modeline_height; |
6125 | 397 aspect_save_screenres(modeline_width,modeline_height); |
4426
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
398 } |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
399 else |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
400 #endif |
4981 | 401 if ( vo_fs ) |
723 | 402 { |
2054 | 403 #ifdef X11_FULLSCREEN |
2031
624df8ea0e0e
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
1924
diff
changeset
|
404 /* this code replaces X11_FULLSCREEN hack in mplayer.c |
2054 | 405 * 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
|
406 * 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
|
407 * 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
|
408 * 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
|
409 */ |
624df8ea0e0e
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
1924
diff
changeset
|
410 |
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
|
411 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
|
412 #endif |
624df8ea0e0e
New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents:
1924
diff
changeset
|
413 |
723 | 414 } |
5945 | 415 // dwidth=d_width; dheight=d_height; //XXX: what are the copy vars used for? |
416 vo_dwidth=d_width; vo_dheight=d_height; | |
5981 | 417 hint.flags = PPosition | PSize /* | PBaseSize */; |
418 hint.base_width = hint.width; hint.base_height = hint.height; | |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
419 XGetWindowAttributes(mDisplay, DefaultRootWindow(mDisplay), &attribs); |
723 | 420 depth=attribs.depth; |
421 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
|
422 XMatchVisualInfo(mDisplay, mScreen, depth, TrueColor, &vinfo); |
723 | 423 |
424 xswa.background_pixel = 0; | |
425 xswa.border_pixel = 0; | |
426 xswamask = CWBackPixel | CWBorderPixel; | |
1 | 427 |
3830 | 428 if ( WinID>=0 ){ |
6043 | 429 vo_window = WinID ? ((Window)WinID) : mRootWin; |
430 if ( WinID ) | |
431 { | |
432 XUnmapWindow( mDisplay,vo_window ); | |
433 XChangeWindowAttributes( mDisplay,vo_window,xswamask,&xswa ); | |
434 XSelectInput( mDisplay,vo_window,StructureNotifyMask | KeyPressMask | PropertyChangeMask | PointerMotionMask | ButtonPressMask | ButtonReleaseMask | ExposureMask ); | |
6366
287c2e661172
-wid fix by "Markus J.R." <random@shell.dnload.com>
atmos4
parents:
6332
diff
changeset
|
435 XMapWindow( mDisplay,vo_window ); |
6043 | 436 } else { drwX=vo_dx; drwY=vo_dy; } |
3830 | 437 } else |
6043 | 438 { |
439 vo_window = XCreateWindow(mDisplay, mRootWin, | |
440 hint.x, hint.y, hint.width, hint.height, | |
441 0, depth,CopyFromParent,vinfo.visual,xswamask,&xswa); | |
3830 | 442 |
6043 | 443 vo_x11_classhint( mDisplay,vo_window,"xv" ); |
444 vo_hidecursor(mDisplay,vo_window); | |
3830 | 445 |
6043 | 446 XSelectInput(mDisplay, vo_window, StructureNotifyMask | KeyPressMask | PropertyChangeMask | |
5822 | 447 ((WinID==0) ? 0 : (PointerMotionMask |
4658 | 448 #ifdef HAVE_NEW_INPUT |
449 | ButtonPressMask | ButtonReleaseMask | |
450 #endif | |
6043 | 451 ))); |
452 XSetStandardProperties(mDisplay, vo_window, hello, hello, None, NULL, 0, &hint); | |
453 XSetWMNormalHints( mDisplay,vo_window,&hint ); | |
454 XMapWindow(mDisplay, vo_window); | |
455 if ( flags&1 ) vo_x11_fullscreen(); | |
3990 | 456 #ifdef HAVE_XINERAMA |
6043 | 457 vo_x11_xinerama_move(mDisplay,vo_window); |
3990 | 458 #endif |
6043 | 459 } |
460 vo_gc = XCreateGC(mDisplay, vo_window, 0L, &xgcv); | |
461 XFlush(mDisplay); | |
462 XSync(mDisplay, False); | |
4426
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
463 #ifdef HAVE_XF86VM |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
464 if ( vm ) |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
465 { |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
466 /* Grab the mouse pointer in our window */ |
4795 | 467 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
|
468 GrabModeAsync, GrabModeAsync, |
4795 | 469 vo_window, None, CurrentTime); |
470 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
|
471 } |
1ceadec3ea67
using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents:
4406
diff
changeset
|
472 #endif |
5985 | 473 } |
1 | 474 |
5935 | 475 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
|
476 |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
477 switch (xv_format){ |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
478 case IMGFMT_YV12: |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
479 case IMGFMT_I420: |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
480 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
|
481 case IMGFMT_YUY2: |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
482 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
|
483 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
|
484 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
|
485 } |
182 | 486 |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
487 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
|
488 allocate_xvimage(current_buf); |
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
489 |
428755f858f7
multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents:
616
diff
changeset
|
490 current_buf=0; |
1 | 491 |
4396 | 492 set_gamma_correction(); |
1818 | 493 |
5945 | 494 aspect(&vo_dwidth,&vo_dheight,A_NOZOOM); |
6043 | 495 if ( ( flags&1 )&&( !WinID ) ) |
182 | 496 { |
5945 | 497 aspect(&vo_dwidth,&vo_dheight,A_ZOOM); |
498 drwX=( vo_screenwidth - (vo_dwidth > vo_screenwidth?vo_screenwidth:vo_dwidth) ) / 2; | |
499 drwY=( vo_screenheight - (vo_dheight > vo_screenheight?vo_screenheight:vo_dheight) ) / 2; | |
500 vo_dwidth=(vo_dwidth > vo_screenwidth?vo_screenwidth:vo_dwidth); | |
501 vo_dheight=(vo_dheight > vo_screenheight?vo_screenheight:vo_dheight); | |
502 mp_msg(MSGT_VO,MSGL_V, "[xv-fs] dx: %d dy: %d dw: %d dh: %d\n",drwX,drwY,vo_dwidth,vo_dheight ); | |
182 | 503 } |
6382
86d5fc5b54e2
fix panscan support and add Jesper Svennevid's <mplayer@svennevid.net> patch
pontscho
parents:
6366
diff
changeset
|
504 |
86d5fc5b54e2
fix panscan support and add Jesper Svennevid's <mplayer@svennevid.net> patch
pontscho
parents:
6366
diff
changeset
|
505 panscan_calc(); |
6043 | 506 |
5945 | 507 mp_msg(MSGT_VO,MSGL_V, "[xv] dx: %d dy: %d dw: %d dh: %d\n",drwX,drwY,vo_dwidth,vo_dheight ); |
508 | |
4316 | 509 saver_off(mDisplay); // turning off screen saver |
182 | 510 return 0; |
1 | 511 } |
512 | |
182 | 513 static const vo_info_t * get_info(void) |
514 { return &vo_info; } | |
1 | 515 |
182 | 516 static void allocate_xvimage(int foo) |
1 | 517 { |
182 | 518 /* |
519 * allocate XvImages. FIXME: no error checking, without | |
6416 | 520 * mit-shm this will bomb... trzing to fix ::atmos |
182 | 521 */ |
6416 | 522 #ifdef HAVE_SHM |
5622
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
523 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
|
524 else |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
525 { |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
526 Shmem_Flag = 0; |
5935 | 527 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
|
528 } |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
529 if ( Shmem_Flag ) |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
530 { |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
531 xvimage[foo] = XvShmCreateImage(mDisplay, xv_port, xv_format, 0, image_width, image_height, &Shminfo[foo]); |
1 | 532 |
5622
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
533 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
|
534 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
|
535 Shminfo[foo].readOnly = False; |
1 | 536 |
5622
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
537 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
|
538 XShmAttach(mDisplay, &Shminfo[foo]); |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
539 XSync(mDisplay, False); |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
540 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
|
541 } |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
542 else |
6416 | 543 #endif |
5622
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
544 { |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
545 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
|
546 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
|
547 XSync(mDisplay,False); |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
548 } |
182 | 549 memset(xvimage[foo]->data,128,xvimage[foo]->data_size); |
550 return; | |
1 | 551 } |
552 | |
1794 | 553 static void deallocate_xvimage(int foo) |
554 { | |
6416 | 555 #ifdef HAVE_SHM |
5622
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
556 if ( Shmem_Flag ) |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
557 { |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
558 XShmDetach( mDisplay,&Shminfo[foo] ); |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
559 shmdt( Shminfo[foo].shmaddr ); |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
560 } |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
561 else |
6416 | 562 #endif |
5622
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
563 { |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
564 free(xvimage[foo]->data); |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
565 } |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
566 XFree(xvimage[foo]); |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
567 |
1794 | 568 XFlush( mDisplay ); |
569 XSync(mDisplay, False); | |
570 return; | |
571 } | |
572 | |
31 | 573 static void check_events(void) |
1 | 574 { |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
844
diff
changeset
|
575 int e=vo_x11_check_events(mDisplay); |
182 | 576 if(e&VO_EVENT_RESIZE) |
577 { | |
5945 | 578 XGetGeometry( mDisplay,vo_window,&mRoot,&drwX,&drwY,&vo_dwidth,&vo_dheight,&drwBorderWidth,&drwDepth ); |
5981 | 579 drwX = drwY = 0; |
5945 | 580 mp_msg(MSGT_VO,MSGL_V, "[xv] dx: %d dy: %d dw: %d dh: %d\n",drwX,drwY,vo_dwidth,vo_dheight ); |
1 | 581 |
3558 | 582 aspect(&dwidth,&dheight,A_NOZOOM); |
4981 | 583 if ( vo_fs ) |
182 | 584 { |
3558 | 585 aspect(&dwidth,&dheight,A_ZOOM); |
182 | 586 drwX=( vo_screenwidth - (dwidth > vo_screenwidth?vo_screenwidth:dwidth) ) / 2; |
587 drwY=( vo_screenheight - (dheight > vo_screenheight?vo_screenheight:dheight) ) / 2; | |
5945 | 588 vo_dwidth=(dwidth > vo_screenwidth?vo_screenwidth:dwidth); |
589 vo_dheight=(dheight > vo_screenheight?vo_screenheight:dheight); | |
590 mp_msg(MSGT_VO,MSGL_V, "[xv-fs] dx: %d dy: %d dw: %d dh: %d\n",drwX,drwY,vo_dwidth,vo_dheight ); | |
182 | 591 } |
592 } | |
1858
88a88d0a3f94
fix skin changing, xv fullscreen redraw bug, etc.
pontscho
parents:
1852
diff
changeset
|
593 if ( e & VO_EVENT_EXPOSE ) |
88a88d0a3f94
fix skin changing, xv fullscreen redraw bug, etc.
pontscho
parents:
1852
diff
changeset
|
594 { |
6416 | 595 #ifdef HAVE_SHM |
5622
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
596 if ( Shmem_Flag ) |
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 XvShmPutImage(mDisplay, xv_port, vo_window, vo_gc, xvimage[current_buf], 0, 0, image_width, image_height, drwX, drwY, 1, 1, False); |
5945 | 599 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
|
600 } |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
601 else |
6416 | 602 #endif |
5622
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
603 { |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
604 XvPutImage(mDisplay, xv_port, vo_window, vo_gc, xvimage[current_buf], 0, 0, image_width, image_height, drwX, drwY, 1, 1); |
5945 | 605 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
|
606 } |
1858
88a88d0a3f94
fix skin changing, xv fullscreen redraw bug, etc.
pontscho
parents:
1852
diff
changeset
|
607 } |
1 | 608 } |
609 | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1265
diff
changeset
|
610 static void draw_osd(void) |
6332
ff858ab25b11
-vm pan&scan fixes by Jesper Svennevid <mplayer@svennevid.ne>
arpi
parents:
6311
diff
changeset
|
611 { vo_draw_text(image_width-(vo_panscan_x>>1),image_height,draw_alpha_fnc);} |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1265
diff
changeset
|
612 |
182 | 613 static void flip_page(void) |
1 | 614 { |
6304
ee65527096c2
pan&scan support with -vo xv by ?? <mplayer@svennevid.net>
arpi
parents:
6295
diff
changeset
|
615 |
6416 | 616 #ifdef HAVE_SHM |
5622
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
617 if ( Shmem_Flag ) |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
618 { |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
619 XvShmPutImage(mDisplay, xv_port, vo_window, vo_gc, xvimage[current_buf], |
182 | 620 0, 0, image_width, image_height, |
6307 | 621 drwX-(vo_panscan_x>>1),drwY-(vo_panscan_y>>1),vo_dwidth+vo_panscan_x,(vo_fs?vo_dheight - 1:vo_dheight)+vo_panscan_y, |
182 | 622 False); |
5622
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
623 } |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
624 else |
6416 | 625 #endif |
5622
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
626 { |
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
627 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
|
628 0, 0, image_width, image_height, |
6307 | 629 drwX-(vo_panscan_x>>1),drwY-(vo_panscan_y>>1),vo_dwidth+vo_panscan_x,(vo_fs?vo_dheight - 1:vo_dheight)+vo_panscan_y); |
5622
d354889a3944
Support XV over remote connections, patch by Dmitry Karasik <dimakar at yahoo.com>
atmos4
parents:
5607
diff
changeset
|
630 } |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1265
diff
changeset
|
631 if (num_buffers>1){ |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1265
diff
changeset
|
632 current_buf=(current_buf+1)%num_buffers; |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1265
diff
changeset
|
633 XFlush(mDisplay); |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1265
diff
changeset
|
634 } else |
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1265
diff
changeset
|
635 XSync(mDisplay, False); |
182 | 636 return; |
1 | 637 } |
638 | |
247 | 639 |
640 | |
182 | 641 static uint32_t draw_slice(uint8_t *image[], int stride[], int w,int h,int x,int y) |
1 | 642 { |
182 | 643 uint8_t *src; |
644 uint8_t *dst; | |
645 int i; | |
6231 | 646 int srcstride; |
182 | 647 |
6231 | 648 dst = xvimage[current_buf]->data + xvimage[current_buf]->offsets[0] + |
649 xvimage[current_buf]->pitches[0]*y + x; | |
182 | 650 src = image[0]; |
6231 | 651 if(w==stride[0] && w==xvimage[current_buf]->pitches[0]) memcpy(dst,src,w*h); |
182 | 652 else |
653 for(i=0;i<h;i++) | |
654 { | |
655 memcpy(dst,src,w); | |
656 src+=stride[0]; | |
6231 | 657 dst+=xvimage[current_buf]->pitches[0]; |
182 | 658 } |
659 | |
660 x/=2;y/=2;w/=2;h/=2; | |
1 | 661 |
6231 | 662 dst = xvimage[current_buf]->data + xvimage[current_buf]->offsets[1] + |
663 xvimage[current_buf]->pitches[1]*y + x; | |
664 src=image[2];srcstride=stride[2]; | |
665 if(image_format!=IMGFMT_YV12){ src=image[1];srcstride=stride[1]; } | |
666 if(w==srcstride && w==xvimage[current_buf]->pitches[1]) memcpy(dst,src,w*h); | |
182 | 667 else |
668 for(i=0;i<h;i++) | |
669 { | |
670 memcpy(dst,src,w); | |
6231 | 671 src+=srcstride; |
672 dst+=xvimage[current_buf]->pitches[1]; | |
182 | 673 } |
5316 | 674 |
6231 | 675 dst = xvimage[current_buf]->data + xvimage[current_buf]->offsets[2] + |
676 xvimage[current_buf]->pitches[2]*y + x; | |
677 src=image[2];srcstride=stride[2]; | |
678 if(image_format==IMGFMT_YV12){ src=image[1];srcstride=stride[1]; } | |
679 if(w==srcstride && w==xvimage[current_buf]->pitches[2]) memcpy(dst,src,w*h); | |
182 | 680 else |
681 for(i=0;i<h;i++) | |
682 { | |
683 memcpy(dst,src,w); | |
6231 | 684 src+=srcstride; |
685 dst+=xvimage[current_buf]->pitches[2]; | |
686 } | |
687 | |
182 | 688 return 0; |
1 | 689 } |
690 | |
182 | 691 static uint32_t draw_frame(uint8_t *src[]) |
1 | 692 { |
693 | |
4629 | 694 switch (image_format) { |
408 | 695 case IMGFMT_YUY2: |
696 case IMGFMT_UYVY: | |
697 case IMGFMT_YVYU: | |
698 | |
6231 | 699 // printf("off=0x%X pitch=%d width=%d \n",xvimage[current_buf]->offsets[0],xvimage[current_buf]->pitches[0],image_width); |
408 | 700 |
6231 | 701 // YUY2 packed |
702 if(image_width*2==xvimage[current_buf]->pitches[0]){ | |
703 memcpy(xvimage[current_buf]->data+xvimage[current_buf]->offsets[0], | |
704 src[0], image_width*image_height*2); | |
705 } else { | |
706 unsigned char* s=src[0]; | |
707 unsigned char* d=xvimage[current_buf]->data+xvimage[current_buf]->offsets[0]; | |
708 int i; | |
709 for(i=0;i<image_height;i++) { | |
710 memcpy(d,s,image_width*2); | |
711 s+=image_width*2; | |
712 d+=xvimage[current_buf]->pitches[0]; | |
713 } | |
714 } | |
715 break; | |
4629 | 716 |
717 case IMGFMT_BGR24: | |
718 | |
719 if(flip_flag) // tricky, using negative src stride: | |
720 rgb24toyv12(src[0]+3*image_width*(image_height-1), | |
6231 | 721 xvimage[current_buf]->data+xvimage[current_buf]->offsets[0], |
722 xvimage[current_buf]->data+xvimage[current_buf]->offsets[2], | |
723 xvimage[current_buf]->data+xvimage[current_buf]->offsets[1], | |
4629 | 724 image_width,image_height, |
6231 | 725 xvimage[current_buf]->pitches[0], |
726 xvimage[current_buf]->pitches[1], | |
727 -3*image_width); | |
4629 | 728 else |
729 rgb24toyv12(src[0], | |
6231 | 730 xvimage[current_buf]->data+xvimage[current_buf]->offsets[0], |
731 xvimage[current_buf]->data+xvimage[current_buf]->offsets[2], | |
732 xvimage[current_buf]->data+xvimage[current_buf]->offsets[1], | |
4629 | 733 image_width,image_height, |
6231 | 734 xvimage[current_buf]->pitches[0], |
735 xvimage[current_buf]->pitches[1], | |
736 3*image_width); | |
4629 | 737 break; |
738 | |
408 | 739 } |
182 | 740 |
741 return 0; | |
1 | 742 } |
743 | |
4980 | 744 static uint32_t get_image(mp_image_t *mpi){ |
745 if(mpi->type==MP_IMGTYPE_STATIC && num_buffers>1) return VO_FALSE; // it is not static | |
5466 | 746 if(mpi->type==MP_IMGTYPE_IPB && num_buffers<3 && mpi->flags&MP_IMGFLAG_READABLE) return VO_FALSE; // not enough |
5006 | 747 if(mpi->imgfmt!=image_format || mpi->imgfmt==IMGFMT_BGR24) return VO_FALSE; // needs conversion :( |
4980 | 748 // if(mpi->flags&MP_IMGFLAG_READABLE) return VO_FALSE; // slow video ram |
6231 | 749 if( (mpi->flags&(MP_IMGFLAG_ACCEPT_STRIDE|MP_IMGFLAG_ACCEPT_WIDTH)) || |
750 (mpi->width*(mpi->bpp/8)==xvimage[current_buf]->pitches[0]) ){ | |
751 mpi->planes[0]=xvimage[current_buf]->data+xvimage[current_buf]->offsets[0]; | |
752 mpi->stride[0]=xvimage[current_buf]->pitches[0]; | |
753 mpi->width=mpi->stride[0]/(mpi->bpp/8); | |
754 if(mpi->flags&MP_IMGFLAG_PLANAR){ | |
755 if(mpi->flags&MP_IMGFLAG_SWAPPED){ | |
756 // I420 | |
757 mpi->planes[1]=xvimage[current_buf]->data+xvimage[current_buf]->offsets[1]; | |
758 mpi->planes[2]=xvimage[current_buf]->data+xvimage[current_buf]->offsets[2]; | |
759 mpi->stride[1]=xvimage[current_buf]->pitches[1]; | |
760 mpi->stride[2]=xvimage[current_buf]->pitches[2]; | |
761 } else { | |
5316 | 762 // YV12 |
6231 | 763 mpi->planes[1]=xvimage[current_buf]->data+xvimage[current_buf]->offsets[2]; |
764 mpi->planes[2]=xvimage[current_buf]->data+xvimage[current_buf]->offsets[1]; | |
765 mpi->stride[1]=xvimage[current_buf]->pitches[2]; | |
766 mpi->stride[2]=xvimage[current_buf]->pitches[1]; | |
767 } | |
768 } | |
4980 | 769 mpi->flags|=MP_IMGFLAG_DIRECT; |
770 // printf("mga: get_image() SUCCESS -> Direct Rendering ENABLED\n"); | |
771 return VO_TRUE; | |
772 } | |
773 return VO_FALSE; | |
774 } | |
775 | |
182 | 776 static uint32_t query_format(uint32_t format) |
1 | 777 { |
5566 | 778 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
|
779 /* check image formats */ |
5566 | 780 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
|
781 for(i = 0; i < formats; i++){ |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
782 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
|
783 } |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
784 return 0; |
1 | 785 } |
786 | |
1852 | 787 static void uninit(void) |
788 { | |
789 int i; | |
6016 | 790 if ( !vo_config_count ) return; |
791 saver_on(mDisplay); // screen saver back on | |
792 for( i=0;i<num_buffers;i++ ) deallocate_xvimage( i ); | |
793 #ifdef HAVE_XF86VM | |
794 vo_vm_close(mDisplay); | |
795 #endif | |
6095 | 796 vo_x11_uninit(); |
322
4e69a8e2700a
Screensaver and monitor powersafe function is switched off when playing a
laaz
parents:
249
diff
changeset
|
797 } |
1 | 798 |
4352 | 799 static uint32_t preinit(const char *arg) |
800 { | |
5509
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
801 XvPortID xv_p; |
6174
9676d7735332
different message for busy Xv ports and missing Xv ports
arpi
parents:
6125
diff
changeset
|
802 int busy_ports=0; |
6016 | 803 |
4737
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4658
diff
changeset
|
804 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
|
805 { |
5935 | 806 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
|
807 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
|
808 } |
5509
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
809 if (!vo_init()) return -1; |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
810 |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
811 xv_port = 0; |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
812 /* check for Xvideo extension */ |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
813 if (Success != XvQueryExtension(mDisplay,&ver,&rel,&req,&ev,&err)){ |
5935 | 814 mp_msg(MSGT_VO,MSGL_ERR,"Sorry, Xv not supported by this X11 version/driver\n"); |
815 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
|
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 for Xvideo support */ |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
820 if (Success != XvQueryAdaptors(mDisplay,DefaultRootWindow(mDisplay), &adaptors,&ai)){ |
5935 | 821 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
|
822 return -1; |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
823 } |
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 /* check adaptors */ |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
826 for (i = 0; i < adaptors && xv_port == 0; i++){ |
5935 | 827 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
|
828 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
|
829 if (!XvGrabPort(mDisplay, xv_p, CurrentTime)) { |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
830 xv_port = xv_p; |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
831 break; |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
832 } else { |
6174
9676d7735332
different message for busy Xv ports and missing Xv ports
arpi
parents:
6125
diff
changeset
|
833 mp_msg(MSGT_VO,MSGL_WARN,"Xv: could not grab port %i\n", (int)xv_p); |
9676d7735332
different message for busy Xv ports and missing Xv ports
arpi
parents:
6125
diff
changeset
|
834 ++busy_ports; |
5509
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
835 } |
5935 | 836 } |
5509
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
837 } |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
838 if(!xv_port){ |
6174
9676d7735332
different message for busy Xv ports and missing Xv ports
arpi
parents:
6125
diff
changeset
|
839 if(busy_ports) |
6249 | 840 mp_msg(MSGT_VO,MSGL_ERR,"Could not find free Xvideo port - maybe another process is already using it.\n" |
6174
9676d7735332
different message for busy Xv ports and missing Xv ports
arpi
parents:
6125
diff
changeset
|
841 "Close all video applications, and try again. If that does not help,\n" |
9676d7735332
different message for busy Xv ports and missing Xv ports
arpi
parents:
6125
diff
changeset
|
842 "see 'mplayer -vo help' for other (non-xv) video out drivers.\n"); |
9676d7735332
different message for busy Xv ports and missing Xv ports
arpi
parents:
6125
diff
changeset
|
843 else |
9676d7735332
different message for busy Xv ports and missing Xv ports
arpi
parents:
6125
diff
changeset
|
844 mp_msg(MSGT_VO,MSGL_ERR,"It seems there is no Xvideo support for your video card available.\n" |
9676d7735332
different message for busy Xv ports and missing Xv ports
arpi
parents:
6125
diff
changeset
|
845 "Run 'xvinfo' to verify its Xv support, and read Xv section of DOCS/video.html !\n" |
9676d7735332
different message for busy Xv ports and missing Xv ports
arpi
parents:
6125
diff
changeset
|
846 "See 'mplayer -vo help' for other (non-xv) video out drivers. Try -vo x11\n"); |
5509
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
847 return -1; |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
848 } |
1e90dd889c34
initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents:
5466
diff
changeset
|
849 |
5566 | 850 fo = XvListImageFormats(mDisplay, xv_port, (int*)&formats); |
851 | |
4737
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4658
diff
changeset
|
852 return 0; |
4352 | 853 } |
1 | 854 |
4352 | 855 static void query_vaa(vo_vaa_t *vaa) |
856 { | |
857 memset(vaa,0,sizeof(vo_vaa_t)); | |
4396 | 858 vaa->get_video_eq = xv_get_video_eq; |
859 vaa->set_video_eq = xv_set_video_eq; | |
4352 | 860 } |
4592
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
861 |
4596 | 862 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
|
863 { |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
864 switch (request) { |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
865 case VOCTRL_QUERY_VAA: |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
866 query_vaa((vo_vaa_t*)data); |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
867 return VO_TRUE; |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
868 case VOCTRL_QUERY_FORMAT: |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
869 return query_format(*((uint32_t*)data)); |
4980 | 870 case VOCTRL_GET_IMAGE: |
871 return get_image(data); | |
6307 | 872 case VOCTRL_GUISUPPORT: |
873 return VO_TRUE; | |
874 case VOCTRL_GET_PANSCAN: | |
6311
da2dda48b7ec
add mute support ( step 1 ) and fixed panscan bugs (1000l for me)
pontscho
parents:
6307
diff
changeset
|
875 if ( !vo_config_count || !vo_fs ) return VO_FALSE; |
6307 | 876 return VO_TRUE; |
6332
ff858ab25b11
-vm pan&scan fixes by Jesper Svennevid <mplayer@svennevid.ne>
arpi
parents:
6311
diff
changeset
|
877 case VOCTRL_FULLSCREEN: |
ff858ab25b11
-vm pan&scan fixes by Jesper Svennevid <mplayer@svennevid.ne>
arpi
parents:
6311
diff
changeset
|
878 vo_x11_fullscreen(); |
ff858ab25b11
-vm pan&scan fixes by Jesper Svennevid <mplayer@svennevid.ne>
arpi
parents:
6311
diff
changeset
|
879 /* indended, fallthrough to update panscan on fullscreen/windowed switch */ |
6307 | 880 case VOCTRL_SET_PANSCAN: |
6332
ff858ab25b11
-vm pan&scan fixes by Jesper Svennevid <mplayer@svennevid.ne>
arpi
parents:
6311
diff
changeset
|
881 if ( ( vo_fs && ( vo_panscan != vo_panscan_amount ) ) || ( !vo_fs && vo_panscan_amount ) ) |
6307 | 882 { |
6332
ff858ab25b11
-vm pan&scan fixes by Jesper Svennevid <mplayer@svennevid.ne>
arpi
parents:
6311
diff
changeset
|
883 int old_y = vo_panscan_y; |
6307 | 884 panscan_calc(); |
6332
ff858ab25b11
-vm pan&scan fixes by Jesper Svennevid <mplayer@svennevid.ne>
arpi
parents:
6311
diff
changeset
|
885 |
ff858ab25b11
-vm pan&scan fixes by Jesper Svennevid <mplayer@svennevid.ne>
arpi
parents:
6311
diff
changeset
|
886 if(old_y != vo_panscan_y) |
ff858ab25b11
-vm pan&scan fixes by Jesper Svennevid <mplayer@svennevid.ne>
arpi
parents:
6311
diff
changeset
|
887 { |
ff858ab25b11
-vm pan&scan fixes by Jesper Svennevid <mplayer@svennevid.ne>
arpi
parents:
6311
diff
changeset
|
888 XClearWindow(mDisplay, vo_window); |
ff858ab25b11
-vm pan&scan fixes by Jesper Svennevid <mplayer@svennevid.ne>
arpi
parents:
6311
diff
changeset
|
889 XFlush(mDisplay); |
ff858ab25b11
-vm pan&scan fixes by Jesper Svennevid <mplayer@svennevid.ne>
arpi
parents:
6311
diff
changeset
|
890 } |
6307 | 891 } |
892 return VO_TRUE; | |
4592
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
893 } |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
894 return VO_NOTIMPL; |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4433
diff
changeset
|
895 } |