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