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