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