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